SQS: Register query API routes in provider lifecycle hook (#12685)

viren-nadkarni · web-flow · commit d724a6904e6b · 2025-06-17T16:04:03.000+05:30
diff --git a/localstack-core/localstack/services/providers.py b/localstack-core/localstack/services/providers.py
@@ -320,12 +320,8 @@ def sns():
 
 @aws_provider()
 def sqs():
-    from localstack.services import edge
-    from localstack.services.sqs import query_api
     from localstack.services.sqs.provider import SqsProvider
 
-    query_api.register(edge.ROUTER)
-
     provider = SqsProvider()
     return Service.for_provider(provider)
 
diff --git a/localstack-core/localstack/services/sqs/provider.py b/localstack-core/localstack/services/sqs/provider.py
@@ -77,6 +77,7 @@
 from localstack.services.edge import ROUTER
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.services.sqs import constants as sqs_constants
+from localstack.services.sqs import query_api
 from localstack.services.sqs.constants import (
     HEADER_LOCALSTACK_SQS_OVERRIDE_MESSAGE_COUNT,
     HEADER_LOCALSTACK_SQS_OVERRIDE_WAIT_TIME_SECONDS,
@@ -828,6 +829,7 @@ def get_store(account_id: str, region: str) -> SqsStore:
         return sqs_stores[account_id][region]
 
     def on_before_start(self):
+        query_api.register(ROUTER)
         self._router_rules = ROUTER.add(SqsDeveloperEndpoints())
         self._queue_update_worker.start()
         self._start_cloudwatch_metrics_reporting()
