From d7e4dcaadb2838f9efbbdf56e6d3b24c010a01c8 Mon Sep 17 00:00:00 2001
From: Alex Arslan <ararslan@comcast.net>
Date: Tue, 2 Jul 2024 09:24:07 -0700
Subject: [PATCH] Fix SQS tests assuming the query service response structure
 (#684)

* Fix SQS tests assuming the query service response structure

In PR 637, SQS changed from a `QueryService` to a `JSONService`. The
response obtained when interacting with SQS using the query protocol
includes a field called `<ActionName>Result`, where `<ActionName>` is
the action requested. The JSON protocol does not include that field.
Thus we can fix issue 683 by simply deleting that additional `getindex`
call.

* Also remove `ReceiveMessageResult`

* Helps if you read the docs

* Once again, the docs help

* ...And again, docs
---
 test/AWS.jl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/AWS.jl b/test/AWS.jl
index dc3058bd38..3fd83aa37c 100644
--- a/test/AWS.jl
+++ b/test/AWS.jl
@@ -792,7 +792,7 @@ end
         function _get_queue_url(queue_name)
             result = SQS.get_queue_url(queue_name)
 
-            return result["GetQueueUrlResult"]["QueueUrl"]
+            return result["QueueUrl"]
         end
 
         # Create Queue
@@ -809,7 +809,7 @@ end
             SQS.send_message(expected_message, queue_url)
 
             response = SQS.receive_message(queue_url)
-            receipt_handle = response["ReceiveMessageResult"]["Message"]["ReceiptHandle"]
+            receipt_handle = only(response["Messages"])["ReceiptHandle"]
 
             response = SQS.delete_message_batch(
                 [
@@ -820,13 +820,13 @@ end
                 queue_url,
             )
 
-            message_id = response["DeleteMessageBatchResult"]["DeleteMessageBatchResultEntry"]["Id"]
+            message_id = only(response["Successful"])["Id"]
             @test message_id == expected_message_id
 
             SQS.send_message(expected_message, queue_url)
 
             result = SQS.receive_message(queue_url)
-            message = result["ReceiveMessageResult"]["Message"]["Body"]
+            message = only(result["Messages"])["Body"]
             @test message == expected_message
         finally
             SQS.delete_queue(queue_url)
@@ -842,7 +842,7 @@ end
         function _get_queue_url(queue_name)
             result = AWSServices.sqs("GetQueueUrl", LittleDict("QueueName" => queue_name))
 
-            return result["GetQueueUrlResult"]["QueueUrl"]
+            return result["QueueUrl"]
         end
 
         # Create Queue
@@ -863,13 +863,13 @@ end
             response = AWSServices.sqs(
                 "ReceiveMessage", LittleDict("QueueUrl" => queue_url)
             )
-            receipt_handle = response["ReceiveMessageResult"]["Message"]["ReceiptHandle"]
+            receipt_handle = only(response["Messages"])["ReceiptHandle"]
 
             response = AWSServices.sqs(
                 "DeleteMessageBatch",
                 LittleDict(
                     "QueueUrl" => queue_url,
-                    "DeleteMessageBatchRequestEntry" => [
+                    "Entries" => [
                         LittleDict(
                             "Id" => expected_message_id,
                             "ReceiptHandle" => receipt_handle,
@@ -878,7 +878,7 @@ end
                 ),
             )
 
-            message_id = response["DeleteMessageBatchResult"]["DeleteMessageBatchResultEntry"]["Id"]
+            message_id = only(response["Successful"])["Id"]
             @test message_id == expected_message_id
 
             # Send message
@@ -889,7 +889,7 @@ end
 
             # Receive Message
             result = AWSServices.sqs("ReceiveMessage", LittleDict("QueueUrl" => queue_url))
-            message = result["ReceiveMessageResult"]["Message"]["Body"]
+            message = only(result["Messages"])["Body"]
             @test message == expected_message
         finally
             AWSServices.sqs("DeleteQueue", LittleDict("QueueUrl" => queue_url))