Merge pull request #108 from DFE-Digital/619-onboarding-new-service-f…

…ixes

[619] new_service template fixes

documentation/onboard-service.md

@@ -46,8 +46,8 @@ Then login to Azure using `az login`.
 ### Create terraform environment
 This creates the minimum Azure resources required to run terraform, ie storage account and keyvaults.
 
-- Validate: `make <environment config> validate-azure-resources`. Example: `make development validate-azure-resources`
-- Deploy: `make <environment config> deploy-azure-resources`. Example: `make development deploy-azure-resources`
+- Validate: `make <environment config> validate-arm-resources`. Example: `make development validate-arm-resources`
+- Deploy: `make <environment config> deploy-arm-resources`. Example: `make development deploy-arm-resources`
 
 ### Configure Statuscake credentials
 If Statuscake is not required at this stage, comment out resources in `terraform/application/statuscake.tf` and the provider in `terraform/application/terraform.tf`.
@@ -68,8 +68,8 @@ The new application uses a default domain in `test.teacherservices.cloud` in tes
 The code deploys integrated DNS zone and Azure front door **in the production subscription**.
 
 ### Create terraform environment
-- Validate: `make domains validate-azure-resources`
-- Deploy: `make domains deploy-azure-resources`
+- Validate: `make domains validate-arm-resources`
+- Deploy: `make domains deploy-arm-resources`
 
 ### Deploy infrastructure
 This deploys one DNS zone and one front door which will be used subsequently by all the domains.

templates/new_service/Makefile

@@ -79,7 +79,7 @@ deploy-arm-resources: arm-deployment ## Validate ARM resource deployment. Usage:
 
 validate-arm-resources: set-what-if arm-deployment ## Validate ARM resource deployment. Usage: make domains validate-arm-resources
 
-domains-infra-init: bin/terrafile composed-variables domains set-azure-account
+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
 
 	terraform -chdir=terraform/domains/infrastructure init -reconfigure -upgrade \
@@ -93,7 +93,7 @@ domains-infra-plan: domains domains-infra-init  ## Terraform plan for DNS infras
 domains-infra-apply: domains domains-infra-init  ## Terraform apply for DNS infrastructure (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 composed-variables domains set-azure-account
+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
 
 	terraform -chdir=terraform/domains/environment_domains init -upgrade -reconfigure \