Merge pull request #2859 from fedspendingtransparency/mod/dev-6468-up…

…date-sqs-to-use-correct-endpoint-url [DEV-6468] Update boto3 endpoint format for SQS
fedspendingtransparency · Nov 25, 2020 · 1e76b85 · 1e76b85
2 parents bda4edb + cc2fc97
commit 1e76b85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/usaspending_api/common/sqs/sqs_handler.py b/usaspending_api/common/sqs/sqs_handler.py
@@ -245,6 +245,6 @@ def get_sqs_queue(region_name=settings.USASPENDING_AWS_REGION, queue_name=settin
         return _FakeFileBackedSQSQueue.instance()
     else:
         # stuff that's in get_queue
-        sqs = boto3.resource("sqs", region_name)
+        sqs = boto3.resource("sqs", endpoint_url=f"https://sqs.{region_name}.amazonaws.com", region_name=region_name)
         queue = sqs.get_queue_by_name(QueueName=queue_name)
         return queue
diff --git a/usaspending_api/common/tests/unit/test_sqs_work_dispatcher.py b/usaspending_api/common/tests/unit/test_sqs_work_dispatcher.py
@@ -502,9 +502,10 @@ def work_one_or_two(message):
     def test_faulty_queue_connection_raises_correct_exception(self):
         """When a queue cannot be connected to, it raises the appropriate exception"""
         try:
+            region_name = "us-gov-west-1"
             # note: connection max retries config not in botocore v1.5.x
-            client_config = Config(region_name="us-gov-west-1", connect_timeout=1, read_timeout=1)
-            sqs = boto3.resource("sqs", config=client_config)
+            client_config = Config(region_name=region_name, connect_timeout=1, read_timeout=1)
+            sqs = boto3.resource("sqs", config=client_config, endpoint_url=f"https://sqs.{region_name}.amazonaws.com")
             queue = sqs.Queue("75f4f422-3866-4e4f-9dc9-5364e3de3eaf")
             dispatcher = SQSWorkDispatcher(
                 queue, worker_process_name="Test Worker Process", long_poll_seconds=1, monitor_sleep_time=1