CCM-5836 fix branch-ref

NHSDigital · Jul 23, 2024 · 03dc419 · 03dc419
1 parent 33e0436
commit 03dc419
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/pr_merge.yaml b/.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,

diff --git a/infrastructure/terraform/components/branch/null_resource_remove_amplify_branch.tf b/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}"
+  }
+}
+
+