From 317ab7e038f8e7a01fd3cbf0f76b24a91cc1e3d3 Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Thu, 23 May 2024 15:01:30 +0100 Subject: [PATCH] Remove production and test config --- global_config/domains.sh | 4 ---- global_config/production.sh | 6 ------ global_config/test.sh | 6 ------ .../application/config/production.tfvars.json | 10 ---------- .../application/config/production_Terrafile | 3 --- terraform/application/config/test.tfvars.json | 6 ------ terraform/application/config/test_Terrafile | 3 --- .../config/production.tfvars.json | 12 ------------ .../config/production_Terrafile | 3 --- .../config/test.tfvars.json | 12 ------------ .../environment_domains/config/test_Terrafile | 3 --- terraform/domains/environment_domains/main.tf | 13 ------------- .../domains/environment_domains/terraform.tf | 19 ------------------- .../domains/environment_domains/variables.tf | 4 ---- .../infrastructure/config/zones.tfvars.json | 11 ----------- .../infrastructure/config/zones_Terrafile | 3 --- terraform/domains/infrastructure/main.tf | 5 ----- terraform/domains/infrastructure/terraform.tf | 19 ------------------- terraform/domains/infrastructure/variables.tf | 7 ------- 19 files changed, 149 deletions(-) delete mode 100644 global_config/domains.sh delete mode 100644 global_config/production.sh delete mode 100644 global_config/test.sh delete mode 100644 terraform/application/config/production.tfvars.json delete mode 100644 terraform/application/config/production_Terrafile delete mode 100644 terraform/application/config/test.tfvars.json delete mode 100644 terraform/application/config/test_Terrafile delete mode 100644 terraform/domains/environment_domains/config/production.tfvars.json delete mode 100644 terraform/domains/environment_domains/config/production_Terrafile delete mode 100644 terraform/domains/environment_domains/config/test.tfvars.json delete mode 100644 terraform/domains/environment_domains/config/test_Terrafile delete mode 100644 terraform/domains/environment_domains/main.tf delete mode 100644 terraform/domains/environment_domains/terraform.tf delete mode 100644 terraform/domains/environment_domains/variables.tf delete mode 100644 terraform/domains/infrastructure/config/zones.tfvars.json delete mode 100644 terraform/domains/infrastructure/config/zones_Terrafile delete mode 100644 terraform/domains/infrastructure/main.tf delete mode 100644 terraform/domains/infrastructure/terraform.tf delete mode 100644 terraform/domains/infrastructure/variables.tf diff --git a/global_config/domains.sh b/global_config/domains.sh deleted file mode 100644 index a7b7641875..0000000000 --- a/global_config/domains.sh +++ /dev/null @@ -1,4 +0,0 @@ -AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production -AZURE_RESOURCE_PREFIX=s189p01 -CONFIG_SHORT=dom -DISABLE_KEYVAULTS=true diff --git a/global_config/production.sh b/global_config/production.sh deleted file mode 100644 index 0a122077b3..0000000000 --- a/global_config/production.sh +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG=production -ENVIRONMENT=production -CONFIG_SHORT=pd -AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production -AZURE_RESOURCE_PREFIX=s189p01 -ENABLE_KV_DIAGNOSTICS=true diff --git a/global_config/test.sh b/global_config/test.sh deleted file mode 100644 index ad8eae4807..0000000000 --- a/global_config/test.sh +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG=test -ENVIRONMENT=test -CONFIG_SHORT=ts -AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test -AZURE_RESOURCE_PREFIX=s189t01 -KV_PURGE_PROTECTION=false diff --git a/terraform/application/config/production.tfvars.json b/terraform/application/config/production.tfvars.json deleted file mode 100644 index c91ef09893..0000000000 --- a/terraform/application/config/production.tfvars.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "cluster": "production", - "namespace": "srtl-production", - "environment": "production", - "canonical_hostname": "claim-additional-payments-for-teaching-production.teacherservices.cloud", - "enable_postgres_backup_storage": true, - "enable_monitoring": true, - "external_url": "https://claim-additional-teaching-payment.service.gov.uk/healthcheck", - "statuscake_contact_groups": [282453] -} diff --git a/terraform/application/config/production_Terrafile b/terraform/application/config/production_Terrafile deleted file mode 100644 index 5b2b118f00..0000000000 --- a/terraform/application/config/production_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" diff --git a/terraform/application/config/test.tfvars.json b/terraform/application/config/test.tfvars.json deleted file mode 100644 index 3257f5f887..0000000000 --- a/terraform/application/config/test.tfvars.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "cluster": "test", - "namespace": "srtl-test", - "environment": "test", - "canonical_hostname": "claim-additional-payments-for-teaching-test.test.teacherservices.cloud" -} diff --git a/terraform/application/config/test_Terrafile b/terraform/application/config/test_Terrafile deleted file mode 100644 index b4c222c13d..0000000000 --- a/terraform/application/config/test_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" diff --git a/terraform/domains/environment_domains/config/production.tfvars.json b/terraform/domains/environment_domains/config/production.tfvars.json deleted file mode 100644 index bb37dcca10..0000000000 --- a/terraform/domains/environment_domains/config/production.tfvars.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "hosted_zone": { - "claim-additional-teaching-payment.service.gov.uk": { - "front_door_name": "#FRONT_DOOR_NAME#", - "resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#", - "domains": ["apex"], - "cached_paths": ["/assets/*"], - "environment_short": "pd", - "origin_hostname": "claim-additional-payments-for-teaching-production.teacherservices.cloud" - } - } -} diff --git a/terraform/domains/environment_domains/config/production_Terrafile b/terraform/domains/environment_domains/config/production_Terrafile deleted file mode 100644 index 58e60b3c88..0000000000 --- a/terraform/domains/environment_domains/config/production_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" diff --git a/terraform/domains/environment_domains/config/test.tfvars.json b/terraform/domains/environment_domains/config/test.tfvars.json deleted file mode 100644 index ec5ad7b7c6..0000000000 --- a/terraform/domains/environment_domains/config/test.tfvars.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "hosted_zone": { - "claim-additional-teaching-payment.service.gov.uk": { - "front_door_name": "#FRONT_DOOR_NAME#", - "resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#", - "domains": ["test"], - "cached_paths": ["/assets/*"], - "environment_short": "test", - "origin_hostname": "claim-additional-payments-for-teaching-test.test.teacherservices.cloud" - } - } -} diff --git a/terraform/domains/environment_domains/config/test_Terrafile b/terraform/domains/environment_domains/config/test_Terrafile deleted file mode 100644 index dfce270ef6..0000000000 --- a/terraform/domains/environment_domains/config/test_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" diff --git a/terraform/domains/environment_domains/main.tf b/terraform/domains/environment_domains/main.tf deleted file mode 100644 index 96beb730ab..0000000000 --- a/terraform/domains/environment_domains/main.tf +++ /dev/null @@ -1,13 +0,0 @@ -# Used to create domains to be managed by front door. -module "domains" { - for_each = var.hosted_zone - source = "./vendor/modules/domains//domains/environment_domains" - zone = each.key - front_door_name = each.value.front_door_name - resource_group_name = each.value.resource_group_name - domains = each.value.domains - environment = each.value.environment_short - host_name = each.value.origin_hostname - null_host_header = try(each.value.null_host_header, false) - cached_paths = try(each.value.cached_paths, []) -} diff --git a/terraform/domains/environment_domains/terraform.tf b/terraform/domains/environment_domains/terraform.tf deleted file mode 100644 index 0fb333955c..0000000000 --- a/terraform/domains/environment_domains/terraform.tf +++ /dev/null @@ -1,19 +0,0 @@ -terraform { - - required_version = "= 1.6.4" - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = "3.82.0" - } - } - backend "azurerm" { - container_name = "terraform-state" - } -} - -provider "azurerm" { - features {} - - skip_provider_registration = true -} diff --git a/terraform/domains/environment_domains/variables.tf b/terraform/domains/environment_domains/variables.tf deleted file mode 100644 index ad63e546fd..0000000000 --- a/terraform/domains/environment_domains/variables.tf +++ /dev/null @@ -1,4 +0,0 @@ -variable "hosted_zone" { - type = map(any) - default = {} -} diff --git a/terraform/domains/infrastructure/config/zones.tfvars.json b/terraform/domains/infrastructure/config/zones.tfvars.json deleted file mode 100644 index fe0910df0a..0000000000 --- a/terraform/domains/infrastructure/config/zones.tfvars.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "hosted_zone": { - "claim-additional-teaching-payment.service.gov.uk": { - "caa_records": {}, - "txt_records": {}, - "resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#", - "front_door_name": "#FRONT_DOOR_NAME#" - } - }, - "deploy_default_records": false -} diff --git a/terraform/domains/infrastructure/config/zones_Terrafile b/terraform/domains/infrastructure/config/zones_Terrafile deleted file mode 100644 index 58e60b3c88..0000000000 --- a/terraform/domains/infrastructure/config/zones_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" diff --git a/terraform/domains/infrastructure/main.tf b/terraform/domains/infrastructure/main.tf deleted file mode 100644 index da091f5e16..0000000000 --- a/terraform/domains/infrastructure/main.tf +++ /dev/null @@ -1,5 +0,0 @@ -module "domains_infrastructure" { - source = "./vendor/modules/domains//domains/infrastructure" - hosted_zone = var.hosted_zone - deploy_default_records = var.deploy_default_records -} diff --git a/terraform/domains/infrastructure/terraform.tf b/terraform/domains/infrastructure/terraform.tf deleted file mode 100644 index 65b9162e88..0000000000 --- a/terraform/domains/infrastructure/terraform.tf +++ /dev/null @@ -1,19 +0,0 @@ -terraform { - required_version = "= 1.6.4" - - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = "3.82.0" - } - } - backend "azurerm" { - container_name = "terraform-state" - } -} - -provider "azurerm" { - features {} - - skip_provider_registration = true -} diff --git a/terraform/domains/infrastructure/variables.tf b/terraform/domains/infrastructure/variables.tf deleted file mode 100644 index 8d91472066..0000000000 --- a/terraform/domains/infrastructure/variables.tf +++ /dev/null @@ -1,7 +0,0 @@ -variable "hosted_zone" { - type = map(any) -} - -variable "deploy_default_records" { - default = true -}