Merge branch 'main' into cf-global-support

CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 
-## [Unreleased](https://github.com/bridgecrewio/checkov/compare/3.2.230...HEAD)
+## [Unreleased](https://github.com/bridgecrewio/checkov/compare/3.2.232...HEAD)
+
+## [3.2.232](https://github.com/bridgecrewio/checkov/compare/3.2.230...3.2.232) - 2024-08-19
+
+### Bug Fix
+
+- **general:** add try except to loads file - [#6668](https://github.com/bridgecrewio/checkov/pull/6668)
+- **secrets:** duplications suppressions for secrets - [#6665](https://github.com/bridgecrewio/checkov/pull/6665)
 
 ## [3.2.230](https://github.com/bridgecrewio/checkov/compare/3.2.228...3.2.230) - 2024-08-18
 

checkov/ansible/graph_builder/local_graph.py

@@ -142,8 +142,11 @@ def get_files_definitions(root_folder: str | Path) -> dict[str | Path, dict[str,
         file_paths = get_scannable_file_paths(root_folder=root_folder)
 
         for file_path in file_paths:
-            result = parse_file(f=file_path)
-            if result is not None:
-                definitions[file_path] = result[0]
+            try:
+                result = parse_file(f=file_path)
+                if result is not None:
+                    definitions[file_path] = result[0]
+            except Exception as err:
+                logging.warning(f'fail to pars file {file_path}, {err}')
 
         return definitions

checkov/common/parsers/yaml/loader.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 from collections.abc import Hashable
 from pathlib import Path
 from typing import Any, TYPE_CHECKING
@@ -17,13 +18,14 @@ def loads(content: str) -> list[dict[str, Any]]:
     """
     Load the given YAML string
     """
-
-    template = list(yaml.load_all(content, Loader=SafeLineLoader))
-
+    try:
+        template = list(yaml.load_all(content, Loader=SafeLineLoader))
+    except Exception as e:
+        logging.warning(f'Fail to load yaml content, {e}')
+        template = [None]
     # Convert an empty file to an empty dict
     if template is None:
         template = {}
-
     return template
 
 

checkov/version.py

@@ -1 +1 @@
-version = '3.2.230'
+version = '3.2.233'

kubernetes/requirements.txt

@@ -1 +1 @@
-checkov==3.2.230
+checkov==3.2.233