CFNV2: fix community issues after attempted pro fixes (#13101)

simonrw · web-flow · commit 904381360bfe · 2025-09-04T21:05:01.000+01:00
diff --git a/.github/workflows/aws-tests.yml b/.github/workflows/aws-tests.yml
@@ -273,6 +273,7 @@ jobs:
             events-v1:
                - 'tests/aws/services/events/**'
             cloudformation-v2:
+               - 'localstack-core/localstack/services/cloudformation/**'
                - 'tests/aws/services/cloudformation/**'
             sns-v2:
                - 'tests/aws/services/sns/**' # todo: potentially add more locations (lambda/sqs tests?)
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py
@@ -60,7 +60,7 @@
 from localstack.utils.strings import to_bytes
 from localstack.utils.urls import localstack_host
 
-_AWS_URL_SUFFIX = localstack_host().host_and_port()  # The value in AWS is "amazonaws.com"
+_AWS_URL_SUFFIX = localstack_host().host  # The value in AWS is "amazonaws.com"
 
 _PSEUDO_PARAMETERS: Final[set[str]] = {
     "AWS::Partition",
@@ -450,7 +450,8 @@ def _perform_static_replacements(value: str) -> str:
             prefix = api_match[1]
             host = api_match[2]
             path = api_match[3]
-            value = f"{prefix}{host}/{path}"
+            port = localstack_host().port
+            value = f"{prefix}{host}:{port}/{path}"
             return value
 
         return value
diff --git a/localstack-core/localstack/services/cloudformation/resource_provider.py b/localstack-core/localstack/services/cloudformation/resource_provider.py
@@ -563,7 +563,7 @@ def execute_action(
     @staticmethod
     def try_load_resource_provider(resource_type: str) -> ResourceProvider | None:
         # TODO: unify namespace of plugins
-        if resource_type.startswith("Custom"):
+        if resource_type and resource_type.startswith("Custom"):
             resource_type = "AWS::CloudFormation::CustomResource"
 
         # 1. try to load pro resource provider
