localstack-core 4.14.1.dev56__tar.gz → 4.14.1.dev69__tar.gz

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/CODEOWNERS

@@ -166,10 +166,10 @@
 /tests/unit/services/kms/ @k-a-il
 
 # lambda
-/localstack-core/localstack/aws/api/lambda_/ @joe4dev @dfangl @gregfurman
-/localstack-core/localstack/services/lambda_/ @joe4dev @dfangl @gregfurman
-/tests/aws/services/lambda_/ @joe4dev @dfangl @gregfurman
-/tests/unit/services/lambda_/ @joe4dev @dfangl @gregfurman
+/localstack-core/localstack/aws/api/lambda_/ @joe4dev @dfangl
+/localstack-core/localstack/services/lambda_/ @joe4dev @dfangl
+/tests/aws/services/lambda_/ @joe4dev @dfangl
+/tests/unit/services/lambda_/ @joe4dev @dfangl
 
 # logs
 /localstack-core/localstack/aws/api/logs/ @pinzon @steffyP
@@ -184,7 +184,7 @@
 /tests/unit/services/opensearch/ @alexrashed @silv-io
 
 # pipes
-/localstack-core/localstack/aws/api/pipes/ @tiurin @gregfurman @joe4dev @carole-lavillonniere
+/localstack-core/localstack/aws/api/pipes/ @tiurin @joe4dev @carole-lavillonniere
 
 # resourcegroupstaggingapi
 /localstack-core/localstack/aws/api/resourcegroupstaggingapi/ @aidehn
@@ -229,10 +229,10 @@
 /tests/unit/services/sns/ @bentsku @baermat
 
 # sqs
-/localstack-core/localstack/aws/api/sqs/ @baermat @gregfurman @thrau
-/localstack-core/localstack/services/sqs/ @baermat @gregfurman @thrau
-/tests/aws/services/sqs/ @baermat @gregfurman @thrau
-/tests/unit/services/sqs/ @baermat @gregfurman @thrau
+/localstack-core/localstack/aws/api/sqs/ @baermat @thrau
+/localstack-core/localstack/services/sqs/ @baermat @thrau
+/tests/aws/services/sqs/ @baermat @thrau
+/tests/unit/services/sqs/ @baermat @thrau
 
 # ssm
 /localstack-core/localstack/aws/api/ssm/ @viren-nadkarni @dominikschubert
@@ -240,10 +240,10 @@
 /tests/aws/services/ssm/ @viren-nadkarni @dominikschubert
 
 # stepfunctions
-/localstack-core/localstack/aws/api/stepfunctions/ @tiurin @joe4dev @gregfurman
-/localstack-core/localstack/services/stepfunctions/ @tiurin @joe4dev @gregfurman
-/tests/aws/services/stepfunctions/ @tiurin @joe4dev @gregfurman
-/tests/unit/services/stepfunctions/ @tiurin @joe4dev @gregfurman
+/localstack-core/localstack/aws/api/stepfunctions/ @tiurin @joe4dev
+/localstack-core/localstack/services/stepfunctions/ @tiurin @joe4dev
+/tests/aws/services/stepfunctions/ @tiurin @joe4dev
+/tests/unit/services/stepfunctions/ @tiurin @joe4dev
 
 # sts
 /localstack-core/localstack/aws/api/sts/ @pinzon @dfangl

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/Dockerfile.s3

@@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
         # Install dependencies to add additional repos
         apt-get install -y --no-install-recommends \
             # Runtime packages (groff-base is necessary for AWS CLI help)
-             ca-certificates curl make openssl
+             ca-certificates curl make openssl jq
 # TODO: add this if we need the DNS server: iputils-ping iproute2
 
 SHELL [ "/bin/bash", "-c" ]
@@ -101,7 +101,8 @@ RUN echo /usr/lib/localstack/python-packages/lib/python3.13/site-packages > loca
 # expose edge service and debugpy
 EXPOSE 4566 5678
 
-HEALTHCHECK --interval=10s --start-period=15s --retries=5 --timeout=10s CMD /opt/code/localstack/.venv/bin/localstack status services --format=json
+# the healthcheck does not support GATEWAY_LISTEN configuration, S3 image should only be used at 4566
+HEALTHCHECK --interval=10s --start-period=15s --retries=5 --timeout=10s CMD curl -s http://localhost:4566/_localstack/health | jq ".services.s3" | grep -q "running" || exit 1
 
 # default volume directory
 VOLUME /var/lib/localstack

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.14.1.dev56
+Version: 4.14.1.dev69
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0
@@ -27,8 +27,8 @@ Requires-Dist: rich>=12.3.0
 Requires-Dist: requests>=2.20.0
 Requires-Dist: semver>=2.10
 Provides-Extra: base-runtime
