feat: storage now have a namespace parameter

kestra-io · Nov 21, 2024 · e00feb1 · e00feb1
1 parent 4222c43
commit e00feb1
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 32 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 version=0.20.0-SNAPSHOT
-kestraVersion=[0.18,)
+kestraVersion=[0.20,)
diff --git a/src/test/java/io/kestra/plugin/aws/dynamodb/AbstractDynamoDbTest.java b/src/test/java/io/kestra/plugin/aws/dynamodb/AbstractDynamoDbTest.java
@@ -3,7 +3,6 @@
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.runners.RunContext;
 import io.kestra.core.runners.RunContextFactory;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
@@ -17,9 +16,6 @@ public abstract class AbstractDynamoDbTest extends AbstractLocalStackTest {
     @Inject
     protected RunContextFactory runContextFactory;
 
-    @Inject
-    protected StorageInterface storageInterface;
-
     void createTable(RunContext runContext, AbstractDynamoDb dynamoDb) throws IllegalVariableEvaluationException {
         try (var dynamoDbClient = dynamoDb.client(runContext)) {
             if (!dynamoDbClient.listTables().tableNames().contains("persons")) {

diff --git a/src/test/java/io/kestra/plugin/aws/eventbridge/PutEventsTest.java b/src/test/java/io/kestra/plugin/aws/eventbridge/PutEventsTest.java
@@ -4,7 +4,6 @@
 import io.kestra.core.runners.RunContext;
 import io.kestra.core.runners.RunContextFactory;
 import io.kestra.core.serializers.FileSerde;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.plugin.aws.eventbridge.model.Entry;
 import io.kestra.core.junit.annotations.KestraTest;
@@ -15,8 +14,6 @@
 import lombok.extern.jackson.Jacksonized;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -36,8 +33,6 @@ class PutEventsTest extends AbstractLocalStackTest {
 
     @Inject
     protected RunContextFactory runContextFactory;
-    @Inject
-    protected StorageInterface storageInterface;
 
     private static List<PutEvents.OutputEntry> getOutputEntries(PutEvents put, RunContext runContext) throws Exception {
         var output = put.run(runContext);

diff --git a/src/test/java/io/kestra/plugin/aws/kinesis/PutRecordsTest.java b/src/test/java/io/kestra/plugin/aws/kinesis/PutRecordsTest.java
@@ -8,7 +8,6 @@
 import io.kestra.core.runners.RunContextFactory;
 import io.kestra.core.serializers.FileSerde;
 import io.kestra.core.serializers.JacksonMapper;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.plugin.aws.kinesis.model.Record;
 import io.kestra.core.junit.annotations.KestraTest;
@@ -23,8 +22,6 @@
 import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
@@ -52,8 +49,6 @@ class PutRecordsTest {
 
     @Inject
     protected RunContextFactory runContextFactory;
-    @Inject
-    protected StorageInterface storageInterface;
 
     @BeforeAll
     static void startLocalstack() throws IllegalVariableEvaluationException, InterruptedException {

diff --git a/src/test/java/io/kestra/plugin/aws/lambda/AbstractInvokeTest.java b/src/test/java/io/kestra/plugin/aws/lambda/AbstractInvokeTest.java
@@ -1,7 +1,6 @@
 package io.kestra.plugin.aws.lambda;
 
 import io.kestra.core.runners.RunContextFactory;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
@@ -16,7 +15,6 @@
 import software.amazon.awssdk.services.lambda.waiters.LambdaWaiter;
 
 import java.io.InputStream;
-import java.util.stream.Collectors;
 
 @KestraTest
 @Testcontainers
@@ -33,11 +31,6 @@ public class AbstractInvokeTest extends AbstractLocalStackTest {
     @Inject
     protected RunContextFactory runContextFactory;
 
-    @Inject
-    protected StorageInterface storageInterface;
-
-    protected String functionArn;
-
 
     void createFunction(LambdaClient client) {
         if (client.listFunctions().functions().stream().noneMatch(config -> config.functionName().equals(FUNCTION_NAME))) {

diff --git a/src/test/java/io/kestra/plugin/aws/s3/AbstractTest.java b/src/test/java/io/kestra/plugin/aws/s3/AbstractTest.java
@@ -16,7 +16,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -64,6 +63,7 @@ protected String upload(String dir) throws Exception {
 
     protected URI storagePut(String path) throws URISyntaxException, IOException {
         return storageInterface.put(
+            null,
             null,
             new URI("/" + (path != null ? path : IdUtils.create())),
             new FileInputStream(file())

diff --git a/src/test/java/io/kestra/plugin/aws/s3/AllTest.java b/src/test/java/io/kestra/plugin/aws/s3/AllTest.java
@@ -51,7 +51,7 @@ void run() throws Exception {
             .build();
         Download.Output run = download.run(runContext(download));
 
-        InputStream get = storageInterface.get(null, run.getUri());
+        InputStream get = storageInterface.get(null, null, run.getUri());
         assertThat(
             CharStreams.toString(new InputStreamReader(get)),
             is(CharStreams.toString(new InputStreamReader(new FileInputStream(file()))))

diff --git a/src/test/java/io/kestra/plugin/aws/sns/AbstractSnsTest.java b/src/test/java/io/kestra/plugin/aws/sns/AbstractSnsTest.java
@@ -1,7 +1,6 @@
 package io.kestra.plugin.aws.sns;
 
 import io.kestra.core.runners.RunContextFactory;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
@@ -17,9 +16,6 @@ public class AbstractSnsTest extends AbstractLocalStackTest {
     @Inject
     protected RunContextFactory runContextFactory;
 
-    @Inject
-    protected StorageInterface storageInterface;
-
     void createTopic(SnsClient client) {
         if (!client.listTopics().topics().contains(TOPIC_ARN)) {
             client.createTopic(CreateTopicRequest.builder().name("test-topic").build());

diff --git a/src/test/java/io/kestra/plugin/aws/sqs/AbstractSqsTest.java b/src/test/java/io/kestra/plugin/aws/sqs/AbstractSqsTest.java
@@ -1,7 +1,6 @@
 package io.kestra.plugin.aws.sqs;
 
 import io.kestra.core.runners.RunContextFactory;
-import io.kestra.core.storages.StorageInterface;
 import io.kestra.plugin.aws.AbstractLocalStackTest;
 import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
@@ -21,9 +20,6 @@ public class AbstractSqsTest extends AbstractLocalStackTest {
     @Inject
     protected RunContextFactory runContextFactory;
 
-    @Inject
-    protected StorageInterface storageInterface;
-
     @BeforeEach
     void beforeEach() {
         try(SqsClient sqsClient = SqsClient