Avoid tagging queues in CreateQueueRequest and do it afterwards to av…

…oid QueueNameExistsException (#70)
awslabs · Sep 17, 2021 · 843043d · 843043d
1 parent 898366c
commit 843043d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/amazonaws/services/sqs/AmazonSQSIdleQueueDeletingClient.java b/src/main/java/com/amazonaws/services/sqs/AmazonSQSIdleQueueDeletingClient.java
@@ -10,6 +10,7 @@
 import java.util.function.Consumer;
 
 import com.amazonaws.services.sqs.model.QueueNameExistsException;
+import com.amazonaws.services.sqs.model.TagQueueRequest;
 import com.amazonaws.services.sqs.util.Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -185,13 +186,16 @@ public CreateQueueResult createQueue(CreateQueueRequest request) {
         long currentTimestamp = System.currentTimeMillis();
         CreateQueueRequest superRequest = request.clone()
                 .withQueueName(queueName)
-                .withAttributes(attributes)
-                .addTagsEntry(IDLE_QUEUE_RETENTION_PERIOD_TAG, retentionPeriodString)
-                .addTagsEntry(LAST_HEARTBEAT_TIMESTAMP_TAG, String.valueOf(currentTimestamp));
+                .withAttributes(attributes);
 
         CreateQueueResult result = super.createQueue(superRequest);
         String queueUrl = result.getQueueUrl();
 
+        TagQueueRequest tagQueueRequest = new TagQueueRequest().withQueueUrl(queueUrl)
+                .addTagsEntry(IDLE_QUEUE_RETENTION_PERIOD_TAG, retentionPeriodString)
+                .addTagsEntry(LAST_HEARTBEAT_TIMESTAMP_TAG, String.valueOf(currentTimestamp));
+        amazonSqsToBeExtended.tagQueue(tagQueueRequest);
+
         // TODO-RS: Filter more carefully to all attributes valid for createQueue 
         List<String> attributeNames = Arrays.asList(QueueAttributeName.ReceiveMessageWaitTimeSeconds.toString(),
                                                     QueueAttributeName.VisibilityTimeout.toString());