-Requires-Dist: boto3==1.42.63; extra == "base-runtime"
-Requires-Dist: botocore==1.42.63; extra == "base-runtime"
+Requires-Dist: boto3==1.42.68; extra == "base-runtime"
+Requires-Dist: botocore==1.42.68; extra == "base-runtime"
 Requires-Dist: awscrt!=0.27.1,>=0.13.14; extra == "base-runtime"
 Requires-Dist: cbor2>=5.5.0; extra == "base-runtime"
 Requires-Dist: dill==0.3.6; extra == "base-runtime"
@@ -51,7 +51,7 @@ Requires-Dist: xmltodict>=0.13.0; extra == "base-runtime"
 Requires-Dist: rolo>=0.8.1; extra == "base-runtime"
 Provides-Extra: runtime
 Requires-Dist: localstack-core[base-runtime]; extra == "runtime"
-Requires-Dist: awscli==1.44.53; extra == "runtime"
+Requires-Dist: awscli==1.44.58; extra == "runtime"
 Requires-Dist: airspeed-ext>=0.6.3; extra == "runtime"
 Requires-Dist: antlr4-python3-runtime==4.13.2; extra == "runtime"
 Requires-Dist: apispec>=5.1.1; extra == "runtime"

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/api/apigateway/__init__.py

@@ -191,6 +191,7 @@ class SecurityPolicy(StrEnum):
     SecurityPolicy_TLS13_1_3_FIPS_2025_09 = "SecurityPolicy_TLS13_1_3_FIPS_2025_09"
     SecurityPolicy_TLS13_1_2_PFS_PQ_2025_09 = "SecurityPolicy_TLS13_1_2_PFS_PQ_2025_09"
     SecurityPolicy_TLS13_1_2_FIPS_PQ_2025_09 = "SecurityPolicy_TLS13_1_2_FIPS_PQ_2025_09"
+    SecurityPolicy_TLS13_1_2_FIPS_PFS_PQ_2025_09 = "SecurityPolicy_TLS13_1_2_FIPS_PFS_PQ_2025_09"
     SecurityPolicy_TLS13_1_2_PQ_2025_09 = "SecurityPolicy_TLS13_1_2_PQ_2025_09"
     SecurityPolicy_TLS13_1_2_2021_06 = "SecurityPolicy_TLS13_1_2_2021_06"
     SecurityPolicy_TLS13_2025_EDGE = "SecurityPolicy_TLS13_2025_EDGE"

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/api/config/__init__.py

@@ -83,7 +83,6 @@ StackArn = str
 String = str
 StringWithCharLimit1024 = str
 StringWithCharLimit128 = str
-StringWithCharLimit2048 = str
 StringWithCharLimit256 = str
 StringWithCharLimit256Min0 = str
 StringWithCharLimit64 = str
