Merge pull request #121 from NHSDigital/feature/terb-ELID-131-automated-deployment-networking-api

Feature/terb elid 131 automated deployment networking api

Author: TOEL2

.github/workflows/cicd-2-publish.yaml

@@ -9,6 +9,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: terraform-dev
+  cancel-in-progress: false
+
 jobs:
   metadata:
     name: "Set CI/CD metadata"

.github/workflows/cicd-3-deploy.yaml

@@ -3,6 +3,10 @@
 
 name: "CI/CD deploy"
 
+concurrency:
+  group: terraform-deploy-${{ github.event.inputs.environment }}
+  cancel-in-progress: false
+
 on:
   workflow_dispatch:
     inputs:

infrastructure/Makefile

@@ -35,7 +35,9 @@ terraform-workspace-delete: guard-env guard-stack
 
 # Runs a specified Terraform command (e.g., plan, apply) for the stack and environment.
 terraform: guard-env guard-stack guard-tf-command terraform-init terraform-workspace
-	terraform -chdir=./stacks/$(stack) $(tf-command) $(args) $(if $(filter $(tf-command),init),,--parallelism=30)
+	terraform -chdir=./stacks/$(stack) $(tf-command) $(args) \
+		$(if $(filter init,$(tf-command)),,--parallelism=30) \
+		$(if $(filter apply,$(tf-command)),-auto-approve)
 	rm -f ./terraform_outputs_$(stack).json || true
 	mkdir -p ./build
 	terraform -chdir=./stacks/$(stack) output -json > ./build/terraform_outputs_$(stack).json