use GatewayServer instead of werkzeug

Author: thrau

aws-replicator/aws_replicator/client/auth_proxy.py

@@ -17,6 +17,7 @@
 from localstack.aws.spec import load_service
 from localstack.config import external_service_url
 from localstack.constants import AWS_REGION_US_EAST_1, DOCKER_IMAGE_NAME_PRO
+from localstack.http.hypercorn import GatewayServer
 from localstack.utils.bootstrap import setup_logging
 from localstack.utils.collections import select_attributes
 from localstack.utils.container_utils.container_client import PortMappings
@@ -27,9 +28,8 @@
 from localstack.utils.serving import Server
 from localstack.utils.strings import short_uid, to_bytes, to_str, truncate
 from localstack_ext.bootstrap.licensingv2 import ENV_LOCALSTACK_API_KEY, ENV_LOCALSTACK_AUTH_TOKEN
-from werkzeug import Request, Response
-from werkzeug import serving as werkzeug_serving
-from werkzeug.datastructures import Headers
+from rolo import Request, Response
+from rolo.gateway import Gateway
 
 from aws_replicator import config as repl_config
 from aws_replicator.client.utils import truncate_content
@@ -65,22 +65,26 @@ def do_run(self):
         self.register_in_instance()
         bind_host = self.config.get("bind_host") or DEFAULT_BIND_HOST
 
-        # werkzeug uses under the hood a stdlib ``http.server.HTTPServer``, which should be enough to serve
-        # a simple AWS proxy. if HTTP2 and websockets are ever needed, then we should move to a more
-        # sophisticated runtime (like hypercorn or twisted)
-        self._server = werkzeug_serving.make_server(bind_host, self.port, self._wsgi_app)
-        self._server.serve_forever()
+        # we use a hypercorn server to serve the proxy.
+        # TODO: there are likely ways to simplify this, and we are maybe getting rid of hypercorn soon,
+        #  but it seems currently the proxy doesn't work with Twisted, likely due to some IO assumptions in
+        #  the ``proxy_request`` code.
+        self._server = GatewayServer(
+            Gateway(request_handlers=[self._handler_chain_handler]),
+            listen=[localstack_config.HostAndPort(bind_host, self.port)],
+            use_ssl=False,
+        )
+        self._server.start()
+        self._server.join()
 
     def do_shutdown(self):
         if self._server:
             self._server.shutdown()
 
-    @Request.application
-    def _wsgi_app(self, request: Request) -> Response:
-        """A wsgi-compatible interface for serving the proxy server."""
-        # make headers mutable (needed for serving through werkzeug)
-        request.headers = Headers(request.headers)
-        return self.proxy_request(request)
+    def _handler_chain_handler(self, chain, context, response):
+        """Exposes the ``proxy_request`` routine as a handler chain handler to be served through a gateway."""
+        response.update_from(self.proxy_request(context.request))
+        chain.stop()
 
     def proxy_request(self, request: Request) -> Response:
         parsed = self._extract_region_and_service(request.headers)

aws-replicator/aws_replicator/server/aws_request_forwarder.py

@@ -177,10 +177,10 @@ def _extract_region_from_domain(self, context: RequestContext):
         extract the region and inject an Authorization header with this region into the request.
         """
         try:
-            from localstack.constants import TEST_AWS_ACCESS_KEY_ID
-        except ImportError:
-            # compatibility with localstack 3.5
             from localstack.testing.config import TEST_AWS_ACCESS_KEY_ID
+        except ImportError:
+            # backwards compatibility before 3.5
+            from localstack.constants import TEST_AWS_ACCESS_KEY_ID
 
         headers = CaseInsensitiveDict(dict(context.request.headers))
         host_header = headers.get("Host") or ""

aws-replicator/setup.cfg

@@ -22,6 +22,7 @@ install_requires =
     localstack-client
     localstack-ext
     xmltodict
+    rolo
     # TODO: runtime dependencies below should be removed over time (required for some LS imports)
     boto
     cbor2
@@ -39,7 +40,6 @@ test =
     pyproject-flake8
     pytest
     pytest-httpserver
-    rolo
 
 [options.package_data]
 aws_replicator =