Improve make config behaviour

.tool-versions

@@ -1,9 +1,11 @@
-nodejs 18.17.1 # Always check AWS and Azure runtime support
-python 3.11.4 # Always check AWS and Azure runtime support
+nodejs 18.18.0 # Always check AWS and Azure runtime support
+python 3.11.5 # Always check AWS and Azure runtime support
 poetry 1.6.1
 yarn 1.22.19
-terraform 1.5.6
-pre-commit 3.3.3
+terraform 1.5.7
+pre-commit 3.4.0
+
+# asdf v0.13.1 0586b37d03031ae8c3110ea2b51cacaad46c7cdc
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.

README.md

@@ -21,12 +21,12 @@ Make use of this repository template to expedite your project setup and enhance
   - [Table of Contents](#table-of-contents)
   - [Setup](#setup)
     - [Prerequisites](#prerequisites)
-    - [Installation](#installation)
+    - [Configuration](#configuration)
   - [Usage](#usage)
     - [Testing](#testing)
   - [Architecture](#architecture)
     - [Diagrams](#diagrams)
-    - [Configuration](#configuration)
+    - [Configuration](#configuration-1)
   - [Contributing](#contributing)
   - [Contacts](#contacts)
   - [Licence](#licence)
@@ -44,12 +44,13 @@ cd nhs-england-tools/repository-template
 
 ### Prerequisites
 
-The following software packages or their equivalents are expected to be installed
+The following software packages, or their equivalents, are expected to be installed:
 
-- [GNU make](https://www.gnu.org/software/make/) **v3.82 or later: OS X users, take note below**
 - [Docker](https://www.docker.com/)
+- [GNU make](https://www.gnu.org/software/make/) 3.82 or later (macOS users, please see the note below).
+- [GNU coreutils](https://www.gnu.org/software/coreutils/) and [GNU binutils](https://www.gnu.org/software/binutils/) may be required to build dependencies like Python, which may need to be compiled during installation. For macOS users, this has been scripted and automated by the `dotfiles` project; please see this [script](https://github.com/nhs-england-tools/dotfiles/blob/main/assets/20-install-base-packages.macos.sh) for details.
 
-Note that the version of GNU Make available by default on OS X is earlier than this.  You will need to upgrade it, or certain `make` tasks will fail.  On OS X, you will need [homebrew](https://brew.sh/) installed, then to install `make`, like so:
+Note that the version of GNU Make available by default on macOS is earlier than this. You will need to upgrade it or certain `make` tasks will fail. On macOS, you will need [homebrew](https://brew.sh/) installed, then to install `make`, like so:
 
 ```shell
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
@@ -59,20 +60,14 @@ brew install make
 You will then see instructions to fix your `$PATH` variable to make the newly installed version available.
 If you are using [dotfiles](https://github.com/nhs-england-tools/dotfiles), this is all done for you.
 
-### Installation
+### Configuration
 
-Install and configure toolchain dependencies
+Installation and configuration of the toolchain dependencies
 
 ```shell
 make config
 ```
 
-If this repository is
-
-```shell
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/org/repo/branch/install.sh)"
-```
-
 ## Usage
 
 After a successful installation, provide an informative example of how this project can be used. Additional code snippets, screenshots and demos work well in this space. You may also link to the other documentation resources, e.g. the [User Guide](./docs/user-guide.md) to demonstrate more use cases and to show more features.

scripts/config/pre-commit.yaml

@@ -10,7 +10,8 @@ repos:
   hooks:
   - id: check-file-format
     name: Check File Format
-    entry: check=staged-changes./scripts/githooks/check-file-format.sh
+    entry: ./scripts/githooks/check-file-format.sh
+    args: ["check=staged-changes"]
     language: script
     pass_filenames: false
 - repo: local

scripts/init.mk

@@ -49,11 +49,19 @@ githooks-run: # Run git hooks configured in this repository @Operations
 		--all-files
 
 asdf-install: # Install asdf @Installation
-	if [ -d "${HOME}/.asdf" ]; then
-		( cd "${HOME}/.asdf"; git pull )
-	else
-		git clone --depth=1 https://github.com/asdf-vm/asdf.git "${HOME}/.asdf" ||:
+	asdf_version=$$(grep -E "#\s+asdf\s+v[0-9.]+\s+[a-fA-F0-9]{40}" .tool-versions | awk '{ print $$4 }')
+	if ! [ -d "${HOME}/.asdf" ] || ! [ -d "${HOME}/.asdf/.git" ]; then
+		rm -rf "${HOME}/.asdf"
+		git clone https://github.com/asdf-vm/asdf.git "${HOME}/.asdf" ||:
 	fi
+	cd "${HOME}/.asdf"
+	git checkout master
+	git pull
+	git checkout $$asdf_version
+	printf "\n\033[0m\033[93mPlease, add the following lines to your shell profile, either '~/.zshrc' or '~/.bashrc' file:\033[0m\n\n"
+	printf "\033[3m\033[93m  source \"$$HOME/.asdf/asdf.sh\"\033[0m\n"
+	printf "\033[3m\033[93m  source \"$$HOME/.asdf/completions/asdf.bash\"\033[0m\n\n"
+	printf "\033[0m\033[93mThen re-run this command if required.\033[0m\n\n"
 	asdf plugin update --all
 
 _install-dependency: # Install asdf dependency - mandatory: name=[listed in the '.tool-versions' file]; optional: version=[if not listed]

scripts/terraform/terraform.mk

@@ -90,6 +90,7 @@ ${VERBOSE}.SILENT: \
 	terraform-example-provision-aws-infrastructure \
 	terraform-fmt \
 	terraform-init \
+	terraform-install \
 	terraform-plan \
 	terraform-shellscript-lint \
 	terraform-validate \