remove LEGACY_EDGE_PROXY (#7886)

thrau · thrau · commit 762339a3cf92 · 2023-03-18T22:01:31.000+01:00
diff --git a/localstack/services/edge.py b/localstack/services/edge.py
@@ -354,14 +354,9 @@ def is_trace_logging_enabled(headers) -> bool:
 
 
 def do_start_edge(bind_address, port, use_ssl, asynchronous=False):
-    if config.LEGACY_EDGE_PROXY:
-        serve = do_start_edge_proxy
-    else:
-        from localstack.aws.serving.edge import serve_gateway
-
-        serve = serve_gateway
+    from localstack.aws.serving.edge import serve_gateway
 
-    return serve(bind_address, port, use_ssl, asynchronous)
+    return serve_gateway(bind_address, port, use_ssl, asynchronous)
 
 
 def do_start_edge_proxy(bind_address, port, use_ssl, asynchronous=False):
diff --git a/localstack/services/s3/s3_listener.py b/localstack/services/s3/s3_listener.py
@@ -183,10 +183,6 @@ def get_bucket(bucket_name: str) -> FakeBucket:
         backend = get_s3_backend()
         bucket = backend.buckets.get(bucket_name)
         if not bucket:
-            # note: adding a switch here to be able to handle both, moto's MissingBucket with the
-            # legacy edge proxy, as well as our custom CommonServiceException with the new Gateway.
-            if config.LEGACY_EDGE_PROXY:
-                raise MissingBucket()
             raise NoSuchBucket()
         return bucket
 
diff --git a/localstack/services/s3/s3_starter.py b/localstack/services/s3/s3_starter.py
@@ -82,8 +82,7 @@ def start_s3(port=None, backend_port=None, asynchronous=None, update_listener=No
 
     apply_patches()
 
-    if not config.LEGACY_EDGE_PROXY:
-        add_gateway_compatibility_handlers()
+    add_gateway_compatibility_handlers()
 
     return start_moto_server(
         key="s3",
diff --git a/tests/integration/test_edge.py b/tests/integration/test_edge.py
@@ -1,18 +1,17 @@
+# FIXME: these are remnants of the legacy edge proxy. these tests should somehow be migrated to
+#  instead either test the LocalstackAwsGateway (integration), or functionality of the http server (unit).
 import io
 import json
 import os
-import urllib
 
 import pytest
 import requests
 import xmltodict
-from quart import request as quart_request
 from requests.models import Request as RequestsRequest
 
 from localstack import config
 from localstack.aws.accounts import get_aws_account_id
 from localstack.constants import APPLICATION_JSON, HEADER_LOCALSTACK_EDGE_URL
-from localstack.http.request import get_full_raw_path
 from localstack.services.generic_proxy import (
     MessageModifyingProxyListener,
     ProxyListener,
@@ -53,9 +52,7 @@ def test_invoke_s3(self):
         edge_url = config.get_edge_url()
         self._invoke_s3_via_edge(edge_url)
 
-    @pytest.mark.xfail(
-        condition=not config.LEGACY_EDGE_PROXY, reason="failing with new HTTP gateway (only in CI)"
-    )
+    @pytest.mark.xfail(reason="failing in CI")  # TODO verify this
     def test_invoke_s3_multipart_request(self):
         edge_url = config.get_edge_url()
         self._invoke_s3_via_edge_multipart_form(edge_url)
@@ -361,28 +358,3 @@ def test_request_with_custom_host_header(self):
                 response = requests.get(f"{url}/2015-03-31/functions", headers=headers)
                 assert response
                 assert "Functions" in json.loads(to_str(response.content))
-
-    @pytest.mark.skipif(
-        condition=not config.LEGACY_EDGE_PROXY, reason="only relevant for old edge proxy"
-    )
-    def test_forward_raw_path(self, monkeypatch):
-        class MyListener(ProxyListener):
-            def forward_request(self, method, path, data, headers):
-                _path = get_full_raw_path(quart_request)
-                return {"method": method, "path": _path}
-
-        # start listener and configure EDGE_FORWARD_URL
-        port = get_free_tcp_port()
-        forward_url = f"http://localhost:{port}"
-        listener = MyListener()
-        proxy = start_proxy_server(port, update_listener=listener, use_ssl=True)
-        monkeypatch.setattr(config, "EDGE_FORWARD_URL", forward_url)
-
-        # run test request, assert that raw request path is forwarded
-        test_arn = "arn:aws:test:resource/test"
-        raw_path = f"/test/{urllib.parse.quote(test_arn)}/bar?q1=foo&q2=bar"
-        url = f"{config.get_edge_url()}{raw_path}"
-        response = requests.get(url)
-        expected = {"method": "GET", "path": raw_path}
-        assert json.loads(to_str(response.content)) == expected
-        proxy.stop()
