Merge pull request #3 from ivov/reorganize-infrastructure-dir

chore: Reorganize infrastructure dir
ivov · Nov 15, 2024 · 2e2ea7b · 2e2ea7b
2 parents 0006b4d + 812611f
commit 2e2ea7b
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 3 deletions.
diff --git a/docs/provision.md b/docs/provision.md
@@ -33,8 +33,9 @@ ssh-keygen -t ed25519 -C "[email protected]" -f ~/.ssh/id_ed25519_shortlink_via_terra
 - `tf_automation_aws_access_key_id`: Access key ID for `terraform-automation` IAM user. Mark as sensitive.
 - `tf_automation_aws_secret_access_key`. Secret access key for `terraform-automation` IAM user. Mark as sensitive.
 
-```jsonc
-// n8n-shortlink-terraform-automation-policy
+Policy: `n8n-shortlink-terraform-automation-policy`
+
+```json
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -66,10 +67,12 @@ ssh-keygen -t ed25519 -C "[email protected]" -f ~/.ssh/id_ed25519_shortlink_via_terra
 2. Initialize Terraform:
 
    ```sh
-   cd infra/provision
+   cd infrastructure/01-provision
    terraform init
    ```
 
+   This will create an untracked `.terraform` dir, which caches provider plugins and modules; this dir also contains `terraform.tfstate` and `environment` files to record, respectively, the remote state backend configuration and workspace tracking in HCP Terraform. The state itself is stored remotely in the HCP Terraform workspace. This operation will also create a version-controlled `.terraform.lock.hcl` file, which records the exact version of provider plugins and modules.
+
 3. Plan and apply:
 
    ```sh

diff --git a/infra/provision/.terraform.lock.hcl → ...tructure/01-provision/.terraform.lock.hcl b/infra/provision/.terraform.lock.hcl → ...tructure/01-provision/.terraform.lock.hcl
diff --git a/infra/provision/main.tf → infrastructure/01-provision/main.tf b/infra/provision/main.tf → infrastructure/01-provision/main.tf
diff --git a/infra/provision/modules/backup/main.tf → ...cture/01-provision/modules/backup/main.tf b/infra/provision/modules/backup/main.tf → ...cture/01-provision/modules/backup/main.tf
diff --git a/infra/provision/modules/backup/outputs.tf → ...re/01-provision/modules/backup/outputs.tf b/infra/provision/modules/backup/outputs.tf → ...re/01-provision/modules/backup/outputs.tf
diff --git a/infra/provision/modules/backup/variables.tf → .../01-provision/modules/backup/variables.tf b/infra/provision/modules/backup/variables.tf → .../01-provision/modules/backup/variables.tf
diff --git a/infra/provision/modules/server/main.tf → ...cture/01-provision/modules/server/main.tf b/infra/provision/modules/server/main.tf → ...cture/01-provision/modules/server/main.tf
diff --git a/infra/provision/modules/server/outputs.tf → ...re/01-provision/modules/server/outputs.tf b/infra/provision/modules/server/outputs.tf → ...re/01-provision/modules/server/outputs.tf
diff --git a/infra/provision/modules/server/providers.tf → .../01-provision/modules/server/providers.tf b/infra/provision/modules/server/providers.tf → .../01-provision/modules/server/providers.tf
diff --git a/infra/provision/modules/server/variables.tf → .../01-provision/modules/server/variables.tf b/infra/provision/modules/server/variables.tf → .../01-provision/modules/server/variables.tf
diff --git a/infra/provision/outputs.tf → infrastructure/01-provision/outputs.tf b/infra/provision/outputs.tf → infrastructure/01-provision/outputs.tf
diff --git a/infra/provision/providers.tf → infrastructure/01-provision/providers.tf b/infra/provision/providers.tf → infrastructure/01-provision/providers.tf
diff --git a/infra/provision/variables.tf → infrastructure/01-provision/variables.tf b/infra/provision/variables.tf → infrastructure/01-provision/variables.tf
diff --git a/infra/provision/versions.tf → infrastructure/01-provision/versions.tf b/infra/provision/versions.tf → infrastructure/01-provision/versions.tf