CI-CD for domains

DFE-Digital · Feb 28, 2025 · 85e3625 · 85e3625
1 parent ff809fb
commit 85e3625
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -129,32 +129,32 @@ dns:
 	$(eval include global_config/dns-domain.sh)
 
 domains-infra-init: set-azure-account
-	rm -rf terraform/custom_domains/infrastructure/vendor/modules/domains
-	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/custom_domains/infrastructure/vendor/modules/domains
+	rm -rf terraform/domains/infrastructure/vendor/modules/domains
+	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/infrastructure/vendor/modules/domains
 
-	terraform -chdir=terraform/custom_domains/infrastructure init -reconfigure -upgrade \
+	terraform -chdir=terraform/domains/infrastructure init -reconfigure -upgrade \
 		-backend-config=config/${DOMAINS_ID}_backend.tfvars
 
 domains-infra-plan: domains-infra-init # make dns domains-infra-plan
-	terraform -chdir=terraform/custom_domains/infrastructure plan -var-file config/${DOMAINS_ID}.tfvars.json
+	terraform -chdir=terraform/domains/infrastructure plan -var-file config/${DOMAINS_ID}.tfvars.json
 
 domains-infra-apply: domains-infra-init # make dns domains-infra-apply
-	terraform -chdir=terraform/custom_domains/infrastructure apply -var-file config/${DOMAINS_ID}.tfvars.json ${AUTO_APPROVE}
+	terraform -chdir=terraform/domains/infrastructure apply -var-file config/${DOMAINS_ID}.tfvars.json ${AUTO_APPROVE}
 
 domains-init: set-azure-account
-	rm -rf terraform/custom_domains/environment_domains/vendor/modules/domains
-	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/custom_domains/environment_domains/vendor/modules/domains
+	rm -rf terraform/domains/environment_domains/vendor/modules/domains
+	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/environment_domains/vendor/modules/domains
 	$(if $(PR_NUMBER), $(eval DEPLOY_ENV=${PR_NUMBER}))
-	terraform -chdir=terraform/custom_domains/environment_domains init -upgrade -reconfigure -backend-config=config/${DOMAINS_ID}_${DEPLOY_ENV}_backend.tfvars
+	terraform -chdir=terraform/domains/environment_domains init -upgrade -reconfigure -backend-config=config/${DOMAINS_ID}_${DEPLOY_ENV}_backend.tfvars
 
 domains-plan: domains-init  # make test dns domains-plan
-	terraform -chdir=terraform/custom_domains/environment_domains plan -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json
+	terraform -chdir=terraform/domains/environment_domains plan -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json
 
 domains-apply: domains-init # make test dns domains-apply
-	terraform -chdir=terraform/custom_domains/environment_domains apply -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json ${AUTO_APPROVE}
+	terraform -chdir=terraform/domains/environment_domains apply -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json ${AUTO_APPROVE}
 
 domains-destroy: domains-init # make test dns domains-destroy
-	terraform -chdir=terraform/custom_domains/environment_domains destroy -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json
+	terraform -chdir=terraform/domains/environment_domains destroy -var-file config/${DOMAINS_ID}_${DEPLOY_ENV}.tfvars.json
 
 domain-azure-resources: set-azure-account
 	$(if $(AUTO_APPROVE), , $(error can only run with AUTO_APPROVE))

diff --git a/...s/environment_domains/.terraform.lock.hcl → ...s/environment_domains/.terraform.lock.hcl b/...s/environment_domains/.terraform.lock.hcl → ...s/environment_domains/.terraform.lock.hcl
diff --git a/...ins/config/ccbl_preproduction.tfvars.json → ...ins/config/ccbl_preproduction.tfvars.json b/...ins/config/ccbl_preproduction.tfvars.json → ...ins/config/ccbl_preproduction.tfvars.json
diff --git a/.../config/ccbl_preproduction_backend.tfvars → .../config/ccbl_preproduction_backend.tfvars b/.../config/ccbl_preproduction_backend.tfvars → .../config/ccbl_preproduction_backend.tfvars
diff --git a/...omains/config/ccbl_production.tfvars.json → ...omains/config/ccbl_production.tfvars.json b/...omains/config/ccbl_production.tfvars.json → ...omains/config/ccbl_production.tfvars.json
diff --git a/...ins/config/ccbl_production_backend.tfvars → ...ins/config/ccbl_production_backend.tfvars b/...ins/config/ccbl_production_backend.tfvars → ...ins/config/ccbl_production_backend.tfvars
diff --git a/...ment_domains/config/ccbl_test.tfvars.json → ...ment_domains/config/ccbl_test.tfvars.json b/...ment_domains/config/ccbl_test.tfvars.json → ...ment_domains/config/ccbl_test.tfvars.json
diff --git a/...t_domains/config/ccbl_test_backend.tfvars → ...t_domains/config/ccbl_test_backend.tfvars b/...t_domains/config/ccbl_test_backend.tfvars → ...t_domains/config/ccbl_test_backend.tfvars
diff --git a/...ustom_domains/environment_domains/main.tf → ...aform/domains/environment_domains/main.tf b/...ustom_domains/environment_domains/main.tf → ...aform/domains/environment_domains/main.tf
diff --git a/...tom_domains/environment_domains/output.tf → ...orm/domains/environment_domains/output.tf b/...tom_domains/environment_domains/output.tf → ...orm/domains/environment_domains/output.tf
diff --git a/..._domains/environment_domains/terraform.tf → .../domains/environment_domains/terraform.tf b/..._domains/environment_domains/terraform.tf → .../domains/environment_domains/terraform.tf
diff --git a/..._domains/environment_domains/variables.tf → .../domains/environment_domains/variables.tf b/..._domains/environment_domains/variables.tf → .../domains/environment_domains/variables.tf
diff --git a/...omains/infrastructure/.terraform.lock.hcl → ...omains/infrastructure/.terraform.lock.hcl b/...omains/infrastructure/.terraform.lock.hcl → ...omains/infrastructure/.terraform.lock.hcl
diff --git a/...ns/infrastructure/config/ccbl.tfvars.json → ...ns/infrastructure/config/ccbl.tfvars.json b/...ns/infrastructure/config/ccbl.tfvars.json → ...ns/infrastructure/config/ccbl.tfvars.json
diff --git a/...infrastructure/config/ccbl_backend.tfvars → ...infrastructure/config/ccbl_backend.tfvars b/...infrastructure/config/ccbl_backend.tfvars → ...infrastructure/config/ccbl_backend.tfvars
diff --git a/...orm/custom_domains/infrastructure/main.tf → terraform/domains/infrastructure/main.tf b/...orm/custom_domains/infrastructure/main.tf → terraform/domains/infrastructure/main.tf
diff --git a/...ustom_domains/infrastructure/terraform.tf → ...aform/domains/infrastructure/terraform.tf b/...ustom_domains/infrastructure/terraform.tf → ...aform/domains/infrastructure/terraform.tf
diff --git a/...ustom_domains/infrastructure/variables.tf → ...aform/domains/infrastructure/variables.tf b/...ustom_domains/infrastructure/variables.tf → ...aform/domains/infrastructure/variables.tf
diff --git a/terraform/domains/infrastructure/vendor/modules/domains b/terraform/domains/infrastructure/vendor/modules/domains