Reomoved paas related code

DFE-Digital · Jan 4, 2024 · 65a245f · 65a245f
1 parent eb1f77e
commit 65a245f
Show file tree

Hide file tree

Showing 27 changed files with 3 additions and 554 deletions.
diff --git a/.github/common_environment.yml b/.github/common_environment.yml
@@ -1,11 +1,10 @@
   DOCKER_REPOSITORY:     ghcr.io/dfe-digital/get-teacher-training-adviser-service
   DOMAIN:                london.cloudapps.digital
   APPLICATION:           Teacher Training Adviser Service
-  PAAS_APPLICATION_NAME: get-teacher-training-adviser-service
+  AZURE_APPLICATION_NAME: get-teacher-training-adviser-service
   REVIEW_APPLICATION:    review-teacher-training-adviser
   SLACK_FAILURE:         '#ff0000'
   SLACK_SUCCESS:         '#00ff00'
   SLACK_ICON:            https://raw.githubusercontent.com//DFE-Digital/get-into-teaching-api/master/.github/image.png?size=48
   SLACK_USERNAME:        GiT Workflows
   SLACK_FOOTER:          Teacher Training Adviser Service
-
diff --git a/.github/workflows/actions/owasp/action.yml b/.github/workflows/actions/owasp/action.yml
@@ -47,6 +47,6 @@ runs:
         uses: rtCamp/action-slack-notify@master
         env:
            SLACK_COLOR: ${{env.SLACK_FAILURE}}
-           SLACK_MESSAGE: 'Pipeline Failure carrying out OWASP Testing on https://${{env.PAAS_APPLICATION_NAME}}-${{ inputs.environment }}.${{env.DOMAIN}}/'
+           SLACK_MESSAGE: 'Pipeline Failure carrying out OWASP Testing on https://${{env.AZURE_APPLICATION_NAME}}-${{ inputs.environment }}.${{env.DOMAIN}}/'
            SLACK_TITLE: 'Failure: OWSAP Testing has failed on ${{ inputs.environment }}'
            SLACK_WEBHOOK: ${{ steps.keyvault-yaml-secret.outputs.SLACK-WEBHOOK  }}
diff --git a/.github/workflows/destroy.yml b/.github/workflows/destroy.yml
diff --git a/Makefile b/Makefile
@@ -23,17 +23,6 @@ development:
 	$(eval export KEY_VAULT=s146d01-kv)
 	$(eval export AZURE_SUBSCRIPTION=s146-getintoteachingwebsite-development)
 
-.PHONY: review
-review:
-	$(if $(PR_NUMBER), , $(error Missing environment variable "PR_NUMBER", Please specify a pr number for your review app))
-	$(eval export PR_NAME=review-teacher-training-adviser-${PR_NUMBER})
-	$(eval export DEPLOY_ENV=review)
-	$(eval export TF_VAR_paas_adviser_application_name=${PR_NAME})
-	$(eval export KEY_VAULT=s146d01-kv)
-	$(eval export AZURE_SUBSCRIPTION=s146-getintoteachingwebsite-development)
-	$(eval BACKEND_KEY=-backend-config=key=${PR_NAME}.tfstate)
-	$(eval export TF_VAR_paas_adviser_route_name=${PR_NAME})
-
 .PHONY: test
 test:
 	$(eval export DEPLOY_ENV=test)
@@ -82,22 +71,6 @@ ci:
 	$(eval SKIP_AZURE_LOGIN=true)
 	$(eval SKIP_CONFIRM=true)
 
-terraform-init: set-azure-account
-	$(if $(or $(IMAGE_TAG), $(NO_IMAGE_TAG_DEFAULT)), , $(eval export IMAGE_TAG=master))
-	$(if $(IMAGE_TAG), , $(error Missing environment variable "IMAGE_TAG"))
-	$(eval export TF_VAR_paas_adviser_docker_image=ghcr.io/dfe-digital/get-teacher-training-adviser-service:$(IMAGE_TAG))
-
-	terraform -chdir=terraform/paas init -reconfigure -backend-config=${DEPLOY_ENV}.bk.vars ${BACKEND_KEY}
-
-terraform-plan: terraform-init
-	terraform -chdir=terraform/paas plan -var-file=${DEPLOY_ENV}.env.tfvars
-
-terraform: terraform-init
-	terraform -chdir=terraform/paas apply -var-file=${DEPLOY_ENV}.env.tfvars ${AUTO_APPROVE}
-
-terraform-destroy: terraform-init
-	terraform -chdir=terraform/paas destroy -var-file=${DEPLOY_ENV}.env.tfvars ${AUTO_APPROVE}
-
 delete-state-file:
 	az storage blob delete --container-name pass-tfstate --delete-snapshots include --account-name s146d01sgtfstate -n ${PR_NAME}.tfstate
 

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@
 - Dotenv (managing environment variables)
 - Dockerfile
 - CI based on GitHub Actions
-- Deployment utilising GovUK PAAS
+- Deployment utilising Azure
 
 ## Running specs, linter(without auto correct) and annotate models and serializers
 

diff --git a/terraform/paas/.terraform.lock.hcl b/terraform/paas/.terraform.lock.hcl
diff --git a/terraform/paas/application.tf b/terraform/paas/application.tf
diff --git a/terraform/paas/backend.tf b/terraform/paas/backend.tf
diff --git a/terraform/paas/data.tf b/terraform/paas/data.tf
diff --git a/terraform/paas/dev.bk.vars b/terraform/paas/dev.bk.vars
diff --git a/terraform/paas/dev.env.tfvars b/terraform/paas/dev.env.tfvars
diff --git a/terraform/paas/domain.tf b/terraform/paas/domain.tf
diff --git a/terraform/paas/network.tf b/terraform/paas/network.tf
diff --git a/terraform/paas/production.bk.vars b/terraform/paas/production.bk.vars
diff --git a/terraform/paas/production.env.tfvars b/terraform/paas/production.env.tfvars
diff --git a/terraform/paas/provider.tf b/terraform/paas/provider.tf
diff --git a/terraform/paas/review.bk.vars b/terraform/paas/review.bk.vars
diff --git a/terraform/paas/review.env.tfvars b/terraform/paas/review.env.tfvars