refactor to be used in Update as well

bentsku · bentsku · commit 300ca0c434cb · 2025-05-28T14:45:59.000+02:00
diff --git a/localstack-core/localstack/services/sns/resource_providers/aws_sns_subscription.py b/localstack-core/localstack/services/sns/resource_providers/aws_sns_subscription.py
@@ -7,6 +7,7 @@
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack import config
+from localstack.aws.connect import ServiceLevelClientFactory
 from localstack.services.cloudformation.resource_provider import (
     ConvertingInternalClientFactory,
     OperationStatus,
@@ -64,18 +65,7 @@ def create(
 
         """
         model = request.desired_state
-        if subscription_region := model.get("Region"):
-            # FIXME: this is hacky, maybe we should have access to the original parameters for the `aws_client_factory`
-            #  as we now need to manually use them
-            # Not all internal CloudFormation requests will be directed to the same region and account
-            # maybe we could need to expose a proper client factory where we can override some parameters like the
-            # Region
-            factory = ConvertingInternalClientFactory(use_ssl=config.DISTRIBUTED_MODE)
-            client_params = dict(request.aws_client_factory._client_creation_params)
-            client_params["region_name"] = subscription_region
-            sns = factory(**client_params).sns
-        else:
-            sns = request.aws_client_factory.sns
+        sns = self._get_client(request).sns
 
         params = util.select_attributes(model=model, params=["TopicArn", "Protocol", "Endpoint"])
 
@@ -141,7 +131,7 @@ def update(
         """
         model = request.desired_state
         model["Id"] = request.previous_state["Id"]
-        sns = request.aws_client_factory.sns
+        sns = self._get_client(request).sns
 
         attrs = [
             "DeliveryPolicy",
@@ -166,3 +156,23 @@ def update(
     @staticmethod
     def attr_val(val):
         return json.dumps(val) if isinstance(val, dict) else str(val)
+
+    @staticmethod
+    def _get_client(
+        request: ResourceRequest[SNSSubscriptionProperties],
+    ) -> ServiceLevelClientFactory:
+        model = request.desired_state
+        if subscription_region := model.get("Region"):
+            # FIXME: this is hacky, maybe we should have access to the original parameters for the `aws_client_factory`
+            #  as we now need to manually use them
+            # Not all internal CloudFormation requests will be directed to the same region and account
+            # maybe we could need to expose a proper client factory where we can override some parameters like the
+            # Region
+            factory = ConvertingInternalClientFactory(use_ssl=config.DISTRIBUTED_MODE)
+            client_params = dict(request.aws_client_factory._client_creation_params)
+            client_params["region_name"] = subscription_region
+            service_factory = factory(**client_params)
+        else:
+            service_factory = request.aws_client_factory
+
+        return service_factory
