localstack-core 4.13.2.dev82__py3-none-any.whl → 4.13.2.dev83__py3-none-any.whl

localstack/services/sns/provider.py

@@ -175,6 +175,52 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
         # see https://docs.aws.amazon.com/sns/latest/dg/sns-verify-signature-of-message.html
         return Response(self._signature_cert_pem, 200)
 
+    # Tag Utils
+
+    def _check_matching_tags(
+        self, context: RequestContext, topic_arn: str, tags: TagList | None
+    ) -> bool:
+        """
+        Checks if a topic to be created doesn't already exist with different tags
+        :param context: The context of the original request
+        :param topic_arn: Arn of the topic
+        :param tags: Tags to be checked
+        :return: False if there is a mismatch in tags, True otherwise
+        """
+        store = self.get_store(context.account_id, context.region)
+        existing_tags = self._list_resource_tags(context, resource_arn=topic_arn)
+        # if this is none there is nothing to check
+        if topic_arn in store.topics:
+            if tags is None:
+                tags = []
+            for tag in tags:
+                # this means topic already created with empty tags and when we try to create it
+                # again with other tag value then it should fail according to aws documentation.
+                if existing_tags is not None and tag not in existing_tags:
+                    return False
+        return True
+
+    def _list_resource_tags(self, context: RequestContext, resource_arn: str) -> TagList:
+        store = self.get_store(context.account_id, context.region)
+        tags = store.TAGS.list_tags_for_resource(resource_arn).get("Tags")
+        return tags
+
+    def _tag_resource(
+        self, context: RequestContext, resource_arn: str, tags: list[dict[str, str]]
+    ) -> None:
+        store = self.get_store(context.account_id, context.region)
+        store.TAGS.tag_resource(resource_arn, tags)
+
+    def _untag_resource(
+        self, context: RequestContext, resource_arn: str, tag_keys: list[str]
+    ) -> None:
+        store = self.get_store(context.account_id, context.region)
+        store.TAGS.untag_resource(resource_arn, tag_keys)
+
+    def _remove_resource_tags(self, context: RequestContext, resource_arn: str) -> None:
+        store = self.get_store(context.account_id, context.region)
+        store.TAGS.tags.pop(resource_arn, None)
+
     ## Topic Operations
 
     def create_topic(
@@ -213,7 +259,7 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
                     raise InvalidParameterException(
                         "Invalid parameter: Attributes Reason: Topic already exists with different attributes"
                     )
-            tag_resource_success = _check_matching_tags(topic_arn, tags, store)
+            tag_resource_success = self._check_matching_tags(context, topic_arn, tags)
             if not tag_resource_success:
                 raise InvalidParameterException(
                     "Invalid parameter: Tags Reason: Topic already exists with different tags"
@@ -229,7 +275,7 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
             context=context,
         )
         if tags:
-            self.tag_resource(context=context, resource_arn=topic_arn, tags=tags)
+            self._tag_resource(context, resource_arn=topic_arn, tags=tags)
 
         store.topics[topic_arn] = topic
 
@@ -251,8 +297,9 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
         arn_data = parse_and_validate_topic_arn(topic_arn)
         if context.region != arn_data["region"]:
             raise InvalidParameterException("Invalid parameter: TopicArn")
-        store = self.get_store(context.account_id, context.region)
 
+        store = self.get_store(context.account_id, context.region)
+        self._remove_resource_tags(context, topic_arn)
         store.topics.pop(topic_arn, None)
 
     def list_topics(
@@ -1233,9 +1280,8 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
     def list_tags_for_resource(
         self, context: RequestContext, resource_arn: AmazonResourceName, **kwargs
     ) -> ListTagsForResourceResponse:
-        store = sns_stores[context.account_id][context.region]
-        tags = store.TAGS.list_tags_for_resource(resource_arn)
-        return ListTagsForResourceResponse(Tags=tags.get("Tags"))
+        tags = self._list_resource_tags(context, resource_arn)
+        return ListTagsForResourceResponse(Tags=tags)
 
     def tag_resource(
         self, context: RequestContext, resource_arn: AmazonResourceName, tags: TagList, **kwargs
@@ -1243,8 +1289,7 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
         unique_tag_keys = {tag["Key"] for tag in tags}
         if len(unique_tag_keys) < len(tags):
             raise InvalidParameterException("Invalid parameter: Duplicated keys are not allowed.")
-        store = sns_stores[context.account_id][context.region]
-        store.TAGS.tag_resource(resource_arn, tags)
+        self._tag_resource(context, resource_arn, tags)
         return TagResourceResponse()
 
     def untag_resource(
@@ -1254,8 +1299,7 @@ class SnsProvider(SnsApi, ServiceLifecycleHook):
         tag_keys: TagKeyList,
         **kwargs,
     ) -> UntagResourceResponse:
-        store = sns_stores[context.account_id][context.region]
-        store.TAGS.untag_resource(resource_arn, tag_keys)
+        self._untag_resource(context, resource_arn, tag_keys)
         return UntagResourceResponse()
 
     @staticmethod
@@ -1503,27 +1547,6 @@ def _validate_phone_number(phone_number: str):
         )
 
 
-def _check_matching_tags(topic_arn: str, tags: TagList | None, store: SnsStore) -> bool:
-    """
-    Checks if a topic to be created doesn't already exist with different tags
-    :param topic_arn: Arn of the topic
-    :param tags: Tags to be checked
-    :param store: Store object that holds the topics and tags
-    :return: False if there is a mismatch in tags, True otherwise
-    """
-    existing_tags = store.TAGS.list_tags_for_resource(topic_arn)["Tags"]
-    # if this is none there is nothing to check
-    if topic_arn in store.topics:
-        if tags is None:
-            tags = []
-        for tag in tags:
-            # this means topic already created with empty tags and when we try to create it
-            # again with other tag value then it should fail according to aws documentation.
-            if existing_tags is not None and tag not in existing_tags:
-                return False
-    return True
-
-
 def _get_total_publish_size(
     message_body: str, message_attributes: MessageAttributeMap | None
 ) -> int:

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev82'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev82')
+__version__ = version = '4.13.2.dev83'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev83')
 
 __commit_id__ = commit_id = None

{localstack_core-4.13.2.dev82.dist-info → localstack_core-4.13.2.dev83.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev82
+Version: 4.13.2.dev83
 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.dev82.dist-info → localstack_core-4.13.2.dev83.dist-info}/RECORD

@@ -4,7 +4,7 @@ localstack/deprecations.py,sha256=-3IYgCd6LEC3PjO7hbr3Dg-p0PIS6phjmv1qZnj1uo0,15
 localstack/openapi.yaml,sha256=jFUzv-NKkJttxb8HRrmKiNYOmJD-zVfPxG3DDMrRwfg,30865
 localstack/plugins.py,sha256=BIJC9dlo0WbP7lLKkCiGtd_2q5oeqiHZohvoRTcejXM,2457
 localstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-localstack/version.py,sha256=IqoTpaxQZHOuVd6LS9fndU2qhcOfIVCsbw6rfabOvC4,721
+localstack/version.py,sha256=Wh2wST4lvbLiLrWClry4ZT7ZUfcNTir8-ggYRtr9T2A,721
 localstack/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/aws/accounts.py,sha256=102zpGowOxo0S6UGMpfjw14QW7WCLVAGsnFK5xFMLoo,3043
 localstack/aws/app.py,sha256=n9bJCfJRuMz_gLGAH430c3bIQXgUXeWO5NPfcdL2MV8,5145
@@ -747,7 +747,7 @@ localstack/services/sns/constants.py,sha256=RNRg-5AbI1jMyzLlGfEEAP74j8YiCbSTYxzn
 localstack/services/sns/executor.py,sha256=VRaoalDYwo-K_1iDAMkeNZ6uXHo_WtGv4qPgNMxmAAk,4134
 localstack/services/sns/filter.py,sha256=aHkd3oF2RTvuHiFZvVv1dD2qVpLUQkAeU2hJBQnW4xU,22990
 localstack/services/sns/models.py,sha256=l-GO8jpFuyqUlr89EWA1Ef9tCasgSUAvOIitXiI3rg0,7094
-localstack/services/sns/provider.py,sha256=B3N22sSmQH5m05IOicKOB1bXcne7tByJ0UWeFYt_Jl8,76816
+localstack/services/sns/provider.py,sha256=Hb_0cFHPC9DNgAcYrMjZxkjlU7G8qBqa0JG3UFn5Vus,77809
 localstack/services/sns/publisher.py,sha256=zdvgxBxancNa9BbFe9T1DnWqEzCczp79RDZBDUq0nrk,60928
 localstack/services/sns/utils.py,sha256=lKfELrr-ArvXRIaac7_kUwHVznPg3DEiX1tW6xchSTM,7242
 localstack/services/sns/resource_providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1311,10 +1311,10 @@ localstack/utils/server/tcp_proxy.py,sha256=y2NJAmvftTiAYsLU_8qe4W5LGqwUw21i90Pu
 localstack/utils/xray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/utils/xray/trace_header.py,sha256=ahXk9eonq7LpeENwlqUEPj3jDOCiVRixhntQuxNor-Q,6209
 localstack/utils/xray/traceid.py,sha256=GKO-R2sMMjlrH2UaLPXlQlZ6flbE7ZKb6IZMtMu_M5U,1110
-localstack_core-4.13.2.dev82.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
-localstack_core-4.13.2.dev82.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
-localstack_core-4.13.2.dev82.dist-info/METADATA,sha256=Zkv67pWR1aeLWSTNtVCKtxPW6G-kx5UVg9-qPU7Azh8,5867
-localstack_core-4.13.2.dev82.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack_core-4.13.2.dev82.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
-localstack_core-4.13.2.dev82.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
-localstack_core-4.13.2.dev82.dist-info/RECORD,,
+localstack_core-4.13.2.dev83.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
+localstack_core-4.13.2.dev83.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
+localstack_core-4.13.2.dev83.dist-info/METADATA,sha256=5qhV1XKYZWzrA2zthNhKDs1If3brCNUujI7rL73HV6Y,5867
+localstack_core-4.13.2.dev83.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack_core-4.13.2.dev83.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
+localstack_core-4.13.2.dev83.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
+localstack_core-4.13.2.dev83.dist-info/RECORD,,