localstack-core 4.7.1.dev22__py3-none-any.whl → 4.7.1.dev24__py3-none-any.whl

localstack/services/certificatemanager/resource_providers/aws_certificatemanager_certificate_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class CertificateManagerCertificateProviderPlugin(CloudFormationResourceProvider
     name = "AWS::CertificateManager::Certificate"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.certificatemanager.resource_providers.aws_certificatemanager_certificate import (

localstack/services/cloudformation/cfn_utils.py

@@ -1,5 +1,5 @@
 import json
-from typing import Callable
+from collections.abc import Callable
 
 from localstack.utils.objects import recurse_object
 

localstack/services/cloudformation/deployment_utils.py

@@ -2,8 +2,8 @@ import builtins
 import json
 import logging
 import re
+from collections.abc import Callable
 from copy import deepcopy
-from typing import Callable, List
 
 from localstack import config
 from localstack.utils import common
@@ -88,7 +88,7 @@ def params_list_to_dict(param_name, key_attr_name="Key", value_attr_name="Value"
     return do_replace
 
 
-def lambda_keys_to_lower(key=None, skip_children_of: List[str] = None):
+def lambda_keys_to_lower(key=None, skip_children_of: list[str] = None):
     return (
         lambda account_id,
         region_name,

localstack/services/cloudformation/engine/changes.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, TypedDict
+from typing import Literal, TypedDict
 
 Action = str
 
@@ -6,11 +6,11 @@ Action = str
 class ResourceChange(TypedDict):
     Action: Action
     LogicalResourceId: str
-    PhysicalResourceId: Optional[str]
+    PhysicalResourceId: str | None
     ResourceType: str
     Scope: list
     Details: list
-    Replacement: Optional[Literal["False"]]
+    Replacement: Literal["False"] | None
 
 
 class ChangeConfig(TypedDict):

localstack/services/cloudformation/engine/entities.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from localstack.aws.api.cloudformation import Capability, ChangeSetType, Parameter
 from localstack.services.cloudformation.engine.parameters import (
@@ -52,14 +52,14 @@ class StackInstance:
 class CreateChangeSetInput(TypedDict):
     StackName: str
     Capabilities: list[Capability]
-    ChangeSetName: Optional[str]
-    ChangSetType: Optional[ChangeSetType]
+    ChangeSetName: str | None
+    ChangSetType: ChangeSetType | None
     Parameters: list[Parameter]
 
 
 class StackTemplate(TypedDict):
     StackName: str
-    ChangeSetName: Optional[str]
+    ChangeSetName: str | None
     Outputs: dict
     Resources: dict
 
@@ -83,9 +83,9 @@ class Stack:
         self,
         account_id: str,
         region_name: str,
-        metadata: Optional[CreateChangeSetInput] = None,
-        template: Optional[StackTemplate] = None,
-        template_body: Optional[str] = None,
+        metadata: CreateChangeSetInput | None = None,
+        template: StackTemplate | None = None,
+        template_body: str | None = None,
     ):
         self.account_id = account_id
         self.region_name = region_name
@@ -185,7 +185,7 @@ class Stack:
             result.setdefault(attr, [])
         return result
 
-    def set_stack_status(self, status: str, status_reason: Optional[str] = None):
+    def set_stack_status(self, status: str, status_reason: str | None = None):
         self.metadata["StackStatus"] = status
         if "FAILED" in status:
             self.metadata["StackStatusReason"] = status_reason or "Deployment failed"
@@ -428,10 +428,10 @@ class StackChangeSet(Stack):
     # V2 only
     def populate_update_graph(
         self,
-        before_template: Optional[dict],
-        after_template: Optional[dict],
-        before_parameters: Optional[dict],
-        after_parameters: Optional[dict],
+        before_template: dict | None,
+        after_template: dict | None,
+        before_parameters: dict | None,
+        after_parameters: dict | None,
     ) -> None:
         change_set_model = ChangeSetModel(
             before_template=before_template,

localstack/services/cloudformation/engine/parameters.py

@@ -19,7 +19,7 @@ Documentation extracted from AWS docs (https://docs.aws.amazon.com/AWSCloudForma
 """
 
 import logging
-from typing import Literal, Optional, TypedDict
+from typing import Literal, TypedDict
 
 from botocore.exceptions import ClientError
 
@@ -179,8 +179,8 @@ def convert_stack_parameters_to_dict(in_params: list[Parameter] | None) -> dict[
 class LegacyParameterProperties(TypedDict):
     Value: str
     ParameterType: str
-    ParameterValue: Optional[str]
-    ResolvedValue: Optional[str]
+    ParameterValue: str | None
+    ResolvedValue: str | None
 
 
 class LegacyParameter(TypedDict):

localstack/services/cloudformation/engine/template_deployer.py

@@ -4,7 +4,6 @@ import logging
 import re
 import traceback
 import uuid
-from typing import Optional
 
 from botocore.exceptions import ClientError
 
@@ -86,7 +85,7 @@ def get_attr_from_model_instance(
     attribute_name: str,
     resource_type: str,
     resource_id: str,
-    attribute_sub_name: Optional[str] = None,
+    attribute_sub_name: str | None = None,
 ) -> str:
     if resource["PhysicalResourceId"] == MOCK_REFERENCE:
         LOG.warning(
@@ -1029,7 +1028,7 @@ class TemplateDeployer:
             stack.set_resource_status(resource_id, f"{action}_IN_PROGRESS")
 
     def get_change_config(
-        self, action: str, resource: dict, change_set_id: Optional[str] = None
+        self, action: str, resource: dict, change_set_id: str | None = None
     ) -> ChangeConfig:
         result = ChangeConfig(
             **{
@@ -1105,10 +1104,10 @@ class TemplateDeployer:
         existing_stack,
         new_stack,
         # TODO: remove initialize argument from here, and determine action based on resource status
-        initialize: Optional[bool] = False,
+        initialize: bool | None = False,
         change_set_id=None,
-        append_to_changeset: Optional[bool] = False,
-        filter_unchanged_resources: Optional[bool] = False,
+        append_to_changeset: bool | None = False,
+        filter_unchanged_resources: bool | None = False,
     ) -> list[ChangeConfig]:
         old_resources = existing_stack.template["Resources"]
         new_resources = new_stack.template["Resources"]
@@ -1140,9 +1139,9 @@ class TemplateDeployer:
         self,
         existing_stack: Stack,
         new_stack: StackChangeSet,
-        change_set_id: Optional[str] = None,
-        initialize: Optional[bool] = False,
-        action: Optional[str] = None,
+        change_set_id: str | None = None,
+        initialize: bool | None = False,
+        action: str | None = None,
     ):
         old_resources = existing_stack.template["Resources"]
         new_resources = new_stack.template["Resources"]
@@ -1201,7 +1200,7 @@ class TemplateDeployer:
         self,
         changes: list[ChangeConfig],
         stack: Stack,
-        action: Optional[str] = None,
+        action: str | None = None,
         new_stack=None,
     ):
         def _run(*args):

localstack/services/cloudformation/engine/transformers.py

@@ -3,9 +3,10 @@ import json
 import logging
 import os
 import re
+from collections.abc import Callable
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Callable, Dict, Optional, Type, Union
+from typing import Any
 
 import boto3
 from botocore.exceptions import ClientError
@@ -27,7 +28,7 @@ SERVERLESS_TRANSFORM = "AWS::Serverless-2016-10-31"
 EXTENSIONS_TRANSFORM = "AWS::LanguageExtensions"
 SECRETSMANAGER_TRANSFORM = "AWS::SecretsManager-2020-07-23"
 
-TransformResult = Union[dict, str]
+TransformResult = dict | str
 
 
 @dataclass
@@ -83,7 +84,7 @@ class AwsIncludeTransformer(Transformer):
 
 
 # maps transformer names to implementing classes
-transformers: Dict[str, Type] = {"AWS::Include": AwsIncludeTransformer}
+transformers: dict[str, type] = {"AWS::Include": AwsIncludeTransformer}
 
 
 def apply_intrinsic_transformations(
@@ -449,7 +450,7 @@ def expand_fn_foreach(
 
 def apply_serverless_transformation(
     account_id: str, region_name: str, parsed_template: dict, template_parameters: dict
-) -> Optional[str]:
+) -> str | None:
     """only returns string when parsing SAM template, otherwise None"""
     # TODO: we might also want to override the access key ID to account ID
     region_before = os.environ.get("AWS_DEFAULT_REGION")

localstack/services/cloudformation/engine/types.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Optional, TypedDict
+from collections.abc import Callable
+from typing import Any, TypedDict
 
 # ---------------------
 # TYPES
@@ -25,16 +26,16 @@ class FuncDetailsValue(TypedDict):
     # - stack_name
     # - resources
     # - resource_id
-    parameters: Optional[ResourceDefinition | Callable[[dict, str, list[dict], str], dict]]
+    parameters: ResourceDefinition | Callable[[dict, str, list[dict], str], dict] | None
     """arguments to the function, or a function that generates the arguments to the function"""
     # Callable here takes the arguments
     # - result
     # - resource_id
     # - resources
     # - resource_type
-    result_handler: Optional[Callable[[dict, str, list[dict], str], None]]
+    result_handler: Callable[[dict, str, list[dict], str], None] | None
     """Take the result of the operation and patch the state of the resources, yuck..."""
-    types: Optional[dict[str, Callable]]
+    types: dict[str, Callable] | None
     """Possible type conversions"""
 
 

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

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import abc
 import enum
+from collections.abc import Generator
 from itertools import zip_longest
-from typing import Any, Final, Generator, Optional, TypedDict, Union, cast
+from typing import TYPE_CHECKING, Any, Final, TypedDict, cast
 
 from typing_extensions import TypeVar
 
@@ -11,6 +12,9 @@ from localstack.aws.api.cloudformation import ChangeAction
 from localstack.services.cloudformation.resource_provider import ResourceProviderExecutor
 from localstack.utils.strings import camel_to_snake_case
 
+if TYPE_CHECKING:
+    from localstack.services.cloudformation.v2.entities import EngineParameter
+
 T = TypeVar("T")
 
 
@@ -44,7 +48,7 @@ class NothingType:
         return False
 
 
-Maybe = Union[T, NothingType]
+Maybe = T | NothingType
 Nothing = NothingType()
 
 
@@ -86,7 +90,7 @@ class NormalisedGlobalTransformDefinition(TypedDict):
 
 
 class Scope(str):
-    _ROOT_SCOPE: Final[str] = str()
+    _ROOT_SCOPE: Final[str] = ""
     _SEPARATOR: Final[str] = "/"
 
     def __new__(cls, scope: str = _ROOT_SCOPE) -> Scope:
@@ -533,16 +537,17 @@ class ChangeSetModel:
 
     def __init__(
         self,
-        before_template: Optional[dict],
-        after_template: Optional[dict],
-        before_parameters: Optional[dict],
-        after_parameters: Optional[dict],
+        before_template: dict | None,
+        after_template: dict | None,
+        before_parameters: dict | None,
+        after_parameters: dict[str, EngineParameter] | None,
     ):
         self._before_template = before_template or Nothing
         self._after_template = after_template or Nothing
         self._before_parameters = before_parameters or Nothing
         self._after_parameters = after_parameters or Nothing
         self._visited_scopes = dict()
+        # TODO: move this modeling process to the `get_update_model` method as constructors shouldn't do work
         self._node_template = self._model(
             before_template=self._before_template, after_template=self._after_template
         )
@@ -1008,9 +1013,26 @@ class ChangeSetModel:
 
     def _visit_dynamic_parameter(self, parameter_name: str) -> ChangeSetEntity:
         scope = Scope("Dynamic").open_scope("Parameters")
-        scope_parameter, (before_parameter, after_parameter) = self._safe_access_in(
+        scope_parameter, (before_parameter_dct, after_parameter_dct) = self._safe_access_in(
             scope, parameter_name, self._before_parameters, self._after_parameters
         )
+
+        before_parameter = Nothing
+        if not is_nothing(before_parameter_dct):
+            before_parameter = (
+                before_parameter_dct.get("resolved_value")
+                or before_parameter_dct["given_value"]
+                or before_parameter_dct.get("default_value")
+            )
+
+        after_parameter = Nothing
+        if not is_nothing(after_parameter_dct):
+            after_parameter = (
+                after_parameter_dct.get("resolved_value")
+                or after_parameter_dct["given_value"]
+                or after_parameter_dct.get("default_value")
+            )
+
         parameter = self._visit_value(
             scope=scope_parameter, before_value=before_parameter, after_value=after_parameter
         )
@@ -1425,7 +1447,7 @@ class ChangeSetModel:
         return keys
 
     @staticmethod
-    def _name_if_intrinsic_function(value: Maybe[Any]) -> Optional[str]:
+    def _name_if_intrinsic_function(value: Maybe[Any]) -> str | None:
         if isinstance(value, dict):
             keys = ChangeSetModel._safe_keys_of(value)
             if len(keys) == 1:

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import json
-from typing import Final, Optional
+from typing import Final
 
 import localstack.aws.api.cloudformation as cfn_api
 from localstack.aws.api.cloudformation import Replacement
@@ -76,7 +76,7 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
             resource_name=logical_name_of_resource,
             node_template=self._change_set.update_model.node_template,
         )
-        node_property: Optional[NodeProperty] = self._get_node_property_for(
+        node_property: NodeProperty | None = self._get_node_property_for(
             property_name=attribute_name, node_resource=node_resource
         )
         if node_property is not None:
@@ -116,9 +116,9 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         self,
         logical_id: str,
         type_: str,
-        physical_id: Optional[str],
-        before_properties: Optional[PreprocProperties],
-        after_properties: Optional[PreprocProperties],
+        physical_id: str | None,
+        before_properties: PreprocProperties | None,
+        after_properties: PreprocProperties | None,
         # TODO: remove default
         requires_replacement: bool = False,
     ) -> None:
@@ -156,7 +156,7 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         )
 
     def _describe_resource_change(
-        self, name: str, before: Optional[PreprocResource], after: Optional[PreprocResource]
+        self, name: str, before: PreprocResource | None, after: PreprocResource | None
     ) -> None:
         if before == after:
             # unchanged: nothing to do.