Remove unused variables and fix default values for domains

DFE-Digital · Feb 20, 2024 · d23ac28 · d23ac28
1 parent ad85759
commit d23ac28
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_preproduction.tfvars.json
@@ -1,5 +1,4 @@
 {
-  "enable_alerting": false,
   "hosted_zone": {
     "check-the-childrens-barred-list.education.gov.uk": {
       "front_door_name": "s189p01-ccbl-edu-domains-fd",
@@ -8,7 +7,6 @@
       "cached_paths": ["/assets/*"],
       "environment_short": "pp",
       "origin_hostname": "check-childrens-barred-list-preproduction.test.teacherservices.cloud",
-      "null_host_header": true,
       "cnames": {}
     }
   }

diff --git a/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_production.tfvars.json
@@ -1,5 +1,4 @@
 {
-  "enable_alerting": false,
   "hosted_zone": {
     "check-the-childrens-barred-list.education.gov.uk": {
       "front_door_name": "s189p01-ccbl-edu-domains-fd",
@@ -8,7 +7,6 @@
       "cached_paths": ["/assets/*"],
       "environment_short": "pd",
       "origin_hostname": "check-childrens-barred-list-production.teacherservices.cloud",
-      "null_host_header": true,
       "cnames": {},
       "redirect_rules": [
         {

diff --git a/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json b/terraform/custom_domains/environment_domains/config/ccbl_test.tfvars.json
@@ -1,5 +1,4 @@
 {
-  "enable_alerting": false,
   "hosted_zone": {
     "check-the-childrens-barred-list.education.gov.uk": {
       "front_door_name": "s189p01-ccbl-edu-domains-fd",
@@ -8,7 +7,6 @@
       "cached_paths": ["/assets/*"],
       "environment_short": "test",
       "origin_hostname": "check-childrens-barred-list-test.test.teacherservices.cloud",
-      "null_host_header": true,
       "cnames": {}
     }
   }

diff --git a/terraform/custom_domains/environment_domains/main.tf b/terraform/custom_domains/environment_domains/main.tf
@@ -8,9 +8,9 @@ module "domains" {
   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)
+  null_host_header      = true
   cached_paths          = try(each.value.cached_paths, [])
-  redirect_rules        = try(each.value.redirect_rules, [])
+  redirect_rules        = try(each.value.redirect_rules, null)
 }
 
 # Takes values from hosted_zone.domain_name.cnames (or txt_records, a-records). Use for domains which are not associated with front door.