localstack-core 4.4.1.dev60__py3-none-any.whl → 4.4.1.dev65__py3-none-any.whl

localstack/services/cloudformation/engine/v2/change_set_model_describer.py

@@ -8,7 +8,9 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
     NodeIntrinsicFunction,
     NodeProperty,
     NodeResource,
+    Nothing,
     PropertiesKey,
+    is_nothing,
 )
 from localstack.services.cloudformation.engine.v2.change_set_model_preproc import (
     ChangeSetModelPreproc,
@@ -53,8 +55,8 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         if isinstance(after_argument, str):
             after_argument = after_argument.split(".")
 
-        before = None
-        if before_argument:
+        before = Nothing
+        if not is_nothing(before_argument):
             before_logical_name_of_resource = before_argument[0]
             before_attribute_name = before_argument[1]
             before_node_resource = self._get_node_resource_for(
@@ -72,8 +74,8 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
                     property_name=before_attribute_name,
                 )
 
-        after = None
-        if after_argument:
+        after = Nothing
+        if not is_nothing(after_argument):
             after_logical_name_of_resource = after_argument[0]
             after_attribute_name = after_argument[1]
             after_node_resource = self._get_node_resource_for(
@@ -154,7 +156,7 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         if before == after:
             # unchanged: nothing to do.
             return
-        if before is not None and after is not None:
+        if not is_nothing(before) and not is_nothing(after):
             # Case: change on same type.
             if before.resource_type == after.resource_type:
                 # Register a Modified if changed.
@@ -184,7 +186,7 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
                     before_properties=None,
                     after_properties=after.properties,
                 )
-        elif before is not None:
+        elif not is_nothing(before):
             # Case: removal
             self._register_resource_change(
                 logical_id=name,
@@ -193,7 +195,7 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
                 before_properties=before.properties,
                 after_properties=None,
             )
-        elif after is not None:
+        elif not is_nothing(after):
             # Case: addition
             self._register_resource_change(
                 logical_id=name,

localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -11,6 +11,7 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
     NodeOutput,
     NodeParameter,
     NodeResource,
+    is_nothing,
 )
 from localstack.services.cloudformation.engine.v2.change_set_model_preproc import (
     ChangeSetModelPreproc,
@@ -113,13 +114,13 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             # There are no updates for this resource; iff the resource was previously
             # deployed, then the resolved details are copied in the current state for
             # references or other downstream operations.
-            if before is not None:
+            if not is_nothing(before):
                 before_logical_id = delta.before.logical_id
                 before_resource = self._before_resolved_resources.get(before_logical_id, dict())
                 self.resources[before_logical_id] = before_resource
 
         # Update the latest version of this resource for downstream references.
-        if after is not None:
+        if not is_nothing(after):
             after_logical_id = after.logical_id
             after_physical_id: str = self._after_resource_physical_id(
                 resource_logical_id=after_logical_id
@@ -132,7 +133,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
     ) -> PreprocEntityDelta[PreprocOutput, PreprocOutput]:
         delta = super().visit_node_output(node_output=node_output)
         after = delta.after
-        if after is None or (isinstance(after, PreprocOutput) and after.condition is False):
+        if is_nothing(after) or (isinstance(after, PreprocOutput) and after.condition is False):
             return delta
         self.outputs[delta.after.name] = delta.after.value
         return delta
@@ -142,7 +143,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
     ) -> None:
         # Changes are to be made about this resource.
         # TODO: this logic is a POC and should be revised.
-        if before is not None and after is not None:
+        if not is_nothing(before) and not is_nothing(after):
             # Case: change on same type.
             if before.resource_type == after.resource_type:
                 # Register a Modified if changed.
@@ -177,7 +178,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                     before_properties=None,
                     after_properties=after.properties,
                 )
-        elif before is not None:
+        elif not is_nothing(before):
             # Case: removal
             # XXX hacky, stick the previous resources' properties into the payload
             # XXX hacky, stick the previous resources' properties into the payload
@@ -190,7 +191,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 before_properties=before_properties,
                 after_properties=None,
             )
-        elif after is not None:
+        elif not is_nothing(after):
             # Case: addition
             self._execute_resource_action(
                 action=ChangeAction.Add,