From 36cc6e5df74020887421c84bf36655c1b7ce905a Mon Sep 17 00:00:00 2001
From: Carson Dunbar <carsondunbar@google.com>
Date: Wed, 13 Dec 2023 18:24:34 +0000
Subject: [PATCH 1/4] Fixes for wait-for-startup script because it has been
 recently updated.  This checks for an additional string that is now used for
 return codes that aren't 0

---
 .../scripts/wait-for-startup-status.sh            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh b/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
index 6a9b4e534b..4d7c8f5a16 100755
--- a/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
+++ b/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
@@ -37,25 +37,26 @@ now=$(date +%s)
 deadline=$((now + TIMEOUT))
 error_file=$(mktemp)
 fetch_cmd="gcloud compute instances get-serial-port-output ${INSTANCE_NAME} --port 1 --zone ${ZONE} --project ${PROJECT_ID}"
+FINISH_LINE="startup-script exit status"
+FINISH_LINE_ERR="Script.*failed with error:"
 
 until [[ now -gt deadline ]]; do
-	FINISH_LINE="startup-script exit status"
 	ser_log=$(
 		set -o pipefail
-		${fetch_cmd} 2>"${error_file}" | c1grep "${FINISH_LINE}"
+		${fetch_cmd} 2>"${error_file}" | c1grep "${FINISH_LINE}\|${FINISH_LINE_ERR}"
 	) || {
 		cat "${error_file}"
 		exit 1
 	}
-	STATUS=$(sed -r 's/.*([0-9]+)\s*$/\1/' <<<"${ser_log}" | uniq)
-	if [[ -n "${STATUS}" ]]; then break; fi
-	echo "could not detect end of startup script. Sleeping."
+	if [[ -n "${ser_log}" ]]; then break; fi
+	echo "Could not detect end of startup script. Sleeping."
 	sleep 5
 	now=$(date +%s)
 done
 
+STATUS=$(sed -r 's/.*([0-9]+)\s*$/\1/' <<<"${ser_log}" | uniq)
 # This specific text is monitored for in tests, do not change.
-INSPECT_OUTPUT_TEXT="to inspect the startup script output, please run:"
+INSPECT_OUTPUT_TEXT="To inspect the startup script output, please run:"
 if [[ "${STATUS}" == 0 ]]; then
 	echo "startup-script finished successfully"
 elif [[ "${STATUS}" == 1 ]]; then
@@ -67,7 +68,7 @@ elif [[ now -ge deadline ]]; then
 	echo "${fetch_cmd}"
 	exit 1
 else
-	echo "invalid return status '${STATUS}'"
+	echo "Invalid return status: '${STATUS}'"
 	echo "${INSPECT_OUTPUT_TEXT}"
 	echo "${fetch_cmd}"
 	exit 1

From 5b0a4642b89f3bfea927495f75d700470f886c2e Mon Sep 17 00:00:00 2001
From: Carson Dunbar <carsondunbar@google.com>
Date: Wed, 13 Dec 2023 19:54:05 +0000
Subject: [PATCH 2/4] Bumping version number

---
 cmd/root.go                                                   | 2 +-
 community/modules/compute/gke-node-pool/versions.tf           | 2 +-
 community/modules/compute/htcondor-execute-point/versions.tf  | 2 +-
 .../compute/schedmd-slurm-gcp-v5-node-group/versions.tf       | 2 +-
 .../compute/schedmd-slurm-gcp-v5-partition/versions.tf        | 2 +-
 .../compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf      | 2 +-
 .../modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf  | 2 +-
 .../compute/schedmd-slurm-gcp-v6-partition/versions.tf        | 2 +-
 .../modules/database/slurm-cloudsql-federation/versions.tf    | 4 ++--
 .../modules/file-system/cloud-storage-bucket/versions.tf      | 2 +-
 .../modules/file-system/gke-persistent-volume/versions.tf     | 2 +-
 community/modules/file-system/nfs-server/versions.tf          | 2 +-
 community/modules/project/service-enablement/versions.tf      | 2 +-
 .../scheduler/SchedMD-slurm-on-gcp-controller/versions.tf     | 2 +-
 .../scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf     | 2 +-
 community/modules/scheduler/gke-cluster/versions.tf           | 2 +-
 community/modules/scheduler/htcondor-access-point/versions.tf | 2 +-
 .../modules/scheduler/htcondor-central-manager/versions.tf    | 2 +-
 community/modules/scheduler/htcondor-pool-secrets/versions.tf | 2 +-
 community/modules/scheduler/htcondor-setup/versions.tf        | 2 +-
 .../scheduler/schedmd-slurm-gcp-v5-controller/versions.tf     | 2 +-
 .../modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf  | 2 +-
 .../scheduler/schedmd-slurm-gcp-v6-controller/versions.tf     | 2 +-
 .../modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf  | 2 +-
 community/modules/scripts/wait-for-startup/versions.tf        | 2 +-
 community/modules/scripts/windows-startup-script/versions.tf  | 2 +-
 modules/compute/vm-instance/versions.tf                       | 4 ++--
 modules/file-system/filestore/versions.tf                     | 4 ++--
 modules/monitoring/dashboard/versions.tf                      | 2 +-
 modules/network/pre-existing-vpc/versions.tf                  | 2 +-
 modules/scheduler/batch-login-node/versions.tf                | 2 +-
 modules/scripts/startup-script/versions.tf                    | 2 +-
 32 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index 4fa5bf3ffd..b176282a63 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -52,7 +52,7 @@ HPC deployments on the Google Cloud Platform.`,
 				log.Fatalf("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.26.0",
+		Version:     "v1.26.1",
 		Annotations: annotation,
 	}
 )
diff --git a/community/modules/compute/gke-node-pool/versions.tf b/community/modules/compute/gke-node-pool/versions.tf
index 0015683457..388a8bda6b 100644
--- a/community/modules/compute/gke-node-pool/versions.tf
+++ b/community/modules/compute/gke-node-pool/versions.tf
@@ -26,6 +26,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.26.1"
   }
 }
diff --git a/community/modules/compute/htcondor-execute-point/versions.tf b/community/modules/compute/htcondor-execute-point/versions.tf
index b5dcdb9500..fe9434191a 100644
--- a/community/modules/compute/htcondor-execute-point/versions.tf
+++ b/community/modules/compute/htcondor-execute-point/versions.tf
@@ -25,6 +25,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf
index 4e21434e26..1e76e2eb4c 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf
index 113eb77e87..92a2a70edc 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.26.1"
   }
   required_version = ">= 0.13.0"
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
index bc617055b7..5df65418aa 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
index 2f9ae6af20..c3566ec725 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.26.1"
   }
 }
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
index 0e929a2b86..5f230db05d 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.26.1"
   }
 }
diff --git a/community/modules/database/slurm-cloudsql-federation/versions.tf b/community/modules/database/slurm-cloudsql-federation/versions.tf
index 29cc486b26..b939106734 100644
--- a/community/modules/database/slurm-cloudsql-federation/versions.tf
+++ b/community/modules/database/slurm-cloudsql-federation/versions.tf
@@ -30,10 +30,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.26.1"
   }
 
   required_version = ">= 0.13.0"
diff --git a/community/modules/file-system/cloud-storage-bucket/versions.tf b/community/modules/file-system/cloud-storage-bucket/versions.tf
index 70fa80e90e..b1a820d4ab 100644
--- a/community/modules/file-system/cloud-storage-bucket/versions.tf
+++ b/community/modules/file-system/cloud-storage-bucket/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.26.1"
   }
   required_version = ">= 0.14.0"
 }
diff --git a/community/modules/file-system/gke-persistent-volume/versions.tf b/community/modules/file-system/gke-persistent-volume/versions.tf
index d1d8e8d595..28c8ac4a96 100644
--- a/community/modules/file-system/gke-persistent-volume/versions.tf
+++ b/community/modules/file-system/gke-persistent-volume/versions.tf
@@ -29,6 +29,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.26.1"
   }
 }
diff --git a/community/modules/file-system/nfs-server/versions.tf b/community/modules/file-system/nfs-server/versions.tf
index 6e9b180dda..e4cb38b82a 100644
--- a/community/modules/file-system/nfs-server/versions.tf
+++ b/community/modules/file-system/nfs-server/versions.tf
@@ -30,7 +30,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/project/service-enablement/versions.tf b/community/modules/project/service-enablement/versions.tf
index e981f912a8..6b1d072783 100644
--- a/community/modules/project/service-enablement/versions.tf
+++ b/community/modules/project/service-enablement/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf
index e4b231d37c..3462727757 100644
--- a/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf
+++ b/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf
@@ -16,7 +16,7 @@
 
 terraform {
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf
index bb6a5ce5c2..2624b90d1f 100644
--- a/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf
+++ b/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf
@@ -16,7 +16,7 @@
 
 terraform {
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/gke-cluster/versions.tf b/community/modules/scheduler/gke-cluster/versions.tf
index d8eb847dd6..cfe9b7bd8b 100644
--- a/community/modules/scheduler/gke-cluster/versions.tf
+++ b/community/modules/scheduler/gke-cluster/versions.tf
@@ -30,6 +30,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.26.1"
   }
 }
diff --git a/community/modules/scheduler/htcondor-access-point/versions.tf b/community/modules/scheduler/htcondor-access-point/versions.tf
index 5568cd3679..c9561851b5 100644
--- a/community/modules/scheduler/htcondor-access-point/versions.tf
+++ b/community/modules/scheduler/htcondor-access-point/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.26.1"
   }
 
   required_version = ">= 1.1"
diff --git a/community/modules/scheduler/htcondor-central-manager/versions.tf b/community/modules/scheduler/htcondor-central-manager/versions.tf
index 6d89a60d5f..9976839c7c 100644
--- a/community/modules/scheduler/htcondor-central-manager/versions.tf
+++ b/community/modules/scheduler/htcondor-central-manager/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.26.1"
   }
 
   required_version = ">= 1.1.0"
diff --git a/community/modules/scheduler/htcondor-pool-secrets/versions.tf b/community/modules/scheduler/htcondor-pool-secrets/versions.tf
index 6d107d7c98..6420fa8c0f 100644
--- a/community/modules/scheduler/htcondor-pool-secrets/versions.tf
+++ b/community/modules/scheduler/htcondor-pool-secrets/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.26.1"
   }
 
   required_version = ">= 0.13.0"
diff --git a/community/modules/scheduler/htcondor-setup/versions.tf b/community/modules/scheduler/htcondor-setup/versions.tf
index bd66922517..16cc812c80 100644
--- a/community/modules/scheduler/htcondor-setup/versions.tf
+++ b/community/modules/scheduler/htcondor-setup/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-setup/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-setup/v1.26.1"
   }
 
   required_version = ">= 0.13.0"
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf
index 3878569888..eac958a101 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf
index 4c87f4e469..7e9c436eec 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.26.1"
   }
   required_version = ">= 1.1"
 }
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
index f048f7f3fa..313cd5a031 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.26.1"
   }
 }
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf
index a62391560e..f5f816c46c 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf
@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.26.1"
   }
 }
diff --git a/community/modules/scripts/wait-for-startup/versions.tf b/community/modules/scripts/wait-for-startup/versions.tf
index c8259d5333..1fa11f9967 100644
--- a/community/modules/scripts/wait-for-startup/versions.tf
+++ b/community/modules/scripts/wait-for-startup/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scripts/windows-startup-script/versions.tf b/community/modules/scripts/windows-startup-script/versions.tf
index c328b57ebb..02b7f9bdb0 100644
--- a/community/modules/scripts/windows-startup-script/versions.tf
+++ b/community/modules/scripts/windows-startup-script/versions.tf
@@ -16,7 +16,7 @@
 
 terraform {
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/compute/vm-instance/versions.tf b/modules/compute/vm-instance/versions.tf
index d78e56e2a2..23aa4b4e8c 100644
--- a/modules/compute/vm-instance/versions.tf
+++ b/modules/compute/vm-instance/versions.tf
@@ -31,10 +31,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.26.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.26.1"
   }
 
   required_version = ">= 1.2.0"
diff --git a/modules/file-system/filestore/versions.tf b/modules/file-system/filestore/versions.tf
index 2e3951a7c9..62c570e8ba 100644
--- a/modules/file-system/filestore/versions.tf
+++ b/modules/file-system/filestore/versions.tf
@@ -26,10 +26,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.26.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/monitoring/dashboard/versions.tf b/modules/monitoring/dashboard/versions.tf
index 304450987d..950bf727ab 100644
--- a/modules/monitoring/dashboard/versions.tf
+++ b/modules/monitoring/dashboard/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/network/pre-existing-vpc/versions.tf b/modules/network/pre-existing-vpc/versions.tf
index b0760d5703..d1b256a013 100644
--- a/modules/network/pre-existing-vpc/versions.tf
+++ b/modules/network/pre-existing-vpc/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/scheduler/batch-login-node/versions.tf b/modules/scheduler/batch-login-node/versions.tf
index 2046317928..f313e7fbb6 100644
--- a/modules/scheduler/batch-login-node/versions.tf
+++ b/modules/scheduler/batch-login-node/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.26.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/scripts/startup-script/versions.tf b/modules/scripts/startup-script/versions.tf
index f5302f607d..ef66045b12 100644
--- a/modules/scripts/startup-script/versions.tf
+++ b/modules/scripts/startup-script/versions.tf
@@ -30,7 +30,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.26.0"
+    module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.26.1"
   }
 
   required_version = ">= 0.14.0"

From 26f7ec80a01d78daaa4805f63492915b1fb7e0ce Mon Sep 17 00:00:00 2001
From: Vadim Ivanov <ivanovvvadim@gmail.com>
Date: Mon, 11 Dec 2023 14:43:47 +0000
Subject: [PATCH 3/4] update TFLint to 0.49 & latest plugin in precommit

(cherry picked from commit 41ff13028f481bb20f500bd3a97ede7844437c36)
---
 .tflint.hcl                                           |  7 ++++++-
 community/modules/compute/gke-node-pool/variables.tf  |  3 +++
 .../schedmd-slurm-gcp-v5-node-group/variables.tf      |  4 ++++
 .../modules/file-system/DDN-EXAScaler/variables.tf    |  1 +
 .../modules/project/service-account/variables.tf      |  3 +++
 community/modules/scheduler/gke-cluster/variables.tf  |  1 +
 .../schedmd-slurm-gcp-v5-controller/variables.tf      |  5 +++++
 .../scheduler/schedmd-slurm-gcp-v5-login/variables.tf |  5 +++++
 community/modules/scripts/spack-setup/variables.tf    | 11 +++++++++++
 modules/network/vpc/variables.tf                      |  3 +++
 modules/scheduler/batch-login-node/variables.tf       |  3 +++
 modules/scripts/startup-script/variables.tf           |  1 +
 tools/cloud-build/hpc-toolkit-builder.yaml            |  2 +-
 tools/cloud-workstations/workstation-image.yaml       |  2 +-
 14 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/.tflint.hcl b/.tflint.hcl
index cd3b9fbb6c..e6ede24f8c 100644
--- a/.tflint.hcl
+++ b/.tflint.hcl
@@ -13,9 +13,14 @@
 // limitations under the License.
 plugin "google" {
   enabled = true
-  version = "0.23.0"
+  version = "0.26.0"
   source  = "github.com/terraform-linters/tflint-ruleset-google"
 }
+plugin "terraform" {
+  enabled = true
+  version = "0.5.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+}
 rule "terraform_deprecated_index" {
   enabled = true
 }
diff --git a/community/modules/compute/gke-node-pool/variables.tf b/community/modules/compute/gke-node-pool/variables.tf
index 98288b38f4..0940d09c38 100644
--- a/community/modules/compute/gke-node-pool/variables.tf
+++ b/community/modules/compute/gke-node-pool/variables.tf
@@ -230,6 +230,7 @@ variable "timeout_update" {
 
 # Deprecated
 
+# tflint-ignore: terraform_unused_declarations
 variable "total_min_nodes" {
   description = "DEPRECATED: Use autoscaling_total_min_nodes."
   type        = number
@@ -240,6 +241,7 @@ variable "total_min_nodes" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "total_max_nodes" {
   description = "DEPRECATED: Use autoscaling_total_max_nodes."
   type        = number
@@ -250,6 +252,7 @@ variable "total_max_nodes" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "service_account" {
   description = "DEPRECATED: use service_account_email and scopes."
   type = object({
diff --git a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf
index a88d8b2668..1a1ac7b1c3 100644
--- a/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf
+++ b/community/modules/compute/schedmd-slurm-gcp-v5-node-group/variables.tf
@@ -126,6 +126,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -136,6 +137,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -146,6 +148,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -263,6 +266,7 @@ variable "on_host_maintenance" {
   default     = "TERMINATE"
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string
diff --git a/community/modules/file-system/DDN-EXAScaler/variables.tf b/community/modules/file-system/DDN-EXAScaler/variables.tf
index 0ae9f1d3b3..1dace16deb 100644
--- a/community/modules/file-system/DDN-EXAScaler/variables.tf
+++ b/community/modules/file-system/DDN-EXAScaler/variables.tf
@@ -202,6 +202,7 @@ variable "boot" {
 # project: project name
 # family: image family name
 # name: !!DEPRECATED!! - image name
+# tflint-ignore: terraform_unused_declarations
 variable "image" {
   description = "DEPRECATED: Source image properties"
   type        = any
diff --git a/community/modules/project/service-account/variables.tf b/community/modules/project/service-account/variables.tf
index c27f6c3bb1..99aa9b20f9 100644
--- a/community/modules/project/service-account/variables.tf
+++ b/community/modules/project/service-account/variables.tf
@@ -31,6 +31,7 @@ variable "description" {
   default     = "Service Account"
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "descriptions" {
   description = "Deprecated; create single service accounts using var.description."
   type        = list(string)
@@ -71,6 +72,7 @@ variable "name" {
   type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "names" {
   description = "Deprecated; create single service accounts using var.name."
   type        = list(string)
@@ -88,6 +90,7 @@ variable "org_id" {
   default     = ""
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "prefix" {
   description = "Deprecated; prefix now set using var.deployment_name"
   type        = string
diff --git a/community/modules/scheduler/gke-cluster/variables.tf b/community/modules/scheduler/gke-cluster/variables.tf
index 0650656685..4b12f14852 100644
--- a/community/modules/scheduler/gke-cluster/variables.tf
+++ b/community/modules/scheduler/gke-cluster/variables.tf
@@ -258,6 +258,7 @@ variable "timeout_update" {
 }
 
 # Deprecated
+# tflint-ignore: terraform_unused_declarations
 variable "service_account" {
   description = "DEPRECATED: use service_account_email and scopes."
   type = object({
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf
index 97eea5eb6f..b9ff6637af 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v5-controller/variables.tf
@@ -293,6 +293,7 @@ EOD
   default = []
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string
@@ -349,6 +350,7 @@ EOD
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "network_ip" {
   type        = string
   description = "DEPRECATED: Use `static_ips` variable to assign an internal static ip address."
@@ -575,6 +577,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -585,6 +588,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -595,6 +599,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf
index 83c09b7d1d..0b43011968 100644
--- a/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf
+++ b/community/modules/scheduler/schedmd-slurm-gcp-v5-login/variables.tf
@@ -92,6 +92,7 @@ variable "region" {
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "network_ip" {
   type        = string
   description = "DEPRECATED: Use `static_ips` variable to assign an internal static ip address."
@@ -154,6 +155,7 @@ variable "min_cpu_platform" {
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpu" {
   type = object({
     type  = string
@@ -324,6 +326,7 @@ variable "instance_image_custom" {
   default     = false
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_project" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -334,6 +337,7 @@ variable "source_image_project" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image_family" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
@@ -344,6 +348,7 @@ variable "source_image_family" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "source_image" {
   type        = string
   description = "DEPRECATED: Use `instance_image` instead."
diff --git a/community/modules/scripts/spack-setup/variables.tf b/community/modules/scripts/spack-setup/variables.tf
index f8b49177c9..16dbec058c 100644
--- a/community/modules/scripts/spack-setup/variables.tf
+++ b/community/modules/scripts/spack-setup/variables.tf
@@ -90,6 +90,7 @@ variable "labels" {
 
 # variables to be deprecated
 
+# tflint-ignore: terraform_unused_declarations
 variable "log_file" {
   description = <<-EOT
   DEPRECATED 
@@ -105,6 +106,7 @@ variable "log_file" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "spack_cache_url" {
   description = <<-EOT
   DEPRECATED
@@ -129,6 +131,7 @@ variable "spack_cache_url" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "configs" {
   description = <<-EOT
   DEPRECATED
@@ -151,6 +154,7 @@ variable "configs" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "compilers" {
   description = <<-EOT
   DEPRECATED
@@ -175,6 +179,7 @@ variable "compilers" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "licenses" {
   description = <<-EOT
   DEPRECATED
@@ -202,6 +207,7 @@ variable "licenses" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "packages" {
   description = <<-EOT
   DEPRECATED
@@ -222,6 +228,7 @@ variable "packages" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "install_flags" {
   description = "DEPRECATED - spack install is now performed using the [spack-execute](../spack-execute/) module `commands` variable."
   default     = null
@@ -232,6 +239,7 @@ variable "install_flags" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "concretize_flags" {
   description = "DEPRECATED - spack concretize is now performed using the [spack-execute](../spack-execute/) module `commands` variable."
   default     = null
@@ -242,6 +250,7 @@ variable "concretize_flags" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "gpg_keys" {
   description = <<EOT
   DEPRECATED
@@ -265,6 +274,7 @@ EOT
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "caches_to_populate" {
   description = <<-EOT
   DEPRECATED
@@ -295,6 +305,7 @@ EOT
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "environments" {
   description = <<-EOT
   DEPRECATED
diff --git a/modules/network/vpc/variables.tf b/modules/network/vpc/variables.tf
index f88e5aca01..f337a0479a 100644
--- a/modules/network/vpc/variables.tf
+++ b/modules/network/vpc/variables.tf
@@ -31,6 +31,7 @@ variable "subnetwork_name" {
   default     = null
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "subnetwork_size" {
   description = "DEPRECATED: please see https://goo.gle/hpc-toolkit-vpc-deprecation for migration instructions"
   type        = number
@@ -117,6 +118,7 @@ variable "subnetworks" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "primary_subnetwork" {
   description = "DEPRECATED: please see https://goo.gle/hpc-toolkit-vpc-deprecation for migration instructions"
   type        = map(string)
@@ -127,6 +129,7 @@ variable "primary_subnetwork" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "additional_subnetworks" {
   description = "DEPRECATED: please see https://goo.gle/hpc-toolkit-vpc-deprecation for migration instructions"
   type        = list(map(string))
diff --git a/modules/scheduler/batch-login-node/variables.tf b/modules/scheduler/batch-login-node/variables.tf
index b81e844e19..e4f3a6e5b4 100644
--- a/modules/scheduler/batch-login-node/variables.tf
+++ b/modules/scheduler/batch-login-node/variables.tf
@@ -85,6 +85,7 @@ variable "job_data" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "job_template_contents" {
   description = "Deprecated (use `job_data`): The contents of the Google Cloud Batch job template. Typically supplied by a batch-job-template module."
   type        = string
@@ -95,6 +96,7 @@ variable "job_template_contents" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "job_filename" {
   description = "Deprecated (use `job_data`): The filename of the generated job template file. Typically supplied by a batch-job-template module."
   type        = string
@@ -105,6 +107,7 @@ variable "job_filename" {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "job_id" {
   description = "Deprecated (use `job_data`): The ID for the Google Cloud Batch job. Typically supplied by a batch-job-template module for use in the output instructions."
   type        = string
diff --git a/modules/scripts/startup-script/variables.tf b/modules/scripts/startup-script/variables.tf
index ca3f774fb2..f8aeb6b336 100644
--- a/modules/scripts/startup-script/variables.tf
+++ b/modules/scripts/startup-script/variables.tf
@@ -136,6 +136,7 @@ variable "configure_ssh_host_patterns" {
   default     = []
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "prepend_ansible_installer" {
   description = <<EOT
   DEPRECATED. Use `install_ansible=false` to prevent ansible installation.
diff --git a/tools/cloud-build/hpc-toolkit-builder.yaml b/tools/cloud-build/hpc-toolkit-builder.yaml
index 620755a1a3..af8c5cbfa4 100644
--- a/tools/cloud-build/hpc-toolkit-builder.yaml
+++ b/tools/cloud-build/hpc-toolkit-builder.yaml
@@ -24,7 +24,7 @@ steps:
   - '--cache-from'
   - 'us-central1-docker.pkg.dev/$PROJECT_ID/hpc-toolkit-repo/hpc-toolkit-builder:latest'
   - '--build-arg'
-  - 'TFLINT_VERSION=v0.46.0'
+  - 'TFLINT_VERSION=v0.49.0'
   - '--build-arg'
   - 'SHELLCHECK_VERSION=v0.9.0'
   - '-f'
diff --git a/tools/cloud-workstations/workstation-image.yaml b/tools/cloud-workstations/workstation-image.yaml
index 81c5f9b192..4638938244 100644
--- a/tools/cloud-workstations/workstation-image.yaml
+++ b/tools/cloud-workstations/workstation-image.yaml
@@ -24,7 +24,7 @@ steps:
   - '--cache-from'
   - '${_LOCATION}-docker.pkg.dev/${PROJECT_ID}/${_REPO}/hpc-toolkit-workstation:latest'
   - '--build-arg'
-  - 'TFLINT_VERSION=v0.46.0'
+  - 'TFLINT_VERSION=v0.49.0'
   - '-f'
   - 'tools/cloud-workstations/Dockerfile'
   - '.'

From 6d50e0539cf3036ffbab29ca3b85888405d9e298 Mon Sep 17 00:00:00 2001
From: Carson Dunbar <carsondunbar@google.com>
Date: Wed, 13 Dec 2023 21:40:03 +0000
Subject: [PATCH 4/4] Update to address PR review

---
 .../scripts/wait-for-startup-status.sh                | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh b/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
index 4d7c8f5a16..0c9720203c 100755
--- a/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
+++ b/community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh
@@ -36,14 +36,19 @@ c1grep() { grep "$@" || test $? = 1; }
 now=$(date +%s)
 deadline=$((now + TIMEOUT))
 error_file=$(mktemp)
-fetch_cmd="gcloud compute instances get-serial-port-output ${INSTANCE_NAME} --port 1 --zone ${ZONE} --project ${PROJECT_ID}"
+fetch_cmd="gcloud compute instances get-serial-port-output ${INSTANCE_NAME} \
+           --port 1 --zone ${ZONE} --project ${PROJECT_ID}"
+# Match string for all finish types of the old guest agent and successful
+# finishes on the new guest agent
 FINISH_LINE="startup-script exit status"
+# Match string for failures on the new guest agent
 FINISH_LINE_ERR="Script.*failed with error:"
 
 until [[ now -gt deadline ]]; do
 	ser_log=$(
 		set -o pipefail
-		${fetch_cmd} 2>"${error_file}" | c1grep "${FINISH_LINE}\|${FINISH_LINE_ERR}"
+		${fetch_cmd} 2>"${error_file}" |
+			c1grep "${FINISH_LINE}\|${FINISH_LINE_ERR}"
 	) || {
 		cat "${error_file}"
 		exit 1
@@ -54,6 +59,8 @@ until [[ now -gt deadline ]]; do
 	now=$(date +%s)
 done
 
+# This line checks for an exit code - the assumption is that there is a number
+# at the end of the line and it is an exit code
 STATUS=$(sed -r 's/.*([0-9]+)\s*$/\1/' <<<"${ser_log}" | uniq)
 # This specific text is monitored for in tests, do not change.
 INSPECT_OUTPUT_TEXT="To inspect the startup script output, please run:"