shared-sqs: Этап 4 — изоляция очередей по тенанту

2026-04-09 12:53:10 +03:00
parent f4352a17b1
commit 08053ca8e5
16 changed files with 1243 additions and 882 deletions
@@ -1,65 +1,64 @@
+// Изменено: 2026-04-09
+// DeleteMessageV1 — удаляет сообщение из очереди тенанта по ReceiptHandle.
 package gosqs

 import (
-	"net/http"
-	"strings"
+"net/http"
+"strings"

-	"shared-sqs/app/interfaces"
-	"shared-sqs/app/models"
-	"shared-sqs/app/utils"
-	"github.com/gorilla/mux"
-	log "github.com/sirupsen/logrus"
+"shared-sqs/app/interfaces"
+"shared-sqs/app/models"
+"shared-sqs/app/utils"
+"github.com/gorilla/mux"
+log "github.com/sirupsen/logrus"
 )

 func DeleteMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
-	requestBody := models.NewDeleteMessageRequest()
-	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
-	if !ok {
-		log.Error("Invalid Request - DeleteMessageV1")
-		return utils.CreateErrorResponseV1("InvalidParameterValue", true)
-	}
-
-	// Retrieve FormValues required
-	receiptHandle := requestBody.ReceiptHandle
-
-	// Retrieve FormValues required
-	queueUrl := requestBody.QueueUrl
-	queueName := ""
-	if queueUrl == "" {
-		vars := mux.Vars(req)
-		queueName = vars["queueName"]
-	} else {
-		uriSegments := strings.Split(queueUrl, "/")
-		queueName = uriSegments[len(uriSegments)-1]
-	}
-
-	log.Info("Deleting Message, Queue:", queueName, ", ReceiptHandle:", receiptHandle)
-
-	// Find queue/message with the receipt handle and delete
-	models.SyncQueues.Lock()
-	defer models.SyncQueues.Unlock()
-	if _, ok := models.SyncQueues.Queues[queueName]; ok {
-		for i, msg := range models.SyncQueues.Queues[queueName].Messages {
-			if msg.ReceiptHandle == receiptHandle {
-				// Unlock messages for the group
-				log.Debugf("FIFO Queue %s unlocking group %s:", queueName, msg.GroupID)
-				models.SyncQueues.Queues[queueName].UnlockGroup(msg.GroupID)
-				//Delete message from Q
-				models.SyncQueues.Queues[queueName].Messages = append(models.SyncQueues.Queues[queueName].Messages[:i], models.SyncQueues.Queues[queueName].Messages[i+1:]...)
-				delete(models.SyncQueues.Queues[queueName].Duplicates, msg.DeduplicationID)
-
-				// Create, encode/xml and send response
-				respStruct := models.DeleteMessageResponse{
-					Xmlns:    models.BaseXmlns,
-					Metadata: models.BaseResponseMetadata,
-				}
-				return 200, &respStruct
-			}
-		}
-		log.Warning("Receipt Handle not found")
-	} else {
-		log.Warning("Queue not found")
-	}
-
-	return utils.CreateErrorResponseV1("MessageDoesNotExist", true)
+requestBody := models.NewDeleteMessageRequest()
+ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
+if !ok {
+log.Error("Invalid Request - DeleteMessageV1")
+return utils.CreateErrorResponseV1("InvalidParameterValue", true)
+}
+
+t := getTenantFromContext(req)
+if t == nil {
+return utils.CreateErrorResponseV1("InvalidClientTokenId", true)
+}
+
+receiptHandle := requestBody.ReceiptHandle
+queueUrl := requestBody.QueueUrl
+queueName := ""
+if queueUrl == "" {
+vars := mux.Vars(req)
+queueName = vars["queueName"]
+} else {
+uriSegments := strings.Split(queueUrl, "/")
+queueName = uriSegments[len(uriSegments)-1]
+}
+
+key := tenantQueueKey(t.AccessKey, queueName)
+log.Info("Deleting Message, Queue:", queueName, ", ReceiptHandle:", receiptHandle)
+
+models.SyncQueues.Lock()
+defer models.SyncQueues.Unlock()
+if _, ok := models.SyncQueues.Queues[key]; ok {
+for i, msg := range models.SyncQueues.Queues[key].Messages {
+if msg.ReceiptHandle == receiptHandle {
+models.SyncQueues.Queues[key].UnlockGroup(msg.GroupID)
+models.SyncQueues.Queues[key].Messages = append(models.SyncQueues.Queues[key].Messages[:i], models.SyncQueues.Queues[key].Messages[i+1:]...)
+delete(models.SyncQueues.Queues[key].Duplicates, msg.DeduplicationID)
+respStruct := models.DeleteMessageResponse{
+Xmlns:    models.BaseXmlns,
+Metadata: models.BaseResponseMetadata,
+}
+return 200, &respStruct
+}
+}
+log.Warning("Receipt Handle not found")
+} else {
+log.Warning("Queue not found")
+}
+
+return utils.CreateErrorResponseV1("MessageDoesNotExist", true)
 }