Merge branch 'main' into UML-3121-dynamic-redirect-uri

ministryofjustice · Oct 31, 2023 · 18de379 · 18de379
2 parents f88dd04 + e12338d
commit 18de379
Show file tree

Hide file tree

Showing 26 changed files with 364 additions and 248 deletions.
diff --git a/service-front/app/languages/cy/LC_MESSAGES/messages.mo b/service-front/app/languages/cy/LC_MESSAGES/messages.mo
diff --git a/service-front/app/languages/cy/LC_MESSAGES/messages.po b/service-front/app/languages/cy/LC_MESSAGES/messages.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2023-10-12T09:26:27+00:00\n"
+"POT-Creation-Date: 2023-10-25T13:09:50+00:00\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -6456,6 +6456,17 @@ msgctxt "flashMessage"
 msgid "You've removed %donor%'s %lpaType% LPA"
 msgstr "Rydych wedi tynnu atwrneiaeth arhosol %donor% ar gyfer %lpaType%"
 
+#: src/Actor/templates/actor/view-lpa-summary.html.twig:170
+msgid ""
+"You cannot use a download or printout of this <abbr title=\"lasting power of "
+"attorney\">LPA</abbr> summary. Always use the original paper <abbr "
+"title=\"lasting power of attorney\">LPA</abbr> or give someone an access code."
+msgstr ""
+"Ni allwch ddefnyddio copi wedi’i lawrlwytho neu gopi wedi’i argraffu o’r "
+"crynodeb <abbr title=“atwrneiaeth arhosol”>LPA</abbr> hwn. Defnyddiwch fersiwn "
+"papur y <abbr title=“atwrneiaeth arhosol”>LPA</abbr>  neu rhowch god mynediad "
+"i rywun."
+
 #~ msgid ""
 #~ "If the scanned image is not readable, organisations may ask to see the "
 #~ "paper LPA so that they can find out what the instructions or preferences "

diff --git a/service-front/app/languages/messages.pot b/service-front/app/languages/messages.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Language: en_GB\n"
-"POT-Creation-Date: 2023-10-12T09:26:27+00:00\n"
+"POT-Creation-Date: 2023-10-25T13:09:50+00:00\n"
 "X-Domain: messages\n"
 
 #: src/Actor/templates/actor/activation-key-request-received.html.twig:12
@@ -4462,3 +4462,7 @@ msgstr ""
 msgctxt "flashMessage"
 msgid "You've removed %donor%'s %lpaType% LPA"
 msgstr ""
+
+#: src/Actor/templates/actor/view-lpa-summary.html.twig:170
+msgid "You cannot use a download or printout of this <abbr title=\"lasting power of attorney\">LPA</abbr> summary. Always use the original paper <abbr title=\"lasting power of attorney\">LPA</abbr> or give someone an access code."
+msgstr ""
diff --git a/service-front/app/src/Actor/templates/actor/view-lpa-summary.html.twig b/service-front/app/src/Actor/templates/actor/view-lpa-summary.html.twig
@@ -167,8 +167,7 @@
                 <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
                 <strong class="govuk-warning-text__text">
                     <span class="govuk-warning-text__assistive">{% trans %}Warning{% endtrans %}</span>
-                    {% trans %}You cannot use a download or print out of this <abbr title="lasting power of attorney">LPA</abbr> summary in place of the original paper
-                        <abbr title="lasting power of attorney">LPA</abbr> or instead of giving someone an access code.{% endtrans %}
+                    {% trans %}You cannot use a download or printout of this <abbr title="lasting power of attorney">LPA</abbr> summary. Always use the original paper <abbr title="lasting power of attorney">LPA</abbr> or give someone an access code.{% endtrans %}
                 </strong>
             </div>
             </p>

diff --git a/terraform/environment/cognito_client.tf b/terraform/environment/cognito_client.tf
@@ -41,8 +41,8 @@ resource "aws_cognito_user_pool_client" "use_a_lasting_power_of_attorney_admin"
   read_attributes        = []
   write_attributes       = []
 
