cfn-check 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

cfn_check/rendering/renderer.py

@@ -26,6 +26,7 @@ class Renderer:
         self._mappings = CommentedMap()
         self._parameters_with_defaults: dict[str, str | int | float | bool | None] = {}
         self._selected_mappings = CommentedMap()
+        self._conditions = CommentedMap()
         self._references: dict[str, str] = {}
         self._resources: dict[str, YamlObject] = CommentedMap()
         self._attributes: dict[str, str] = {}
@@ -39,7 +40,13 @@ class Renderer:
             '!Base64': self._resolve_base64,
             '!Split': self._resolve_split,
             '!Select': self._resolve_select,
-            '!ToJsonString': self._resolve_to_json_string,
+            '!ToJsonString': self._resolve_tree_to_json,
+            '!Equals': self._resolve_equals,
+            '!If': self._resolve_if,
+            '!Condition': self._resolve_condition,
+            '!And': self._resolve_and,
+            '!Not': self._resolve_not,
+            '!Or': self._resolve_or
         }
 
     def render(
@@ -79,13 +86,13 @@ class Renderer:
             self._selected_mappings = mappings
 
         self._resources = template.get('Resources', CommentedMap())
+        self._conditions = template.get('Conditions', CommentedMap())
 
         return self._resolve_tree(template)
 
     def _resolve_tree(self, root: YamlObject):
         self.items.clear()
         self.items.append((None, None, root))
-        self.items.append((None, None, root))
 
         while self.items:
             parent, accessor, node = self.items.pop()
@@ -98,9 +105,8 @@ class Renderer:
                     parent[accessor] = resolved
 
             elif isinstance(node, CommentedMap):
-                if isinstance(node.tag, Tag) and node.tag.value is not None and parent and (
-                    resolved_node := self._resolve_tagged(root, node)
-                ):
+                if isinstance(node.tag, Tag) and node.tag.value is not None and parent:
+                    resolved_node = self._resolve_tagged(root, node)
                     parent[accessor] = resolved_node
 
                 elif isinstance(node.tag, Tag) and node.tag.value is not None:
@@ -117,13 +123,13 @@ class Renderer:
 
             elif isinstance(node, CommentedSeq):
                 
-                if isinstance(node.tag, Tag) and node.tag.value is not None and parent and (
-                    resolved_node := self._resolve_tagged(root, node)
-                ):
+                if isinstance(node.tag, Tag) and node.tag.value is not None and parent:
+                    resolved_node = self._resolve_tagged(root, node)
                     parent[accessor] = resolved_node
 
                 elif isinstance(node.tag, Tag) and node.tag.value is not None:
                     node = self._resolve_tagged(root, node)
+                    
                     for idx, val in enumerate(reversed(node)):
                         self.items.append((node, idx, val))
 
@@ -328,7 +334,7 @@ class Renderer:
         resolved = self._resolve_subtree(root, subselction)
 
         if not isinstance(resolved, CommentedSeq):
-            return resolved
+            return source
 
         return delimiter.join([
             str(self._resolve_tagged(
@@ -453,7 +459,195 @@ class Renderer:
         
         return target[index]
     
-    def _resolve_to_json_string(
+    def _resolve_equals(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, TaggedScalar),
+        ) or len(source) != 2:
+            return source
+        
+        item_a = source[0]
+        if isinstance(
+            item_a,
+            (CommentedMap, CommentedSeq, TaggedScalar),
+        ):
+            item_a = self._resolve_subtree(root, item_a)
+
+        item_b = source[1]
+        if isinstance(
+            item_b,
+            (CommentedMap, CommentedSeq, TaggedScalar),
+        ):
+            item_b = self._resolve_subtree(root, item_b)
+
+        return item_a == item_b
+
+    def _resolve_if(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, TaggedScalar),
+        ) or len(source) != 3:
+            return source
+        
+        condition_key = source[0]
+        if isinstance(
+            condition_key,
+            (CommentedMap, CommentedSeq, TaggedScalar),
+        ):
+            condition_key = self._resolve_subtree(root, condition_key)
+
+        true_result = source[1]
+        if isinstance(
+            true_result,
+            (CommentedMap, CommentedSeq, TaggedScalar),
+        ):
+            true_result = self._resolve_subtree(root, true_result)
+
+        false_result = source[2]
+        if isinstance(
+            true_result,
+            (CommentedMap, CommentedSeq, TaggedScalar),
+        ):
+            false_result = self._resolve_subtree(root, false_result)
+
+        if (
+            condition := self._conditions.get(condition_key)
+        ) and isinstance(
+            condition,
+            (CommentedMap, CommentedSeq, TaggedScalar)
+        ) and (
+            result := self._resolve_subtree(root, condition)
+        ) and isinstance(
+            result,
+            bool,
+        ):
+            
+            return true_result if result else False
+
+        elif (
+            condition := self._conditions.get(condition_key)
+        ) and isinstance(
+            condition,
+            bool,
+        ):
+            return true_result if condition else False
+        
+        return source
+    
+    def _resolve_condition(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, CommentedSeq),
+        ):
+            return source
+        
+        if (
+            condition := self._conditions.get(source.value)
+        ) and isinstance(
+            condition,
+            (CommentedMap, CommentedSeq, TaggedScalar)
+        ) and (
+            result := self._resolve_subtree(root, condition)
+        ) and isinstance(
+            result,
+            bool,
+        ):
+            return result
+        
+        elif (
+            condition := self._conditions.get(source.value)
+        ) and isinstance(
+            condition,
+            bool,
+        ):
+            return condition
+        
+        return source
+    
+    def _resolve_and(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, TaggedScalar),
+        ):
+            return source
+        
+        resolved = self._resolve_subtree(root, CommentedSeq([
+            item for item in source
+        ]))
+        if not isinstance(resolved, CommentedSeq):
+            return source
+        
+    
+        for node in resolved:
+            if not isinstance(node, bool):
+                return source
+        
+        return all(resolved)
+    
+    def _resolve_not(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, TaggedScalar),
+        ):
+            return source
+        
+        resolved = self._resolve_subtree(root, CommentedSeq([
+            item for item in  source
+        ]))
+        if not isinstance(resolved, CommentedSeq):
+            return source
+        
+        for node in resolved:
+            if not isinstance(node, bool):
+                return source
+        
+        return not all(resolved)
+    
+    def _resolve_or(
+        self,
+        root: CommentedMap,
+        source: CommentedSeq | CommentedMap | TaggedScalar,
+    ):
+        if isinstance(
+            source,
+            (CommentedMap, TaggedScalar),
+        ):
+            return source
+        
+        resolved = self._resolve_subtree(root, CommentedSeq([
+            item for item in source
+        ]))
+        if not isinstance(resolved, CommentedSeq):
+            return source
+        
+    
+        for node in resolved:
+            if not isinstance(node, bool):
+                return source
+        
+        return any(resolved)
+
+    def _resolve_tree_to_json(
         self,
         root: CommentedMap,
         source: CommentedSeq | CommentedMap | TaggedScalar,
@@ -470,6 +664,11 @@ class Renderer:
                 ):
                     parent[accessor] = resolved
 
+                elif (
+                    resolved := self._resolve_tagged(root, node)
+                ):
+                    source = resolved
+
             elif isinstance(node, CommentedMap):
                 if isinstance(node.tag, Tag) and node.tag.value is not None and parent and (
                     resolved_node := self._resolve_tagged(root, node)
@@ -518,7 +717,7 @@ class Renderer:
         - CommentedMap/CommentedSeq are traversed.
         """
         stack: list[tuple[CommentedMap | CommentedSeq | None, Any | None, Any]] = [(None, None, source)]
-
+        
         while stack:
             parent, accessor, node = stack.pop()
             if isinstance(node, TaggedScalar):
@@ -528,10 +727,14 @@ class Renderer:
                 ):
                     parent[accessor] = resolved
 
-            elif isinstance(node, CommentedMap):
-                if isinstance(node.tag, Tag) and node.tag.value is not None and parent and (
-                    resolved_node := self._resolve_tagged(root, node)
+                elif (
+                    resolved := self._resolve_tagged(root, node)
                 ):
+                    source = resolved
+
+            elif isinstance(node, CommentedMap):
+                if isinstance(node.tag, Tag) and node.tag.value is not None and parent:
+                    resolved_node = self._resolve_tagged(root, node)
                     parent[accessor] = resolved_node
 
                 elif isinstance(node.tag, Tag) and node.tag.value is not None:
@@ -547,9 +750,8 @@ class Renderer:
                         stack.append((node, k, node[k]))
 
             elif isinstance(node, CommentedSeq):
-                if isinstance(node.tag, Tag) and node.tag.value is not None and parent and (
-                    resolved_node := self._resolve_tagged(root, node)
-                ):
+                if isinstance(node.tag, Tag) and node.tag.value is not None and parent:
+                    resolved_node = self._resolve_tagged(root, node)
                     parent[accessor] = resolved_node
 
                 elif isinstance(node.tag, Tag) and node.tag.value is not None:

{cfn_check-0.5.0.dist-info → cfn_check-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfn-check
-Version: 0.5.0
+Version: 0.6.0
 Summary: Validate Cloud Formation
 Author-email: Ada Lundhe <adalundhe@lundhe.audio>
 License: MIT License

{cfn_check-0.5.0.dist-info → cfn_check-0.6.0.dist-info}/RECORD

@@ -19,7 +19,7 @@ cfn_check/evaluation/parsing/token_type.py,sha256=E5AVBerinBszMLjjc7ejwSSWEc0p0J
 cfn_check/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfn_check/logging/models.py,sha256=-tBaK6p8mJ0cO8h2keEJ-VmtFX_VW4XzwAw2PtqbkF0,490
 cfn_check/rendering/__init__.py,sha256=atcbddYun4YHyY7bVGA9CgEYzzXpYzvkx9_Kg-gnD5w,42
-cfn_check/rendering/renderer.py,sha256=mPLyXyv0yUsCZnKuLZg8yDN1NQlFivX-P8_bwhQqzXI,25903
+cfn_check/rendering/renderer.py,sha256=xbSPfjX6w-xcGULLJ_3m3k3PrnDNWdaB418OaVT-J8A,31389
 cfn_check/rendering/utils.py,sha256=MNaKePylbJ9Bs4kjuoV0PpCmPJYttPXXvKQILemCrUI,489
 cfn_check/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfn_check/rules/rule.py,sha256=_cKNQ5ciJgPj-exmtBUz31cU2lxWYxw2n2NWIlhYc3s,635
@@ -27,13 +27,13 @@ cfn_check/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 cfn_check/shared/types.py,sha256=-om3DyZsjK_tJd-I8SITkoE55W0nB2WA3LOc87Cs7xI,414
 cfn_check/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfn_check/validation/validator.py,sha256=Z6S6T_4yQW1IUa5Kv3ohR9U8NDrhTvBadW2FEM8TRL8,1478
-cfn_check-0.5.0.dist-info/licenses/LICENSE,sha256=EbCpGNzOkyQ53ig7J2Iwgmy4Og0dgHe8COo3WylhIKk,1069
+cfn_check-0.6.0.dist-info/licenses/LICENSE,sha256=EbCpGNzOkyQ53ig7J2Iwgmy4Og0dgHe8COo3WylhIKk,1069
 example/multitag.py,sha256=QQfcRERGEDgTUCGqWRqRbXHrLwSX4jEOFq8ED4NJnz8,636
 example/pydantic_rules.py,sha256=6NFtDiaqmnYWt6oZIWB7AO_v5LJoZVOGXrmEe2_J_rI,4162
 example/renderer_test.py,sha256=XG5PVTSHztYXHrBw4bpwVuuYt1JNZdtLGJ-DZ9wPjFM,741
 example/rules.py,sha256=mWHB0DK283lb0CeSHgnyO5qiVTJJpybuwWXb4Yoa3zQ,3148
-cfn_check-0.5.0.dist-info/METADATA,sha256=KJXT9Yc29NfwClW04f0TcQe1gI7iu82mNV_MpLb2aRg,20459
-cfn_check-0.5.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-cfn_check-0.5.0.dist-info/entry_points.txt,sha256=B4lCHoDHmwisABxKgRLShwqqFv7QwwDAFXoAChOnkwg,53
-cfn_check-0.5.0.dist-info/top_level.txt,sha256=hUn9Ya50yY1fpgWxEhG5iMgfMDDVX7qWQnM1xrgZnhM,18
-cfn_check-0.5.0.dist-info/RECORD,,
+cfn_check-0.6.0.dist-info/METADATA,sha256=YhkiamHlnRXbS6bVDUiTiWPHU4BgEwGqVKgHoCLBN28,20459
+cfn_check-0.6.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+cfn_check-0.6.0.dist-info/entry_points.txt,sha256=B4lCHoDHmwisABxKgRLShwqqFv7QwwDAFXoAChOnkwg,53
+cfn_check-0.6.0.dist-info/top_level.txt,sha256=hUn9Ya50yY1fpgWxEhG5iMgfMDDVX7qWQnM1xrgZnhM,18
+cfn_check-0.6.0.dist-info/RECORD,,