From 6b500a451f576a7acdcbbd7d9100d69a3b946891 Mon Sep 17 00:00:00 2001
From: Ludovic DEHON <tchiot.ludo@gmail.com>
Date: Fri, 16 Aug 2024 11:02:09 +0200
Subject: [PATCH] fix(s3): missing NotNull for bucket and key

---
 .../io/kestra/plugin/aws/s3/AbstractS3ObjectInterface.java     | 2 ++
 src/main/java/io/kestra/plugin/aws/s3/Copy.java                | 3 +++
 src/main/java/io/kestra/plugin/aws/s3/CreateBucket.java        | 2 ++
 src/main/java/io/kestra/plugin/aws/s3/Delete.java              | 2 ++
 src/main/java/io/kestra/plugin/aws/s3/Download.java            | 2 ++
 src/main/java/io/kestra/plugin/aws/s3/Upload.java              | 3 +++
 6 files changed, 14 insertions(+)

diff --git a/src/main/java/io/kestra/plugin/aws/s3/AbstractS3ObjectInterface.java b/src/main/java/io/kestra/plugin/aws/s3/AbstractS3ObjectInterface.java
index 8b61c488..0dbfcda6 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/AbstractS3ObjectInterface.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/AbstractS3ObjectInterface.java
@@ -2,12 +2,14 @@
 
 import io.kestra.core.models.annotations.PluginProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 public interface AbstractS3ObjectInterface extends AbstractS3 {
     @Schema(
         title = "The S3 bucket name."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     String getBucket();
 
     @Schema(
diff --git a/src/main/java/io/kestra/plugin/aws/s3/Copy.java b/src/main/java/io/kestra/plugin/aws/s3/Copy.java
index aeb4f789..8772abe7 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/Copy.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/Copy.java
@@ -7,6 +7,7 @@
 import io.kestra.core.runners.RunContext;
 import io.kestra.plugin.aws.AbstractConnection;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -105,12 +106,14 @@ public static class CopyObject {
             title = "The bucket name"
         )
         @PluginProperty(dynamic = true)
+        @NotNull
         String bucket;
 
         @Schema(
             title = "The bucket key"
         )
         @PluginProperty(dynamic = true)
+        @NotNull
         String key;
     }
 
diff --git a/src/main/java/io/kestra/plugin/aws/s3/CreateBucket.java b/src/main/java/io/kestra/plugin/aws/s3/CreateBucket.java
index c6d01dd9..68ce4e26 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/CreateBucket.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/CreateBucket.java
@@ -7,6 +7,7 @@
 import io.kestra.core.runners.RunContext;
 import io.kestra.plugin.aws.AbstractConnection;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -39,6 +40,7 @@ public class CreateBucket extends AbstractConnection implements AbstractS3, Runn
         description = "The S3 bucket name to create."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     private String bucket;
 
     @Schema(
diff --git a/src/main/java/io/kestra/plugin/aws/s3/Delete.java b/src/main/java/io/kestra/plugin/aws/s3/Delete.java
index 5be86bf7..08a70092 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/Delete.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/Delete.java
@@ -6,6 +6,7 @@
 import io.kestra.core.models.tasks.RunnableTask;
 import io.kestra.core.runners.RunContext;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -38,6 +39,7 @@ public class Delete extends AbstractS3Object implements RunnableTask<Delete.Outp
         title = "The key to delete."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     private String key;
 
     @Schema(
diff --git a/src/main/java/io/kestra/plugin/aws/s3/Download.java b/src/main/java/io/kestra/plugin/aws/s3/Download.java
index 5030a4fe..463b9e65 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/Download.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/Download.java
@@ -6,6 +6,7 @@
 import io.kestra.core.models.tasks.RunnableTask;
 import io.kestra.core.runners.RunContext;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.tuple.Pair;
@@ -43,6 +44,7 @@ public class Download extends AbstractS3Object implements RunnableTask<Download.
         title = "The key of a file to download."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     private String key;
 
     @Schema(
diff --git a/src/main/java/io/kestra/plugin/aws/s3/Upload.java b/src/main/java/io/kestra/plugin/aws/s3/Upload.java
index 67082954..7f5c2d75 100644
--- a/src/main/java/io/kestra/plugin/aws/s3/Upload.java
+++ b/src/main/java/io/kestra/plugin/aws/s3/Upload.java
@@ -8,6 +8,7 @@
 import io.kestra.core.runners.RunContext;
 import io.kestra.core.serializers.JacksonMapper;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.apache.commons.io.FilenameUtils;
@@ -57,6 +58,7 @@ public class Upload extends AbstractS3Object implements RunnableTask<Upload.Outp
         anyOf = {List.class, String.class}
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     private Object from;
 
     @Schema(
@@ -64,6 +66,7 @@ public class Upload extends AbstractS3Object implements RunnableTask<Upload.Outp
         description = "a full key (with filename) or the directory path if from is multiple files."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     private String key;
 
     @Schema(