Merged in hotfix/OPT-356 (pull request #90)

[OPT-356] to main Approved-by: David Fernandez Vigo
iriusrisk · Aug 22, 2022 · 21c687c · 21c687c
2 parents 7a624b9 + b6e2890
commit 21c687c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/startleft/iac/mapping/mapper.py b/startleft/iac/mapping/mapper.py
@@ -477,6 +477,9 @@ def __get_parent_names(self, source_model, source_object, id_parents, component_
             else:
                 parent = [get_resource_name_from_resource_reference(parent) if is_terraform_resource_reference(parent) else parent]
 
+        if parent is None:
+            parent = [DEFAULT_TRUSTZONE]
+
         return parent, parents_from_component
 
     def __get_parent_id(self, parent_element, parents_from_component, component_name):

diff --git a/startleft/iac/mapping/sourcemodel.py b/startleft/iac/mapping/sourcemodel.py
@@ -213,11 +213,10 @@ def __search_with_default(self, obj, source, action):
 
     def __jmespath_search(self, search_path, source):
         try:
-            search = jmespath.search(search_path, source, options=self.jmespath_options)
+            return jmespath.search(search_path, source, options=self.jmespath_options)
 
-            return search if search is not None else []
         except:
-            return []
+            return None
 
     def __find_first_search(self, search_path_root, source):
         for search_path in search_path_root: