From 2998cbcb8d311eac08d5b3656d34f6721e383e65 Mon Sep 17 00:00:00 2001 From: aidenvaines-bjss Date: Mon, 14 Oct 2024 15:08:55 +0100 Subject: [PATCH 1/3] CCM-7074 fixing globally user pool domain --- .../components/app/cognito_user_pool_domain custom.tf | 7 +++++++ .../components/app/cognito_user_pool_domain.tf | 10 +--------- 2 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 infrastructure/terraform/components/app/cognito_user_pool_domain custom.tf diff --git a/infrastructure/terraform/components/app/cognito_user_pool_domain custom.tf b/infrastructure/terraform/components/app/cognito_user_pool_domain custom.tf new file mode 100644 index 0000000..9a7570a --- /dev/null +++ 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/infrastructure/terraform/components/app/cognito_user_pool_domain.tf b/infrastructure/terraform/components/app/cognito_user_pool_domain.tf index fe991d3..55b54a7 100644 --- 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 } From 5f4895f0ca3ba54319caf32d38af7a3416693165 Mon Sep 17 00:00:00 2001 From: aidenvaines-bjss Date: Mon, 14 Oct 2024 16:26:53 +0100 Subject: [PATCH 2/3] Upgrade Vale --- .tool-versions | 2 +- .../styles/{Vocab => config/vocabularies}/words/accept.txt | 5 +++++ .../styles/{Vocab => config/vocabularies}/words/reject.txt | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename scripts/config/vale/styles/{Vocab => config/vocabularies}/words/accept.txt (80%) rename scripts/config/vale/styles/{Vocab => config/vocabularies}/words/reject.txt (100%) diff --git a/.tool-versions b/.tool-versions index b5dd39d..3483d5b 100644 --- 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/scripts/config/vale/styles/Vocab/words/accept.txt b/scripts/config/vale/styles/config/vocabularies/words/accept.txt similarity index 80% rename from scripts/config/vale/styles/Vocab/words/accept.txt rename to scripts/config/vale/styles/config/vocabularies/words/accept.txt index a895c39..797ee07 100644 --- a/scripts/config/vale/styles/Vocab/words/accept.txt +++ b/scripts/config/vale/styles/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/scripts/config/vale/styles/Vocab/words/reject.txt b/scripts/config/vale/styles/config/vocabularies/words/reject.txt similarity index 100% rename from scripts/config/vale/styles/Vocab/words/reject.txt rename to scripts/config/vale/styles/config/vocabularies/words/reject.txt From c23c7cbc3430262137186c8cb9b13c539da897aa Mon Sep 17 00:00:00 2001 From: aidenvaines-bjss Date: Mon, 14 Oct 2024 16:27:56 +0100 Subject: [PATCH 3/3] CCM-7074 fixing globally user pool domain --- ...r_pool_domain custom.tf => cognito_user_pool_domain_custom.tf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename infrastructure/terraform/components/app/{cognito_user_pool_domain custom.tf => cognito_user_pool_domain_custom.tf} (100%) diff --git a/infrastructure/terraform/components/app/cognito_user_pool_domain custom.tf b/infrastructure/terraform/components/app/cognito_user_pool_domain_custom.tf similarity index 100% rename from infrastructure/terraform/components/app/cognito_user_pool_domain custom.tf rename to infrastructure/terraform/components/app/cognito_user_pool_domain_custom.tf