Merge pull request #29 from NHSDigital/feature/CCM-5100-suggested-fixes

CCM-5100: Backport suggested changes to template repo

Author: RossBugginsNHS

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # NHS Notify Code Owners
 
 # Notify default owners
-* @rossbugginsnhs @m-houston @edmundcraske2-nhs @timireland
+* @rossbugginsnhs @m-houston @aidenvaines-bjss @timireland
 
 # Codeowners must be final check
 /.github/CODEOWNERS @NHSDigital/nhs-notify-code-owners

.github/actions/lint-terraform/action.yaml

@@ -16,5 +16,6 @@ runs:
       run: |
         stacks=${{ inputs.root-modules }}
         for dir in $(find infrastructure/environments -maxdepth 1 -mindepth 1 -type d; echo ${stacks//,/$'\n'}); do
+          dir=$dir opts='-backend=false' make terraform-init
           dir=$dir make terraform-validate
         done

.tool-versions

@@ -1,6 +1,6 @@
 # This file is for you! Please, updated to the versions agreed by your team.
 
-terraform 1.7.0
+terraform 1.9.1
 pre-commit 3.6.0
 nodejs 18.18.2
 gitleaks 8.18.4

.vscode/settings.json

@@ -10,11 +10,6 @@
     "**/Thumbs.db": true,
     ".devcontainer": true,
     ".github": true,
-    ".vscode": false,
-    "docs": true,
-    "infrastructure": true,
-    "scripts": true,
-    "terraform": true,
-    "tests": true
+    ".vscode": false
   }
 }

scripts/config/pre-commit.yaml

@@ -19,28 +19,28 @@ repos:
     hooks:
       - id: scan-secrets
         name: Scan secrets
-        entry: /bin/env check=whole-history ./scripts/githooks/scan-secrets.sh
+        entry: /usr/bin/env check=whole-history ./scripts/githooks/scan-secrets.sh
         language: script
         pass_filenames: false
   - repo: local
     hooks:
       - id: check-file-format
         name: Check file format
-        entry: /bin/env check=staged-changes ./scripts/githooks/check-file-format.sh
+        entry: /usr/bin/env check=branch ./scripts/githooks/check-file-format.sh
         language: script
         pass_filenames: false
   - repo: local
     hooks:
       - id: check-markdown-format
         name: Check Markdown format
-        entry: /bin/env check=staged-changes ./scripts/githooks/check-markdown-format.sh
+        entry: /usr/bin/env check=branch ./scripts/githooks/check-markdown-format.sh
         language: script
         pass_filenames: false
   - repo: local
     hooks:
       - id: check-english-usage
         name: Check English usage
-        entry: /bin/env check=staged-changes ./scripts/githooks/check-english-usage.sh
+        entry: /usr/bin/env check=branch ./scripts/githooks/check-english-usage.sh
         language: script
         pass_filenames: false
   - repo: local

scripts/config/vale/styles/Vocab/words/accept.txt

@@ -23,3 +23,4 @@ endfor
 drawio
 rawContent
 endcapture
+Cognito

scripts/git-repo/branch-protection.md

@@ -1,8 +1,8 @@
-# Github
+# GitHub
 
 ## Branch Protection Rules
 
-This will create the default branch protection rules using Github API.
+This will create the default branch protection rules using GitHub API.
 
 ```sh
 ./branch-protection.sh $reponame $PAT

scripts/terraform/terraform.mk

@@ -47,8 +47,8 @@ clean:: # Remove Terraform files (terraform) - optional: terraform_dir|dir=[path
 
 _terraform: # Terraform command wrapper - mandatory: cmd=[command to execute]; optional: dir=[path to a directory where the command will be executed, relative to the project's top-level directory, default is one of the module variables or the example directory, if not set], opts=[options to pass to the Terraform command, default is none/empty]
 	dir=$(or ${dir}, ${TERRAFORM_STACK})
-	source scripts/terraform/terraform.lib.sh
-	terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set
+	. scripts/terraform/terraform.lib.sh && \
+		terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set
 
 # ==============================================================================
 # Quality checks - please DO NOT edit this section!