Merge pull request #74 from NHSDigital/aiva2/CCM-7074_fixUniqueDomain…

…String CCM-7074 fixing globally user pool domain
NHSDigital · Oct 14, 2024 · ae3b5d5 · ae3b5d5
2 parents debe1f9 + c23c7cb
commit ae3b5d5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -19,7 +19,7 @@ tfsec 1.28.10
 # docker/ghcr.io/nhs-england-tools/github-runner-image 20230909-321fd1e-rt@sha256:ce4fd6035dc450a50d3cbafb4986d60e77cb49a71ab60a053bb1b9518139a646 # SEE: https://github.com/nhs-england-tools/github-runner-image/pkgs/container/github-runner-image
 # docker/hadolint/hadolint 2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 # SEE: https://hub.docker.com/r/hadolint/hadolint/tags
 # docker/hashicorp/terraform 1.5.6@sha256:180a7efa983386a27b43657ed610e9deed9e6c3848d54f9ea9b6cb8a5c8c25f5 # SEE: https://hub.docker.com/r/hashicorp/terraform/tags
-# docker/jdkato/vale v2.29.7@sha256:5ccfac574231b006284513ac3e4e9f38833989d83f2a68db149932c09de85149 # SEE: https://hub.docker.com/r/jdkato/vale/tags
+# docker/jdkato/vale v3.6.0@sha256:0ef22c8d537f079633cfff69fc46f69a2196072f69cab1ab232e8a79a388e425 # SEE: https://hub.docker.com/r/jdkato/vale/tags
 # docker/koalaman/shellcheck latest@sha256:e40388688bae0fcffdddb7e4dea49b900c18933b452add0930654b2dea3e7d5c # SEE: https://hub.docker.com/r/koalaman/shellcheck/tags
 # docker/mstruebing/editorconfig-checker 2.7.1@sha256:dd3ca9ea50ef4518efe9be018d669ef9cf937f6bb5cfe2ef84ff2a620b5ddc24 # SEE: https://hub.docker.com/r/mstruebing/editorconfig-checker/tags
 # docker/sonarsource/sonar-scanner-cli 5.0.1@sha256:494ecc3b5b1ee1625bd377b3905c4284e4f0cc155cff397805a244dee1c7d575 # SEE: https://hub.docker.com/r/sonarsource/sonar-scanner-cli/tags
diff --git a/infrastructure/terraform/components/app/cognito_user_pool_domain.tf b/infrastructure/terraform/components/app/cognito_user_pool_domain.tf
@@ -1,12 +1,4 @@
 resource "aws_cognito_user_pool_domain" "main" {
   user_pool_id = aws_cognito_user_pool.main.id
-  domain       = local.csi
-}
-
-resource "aws_cognito_user_pool_domain" "custom" {
-  user_pool_id    = aws_cognito_user_pool.main.id
-  certificate_arn = aws_acm_certificate.cognito.arn
-  domain          = local.auth_domain_name
-
-  depends_on = [aws_route53_record.root]
+  domain       = local.csi_global
 }
diff --git a/infrastructure/terraform/components/app/cognito_user_pool_domain_custom.tf b/infrastructure/terraform/components/app/cognito_user_pool_domain_custom.tf
@@ -0,0 +1,7 @@
+resource "aws_cognito_user_pool_domain" "custom" {
+  user_pool_id    = aws_cognito_user_pool.main.id
+  certificate_arn = aws_acm_certificate.cognito.arn
+  domain          = local.auth_domain_name
+
+  depends_on = [aws_route53_record.root]
+}
diff --git a/...config/vale/styles/Vocab/words/accept.txt → ...yles/config/vocabularies/words/accept.txt b/...config/vale/styles/Vocab/words/accept.txt → ...yles/config/vocabularies/words/accept.txt
@@ -4,7 +4,12 @@ bot
 config
 Cyber
 Dependabot
+draw.io
+drawio
+endfor
+endraw
 env
+GitHub
 Gitleaks
 Grype
 idempotence

diff --git a/...config/vale/styles/Vocab/words/reject.txt → ...yles/config/vocabularies/words/reject.txt b/...config/vale/styles/Vocab/words/reject.txt → ...yles/config/vocabularies/words/reject.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,12 @@ bot @@
     config
     Cyber
     Dependabot
+    draw.io
+    drawio
+    endfor
+    endraw
     env
+    GitHub
     Gitleaks
     Grype
     idempotence
@@ Expand Down @@