Skip to content

feat(plugin-aws): Added the new ubiquitous from in Publish.java closes #12354 #650

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

feat(plugin-aws): Added the new ubiquitous from in Publish.java closes #12354 #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f85891a
Used the new 'ubiquitous' from in sqs/Publish.java
Pavalasri Oct 27, 2025
315f059
Used the new 'ubiquitous' from in sns/Publish.java
Pavalasri Oct 27, 2025
6e68478
Refactor SNS message sending to use publish method
Pavalasri Oct 28, 2025
a62daa8
Refactor message mapping in sqs/Publish class
Pavalasri Oct 28, 2025
8c807ab
Refactor sendMessage call for sqs/Publish.java
Pavalasri Oct 28, 2025
4db2b5f
Updated sns/Publish.java
Pavalasri Oct 28, 2025
62e06c2
Update message retrieval in SNS publish method
Pavalasri Oct 28, 2025
1fcaf6c
Improved message parsing in sns/Publish.java
Pavalasri Oct 28, 2025
ca4eebb
Refactor message handling in sqs/Publish class
Pavalasri Oct 28, 2025
52be47f
Implement error handling for message parsing in sqs/Publish.java
Pavalasri Oct 28, 2025
a1394ea
Implement fallback for message parsing errors in sns/Publish.java
Pavalasri Oct 28, 2025
9f41d2b
Refactor message handling in sqs/Publish.java
Pavalasri Oct 28, 2025
70ad5f8
Refactor message handling in sns/Publish.java
Pavalasri Oct 28, 2025
3fcc13d
Refactor message handling for raw input types
Pavalasri Nov 1, 2025
0c798eb
Refactor message handling for String and Map types
Pavalasri Nov 1, 2025
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
77 changes: 36 additions & 41 deletions src/main/java/io/kestra/plugin/aws/sns/Publish.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.executions.metrics.Counter;
import io.kestra.core.models.property.Data;
import io.kestra.core.models.property.Property;
import io.kestra.core.models.tasks.RunnableTask;
import io.kestra.core.runners.RunContext;
import io.kestra.core.serializers.FileSerde;
Expand All @@ -24,6 +26,7 @@
import java.net.URI;
import java.util.List;
import jakarta.validation.constraints.NotNull;
import java.util.Map;

import static io.kestra.core.utils.Rethrow.throwFunction;

