Merge pull request #7641 from ministryofjustice/RST-6829-tribunals-de…

…legate-dns-patch Fix logic of using substring to split the www_instances by removing th…
ministryofjustice · Aug 30, 2024 · 3c8aaf4 · 3c8aaf4
2 parents d5f1069 + b4804b2
commit 3c8aaf4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/terraform/environments/tribunals/dns-delegate-route53.tf b/terraform/environments/tribunals/dns-delegate-route53.tf
@@ -44,8 +44,7 @@ locals {
     "www.consumercreditappeals",
     "www.estateagentappeals",
     "www.fhsaa",
-    "www.siac",
-    "www"
+    "www.siac"
   ]
 
   production_zone_id = data.aws_route53_zone.production_zone.zone_id
@@ -99,7 +98,21 @@ resource "aws_route53_record" "www_instances" {
   type    = "A"
 
   alias {
-    name                   = substr(local.www_records[count.index], 4, -1)
+    name                   = format("%s.tribunals.gov.uk",substr(local.www_records[count.index], 4, -1))
+    zone_id                = local.production_zone_id
+    evaluate_target_health = false
+  }
+}
+
+#  The root www resource record needs its own resource to avoid breaking the logic of using the substring in www_instances
+resource "aws_route53_record" "www_root" {
+  provider = aws.core-network-services
+  zone_id = local.production_zone_id
+  name    = "www"
+  type    = "A"
+
+  alias {
+    name                   = "tribunals.gov.uk"
     zone_id                = local.production_zone_id
     evaluate_target_health = false
   }

diff --git a/terraform/environments/tribunals/platform_data.tf b/terraform/environments/tribunals/platform_data.tf
@@ -3,6 +3,8 @@ data "aws_region" "current" {}
 
 data "aws_caller_identity" "current" {}
 
+
+
 # VPC and subnet data
 data "aws_vpc" "shared" {
   tags = {

diff --git a/terraform/environments/tribunals/platform_providers.tf b/terraform/environments/tribunals/platform_providers.tf
@@ -56,3 +56,8 @@ provider "aws" {
     role_arn = "arn:aws:iam::${local.environment_management.aws_organizations_root_account_id}:role/ModernisationPlatformSSOReadOnly"
   }
 }
+# Configure the GitHub Provider to use 6.2.2 (6.2.3 seems to have a  bug)
+# https://github.com/integrations/terraform-provider-github/issues/2357
+provider "github" {
+  version = "6.2.2"
+}