Skip to content

Commit 7cce85f

Browse files
author
Pankaj Agrawal
committed
Fix correct place holder for queuename and account
1 parent 145174b commit 7cce85f

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import software.amazon.awssdk.services.sqs.SqsClient;
99
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequest;
1010
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequestEntry;
11+
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchResponse;
1112
import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest;
1213
import software.amazon.lambda.powertools.sqs.SQSBatchProcessingException;
1314

@@ -68,15 +69,16 @@ private void deleteSuccessMessage() {
6869
.build()).collect(toList()))
6970
.build();
7071

71-
client.deleteMessageBatch(request);
72+
DeleteMessageBatchResponse deleteMessageBatchResponse = client.deleteMessageBatch(request);
73+
LOG.debug(format("Response from delete request %s", deleteMessageBatchResponse));
7274
}
7375
}
7476

7577
private String url() {
7678
String[] arnArray = success.get(0).getEventSourceArn().split(":");
7779
return client.getQueueUrl(GetQueueUrlRequest.builder()
78-
.queueOwnerAWSAccountId(arnArray[1])
79-
.queueName(arnArray[2])
80+
.queueOwnerAWSAccountId(arnArray[4])
81+
.queueName(arnArray[5])
8082
.build())
8183
.queueUrl();
8284
}

powertools-sqs/src/test/java/software/amazon/lambda/powertools/sqs/PowertoolsSqsBatchProcessorTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.api.Test;
1010
import org.junit.jupiter.params.ParameterizedTest;
1111
import org.junit.jupiter.params.provider.ValueSource;
12+
import org.mockito.ArgumentCaptor;
1213
import software.amazon.awssdk.services.sqs.SqsClient;
1314
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequest;
1415
import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest;
@@ -107,6 +108,13 @@ void shouldBatchProcessAndDeleteSuccessMessageOnPartialFailures() {
107108

108109
verify(interactionClient).listQueues();
109110
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
111+
112+
ArgumentCaptor<GetQueueUrlRequest> captor = ArgumentCaptor.forClass(GetQueueUrlRequest.class);
113+
verify(sqsClient).getQueueUrl(captor.capture());
114+
115+
assertThat(captor.getValue())
116+
.hasFieldOrPropertyWithValue("queueName", "my-queue")
117+
.hasFieldOrPropertyWithValue("queueOwnerAWSAccountId", "123456789012");
110118
}
111119

112120
@Test

0 commit comments

Comments
 (0)