CCM-7357: Disable automatic build for main branch and provide TF output for post-deployment hook (#199)

Author: m-houston

infrastructure/terraform/components/app/amplify_domain_association.tf

@@ -4,13 +4,13 @@
 #   enable_auto_sub_domain = true
 
 #   sub_domain {
-#     branch_name = module.amplify_branch.name
+#     branch_name = var.branch_name
 #     prefix      = ""
 #   }
 
 #   sub_domain {
-#     branch_name = module.amplify_branch.name
-#     prefix      = "main"
+#     branch_name = var.branch_name
+#     prefix      = var.url_prefix
 #   }
 # }
 
@@ -19,13 +19,14 @@
 resource "null_resource" "amplify_domain_association" {
   triggers = {
     amplify_app_id      = aws_amplify_app.main.id
-    amplify_branch_name = module.amplify_branch.name
+    amplify_branch_name = var.branch_name
+    amplify_url_prefix  = var.url_prefix
     amplify_domain_name = local.root_domain_name
   }
 
   provisioner "local-exec" {
     when    = create
-    command = "aws amplify create-domain-association --app-id ${self.triggers.amplify_app_id} --domain-name ${self.triggers.amplify_domain_name} --sub-domain-settings prefix=\"\",branchName=\"${self.triggers.amplify_branch_name}\" prefix=\"${self.triggers.amplify_branch_name}\",branchName=\"${self.triggers.amplify_branch_name}\" --enable-auto-sub-domain --auto-sub-domain-creation-patterns \"*,*/*,pr*\""
+    command = "aws amplify create-domain-association --app-id ${self.triggers.amplify_app_id} --domain-name ${self.triggers.amplify_domain_name} --sub-domain-settings prefix=\"\",branchName=\"${self.triggers.amplify_branch_name}\" prefix=\"${self.triggers.amplify_url_prefix}\",branchName=\"${self.triggers.amplify_branch_name}\" --enable-auto-sub-domain --auto-sub-domain-creation-patterns \"*,*/*,pr*\""
   }
 
   provisioner "local-exec" {

infrastructure/terraform/components/app/module_amplify_branch.tf

@@ -2,7 +2,7 @@ module "amplify_branch" {
   source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/amp_branch?ref=v1.0.0"
 
   name              = "main"
-  display_name      = "main"
+  display_name      = var.url_prefix
   aws_account_id    = var.aws_account_id
   component         = var.component
   environment       = var.environment
@@ -13,7 +13,7 @@ module "amplify_branch" {
   amplify_app_id    = aws_amplify_app.main.id
   branch            = var.branch_name
   stage             = "PRODUCTION"
-  enable_auto_build = true
+  enable_auto_build = false
 
   environment_variables = {
     NOTIFY_SUBDOMAIN      = var.environment

infrastructure/terraform/components/app/outputs.tf

@@ -2,6 +2,20 @@ output "amplify" {
   value = {
     id          = aws_amplify_app.main.id
     domain_name = local.root_domain_name
+    branch_name = var.branch_name
+  }
+}
+
+output "deployment" {
+  description = "Deployment details used for post-deployment scripts"
+  value = {
+    aws_region     = var.region
+    aws_account_id = var.aws_account_id
+    project        = var.project
+    environment    = var.environment
+    group          = var.group
+    component      = var.component
+    commit_id      = var.commit_id
   }
 }
 

infrastructure/terraform/components/app/variables.tf

@@ -99,6 +99,18 @@ variable "branch_name" {
   default     = "main"
 }
 
+variable "url_prefix" {
+  type        = string
+  description = "The url prefix to use for the deployed branch"
+  default     = "main"
+}
+
+variable "commit_id" {
+  type        = string
+  description = "The commit to deploy. Must be in the tree for branch_name"
+  default     = "HEAD"
+}
+
 variable "disable_content" {
   type        = string
   description = "Value for turning switching disable conten true/false"