update

Admiral-Piett · Sep 20, 2024 · 20c9e6c · 20c9e6c
1 parent a65cc66
commit 20c9e6c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/app/gosqs/change_message_visibility.go b/app/gosqs/change_message_visibility.go
@@ -75,8 +75,9 @@ func ChangeMessageVisibilityV1(req *http.Request) (int, interfaces.AbstractRespo
 	}
 
 	respStruct := models.ChangeMessageVisibilityResult{
-		"http://queue.amazonaws.com/doc/2012-11-05/",
-		app.ResponseMetadata{RequestId: "00000000-0000-0000-0000-000000000001"}}
+		Xmlns:    models.BASE_XMLNS,
+		Metadata: models.BASE_RESPONSE_METADATA,
+	}
 
 	return http.StatusOK, &respStruct
 }
diff --git a/app/gosqs/delete_message.go b/app/gosqs/delete_message.go
@@ -50,7 +50,10 @@ func DeleteMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
 				delete(app.SyncQueues.Queues[queueName].Duplicates, msg.DeduplicationID)
 
 				// Create, encode/xml and send response
-				respStruct := models.DeleteMessageResponse{"http://queue.amazonaws.com/doc/2012-11-05/", app.ResponseMetadata{RequestId: "00000000-0000-0000-0000-000000000001"}}
+				respStruct := models.DeleteMessageResponse{
+					Xmlns:    models.BASE_XMLNS,
+					Metadata: models.BASE_RESPONSE_METADATA,
+				}
 				return 200, &respStruct
 			}
 		}

diff --git a/app/gosqs/get_queue_attributes.go b/app/gosqs/get_queue_attributes.go
@@ -128,9 +128,9 @@ func GetQueueAttributesV1(req *http.Request) (int, interfaces.AbstractResponseBo
 	}
 
 	respStruct := models.GetQueueAttributesResponse{
-		models.BASE_XMLNS,
-		models.GetQueueAttributesResult{Attrs: queueAttributes},
-		models.BASE_RESPONSE_METADATA,
+		Xmlns:    models.BASE_XMLNS,
+		Result:   models.GetQueueAttributesResult{Attrs: queueAttributes},
+		Metadata: models.BASE_RESPONSE_METADATA,
 	}
 	return http.StatusOK, respStruct
 }
diff --git a/app/gosqs/receive_message.go b/app/gosqs/receive_message.go
@@ -67,11 +67,9 @@ func ReceiveMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody)
 			case <-req.Context().Done():
 				continueTimer.Stop()
 				return http.StatusOK, models.ReceiveMessageResponse{
-					"http://queue.amazonaws.com/doc/2012-11-05/",
-					models.ReceiveMessageResult{},
-					app.ResponseMetadata{
-						RequestId: "00000000-0000-0000-0000-000000000000",
-					},
+					Xmlns:    models.BASE_XMLNS,
+					Result:   models.ReceiveMessageResult{},
+					Metadata: models.BASE_RESPONSE_METADATA,
 				}
 			case <-continueTimer.C:
 				continueTimer.Stop()

diff --git a/app/gosqs/send_message.go b/app/gosqs/send_message.go
@@ -88,16 +88,14 @@ func SendMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
 	log.Infof("%s: Queue: %s, Message: %s\n", time.Now().Format("2006-01-02 15:04:05"), queueName, msg.MessageBody)
 
 	respStruct := models.SendMessageResponse{
-		Xmlns: "http://queue.amazonaws.com/doc/2012-11-05/",
+		Xmlns: models.BASE_XMLNS,
 		Result: models.SendMessageResult{
 			MD5OfMessageAttributes: msg.MD5OfMessageAttributes,
 			MD5OfMessageBody:       msg.MD5OfMessageBody,
 			MessageId:              msg.Uuid,
 			SequenceNumber:         fifoSeqNumber,
 		},
-		Metadata: app.ResponseMetadata{
-			RequestId: "00000000-0000-0000-0000-000000000000",
-		},
+		Metadata: models.BASE_RESPONSE_METADATA,
 	}
 
 	return http.StatusOK, respStruct