From 2ea8960798185ea29a6c1f08a0e7266bb1aa8027 Mon Sep 17 00:00:00 2001 From: John Ake Date: Thu, 25 Apr 2024 17:16:17 +0100 Subject: [PATCH] Add new trs domains --- .../domains/environment_domains/config/dev.tfvars.json | 4 ++-- terraform/domains/environment_domains/config/dev_Terrafile | 2 +- .../environment_domains/config/pre-production.tfvars.json | 4 ++-- .../environment_domains/config/pre-production_Terrafile | 2 +- .../environment_domains/config/production.tfvars.json | 6 +++--- .../domains/environment_domains/config/production_Terrafile | 2 +- .../domains/environment_domains/config/test.tfvars.json | 4 ++-- terraform/domains/environment_domains/config/test_Terrafile | 2 +- terraform/domains/environment_domains/main.tf | 3 ++- terraform/domains/environment_domains/variables.tf | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/terraform/domains/environment_domains/config/dev.tfvars.json b/terraform/domains/environment_domains/config/dev.tfvars.json index fbd74a73d2..61b6eeb0db 100644 --- a/terraform/domains/environment_domains/config/dev.tfvars.json +++ b/terraform/domains/environment_domains/config/dev.tfvars.json @@ -10,7 +10,7 @@ "origin_hostname": "trs-dev-api.test.teacherservices.cloud" }, "authorise-access-to-a-teaching-record.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "dev" @@ -19,7 +19,7 @@ "origin_hostname": "trs-dev-authz.test.teacherservices.cloud" }, "teaching-record-system.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "dev" diff --git a/terraform/domains/environment_domains/config/dev_Terrafile b/terraform/domains/environment_domains/config/dev_Terrafile index dfce270ef6..3701541660 100644 --- a/terraform/domains/environment_domains/config/dev_Terrafile +++ b/terraform/domains/environment_domains/config/dev_Terrafile @@ -1,3 +1,3 @@ domains: source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" + version: "refactor_custom_domain_module" diff --git a/terraform/domains/environment_domains/config/pre-production.tfvars.json b/terraform/domains/environment_domains/config/pre-production.tfvars.json index 406215e01a..ac8c7cb9a6 100644 --- a/terraform/domains/environment_domains/config/pre-production.tfvars.json +++ b/terraform/domains/environment_domains/config/pre-production.tfvars.json @@ -10,7 +10,7 @@ "origin_hostname": "trs-pre-production-api.test.teacherservices.cloud" }, "authorise-access-to-a-teaching-record.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "preprod" @@ -19,7 +19,7 @@ "origin_hostname": "trs-pre-production-authz.test.teacherservices.cloud" }, "teaching-record-system.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "preprod" diff --git a/terraform/domains/environment_domains/config/pre-production_Terrafile b/terraform/domains/environment_domains/config/pre-production_Terrafile index dfce270ef6..3701541660 100644 --- a/terraform/domains/environment_domains/config/pre-production_Terrafile +++ b/terraform/domains/environment_domains/config/pre-production_Terrafile @@ -1,3 +1,3 @@ domains: source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" + version: "refactor_custom_domain_module" diff --git a/terraform/domains/environment_domains/config/production.tfvars.json b/terraform/domains/environment_domains/config/production.tfvars.json index 5f71ae27a5..18812d0efb 100644 --- a/terraform/domains/environment_domains/config/production.tfvars.json +++ b/terraform/domains/environment_domains/config/production.tfvars.json @@ -10,7 +10,7 @@ "origin_hostname": "trs-production-api.teacherservices.cloud" }, "authorise-access-to-a-teaching-record.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "apex" @@ -19,13 +19,13 @@ "origin_hostname": "trs-production-authz.teacherservices.cloud" }, "teaching-record-system.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "apex" ], "environment_short": "pd", - "origin_hostname": " trs-production-ui.teacherservices.cloud" + "origin_hostname": "trs-production-ui.teacherservices.cloud" } } } diff --git a/terraform/domains/environment_domains/config/production_Terrafile b/terraform/domains/environment_domains/config/production_Terrafile index 58e60b3c88..3701541660 100644 --- a/terraform/domains/environment_domains/config/production_Terrafile +++ b/terraform/domains/environment_domains/config/production_Terrafile @@ -1,3 +1,3 @@ domains: source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" + version: "refactor_custom_domain_module" diff --git a/terraform/domains/environment_domains/config/test.tfvars.json b/terraform/domains/environment_domains/config/test.tfvars.json index 16d1ef76b5..bb214a0c30 100644 --- a/terraform/domains/environment_domains/config/test.tfvars.json +++ b/terraform/domains/environment_domains/config/test.tfvars.json @@ -10,7 +10,7 @@ "origin_hostname": "trs-test-api.test.teacherservices.cloud" }, "authorise-access-to-a-teaching-record.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "test" @@ -19,7 +19,7 @@ "origin_hostname": "trs-test-authz.test.teacherservices.cloud" }, "teaching-record-system.education.gov.uk": { - "front_door_name": "s189p01-trsdomains-fd", + "add_to_front_door": "s189p01-trsdomains-fd", "resource_group_name": "s189p01-trsdomains-rg", "domains": [ "test" diff --git a/terraform/domains/environment_domains/config/test_Terrafile b/terraform/domains/environment_domains/config/test_Terrafile index dfce270ef6..3701541660 100644 --- a/terraform/domains/environment_domains/config/test_Terrafile +++ b/terraform/domains/environment_domains/config/test_Terrafile @@ -1,3 +1,3 @@ domains: source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" + version: "refactor_custom_domain_module" diff --git a/terraform/domains/environment_domains/main.tf b/terraform/domains/environment_domains/main.tf index a8749b7650..710f0eda45 100644 --- a/terraform/domains/environment_domains/main.tf +++ b/terraform/domains/environment_domains/main.tf @@ -2,7 +2,8 @@ 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 + front_door_name = try(each.value.front_door_name, null) + add_to_front_door = try(each.value.add_to_front_door, null) resource_group_name = each.value.resource_group_name domains = each.value.domains environment = each.value.environment_short diff --git a/terraform/domains/environment_domains/variables.tf b/terraform/domains/environment_domains/variables.tf index ad63e546fd..83d5b55f23 100644 --- a/terraform/domains/environment_domains/variables.tf +++ b/terraform/domains/environment_domains/variables.tf @@ -1,4 +1,4 @@ variable "hosted_zone" { - type = map(any) + //type = map(any) default = {} }