localstack-core 4.6.1.dev60__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/ses/resource_providers/aws_ses_emailidentity.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,41 +14,41 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SESEmailIdentityProperties(TypedDict):
-    EmailIdentity: Optional[str]
-    ConfigurationSetAttributes: Optional[ConfigurationSetAttributes]
-    DkimAttributes: Optional[DkimAttributes]
-    DkimDNSTokenName1: Optional[str]
-    DkimDNSTokenName2: Optional[str]
-    DkimDNSTokenName3: Optional[str]
-    DkimDNSTokenValue1: Optional[str]
-    DkimDNSTokenValue2: Optional[str]
-    DkimDNSTokenValue3: Optional[str]
-    DkimSigningAttributes: Optional[DkimSigningAttributes]
-    FeedbackAttributes: Optional[FeedbackAttributes]
-    MailFromAttributes: Optional[MailFromAttributes]
+    EmailIdentity: str | None
+    ConfigurationSetAttributes: ConfigurationSetAttributes | None
+    DkimAttributes: DkimAttributes | None
+    DkimDNSTokenName1: str | None
+    DkimDNSTokenName2: str | None
+    DkimDNSTokenName3: str | None
+    DkimDNSTokenValue1: str | None
+    DkimDNSTokenValue2: str | None
+    DkimDNSTokenValue3: str | None
+    DkimSigningAttributes: DkimSigningAttributes | None
+    FeedbackAttributes: FeedbackAttributes | None
+    MailFromAttributes: MailFromAttributes | None
 
 
 class ConfigurationSetAttributes(TypedDict):
-    ConfigurationSetName: Optional[str]
+    ConfigurationSetName: str | None
 
 
 class DkimSigningAttributes(TypedDict):
-    DomainSigningPrivateKey: Optional[str]
-    DomainSigningSelector: Optional[str]
-    NextSigningKeyLength: Optional[str]
+    DomainSigningPrivateKey: str | None
+    DomainSigningSelector: str | None
+    NextSigningKeyLength: str | None
 
 
 class DkimAttributes(TypedDict):
-    SigningEnabled: Optional[bool]
+    SigningEnabled: bool | None
 
 
 class MailFromAttributes(TypedDict):
-    BehaviorOnMxFailure: Optional[str]
-    MailFromDomain: Optional[str]
+    BehaviorOnMxFailure: str | None
+    MailFromDomain: str | None
 
 
 class FeedbackAttributes(TypedDict):
-    EmailForwardingEnabled: Optional[bool]
+    EmailForwardingEnabled: bool | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ses/resource_providers/aws_ses_emailidentity_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 SESEmailIdentityProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SES::EmailIdentity"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ses.resource_providers.aws_ses_emailidentity import (

localstack/services/sns/constants.py

@@ -1,5 +1,8 @@
 import re
 from string import ascii_letters, digits
