Use new client at all places SNS was previously being used

localstack · viren-nadkarni · Nov 24, 2022 · Jan 2, 2023 · Jan 4, 2023 · Jan 4, 2023
commit 169f3feed7d57461e81571cf86ba530ff061d24f
diff --git a/localstack/services/s3/notifications.py b/localstack/services/s3/notifications.py
@@ -28,6 +28,7 @@
     TopicArn,
     TopicConfiguration,
 )
+from localstack.aws.connect import connect_to
 from localstack.config import DEFAULT_REGION
 from localstack.services.s3.models import get_moto_s3_backend
 from localstack.services.s3.utils import (
@@ -350,7 +351,7 @@ def _get_arn_value_and_name(topic_configuration: TopicConfiguration) -> [TopicAr
         return topic_configuration.get("TopicArn", ""), "TopicArn"
 
     def _verify_target_exists(self, arn: str, arn_data: ArnData) -> None:
-        client = aws_stack.connect_to_service(self.service_name, region_name=arn_data["region"])
+        client = connect_to(self.service_name, target_arn=arn, source_service="s3")
         try:
             client.get_topic_attributes(TopicArn=arn)
         except ClientError:

diff --git a/localstack/services/s3/s3_listener.py b/localstack/services/s3/s3_listener.py
@@ -21,6 +21,7 @@
 
 from localstack import config, constants
 from localstack.aws.api import CommonServiceException
+from localstack.aws.connect import connect_to
 from localstack.config import get_protocol as get_service_protocol
 from localstack.services.generic_proxy import ProxyListener
 from localstack.services.generic_proxy import append_cors_headers as _append_default_cors_headers
@@ -368,10 +369,11 @@ def send_notification_for_subscriber(
             )
     if notification.get("Topic"):
         region = arns.extract_region_from_arn(notification["Topic"])
-        sns_client = aws_stack.connect_to_service("sns", region_name=region)
+        topic_arn = notification["Topic"]
+        sns_client = connect_to("sns", target_arn=topic_arn, source_service="s3")
         try:
             sns_client.publish(
-                TopicArn=notification["Topic"],
+                TopicArn=topic_arn,
                 Message=message,
                 Subject="Amazon S3 Notification",
             )

diff --git a/localstack/utils/aws/dead_letter_queue.py b/localstack/utils/aws/dead_letter_queue.py
@@ -3,6 +3,7 @@
 import uuid
 from typing import Dict, List
 
+from localstack.aws.connect import connect_to
 from localstack.utils.aws import arns, aws_stack
 from localstack.utils.aws.aws_models import LambdaFunction
 from localstack.utils.strings import convert_to_printable_chars, first_char_to_upper
@@ -52,7 +53,9 @@ def _send_to_dead_letter_queue(source_arn: str, dlq_arn: str, event: Dict, error
             LOG.info(msg)
             raise Exception(msg)
     elif ":sns:" in dlq_arn:
-        sns_client = aws_stack.connect_to_service("sns")
+        sns_client = connect_to(
+            "sns", target_arn=dlq_arn, source_service="lambda", source_arn=source_arn
+        )
         for message in messages:
             sns_client.publish(
                 TopicArn=dlq_arn,

diff --git a/localstack/utils/aws/message_forwarding.py b/localstack/utils/aws/message_forwarding.py
@@ -7,6 +7,7 @@
 
 from moto.events.models import events_backends
 
+from localstack.aws.connect import connect_to
 from localstack.services.apigateway.helpers import extract_query_string_params
 from localstack.utils import collections
 from localstack.utils.aws.arns import (
@@ -35,6 +36,7 @@ def send_event_to_target(
     asynchronous: bool = True,
     target: Dict = None,
 ):
+    # TODO@viren Refactor to accept source ARN and source service, and send them with all `connect_to` calls
     region = extract_region_from_arn(target_arn)
     if target is None:
         target = {}
@@ -48,7 +50,7 @@ def send_event_to_target(
         )
 
     elif ":sns:" in target_arn:
-        sns_client = connect_to_service("sns", region_name=region)
+        sns_client = connect_to("sns", target_arn=target_arn)
         sns_client.publish(TopicArn=target_arn, Message=json.dumps(event))
 
     elif ":sqs:" in target_arn: