From 1f74beb9c4a00d8a2246411f60ec0b8da5485d3e Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Wed, 28 Oct 2026 10:32:27 -0700 Subject: [PATCH] Isolate the missing-gcloud harness test Use a controlled PATH so installed cloud tools cannot affect the check. Print the captured output when the missing-tool assertion fails. Signed-off-by: Daneyon Hansen --- .../provisioning/gke/tests/test-provisioning.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/inference/provisioning/gke/tests/test-provisioning.sh b/inference/provisioning/gke/tests/test-provisioning.sh index 5cc6f9f..889d6f6 100755 --- a/inference/provisioning/gke/tests/test-provisioning.sh +++ b/inference/provisioning/gke/tests/test-provisioning.sh @@ -8,12 +8,21 @@ TEMP_DIR="$(mktemp -d)" trap 'rm -rf -- "${TEMP_DIR}"' EXIT mkdir -p "${TEMP_DIR}/bin" "${TEMP_DIR}/state" -if PATH=/usr/bin:/bin bash "${PROVISION_DIR}/provision.sh" plan \ +# Hosted runners can have gcloud in /usr/bin. Expose only the utility needed +# to source common.sh, and invoke Bash directly so gcloud is always absent. +mkdir -p "${TEMP_DIR}/missing-tool-bin" +ln -s "$(command -v dirname)" "${TEMP_DIR}/missing-tool-bin/dirname" +if PATH="${TEMP_DIR}/missing-tool-bin" "${BASH}" "${PROVISION_DIR}/provision.sh" plan \ >"${TEMP_DIR}/missing-tool.log" 2>&1; then + cat "${TEMP_DIR}/missing-tool.log" >&2 echo "provisioning unexpectedly accepted a missing gcloud CLI" >&2 exit 1 fi -grep -q 'gcloud is required but was not found in PATH' "${TEMP_DIR}/missing-tool.log" +if ! grep -q 'gcloud is required but was not found in PATH' "${TEMP_DIR}/missing-tool.log"; then + cat "${TEMP_DIR}/missing-tool.log" >&2 + echo "provisioning did not report the missing gcloud CLI" >&2 + exit 1 +fi cat >"${TEMP_DIR}/bin/gke-gcloud-auth-plugin" <<'EOF' #!/usr/bin/env bash