Expand Down Expand Up @@ -95,8 +98,7 @@
)
}
)
public class Publish extends AbstractSns implements RunnableTask<Publish.Output> {
@PluginProperty(dynamic = true)
public class Publish extends AbstractSns implements RunnableTask<Publish.Output>,Data.From {
@NotNull
@Schema(
title = "The source of the published data.",
Expand All @@ -109,37 +111,38 @@ public class Publish extends AbstractSns implements RunnableTask<Publish.Output>
public Publish.Output run(RunContext runContext) throws Exception {
var topicArn = runContext.render(getTopicArn()).as(String.class).orElseThrow();
try (var snsClient = this.client(runContext)) {
Integer count;
Flux<Message> flowable;
Flux<Integer> resultFlowable;

if (this.from instanceof String) {
URI from = new URI(runContext.render((String) this.from));
if (!from.getScheme().equals("kestra")) {
throw new Exception("Invalid 'from' parameter, must be a Kestra internal storage URI");
}

try (BufferedReader inputStream = new BufferedReader(new InputStreamReader(runContext.storage().getFile(from)))) {
flowable = FileSerde.readAll(inputStream, Message.class);
resultFlowable = this.buildFlowable(flowable, snsClient, topicArn, runContext);

count = resultFlowable.reduce(Integer::sum).blockOptional().orElse(0);
}

} else if (this.from instanceof List) {
flowable = Flux
.fromIterable((List<?>) this.from)
.map(map -> JacksonMapper.toMap(map, Message.class));

resultFlowable = this.buildFlowable(flowable, snsClient, topicArn, runContext);

count = resultFlowable.reduce(Integer::sum).blockOptional().orElse(0);
} else {
var msg = JacksonMapper.toMap(this.from, Message.class);
snsClient.publish(msg.to(PublishRequest.builder().topicArn(topicArn), runContext));

count = 1;
}
Integer count = Data.from(from).read(runContext)
.map(throwFunction(raw -> {
Message message;

if (raw instanceof Message) {
message = (Message) raw;
} else if (raw instanceof Map) {
message = JacksonMapper.ofJson().convertValue(raw, Message.class);
} else if (raw instanceof String || raw instanceof Map) {
String str = raw.toString();
try {
message = JacksonMapper.ofJson().readValue(str, Message.class);
} catch (Exception e) {
message = Message.builder()
.data(str)
.build();
}
} else {
throw new IllegalArgumentException("Unsupported message type: " + raw.getClass());
}
snsClient.publish(PublishRequest.builder()
.topicArn(topicArn)
.message(message.getData())
.subject(message.getSubject())
.build()
);

return 1;
}))
.reduce(Integer::sum)
.blockOptional()
.orElse(0);

// metrics
runContext.metric(Counter.of("sns.publish.messages", count, "topic", topicArn));
Expand All @@ -150,14 +153,6 @@ public Publish.Output run(RunContext runContext) throws Exception {
}
}

private Flux<Integer> buildFlowable(Flux<Message> flowable, SnsClient snsClient, String topicArn, RunContext runContext) throws IllegalVariableEvaluationException {
return flowable
.map(throwFunction(message -> {
snsClient.publish(message.to(PublishRequest.builder().topicArn(topicArn), runContext));
return 1;
}));
}

@Builder
@Getter
public static class Output implements io.kestra.core.models.tasks.Output {
Expand Down
81 changes: 39 additions & 42 deletions src/main/java/io/kestra/plugin/aws/sqs/Publish.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.executions.metrics.Counter;
import io.kestra.core.models.property.Data;
import io.kestra.core.models.property.Property;
import io.kestra.core.models.tasks.RunnableTask;
import io.kestra.core.runners.RunContext;
import io.kestra.core.serializers.FileSerde;
Expand Down Expand Up @@ -92,8 +94,7 @@
)
}
)
public class Publish extends AbstractSqs implements RunnableTask<Publish.Output> {
@PluginProperty(dynamic = true)
public class Publish extends AbstractSqs implements RunnableTask<Publish.Output>,Data.From {
@NotNull
@Schema(
title = "The source of the published data.",
Expand All @@ -107,39 +108,42 @@ public class Publish extends AbstractSqs implements RunnableTask<Publish.Output>
public Output run(RunContext runContext) throws Exception {
var queueUrl = runContext.render(getQueueUrl()).as(String.class).orElseThrow();
try (var sqsClient = this.client(runContext)) {
Integer count;
Flux<Message> flowable;
Flux<Integer> resultFlowable;

if (this.from instanceof String) {
URI from = new URI(runContext.render((String) this.from));
if (!from.getScheme().equals("kestra")) {
throw new Exception("Invalid from parameter, must be a Kestra internal storage URI");
}


try (BufferedReader inputStream = new BufferedReader(new InputStreamReader(runContext.storage().getFile(from)))) {
flowable = FileSerde.readAll(inputStream, Message.class);
resultFlowable = this.buildFlowable(flowable, sqsClient, queueUrl, runContext);

count = resultFlowable.reduce(Integer::sum).blockOptional().orElse(0);
}

} else if (this.from instanceof List) {
flowable = Flux
.fromIterable((List<?>) this.from)
.map(map -> JacksonMapper.toMap(map, Message.class));

resultFlowable = this.buildFlowable(flowable, sqsClient, queueUrl, runContext);

count = resultFlowable.reduce(Integer::sum).blockOptional().orElse(0);
} else {
var msg = JacksonMapper.toMap(this.from, Message.class);
sqsClient.sendMessage(msg.to(SendMessageRequest.builder().queueUrl(queueUrl), runContext));

count = 1;
}

Integer count = Data.from(from).read(runContext)
.map(throwFunction(raw -> {
Message message;

if (raw instanceof Message) {
message = (Message) raw;
} else if (raw instanceof Map) {
message = JacksonMapper.ofJson().convertValue(raw, Message.class);
} else if (raw instanceof String || raw instanceof Map) {
String str = raw.toString();
try {
message = JacksonMapper.ofJson().readValue(str, Message.class);
} catch (Exception e) {
message = Message.builder()
.data(str)
.build();
}
} else {
throw new IllegalArgumentException("Unsupported message type: " + raw.getClass());
}

var builder = SendMessageRequest.builder()
.queueUrl(queueUrl)
.messageBody(message.getData());

if (message.getDelaySeconds() != null) {
builder.delaySeconds(message.getDelaySeconds());
}

sqsClient.sendMessage(builder.build());
return 1;
}))
.reduce(Integer::sum)
.blockOptional()
.orElse(0);

// metrics
runContext.metric(Counter.of("sqs.publish.messages", count, "queue", queueUrl));

Expand All @@ -149,13 +153,6 @@ public Output run(RunContext runContext) throws Exception {
}
}

private Flux<Integer> buildFlowable(Flux<Message> flowable, SqsClient sqsClient, String queueUrl, RunContext runContext) throws IllegalVariableEvaluationException {
return flowable
.map(throwFunction(message -> {
sqsClient.sendMessage(message.to(SendMessageRequest.builder().queueUrl(queueUrl), runContext));
return 1;
}));
}

@Builder
@Getter
Expand Down
Loading