diff --git a/build.gradle b/build.gradle index 5ba9595..455673f 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,6 @@ dependencies { // test deps needed only for to have a runner testAnnotationProcessor group: "io.kestra", name: "processor", version: kestraVersion testImplementation group: "io.kestra", name: "core", version: kestraVersion - testImplementation group: "io.kestra", name: "core", version: kestraVersion, classifier: "tests" testImplementation group: "io.kestra", name: "repository-memory", version: kestraVersion testImplementation group: "io.kestra", name: "runner-memory", version: kestraVersion testImplementation group: "io.kestra", name: "storage-local", version: kestraVersion @@ -120,8 +119,6 @@ dependencies { testImplementation "org.testcontainers:minio:1.19.8" testImplementation "org.testcontainers:localstack:1.19.8" - testImplementation 'io.minio:minio:8.5.10' - testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1' testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.1' testImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' diff --git a/src/main/java/io/kestra/plugin/minio/Copy.java b/src/main/java/io/kestra/plugin/minio/Copy.java index 6559a34..c9a1b57 100644 --- a/src/main/java/io/kestra/plugin/minio/Copy.java +++ b/src/main/java/io/kestra/plugin/minio/Copy.java @@ -37,7 +37,7 @@ } ) @Schema( - title = "Copy a file between S3 service." + title = "Copy a file between buckets." ) public class Copy extends AbstractMinioObject implements RunnableTask { diff --git a/src/main/java/io/kestra/plugin/minio/CreateBucket.java b/src/main/java/io/kestra/plugin/minio/CreateBucket.java index 3bc734b..079bc76 100644 --- a/src/main/java/io/kestra/plugin/minio/CreateBucket.java +++ b/src/main/java/io/kestra/plugin/minio/CreateBucket.java @@ -36,7 +36,7 @@ public class CreateBucket extends AbstractMinioObject implements RunnableTask { @Schema( - title = "Specifies whether you want S3 Object Lock to be enabled for the new bucket." + title = "Specifies whether you want Object Lock to be enabled for the new bucket." ) @PluginProperty private Boolean objectLockEnabledForBucket; diff --git a/src/main/java/io/kestra/plugin/minio/Delete.java b/src/main/java/io/kestra/plugin/minio/Delete.java index 1f6a8b5..c85798b 100644 --- a/src/main/java/io/kestra/plugin/minio/Delete.java +++ b/src/main/java/io/kestra/plugin/minio/Delete.java @@ -30,7 +30,7 @@ } ) @Schema( - title = "Delete a file from S3 service." + title = "Delete a file from a bucket." ) public class Delete extends AbstractMinioObject implements RunnableTask { @@ -41,7 +41,7 @@ public class Delete extends AbstractMinioObject implements RunnableTask { @@ -100,7 +100,7 @@ public class DeleteList extends AbstractMinioObject implements RunnableTask { diff --git a/src/main/java/io/kestra/plugin/minio/Downloads.java b/src/main/java/io/kestra/plugin/minio/Downloads.java index 37ae958..1d8025e 100644 --- a/src/main/java/io/kestra/plugin/minio/Downloads.java +++ b/src/main/java/io/kestra/plugin/minio/Downloads.java @@ -40,7 +40,7 @@ } ) @Schema( - title = "Downloads multiple files from a S3 service." + title = "Downloads multiple files from a bucket." ) public class Downloads extends AbstractMinioObject implements RunnableTask { @@ -63,8 +63,8 @@ public enum Action { private String delimiter; @Schema( - title = "Marker is where you want Amazon S3 to start listing from.", - description = "Amazon S3 starts listing after this specified key. Marker can be any key in the bucket." + title = "Marker is where you want to start listing from.", + description = "Start listing after this specified key. Marker can be any key in the bucket." ) @PluginProperty(dynamic = true) private String marker; @@ -170,7 +170,7 @@ public Output run(RunContext runContext) throws Exception { public static class Output implements io.kestra.core.models.tasks.Output { @JsonInclude @Schema( - title = "The list of S3 objects." + title = "The list of objects." ) private final java.util.List objects; diff --git a/src/main/java/io/kestra/plugin/minio/List.java b/src/main/java/io/kestra/plugin/minio/List.java index f5539ac..f2ef689 100644 --- a/src/main/java/io/kestra/plugin/minio/List.java +++ b/src/main/java/io/kestra/plugin/minio/List.java @@ -40,7 +40,7 @@ } ) @Schema( - title = "List keys on a S3 service." + title = "List keys on a bucket." ) public class List extends AbstractMinioObject implements RunnableTask { @@ -69,8 +69,8 @@ public enum Filter { private String delimiter; @Schema( - title = "Marker is where you want Amazon S3 to start listing from.", - description = "Amazon S3 starts listing after this specified key. Marker can be any key in the bucket." + title = "Marker is where you want to start listing from.", + description = "Start listing after this specified key. Marker can be any key in the bucket." ) @PluginProperty(dynamic = true) private String marker; @@ -203,7 +203,7 @@ private boolean filter(Item object, String regExp) { public static class Output implements io.kestra.core.models.tasks.Output { @JsonInclude @Schema( - title = "The list of S3 objects." + title = "The list of objects." ) private final java.util.List objects; } diff --git a/src/main/java/io/kestra/plugin/minio/MinioConnectionInterface.java b/src/main/java/io/kestra/plugin/minio/MinioConnectionInterface.java index c523340..61e4b8a 100644 --- a/src/main/java/io/kestra/plugin/minio/MinioConnectionInterface.java +++ b/src/main/java/io/kestra/plugin/minio/MinioConnectionInterface.java @@ -8,19 +8,19 @@ public interface MinioConnectionInterface { @Schema( - title = "URL to S3 service." + title = "URL to the MinIO endpoint." ) @PluginProperty(dynamic = true) String getEndpoint(); @Schema( - title = "Access Key Id in order to connect to S3 service." + title = "Access Key Id for authentication." ) @PluginProperty(dynamic = true) String getAccessKeyId(); @Schema( - title = "Secret Key Id in order to connect to S3 service." + title = "Secret Key Id for authentication." ) @PluginProperty(dynamic = true) String getSecretKeyId(); diff --git a/src/main/java/io/kestra/plugin/minio/Trigger.java b/src/main/java/io/kestra/plugin/minio/Trigger.java index 8f8a878..3ff0541 100644 --- a/src/main/java/io/kestra/plugin/minio/Trigger.java +++ b/src/main/java/io/kestra/plugin/minio/Trigger.java @@ -24,8 +24,8 @@ @Getter @NoArgsConstructor @Schema( - title = "Wait for files on S3 service.", - description = "This trigger will poll every `interval` s3 service. " + + title = "Wait for files on a bucket.", + description = "This trigger will list every `interval` a bucket. " + "You can search for all files in a bucket or directory in `from` or you can filter the files with a `regExp`. " + "The detection is atomic, internally we do a list and interact only with files listed.\n" + "Once a file is detected, we download the file on internal storage and processed with declared `action` " + @@ -34,10 +34,10 @@ @Plugin( examples = { @Example( - title = "Wait for a list of files on a s3 service and iterate through the files.", + title = "Wait for a list of files on a bucket and iterate through the files.", full = true, code = { - "id: s3-listen", + "id: minio-listen", "namespace: company.team", "", "tasks:", @@ -64,10 +64,10 @@ } ), @Example( - title = "Wait for a list of files on a s3 service and iterate through the files. Delete files manually after processing to prevent infinite triggering.", + title = "Wait for a list of files on a bucket and iterate through the files. Delete files manually after processing to prevent infinite triggering.", full = true, code = { - "id: s3-listen", + "id: minio-listen", "namespace: company.team", "", "tasks:", diff --git a/src/main/java/io/kestra/plugin/minio/Upload.java b/src/main/java/io/kestra/plugin/minio/Upload.java index 3b2782a..53bf065 100644 --- a/src/main/java/io/kestra/plugin/minio/Upload.java +++ b/src/main/java/io/kestra/plugin/minio/Upload.java @@ -50,7 +50,7 @@ } ) @Schema( - title = "Upload a file to S3." + title = "Upload a file to a bucket." ) public class Upload extends AbstractMinioObject implements RunnableTask { @@ -76,7 +76,7 @@ public class Upload extends AbstractMinioObject implements RunnableTask metadata;