refactor utils tests to use embedded twisted server; minor polishing

Author: whummer

paradedb/localstack_paradedb/extension.py

@@ -2,7 +2,6 @@
 import socket
 
 from localstack_extensions.utils.docker import ProxiedDockerContainerExtension
-from werkzeug.datastructures import Headers
 from localstack import config
 
 # Environment variables for configuration
@@ -83,13 +82,6 @@ def tcp_connection_matcher(self, data: bytes) -> bool:
 
         return False
 
-    def http2_request_matcher(self, headers: Headers) -> bool:
-        """
-        Define whether an HTTP2 request should be proxied based on request headers.
-        Not used for TCP connections - see tcp_connection_matcher instead.
-        """
-        return False
-
     def _check_tcp_port(self, host: str, port: int, timeout: float = 2.0) -> None:
         """Check if a TCP port is accepting connections."""
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

utils/localstack_extensions/utils/docker.py

@@ -1,6 +1,5 @@
 import re
 import logging
-from abc import abstractmethod
 from functools import cache
 from typing import Callable
 import requests
@@ -188,9 +187,14 @@ def _setup_tcp_protocol_routing(self):
             f"Registered TCP extension {self.name} -> {self.container_host}:{target_port} on gateway"
         )
 
-    @abstractmethod
     def http2_request_matcher(self, headers: Headers) -> bool:
-        """Define whether an HTTP2 request should be proxied, based on request headers."""
+        """
+        Define whether an HTTP2 request should be proxied, based on request headers.
+
+        Default implementation returns False (no HTTP2 proxying).
+        Override this method in subclasses that need HTTP2 proxying.
+        """
+        return False
 
     def on_platform_shutdown(self):
         self._remove_container()

utils/tests/integration/conftest.py

@@ -10,12 +10,15 @@
 
 import socket
 import pytest
+from twisted.internet import reactor
+from twisted.web import server
 
 from hyperframe.frame import Frame
-from werkzeug.datastructures import Headers
+from rolo import Router
+from rolo.gateway import Gateway
+from localstack.utils.net import get_free_tcp_port
 from localstack_extensions.utils.docker import ProxiedDockerContainerExtension
 
-
 GRPCBIN_IMAGE = "moul/grpcbin"
 GRPCBIN_INSECURE_PORT = 9000  # HTTP/2 without TLS
 GRPCBIN_SECURE_PORT = 9001  # HTTP/2 with TLS
@@ -55,37 +58,58 @@ def _tcp_health_check():
             health_check_fn=_tcp_health_check,
         )
 
-    def http2_request_matcher(self, headers: Headers) -> bool:
-        """
-        gRPC services use direct TCP connections, not HTTP gateway routing.
-        This method is not used in these tests but is required by the base class.
-        """
-        return False
-
 
 @pytest.fixture(scope="session")
-def grpcbin_extension():
+def grpcbin_extension_server():
     """
-    Start grpcbin using ProxiedDockerContainerExtension.
+    Start grpcbin using ProxiedDockerContainerExtension with a test gateway server.
 
-    This tests the Docker container management capabilities while providing
-    a realistic gRPC/HTTP2 test service for integration tests.
+    This tests the Docker container management and proxy capabilities by:
+    1. Starting the grpcbin container via the extension
+    2. Setting up a Gateway with the extension's routes
+    3. Serving the Gateway on a test port via Twisted
+    4. Returning server info for end-to-end testing
     """
     extension = GrpcbinExtension()
 
-    # Start the container using the extension infrastructure
-    extension.start_container()
+    # Create router and update with extension routes
+    # This will start the grpcbin container
+    router = Router()
+    extension.update_gateway_routes(router)
+
+    # Create a Gateway with the router
+    gateway = Gateway(router)
+
+    # Start twisted web server on a test port
+    test_port = get_free_tcp_port()
+    site = server.Site(gateway)
+    listener = reactor.listenTCP(test_port, site)
 
-    yield extension
+    # Return server information for tests
+    server_info = {
+        "port": test_port,
+        "url": f"http://localhost:{test_port}",
+        "extension": extension,
+        "listener": listener,
+    }
+
+    yield server_info
 
     # Cleanup
+    listener.stopListening()
     extension.on_platform_shutdown()
 
 
+@pytest.fixture(scope="session")
+def grpcbin_extension(grpcbin_extension_server):
+    """Return the extension instance from the server fixture."""
+    return grpcbin_extension_server["extension"]
+
+
 @pytest.fixture
-def grpcbin_host(grpcbin_extension):
+def grpcbin_host(grpcbin_extension_server):
     """Return the host address for the grpcbin container."""
-    return grpcbin_extension.container_host
+    return grpcbin_extension_server["extension"].container_host
 
 
 @pytest.fixture

utils/tests/unit/test_tcp_protocol_detector.py

@@ -9,7 +9,6 @@
     combine_matchers,
 )
 from localstack_extensions.utils.docker import ProxiedDockerContainerExtension
-from werkzeug.datastructures import Headers
 
 
 class TestMatcherFactories:
@@ -113,8 +112,6 @@ def tcp_connection_matcher(self, data: bytes) -> bool:
                 matcher = create_signature_matcher(b"\xde\xad\xbe\xef", offset=4)
                 return matcher(data)
 
-            def http2_request_matcher(self, headers: Headers) -> bool:
-                return False
 
         extension = CustomProtocolExtension()
         assert hasattr(extension, "tcp_connection_matcher")
@@ -145,8 +142,6 @@ def tcp_connection_matcher(self, data: bytes) -> bool:
                 variant2 = create_prefix_matcher(b"V2:")
                 return combine_matchers(variant1, variant2)(data)
 
-            def http2_request_matcher(self, headers: Headers) -> bool:
-                return False
 
         extension = MultiProtocolExtension()
 
@@ -172,8 +167,6 @@ def tcp_connection_matcher(self, data: bytes) -> bool:
                 # Inline custom logic without helper functions
                 return len(data) >= 8 and data.startswith(b"MAGIC") and data[7] == 0x42
 
-            def http2_request_matcher(self, headers: Headers) -> bool:
-                return False
 
         extension = InlineMatcherExtension()
         assert extension.tcp_connection_matcher(b"MAGIC\x00\x00\x42")

wiremock/localstack_wiremock/extension.py

@@ -94,10 +94,6 @@ def _health_check():
             health_check_sleep=health_check_sleep,
         )
 
-    def http2_request_matcher(self, headers) -> bool:
-        """WireMock uses HTTP/1.1, not HTTP/2."""
-        return False
-
     def on_platform_ready(self):
         url = f"http://wiremock.{constants.LOCALHOST_HOSTNAME}:{config.get_edge_port_http()}"
         mode = "Runner" if self._is_runner_mode else "OSS"