From e1954c9d565ab18eda523df36f971ebd062c62ec Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 15:49:31 +0100 Subject: [PATCH 1/6] CCM-9063: Mandatory Platform Review --- infrastructure/modules/s3bucket/versions.tf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 infrastructure/modules/s3bucket/versions.tf diff --git a/infrastructure/modules/s3bucket/versions.tf b/infrastructure/modules/s3bucket/versions.tf new file mode 100644 index 0000000..5fba18d --- /dev/null +++ b/infrastructure/modules/s3bucket/versions.tf @@ -0,0 +1,10 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.50" + } + } + + required_version = ">= 1.9.0" +} From bc5db44bd98202903d4d02dc1e5c17e8fdbd428f Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 15:50:19 +0100 Subject: [PATCH 2/6] CCM-9371: S3 Web Gateway Deployment Issues Fix --- infrastructure/modules/s3bucket/versions.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure/modules/s3bucket/versions.tf b/infrastructure/modules/s3bucket/versions.tf index 5fba18d..3e3e4e6 100644 --- a/infrastructure/modules/s3bucket/versions.tf +++ b/infrastructure/modules/s3bucket/versions.tf @@ -8,3 +8,4 @@ terraform { required_version = ">= 1.9.0" } + From bf6ebed1d2274026157f9ff4e120bbb8dfbed6e3 Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 15:50:39 +0100 Subject: [PATCH 3/6] CCM-9371: S3 Web Gateway Deployment Issues Fix --- infrastructure/modules/s3bucket/versions.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/infrastructure/modules/s3bucket/versions.tf b/infrastructure/modules/s3bucket/versions.tf index 3e3e4e6..5fba18d 100644 --- a/infrastructure/modules/s3bucket/versions.tf +++ b/infrastructure/modules/s3bucket/versions.tf @@ -8,4 +8,3 @@ terraform { required_version = ">= 1.9.0" } - From 2ed386dedc5de3fcf83e007449557c429518e59e Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 15:53:55 +0100 Subject: [PATCH 4/6] CCM-9371: S3 Web Gateway Deployment Issues Fix --- infrastructure/modules/s3bucket/versions.tf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/infrastructure/modules/s3bucket/versions.tf b/infrastructure/modules/s3bucket/versions.tf index 5fba18d..3737619 100644 --- a/infrastructure/modules/s3bucket/versions.tf +++ b/infrastructure/modules/s3bucket/versions.tf @@ -1,10 +1,8 @@ terraform { required_providers { aws = { - source = "hashicorp/aws" - version = "~> 5.50" + source = "hashicorp/aws" } } - required_version = ">= 1.9.0" } From 444171fb4b558c166e36a77ebfef7429be550104 Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 16:02:31 +0100 Subject: [PATCH 5/6] CCM-9371: S3 Web Gateway Deployment Issues Fix --- .tool-versions | 1 + docs/Gemfile.lock | 9 +++++++-- infrastructure/modules/s3bucket/README.md | 4 +++- scripts/githooks/check-terraform-docs.sh | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.tool-versions b/.tool-versions index 25a6db3..0044d71 100644 --- a/.tool-versions +++ b/.tool-versions @@ -7,6 +7,7 @@ nodejs 18.18.2 gitleaks 8.18.4 tfsec 1.28.10 terraform-docs 0.19.0 +vale 3.6.0 # ============================================================================== diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index d252aed..8a99b57 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -29,6 +29,7 @@ GEM ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) + google-protobuf (3.25.5-arm64-darwin) google-protobuf (3.25.5-x86_64-linux) html-pipeline (2.14.3) activesupport (>= 2) @@ -90,6 +91,8 @@ GEM jekyll-seo-tag (~> 2.1) minitest (5.24.1) mutex_m (0.2.0) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) pathutil (0.16.2) @@ -103,9 +106,10 @@ GEM rexml (3.3.9) rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.69.5) + sass-embedded (1.69.5-arm64-darwin) + google-protobuf (~> 3.23) + sass-embedded (1.69.5-x86_64-linux-gnu) google-protobuf (~> 3.23) - rake (>= 13.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) @@ -114,6 +118,7 @@ GEM webrick (1.8.1) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES diff --git a/infrastructure/modules/s3bucket/README.md b/infrastructure/modules/s3bucket/README.md index feae135..8563dad 100644 --- a/infrastructure/modules/s3bucket/README.md +++ b/infrastructure/modules/s3bucket/README.md @@ -4,7 +4,9 @@ ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >= 1.9.0 | ## Inputs | Name | Description | Type | Default | Required | diff --git a/scripts/githooks/check-terraform-docs.sh b/scripts/githooks/check-terraform-docs.sh index 69210ce..e49cc42 100755 --- a/scripts/githooks/check-terraform-docs.sh +++ b/scripts/githooks/check-terraform-docs.sh @@ -27,7 +27,7 @@ function main() { function terraform-docs() { make terraform-docs - git add infrastructure/terraform/**/*.md + git add infrastructure/modules/**/*.md } # ============================================================================== From bd368d6c200876b629a2de83a4bf40853b426e90 Mon Sep 17 00:00:00 2001 From: jamesthompson26-nhs Date: Thu, 3 Apr 2025 16:03:58 +0100 Subject: [PATCH 6/6] CCM-9371: S3 Web Gateway Deployment Issues Fix --- .github/workflows/stage-1-commit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stage-1-commit.yaml b/.github/workflows/stage-1-commit.yaml index 72070af..b83d89a 100644 --- a/.github/workflows/stage-1-commit.yaml +++ b/.github/workflows/stage-1-commit.yaml @@ -83,7 +83,7 @@ jobs: make terraform-docs - name: "Stage changes" run: | - git add infrastructure/terraform/**/*.md + git add infrastructure/modules/**/*.md - name: "Check for changes in Terraform Docs" run: | if git diff --cached --name-only | grep -qE '\.md$'; then