From 46bb6618e2b1541fa4b796642fb618679f4ec45f Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Wed, 28 Sep 2022 22:09:51 +0200 Subject: [PATCH 01/29] fix(docker): build must fail for a missing plugins --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf665a2cae..920f3672f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -y && \ if [ -n "${APT_PACKAGES}" ]; then apt-get install -y --no-install-recommends ${APT_PACKAGES}; fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* && \ - if [ -n "${KESTRA_PLUGINS}" ]; then /app/kestra plugins install ${KESTRA_PLUGINS}; rm -rf /tmp/*; fi + if [ -n "${KESTRA_PLUGINS}" ]; then /app/kestra plugins install ${KESTRA_PLUGINS} && rm -rf /tmp/*; fi RUN groupadd kestra && \ useradd -m -g kestra kestra && \ From 6649a427de83e0ddfb0e7d8fcd723aeb50bfb655 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Fri, 30 Sep 2022 18:35:13 +0200 Subject: [PATCH 02/29] feat(tasks): handle inputFiles as a json string --- .../core/tasks/scripts/AbstractBash.java | 9 ++--- .../core/tasks/scripts/BashService.java | 22 ++++++++++ .../io/kestra/core/tasks/scripts/Node.java | 6 ++- .../io/kestra/core/tasks/scripts/Python.java | 4 +- .../kestra/core/tasks/AbstractBashTest.java | 40 +++++++++++++++++++ 5 files changed, 73 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java b/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java index d92bcecc65..80b40ba798 100644 --- a/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java +++ b/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java @@ -116,15 +116,14 @@ abstract public class AbstractBash extends Task { @Schema( title = "Input files are extra files supplied by user that make it simpler organize code.", - description = "Describe a files map that will be written and usable in execution context. In python execution " + - "context is in a temp folder, for bash scripts, you can reach files using a workingDir variable " + - "like 'source {{workingDir}}/myfile.sh' " + description = "Describe a files map (that can be a map or a json string) that will be written and usable in execution context. " + + "You can reach files using a workingDir variable like 'source {{workingDir}}/myfile.sh' " ) @PluginProperty( additionalProperties = String.class, dynamic = true ) - protected Map inputFiles; + protected Object inputFiles; @Schema( title = "Additional environnements variable to add for current process." @@ -151,7 +150,7 @@ abstract public class AbstractBash extends Task { protected transient Map additionalVars = new HashMap<>(); protected Map finalInputFiles(RunContext runContext) throws IOException, IllegalVariableEvaluationException { - return this.inputFiles != null ? new HashMap<>(this.inputFiles) : new HashMap<>(); + return this.inputFiles != null ? new HashMap<>(BashService.transformInputFiles(runContext, this.inputFiles)) : new HashMap<>(); } protected Map finalEnv() throws IOException { diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java b/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java index bb9459cc63..0f98ba685c 100644 --- a/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java +++ b/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java @@ -1,6 +1,7 @@ package io.kestra.core.tasks.scripts; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.kestra.core.exceptions.IllegalVariableEvaluationException; import io.kestra.core.runners.RunContext; @@ -17,6 +18,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.validation.constraints.NotNull; + import static io.kestra.core.utils.Rethrow.throwConsumer; abstract public class BashService { @@ -100,6 +103,25 @@ private static void validFilename(String s) { } } + public static Map transformInputFiles(RunContext runContext, @NotNull Object inputFiles) throws IllegalVariableEvaluationException, JsonProcessingException { + Map finalInputFiles; + + if (inputFiles instanceof Map) { + //noinspection unchecked + return (Map) inputFiles; + } else if (inputFiles instanceof String) { + final TypeReference> reference = new TypeReference<>() {}; + + return JacksonMapper.ofJson(false).readValue( + runContext.render((String) inputFiles), + reference + ); + } else { + throw new IllegalVariableEvaluationException("Invalid `files` properties with type '" + (inputFiles != null ? inputFiles.getClass() : "null") + "'"); + } + } + + public static void createInputFiles( RunContext runContext, Path workingDirectory, diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/Node.java b/core/src/main/java/io/kestra/core/tasks/scripts/Node.java index 77789d5c3e..61826eb46b 100644 --- a/core/src/main/java/io/kestra/core/tasks/scripts/Node.java +++ b/core/src/main/java/io/kestra/core/tasks/scripts/Node.java @@ -120,7 +120,9 @@ protected Map finalInputFiles(RunContext runContext) throws IOEx @Override public ScriptOutput run(RunContext runContext) throws Exception { - if (!inputFiles.containsKey("main.js")) { + Map finalInputFiles = this.finalInputFiles(runContext); + + if (!finalInputFiles.containsKey("main.js")) { throw new Exception("Invalid input files structure, expecting inputFiles property to contain at least a main.js key with javascript code value."); } @@ -134,7 +136,7 @@ public ScriptOutput run(RunContext runContext) throws Exception { String args = getArgs() == null ? "" : " " + runContext.render(String.join(" ", getArgs())); - String npmInstall = inputFiles.containsKey("package.json") ? npmPath + " i > /dev/null" : ""; + String npmInstall = finalInputFiles.containsKey("package.json") ? npmPath + " i > /dev/null" : ""; renderer.addAll(Arrays.asList( "PATH=\"$PATH:" + new File(nodePath).getParent() + "\"", diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/Python.java b/core/src/main/java/io/kestra/core/tasks/scripts/Python.java index e48e008602..08926a1b3c 100644 --- a/core/src/main/java/io/kestra/core/tasks/scripts/Python.java +++ b/core/src/main/java/io/kestra/core/tasks/scripts/Python.java @@ -118,7 +118,9 @@ protected Map finalInputFiles(RunContext runContext) throws IOEx @Override public ScriptOutput run(RunContext runContext) throws Exception { - if (!inputFiles.containsKey("main.py") && this.commands.size() == 1 && this.commands.get(0).equals("./bin/python main.py")) { + Map finalInputFiles = this.finalInputFiles(runContext); + + if (!finalInputFiles.containsKey("main.py") && this.commands.size() == 1 && this.commands.get(0).equals("./bin/python main.py")) { throw new Exception("Invalid input files structure, expecting inputFiles property to contain at least a main.py key with python code value."); } diff --git a/core/src/test/java/io/kestra/core/tasks/AbstractBashTest.java b/core/src/test/java/io/kestra/core/tasks/AbstractBashTest.java index ae8838c386..3b1441490f 100644 --- a/core/src/test/java/io/kestra/core/tasks/AbstractBashTest.java +++ b/core/src/test/java/io/kestra/core/tasks/AbstractBashTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.CharStreams; +import io.kestra.core.serializers.JacksonMapper; import io.kestra.core.tasks.scripts.ScriptOutput; import io.kestra.core.utils.TestsUtils; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; @@ -246,6 +247,45 @@ void useInputFilesFromKestraFs() throws Exception { assertThat(outputContent, is(fileContent)); } + @Test + void useInputFilesAsVariable() throws Exception { + URL resource = AbstractBashTest.class.getClassLoader().getResource("application.yml"); + + URI put1 = storageInterface.put( + new URI("/file/storage/get.yml"), + new FileInputStream(Objects.requireNonNull(resource).getFile()) + ); + + URI put2 = storageInterface.put( + new URI("/file/storage/get.yml"), + new FileInputStream(Objects.requireNonNull(resource).getFile()) + ); + + + Map files = new HashMap<>(); + files.put("1.yml", put1.toString()); + files.put("2.yml", put2.toString()); + + List commands = new ArrayList<>(); + commands.add("cat 1.yml 2.yml > {{ outputFiles.out }} "); + + Bash bash = configure(Bash.builder() + .interpreter("/bin/bash") + .commands(commands.toArray(String[]::new)) + .inputFiles(JacksonMapper.ofJson().writeValueAsString(files)) + .outputFiles(Collections.singletonList("out")) + ).build(); + + RunContext runContext = TestsUtils.mockRunContext(runContextFactory, bash, ImmutableMap.of()); + ScriptOutput run = bash.run(runContext); + + assertThat(run.getExitCode(), is(0)); + InputStream get = storageInterface.get(run.getOutputFiles().get("out")); + String outputContent = CharStreams.toString(new InputStreamReader(get)); + String fileContent = String.join("\n", Files.readAllLines(new File(resource.getPath()).toPath(), StandardCharsets.UTF_8)); + assertThat(outputContent, is(fileContent + fileContent)); + } + @Test void preventRelativeFile() throws Exception { URL resource = AbstractBashTest.class.getClassLoader().getResource("application.yml"); From 9df2050f13086a4c2dc01165d867e8732250f9b1 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Fri, 30 Sep 2022 22:31:48 +0200 Subject: [PATCH 03/29] feat(core): add URI as input type close #758 --- .../io/kestra/core/models/flows/Input.java | 1 + .../io/kestra/core/runners/RunnerUtils.java | 15 +++++++ .../io/kestra/core/runners/InputsTest.java | 44 ++++++++++++++----- .../core/serializers/YamlFlowParserTest.java | 4 +- .../test/resources/flows/valids/inputs.yaml | 3 ++ 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/io/kestra/core/models/flows/Input.java b/core/src/main/java/io/kestra/core/models/flows/Input.java index 1fcffef135..b1a438549c 100644 --- a/core/src/main/java/io/kestra/core/models/flows/Input.java +++ b/core/src/main/java/io/kestra/core/models/flows/Input.java @@ -47,5 +47,6 @@ public enum Type { DURATION, FILE, JSON, + URI, } } diff --git a/core/src/main/java/io/kestra/core/runners/RunnerUtils.java b/core/src/main/java/io/kestra/core/runners/RunnerUtils.java index 3e914d1781..10fb4662cb 100644 --- a/core/src/main/java/io/kestra/core/runners/RunnerUtils.java +++ b/core/src/main/java/io/kestra/core/runners/RunnerUtils.java @@ -40,10 +40,14 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; @Singleton public class RunnerUtils { + public static final Pattern URI_PATTERN = Pattern.compile("^[a-z]+:\\/\\/(?:www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&\\/=]*)$"); + @Inject @Named(QueueFactoryInterface.EXECUTION_NAMED) protected QueueInterface executionQueue; @@ -211,6 +215,17 @@ public Map typedInputs(Flow flow, Execution execution, Map( + input.getName(), + current + )); + } else { + throw new MissingRequiredInput("Invalid URI format for '" + input.getName() + "' for '" + current + "'"); + } + default: throw new MissingRequiredInput("Invalid input type '" + input.getType() + "' for '" + input.getName() + "'"); } diff --git a/core/src/test/java/io/kestra/core/runners/InputsTest.java b/core/src/test/java/io/kestra/core/runners/InputsTest.java index 02fa5515a0..eaebfd03c8 100644 --- a/core/src/test/java/io/kestra/core/runners/InputsTest.java +++ b/core/src/test/java/io/kestra/core/runners/InputsTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.CharStreams; +import io.kestra.core.exceptions.MissingRequiredInput; import org.junit.jupiter.api.Test; import io.kestra.core.models.executions.Execution; import io.kestra.core.models.flows.State; @@ -30,18 +31,19 @@ @SuppressWarnings("OptionalGetWithoutIsPresent") public class InputsTest extends AbstractMemoryRunnerTest { - public static Map inputs = ImmutableMap.of( - "string", "myString", - "int", "42", - "float", "42.42", - "bool", "false", - "instant", "2019-10-06T18:27:49Z", - "date", "2019-10-06", - "time", "18:27:49", - "duration", "PT5M6S", - "file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application.yml")).getPath(), - "json", "{\"a\": \"b\"}" - ); + public static Map inputs = ImmutableMap.builder() + .put("string", "myString") + .put("int", "42") + .put("float", "42.42") + .put("bool", "false") + .put("instant", "2019-10-06T18:27:49Z") + .put("date", "2019-10-06") + .put("time", "18:27:49") + .put("duration", "PT5M6S") + .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application.yml")).getPath()) + .put("json", "{\"a\": \"b\"}") + .put("uri", "https://www.google.com") + .build(); @Inject private FlowRepositoryInterface flowRepository; @@ -158,4 +160,22 @@ void inputJson() { Map typeds = typedInputs(inputs); assertThat(typeds.get("json"), is(Map.of("a", "b"))); } + + @Test + void inputUri() { + Map typeds = typedInputs(inputs); + assertThat(typeds.get("uri"), is("https://www.google.com")); + } + + @Test + void inputFailed() { + HashMap map = new HashMap<>(inputs); + map.put("uri", "http:/bla"); + + MissingRequiredInput e = assertThrows(MissingRequiredInput.class, () -> { + Map typeds = typedInputs(map); + }); + + assertThat(e.getMessage(), containsString("Invalid URI format")); + } } diff --git a/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java b/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java index c3d349028b..7d3e4eaae8 100644 --- a/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java +++ b/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java @@ -94,9 +94,9 @@ void inputsFailed() { void inputs() { Flow flow = this.parse("flows/valids/inputs.yaml"); - assertThat(flow.getInputs().size(), is(13)); + assertThat(flow.getInputs().size(), is(14)); assertThat(flow.getInputs().stream().filter(Input::getRequired).count(), is(6L)); - assertThat(flow.getInputs().stream().filter(r -> !r.getRequired()).count(), is(7L)); + assertThat(flow.getInputs().stream().filter(r -> !r.getRequired()).count(), is(8L)); assertThat(flow.getInputs().stream().filter(r -> r.getDefaults() != null).count(), is(1L)); } diff --git a/core/src/test/resources/flows/valids/inputs.yaml b/core/src/test/resources/flows/valids/inputs.yaml index 806f4cf555..dd668c5f41 100644 --- a/core/src/test/resources/flows/valids/inputs.yaml +++ b/core/src/test/resources/flows/valids/inputs.yaml @@ -36,6 +36,9 @@ inputs: - name: json type: JSON required: false +- name: uri + type: URI + required: false tasks: - id: string From 3334905d8cc389d29de8e4246206c0ca7c59db96 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Sun, 2 Oct 2022 21:17:27 +0200 Subject: [PATCH 04/29] feat(core): add hierarchical inputs separated by dots close #753 --- .../io/kestra/core/models/flows/Input.java | 2 +- .../io/kestra/core/runners/RunnerUtils.java | 27 +++++++++++++++---- .../io/kestra/core/runners/InputsTest.java | 12 +++++++++ .../core/serializers/YamlFlowParserTest.java | 4 +-- .../test/resources/flows/valids/inputs.yaml | 10 ++++++- 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/io/kestra/core/models/flows/Input.java b/core/src/main/java/io/kestra/core/models/flows/Input.java index b1a438549c..78728c03d1 100644 --- a/core/src/main/java/io/kestra/core/models/flows/Input.java +++ b/core/src/main/java/io/kestra/core/models/flows/Input.java @@ -20,7 +20,7 @@ public class Input { @NotNull @NotBlank - @Pattern(regexp="[a-zA-Z0-9_-]+") + @Pattern(regexp="[.a-zA-Z0-9_-]+") String name; @NotBlank diff --git a/core/src/main/java/io/kestra/core/runners/RunnerUtils.java b/core/src/main/java/io/kestra/core/runners/RunnerUtils.java index 10fb4662cb..74596b26f7 100644 --- a/core/src/main/java/io/kestra/core/runners/RunnerUtils.java +++ b/core/src/main/java/io/kestra/core/runners/RunnerUtils.java @@ -31,10 +31,7 @@ import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeParseException; -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; @@ -103,7 +100,7 @@ public Map typedInputs(Flow flow, Execution execution, Map results = flow .getInputs() .stream() .map((Function>>) input -> { @@ -233,6 +230,26 @@ public Map typedInputs(Flow flow, Execution execution, Map handleNestedInputs(Map inputs) { + Map result = new TreeMap<>(); + + for (Map.Entry entry : inputs.entrySet()) { + String[] f = entry.getKey().split("\\."); + Map t = result; + int i = 0; + for (int m = f.length - 1; i < m; ++i) { + t = (Map) t.computeIfAbsent(f[i], k -> new TreeMap<>()); + } + + t.put(f[i], entry.getValue()); + } + + return result; } public Execution runOne(String namespace, String flowId) throws TimeoutException { diff --git a/core/src/test/java/io/kestra/core/runners/InputsTest.java b/core/src/test/java/io/kestra/core/runners/InputsTest.java index eaebfd03c8..e5fcb37c74 100644 --- a/core/src/test/java/io/kestra/core/runners/InputsTest.java +++ b/core/src/test/java/io/kestra/core/runners/InputsTest.java @@ -43,6 +43,9 @@ public class InputsTest extends AbstractMemoryRunnerTest { .put("file", Objects.requireNonNull(InputsTest.class.getClassLoader().getResource("application.yml")).getPath()) .put("json", "{\"a\": \"b\"}") .put("uri", "https://www.google.com") + .put("nested.string", "a string") + .put("nested.more.int", "123") + .put("nested.bool", "true") .build(); @Inject @@ -178,4 +181,13 @@ void inputFailed() { assertThat(e.getMessage(), containsString("Invalid URI format")); } + + @SuppressWarnings("unchecked") + @Test + void inputNested() { + Map typeds = typedInputs(inputs); + assertThat(((Map)typeds.get("nested")).get("string"), is("a string")); + assertThat(((Map)typeds.get("nested")).get("bool"), is(true)); + assertThat(((Map)((Map)typeds.get("nested")).get("more")).get("int"), is(123)); + } } diff --git a/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java b/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java index 7d3e4eaae8..c778c5dfef 100644 --- a/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java +++ b/core/src/test/java/io/kestra/core/serializers/YamlFlowParserTest.java @@ -94,9 +94,9 @@ void inputsFailed() { void inputs() { Flow flow = this.parse("flows/valids/inputs.yaml"); - assertThat(flow.getInputs().size(), is(14)); + assertThat(flow.getInputs().size(), is(17)); assertThat(flow.getInputs().stream().filter(Input::getRequired).count(), is(6L)); - assertThat(flow.getInputs().stream().filter(r -> !r.getRequired()).count(), is(8L)); + assertThat(flow.getInputs().stream().filter(r -> !r.getRequired()).count(), is(11L)); assertThat(flow.getInputs().stream().filter(r -> r.getDefaults() != null).count(), is(1L)); } diff --git a/core/src/test/resources/flows/valids/inputs.yaml b/core/src/test/resources/flows/valids/inputs.yaml index dd668c5f41..32883642e3 100644 --- a/core/src/test/resources/flows/valids/inputs.yaml +++ b/core/src/test/resources/flows/valids/inputs.yaml @@ -39,7 +39,15 @@ inputs: - name: uri type: URI required: false - +- name: nested.string + type: STRING + required: false +- name: nested.more.int + type: INT + required: false +- name: nested.bool + type: BOOLEAN + required: false tasks: - id: string type: io.kestra.core.tasks.debugs.Return From fe0f2cf41a940aea0dea99579299f3194e9c46fa Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Mon, 3 Oct 2022 10:40:40 +0200 Subject: [PATCH 05/29] chore(deps): update most java deps --- build.gradle | 12 ++++++------ core/build.gradle | 14 +++++++------- .../models/triggers/types/ScheduleTest.java | 1 + gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++++------ indexer-kafka-elasticsearch/build.gradle | 2 +- jdbc-h2/build.gradle | 2 +- jdbc-mysql/build.gradle | 4 ++-- jdbc-postgres/build.gradle | 2 +- repository-elasticsearch/build.gradle | 2 +- runner-kafka/build.gradle | 2 +- 14 files changed, 38 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index f85d306b01..04b42d36b0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { // test id 'com.adarshr.test-logger' version '3.2.0' - id 'org.gradle.test-retry' version '1.4.0' + id 'org.gradle.test-retry' version '1.4.1' // helper id "com.github.ben-manes.versions" version "0.42.0" @@ -18,7 +18,7 @@ plugins { // release id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id 'net.researchgate.release' version '3.0.1' + id 'net.researchgate.release' version '3.0.2' id "com.gorylenko.gradle-git-properties" version "2.4.1" id 'signing' id 'ru.vyarus.pom' version '2.2.1' apply false @@ -70,7 +70,7 @@ allprojects { resolutionStrategy { force("org.apache.kafka:kafka-clients:" + kafkaVersion) force("org.apache.kafka:kafka-streams:" + kafkaVersion) - force("org.jooq:jooq:3.16.9") + force("org.jooq:jooq:3.16.10") } } @@ -98,9 +98,9 @@ allprojects { // logs implementation "org.slf4j:slf4j-api:1.7.36" - implementation "ch.qos.logback:logback-classic:1.2.11" - implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.18.0' - implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.36' + implementation "ch.qos.logback:logback-classic:1.4.3" + implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.19.0' + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '2.0.3' // jackson implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind' diff --git a/core/build.gradle b/core/build.gradle index 1c7670df1a..6e3046504a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -13,7 +13,7 @@ processResources.dependsOn copyGradleProperties dependencies { // log - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.3' // serializers implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion' @@ -21,7 +21,7 @@ dependencies { // utils implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4' implementation 'com.github.oshi:oshi-core:6.2.2' - implementation 'io.pebbletemplates:pebble:3.1.5' + implementation 'io.pebbletemplates:pebble:3.1.6' // scheduler implementation group: 'com.cronutils', name: 'cron-utils', version: '9.2.0' @@ -33,17 +33,17 @@ dependencies { implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.13' // schema - implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.26.0' - implementation group: 'com.github.victools', name: 'jsonschema-module-javax-validation', version: '4.26.0' - implementation group: 'com.github.victools', name: 'jsonschema-module-jackson', version: '4.26.0' - implementation group: 'com.github.victools', name: 'jsonschema-module-swagger-2', version: '4.26.0' + implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.27.0' + implementation group: 'com.github.victools', name: 'jsonschema-module-javax-validation', version: '4.27.0' + implementation group: 'com.github.victools', name: 'jsonschema-module-jackson', version: '4.27.0' + implementation group: 'com.github.victools', name: 'jsonschema-module-swagger-2', version: '4.27.0' // test testImplementation project(':repository-memory') testImplementation project(':runner-memory') testImplementation project(':storage-local') - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' testImplementation "io.micronaut:micronaut-http-client" testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client" testImplementation "io.micronaut:micronaut-http-server-netty" diff --git a/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java b/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java index a23fcc6840..7e856521ec 100644 --- a/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java +++ b/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java @@ -350,6 +350,7 @@ void hourly() throws Exception { assertThat(dateFromVars(vars.get("date"), date), is(date)); } + @SuppressWarnings("unchecked") @Test void timezone() throws Exception { Schedule trigger = Schedule.builder().cron("12 9 1 * *").timezone("America/New_York").build(); diff --git a/gradle.properties b/gradle.properties index d9e10b085e..fcfd5d278d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=0.5.2-SNAPSHOT -opensearchVersion=2.2.0 -micronautVersion=3.6.1 +opensearchVersion=2.3.0 +micronautVersion=3.7.1 kafkaVersion=3.1.0 lombokVersion=1.18.24 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684f0..ae04661ee7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787337..a69d9cb6c2 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..f127cfd49d 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/indexer-kafka-elasticsearch/build.gradle b/indexer-kafka-elasticsearch/build.gradle index b678e3cf00..c02bccb5db 100644 --- a/indexer-kafka-elasticsearch/build.gradle +++ b/indexer-kafka-elasticsearch/build.gradle @@ -11,5 +11,5 @@ dependencies { implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4' - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } diff --git a/jdbc-h2/build.gradle b/jdbc-h2/build.gradle index 73de8ff6d9..224f3599f7 100644 --- a/jdbc-h2/build.gradle +++ b/jdbc-h2/build.gradle @@ -11,5 +11,5 @@ dependencies { testImplementation project(':jdbc').sourceSets.test.output testImplementation project(':runner-memory') testImplementation project(':storage-local') - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } diff --git a/jdbc-mysql/build.gradle b/jdbc-mysql/build.gradle index 94049aef4a..26dbb823f7 100644 --- a/jdbc-mysql/build.gradle +++ b/jdbc-mysql/build.gradle @@ -6,11 +6,11 @@ dependencies { implementation("io.micronaut.sql:micronaut-jooq") runtimeOnly("mysql:mysql-connector-java:8.0.30") - runtimeOnly('org.flywaydb:flyway-mysql:9.2.0') + runtimeOnly('org.flywaydb:flyway-mysql:9.4.0') testImplementation project(':core').sourceSets.test.output testImplementation project(':jdbc').sourceSets.test.output testImplementation project(':runner-memory') testImplementation project(':storage-local') - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } diff --git a/jdbc-postgres/build.gradle b/jdbc-postgres/build.gradle index 4fa4f37260..d3215d6599 100644 --- a/jdbc-postgres/build.gradle +++ b/jdbc-postgres/build.gradle @@ -11,5 +11,5 @@ dependencies { testImplementation project(':jdbc').sourceSets.test.output testImplementation project(':runner-memory') testImplementation project(':storage-local') - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } diff --git a/repository-elasticsearch/build.gradle b/repository-elasticsearch/build.gradle index 1db4dc3d08..3ddd84841f 100644 --- a/repository-elasticsearch/build.gradle +++ b/repository-elasticsearch/build.gradle @@ -10,5 +10,5 @@ dependencies { testImplementation project(':core').sourceSets.test.output testImplementation project(':runner-memory') testImplementation project(':storage-local') - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } diff --git a/runner-kafka/build.gradle b/runner-kafka/build.gradle index 8d90771a49..ff33c99b38 100644 --- a/runner-kafka/build.gradle +++ b/runner-kafka/build.gradle @@ -12,5 +12,5 @@ dependencies { testImplementation group: 'org.apache.kafka', name: 'kafka-streams-test-utils', version: kafkaVersion - testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0' } From a17d19ad163c16f7e4499692485d63cd41684914 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Mon, 3 Oct 2022 21:30:40 +0200 Subject: [PATCH 06/29] chore(core): remove some compilation warning --- .../java/io/kestra/core/models/triggers/types/Schedule.java | 1 + .../main/java/io/kestra/core/tasks/scripts/BashService.java | 4 +--- core/src/main/java/io/kestra/core/tasks/storages/Concat.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/io/kestra/core/models/triggers/types/Schedule.java b/core/src/main/java/io/kestra/core/models/triggers/types/Schedule.java index f78b55ae11..91d1d5b6b0 100644 --- a/core/src/main/java/io/kestra/core/models/triggers/types/Schedule.java +++ b/core/src/main/java/io/kestra/core/models/triggers/types/Schedule.java @@ -130,6 +130,7 @@ public class Schedule extends AbstractTrigger implements PollingTriggerInterface title = "The time zone id to use for evaluate cron. Default value is the server default zone id." ) @PluginProperty(dynamic = true) + @Builder.Default private String timezone = ZoneId.systemDefault().toString(); @Schema( diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java b/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java index 0f98ba685c..c1d43bb2bf 100644 --- a/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java +++ b/core/src/main/java/io/kestra/core/tasks/scripts/BashService.java @@ -24,7 +24,7 @@ abstract public class BashService { protected static final ObjectMapper MAPPER = JacksonMapper.ofJson(); - private static final Pattern PATTERN = Pattern.compile("^::(\\{.*\\})::$"); + private static final Pattern PATTERN = Pattern.compile("^::(\\{.*})::$"); public static List finalCommandsWithInterpreter( String interpreter, @@ -104,8 +104,6 @@ private static void validFilename(String s) { } public static Map transformInputFiles(RunContext runContext, @NotNull Object inputFiles) throws IllegalVariableEvaluationException, JsonProcessingException { - Map finalInputFiles; - if (inputFiles instanceof Map) { //noinspection unchecked return (Map) inputFiles; diff --git a/core/src/main/java/io/kestra/core/tasks/storages/Concat.java b/core/src/main/java/io/kestra/core/tasks/storages/Concat.java index 4809d13d90..f08e3d3104 100644 --- a/core/src/main/java/io/kestra/core/tasks/storages/Concat.java +++ b/core/src/main/java/io/kestra/core/tasks/storages/Concat.java @@ -98,13 +98,13 @@ public class Concat extends Task implements RunnableTask { @PluginProperty(dynamic = true) private String separator; + @SuppressWarnings("unchecked") @Override public Concat.Output run(RunContext runContext) throws Exception { File tempFile = runContext.tempFile().toFile(); try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile)) { List finalFiles; if (this.files instanceof List) { - //noinspection unchecked finalFiles = (List) this.files; } else if (this.files instanceof String) { final TypeReference> reference = new TypeReference<>() {}; From 1dac65693e62472614ffc29be749a44ad05b1e7a Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Tue, 4 Oct 2022 12:08:15 +0200 Subject: [PATCH 07/29] fix(deps): let micronaut handle slf4j & logback version --- build.gradle | 7 ++++--- core/build.gradle | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 04b42d36b0..be45d95eee 100644 --- a/build.gradle +++ b/build.gradle @@ -97,10 +97,11 @@ allprojects { api "io.micronaut.rxjava2:micronaut-rxjava2-http-client" // logs - implementation "org.slf4j:slf4j-api:1.7.36" - implementation "ch.qos.logback:logback-classic:1.4.3" + implementation "org.slf4j:slf4j-api" + implementation "ch.qos.logback:logback-classic" implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.19.0' - implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '2.0.3' + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.36' + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36' // jackson implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind' diff --git a/core/build.gradle b/core/build.gradle index 6e3046504a..1b65fd36ca 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -13,7 +13,7 @@ processResources.dependsOn copyGradleProperties dependencies { // log - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.3' + implementation group: 'ch.qos.logback', name: 'logback-classic' // serializers implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion' From 3b7e8a5da3b338f6f504c1341644b5979e926a62 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Tue, 4 Oct 2022 23:27:26 +0200 Subject: [PATCH 08/29] feat(ui): add edit on logs tabs close #754 --- ui/src/components/executions/ChangeStatus.vue | 11 ++- ui/src/components/executions/Restart.vue | 15 ++- ui/src/components/flows/SubFlowLink.vue | 24 ++--- ui/src/components/graph/TreeNode.vue | 27 ++---- ui/src/components/logs/LogList.vue | 60 ++++++++---- ui/src/override/components/flows/TaskEdit.vue | 93 +++++++++++++------ ui/src/stores/flow.js | 11 +++ ui/src/translations.json | 6 +- .../webserver/controllers/FlowController.java | 20 ++++ .../controllers/FlowControllerTest.java | 17 ++++ 10 files changed, 201 insertions(+), 83 deletions(-) diff --git a/ui/src/components/executions/ChangeStatus.vue b/ui/src/components/executions/ChangeStatus.vue index 04f812268c..44e8637393 100644 --- a/ui/src/components/executions/ChangeStatus.vue +++ b/ui/src/components/executions/ChangeStatus.vue @@ -1,5 +1,6 @@