From 041a751cf0b7c04447b885f55397894f4edc8dab Mon Sep 17 00:00:00 2001 From: Colin Saliceti Date: Wed, 11 Dec 2024 15:34:40 +0000 Subject: [PATCH] Remove unused doman CNAME records They were only required for GOV.UK PaaS --- .../environment_domains/main.tf | 6 ---- .../apply_pentest.tfvars.json | 28 ++----------------- .../apply_production.tfvars.json | 20 ++----------- .../workspace_variables/apply_qa.tfvars.json | 20 ++----------- .../apply_sandbox.tfvars.json | 20 ++----------- .../apply_staging.tfvars.json | 20 ++----------- 6 files changed, 10 insertions(+), 104 deletions(-) diff --git a/terraform/custom_domains/environment_domains/main.tf b/terraform/custom_domains/environment_domains/main.tf index 534e7a87922..68eee43d6b4 100644 --- a/terraform/custom_domains/environment_domains/main.tf +++ b/terraform/custom_domains/environment_domains/main.tf @@ -12,9 +12,3 @@ module "domains" { null_host_header = try(each.value.null_host_header, false) cached_paths = try(each.value.cached_paths, []) } - -# Takes values from hosted_zone.domain_name.cnames (or txt_records, a-records). Use for domains which are not associated with front door. -module "dns_records" { - source = "git::https://github.com/DFE-Digital/terraform-modules.git//dns/records?ref=0.5.2" - hosted_zone = var.hosted_zone -} diff --git a/terraform/custom_domains/environment_domains/workspace_variables/apply_pentest.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/apply_pentest.tfvars.json index d107a13fe44..85ae7a16d2a 100644 --- a/terraform/custom_domains/environment_domains/workspace_variables/apply_pentest.tfvars.json +++ b/terraform/custom_domains/environment_domains/workspace_variables/apply_pentest.tfvars.json @@ -12,17 +12,7 @@ ], "environment_short": "pt", "origin_hostname": "apply-pen.london.cloudapps.digital", - "null_host_header": true, - "cnames": { - "_2591fbd3d4123185e000682b4c838bd0.pen-assets": { - "target": "_809c702dd45db95700825b993d095227.mvtxpqxpkb.acm-validations.aws", - "ttl": 86400 - }, - "_49618458e8b8d5047b31de62563fd8bb.pen": { - "target": "_4456d705baa45a5964503ebaa5ab14d7.mvtxpqxpkb.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true }, "apply-for-teacher-training.service.gov.uk": { "front_door_name": "s189p01-apply-svc-domains-fd", @@ -35,21 +25,7 @@ ], "environment_short": "pt", "origin_hostname": "apply-pen.london.cloudapps.digital", - "null_host_header": true, - "cnames": { - "pen-assets": { - "target": "dxhwikmjcbucp.cloudfront.net", - "ttl": 300 - }, - "_581c4a3ec7fe8f4b4715a15fcb3cc19c.pen-assets": { - "target": "_8f9050178afd4cc9bc6c2d16b1ef335b.mvtxpqxpkb.acm-validations.aws", - "ttl": 86400 - }, - "_c1ae00f2b52295d00f3760ee62eef561.pen": { - "target": "_31e7fb3a77e73ffa9646267e19e9aa08.mvtxpqxpkb.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true } } } diff --git a/terraform/custom_domains/environment_domains/workspace_variables/apply_production.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/apply_production.tfvars.json index ffddaeb48fb..75db0b89246 100644 --- a/terraform/custom_domains/environment_domains/workspace_variables/apply_production.tfvars.json +++ b/terraform/custom_domains/environment_domains/workspace_variables/apply_production.tfvars.json @@ -16,13 +16,7 @@ ], "environment_short": "pd", "origin_hostname": "apply-production.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_4543fa06c424e9f27d11f7fbcc365308.www": { - "target": "_f5f9cc82aae8a4237d22a44cbfb95119.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true }, "apply-for-teacher-training.service.gov.uk": { "front_door_name": "s189p01-apply-svc-domains-fd", @@ -35,17 +29,7 @@ ], "environment_short": "pd", "origin_hostname": "apply-production.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_6f431f2e0c7d110cd894fcca4c91ba0f.assets": { - "target": "_737dd0de6042e4c502646e7641008d9d.gwpjclltnz.acm-validations.aws", - "ttl": 86400 - }, - "_b1b5c70fa670699c7e96fc6bc285cc4b.www": { - "target": "_10ceec39b7b9b6f93131d0d9e9ac3a4c.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true } } } diff --git a/terraform/custom_domains/environment_domains/workspace_variables/apply_qa.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/apply_qa.tfvars.json index f18d3006274..ed5802f415b 100644 --- a/terraform/custom_domains/environment_domains/workspace_variables/apply_qa.tfvars.json +++ b/terraform/custom_domains/environment_domains/workspace_variables/apply_qa.tfvars.json @@ -14,13 +14,7 @@ ], "environment_short": "qa", "origin_hostname": "apply-qa.test.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_20376ff68e78b33802641a0fb5889553.qa": { - "target": "_de9e1b635132fa1d1be8ac835db32219.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true }, "apply-for-teacher-training.service.gov.uk": { "front_door_name": "s189p01-apply-svc-domains-fd", @@ -33,17 +27,7 @@ ], "environment_short": "qa", "origin_hostname": "apply-qa.test.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_9527eeb2b6fd1423f4fcc8967b68b0e4.qa-assets": { - "target": "_f19cab8c22f1dd7d7f35328463d55490.gwpjclltnz.acm-validations.aws", - "ttl": 86400 - }, - "_4de0d15d287933d3185448456765dbad.qa": { - "target": "_586bdf6bff29ff8a721078ed87dcbc10.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true } } } diff --git a/terraform/custom_domains/environment_domains/workspace_variables/apply_sandbox.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/apply_sandbox.tfvars.json index ae0d525f58d..0491eaf0ab6 100644 --- a/terraform/custom_domains/environment_domains/workspace_variables/apply_sandbox.tfvars.json +++ b/terraform/custom_domains/environment_domains/workspace_variables/apply_sandbox.tfvars.json @@ -14,13 +14,7 @@ ], "environment_short": "sbx", "origin_hostname": "apply-sandbox.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_229b8d2191ea3cbe7ddd6ce57066bd83.sandbox": { - "target": "_072f14fced703e7b0f5a514df5c97fdf.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true }, "apply-for-teacher-training.service.gov.uk": { "front_door_name": "s189p01-apply-svc-domains-fd", @@ -33,17 +27,7 @@ ], "environment_short": "sbx", "origin_hostname": "apply-sandbox.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_030987ad117861a978cc345483658da4.sandbox-assets": { - "target": "_780dc56ef3289e5257ff7b71bc912fe3.gwpjclltnz.acm-validations.aws", - "ttl": 86400 - }, - "_240370c345c6449ea0f019d17ad45b0e.sandbox": { - "target": "_eb78c4241ddbdb81c43ffc174c2d0b40.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true } } } diff --git a/terraform/custom_domains/environment_domains/workspace_variables/apply_staging.tfvars.json b/terraform/custom_domains/environment_domains/workspace_variables/apply_staging.tfvars.json index 1386532e58d..667ea80d826 100644 --- a/terraform/custom_domains/environment_domains/workspace_variables/apply_staging.tfvars.json +++ b/terraform/custom_domains/environment_domains/workspace_variables/apply_staging.tfvars.json @@ -16,13 +16,7 @@ ], "environment_short": "stg", "origin_hostname": "apply-staging.test.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_1d4b1f5476af8d39d1661df9e6d7e63e.staging": { - "target": "_5a3f2a4df63ba5e370e6036e7757f323.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true }, "apply-for-teacher-training.service.gov.uk": { "front_door_name": "s189p01-apply-svc-domains-fd", @@ -35,17 +29,7 @@ ], "environment_short": "stg", "origin_hostname": "apply-staging.test.teacherservices.cloud", - "null_host_header": true, - "cnames": { - "_829232a7a8d7b8feb96f04e168b309a3.staging-assets": { - "target": "_cb8025b2433e4e200440af49798b0811.gwpjclltnz.acm-validations.aws", - "ttl": 86400 - }, - "_5b4d5b584c2120b1a977ec93d64580b0.staging": { - "target": "_6c257c0fff3b6426ce3e75937fc7c077.bbfvkzsszw.acm-validations.aws", - "ttl": 86400 - } - } + "null_host_header": true } } }