+from typing import get_args
+
+from localstack.services.sns.v2.models import SnsApplicationPlatforms
 
 SNS_PROTOCOLS = [
     "http",
@@ -13,7 +16,7 @@ SNS_PROTOCOLS = [
     "firehose",
 ]
 
-VALID_SUBSCRIPTION_ATTR_NAME = [
+VALID_SUBSCRIPTION_ATTR_NAME: list[str] = [
     "DeliveryPolicy",
     "FilterPolicy",
     "FilterPolicyScope",
@@ -39,3 +42,6 @@ SUBSCRIPTION_TOKENS_ENDPOINT = "/_aws/sns/subscription-tokens"
 SNS_CERT_ENDPOINT = "/_aws/sns/SimpleNotificationService-6c6f63616c737461636b69736e696365.pem"
 
 DUMMY_SUBSCRIPTION_PRINCIPAL = "arn:{partition}:iam::{account_id}:user/DummySNSPrincipal"
+E164_REGEX = re.compile(r"^\+?[1-9]\d{1,14}$")
+
+VALID_APPLICATION_PLATFORMS = list(get_args(SnsApplicationPlatforms))

localstack/services/sns/executor.py

@@ -18,7 +18,10 @@ def _worker(work_queue: queue.Queue):
             del work_item
 
     except Exception:
-        LOG.exception("Exception in worker")
+        LOG.error(
+            "Exception in worker",
+            exc_info=LOG.isEnabledFor(logging.DEBUG),
+        )
 
 
 class _WorkItem:
@@ -31,7 +34,11 @@ class _WorkItem:
         try:
             self.fn(*self.args, **self.kwargs)
         except Exception:
-            LOG.exception("Unhandled Exception in while running %s", self.fn.__name__)
+            LOG.error(
+                "Unhandled Exception in while running %s",
+                self.fn.__name__,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
+            )
 
 
 class TopicPartitionedThreadPoolExecutor:

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 Dict, List, Literal, Optional, TypedDict, Union
+from typing import Literal, TypedDict
 
 from localstack.aws.api.sns import (
     MessageAttributeMap,
@@ -80,18 +80,18 @@ class SnsMessageType(StrEnum):
 @dataclass
 class SnsMessage:
     type: SnsMessageType
-    message: Union[
-        str, Dict
-    ]  # can be Dict if after being JSON decoded for validation if structure is `json`
-    message_attributes: Optional[MessageAttributeMap] = None
-    message_structure: Optional[str] = None
-    subject: Optional[str] = None
-    message_deduplication_id: Optional[str] = None
-    message_group_id: Optional[str] = None
-    token: Optional[str] = None
+    message: (
+        str | dict
+    )  # can be Dict if after being JSON decoded for validation if structure is `json`
+    message_attributes: MessageAttributeMap | None = None
+    message_structure: str | None = None
+    subject: str | None = None
+    message_deduplication_id: str | None = None
+    message_group_id: str | None = None
+    token: str | None = None
     message_id: str = field(default_factory=long_uid)
-    is_fifo: Optional[bool] = False
-    sequencer_number: Optional[str] = None
+    is_fifo: bool | None = False
+    sequencer_number: str | None = None
 
     def __post_init__(self):
         if self.message_attributes is None:
@@ -140,39 +140,39 @@ class SnsSubscription(TypedDict, total=False):
     Protocol: SnsProtocols
     SubscriptionArn: subscriptionARN
     PendingConfirmation: Literal["true", "false"]
-    Owner: Optional[str]
-    SubscriptionPrincipal: Optional[str]
-    FilterPolicy: Optional[str]
+    Owner: str | None
+    SubscriptionPrincipal: str | None
+    FilterPolicy: str | None
     FilterPolicyScope: Literal["MessageAttributes", "MessageBody"]
     RawMessageDelivery: Literal["true", "false"]
     ConfirmationWasAuthenticated: Literal["true", "false"]
-    SubscriptionRoleArn: Optional[str]
-    DeliveryPolicy: Optional[str]
+    SubscriptionRoleArn: str | None
+    DeliveryPolicy: str | None
 
 
 class SnsStore(BaseStore):
     # maps topic ARN to subscriptions ARN
-    topic_subscriptions: Dict[str, List[str]] = LocalAttribute(default=dict)
+    topic_subscriptions: dict[str, list[str]] = LocalAttribute(default=dict)
 
     # maps subscription ARN to SnsSubscription
-    subscriptions: Dict[str, SnsSubscription] = LocalAttribute(default=dict)
+    subscriptions: dict[str, SnsSubscription] = LocalAttribute(default=dict)
 
     # maps confirmation token to subscription ARN
-    subscription_tokens: Dict[str, str] = LocalAttribute(default=dict)
+    subscription_tokens: dict[str, str] = LocalAttribute(default=dict)
 
     # maps topic ARN to list of tags
-    sns_tags: Dict[str, List[Dict]] = LocalAttribute(default=dict)
+    sns_tags: dict[str, list[dict]] = 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]] = LocalAttribute(default=dict)
 
     # list of sent SMS messages
-    sms_messages: List[Dict] = LocalAttribute(default=list)
+    sms_messages: list[dict] = LocalAttribute(default=list)
 
     # 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] = LocalAttribute(default=dict)
 
-    def get_topic_subscriptions(self, topic_arn: str) -> List[SnsSubscription]:
+    def get_topic_subscriptions(self, topic_arn: str) -> list[SnsSubscription]:
         topic_subscriptions = self.topic_subscriptions.get(topic_arn, [])
         subscriptions = [
             subscription

localstack/services/sns/provider.py

@@ -1,9 +1,9 @@
 import base64
+import contextlib
 import copy
 import functools
 import json
 import logging
-from typing import Dict, List
 from uuid import uuid4
 
 from botocore.utils import InvalidArnException
@@ -420,6 +420,10 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
     def unsubscribe(
         self, context: RequestContext, subscription_arn: subscriptionARN, **kwargs
     ) -> None:
+        if subscription_arn is None:
+            raise InvalidParameterException(
+                "Invalid parameter: SubscriptionArn Reason: no value for required parameter",
+            )
         count = len(subscription_arn.split(":"))
         try:
             parsed_arn = parse_arn(subscription_arn)
@@ -470,7 +474,8 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
                 subscription_arn=subscription_arn,
             )
 
-        store.topic_subscriptions[subscription["TopicArn"]].remove(subscription_arn)
+        with contextlib.suppress(ValueError):
+            store.topic_subscriptions[subscription["TopicArn"]].remove(subscription_arn)
         store.subscription_filter_policy.pop(subscription_arn, None)
         store.subscriptions.pop(subscription_arn, None)
 
@@ -584,10 +589,7 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
             raise InvalidParameterException(
                 "Invalid parameter: MessageDeduplicationId Reason: The request includes MessageDeduplicationId parameter that is not valid for this topic type"
             )
-        elif message_group_id:
-            raise InvalidParameterException(
-                "Invalid parameter: MessageGroupId Reason: The request includes MessageGroupId parameter that is not valid for this topic type"
-            )
+
         is_endpoint_publish = target_arn and ":endpoint/" in target_arn
         if message_structure == "json":
             try:
@@ -1130,7 +1132,7 @@ def register_sns_api_resource(router: Router):
     router.add(SNSServiceSubscriptionTokenApiResource())
 
 
-def _format_messages(sent_messages: List[Dict[str, str]], validated_keys: List[str]):
+def _format_messages(sent_messages: list[dict[str, str]], validated_keys: list[str]):
     """
     This method format the messages to be more readable and undo the format change that was needed for Moto
     Should be removed once we refactor SNS.

localstack/services/sns/publisher.py

@@ -9,7 +9,6 @@ import time
 import traceback
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass, field
-from typing import Dict, List, Tuple, Union
 
 import requests
 from cryptography.hazmat.primitives import hashes
@@ -61,9 +60,9 @@ class SnsPublishContext:
 
 @dataclass
 class SnsBatchPublishContext:
-    messages: List[SnsMessage]
+    messages: list[SnsMessage]
     store: SnsStore
-    request_headers: Dict[str, str]
+    request_headers: dict[str, str]
     topic_attributes: dict[str, str] = field(default_factory=dict)
 
 
@@ -90,9 +89,10 @@ class TopicPublisher(abc.ABC):
         try:
             self._publish(context=context, subscriber=subscriber)
         except Exception:
-            LOG.exception(
+            LOG.error(
                 "An internal error occurred while trying to send the SNS message %s",
                 context.message,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
             )
             return
 
@@ -148,9 +148,10 @@ class EndpointPublisher(abc.ABC):
         try:
             self._publish(context=context, endpoint=endpoint)
         except Exception:
-            LOG.exception(
+            LOG.error(
                 "An internal error occurred while trying to send the SNS message %s",
                 context.message,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
             )
             return
 
@@ -296,7 +297,10 @@ class SqsTopicPublisher(TopicPublisher):
             )
             kwargs = self.get_sqs_kwargs(msg_context=message_context, subscriber=subscriber)
         except Exception:
-            LOG.exception("An internal error occurred while trying to format the message for SQS")
+            LOG.error(
+                "An internal error occurred while trying to format the message for SQS",
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
+            )
             return
         try:
             queue_url: str = sqs_queue_url_for_arn(subscriber["Endpoint"])
@@ -336,19 +340,29 @@ class SqsTopicPublisher(TopicPublisher):
 
         # SNS now allows regular non-fifo subscriptions to FIFO topics. Validate that the subscription target is fifo
         # before passing the FIFO-only parameters
-        if subscriber["Endpoint"].endswith(".fifo"):
-            if msg_context.message_group_id:
-                kwargs["MessageGroupId"] = msg_context.message_group_id
-            if msg_context.message_deduplication_id:
-                kwargs["MessageDeduplicationId"] = msg_context.message_deduplication_id
-            elif subscriber["TopicArn"].endswith(".fifo"):
-                # Amazon SNS uses the message body provided to generate a unique hash value to use as the deduplication
-                # ID for each message, so you don't need to set a deduplication ID when you send each message.
-                # https://docs.aws.amazon.com/sns/latest/dg/fifo-message-dedup.html
-                content = msg_context.message_content("sqs")
-                kwargs["MessageDeduplicationId"] = hashlib.sha256(
-                    content.encode("utf-8")
-                ).hexdigest()
+
+        # SNS will only forward the `MessageGroupId` for Fair Queues in some scenarios:
+        # - non-FIFO SNS topic to Fair Queue
+        # - FIFO topic to FIFO queue
+        # It will NOT forward it with FIFO topic to regular Queue (possibly used for internal grouping without relying
+        # on SQS capabilities)
+        if subscriber["TopicArn"].endswith(".fifo"):
+            if subscriber["Endpoint"].endswith(".fifo"):
+                if msg_context.message_group_id:
+                    kwargs["MessageGroupId"] = msg_context.message_group_id
+                if msg_context.message_deduplication_id:
+                    kwargs["MessageDeduplicationId"] = msg_context.message_deduplication_id
+                else:
+                    # SNS uses the message body provided to generate a unique hash value to use as the deduplication ID
+                    # for each message, so you don't need to set a deduplication ID when you send each message.
+                    # https://docs.aws.amazon.com/sns/latest/dg/fifo-message-dedup.html
+                    content = msg_context.message_content("sqs")
+                    kwargs["MessageDeduplicationId"] = hashlib.sha256(
+                        content.encode("utf-8")
+                    ).hexdigest()
+
+        elif msg_context.message_group_id:
+            kwargs["MessageGroupId"] = msg_context.message_group_id
 
         # TODO: for message deduplication, we are using the underlying features of the SQS queue
         # however, SQS queue only deduplicate at the Queue level, where the SNS topic deduplicate on the topic level
@@ -818,7 +832,7 @@ class ApplicationEndpointPublisher(EndpointPublisher):
         # TODO: see about delivery log for individual endpoint message, need credentials for testing
         # store_delivery_log(subscriber, context, success=True)
 
-    def prepare_message(self, message_context: SnsMessage, endpoint: str) -> Union[str, Dict]:
+    def prepare_message(self, message_context: SnsMessage, endpoint: str) -> str | dict:
         platform_type = get_platform_type_from_endpoint_arn(endpoint)
         return {
             "TargetArn": endpoint,
@@ -862,7 +876,7 @@ def get_application_platform_arn_from_endpoint_arn(endpoint_arn: str) -> str:
     return f"{base_arn}:app/{platform_type}/{app_name}"
 
 
-def get_attributes_for_application_endpoint(endpoint_arn: str) -> Tuple[Dict, Dict]:
+def get_attributes_for_application_endpoint(endpoint_arn: str) -> tuple[dict, dict]:
     """
     Retrieve the attributes necessary to send a message directly to the platform (credentials and token)
     :param endpoint_arn:
@@ -883,7 +897,7 @@ def get_attributes_for_application_endpoint(endpoint_arn: str) -> Tuple[Dict, Di
 
 
 def send_message_to_gcm(
-    context: SnsPublishContext, app_attributes: Dict[str, str], endpoint_attributes: Dict[str, str]
+    context: SnsPublishContext, app_attributes: dict[str, str], endpoint_attributes: dict[str, str]
 ) -> None:
     """
     Send the message directly to GCM, with the credentials used when creating the PlatformApplication and the Endpoint
@@ -1014,7 +1028,7 @@ def create_sns_message_body(
 
 def prepare_message_attributes(
     message_attributes: MessageAttributeMap,
-) -> Dict[str, Dict[str, str]]:
+) -> dict[str, dict[str, str]]:
     attributes = {}
     if not message_attributes:
         return attributes

localstack/services/sns/resource_providers/aws_sns_subscription.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack import config
@@ -18,18 +18,18 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class SNSSubscriptionProperties(TypedDict):
-    Protocol: Optional[str]
-    TopicArn: Optional[str]
-    DeliveryPolicy: Optional[dict]
-    Endpoint: Optional[str]
-    FilterPolicy: Optional[dict]
-    FilterPolicyScope: Optional[str]
-    Id: Optional[str]
-    RawMessageDelivery: Optional[bool]
-    RedrivePolicy: Optional[dict]
-    Region: Optional[str]
-    ReplayPolicy: Optional[dict]
-    SubscriptionRoleArn: Optional[str]
+    Protocol: str | None
+    TopicArn: str | None
+    DeliveryPolicy: dict | None
+    Endpoint: str | None
+    FilterPolicy: dict | None
+    FilterPolicyScope: str | None
+    Id: str | None
+    RawMessageDelivery: bool | None
+    RedrivePolicy: dict | None
+    Region: str | None
+    ReplayPolicy: dict | None
+    SubscriptionRoleArn: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/sns/resource_providers/aws_sns_subscription_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 SNSSubscriptionProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SNS::Subscription"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.sns.resource_providers.aws_sns_subscription import (

localstack/services/sns/resource_providers/aws_sns_topic.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -16,27 +16,27 @@ from localstack.utils.strings import canonicalize_bool_to_str, short_uid
 
 
 class SNSTopicProperties(TypedDict):
-    ContentBasedDeduplication: Optional[bool]
-    DataProtectionPolicy: Optional[dict]
-    DisplayName: Optional[str]
-    FifoTopic: Optional[bool]
-    KmsMasterKeyId: Optional[str]
-    SignatureVersion: Optional[str]
-    Subscription: Optional[list[Subscription]]
-    Tags: Optional[list[Tag]]
-    TopicArn: Optional[str]
-    TopicName: Optional[str]
-    TracingConfig: Optional[str]
+    ContentBasedDeduplication: bool | None
+    DataProtectionPolicy: dict | None
+    DisplayName: str | None
+    FifoTopic: bool | None
+    KmsMasterKeyId: str | None
+    SignatureVersion: str | None
+    Subscription: list[Subscription] | None
+    Tags: list[Tag] | None
+    TopicArn: str | None
+    TopicName: str | None
+    TracingConfig: str | None
 
 
 class Subscription(TypedDict):
-    Endpoint: Optional[str]
-    Protocol: Optional[str]
+    Endpoint: str | None
+    Protocol: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/sns/resource_providers/aws_sns_topic_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 SNSTopicProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SNS::Topic"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.sns.resource_providers.aws_sns_topic import SNSTopicProvider

localstack/services/sns/resource_providers/aws_sns_topicpolicy.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from botocore.exceptions import ClientError
 
@@ -18,9 +18,9 @@ from localstack.services.sns.models import create_default_sns_topic_policy
 
 
 class SNSTopicPolicyProperties(TypedDict):
-    PolicyDocument: Optional[dict | str]
-    Topics: Optional[list[str]]
-    Id: Optional[str]
+    PolicyDocument: dict | str | None
+    Topics: list[str] | None
+    Id: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/sns/resource_providers/aws_sns_topicpolicy_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 SNSTopicPolicyProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::SNS::TopicPolicy"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.sns.resource_providers.aws_sns_topicpolicy import (