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

cfn_check/rendering/renderer.py

@@ -165,7 +165,9 @@ class Renderer:
     def _assemble_parameters(self, resources: YamlObject):
         params: dict[str, Data] = resources.get("Parameters", {})
         for param_name, param in params.items():
-            if default := param.get("Default"):
+            if isinstance(param, CommentedMap) and (
+                default := param.get("Default")
+            ):
                 self._parameters_with_defaults[param_name] = default
 
     def _resolve_tagged(self, root: CommentedMap, node: TaggedScalar | CommentedMap | CommentedSeq):
@@ -504,6 +506,8 @@ class Renderer:
         ):
             condition_key = self._resolve_subtree(root, condition_key)
 
+        result = self._resolve_subtree(root, self._conditions.get(condition_key))
+
         true_result = source[1]
         if isinstance(
             true_result,
@@ -512,35 +516,8 @@ class Renderer:
             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
+        return true_result if isinstance(result, bool) and result else false_result
     
     def _resolve_condition(
         self,

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

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

{cfn_check-0.6.0.dist-info → cfn_check-0.6.2.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=xbSPfjX6w-xcGULLJ_3m3k3PrnDNWdaB418OaVT-J8A,31389
+cfn_check/rendering/renderer.py,sha256=eYIYIVBbkbwWqnP7wxS7C_f4DD7tL8Izo4tfvwVA_rk,30812
 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.6.0.dist-info/licenses/LICENSE,sha256=EbCpGNzOkyQ53ig7J2Iwgmy4Og0dgHe8COo3WylhIKk,1069
+cfn_check-0.6.2.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.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,,
+cfn_check-0.6.2.dist-info/METADATA,sha256=-7DN9EqCSg1J-BrS2-0S-vqkwmWKDncCpzjsmqrW5Jg,20459
+cfn_check-0.6.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+cfn_check-0.6.2.dist-info/entry_points.txt,sha256=B4lCHoDHmwisABxKgRLShwqqFv7QwwDAFXoAChOnkwg,53
+cfn_check-0.6.2.dist-info/top_level.txt,sha256=hUn9Ya50yY1fpgWxEhG5iMgfMDDVX7qWQnM1xrgZnhM,18
+cfn_check-0.6.2.dist-info/RECORD,,