Skip to content

Commit bf2ea42

Browse files
authored
Removing POC environment from repo (#458)
# What is the change? We no longer use the POC environment and therefore having the configuration in the Repo for this is misleading and confusing for people maintaining the repository. Please note that the Azure resources have already been removed from Azure. <!-- Describe the intended changes. --> # Why are we making this change? To save money and to reducing the complexity of the repository. <!-- Why is this change required? What problem does it solve? -->
2 parents 50a04f2 + 2c69bf0 commit bf2ea42

5 files changed

Lines changed: 1 addition & 61 deletions

File tree

.github/workflows/test-deploy.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
required: true
99
type: choice
1010
options:
11-
- poc
1211
- review
1312
- dev
1413

@@ -41,4 +40,4 @@ jobs:
4140
terraform_version: 1.11.4
4241

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

infrastructure/environments/poc/variables.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

infrastructure/environments/poc/variables.tfvars

Lines changed: 0 additions & 13 deletions
This file was deleted.

infrastructure/environments/poc/variables.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

scripts/terraform/terraform.mk

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ bootstrap:
88
--template-file "infrastructure/bootstrap/${BOOTSTRAP}.bicep" \
99
--parameters "infrastructure/bootstrap/environments/${HUB_TYPE}/${BOOTSTRAP}.bicepparam"
1010

11-
12-
poc: # Target the poc environment - make poc <action>
13-
$(eval include infrastructure/environments/poc/variables.sh)
14-
1511
hub-nonlive: # Target the non-live hub environment - make hub-nonlive <action>
1612
$(eval include infrastructure/bootstrap/environments/nonlive/variables.sh)
1713

@@ -112,29 +108,3 @@ terraform-validate: terraform-init-no-backend # Validate Terraform changes - mak
112108

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

0 commit comments

Comments
 (0)