diff --git a/Makefile b/Makefile index 4ecd0eeb7..e72aa5652 100644 --- a/Makefile +++ b/Makefile @@ -23,91 +23,6 @@ ci: ## Run in automation environment $(eval SP_AUTH=true) $(eval SKIP_AZURE_LOGIN=true) -set-azure-resource-group-tags: ##Tags that will be added to resource group on it's creation in ARM template - $(eval RG_TAGS=$(shell echo '{"Portfolio": "Early Years and Schools Group", "Parent Business":"Teacher Misconduct Unit", "Product" : "Refer Serious Misconduct", "Service Line": "Teaching Workforce", "Service": "Teacher Training and Qualifications", "Service Offering": "Refer Serious Misconduct", "Environment" : "$(ENV_TAG)"}' | jq . )) - -set-azure-template-tag: - $(eval ARM_TEMPLATE_TAG=1.1.0) - -.PHONY: read-keyvault-config -read-keyvault-config: - $(eval KEY_VAULT_NAME=$(shell jq -r '.key_vault_name' terraform/workspace_variables/$(DEPLOY_ENV).tfvars.json)) - $(eval KEY_VAULT_SECRET_NAME=INFRASTRUCTURE) - -read-deployment-config: - $(eval POSTGRES_DATABASE_NAME="$(RESOURCE_NAME_PREFIX)-rsm-$(DEPLOY_ENV)${var.app_suffix}-psql-db") - $(eval POSTGRES_SERVER_NAME="$(RESOURCE_NAME_PREFIX)-rsm-$(DEPLOY_ENV)${var.app_suffix}-psql.postgres.database.azure.com") - -##@ Query parameter store to display environment variables. Requires Azure credentials -set-azure-account: ${environment} - echo "Logging on to ${AZURE_SUBSCRIPTION}" - az account set -s ${AZURE_SUBSCRIPTION} - -.PHONY: install-fetch-config -install-fetch-config: ## Install the fetch-config script, for viewing/editing secrets in Azure Key Vault - [ ! -f bin/fetch_config.rb ] \ - && curl -s https://raw.githubusercontent.com/DFE-Digital/bat-platform-building-blocks/master/scripts/fetch_config/fetch_config.rb -o bin/fetch_config.rb \ - && chmod +x bin/fetch_config.rb \ - || true - -edit-keyvault-secret: read-keyvault-config install-fetch-config set-azure-account - bin/fetch_config.rb -s azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} \ - -e -d azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} -f yaml -c - -create-keyvault-secret: read-keyvault-config install-fetch-config set-azure-account - bin/fetch_config.rb -s azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} \ - -i -e -d azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} -f yaml -c - -print-keyvault-secret: read-keyvault-config install-fetch-config set-azure-account - bin/fetch_config.rb -s azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} -f yaml - -validate-keyvault-secret: read-keyvault-config install-fetch-config set-azure-account - bin/fetch_config.rb -s azure-key-vault-secret:${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} -d quiet \ - && echo Data in ${KEY_VAULT_NAME}/${KEY_VAULT_SECRET_NAME} looks valid - -terraform-init: - $(if $(IMAGE_TAG), , $(eval export IMAGE_TAG=main)) - [[ "${SP_AUTH}" != "true" ]] && az account set -s $(AZURE_SUBSCRIPTION) || true - terraform -chdir=terraform init -backend-config workspace_variables/${DEPLOY_ENV}.backend.tfvars $(backend_config) -upgrade -reconfigure - -terraform-plan: terraform-init - terraform -chdir=terraform plan -var-file workspace_variables/${DEPLOY_ENV}.tfvars.json - -terraform-apply: terraform-init - terraform -chdir=terraform apply -var-file workspace_variables/${DEPLOY_ENV}.tfvars.json ${AUTO_APPROVE} - -terraform-destroy: terraform-init - terraform -chdir=terraform destroy -var-file workspace_variables/${DEPLOY_ENV}.tfvars.json ${AUTO_APPROVE} - -deploy-azure-resources: set-azure-account set-azure-template-tag set-azure-resource-group-tags# make dev deploy-azure-resources AUTO_APPROVE=1 - $(if $(AUTO_APPROVE), , $(error can only run with AUTO_APPROVE)) - az deployment sub create --name "resourcedeploy-rsm-$(shell date +%Y%m%d%H%M%S)" -l "West Europe" --template-uri "https://raw.githubusercontent.com/DFE-Digital/tra-shared-services/${ARM_TEMPLATE_TAG}/azure/resourcedeploy.json" \ - --parameters "resourceGroupName=${RESOURCE_NAME_PREFIX}-rsm-${ENV_SHORT}-rg" 'tags=${RG_TAGS}' \ - "tfStorageAccountName=${RESOURCE_NAME_PREFIX}rsmtfstate${ENV_SHORT}" "tfStorageContainerName=rsm-tfstate" \ - "dbBackupStorageAccountName=${AZURE_BACKUP_STORAGE_ACCOUNT_NAME}" "dbBackupStorageContainerName=${AZURE_BACKUP_STORAGE_CONTAINER_NAME}" \ - "keyVaultName=${RESOURCE_NAME_PREFIX}-rsm-${ENV_SHORT}-kv" - -validate-azure-resources: set-azure-account set-azure-template-tag set-azure-resource-group-tags# make dev validate-azure-resources - az deployment sub create --name "resourcedeploy-rsm-$(shell date +%Y%m%d%H%M%S)" -l "West Europe" --template-uri "https://raw.githubusercontent.com/DFE-Digital/tra-shared-services/${ARM_TEMPLATE_TAG}/azure/resourcedeploy.json" \ - --parameters "resourceGroupName=${RESOURCE_NAME_PREFIX}-rsm-${ENV_SHORT}-rg" 'tags=${RG_TAGS}' \ - "tfStorageAccountName=${RESOURCE_NAME_PREFIX}rsmtfstate${ENV_SHORT}" "tfStorageContainerName=rsm-tfstate" \ - "dbBackupStorageAccountName=${AZURE_BACKUP_STORAGE_ACCOUNT_NAME}" "dbBackupStorageContainerName=${AZURE_BACKUP_STORAGE_CONTAINER_NAME}" \ - "keyVaultName=${RESOURCE_NAME_PREFIX}-rsm-${ENV_SHORT}-kv" \ - --what-if - -domain-azure-resources: set-azure-account set-azure-template-tag set-azure-resource-group-tags# make domain domain-azure-resources AUTO_APPROVE=1 - $(if $(AUTO_APPROVE), , $(error can only run with AUTO_APPROVE)) - az deployment sub create -l "West Europe" --template-uri "https://raw.githubusercontent.com/DFE-Digital/tra-shared-services/${ARM_TEMPLATE_TAG}/azure/resourcedeploy.json" \ - --parameters "resourceGroupName=${RESOURCE_NAME_PREFIX}-rsmdomains-rg" 'tags=${RG_TAGS}' "environment=${DEPLOY_ENV}" \ - "tfStorageAccountName=${RESOURCE_NAME_PREFIX}rsmdomainstf" "tfStorageContainerName=rsmdomains-tf" "keyVaultName=${RESOURCE_NAME_PREFIX}-rsmdomains-kv" - -az-console: set-azure-account - az container exec \ - --name=${RESOURCE_NAME_PREFIX}-rsm-${NAME_ENV}-wkr-cg \ - --resource-group=${RESOURCE_NAME_PREFIX}-rsm-${RESOURCE_ENV}-rg \ - --exec-command="bundle exec rails c ${CONSOLE_OPTIONS}-- --noautocomplete" - -# AKS make config .PHONY: aks-review aks-review: test-cluster $(if ${PR_NUMBER},,$(error Missing PR_NUMBER)) diff --git a/README.md b/README.md index ffa6f2309..6a427de95 100644 --- a/README.md +++ b/README.md @@ -238,7 +238,6 @@ You'll also need to configure your editor's `solargraph` plugin to + "solargraph.useBundler": true, ``` - ### PDF generation The service use Grover to generate PDF files. This uses the node module 'puppeteer' and headless Chrome on the server.