From e8ae3bc1ac30c8ba63c09c70ac6b40d0631f9b21 Mon Sep 17 00:00:00 2001
From: aidenvaines-bjss <aiden.vaines@bjss.com>
Date: Wed, 17 Sep 2025 14:04:43 +0100
Subject: [PATCH] CCM-10160 minor fixes to workflows and precommits

---
 .github/workflows/pr_closed.yaml                  | 4 +++-
 .github/workflows/release_created.yaml            | 4 +++-
 infrastructure/terraform/components/api/README.md | 2 --
 sandbox/.eslintrc.json                            | 2 --
 scripts/config/pre-commit.yaml                    | 1 +
 scripts/devcontainer/custom-ca-certs/.gitignore   | 2 ++
 scripts/init.mk                                   | 4 ++--
 7 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 scripts/devcontainer/custom-ca-certs/.gitignore

diff --git a/.github/workflows/pr_closed.yaml b/.github/workflows/pr_closed.yaml
index 92e17e1d2..5e994f0ba 100644
--- a/.github/workflows/pr_closed.yaml
+++ b/.github/workflows/pr_closed.yaml
@@ -60,4 +60,6 @@ jobs:
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-supplier-api-dev" \
             --targetComponent "${{ matrix.component }}" \
-            --terraformAction "apply"
+            --terraformAction "apply" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
diff --git a/.github/workflows/release_created.yaml b/.github/workflows/release_created.yaml
index 0944c603a..6d63c9d11 100644
--- a/.github/workflows/release_created.yaml
+++ b/.github/workflows/release_created.yaml
@@ -36,4 +36,6 @@ jobs:
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-supplier-api-nonprod" \
             --targetComponent "${{ matrix.component }}" \
-            --terraformAction "apply"
+            --terraformAction "apply" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
diff --git a/infrastructure/terraform/components/api/README.md b/infrastructure/terraform/components/api/README.md
index e810e2760..9071e1371 100644
--- a/infrastructure/terraform/components/api/README.md
+++ b/infrastructure/terraform/components/api/README.md
@@ -31,8 +31,6 @@ No requirements.
 |------|--------|---------|
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
 | <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |
-| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.10 |
-| <a name="module_kms"></a> [kms](#module\_kms) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/kms | v2.0.10 |
 | <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
 | <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-kms.zip | n/a |
 | <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |
diff --git a/sandbox/.eslintrc.json b/sandbox/.eslintrc.json
index ff2c49652..954d644be 100644
--- a/sandbox/.eslintrc.json
+++ b/sandbox/.eslintrc.json
@@ -1,5 +1,3 @@
-// Use this file as a starting point for your project's .eslintrc.
-// Copy this file, and add rule overrides as needed.
 {
   "extends": "airbnb-base",
   "rules": {
diff --git a/scripts/config/pre-commit.yaml b/scripts/config/pre-commit.yaml
index 1bd20f28f..1a8a5313f 100644
--- a/scripts/config/pre-commit.yaml
+++ b/scripts/config/pre-commit.yaml
@@ -15,6 +15,7 @@ repos:
         args: ['--autofix']
         exclude: |
             (?x)^(
+                package(-lock)?\.json$ |
                 sdk/.* |
                 someotherdir/.* |
                 src/server/host/Properties/launchSettings.json
diff --git a/scripts/devcontainer/custom-ca-certs/.gitignore b/scripts/devcontainer/custom-ca-certs/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/scripts/devcontainer/custom-ca-certs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/scripts/init.mk b/scripts/init.mk
index e12255c34..c42cf2bf7 100644
--- a/scripts/init.mk
+++ b/scripts/init.mk
@@ -46,8 +46,8 @@ _install-dependency: # Install asdf dependency - mandatory: name=[listed in the
 	asdf install ${name} $(or ${version},)
 
 _install-dependencies: # Install all the dependencies listed in .tool-versions
-	for plugin in $$(grep ^[a-z] .tool-versions | sed 's/[[:space:]].*//'); do
-		make _install-dependency name="$${plugin}"
+	for plugin in $$(grep '^[a-z]' .tool-versions | cut -f1 -d' '); do \
+		echo "Installing $${plugin}..."; \
 	done
 
 clean:: # Remove all generated and temporary files (common) @Operations