aiva2/CCM-5680 IAM Webauth infra

.github/workflows/pr_create_dynamic_env.yaml

@@ -22,12 +22,12 @@ jobs:
 
           DISPATCH_EVENT=$(jq -ncM \
             --arg infraRepoName "${this_repo_name}" \
-            --arg releaseVersion "${{ github.ref_name }}" \
+            --arg releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             --arg targetEnvironment "pr${{ github.event.number }}" \
             --arg targetAccountGroup "nhs-notify-iam-dev" \
             --arg targetComponent "branch" \
             --arg terraformAction "apply" \
-            --arg overrides "branch_name=${{ github.ref_name }}" \
+            --arg overrides "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             '{ "ref": "main",
               "inputs": {
                 "infraRepoName": $infraRepoName,

.github/workflows/pr_merge.yaml

@@ -22,12 +22,12 @@ jobs:
 
           DISPATCH_EVENT=$(jq -ncM \
             --arg infraRepoName "${this_repo_name}" \
-            --arg releaseVersion "${{ github.ref_name }}" \
+            --arg releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             --arg targetEnvironment "pr${{ github.event.number }}" \
             --arg targetAccountGroup "nhs-notify-iam-dev" \
             --arg targetComponent "branch" \
             --arg terraformAction "destroy" \
-            --arg overrides "branch_name=${{ github.ref_name }}" \
+            --arg overrides "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             '{ "ref": "main",
               "inputs": {
                 "infraRepoName": $infraRepoName,

infrastructure/terraform/components/branch/null_resource_remove_amplify_branch.tf

@@ -0,0 +1,13 @@
+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_branch_name = module.amplify_branch.name
+  }
+
+  provisioner "local-exec" {
+    when    = destroy
+    command = "aws amplify delete-branch --app-id ${self.triggers.amplify_app_id} --branch-name ${self.triggers.amplify_branch_name}"
+  }
+}

infrastructure/terraform/components/iam/amplify_app.tf

@@ -16,7 +16,7 @@ resource "aws_amplify_app" "main" {
 
   environment_variables = {
     USER_POOL_ID = aws_cognito_user_pool.main.id
-    # HOSTED_LOGIN_DOMAIN = "auth.${var.environment}.${local.acct.dns_zone["name"]}"
+    # HOSTED_LOGIN_DOMAIN = "auth.${local.acct.dns_zone["name"]}"
     NOTIFY_GROUP       = var.group
     NOTIFY_ENVIRONMENT = var.environment
     NOTIFY_DOMAIN_NAME = local.acct.dns_zone["name"]

infrastructure/terraform/components/iam/locals_remote_state.tf

@@ -32,7 +32,7 @@ data "terraform_remote_state" "acct" {
       var.project,
       var.aws_account_id,
       "eu-west-2",
-      "main"
+      var.environment
     )
 
     region = "eu-west-2"

infrastructure/terraform/components/iam/module_amplify_branch.tf

@@ -1,7 +1,7 @@
 module "amplify_branch" {
   source = "../../modules/amp_branch"
 
-  name           = var.environment
+  name           = "main"
   aws_account_id = var.aws_account_id
   component      = var.component
   environment    = var.environment
@@ -12,7 +12,8 @@ module "amplify_branch" {
   cognito_user_pool_client_id               = aws_cognito_user_pool_client.main.user_pool_id
   cognito_user_pool_identity_provider_names = aws_cognito_user_pool_client.main.supported_identity_providers
   amplify_app_id                            = aws_amplify_app.main.id
-  branch                                    = var.environment
+  branch                                    = "main"
   domain_name                               = local.acct.dns_zone["name"]
   subdomain                                 = var.environment
+  enable_auto_deploy                        = true
 }

infrastructure/terraform/modules/amp_branch/amplify_branch.tf

@@ -2,7 +2,8 @@ resource "aws_amplify_branch" "main" {
   app_id                      = var.amplify_app_id
   branch_name                 = var.branch
   display_name                = var.name
-  enable_pull_request_preview = false # PR previews are not supported for public repos
+  enable_pull_request_preview = false
+  enable_auto_build           = var.enable_auto_deploy
 
   environment_variables = {
     USER_POOL_CLIENT_ID = var.cognito_user_pool_client_id

infrastructure/terraform/modules/amp_branch/variables.tf

@@ -61,18 +61,18 @@ variable "name" {
 }
 
 variable "cognito_user_pool_client_id" {
-  description = "Cognito User Pool client ID"
   type        = string
+  description = "Cognito User Pool client ID"
 }
 
 variable "cognito_user_pool_identity_provider_names" {
-  description = "A list of Cognito IDP names"
   type        = list(string)
+  description = "A list of Cognito IDP names"
 }
 
 variable "amplify_app_id" {
-  description = "Amplify application ID"
   type        = string
+  description = "Amplify application ID"
 }
 
 variable "branch" {
@@ -90,3 +90,9 @@ variable "subdomain" {
   default     = "main"
   description = "Subdomain used as the branch alias"
 }
+
+variable "enable_auto_deploy" {
+  type        = bool
+  description = "Enable the auto deployment of the branch code as well as just the resources for it"
+  default     = false
+}

scripts/terraform/terraform.mk

@@ -4,6 +4,11 @@
 # Custom implementation - implementation of a make target should not exceed 5 lines of effective code.
 # In most cases there should be no need to modify the existing make targets.
 
+# TF_ENV ?= dev
+# STACK ?= ${stack}
+# TERRAFORM_STACK ?= $(or ${STACK}, infrastructure/terraform)
+# dir ?= ${TERRAFORM_STACK}
+
 terraform-init: # Initialise Terraform - optional: terraform_dir|dir=[path to a directory where the command will be executed, relative to the project's top-level directory, default is one of the module variables or the example directory, if not set], terraform_opts|opts=[options to pass to the Terraform init command, default is none/empty] @Development
 	make _terraform cmd="init" \
 		dir=$(or ${terraform_dir}, ${dir}) \