Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix QueueAttributesResolver throws when creating Fifo queue (#995) #1002

Merged
merged 1 commit into from
Dec 31, 2023
Merged

Fix QueueAttributesResolver throws when creating Fifo queue (#995) #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/QueueAttributesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,17 @@ private CompletableFuture<String> handleException(Throwable t) {
}

private CompletableFuture<String> createQueue() {
return this.sqsAsyncClient.createQueue(req -> req.queueName(this.queueName).build())
return this.sqsAsyncClient.createQueue(req -> req.queueName(this.queueName)
.attributes(getAttributes())
.build())
.thenApply(CreateQueueResponse::queueUrl)
.whenComplete(this::logCreateQueueResult);
}

private Map<QueueAttributeName,String> getAttributes() {
return FifoUtils.isFifo(this.queueName) ? Map.of(QueueAttributeName.FIFO_QUEUE, "true") : Map.of();
}

private void logCreateQueueResult(String v, Throwable t) {
if (t != null) {
logger.debug("Error creating queue {}", this.queueName, t);
Expand Down
23 changes: 23 additions & 0 deletions .../test/java/io/awspring/cloud/sqs/integration/QueueAttributesResolverIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,29 @@ void shouldCreateQueue() {
}
}

// @formatter:off
@Test
void shouldCreateFifoQueue() {
String queueName = "testQueueName-" + UUID.randomUUID() + ".fifo";
SqsAsyncClient client = createAsyncClient();
QueueAttributesResolver resolver = QueueAttributesResolver
.builder()
.queueAttributeNames(Collections.emptyList())
.sqsAsyncClient(client)
.queueName(queueName)
.queueNotFoundStrategy(QueueNotFoundStrategy.CREATE)
.build();
try {
QueueAttributes attributes = resolver.resolveQueueAttributes().join();
assertThat(attributes.getQueueName()).isEqualTo(queueName);
assertThat(attributes.getQueueAttribute(QueueAttributeName.QUEUE_ARN)).isNull();
}
finally {
String queueUrl = client.getQueueUrl(GetQueueUrlRequest.builder().queueName(queueName).build()).join().queueUrl();
client.deleteQueue(DeleteQueueRequest.builder().queueUrl(queueUrl).build()).join();
}
}

@Test
void shouldNotCreateQueue() {
String queueName = "testQueueName-" + UUID.randomUUID();
Expand Down
Loading