Merge branch 'master' into release-please--branches--master--componen…

…ts--tflint-ruleset-blueprint
GoogleCloudPlatform · Aug 9, 2024 · be13ee0 · be13ee0
2 parents 8945fe0 + 9792271
commit be13ee0
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
@@ -58,7 +58,7 @@ OPA_VERSION := 0.52.0
 # Updated by Update Tooling Workflow
 GCRANE_VERSION := 0.20.2
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.1
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22.2
 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_helper_functions.sh b/infra/build/developer-tools/build/scripts/task_helper_functions.sh
@@ -375,12 +375,15 @@ function check_tflint() {
       fi
       # load default ruleset
       tflintCfg="/root/tflint/.tflint.example.hcl"
+      # load if local repo ruleset
+      if [[ -f "/workspace/.github/.tflint.repo.hcl" ]]; then
+        tflintCfg="/workspace/.github/.tflint.repo.hcl"
       # if module, load tighter ruleset
-      if [[ $path == "." || $path == "./modules"* ]];then
+      elif [[ $path == "." || $path == "./modules"* || $path =~ "^[0-9]+-.*" ]]; then
         tflintCfg="/root/tflint/.tflint.module.hcl"
       fi
 
-      cd "${path}" && echo "Working in ${path} ..."
+      cd "${path}" && echo "Working in ${path} using ${tflintCfg}..."
       tflint --config=${tflintCfg} --no-color
       rc=$?
       if [[ "${rc}" -ne 0 ]]; then