Merge pull request #131 from NHSDigital/CCM-8071_destroyenv_workflow

CCM-8071 destroy env fixes
NHSDigital · Dec 17, 2024 · 9e2530b · 9e2530b
2 parents 92c41c0 + 94c3829
commit 9e2530b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/pr_destroy_dynamic_env.yaml b/.github/workflows/pr_destroy_dynamic_env.yaml
@@ -27,7 +27,6 @@ jobs:
             --arg targetAccountGroup "nhs-notify-iam-dev" \
             --arg targetComponent "branch" \
             --arg terraformAction "destroy" \
-            --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_initial_amplify_branch_build.tf b/infrastructure/terraform/components/branch/null_resource_initial_amplify_branch_build.tf
@@ -0,0 +1,12 @@
+resource "null_resource" "initial_amplify_branch_build" {
+  # Trigger initial build when the branch is creates. Subsequent commits to the branch would cause builds anyway
+  triggers = {
+    csi                 = local.csi
+    amplify_app_id      = local.app.amplify["id"]
+    amplify_branch_name = module.amplify_branch.name
+  }
+
+  provisioner "local-exec" {
+    command = "aws amplify start-job --app-id ${self.triggers.amplify_app_id} --branch-name ${self.triggers.amplify_branch_name} --job-type 'RELEASE'"
+  }
+}