[NRL-774] Re-update .terraform-version files

Author: mattdean3-nhs

.github/workflows/persistent-environment.yml

@@ -25,6 +25,9 @@ jobs:
     runs-on: [self-hosted, ci]
 
     steps:
+      #- name: Clear stale ASDF state
+      #  run: rm -rf ~/.asdf
+
       - name: Git clone - ${{ inputs.branch_name }}
         uses: actions/checkout@v4
         with:
@@ -51,18 +54,7 @@ jobs:
           source $(poetry env info --path)/bin/activate
 
       - name: Run Linting
-        run: |
-          which asdf
-          which terraform
-          #env
-          #cat .tool-versions
-          #ls -ltr ~/.asdf/installs/terraform
-          #asdf list terraform
-          #ldd ~/.asdf/installs/terraform/1.9.8/bin/terraform
-          #file ~/.asdf/installs/terraform/1.9.8/bin/terraform
-          ls -ltr ~/.asdf/installs/terraform/1.9.8/bin
-          ~/.asdf/installs/terraform/1.9.8/bin/terraform --version
-          make lint
+        run: make lint
 
       - name: Run Unit Tests
         run: make test
@@ -114,8 +106,7 @@ jobs:
         with:
           path: ~/.asdf
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+          fail-on-cache-miss: true
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
@@ -194,8 +185,7 @@ jobs:
         with:
           path: ~/.asdf
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+          fail-on-cache-miss: true
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
@@ -276,8 +266,7 @@ jobs:
         with:
           path: ~/.asdf
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+          fail-on-cache-miss: true
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
@@ -321,8 +310,7 @@ jobs:
         with:
           path: ~/.asdf
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+          fail-on-cache-miss: true
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
@@ -366,8 +354,7 @@ jobs:
         with:
           path: ~/.asdf
           key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+          fail-on-cache-miss: true
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]

Makefile

@@ -16,9 +16,6 @@ APP_ALIAS ?= default
 HOST ?= $(TF_WORKSPACE_NAME).api.record-locator.$(ENV).national.nhs.uk
 ENV_TYPE ?= $(ENV)
 
-DEBUG_PROP_ASDF_ENV := $(shell env | grep ASDF)
-DEBUG_PROP_BUILD_PATH := $(shell env | grep PATH)
-
 export PATH := $(PATH):$(PWD)/.venv/bin
 export USE_SHARED_RESOURCES := $(shell poetry run python scripts/are_resources_shared_for_stack.py $(TF_WORKSPACE_NAME))
 
@@ -49,7 +46,7 @@ check-warn:
 	@SHOULD_WARN_ONLY=true ./scripts/check-build-environment.sh
 
 check-deploy: ## check the deploy environment is setup correctly
-	@./scripts/lint-deploy-environment.sh
+	@./scripts/check-deploy-environment.sh
 
 check-deploy-warn:
 	@SHOULD_WARN_ONLY=true ./scripts/check-deploy-environment.sh
@@ -176,7 +173,6 @@ test-performance-cleanup:
 	PYTHONPATH=. poetry run python tests/performance/environment.py cleanup $(TF_WORKSPACE_NAME)
 
 lint: check-warn ## Lint the project
-
 	SKIP="no-commit-to-branch" pre-commit run --all-files
 
 clean: ## Remove all generated and temporary files

scripts/check-build-environment.sh

@@ -33,9 +33,6 @@ BUILD_DEPENDENCIES="
     zip
 "
 
-echo "BUILD_PATH=${PATH}"
-env | grep "ASDF"
-
 for dep in ${BUILD_DEPENDENCIES}; do
     set +e
         dep_path="$(which ${dep} 2> /dev/null)"

terraform/account-wide-infrastructure/dev/.terraform-version

@@ -1 +1 @@
-1.3.4
+1.9.8

terraform/account-wide-infrastructure/mgmt/.terraform-version

@@ -1 +1 @@
-1.3.4
+1.9.8

terraform/account-wide-infrastructure/prod/.terraform-version

@@ -1 +1 @@
-1.3.4
+1.9.8

terraform/account-wide-infrastructure/test/.terraform-version

@@ -1 +1 @@
-1.3.4
+1.9.8

terraform/infrastructure/.terraform-version

@@ -1 +1 @@
-1.3.4
+1.9.8