Merge branch 'release-2.7.1' of orahub.oci.oraclecorp.com:nace-shared…

…-services/cis-oci-landing-zone into release-2.7.1
oci-landing-zones · Jan 4, 2024 · 4d8504e · 4d8504e
2 parents dc96dfe + 1211ce7
commit 4d8504e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/scripts/cis_reports.py b/scripts/cis_reports.py
@@ -3374,13 +3374,17 @@ def __search_resources_in_root_compartment(self):
 
                 for item in structured_search_all_resources:
                     # ignoring global resources like IAM
-                    if item.identifier.split('.')[3]:
-                        record = {
-                            "display_name": item.display_name,
-                            "id": item.identifier,
-                            "region": region_key
-                        }
-                        self.cis_foundations_benchmark_1_2['5.2']['Total'].append(item)
+                    try:
+                        if item.identifier.split('.')[3]:
+                            record = {
+                                "display_name": item.display_name,
+                                "id": item.identifier,
+                                "region": region_key
+                            }
+                            self.cis_foundations_benchmark_1_2['5.2']['Total'].append(item)
+                    except:
+                        self.__errors.append({"id" : "search_resources_in_root_compartment Invalid OCID", "error" : str(item)})
+                        debug(f'__search_resources_in_root_compartment: Invalid OCID: {str(item)}')
 
             except Exception as e:
                 raise RuntimeError(