Revert "refactor: use -chdir in terraform_validate wrapper" (#2624)

GoogleCloudPlatform · Sep 25, 2024 · cce4a74 · cce4a74
1 parent 9907e7f
commit cce4a74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/infra/build/Makefile b/infra/build/Makefile
@@ -56,7 +56,7 @@ OPA_VERSION := 0.52.0
 # Updated by Update Tooling Workflow
 GCRANE_VERSION := 0.20.2
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.13
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.12
 DOCKER_TAG_MAJOR_VERSION_DEVELOPER_TOOLS := $(firstword $(subst ., , $(DOCKER_TAG_VERSION_DEVELOPER_TOOLS)))
 DOCKER_TAG_MINOR_VERSION_DEVELOPER_TOOLS := $(shell echo "${DOCKER_TAG_VERSION_DEVELOPER_TOOLS}" | awk -F. '{print $$1"."$$2}')
 

diff --git a/infra/build/developer-tools/build/scripts/task_wrapper_scripts/terraform_validate b/infra/build/developer-tools/build/scripts/task_wrapper_scripts/terraform_validate
@@ -19,5 +19,8 @@
 # files to validate.  This directory is assumed to be a root module.
 
 set -eu
-flock -x /workspace/.terraform.lock -c "terraform init -compact-warnings -chdir=$1 -backend=false >/dev/null"
-flock -s /workspace/.terraform.lock -c "terraform -chdir=$1  validate"
+curdir=$(pwd)
+cd "${1}"
+flock -x /workspace/.terraform.lock -c "terraform init -backend=false >/dev/null"
+flock -s /workspace/.terraform.lock -c "terraform validate"
+cd "$curdir"