Merge pull request #52 from NHSDigital/aiva2/CCM-6603_refactorAmplify…

…Component CCM-6603 rename of the amplify component
NHSDigital · Sep 16, 2024 · e38d444 · e38d444
2 parents 15ccdca + 57ddac2
commit e38d444
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/pr_merge.yaml b/.github/workflows/pr_merge.yaml
@@ -63,7 +63,7 @@ jobs:
             --arg releaseVersion "main" \
             --arg targetEnvironment "main" \
             --arg targetAccountGroup "nhs-notify-iam-dev" \
-            --arg targetComponent "iam" \
+            --arg targetComponent "app" \
             --arg terraformAction "apply" \
             '{ "ref": "main",
               "inputs": {

diff --git a/...e/terraform/components/iam/.tool-versions → ...e/terraform/components/app/.tool-versions b/...e/terraform/components/iam/.tool-versions → ...e/terraform/components/app/.tool-versions
diff --git a/...components/iam/acm_certificate_cognito.tf → ...components/app/acm_certificate_cognito.tf b/...components/iam/acm_certificate_cognito.tf → ...components/app/acm_certificate_cognito.tf
diff --git a/...e/terraform/components/iam/amplify_app.tf → ...e/terraform/components/app/amplify_app.tf b/...e/terraform/components/iam/amplify_app.tf → ...e/terraform/components/app/amplify_app.tf
diff --git a/...ponents/iam/amplify_domain_association.tf → ...ponents/app/amplify_domain_association.tf b/...ponents/iam/amplify_domain_association.tf → ...ponents/app/amplify_domain_association.tf
diff --git a/...nents/iam/cloudwatch_log_group_amplify.tf → ...nents/app/cloudwatch_log_group_amplify.tf b/...nents/iam/cloudwatch_log_group_amplify.tf → ...nents/app/cloudwatch_log_group_amplify.tf
diff --git a/...aform/components/iam/cognito_user_pool.tf → ...aform/components/app/cognito_user_pool.tf b/...aform/components/iam/cognito_user_pool.tf → ...aform/components/app/cognito_user_pool.tf
diff --git a/...omponents/iam/cognito_user_pool_client.tf → ...omponents/app/cognito_user_pool_client.tf b/...omponents/iam/cognito_user_pool_client.tf → ...omponents/app/cognito_user_pool_client.tf
diff --git a/...omponents/iam/cognito_user_pool_domain.tf → ...omponents/app/cognito_user_pool_domain.tf b/...omponents/iam/cognito_user_pool_domain.tf → ...omponents/app/cognito_user_pool_domain.tf
diff --git a/...ents/iam/data_ssm_parameter_github_pat.tf → ...ents/app/data_ssm_parameter_github_pat.tf b/...ents/iam/data_ssm_parameter_github_pat.tf → ...ents/app/data_ssm_parameter_github_pat.tf
diff --git a/...raform/components/iam/iam_role_amplify.tf → ...raform/components/app/iam_role_amplify.tf b/...raform/components/iam/iam_role_amplify.tf → ...raform/components/app/iam_role_amplify.tf
diff --git a/...ucture/terraform/components/iam/locals.tf → ...ucture/terraform/components/app/locals.tf b/...ucture/terraform/components/iam/locals.tf → ...ucture/terraform/components/app/locals.tf
diff --git a/...orm/components/iam/locals_remote_state.tf → ...orm/components/app/locals_remote_state.tf b/...orm/components/iam/locals_remote_state.tf → ...orm/components/app/locals_remote_state.tf
diff --git a/...aform/components/iam/locals_tfscaffold.tf → ...aform/components/app/locals_tfscaffold.tf b/...aform/components/iam/locals_tfscaffold.tf → ...aform/components/app/locals_tfscaffold.tf
diff --git a/...m/components/iam/module_amplify_branch.tf → ...m/components/app/module_amplify_branch.tf b/...m/components/iam/module_amplify_branch.tf → ...m/components/app/module_amplify_branch.tf
diff --git a/...cture/terraform/components/iam/outputs.tf → ...cture/terraform/components/app/outputs.tf b/...cture/terraform/components/iam/outputs.tf → ...cture/terraform/components/app/outputs.tf
diff --git a/.../terraform/components/iam/provider_aws.tf → .../terraform/components/app/provider_aws.tf b/.../terraform/components/iam/provider_aws.tf → .../terraform/components/app/provider_aws.tf
diff --git a/.../components/iam/route53_record_cognito.tf → .../components/app/route53_record_cognito.tf b/.../components/iam/route53_record_cognito.tf → .../components/app/route53_record_cognito.tf
diff --git a/.../route53_record_cognito_acm_validation.tf → .../route53_record_cognito_acm_validation.tf b/.../route53_record_cognito_acm_validation.tf → .../route53_record_cognito_acm_validation.tf
diff --git a/...orm/components/iam/route53_record_root.tf → ...orm/components/app/route53_record_root.tf b/...orm/components/iam/route53_record_root.tf → ...orm/components/app/route53_record_root.tf
diff --git a/...nts/iam/ssm_parameter_amplify_password.tf → ...nts/app/ssm_parameter_amplify_password.tf b/...nts/iam/ssm_parameter_amplify_password.tf → ...nts/app/ssm_parameter_amplify_password.tf
diff --git a/...ure/terraform/components/iam/variables.tf → ...ure/terraform/components/app/variables.tf b/...ure/terraform/components/iam/variables.tf → ...ure/terraform/components/app/variables.tf
@@ -38,7 +38,7 @@ variable "group" {
 variable "component" {
   type        = string
   description = "The variable encapsulating the name of this component"
-  default     = "iam"
+  default     = "app"
 }
 
 variable "default_tags" {

diff --git a/...ture/terraform/components/iam/versions.tf → ...ture/terraform/components/app/versions.tf b/...ture/terraform/components/iam/versions.tf → ...ture/terraform/components/app/versions.tf
diff --git a/infrastructure/terraform/components/branch/locals.tf b/infrastructure/terraform/components/branch/locals.tf
@@ -1,4 +1,4 @@
 locals {
-  root_domain_name       = "${var.environment}.${local.iam.amplify["domain_name"]}"
+  root_domain_name       = "${var.environment}.${local.app.amplify["domain_name"]}"
   normalised_branch_name = lower(substr(join("", regexall("[a-zA-Z0-9-]+", var.branch_name)), 0, 25))
 }
diff --git a/infrastructure/terraform/components/branch/locals_remote_state.tf b/infrastructure/terraform/components/branch/locals_remote_state.tf
@@ -1,6 +1,6 @@
 locals {
   bootstrap = data.terraform_remote_state.bootstrap.outputs
-  iam       = data.terraform_remote_state.iam.outputs
+  app       = data.terraform_remote_state.app.outputs
 }
 
 data "terraform_remote_state" "bootstrap" {
@@ -21,14 +21,14 @@ data "terraform_remote_state" "bootstrap" {
   }
 }
 
-data "terraform_remote_state" "iam" {
+data "terraform_remote_state" "app" {
   backend = "s3"
 
   config = {
     bucket = local.terraform_state_bucket
 
     key = format(
-      "%s/%s/%s/%s/iam.tfstate",
+      "%s/%s/%s/%s/app.tfstate",
       var.project,
       var.aws_account_id,
       "eu-west-2",

diff --git a/infrastructure/terraform/components/branch/module_amplify_branch.tf b/infrastructure/terraform/components/branch/module_amplify_branch.tf
@@ -12,12 +12,12 @@ module "amplify_branch" {
   region         = var.region
   group          = var.group
 
-  amplify_app_id    = local.iam.amplify["id"]
+  amplify_app_id    = local.app.amplify["id"]
   branch            = var.branch_name
   enable_auto_build = true
 
   environment_variables = {
-    USER_POOL_CLIENT_ID   = local.iam.cognito_user_pool_client["id"]
+    USER_POOL_CLIENT_ID   = local.app.cognito_user_pool_client["id"]
     NOTIFY_SUBDOMAIN      = var.environment
     NEXT_PUBLIC_BASE_PATH = "/auth~${local.normalised_branch_name}"
   }

diff --git a/infrastructure/terraform/components/branch/null_resource_remove_amplify_branch.tf b/infrastructure/terraform/components/branch/null_resource_remove_amplify_branch.tf
@@ -2,7 +2,7 @@ resource "null_resource" "remove_amplify_branch" {
   # Despite destroying the resource, apparently Amplify thinks we want to keep the branch resrouce around
   triggers = {
     csi                 = local.csi
-    amplify_app_id      = local.iam.amplify["id"]
+    amplify_app_id      = local.app.amplify["id"]
     amplify_branch_name = module.amplify_branch.name
   }