issue 168 & 171 fixes

NHSDigital · Jul 24, 2024 · 0a7bd81 · 0a7bd81
1 parent 437e1a4
commit 0a7bd81
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,9 +1,10 @@
 # This file is for you! Please, updated to the versions agreed by your team.
 
-terraform 1.9.1
-pre-commit 3.6.0
-nodejs 18.18.2
 gitleaks 8.18.4
+nodejs 18.18.2
+pre-commit 3.6.0
+terraform 1.9.1
+vale 3.6.0
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.
@@ -17,7 +18,7 @@ gitleaks 8.18.4
 # 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/Vocab/words/accept.txt
@@ -1,21 +1,3 @@
-Bitwarden
-Cyber
-Dependabot
-Gitleaks
-Grype
-OAuth
-Octokit
-Podman
-Python
-Syft
-Terraform
-Trufflehog
-bot
-idempotence
-onboarding
-sed
-toolchain
-[A-Z]+s
 GitHub
 endraw
 draw.io

diff --git a/scripts/config/vale/styles/Vocab/words/reject.txt b/scripts/config/vale/styles/Vocab/words/reject.txt
@@ -1 +0,0 @@
-python

diff --git a/scripts/docker/docker.mk b/scripts/docker/docker.mk
@@ -22,7 +22,7 @@ _docker: # Docker command wrapper - mandatory: cmd=[command to execute]; optiona
 	# 'DOCKER_IMAGE' and 'DOCKER_TITLE' are passed to the functions as environment variables
 	DOCKER_IMAGE=$(or ${DOCKER_IMAGE}, $(or ${docker_image}, $(or ${IMAGE}, $(or ${image}, ghcr.io/org/repo))))
 	DOCKER_TITLE=$(or "${DOCKER_TITLE}", $(or "${docker_title}", $(or "${TITLE}", $(or "${title}", "Service Docker image"))))
-	source scripts/docker/docker.lib.sh
+	. "scripts/docker/docker.lib.sh"
 	dir=$(realpath ${dir})
 	docker-${cmd} # 'dir' is accessible by the function as environment variable
 
@@ -41,7 +41,7 @@ docker-test-suite-run: # Run Docker test suite @ExamplesAndTests
 	scripts/docker/tests/docker.test.sh
 
 docker-example-build: # Build Docker example @ExamplesAndTests
-	source scripts/docker/docker.lib.sh
+	. "scripts/docker/docker.lib.sh"
 	cd scripts/docker/examples/python
 	DOCKER_IMAGE=repository-template/docker-example-python
 	DOCKER_TITLE="Repository Template Docker Python Example"
@@ -53,7 +53,7 @@ docker-example-lint: # Lint Docker example @ExamplesAndTests
 	file=$${dockerfile} scripts/docker/dockerfile-linter.sh
 
 docker-example-run: # Run Docker example @ExamplesAndTests
-	source scripts/docker/docker.lib.sh
+	. "scripts/docker/docker.lib.sh"
 	cd scripts/docker/examples/python
 	DOCKER_IMAGE=repository-template/docker-example-python
 	args=" \
@@ -63,7 +63,7 @@ docker-example-run: # Run Docker example @ExamplesAndTests
 	docker-run
 
 docker-example-clean: # Remove Docker example resources @ExamplesAndTests
-	source scripts/docker/docker.lib.sh
+	. "scripts/docker/docker.lib.sh"
 	cd scripts/docker/examples/python
 	DOCKER_IMAGE=repository-template/docker-example-python
 	docker-clean

diff --git a/scripts/init.mk b/scripts/init.mk
@@ -7,7 +7,7 @@ include scripts/tests/test.mk
 # ==============================================================================
 
 runner-act: # Run GitHub Actions locally - mandatory: workflow=[workflow file name], job=[job name] @Development
-	source ./scripts/docker/docker.lib.sh
+	. "./scripts/docker/docker.lib.sh"
 	act $(shell [[ "${VERBOSE}" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$$ ]] && echo --verbose) \
 		--container-architecture linux/amd64 \
 		--platform ubuntu-latest=$$(name="ghcr.io/nhs-england-tools/github-runner-image" docker-get-image-version-and-pull) \
@@ -21,7 +21,7 @@ runner-act: # Run GitHub Actions locally - mandatory: workflow=[workflow file na
 		--job ${job}
 
 version-create-effective-file: # Create effective version file - optional: dir=[path to the VERSION file to use, default is '.'], BUILD_DATETIME=[build date and time in the '%Y-%m-%dT%H:%M:%S%z' format generated by the CI/CD pipeline, default is current date and time] @Development
-	source scripts/docker/docker.lib.sh
+	. "scripts/docker/docker.lib.sh"
 	version-create-effective-file
 
 shellscript-lint-all: # Lint all shell scripts in this project, do not fail on error, just print the error messages @Quality