Merge branch 'master' into pre-commit-ci-update-config

Author: MaxymVlasov

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.99.5](https://github.com/antonbabenko/pre-commit-terraform/compare/v1.99.4...v1.99.5) (2025-07-08)
+
+
+### Bug Fixes
+
+* Regression from (at least) v1.99.0 which incorrectly handle `pre-commit run -a`, that causes multiply hooks runs. `terraform_trivy` from its introduction could always be `Passed` for `pre-commit run -a` ([#909](https://github.com/antonbabenko/pre-commit-terraform/issues/909)) ([a5bd84e](https://github.com/antonbabenko/pre-commit-terraform/commit/a5bd84e94dc228794a017da7f3e21f02745b8c06)), closes [#908](https://github.com/antonbabenko/pre-commit-terraform/issues/908) [/github.com/pre-commit-terraform/#908](https://github.com//github.com/pre-commit-terraform//issues/908)
+
 ## [1.99.4](https://github.com/antonbabenko/pre-commit-terraform/compare/v1.99.3...v1.99.4) (2025-06-12)
 
 

hooks/_common.sh

@@ -176,9 +176,9 @@ function common::is_hook_run_on_whole_repo {
   local all_files_that_can_be_checked
 
   if [ -z "$excluded_files" ]; then
-    all_files_that_can_be_checked=$(git ls-files | sort | grep -e "$included_files" | tr '\n' ' ')
+    all_files_that_can_be_checked=$(git ls-files | sort | grep -E -- "$included_files" | tr '\n' ' ')
   else
-    all_files_that_can_be_checked=$(git ls-files | sort | grep -e "$included_files" | grep -v -e "$excluded_files" | tr '\n' ' ')
+    all_files_that_can_be_checked=$(git ls-files | sort | grep -E -- "$included_files" | grep -v -E -- "$excluded_files" | tr '\n' ' ')
   fi
 
   if [ "$files_to_check" == "$all_files_that_can_be_checked" ]; then

hooks/terraform_docs.sh

@@ -187,7 +187,7 @@ function terraform_docs {
     config_file_no_color="$config_file$(date +%s).yml"
 
     if [ "$PRE_COMMIT_COLOR" = "never" ] &&
-      [[ $(grep -e '^formatter:' "$config_file") == *"pretty"* ]] &&
+      [[ $(grep -E '^formatter:' "$config_file") == *"pretty"* ]] &&
       [[ $(grep '  color: ' "$config_file") != *"false"* ]]; then
 
       cp "$config_file" "$config_file_no_color"

hooks/terraform_trivy.sh

@@ -65,7 +65,7 @@ function run_hook_on_whole_repo {
   local -a -r args=("$@")
 
   # pass the arguments to hook
-  trivy conf "$(pwd)" "${args[@]}"
+  trivy conf "$(pwd)" --exit-code=1 "${args[@]}"
 
   # return exit code to common::per_dir_hook
   local exit_code=$?