Merge pull request #910 from DFE-Digital/replace-terrafile

Replace terrafile

.gitignore

@@ -34,7 +34,6 @@ fetch_config.rb
 terraform/application/vendor
 terraform/domains/infrastructure/vendor
 terraform/domains/environment_domains/vendor
-bin/terrafile
 
 # Active Storage folder
 storage/

Makefile

@@ -2,7 +2,6 @@
 SHELL := /bin/bash
 
 ### AKS ###
-TERRAFILE_VERSION = 0.8
 ARM_TEMPLATE_TAG = 1.1.10
 RG_TAGS = {"Product" : "Access Your Teaching Qualifications"}
 REGION = UK South
@@ -67,14 +66,14 @@ composed-variables: ## Compose variables needed for deployments
 	$(eval STORAGE_ACCOUNT_NAME=${AZURE_RESOURCE_PREFIX}${SERVICE_SHORT}${CONFIG_SHORT}tfsa)
 	$(eval LOG_ANALYTICS_WORKSPACE_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-log)
 
-bin/terrafile: ## Install terrafile to manage terraform modules
-	curl -sL https://github.com/coretech/terrafile/releases/download/v${TERRAFILE_VERSION}/terrafile_${TERRAFILE_VERSION}_$$(uname)_x86_64.tar.gz \
-		| tar xz -C ./bin terrafile
+.PHONY: vendor-modules
+vendor-modules:
+	rm -rf terraform/application/vendor/modules
+	git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/application/vendor/modules/aks
 
-terraform-init: composed-variables bin/terrafile set-azure-account ## Initialize terraform for AKS
+terraform-init: composed-variables vendor-modules set-azure-account ## Initialize terraform for AKS
 	$(if ${DOCKER_IMAGE_TAG}, , $(eval DOCKER_IMAGE_TAG=main))
 
-	./bin/terrafile -p terraform/application/vendor/modules -f terraform/application/config/$(CONFIG)_Terrafile
 	terraform -chdir=terraform/application init -upgrade -reconfigure \
 		-backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \
 		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
@@ -130,9 +129,13 @@ get-cluster-credentials: set-azure-account ## Get AKS cluster credentials
 	az aks get-credentials --overwrite-existing -g ${CLUSTER_RESOURCE_GROUP_NAME} -n ${CLUSTER_NAME}
 	kubelogin convert-kubeconfig -l $(if ${GITHUB_ACTIONS},spn,azurecli)
 
-domains-infra-init: bin/terrafile domains composed-variables set-azure-account
-	./bin/terrafile -p terraform/domains/infrastructure/vendor/modules -f terraform/domains/infrastructure/config/zones_Terrafile
+.PHONY: vendor-domain-infra-modules
+vendor-domain-infra-modules:
+	rm -rf terraform/domains/infrastructure/vendor/modules/domains
+	TERRAFORM_MODULES_TAG=stable
+	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
 
+domains-infra-init: domains composed-variables vendor-domain-infra-modules set-azure-account
 	terraform -chdir=terraform/domains/infrastructure init -reconfigure -upgrade \
 		-backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \
 		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
@@ -144,9 +147,12 @@ domains-infra-plan: domains domains-infra-init  ## Terraform plan for DNS infras
 domains-infra-apply: domains domains-infra-init  ## Terraform apply for DNS infrastructure (DNS zone and front door). Usage: make domains-infra-apply
 	terraform -chdir=terraform/domains/infrastructure apply -var-file config/zones.tfvars.json ${AUTO_APPROVE}
 
-domains-init: bin/terrafile domains composed-variables set-azure-account
-	./bin/terrafile -p terraform/domains/environment_domains/vendor/modules -f terraform/domains/environment_domains/config/${CONFIG}_Terrafile
+.PHONY: vendor-domain-modules
+vendor-domain-modules:
+	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
 
+domains-init: domains composed-variables vendor-domain-modules set-azure-account
 	terraform -chdir=terraform/domains/environment_domains init -upgrade -reconfigure \
 		-backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \
 		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \

global_config/preprod.sh

@@ -4,3 +4,4 @@ CONFIG_SHORT=pp
 AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
 AZURE_RESOURCE_PREFIX=s189t01
 KV_PURGE_PROTECTION=false
+TERRAFORM_MODULES_TAG=testing

global_config/production.sh

@@ -4,3 +4,4 @@ CONFIG_SHORT=pd
 AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production
 AZURE_RESOURCE_PREFIX=s189p01
 KV_PURGE_PROTECTION=true
+TERRAFORM_MODULES_TAG=stable

global_config/review.sh

@@ -3,3 +3,4 @@ CONFIG_SHORT=rv
 AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
 AZURE_RESOURCE_PREFIX=s189t01
 KV_PURGE_PROTECTION=false
+TERRAFORM_MODULES_TAG=main

global_config/test.sh

@@ -4,3 +4,4 @@ CONFIG_SHORT=ts
 AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
 AZURE_RESOURCE_PREFIX=s189t01
 KV_PURGE_PROTECTION=false
+TERRAFORM_MODULES_TAG=testing