Merge pull request #60 from NHSDigital/feature/CCM-9371_Fixes

Feature/ccm 9371 fixes

Author: jamesthompson26-nhs

.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

.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
 
 
 # ==============================================================================

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

infrastructure/modules/s3bucket/README.md

@@ -4,7 +4,9 @@
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
 ## Inputs
 
 | Name | Description | Type | Default | Required |

infrastructure/modules/s3bucket/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 1.9.0"
+}

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
 }
 
 # ==============================================================================