From ce7749882e70f76add6247a2b5092a69877b6109 Mon Sep 17 00:00:00 2001 From: Barak Fatal Date: Mon, 17 Nov 2025 17:10:36 +0200 Subject: [PATCH 1/4] Test --- .../graph_builder/variable_rendering/evaluate_terraform.py | 1 + 1 file changed, 1 insertion(+) diff --git a/checkov/terraform/graph_builder/variable_rendering/evaluate_terraform.py b/checkov/terraform/graph_builder/variable_rendering/evaluate_terraform.py index 0e6f3b3918..87e97a3410 100644 --- a/checkov/terraform/graph_builder/variable_rendering/evaluate_terraform.py +++ b/checkov/terraform/graph_builder/variable_rendering/evaluate_terraform.py @@ -126,6 +126,7 @@ def replace_string_value(original_str: Any, str_to_replace: str, replaced_value: return original_str if keep_origin else str_to_replace string_without_interpolation = remove_interpolation(original_str, str_to_replace, escape_unrendered=False) + return string_without_interpolation.replace(str_to_replace, str(replaced_value)) From c9db8db0f425be4a3f61f1510e336684f53efed9 Mon Sep 17 00:00:00 2001 From: Barak Fatal Date: Tue, 18 Nov 2025 09:38:29 +0200 Subject: [PATCH 2/4] added debug print --- integration_tests/test_checkov_json_report.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration_tests/test_checkov_json_report.py b/integration_tests/test_checkov_json_report.py index 6fef287dc0..b93813b744 100644 --- a/integration_tests/test_checkov_json_report.py +++ b/integration_tests/test_checkov_json_report.py @@ -54,6 +54,8 @@ def validate_report(self, report_path): self.validate_report_not_empty(data) def validate_report_not_empty(self, report): + if "summary" not in report: + print("ERROR - summary not found in report, found keys: {keys}".format(keys=report)) self.assertEqual(report["summary"]["parsing_errors"], 0, f"expecting 0 parsing errors but got: {report['results']['parsing_errors']}") self.assertGreater(report["summary"]["failed"], 1, From ac87d44386ce160ec2722f5b7d8d154acc6968a0 Mon Sep 17 00:00:00 2001 From: Barak Fatal Date: Tue, 18 Nov 2025 09:51:17 +0200 Subject: [PATCH 3/4] kets --- integration_tests/test_checkov_json_report.py | 1 + 1 file changed, 1 insertion(+) diff --git a/integration_tests/test_checkov_json_report.py b/integration_tests/test_checkov_json_report.py index b93813b744..cb33bd3c1b 100644 --- a/integration_tests/test_checkov_json_report.py +++ b/integration_tests/test_checkov_json_report.py @@ -56,6 +56,7 @@ def validate_report(self, report_path): def validate_report_not_empty(self, report): if "summary" not in report: print("ERROR - summary not found in report, found keys: {keys}".format(keys=report)) + self.assertEqual(list(report.keys()), ["summary", "results"]) self.assertEqual(report["summary"]["parsing_errors"], 0, f"expecting 0 parsing errors but got: {report['results']['parsing_errors']}") self.assertGreater(report["summary"]["failed"], 1, From 0a732576ef9710e3f6afc518bf6b93881aaa71fb Mon Sep 17 00:00:00 2001 From: Barak Fatal Date: Tue, 18 Nov 2025 10:05:09 +0200 Subject: [PATCH 4/4] try to pin helm version in tests --- .github/workflows/pr-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 28f4e320f6..e3ecec4603 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -139,6 +139,7 @@ jobs: - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4 - uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3 with: + version: "v3.19.1" token: ${{ secrets.GITHUB_TOKEN }} - uses: imranismail/setup-kustomize@a76db1c6419124d51470b1e388c4b29476f495f1 # v2 if: ${{ runner.os != 'windows' }}