Merge pull request #22 from NHSDigital/rossbugginsnhs/move-tf-to-infr…

…a-folder move terraform to infra dir
NHSDigital · Jul 2, 2024 · 49617fa · 49617fa
2 parents 0380729 + 0a0deed
commit 49617fa
Show file tree

Hide file tree

Showing 33 changed files with 2 additions and 28 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,7 +14,6 @@
     ".vscode": false,
     "tests":true,
     "infrastructure":true,
-    "scripts":true,
-    "terraform": true
+    "scripts":true
   }
 }
diff --git a/terraform/.gitignore → infrastructure/terraform/.gitignore b/terraform/.gitignore → infrastructure/terraform/.gitignore
diff --git a/terraform/bin/terraform.sh → infrastructure/terraform/bin/terraform.sh b/terraform/bin/terraform.sh → infrastructure/terraform/bin/terraform.sh
diff --git a/terraform/bootstrap/.terraform-version → ...re/terraform/bootstrap/.terraform-version b/terraform/bootstrap/.terraform-version → ...re/terraform/bootstrap/.terraform-version
diff --git a/...tstrap/data_iam_policy_document_bucket.tf → ...tstrap/data_iam_policy_document_bucket.tf b/...tstrap/data_iam_policy_document_bucket.tf → ...tstrap/data_iam_policy_document_bucket.tf
diff --git a/...ap/data_iam_policy_document_kms_key_s3.tf → ...ap/data_iam_policy_document_kms_key_s3.tf b/...ap/data_iam_policy_document_kms_key_s3.tf → ...ap/data_iam_policy_document_kms_key_s3.tf
diff --git a/terraform/bootstrap/dynamodb_table.tf → ...ure/terraform/bootstrap/dynamodb_table.tf b/terraform/bootstrap/dynamodb_table.tf → ...ure/terraform/bootstrap/dynamodb_table.tf
diff --git a/terraform/bootstrap/kms_key_s3.tf → ...ructure/terraform/bootstrap/kms_key_s3.tf b/terraform/bootstrap/kms_key_s3.tf → ...ructure/terraform/bootstrap/kms_key_s3.tf
diff --git a/terraform/bootstrap/locals.tf → infrastructure/terraform/bootstrap/locals.tf b/terraform/bootstrap/locals.tf → infrastructure/terraform/bootstrap/locals.tf
diff --git a/terraform/bootstrap/outputs.tf → ...astructure/terraform/bootstrap/outputs.tf b/terraform/bootstrap/outputs.tf → ...astructure/terraform/bootstrap/outputs.tf
diff --git a/terraform/bootstrap/provider_aws.tf → ...cture/terraform/bootstrap/provider_aws.tf b/terraform/bootstrap/provider_aws.tf → ...cture/terraform/bootstrap/provider_aws.tf
diff --git a/terraform/bootstrap/s3_bucket.tf → ...tructure/terraform/bootstrap/s3_bucket.tf b/terraform/bootstrap/s3_bucket.tf → ...tructure/terraform/bootstrap/s3_bucket.tf
diff --git a/...trap/s3_bucket_lifecycle_configuration.tf → ...trap/s3_bucket_lifecycle_configuration.tf b/...trap/s3_bucket_lifecycle_configuration.tf → ...trap/s3_bucket_lifecycle_configuration.tf
diff --git a/...bootstrap/s3_bucket_ownership_controls.tf → ...bootstrap/s3_bucket_ownership_controls.tf b/...bootstrap/s3_bucket_ownership_controls.tf → ...bootstrap/s3_bucket_ownership_controls.tf
diff --git a/terraform/bootstrap/s3_bucket_policy.tf → ...e/terraform/bootstrap/s3_bucket_policy.tf b/terraform/bootstrap/s3_bucket_policy.tf → ...e/terraform/bootstrap/s3_bucket_policy.tf
diff --git a/...ootstrap/s3_bucket_public_access_block.tf → ...ootstrap/s3_bucket_public_access_block.tf b/...ootstrap/s3_bucket_public_access_block.tf → ...ootstrap/s3_bucket_public_access_block.tf
diff --git a/...t_server_side_encryption_configuration.tf → ...t_server_side_encryption_configuration.tf b/...t_server_side_encryption_configuration.tf → ...t_server_side_encryption_configuration.tf
diff --git a/terraform/bootstrap/s3_bucket_versioning.tf → ...rraform/bootstrap/s3_bucket_versioning.tf b/terraform/bootstrap/s3_bucket_versioning.tf → ...rraform/bootstrap/s3_bucket_versioning.tf
diff --git a/terraform/bootstrap/variables.tf → ...tructure/terraform/bootstrap/variables.tf b/terraform/bootstrap/variables.tf → ...tructure/terraform/bootstrap/variables.tf
diff --git a/terraform/bootstrap/versions.tf → ...structure/terraform/bootstrap/versions.tf b/terraform/bootstrap/versions.tf → ...structure/terraform/bootstrap/versions.tf
diff --git a/terraform/components/.gitkeep → infrastructure/terraform/components/.gitkeep b/terraform/components/.gitkeep → infrastructure/terraform/components/.gitkeep
diff --git a/...aform/components/examplecomponent/main.tf → ...aform/components/examplecomponent/main.tf b/...aform/components/examplecomponent/main.tf → ...aform/components/examplecomponent/main.tf
diff --git a/...rm/components/examplecomponent/outputs.tf → ...rm/components/examplecomponent/outputs.tf b/...rm/components/examplecomponent/outputs.tf → ...rm/components/examplecomponent/outputs.tf
diff --git a/.../components/examplecomponent/variables.tf → .../components/examplecomponent/variables.tf b/.../components/examplecomponent/variables.tf → .../components/examplecomponent/variables.tf
diff --git a/terraform/etc/.gitkeep → infrastructure/terraform/etc/.gitkeep b/terraform/etc/.gitkeep → infrastructure/terraform/etc/.gitkeep
diff --git a/terraform/modules/.gitkeep → infrastructure/terraform/modules/.gitkeep b/terraform/modules/.gitkeep → infrastructure/terraform/modules/.gitkeep
diff --git a/nhs-notify-repository-template.code-workspace b/nhs-notify-repository-template.code-workspace
@@ -13,7 +13,7 @@
       "path": "./tests"
     },
     {
-      "name": "Infra",
+      "name": "Infrastructure",
       "path": "./infrastructure"
     },
     {
@@ -32,10 +32,6 @@
       "name": "Dev Container",
       "path": ".devcontainer"
     },
-    {
-      "name": "Terraform",
-      "path": "terraform"
-    }
   ],
   "settings": {
 

diff --git a/terraform/etc/env_eu-west-2_exampleenv.tfvars b/terraform/etc/env_eu-west-2_exampleenv.tfvars
diff --git a/terraform/etc/eu-west-2.tfvars b/terraform/etc/eu-west-2.tfvars
diff --git a/terraform/etc/global.tfvars b/terraform/etc/global.tfvars
diff --git a/terraform/etc/group_examplegroup.tfvars b/terraform/etc/group_examplegroup.tfvars
diff --git a/terraform/etc/versions_eg-region-1_exampleenv.tfvars b/terraform/etc/versions_eg-region-1_exampleenv.tfvars
diff --git a/terraform/plugin-cache/.gitkeep b/terraform/plugin-cache/.gitkeep