aiva2/CCM-5680 IAM Webauth infra

.github/workflows/pr_create_dynamic_env.yaml

@@ -22,7 +22,7 @@ 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" \

.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" {
+  # Dispite destroying the resouce, apparently Amplify thinks we want to keep the branch resrouce around
+  triggers = {
+    csi = local.csi
+  }
+
+  provisioner "local-exec" {
+    when    = destroy
+    command = "aws amplify delete-branch --app-id ${local.iam.amplify["id"]} --branch-name ${module.amplify_branch.name}"
+  }
+}
+
+

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}) \