Merge branch 'main' into LCS-867-Review-sonarqube-vulnerabilities-in-github-pipelines

Author: mrlockstar

.github/workflows/test-deploy.yaml

@@ -8,7 +8,6 @@ on:
         required: true
         type: choice
         options:
-          - poc
           - review
           - dev
 
@@ -41,4 +40,4 @@ jobs:
           terraform_version: 1.11.4
 
       - name: Terraform plan
-        run: make ${TARGET_ENV} ci poc-terraform-apply DOCKER_IMAGE_TAG=git-sha-${{ github.sha }}
+        run: make ${TARGET_ENV} ci terraform-plan DOCKER_IMAGE_TAG=git-sha-${{ github.sha }}

infrastructure/environments/poc/variables.sh

@@ -8,10 +8,6 @@ bootstrap:
 		--template-file "infrastructure/bootstrap/${BOOTSTRAP}.bicep" \
 		--parameters "infrastructure/bootstrap/environments/${HUB_TYPE}/${BOOTSTRAP}.bicepparam"
 
-
-poc: # Target the poc environment - make poc <action>
-	$(eval include infrastructure/environments/poc/variables.sh)
-
 hub-nonlive: # Target the non-live hub environment - make hub-nonlive <action>
 	$(eval include infrastructure/bootstrap/environments/nonlive/variables.sh)
 
@@ -112,29 +108,3 @@ terraform-validate: terraform-init-no-backend # Validate Terraform changes - mak
 
 terraform-fmt:
 	terraform -chdir=infrastructure/terraform/spoke fmt
-
-
-# TODO: Delete these once we are in production like environments
-poc-terraform-init: set-azure-account get-subscription-ids # Initialise Terraform - make <env> terraform-init
-	$(eval STORAGE_ACCOUNT_NAME=sa${APP_SHORT_NAME}${ENV_CONFIG}tfstate)
-	$(eval export ARM_USE_AZUREAD=true)
-
-	rm -rf infrastructure/modules/dtos-devops-templates
-	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_REF} \
-		https://github.com/NHSDigital/dtos-devops-templates.git infrastructure/modules/dtos-devops-templates
-
-	terraform -chdir=infrastructure/terraform/spoke init -upgrade -reconfigure \
-		-backend-config=subscription_id=${HUB_SUBSCRIPTION_ID} \
-		-backend-config=resource_group_name=${STORAGE_ACCOUNT_RG} \
-		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
-		-backend-config=key=${ENVIRONMENT}.tfstate
-
-	$(eval export TF_VAR_app_short_name=${APP_SHORT_NAME})
-	$(eval export TF_VAR_docker_image=${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG})
-	$(eval export TF_VAR_environment=${ENVIRONMENT})
-	$(eval export TF_VAR_env_config=${ENV_CONFIG})
-	$(eval export TF_VAR_hub=${HUB})
-	$(eval export TF_VAR_hub_subscription_id=${HUB_SUBSCRIPTION_ID})
-
-poc-terraform-apply: poc-terraform-init # Apply Terraform changes - make <env> terraform-apply DOCKER_IMAGE_TAG=abcd123
-	terraform -chdir=infrastructure/terraform/spoke apply -var-file ../../environments/${ENV_CONFIG}/variables.tfvars ${AUTO_APPROVE}