fix(tasks): all script property must be not-null and commands not…

…-empty (#81)
kestra-io · Oct 20, 2023 · b7e8dcf · b7e8dcf
1 parent 96ec91a
commit b7e8dcf
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 6 deletions.
diff --git a/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Commands.java b/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Commands.java
@@ -13,6 +13,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import javax.validation.constraints.NotEmpty;
 
 @SuperBuilder
 @ToString
@@ -64,6 +65,7 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
+    @NotEmpty
     protected List<String> commands;
 
     @Override

diff --git a/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Script.java b/plugin-script-julia/src/main/java/io/kestra/plugin/scripts/julia/Script.java
@@ -17,6 +17,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.NotNull;
 
 @SuperBuilder
 @ToString
@@ -51,6 +52,7 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Override

diff --git a/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Commands.java b/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Commands.java
@@ -13,6 +13,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import javax.validation.constraints.NotEmpty;
 
 @SuperBuilder
 @ToString
@@ -64,6 +65,7 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
+    @NotEmpty
     protected List<String> commands;
 
     @Override

diff --git a/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Script.java b/plugin-script-node/src/main/java/io/kestra/plugin/scripts/node/Script.java
@@ -17,6 +17,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.NotNull;
 
 @SuperBuilder
 @ToString
@@ -118,6 +119,7 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Override

diff --git a/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Commands.java b/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Commands.java
@@ -64,7 +64,6 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
-    @NotNull
     @NotEmpty
     protected List<String> commands;
 
@@ -73,7 +72,6 @@ public class Commands extends AbstractExecScript {
         title = "Which interpreter to use"
     )
     @PluginProperty
-    @NotNull
     @NotEmpty
     protected List<String> interpreter = List.of("/bin/sh", "-c");
 

diff --git a/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Script.java b/plugin-script-powershell/src/main/java/io/kestra/plugin/scripts/powershell/Script.java
@@ -67,14 +67,14 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Builder.Default
     @Schema(
         title = "Which interpreter to use"
     )
     @PluginProperty
-    @NotNull
     @NotEmpty
     protected List<String> interpreter = List.of("pwsh", "-NoProfile", "-NonInteractive", "-Command");
 

diff --git a/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Commands.java b/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Commands.java
@@ -242,7 +242,6 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
-    @NotNull
     @NotEmpty
     protected List<String> commands;
 

diff --git a/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Script.java b/plugin-script-python/src/main/java/io/kestra/plugin/scripts/python/Script.java
@@ -17,6 +17,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import javax.validation.constraints.NotNull;
 
 @SuperBuilder
 @ToString
@@ -110,6 +111,7 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Override

diff --git a/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Commands.java b/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Commands.java
@@ -68,7 +68,6 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
-    @NotNull
     @NotEmpty
     protected List<String> commands;
 

diff --git a/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Script.java b/plugin-script-r/src/main/java/io/kestra/plugin/scripts/r/Script.java
@@ -16,6 +16,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.List;
+import javax.validation.constraints.NotNull;
 
 @SuperBuilder
 @ToString
@@ -98,6 +99,7 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Override

diff --git a/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Commands.java b/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Commands.java
@@ -112,7 +112,6 @@ public class Commands extends AbstractExecScript {
         title = "The commands to run"
     )
     @PluginProperty(dynamic = true)
-    @NotNull
     @NotEmpty
     protected List<String> commands;
 

diff --git a/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Script.java b/plugin-script-shell/src/main/java/io/kestra/plugin/scripts/shell/Script.java
@@ -13,6 +13,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import javax.validation.constraints.NotNull;
 
 @SuperBuilder
 @ToString
@@ -65,6 +66,7 @@ public class Script extends AbstractExecScript {
         title = "The inline script content. This property is intended for the script file's content as a (multiline) string, not a path to a file. To run a command from a file such as `bash myscript.sh` or `python myscript.py`, use the `Commands` task instead."
     )
     @PluginProperty(dynamic = true)
+    @NotNull
     protected String script;
 
     @Override