Merge pull request #5723 from ministryofjustice/oasys-non-compatibility

oasys non compatibility
ministryofjustice · Apr 15, 2024 · 11a111b · 11a111b
2 parents da11817 + 2d1db53
commit 11a111b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 31 deletions.
diff --git a/terraform/environments/oasys/locals_preproduction.tf b/terraform/environments/oasys/locals_preproduction.tf
@@ -357,24 +357,24 @@ locals {
             protocol                  = "HTTPS"
             ssl_policy                = "ELBSecurityPolicy-2016-08"
             certificate_names_or_arns = ["pp_${local.application_name}_cert"]
-            # default_action = {
-            #   type = "redirect"
-            #   redirect = {
-            #     host        = "pp-int.oasys.service.justice.gov.uk"
-            #     port        = "443"
-            #     protocol    = "HTTPS"
-            #     status_code = "HTTP_301"
-            #   }
-            # }
             default_action = {
-              type = "fixed-response"
-              fixed_response = {
-                content_type = "text/plain"
-                message_body = "use pp-int.oasys.service.justice.gov.uk"
-                status_code  = "200"
+              type = "redirect"
+              redirect = {
+                host        = "pp-int.oasys.service.justice.gov.uk"
+                port        = "443"
+                protocol    = "HTTPS"
+                status_code = "HTTP_302"
               }
             }
             # default_action = {
+            #   type = "fixed-response"
+            #   fixed_response = {
+            #     content_type = "text/plain"
+            #     message_body = "use pp-int.oasys.service.justice.gov.uk"
+            #     status_code  = "200"
+            #   }
+            # }
+            # default_action = {
             #   type              = "forward"
             #   target_group_name = "pp-${local.application_name}-web-a-pv-http-8080"
             # }
@@ -391,7 +391,7 @@ locals {
                       values = [
                         "pp-int.oasys.service.justice.gov.uk",
                         "pp-a-int.oasys.service.justice.gov.uk",
-                        "pp-oasys.az.justice.gov.uk",
+                        #"pp-oasys.az.justice.gov.uk",
                         "oasys-ukwest.pp-oasys.az.justice.gov.uk",
                       ]
                     }

diff --git a/terraform/environments/oasys/locals_production.tf b/terraform/environments/oasys/locals_production.tf
@@ -559,23 +559,23 @@ locals {
             protocol                  = "HTTPS"
             ssl_policy                = "ELBSecurityPolicy-2016-08"
             certificate_names_or_arns = ["pd_${local.application_name}_cert"]
-            default_action = {
-              type = "fixed-response"
-              fixed_response = {
-                content_type = "text/plain"
-                message_body = "use int.oasys.service.justice.gov.uk, or for practice ptc-int.oasys.service.justice.gov.uk, or for training trn-int.oasys.service.justice.gov.uk"
-                status_code  = "200"
-              }
-            }
             # default_action = {
-            #   type = "redirect"
-            #   redirect = {
-            #     host        = "int.oasys.service.justice.gov.uk"
-            #     port        = "443"
-            #     protocol    = "HTTPS"
-            #     status_code = "HTTP_301"
+            #   type = "fixed-response"
+            #   fixed_response = {
+            #     content_type = "text/plain"
+            #     message_body = "use int.oasys.service.justice.gov.uk, or for practice ptc-int.oasys.service.justice.gov.uk, or for training trn-int.oasys.service.justice.gov.uk"
+            #     status_code  = "200"
             #   }
             # }
+            default_action = {
+              type = "redirect"
+              redirect = {
+                host        = "int.oasys.service.justice.gov.uk"
+                port        = "443"
+                protocol    = "HTTPS"
+                status_code = "HTTP_302"
+              }
+            }
             # default_action = {
             #   type              = "forward"
             #   target_group_name = "pd-${local.application_name}-web-a-pv-http-8080"
@@ -593,7 +593,7 @@ locals {
                       values = [
                         "int.oasys.service.justice.gov.uk",
                         "oasys-ukwest.oasys.az.justice.gov.uk",
-                        "oasys.az.justice.gov.uk",
+                        # "oasys.az.justice.gov.uk",
                         "p-oasys.az.justice.gov.uk",
                       ]
                     }

diff --git a/terraform/environments/oasys/locals_security_groups.tf b/terraform/environments/oasys/locals_security_groups.tf
@@ -43,7 +43,8 @@ locals {
       module.ip_addresses.moj_cidrs.trusted_moj_digital_staff_public,
       module.ip_addresses.moj_cidr.aws_cloud_platform_vpc, # "172.20.0.0/16"
       module.ip_addresses.external_cidrs.cloud_platform,
-      module.ip_addresses.azure_studio_hosting_public.prod
+      module.ip_addresses.azure_studio_hosting_public.prod,
+      "10.0.0.0/8"
     ])
     oracle_db = flatten([
       module.ip_addresses.moj_cidr.aws_cloud_platform_vpc,