@@ -2192,7 +2191,7 @@ OrganizationConfigRuleTriggerTypeNoSNs = list[OrganizationConfigRuleTriggerTypeN
 class OrganizationCustomPolicyRuleMetadataNoPolicy(TypedDict, total=False):
     Description: StringWithCharLimit256Min0 | None
     OrganizationConfigRuleTriggerTypes: OrganizationConfigRuleTriggerTypeNoSNs | None
-    InputParameters: StringWithCharLimit2048 | None
+    InputParameters: StringWithCharLimit1024 | None
     MaximumExecutionFrequency: MaximumExecutionFrequency | None
     ResourceTypesScope: ResourceTypesScope | None
     ResourceIdScope: StringWithCharLimit768 | None
@@ -2210,7 +2209,7 @@ class OrganizationCustomRuleMetadata(TypedDict, total=False):
     Description: StringWithCharLimit256Min0 | None
     LambdaFunctionArn: StringWithCharLimit256
     OrganizationConfigRuleTriggerTypes: OrganizationConfigRuleTriggerTypes
-    InputParameters: StringWithCharLimit2048 | None
+    InputParameters: StringWithCharLimit1024 | None
     MaximumExecutionFrequency: MaximumExecutionFrequency | None
     ResourceTypesScope: ResourceTypesScope | None
     ResourceIdScope: StringWithCharLimit768 | None
@@ -2221,7 +2220,7 @@ class OrganizationCustomRuleMetadata(TypedDict, total=False):
 class OrganizationManagedRuleMetadata(TypedDict, total=False):
     Description: StringWithCharLimit256Min0 | None
     RuleIdentifier: StringWithCharLimit256
-    InputParameters: StringWithCharLimit2048 | None
+    InputParameters: StringWithCharLimit1024 | None
     MaximumExecutionFrequency: MaximumExecutionFrequency | None
     ResourceTypesScope: ResourceTypesScope | None
     ResourceIdScope: StringWithCharLimit768 | None
@@ -2969,7 +2968,7 @@ class ListTagsForResourceResponse(TypedDict, total=False):
 class OrganizationCustomPolicyRuleMetadata(TypedDict, total=False):
     Description: StringWithCharLimit256Min0 | None
     OrganizationConfigRuleTriggerTypes: OrganizationConfigRuleTriggerTypeNoSNs | None
-    InputParameters: StringWithCharLimit2048 | None
+    InputParameters: StringWithCharLimit1024 | None
     MaximumExecutionFrequency: MaximumExecutionFrequency | None
     ResourceTypesScope: ResourceTypesScope | None
     ResourceIdScope: StringWithCharLimit768 | None

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/api/opensearch/__init__.py

@@ -832,6 +832,7 @@ class AddDirectQueryDataSourceRequest(ServiceRequest):
     DataSourceType: DirectQueryDataSourceType
     Description: DirectQueryDataSourceDescription | None
     OpenSearchArns: DirectQueryOpenSearchARNList
+    DataSourceAccessPolicy: PolicyDocument | None
     TagList: TagList | None
 
 
@@ -1295,6 +1296,7 @@ class IamIdentityCenterOptionsInput(TypedDict, total=False):
 class DataSource(TypedDict, total=False):
     dataSourceArn: ARN | None
     dataSourceDescription: DataSourceDescription | None
+    iamRoleForDataSourceArn: RoleArn | None
 
 
 DataSources = list[DataSource]
@@ -2247,6 +2249,7 @@ class GetDirectQueryDataSourceResponse(TypedDict, total=False):
     DataSourceType: DirectQueryDataSourceType | None
     Description: DirectQueryDataSourceDescription | None
     OpenSearchArns: DirectQueryOpenSearchARNList | None
+    DataSourceAccessPolicy: PolicyDocument | None
     DataSourceArn: String | None
 
 
@@ -2616,6 +2619,7 @@ class UpdateDirectQueryDataSourceRequest(ServiceRequest):
     DataSourceType: DirectQueryDataSourceType
     Description: DirectQueryDataSourceDescription | None
     OpenSearchArns: DirectQueryOpenSearchARNList
+    DataSourceAccessPolicy: PolicyDocument | None
 
 
 class UpdateDirectQueryDataSourceResponse(TypedDict, total=False):
@@ -2755,6 +2759,7 @@ class OpensearchApi:
         data_source_type: DirectQueryDataSourceType,
         open_search_arns: DirectQueryOpenSearchARNList,
         description: DirectQueryDataSourceDescription | None = None,
+        data_source_access_policy: PolicyDocument | None = None,
         tag_list: TagList | None = None,
         **kwargs,
     ) -> AddDirectQueryDataSourceResponse:
@@ -3404,6 +3409,7 @@ class OpensearchApi:
         data_source_type: DirectQueryDataSourceType,
         open_search_arns: DirectQueryOpenSearchARNList,
         description: DirectQueryDataSourceDescription | None = None,
+        data_source_access_policy: PolicyDocument | None = None,
         **kwargs,
     ) -> UpdateDirectQueryDataSourceResponse:
         raise NotImplementedError

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/api/s3/__init__.py

@@ -273,6 +273,11 @@ class BucketLogsPermission(StrEnum):
     WRITE = "WRITE"
 
 
+class BucketNamespace(StrEnum):
+    account_regional = "account-regional"
+    global_ = "global"
+
+
 class BucketType(StrEnum):
     Directory = "Directory"
 
@@ -1626,6 +1631,7 @@ class CreateBucketRequest(ServiceRequest):
     GrantWriteACP: GrantWriteACP | None
     ObjectLockEnabledForBucket: ObjectLockEnabledForBucket | None
     ObjectOwnership: ObjectOwnership | None
+    BucketNamespace: BucketNamespace | None
 
 
 class CreateMultipartUploadOutput(TypedDict, total=False):
