Skip to content

Commit ffc2f43

Browse files
committed
Ensure POC can deploy independent of hub spoke envs
1 parent 275a4b0 commit ffc2f43

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

.github/workflows/test-deploy.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ jobs:
3939
terraform_version: 1.11.4
4040

4141
- name: Terraform plan
42-
run: make ${TARGET_ENV} ci terraform-apply DOCKER_IMAGE_TAG=git-sha-${{ github.sha }}
42+
run: make ${TARGET_ENV} ci poc-terraform-apply DOCKER_IMAGE_TAG=git-sha-${{ github.sha }}
43+

scripts/terraform/terraform.mk

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,29 @@ terraform-validate: terraform-init-no-backend # Validate Terraform changes - mak
102102

103103
terraform-fmt:
104104
terraform -chdir=infrastructure/terraform/spoke fmt
105+
106+
107+
# TODO: Delete these once we are in production like environments
108+
poc-terraform-init: set-azure-account get-subscription-ids # Initialise Terraform - make <env> terraform-init
109+
$(eval STORAGE_ACCOUNT_NAME=sa${APP_SHORT_NAME}${ENV_CONFIG}tfstate)
110+
$(eval export ARM_USE_AZUREAD=true)
111+
112+
rm -rf infrastructure/modules/dtos-devops-templates
113+
git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_REF} \
114+
https://github.com/NHSDigital/dtos-devops-templates.git infrastructure/modules/dtos-devops-templates
115+
116+
terraform -chdir=infrastructure/terraform init -upgrade -reconfigure \
117+
-backend-config=subscription_id=${HUB_SUBSCRIPTION_ID} \
118+
-backend-config=resource_group_name=${STORAGE_ACCOUNT_RG} \
119+
-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
120+
-backend-config=key=${ENVIRONMENT}.tfstate
121+
122+
$(eval export TF_VAR_app_short_name=${APP_SHORT_NAME})
123+
$(eval export TF_VAR_docker_image=${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG})
124+
$(eval export TF_VAR_environment=${ENVIRONMENT})
125+
$(eval export TF_VAR_env_config=${ENV_CONFIG})
126+
$(eval export TF_VAR_hub=${HUB})
127+
$(eval export TF_VAR_hub_subscription_id=${HUB_SUBSCRIPTION_ID})
128+
129+
poc-terraform-apply: poc-terraform-init # Apply Terraform changes - make <env> terraform-apply DOCKER_IMAGE_TAG=abcd123
130+
terraform -chdir=infrastructure/terraform apply -var-file ../environments/${ENV_CONFIG}/variables.tfvars ${AUTO_APPROVE}

0 commit comments

Comments
 (0)