fix: commands wrapper to dynamic properties (#29)

Author: mgabelle

src/main/java/io/kestra/plugin/sqlmesh/cli/SQLMeshCLI.java

@@ -61,16 +61,13 @@ public class SQLMeshCLI extends Task implements RunnableTask<ScriptOutput>, Name
     @Schema(
         title = "The commands to execute before the main list of commands, e.g. to initialize or prepare the environment"
     )
-    @PluginProperty(dynamic = true)
-    protected List<String> beforeCommands;
+    protected Property<List<String>> beforeCommands;
 
     @Schema(
         title = "The commands to run in the container."
     )
-    @PluginProperty(dynamic = true)
     @NotNull
-    @NotEmpty
-    protected List<String> commands;
+    protected Property<List<String>> commands;
 
     @Schema(
         title = "Additional environment variables for the current process."
@@ -120,13 +117,9 @@ public ScriptOutput run(RunContext runContext) throws Exception {
             .withNamespaceFiles(namespaceFiles)
             .withInputFiles(inputFiles)
             .withOutputFiles(renderedOutputFiles.isEmpty() ? null : renderedOutputFiles)
-            .withCommands(
-                ScriptService.scriptCommands(
-                    List.of("/bin/sh", "-c"),
-                    Optional.ofNullable(this.beforeCommands).map(throwFunction(runContext::render)).orElse(null),
-                    runContext.render(this.commands)
-                )
-            )
+            .withInterpreter(Property.of(List.of("/bin/sh", "-c")))
+            .withBeforeCommands(this.beforeCommands)
+            .withCommands(this.commands)
             .run();
     }
 

src/test/java/io/kestra/plugin/sqlmesh/cli/SQLMeshCLITest.java

@@ -1,6 +1,7 @@
 package io.kestra.plugin.sqlmesh.cli;
 
 import com.google.common.collect.ImmutableMap;
+import io.kestra.core.models.property.Property;
 import io.kestra.core.utils.IdUtils;
 import io.kestra.core.utils.TestsUtils;
 import io.kestra.plugin.scripts.exec.scripts.models.DockerOptions;
@@ -37,7 +38,7 @@ void run() throws Exception {
             .id(IdUtils.create())
             .type(SQLMeshCLI.class.getName())
             .docker(DockerOptions.builder().image("ghcr.io/kestra-io/sqlmesh").entryPoint(Collections.emptyList()).build())
-            .commands(List.of("sqlmesh --version"));
+            .commands(Property.of(List.of("sqlmesh --version")));
 
         SQLMeshCLI runner = terraformBuilder.build();
 
@@ -48,13 +49,13 @@ void run() throws Exception {
 
         runner = terraformBuilder
             .env(Map.of("{{ inputs.environmentKey }}", "{{ inputs.environmentValue }}"))
-            .beforeCommands(List.of("sqlmesh init duckdb"))
-            .commands(List.of(
+            .beforeCommands(Property.of(List.of("sqlmesh init duckdb")))
+            .commands(Property.of(List.of(
                 "echo \"::{\\\"outputs\\\":{" +
                     "\\\"customEnv\\\":\\\"$" + environmentKey + "\\\"" +
                     "}}::\"",
                 "sqlmesh info | tr -d ' \n' | xargs -0 -I {} echo '::{\"outputs\":{}}::'"
-                             ))
+                             )))
             .build();
 
         scriptOutput = runner.run(runContext);