Merge branch 'main' into fix/CKV_AWS_342

bridgecrewio · Jul 12, 2023 · 085136c · 085136c
2 parents 2e703b3 + d92323f
commit 085136c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/checkov/kustomize/runner.py b/checkov/kustomize/runner.py
@@ -216,14 +216,20 @@ def _get_caller_line_range(self, root_folder: str, k8_file: str, origin_relative
         if caller_file_path not in self.definitions:
             return None
         caller_resource = self.definitions[caller_file_path][0]
+
+        if caller_file_path not in self.definitions_raw:
+            # As we cannot calculate better lines with the `calculate_code_lines` without the raw code,
+            # we can use the existing info in the resource
+            return caller_resource[START_LINE], caller_resource[END_LINE]
+
         raw_caller_resource = self.definitions_raw[caller_file_path]
 
         caller_raw_start_line = caller_resource[START_LINE]
         caller_raw_end_line = min(caller_resource[END_LINE], len(raw_caller_resource))
 
         _, caller_start_line, caller_end_line = calculate_code_lines(raw_caller_resource, caller_raw_start_line,
                                                                      caller_raw_end_line)
-        return (caller_start_line, caller_end_line)
+        return caller_start_line, caller_end_line
 
     def line_range(self, code_lines: list[tuple[int, str]]) -> list[int]:
         num_of_lines = len(code_lines)

diff --git a/checkov/version.py b/checkov/version.py
@@ -1 +1 @@
-version = '2.3.318'
+version = '2.3.319'
diff --git a/kubernetes/requirements.txt b/kubernetes/requirements.txt
@@ -1 +1 @@
-checkov==2.3.318
+checkov==2.3.319