@@ -3955,6 +3961,7 @@ class S3Api:
         grant_write_acp: GrantWriteACP | None = None,
         object_lock_enabled_for_bucket: ObjectLockEnabledForBucket | None = None,
         object_ownership: ObjectOwnership | None = None,
+        bucket_namespace: BucketNamespace | None = None,
         **kwargs,
     ) -> CreateBucketOutput:
         raise NotImplementedError

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/connect.py

@@ -15,7 +15,7 @@ from collections.abc import Callable
 from functools import lru_cache, partial
 from random import choice
 from socket import socket
-from typing import Any, Generic, TypedDict, TypeVar
+from typing import Any, Generic, Self, TypedDict, TypeVar
 
 import dns.message
 import dns.query
@@ -149,14 +149,17 @@ INTERNAL_REQUEST_PARAMS_HEADER = "x-localstack-data"
 
 class InternalRequestParameters(TypedDict):
     """
-    LocalStack Data Transfer Object.
+    LocalStack Data Transfer Object (DTO).
 
-    This is sent with every internal request and contains any additional information
-    LocalStack might need for the purpose of policy enforcement. It is serialised
+    This is sent for internal requests and contains any additional information
+    LocalStack might need (e.g., IAM policy enforcement). The DTO is serialised
     into text and sent in the request header.
 
     Attributes can be added as needed. The keys should roughly correspond to:
     https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_condition-keys.html
+
+    Recommendation: Typed LocalStack-internal metadata go here and other headers such as the
+    AWS X-Amzn-Trace-Id go into .custom_headers(...).
     """
 
     source_arn: str | None
@@ -183,16 +186,27 @@ T = TypeVar("T")
 
 
 class MetadataRequestInjector(Generic[T]):
-    def __init__(self, client: T, params: dict[str, str] | None = None):
+    def __init__(
+        self,
+        client: T,
+        params: dict[str, str] | None = None,
+        custom_headers: dict[str, str] | None = None,
+    ):
         self._client = client
         self._params = params
+        self._custom_headers = custom_headers
 
     def __getattr__(self, item):
         target = getattr(self._client, item)
         if not isinstance(target, Callable):
             return target
-        if self._params:
-            return partial(target, **self._params)
+        if self._params or self._custom_headers:
+            kwargs = {}
+            if self._params:
+                kwargs = self._params
+            if self._custom_headers:
+                kwargs["_CustomHeaders"] = self._custom_headers
+            return partial(target, **kwargs)
         else:
             return target
 
@@ -201,24 +215,24 @@ class MetadataRequestInjector(Generic[T]):
         source_arn: str | None = None,
         service_principal: str | None = None,
         trace_visibility: TraceVisibility | None = None,
-    ) -> T:
+    ) -> T | Self:
         """
-        Returns a new client instance preset with the given request metadata.
-        Identical to providing _ServicePrincipal, _SourceArn or _TraceVisibilty directly as operation arguments but typing
-        compatible.
+        Returns a new client instance preset with the given request metadata or Self for chaining.
+        Identical to providing _ServicePrincipal, _SourceArn, or _TraceVisibilty
+        directly as operation arguments but typing compatible.
 
         Raw example: lambda_client.invoke(FunctionName="fn", _SourceArn="...")
         Injector example: lambda_client.request_metadata(source_arn="...").invoke(FunctionName="fn")
-        Cannot be called on objects where the parameters are already set.
 
-        :param source_arn: Arn on which behalf the calls of this client shall be made
-        :param service_principal: Service principal on which behalf the calls of this client shall be made
+        Can be called on an already-configured injector to layer additional parameters on top of
+        the existing ones (later values win on conflict).
+
+        :param source_arn: ARN of the resource on whose behalf the call is made
+        :param service_principal: Service principal making the call
         :param trace_visibility: Visibility of this call, for tracing purposes
-        :return: A new version of the MetadataRequestInjector
+        :return: A new MetadataRequestInjector with the merged parameters
         """
-        if self._params is not None:
-            raise TypeError("Request_data cannot be called on it's own return value")
-        params = {}
+        params = dict(self._params) if self._params else {}
         if source_arn:
             params["_SourceArn"] = source_arn
         if service_principal:
@@ -227,6 +241,21 @@ class MetadataRequestInjector(Generic[T]):
             params["_TraceVisibility"] = trace_visibility.value
         return MetadataRequestInjector(client=self._client, params=params)
 
