revert port logic for eager loading

bentsku · bentsku · commit 45045104e02e · 2023-11-02T16:50:50.000+01:00
diff --git a/localstack/utils/bootstrap.py b/localstack/utils/bootstrap.py
@@ -233,12 +233,17 @@ def get_enabled_apis() -> Set[str]:
     services = SERVICE_PLUGINS.list_available()
 
     if services_env and is_env_true("STRICT_SERVICE_LOADING"):
-        from localstack.services.plugins import SERVICE_PLUGINS
-
         # SERVICES and STRICT_SERVICE_LOADING are set
         # we filter the result of SERVICE_PLUGINS.list_available() to cross the user-provided list with
         # the available ones
-        services = [service for service in services_env.split(",") if service in services]
+        enabled_services = []
+        for service_port in re.split(r"\s*,\s*", services_env):
+            # Only extract the service name, discard the port
+            parts = re.split(r"[:=]", service_port)
+            service = parts[0]
+            enabled_services.append(service)
+
+        services = [service for service in enabled_services if service in services]
         # TODO: log a message if a service was not supported? see with pro loading
 
     return resolve_apis(services)
@@ -263,7 +268,12 @@ def get_preloaded_services() -> Set[str]:
     if services_env and is_env_true("EAGER_SERVICE_LOADING"):
         # SERVICES and EAGER_SERVICE_LOADING are set
         # SERVICES env var might contain ports, but we do not support these anymore
-        services = [service for service in services_env.split(",")]
+        services = []
+        for service_port in re.split(r"\s*,\s*", services_env):
+            # Only extract the service name, discard the port
+            parts = re.split(r"[:=]", service_port)
+            service = parts[0]
+            services.append(service)
 
     if not services:
         from localstack.services.plugins import SERVICE_PLUGINS
@@ -274,7 +284,16 @@ def get_preloaded_services() -> Set[str]:
 
 
 def should_eager_load_api(api: str) -> bool:
-    return api in get_preloaded_services()
+    apis = get_preloaded_services()
+
+    if api in apis:
+        return True
+
+    for enabled_api in apis:
+        if api.startswith(f"{enabled_api}:"):
+            return True
+
+    return False
 
 
 def start_infra_locally():
diff --git a/tests/unit/utils/test_bootstrap.py b/tests/unit/utils/test_bootstrap.py
@@ -61,19 +61,14 @@ def test_custom_service_without_port(self):
         assert "foobar" in result
 
     def test_custom_port_mapping_in_services_env(self):
-        """
-        We do not support custom port mapping anymore, assert that it goes through but will not load the service
-        """
-
         with temporary_env({"SERVICES": "foobar:1235", "EAGER_SERVICE_LOADING": "1"}):
             result = get_preloaded_services()
 
         assert len(result) == 1
-        assert "foobar:1235" in result
-        assert "foobar" not in result
+        assert "foobar" in result
 
     def test_resolve_meta(self):
-        with temporary_env({"SERVICES": "es,cognito", "EAGER_SERVICE_LOADING": "1"}):
+        with temporary_env({"SERVICES": "es,cognito:1337", "EAGER_SERVICE_LOADING": "1"}):
             result = get_preloaded_services()
 
         assert len(result) == 4
@@ -121,19 +116,26 @@ def test_custom_service_not_supported(self):
 
         assert not result
 
-    def test_custom_service_and_supported_service(self):
+    def test_custom_service_with_supported_service(self):
         with temporary_env({"SERVICES": "foobar,s3", "STRICT_SERVICE_LOADING": "1"}):
             result = get_enabled_apis()
 
         assert len(result) == 1
         assert "s3" in result
 
-    def test_custom_port_mapping_in_services_env_not_supported(self):
+    def test_custom_service_and_port_mapping_in_services_env_not_supported(self):
         with temporary_env({"SERVICES": "foobar:1235", "STRICT_SERVICE_LOADING": "1"}):
             result = get_enabled_apis()
 
         assert not result
 
+    def test_custom_port_mapping_with_supported_service(self):
+        with temporary_env({"SERVICES": "s3:1234", "STRICT_SERVICE_LOADING": "1"}):
+            result = get_enabled_apis()
+
+        assert len(result) == 1
+        assert "s3" in result
+
     def test_resolve_meta(self):
         with temporary_env({"SERVICES": "es,lambda", "STRICT_SERVICE_LOADING": "1"}):
             result = get_enabled_apis()
