localstack-core 4.13.2.dev68__tar.gz → 4.13.2.dev70__tar.gz

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev68
+Version: 4.13.2.dev70
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/aws/api/apigateway/__init__.py

@@ -1138,11 +1138,14 @@ class TlsConfig(TypedDict, total=False):
     insecureSkipVerification: Boolean | None
 
 
+MapOfStringToNullableString = dict[String, String | None]
+
+
 class IntegrationResponse(TypedDict, total=False):
     statusCode: StatusCode | None
     selectionPattern: String | None
     responseParameters: MapOfStringToString | None
-    responseTemplates: MapOfStringToString | None
+    responseTemplates: MapOfStringToNullableString | None
     contentHandling: ContentHandlingStrategy | None
 
 

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/aws/protocol/serializer.py

@@ -1533,6 +1533,17 @@ class RestJSONResponseSerializer(BaseRestResponseSerializer, JSONResponseSeriali
         if has_body and not has_content_type:
             serialized.headers["Content-Type"] = mime_type
 
+    def _serialize_type_map(
+        self, body: dict, value: dict, shape: MapShape, key: str, mime_type: str
+    ):
+        # REST JSON is different from regular JSON, it returns None values in Map
+        if value is None:
+            return
+        map_obj = {}
+        body[key] = map_obj
+        for sub_key, sub_value in value.items():
+            self._serialize(map_obj, sub_value, shape.value, sub_key, mime_type)
+
 
 class BaseCBORResponseSerializer(ResponseSerializer):
     """

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/aws/scaffold.py

@@ -64,6 +64,14 @@ def html_to_rst(html: str):
     return rst
 
 
+def is_sparse_shape(shape: ListShape | MapShape):
+    # see https://smithy.io/2.0/spec/type-refinement-traits.html#sparse-trait
+    # this is needed for generating Map that can have nullable values
+    # We need to access `_shape_model` directly, because `sparse` is not used by Botocore, so it is not picked in
+    # `metadata`: see ``botocore.model.Shape.METADATA_ATTRS`` and ``botocore.model.Shape.metadata``
+    return getattr(shape, "_shape_model", {}).get("sparse")
+
+
 class ShapeNode:
     service: ServiceModel
     shape: Shape
@@ -258,8 +266,12 @@ class ShapeNode:
                 f"{to_valid_python_name(shape.name)} = list[{q}{to_valid_python_name(shape.member.name)}{q}]"
             )
         elif isinstance(shape, MapShape):
+            if is_sparse_shape(shape):
+                value_key = f"{q}{to_valid_python_name(shape.value.name)} | None{q}"
+            else:
+                value_key = f"{q}{to_valid_python_name(shape.value.name)}{q}"
             output.write(
-                f"{to_valid_python_name(shape.name)} = dict[{q}{to_valid_python_name(shape.key.name)}{q}, {q}{to_valid_python_name(shape.value.name)}{q}]"
+                f"{to_valid_python_name(shape.name)} = dict[{q}{to_valid_python_name(shape.key.name)}{q}, {value_key}]"
             )
         elif isinstance(shape, StringShape):
             if shape.enum:

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/aws/spec-patches.json

@@ -1372,5 +1372,22 @@
       "path": "/operations/CreateApiMapping/http/responseCode",
       "value": 200
     }
+  ],
+  "apigateway/2015-07-09/service-2": [
+    {
+      "op": "add",
+      "path": "/shapes/MapOfStringToNullableString",
+      "value": {
+        "type":"map",
+        "key":{"shape":"String"},
+        "value":{"shape":"String"},
+        "sparse": true
+      }
+    },
+    {
+      "op": "replace",
+      "path": "/shapes/IntegrationResponse/members/responseTemplates/shape",
+      "value": "MapOfStringToNullableString"
+    }
   ]
 }

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/services/sns/models.py

@@ -2,7 +2,7 @@ import itertools
 import time
 from dataclasses import dataclass, field
 from enum import StrEnum
-from typing import Literal, TypedDict
+from typing import Any, Literal, TypedDict
 
 from localstack.aws.api.sns import (
     Endpoint,
@@ -29,7 +29,7 @@ class Topic(TypedDict, total=True):
     arn: str
     name: str
     attributes: TopicAttributesMap
-    data_protection_policy: str
+    data_protection_policy: str | None
     subscriptions: list[str]
 
 
@@ -173,7 +173,7 @@ class SnsStore(BaseStore):
     subscriptions: dict[str, SnsSubscription] = LocalAttribute(default=dict)
 
     # filter policy are stored as JSON string in subscriptions, store the decoded result Dict
-    subscription_filter_policy: dict[subscriptionARN, dict] = LocalAttribute(default=dict)
+    subscription_filter_policy: dict[subscriptionARN, dict[str, Any]] = LocalAttribute(default=dict)
 
     # maps confirmation token to subscription ARN
     subscription_tokens: dict[str, str] = LocalAttribute(default=dict)
@@ -185,13 +185,15 @@ class SnsStore(BaseStore):
     platform_endpoints: dict[str, PlatformEndpoint] = LocalAttribute(default=dict)
 
     # cache of topic ARN to platform endpoint messages (used primarily for testing)
-    platform_endpoint_messages: dict[str, list[dict]] = LocalAttribute(default=dict)
+    platform_endpoint_messages: dict[str, list[dict[str, str | MessageAttributeMap | None]]] = (
+        LocalAttribute(default=dict)
+    )
 
     # topic/subscription independent default values for sending sms messages
     sms_attributes: dict[str, str] = LocalAttribute(default=dict)
 
     # list of sent SMS messages
-    sms_messages: list[dict] = LocalAttribute(default=list)
+    sms_messages: list[dict[str, str | MessageAttributeMap | None]] = LocalAttribute(default=list)
 
     TAGS: TaggingService = CrossRegionAttribute(default=TaggingService)
 

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/services/sns/provider.py

@@ -222,7 +222,12 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
 
         attributes["EffectiveDeliveryPolicy"] = _create_default_effective_delivery_policy()
 
-        topic = _create_topic(name=name, attributes=attributes, context=context)
+        topic = _create_topic(
+            name=name,
+            attributes=attributes,
+            data_protection_policy=data_protection_policy,
+            context=context,
+        )
         if tags:
             self.tag_resource(context=context, resource_arn=topic_arn, tags=tags)
 
@@ -997,7 +1002,8 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
         attributes = attributes or {}
         _validate_endpoint_attributes(attributes, allow_empty=True)
         # CustomUserData can be specified both in attributes and as parameter. Attributes take precedence
-        attributes.setdefault(EndpointAttributeNames.CUSTOM_USER_DATA, custom_user_data)
+        if custom_user_data:
+            attributes.setdefault(EndpointAttributeNames.CUSTOM_USER_DATA, custom_user_data)
         _attributes = {"Enabled": "true", "Token": token, **attributes}
         if endpoint_arn and (
             platform_endpoint_details := store.platform_endpoints.get(endpoint_arn)
@@ -1284,7 +1290,9 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
             raise NotFoundException("PlatformApplication does not exist")
 
 
-def _create_topic(name: str, attributes: dict, context: RequestContext) -> Topic:
+def _create_topic(
+    name: str, attributes: dict, data_protection_policy: str, context: RequestContext
+) -> Topic:
     topic_arn = sns_topic_arn(
         topic_name=name, region_name=context.region, account_id=context.account_id
     )
@@ -1293,6 +1301,7 @@ def _create_topic(name: str, attributes: dict, context: RequestContext) -> Topic
         "arn": topic_arn,
         "attributes": {},
         "subscriptions": [],
+        "data_protection_policy": data_protection_policy,
     }
     attrs = _default_attributes(topic, context)
     attrs.update(attributes or {})
@@ -1439,6 +1448,7 @@ def _validate_platform_application_name(name: str) -> None:
         reason = "must contain only characters 'a'-'z', 'A'-'Z', '0'-'9', '_', '-', and '.'"
 
     if reason:
+        LOG.debug("SNS Platform Application Name rejected due to reason: %s", reason)
         raise InvalidParameterException(f"Invalid parameter: {name} Reason: {reason}")
 
 

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/services/sns/publisher.py

@@ -16,7 +16,7 @@ from cryptography.hazmat.primitives.asymmetric import padding
 
 from localstack import config
 from localstack.aws.api.lambda_ import InvocationType
-from localstack.aws.api.sns import MessageAttributeMap
+from localstack.aws.api.sns import MessageAttributeMap, TopicAttributesMap
 from localstack.aws.connect import connect_to
 from localstack.config import external_service_url
 from localstack.services.sns import constants as sns_constants
@@ -111,7 +111,7 @@ class TopicPublisher(abc.ABC):
         self,
         message_context: SnsMessage,
         subscriber: SnsSubscription,
-        topic_attributes: dict[str, str] = None,
+        topic_attributes: TopicAttributesMap = None,
     ) -> str:
         """
         Returns the message formatted in the base SNS message format. The base SNS message format is shared amongst
@@ -233,7 +233,7 @@ class LambdaTopicPublisher(TopicPublisher):
         self,
         message_context: SnsMessage,
         subscriber: SnsSubscription,
-        topic_attributes: dict[str, str] = None,
+        topic_attributes: TopicAttributesMap = None,
     ) -> str:
         """
         You can see Lambda SNS Event format here: https://docs.aws.amazon.com/lambda/latest/dg/with-sns.html
@@ -621,7 +621,7 @@ class EmailTopicPublisher(EmailJsonTopicPublisher):
         self,
         message_context: SnsMessage,
         subscriber: SnsSubscription,
-        topic_attributes: dict[str, str] = None,
+        topic_attributes: TopicAttributesMap = None,
     ) -> str:
         return message_context.message_content(subscriber["Protocol"])
 
@@ -664,8 +664,8 @@ class ApplicationTopicPublisher(TopicPublisher):
         self,
         message_context: SnsMessage,
         subscriber: SnsSubscription,
-        topic_attributes: dict[str, str] = None,
-    ) -> dict[str, str]:
+        topic_attributes: TopicAttributesMap = None,
+    ) -> dict[str, str | MessageAttributeMap | None]:
         endpoint_arn = subscriber["Endpoint"]
         platform_type = get_platform_type_from_endpoint_arn(endpoint_arn)
         return {
@@ -725,8 +725,8 @@ class SmsTopicPublisher(TopicPublisher):
         self,
         message_context: SnsMessage,
         subscriber: SnsSubscription,
-        topic_attributes: dict[str, str] = None,
-    ) -> dict:
+        topic_attributes: TopicAttributesMap = None,
+    ) -> dict[str, str | MessageAttributeMap | None]:
         return {
             "PhoneNumber": subscriber["Endpoint"],
             "TopicArn": subscriber["TopicArn"],

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev68'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev68')
+__version__ = version = '4.13.2.dev70'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev70')
 
-__commit_id__ = commit_id = 'gf9365ed41'
+__commit_id__ = commit_id = 'g8554f9a9d'

{localstack_core-4.13.2.dev68 → localstack_core-4.13.2.dev70}/localstack-core/localstack_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev68
+Version: 4.13.2.dev70
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0