-  callback_urls = ["https://${aws_route53_record.admin_use_my_lpa.fqdn}/oauth2/idpresponse"]
-  logout_urls   = ["https://${aws_route53_record.admin_use_my_lpa.fqdn}/"]
+  callback_urls = ["https://${module.eu_west_1.route53_fqdns.admin}/oauth2/idpresponse"]
+  logout_urls   = ["https://${module.eu_west_1.route53_fqdns.admin}/"]
 }
 
 moved {

diff --git a/terraform/environment/config_file.tf b/terraform/environment/config_file.tf
@@ -12,11 +12,11 @@ locals {
     viewer_codes_table                       = aws_dynamodb_table.viewer_codes_table.name
     user_lpa_actor_map                       = aws_dynamodb_table.user_lpa_actor_map.name
     stats_table                              = aws_dynamodb_table.stats_table.name
-    actor_fqdn                               = aws_route53_record.actor_use_my_lpa.fqdn
-    viewer_fqdn                              = aws_route53_record.viewer_use_my_lpa.fqdn
-    admin_fqdn                               = aws_route53_record.admin_use_my_lpa.fqdn
-    public_facing_use_fqdn                   = aws_route53_record.public_facing_use_lasting_power_of_attorney.fqdn
-    public_facing_view_fqdn                  = aws_route53_record.public_facing_view_lasting_power_of_attorney.fqdn
+    actor_fqdn                               = module.eu_west_1.route53_fqdns.actor
+    viewer_fqdn                              = module.eu_west_1.route53_fqdns.viewer
+    admin_fqdn                               = module.eu_west_1.route53_fqdns.admin
+    public_facing_use_fqdn                   = module.eu_west_1.route53_fqdns.public_facing_use
+    public_facing_view_fqdn                  = module.eu_west_1.route53_fqdns.public_facing_view
     viewer_load_balancer_security_group_name = module.eu_west_1.security_group_names.viewer_loadbalancer
     actor_load_balancer_security_group_name  = module.eu_west_1.security_group_names.actor_loadbalancer
 

diff --git a/terraform/environment/dns.tf b/terraform/environment/dns.tf
diff --git a/terraform/environment/dns_health_check.tf b/terraform/environment/dns_health_check.tf
diff --git a/terraform/environment/outputs.tf b/terraform/environment/outputs.tf
@@ -1,3 +1,11 @@
 output "admin_domain" {
-  value = module.eu_west_1.admin_domain
-}
+  value = "https://${module.eu_west_1.route53_fqdns.admin}"
+}
+
+output "public_facing_use_domain" {
+  value = "https://${module.eu_west_1.route53_fqdns.public_facing_use}"
+}
+
+output "public_facing_view_domain" {
+  value = "https://${module.eu_west_1.route53_fqdns.public_facing_view}"
+}
diff --git a/terraform/environment/refactor.tf b/terraform/environment/refactor.tf
@@ -871,3 +871,53 @@ moved {
   from = aws_wafv2_web_acl_association.viewer[0]
   to   = module.eu_west_1.aws_wafv2_web_acl_association.viewer[0]
 }
+
+moved {
+  from = aws_cloudwatch_metric_alarm.actor_health_check_alarm
+  to   = module.eu_west_1.module.actor_use_my_lpa.aws_cloudwatch_metric_alarm.this[0]
+}
+
+moved {
+  from = aws_cloudwatch_metric_alarm.viewer_health_check_alarm
+  to   = module.eu_west_1.module.viewer_use_my_lpa.aws_cloudwatch_metric_alarm.this[0]
+}
+
+moved {
+  from = aws_route53_health_check.actor_health_check
+  to   = module.eu_west_1.module.actor_use_my_lpa.aws_route53_health_check.this[0]
+}
+
+moved {
+  from = aws_route53_health_check.viewer_health_check
+  to   = module.eu_west_1.module.viewer_use_my_lpa.aws_route53_health_check.this[0]
+}
+
+moved {
+  from = aws_route53_record.actor_use_my_lpa
+  to   = module.eu_west_1.module.actor_use_my_lpa.aws_route53_record.this
+}
+
+moved {
+  from = aws_route53_record.admin_use_my_lpa
+  to   = module.eu_west_1.module.admin_use_my_lpa.aws_route53_record.this
+}
+
+moved {
+  from = aws_route53_record.public_facing_use_lasting_power_of_attorney
+  to   = module.eu_west_1.module.public_facing_use_lasting_power_of_attorney.aws_route53_record.this
+}
+
+moved {
+  from = aws_route53_record.public_facing_view_lasting_power_of_attorney
+  to   = module.eu_west_1.module.public_facing_view_lasting_power_of_attorney.aws_route53_record.this
+}
+
+moved {
+  from = aws_route53_record.viewer_use_my_lpa
+  to   = module.eu_west_1.module.viewer_use_my_lpa.aws_route53_record.this
+}
+
+moved {
+  from = aws_service_discovery_private_dns_namespace.internal_ecs
+  to   = module.eu_west_1.aws_service_discovery_private_dns_namespace.internal_ecs
+}
diff --git a/terraform/environment/region.tf b/terraform/environment/region.tf
@@ -5,11 +5,11 @@ module "eu_west_1" {
   admin_container_version                   = var.admin_container_version
   autoscaling                               = local.environment.autoscaling
   associate_alb_with_waf_web_acl_enabled    = local.environment.associate_alb_with_waf_web_acl_enabled
-  aws_service_discovery_service             = aws_service_discovery_private_dns_namespace.internal_ecs
   capacity_provider                         = local.capacity_provider
   container_version                         = var.container_version
   cookie_expires_use                        = local.environment.cookie_expires_use
   cookie_expires_view                       = local.environment.cookie_expires_view
+  dns_namespace_env                         = local.dns_namespace_env
   ecs_execution_role                        = module.iam.ecs_execution_role
   ecs_task_roles                            = module.iam.ecs_task_roles
   environment_name                          = local.environment_name
@@ -69,16 +69,9 @@ module "eu_west_1" {
     "delete_lpa_feature"                                         = local.environment.application_flags.delete_lpa_feature
   }
 
-  route_53_fqdns = {
-    "public_view" = aws_route53_record.public_facing_view_lasting_power_of_attorney.fqdn
-    "public_use"  = aws_route53_record.public_facing_use_lasting_power_of_attorney.fqdn
-    "admin"       = aws_route53_record.admin_use_my_lpa.fqdn
-    "actor"       = aws_route53_record.actor_use_my_lpa.fqdn
-    "viewer"      = aws_route53_record.viewer_use_my_lpa.fqdn
-  }
-
   providers = {
     aws.region     = aws.eu_west_1
     aws.management = aws.management
+    aws.us-east-1  = aws.us-east-1
   }
 }
diff --git a/terraform/environment/region/actor_ecs.tf b/terraform/environment/region/actor_ecs.tf
@@ -194,7 +194,7 @@ locals {
       environment = [
         {
           name  = "WEB_DOMAIN",
-          value = "https://${var.route_53_fqdns.public_use}"
+          value = "https://${local.route53_fqdns.public_facing_use}"
         },
         {
           name  = "APP_HOST",