+    def custom_headers(self, custom_headers: dict[str, str]) -> T | Self:
+        """
+        Returns a new client instance preset with the given request metadata or Self for chaining.
+        Identical to providing _CustomHeaders directly as operation arguments but typing compatible.
+
+        Injector example: lambda_client.custom_headers({"X-Amzn-Trace-Id": "Root=1-67891233-abcdef012345678912345678"})
+                                       .invoke(FunctionName="fn")
+        Chaining .custom_headers().custom_headers() merges the dicts.
+        """
+        merged = dict(self._custom_headers) if self._custom_headers else {}
+        merged.update(custom_headers)
+        return MetadataRequestInjector(
+            client=self._client, params=self._params, custom_headers=merged
+        )
+
 
 #
 # Factory
@@ -813,12 +842,20 @@ def _handler_create_request_parameters(params: dict[str, Any], context: dict[str
             dto[member] = params.pop(parameter)
 
     context["_localstack"] = dto
+    if headers := params.pop("_CustomHeaders", None):
+        context["_custom_headers"] = headers
 
 
 def _handler_inject_dto_header(params: dict[str, Any], context: dict[str, Any], **kwargs):
     """
     Retrieve the data transfer object from the Boto context dict and serialise
     it as part of the request headers.
+
+    Custom headers (if any) are applied directly to the outgoing HTTP request on the sender
+    side and are not forwarded in the serialised DTO, since the receiving service already
+    sees them as regular HTTP headers.
     """
     if (dto := context.pop("_localstack", None)) is not None:
         params["headers"][INTERNAL_REQUEST_PARAMS_HEADER] = dump_dto(dto)
+        if custom_headers := context.pop("_custom_headers", None):
+            params["headers"].update(custom_headers)

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/aws/handlers/tracing.py

@@ -9,6 +9,8 @@ class TraceContextParser(Handler):
     A handler that parses trace context headers, including:
     * AWS X-Ray trace header: https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
       X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Sampled=1;Lineage=a87bd80c:1|68fd508a:5|c512fbe3:2
+    * AWS request id header: https://http.dev/x-amz-request-id
+      X-Amz-Request-Id: 6479de2e-44d0-47c9-ac32-4d720d411eb1
     """
 
     def __call__(self, chain: HandlerChain, context: RequestContext, response: Response):
@@ -21,3 +23,8 @@ class TraceContextParser(Handler):
         context.trace_context["aws_trace_header"] = aws_trace_header
         # NOTE: X-Ray sampling might require service-specific decisions:
         #  https://docs.aws.amazon.com/xray/latest/devguide/xray-console-sampling.html
+
+        # Allows retaining a request id for cross-service calls. For example, Lambda event invokes must retain the same
+        # AWS request id for retries and this mechanism enables LocalStack-internal lambda.Invoke calls to do that.
+        if request_id := context.request.headers.get("X-Amz-Request-Id"):
+            context.request_id = request_id

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/entities.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TypedDict
+from typing import Any, TypedDict
 
 from localstack.aws.api.cloudformation import Capability, ChangeSetType, Parameter
 from localstack.services.cloudformation.engine.parameters import (
@@ -30,6 +30,8 @@ LOG = logging.getLogger(__name__)
 
 
 class StackSet:
+    # FIXME: this is a dummy attr for Avro schema
+    metadata: dict[str, Any]
     """A stack set contains multiple stack instances."""
 
     # FIXME: confusing name. metadata is the complete incoming request object
@@ -88,7 +90,9 @@ class StackIdentifierV2(StackIdentifier):
 
 # TODO: remove metadata (flatten into individual fields)
 class Stack:
-    change_sets: list["StackChangeSet"]
+    # FIXME: CFN v1 does not support Avro serialization, so we don't add type annotations except dummy ones
+    account_id: str
+    region_name: str
 
     def __init__(
         self,
@@ -149,7 +153,7 @@ class Stack:
         # list of stack events
         self.events = []
         # list of stack change sets
-        self.change_sets = []
+        self.change_sets: list[StackChangeSet] = []
         # self.evaluated_conditions = {}
 
     def set_resolved_parameters(self, resolved_parameters: dict[str, StackParameter]):

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/template_deployer.py

@@ -30,6 +30,7 @@ from localstack.services.cloudformation.engine.template_utils import (
     fn_equals_type_conversion,
     get_deps_for_resource,
 )
+from localstack.services.cloudformation.models import exports_map, find_stack
 from localstack.services.cloudformation.resource_provider import (
     Credentials,
     NoResourceProvider,
@@ -42,7 +43,6 @@ from localstack.services.cloudformation.resource_provider import (
 from localstack.services.cloudformation.service_models import (
     DependencyNotYetSatisfied,
 )
-from localstack.services.cloudformation.stores import exports_map, find_stack
 from localstack.utils.aws.arns import get_partition
 from localstack.utils.functions import prevent_stack_overflow
 from localstack.utils.json import clone_safe

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/transformers.py

@@ -18,7 +18,7 @@ from localstack.services.cloudformation.engine.parameters import StackParameter
 from localstack.services.cloudformation.engine.policy_loader import create_policy_loader
 from localstack.services.cloudformation.engine.template_deployer import resolve_refs_recursively
 from localstack.services.cloudformation.engine.validations import ValidationError
-from localstack.services.cloudformation.stores import get_cloudformation_store
+from localstack.services.cloudformation.models import get_cloudformation_store
 from localstack.utils import testutil
 from localstack.utils.objects import recurse_object
 from localstack.utils.strings import long_uid

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -302,7 +302,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
         output = Output(
             OutputKey=delta.after.name,
-            OutputValue=delta.after.value,
+            OutputValue=str(delta.after.value),
             # TODO
             # Description=delta.after.description
         )

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py

@@ -55,7 +55,7 @@ from localstack.services.cloudformation.engine.v2.unsupported_resource import (
     should_ignore_unsupported_resource_type,
 )
 from localstack.services.cloudformation.engine.validations import ValidationError
-from localstack.services.cloudformation.stores import (
+from localstack.services.cloudformation.models import (
     exports_map,
 )
 from localstack.services.cloudformation.v2.entities import ChangeSet

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_transform.py

@@ -42,7 +42,7 @@ from localstack.services.cloudformation.engine.v2.change_set_model_preproc impor
     PreprocProperties,
 )
 from localstack.services.cloudformation.engine.validations import ValidationError
-from localstack.services.cloudformation.stores import get_cloudformation_store
+from localstack.services.cloudformation.models import get_cloudformation_store
 from localstack.services.cloudformation.v2.entities import ChangeSet
 from localstack.services.cloudformation.v2.types import EngineParameter, engine_parameter_value
 from localstack.utils import testutil

localstack_core-4.14.1.dev56/localstack-core/localstack/services/cloudformation/stores.py → localstack_core-4.14.1.dev69/localstack-core/localstack/services/cloudformation/models.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from localstack.aws.api.cloudformation import Export, StackStatus
 from localstack.services.cloudformation.engine.entities import Stack, StackChangeSet, StackSet
@@ -22,7 +23,7 @@ class CloudFormationStore(BaseStore):
     stack_sets_v2: dict[str, StackSetV2] = LocalAttribute(default=dict)
 
     # maps macro ID to macros
-    macros: dict[str, dict] = LocalAttribute(default=dict)
+    macros: dict[str, dict[str, Any]] = LocalAttribute(default=dict)
 
     @property
     def exports(self) -> dict[str, Export]:

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/provider.py

@@ -109,11 +109,7 @@ from localstack.services.cloudformation.engine.validations import (
     DEFAULT_TEMPLATE_VALIDATIONS,
     ValidationError,
 )
-from localstack.services.cloudformation.resource_provider import (
-    PRO_RESOURCE_PROVIDERS,
-    ResourceProvider,
-)
-from localstack.services.cloudformation.stores import (
+from localstack.services.cloudformation.models import (
     cloudformation_stores,
     find_active_stack_by_name_or_id,
     find_change_set,
@@ -121,6 +117,10 @@ from localstack.services.cloudformation.stores import (
     find_stack_by_id,
     get_cloudformation_store,
 )
+from localstack.services.cloudformation.resource_provider import (
+    PRO_RESOURCE_PROVIDERS,
+    ResourceProvider,
+)
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.state import StateVisitor
 from localstack.utils.aws.arns import ARN_PARTITION_REGEX

{localstack_core-4.14.1.dev56 → localstack_core-4.14.1.dev69}/localstack-core/localstack/services/cloudformation/resource_providers/aws_cloudformation_macro.py

@@ -5,13 +5,13 @@ from pathlib import Path
 from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
+from localstack.services.cloudformation.models import get_cloudformation_store
 from localstack.services.cloudformation.resource_provider import (
     OperationStatus,
     ProgressEvent,
     ResourceProvider,
     ResourceRequest,
 )
-from localstack.services.cloudformation.stores import get_cloudformation_store
 
 
 class CloudFormationMacroProperties(TypedDict):