Partially update SQS to use the new config

simonrw · simonrw · commit 6e58a00360de · 2023-03-03T11:08:57.000Z
The logic seems a little fragmented - the default is to use the `Host`
request header, but then some circumstances can partially override this
with new behaviour.
diff --git a/localstack/services/sqs/models.py b/localstack/services/sqs/models.py
@@ -9,7 +9,7 @@
 from queue import PriorityQueue
 from typing import Dict, NamedTuple, Optional, Set
 
-from localstack import config, constants
+from localstack import config
 from localstack.aws.api import RequestContext
 from localstack.aws.api.sqs import (
     InvalidAttributeName,
@@ -21,7 +21,7 @@
     ReceiptHandleIsInvalid,
     TagMap,
 )
-from localstack.config import external_service_url
+from localstack.config import get_protocol
 from localstack.services.sqs import constants as sqs_constants
 from localstack.services.sqs.exceptions import (
     InvalidAttributeValue,
@@ -35,6 +35,7 @@
 )
 from localstack.services.stores import AccountRegionBundle, BaseStore, LocalAttribute
 from localstack.utils.time import now
+from localstack.utils.urls import localstack_host
 
 LOG = logging.getLogger(__name__)
 
@@ -249,13 +250,18 @@ def url(self, context: RequestContext) -> str:
             # or us-east-2.queue.localhost.localstack.cloud:4566/000000000000/my-queue
             region = "" if self.region == "us-east-1" else self.region + "."
             scheme = context.request.scheme
-            host_url = f"{scheme}://{region}queue.{constants.LOCALHOST_HOSTNAME}:{config.EDGE_PORT}"
+
+            host_definition = localstack_host(use_localhost_cloud=True)
+            host_url = f"{scheme}://{region}queue.{host_definition.host_and_port()}"
         elif config.SQS_ENDPOINT_STRATEGY == "path":
             # https?://localhost:4566/queue/us-east-1/00000000000/my-queue (us-east-1)
             host_url = f"{context.request.host_url}/queue/{self.region}"
         else:
             if config.SQS_PORT_EXTERNAL:
-                host_url = external_service_url("sqs")
+                host_definition = localstack_host(
+                    use_hostname_external=True, custom_port=config.SQS_PORT_EXTERNAL
+                )
+                return f"{get_protocol()}://{host_definition.host_and_port()}"
 
         return "{host}/{account_id}/{name}".format(
             host=host_url.rstrip("/"),
diff --git a/tests/integration/test_network_configuration.py b/tests/integration/test_network_configuration.py
@@ -170,6 +170,7 @@ def test_off_strategy(self, monkeypatch, sqs_create_queue, patch_hostnames):
         queue_url = sqs_create_queue()
 
         assert external_hostname in queue_url
+        assert external_port in queue_url
 
         assert localstack_hostname not in queue_url
 
