fix aws-replicator compatibility with localstack >=3.4 (#63)

localstack · Jun 5, 2024 · 0cab1aa · 0cab1aa
1 parent 79bf5f3
commit 0cab1aa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/aws-replicator.yml b/.github/workflows/aws-replicator.yml
@@ -57,7 +57,7 @@ jobs:
 
           find  /home/runner/.cache/localstack/volume/lib/extensions/python_venv/lib/python3.11/site-packages/aws*
           ls -la  /home/runner/.cache/localstack/volume/lib/extensions/python_venv/lib/python3.11/site-packages/aws*
-          DEBUG=1 localstack start -d
+          DEBUG=1 GATEWAY_SERVER=hypercorn localstack start -d
           localstack wait
 
       - name: Run linter

diff --git a/aws-replicator/aws_replicator/server/aws_request_forwarder.py b/aws-replicator/aws_replicator/server/aws_request_forwarder.py
@@ -6,12 +6,7 @@
 import requests
 from localstack.aws.api import RequestContext
 from localstack.aws.chain import Handler, HandlerChain
-from localstack.constants import (
-    APPLICATION_JSON,
-    LOCALHOST,
-    LOCALHOST_HOSTNAME,
-    TEST_AWS_ACCESS_KEY_ID,
-)
+from localstack.constants import APPLICATION_JSON, LOCALHOST, LOCALHOST_HOSTNAME
 from localstack.http import Response
 from localstack.utils.aws import arns
 from localstack.utils.aws.arns import sqs_queue_arn
@@ -22,6 +17,11 @@
 from localstack.utils.strings import to_str, truncate
 from requests.structures import CaseInsensitiveDict
 
+try:
+    from localstack.testing.config import TEST_AWS_ACCESS_KEY_ID
+except ImportError:
+    from localstack.constants import TEST_AWS_ACCESS_KEY_ID
+
 from aws_replicator.shared.models import ProxyInstance, ProxyServiceConfig
 
 LOG = logging.getLogger(__name__)

diff --git a/aws-replicator/aws_replicator/server/extension.py b/aws-replicator/aws_replicator/server/extension.py
@@ -1,5 +1,6 @@
 import logging
 
+from localstack import config
 from localstack.aws.chain import CompositeHandler
 from localstack.extensions.api import Extension, http
 from localstack.services.internal import get_internal_apis
@@ -10,6 +11,13 @@
 class AwsReplicatorExtension(Extension):
     name = "aws-replicator"
 
+    def on_extension_load(self):
+        if config.GATEWAY_SERVER == "twisted":
+            LOG.warning(
+                "AWS resource replicator: The aws-replicator extension currently requires hypercorn as "
+                "gateway server. Please start localstack with GATEWAY_SERVER=hypercorn"
+            )
+
     def update_gateway_routes(self, router: http.Router[http.RouteHandler]):
         from aws_replicator.server.request_handler import RequestHandler
 

diff --git a/aws-replicator/tests/test_proxy_requests.py b/aws-replicator/tests/test_proxy_requests.py
@@ -6,14 +6,19 @@
 import pytest
 from botocore.exceptions import ClientError
 from localstack.aws.connect import connect_to
-from localstack.constants import TEST_AWS_ACCOUNT_ID
 from localstack.utils.aws.arns import sqs_queue_arn, sqs_queue_url_for_arn
 from localstack.utils.net import wait_for_port_open
 from localstack.utils.sync import retry
 
 from aws_replicator.client.auth_proxy import start_aws_auth_proxy
 from aws_replicator.shared.models import ProxyConfig
 
+try:
+    from localstack.testing.config import TEST_AWS_ACCOUNT_ID
+except ImportError:
+    # backwards compatibility
+    from localstack.constants import TEST_AWS_ACCOUNT_ID
+
 # binding proxy to 0.0.0.0 to enable testing in CI
 PROXY_BIND_HOST = "0.0.0.0"