Skip to content

Commit

Permalink
Merge pull request #29 from NHSDigital/feature/CCM-5100-suggested-fixes
Browse files Browse the repository at this point in the history
CCM-5100: Backport suggested changes to template repo
RossBugginsNHS authored Jul 10, 2024
2 parents 94a1050 + fd8a7b8 commit ca43476
Showing 8 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
This CODEOWNERS file is valid.
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .github/actions/lint-terraform/action.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -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
7 changes: 1 addition & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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
}
}
8 changes: 4 additions & 4 deletions scripts/config/pre-commit.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions scripts/config/vale/styles/Vocab/words/accept.txt
Original file line number Diff line number Diff line change
@@ -23,3 +23,4 @@ endfor
drawio
rawContent
endcapture
Cognito
4 changes: 2 additions & 2 deletions scripts/git-repo/branch-protection.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions scripts/terraform/terraform.mk
Original file line number Diff line number Diff line change
@@ -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!

0 comments on commit ca43476

Please sign in to comment.