IaC:added fallback plugin for pro,fixed comments

k-a-il · k-a-il · commit 0688e84b96e8 · 2025-09-17T09:45:06.000+02:00
diff --git a/localstack-core/localstack/utils/catalog/catalog.py b/localstack-core/localstack/utils/catalog/catalog.py
@@ -94,11 +94,11 @@ def __init__(self, remote_catalog_loader: RemoteCatalogLoader | None = None) ->
                     service_provider.operations
                 )
 
-        self.cfn_resources_in_latest = AwsCatalogRemoteStatePlugin.get_cfn_resources_catalog(
+        self.cfn_resources_in_latest = self.get_cfn_resources_catalog(
             remote_catalog.cloudformation_resources
         )
         self.cfn_resources_at_runtime = set(cfn_plugin_manager.list_names())
-        self.services_at_runtime = AwsCatalogRemoteStatePlugin.get_aws_services_at_runtime()
+        self.services_at_runtime = self.get_aws_services_at_runtime()
 
     def get_aws_service_status(
         self, service_name: str, operation_name: str | None = None
diff --git a/localstack-core/localstack/utils/catalog/plugins.py b/localstack-core/localstack/utils/catalog/plugins.py
@@ -21,4 +21,8 @@ def get_aws_catalog() -> CatalogPlugin:
             "Failed to load catalog plugin with the latest LocalStack services support data, falling back to catalog without remote state: %s",
             e,
         )
-        return plugin_manager.load("aws-catalog-runtime-only")
+        # Try to load runtime catalog from pro version first
+        fallback_plugin_name = "aws-catalog-runtime-only-with-license"
+        if not plugin_manager.exists(fallback_plugin_name):
+            fallback_plugin_name = "aws-catalog-runtime-only"
+        return plugin_manager.load(fallback_plugin_name)

Original file line number	Diff line number	Diff line change
`@@ -94,11 +94,11 @@ def __init__(self, remote_catalog_loader: RemoteCatalogLoader \| None = None) ->`
`94`	`94`	`service_provider.operations`
`95`	`95`	`)`
`96`	`96`
`97`		`- self.cfn_resources_in_latest = AwsCatalogRemoteStatePlugin.get_cfn_resources_catalog(`
	`97`	`+ self.cfn_resources_in_latest = self.get_cfn_resources_catalog(`
`98`	`98`	`remote_catalog.cloudformation_resources`
`99`	`99`	`)`
`100`	`100`	`self.cfn_resources_at_runtime = set(cfn_plugin_manager.list_names())`
`101`		`- self.services_at_runtime = AwsCatalogRemoteStatePlugin.get_aws_services_at_runtime()`
	`101`	`+ self.services_at_runtime = self.get_aws_services_at_runtime()`
`102`	`102`
`103`	`103`	`def get_aws_service_status(`
`104`	`104`	`self, service_name: str, operation_name: str \| None = None`