fix(script): bad merge

Fixes #4078

.github/workflows/docker.yml

@@ -7,14 +7,7 @@ on:
         description: 'Retag latest Docker images'
         required: true
         type: string
-        options:
+        default: "true"
-          - "true"
-          - "false"
-      skip-test:
-        description: 'Skip test'
-        required: false
-        type: string
-        default: "false"
         options:
           - "true"
           - "false"
@@ -125,6 +118,16 @@ jobs:
             packages: python3 python3-venv python-is-python3 python3-pip nodejs npm curl zip unzip
             python-libs: kestra
     steps:
+      - uses: actions/checkout@v4
+
+      # Vars
+      - name: Set image name
+        id: vars
+        run: |
+          TAG=${GITHUB_REF#refs/*/}
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          echo "plugins=${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT
+
       # Download release
       - name: Download release
         uses: robinraju/release-downloader@v1.10
@@ -137,14 +140,6 @@ jobs:
         run: |
           cp build/executable/* docker/app/kestra && chmod +x docker/app/kestra
 
-      # Vars
-      - name: Set image name
-        id: vars
-        run: |
-          TAG=${GITHUB_REF#refs/*/}
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-          echo "plugins=${{ matrix.image.plugins }}" >> $GITHUB_OUTPUT
-
       # Docker setup
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -179,7 +174,7 @@ jobs:
       - name: Retag to latest
         if: github.event.inputs.retag-latest == 'true'
         run: |
-          regctl image copy ${{ format('kestra/kestra:{0}{1}', steps.vars.outputs.tag, matrix.image.name) }} ${{ format('kestra/kestra:latest{1}', matrix.image.name) }}
+          regctl image copy ${{ format('kestra/kestra:{0}{1}', steps.vars.outputs.tag, matrix.image.name) }} ${{ format('kestra/kestra:latest{0}', matrix.image.name) }}
 
   end:
     runs-on: ubuntu-latest

build.gradle

@@ -454,7 +454,7 @@ subprojects {
     }
 
     maven.pom {
-        description 'The modern, scalable orchestrator & scheduler open source platform'
+        description = 'The modern, scalable orchestrator & scheduler open source platform'
 
         developers {
             developer {

cli/src/main/java/io/kestra/cli/commands/servers/ExecutorCommand.java

@@ -37,6 +37,12 @@ public class ExecutorCommand extends AbstractServerCommand {
     @CommandLine.Option(names = {"--skip-flows"}, split=",", description = "a list of flow identifiers (tenant|namespace|flowId) to skip, separated by a coma; for troubleshooting purpose only")
     private List<String> skipFlows = Collections.emptyList();
 
+    @CommandLine.Option(names = {"--skip-namespaces"}, split=",", description = "a list of namespace identifiers (tenant|namespace) to skip, separated by a coma; for troubleshooting purpose only")
+    private List<String> skipNamespaces = Collections.emptyList();
+
+    @CommandLine.Option(names = {"--skip-tenants"}, split=",", description = "a list of tenants to skip, separated by a coma; for troubleshooting purpose only")
+    private List<String> skipTenants = Collections.emptyList();
+
     @CommandLine.Option(names = {"--start-executors"}, split=",", description = "a list of Kafka Stream executors to start, separated by a command. Use it only with the Kafka queue, for debugging purpose.")
     private List<String> startExecutors = Collections.emptyList();
 
@@ -54,6 +60,8 @@ public class ExecutorCommand extends AbstractServerCommand {
     public Integer call() throws Exception {
         this.skipExecutionService.setSkipExecutions(skipExecutions);
         this.skipExecutionService.setSkipFlows(skipFlows);
+        this.skipExecutionService.setSkipNamespaces(skipNamespaces);
+        this.skipExecutionService.setSkipTenants(skipTenants);
 
         this.startExecutorService.applyOptions(startExecutors, notStartExecutors);
 

cli/src/main/java/io/kestra/cli/commands/servers/StandAloneCommand.java

@@ -49,6 +49,12 @@ public class StandAloneCommand extends AbstractServerCommand {
     @CommandLine.Option(names = {"--skip-flows"}, split=",", description = "a list of flow identifiers (namespace.flowId) to skip, separated by a coma; for troubleshooting purpose only")
     private List<String> skipFlows = Collections.emptyList();
 
+    @CommandLine.Option(names = {"--skip-namespaces"}, split=",", description = "a list of namespace identifiers (tenant|namespace) to skip, separated by a coma; for troubleshooting purpose only")
+    private List<String> skipNamespaces = Collections.emptyList();
+
+    @CommandLine.Option(names = {"--skip-tenants"}, split=",", description = "a list of tenants to skip, separated by a coma; for troubleshooting purpose only")
+    private List<String> skipTenants = Collections.emptyList();
+
     @CommandLine.Option(names = {"--no-tutorials"}, description = "Flag to disable auto-loading of tutorial flows.")
     boolean tutorialsDisabled = false;
 
@@ -74,6 +80,8 @@ public class StandAloneCommand extends AbstractServerCommand {
     public Integer call() throws Exception {
         this.skipExecutionService.setSkipExecutions(skipExecutions);
         this.skipExecutionService.setSkipFlows(skipFlows);
+        this.skipExecutionService.setSkipNamespaces(skipNamespaces);
+        this.skipExecutionService.setSkipTenants(skipTenants);
 
         this.startExecutorService.applyOptions(startExecutors, notStartExecutors);
 

core/src/main/java/io/kestra/core/models/flows/input/FileInput.java

@@ -1,18 +1,21 @@
 package io.kestra.core.models.flows.input;
 
 import io.kestra.core.models.flows.Input;
+import jakarta.validation.ConstraintViolationException;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.net.URI;
 
-import jakarta.validation.ConstraintViolationException;
-
 @SuperBuilder
 @Getter
 @NoArgsConstructor
 public class FileInput extends Input<URI> {
+    @Builder.Default
+    public String extension = ".upl";
+
     @Override
     public void validate(URI input) throws ConstraintViolationException {
         // no validation yet

core/src/main/java/io/kestra/core/runners/FilesService.java

@@ -2,6 +2,7 @@ package io.kestra.core.runners;
 
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.models.tasks.runners.PluginUtilsService;
+import io.kestra.core.utils.IdUtils;
 import io.kestra.core.utils.ListUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -85,10 +86,14 @@ public abstract class FilesService {
                 .filter(path -> pathMatcher.matches(runContext.tempDir().relativize(path)))
                 .map(throwFunction(path -> new AbstractMap.SimpleEntry<>(
                     runContext.tempDir().relativize(path).toString(),
-                    runContext.storage().putFile(path.toFile())
+                    runContext.storage().putFile(path.toFile(), resolveUniqueNameForFile(path))
                 )))
                 .toList()
                 .stream();
         }
     }
+
+    private static String resolveUniqueNameForFile(final Path path) {
+        return IdUtils.from(path.toString()) + "-" + path.toFile().getName();
+    }
 }

core/src/main/java/io/kestra/core/runners/FlowInputOutput.java

@@ -8,6 +8,7 @@ import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.Input;
 import io.kestra.core.models.flows.Type;
 import io.kestra.core.models.flows.input.ArrayInput;
+import io.kestra.core.models.flows.input.FileInput;
 import io.kestra.core.models.tasks.common.EncryptedString;
 import io.kestra.core.serializers.JacksonMapper;
 import io.kestra.core.storages.StorageInterface;
@@ -85,7 +86,9 @@ public class FlowInputOutput {
             .subscribeOn(Schedulers.boundedElastic())
             .map(throwFunction(input -> {
                 if (input instanceof CompletedFileUpload fileUpload) {
-                    File tempFile = File.createTempFile(fileUpload.getFilename() + "_", ".upl");
+                    String fileExtension = inputs.stream().filter(flowInput -> flowInput instanceof FileInput && flowInput.getId().equals(fileUpload.getFilename())).map(flowInput -> ((FileInput) flowInput).getExtension()).findFirst().orElse(".upl");
+                    fileExtension = fileExtension.startsWith(".") ? fileExtension : "." + fileExtension;
+                    File tempFile = File.createTempFile(fileUpload.getFilename() + "_", fileExtension);
                     try (var inputStream = fileUpload.getInputStream();
                          var outputStream = new FileOutputStream(tempFile)) {
                         long transferredBytes = inputStream.transferTo(outputStream);

core/src/main/java/io/kestra/core/runners/NamespaceFilesService.java

@@ -31,7 +31,7 @@ public class NamespaceFilesService {
     private StorageInterface storageInterface;
 
     public List<URI> inject(RunContext runContext, String tenantId, String namespace, Path basePath, NamespaceFiles namespaceFiles) throws Exception {
-        if (!namespaceFiles.getEnabled()) {
+        if (!Boolean.TRUE.equals(namespaceFiles.getEnabled())) {
             return Collections.emptyList();
         }
 

core/src/main/java/io/kestra/core/runners/RunContext.java

@@ -339,7 +339,7 @@ public class RunContext {
             if (execution.getTaskRunList() != null) {
                 Map<String, Object> outputs = new HashMap<>(execution.outputs());
                 if (decryptVariables) {
-                    decryptOutputs(outputs);
+                    outputs = decryptOutputs(outputs);
                 }
                 builder.put("outputs", outputs);
             }
@@ -401,25 +401,37 @@ public class RunContext {
                 ));
         }
 
+        if (this.runContextLogger != null) {
+            builder.put("addSecretConsumer", (Consumer<String>) s -> this.runContextLogger.usedSecret(s));
+        }
+
         return builder.build();
     }
 
-    private void decryptOutputs(Map<String, Object> outputs) {
+    private Map<String, Object> decryptOutputs(Map<String, Object> mapToDecrypt) {
-        for (var entry: outputs.entrySet()) {
+        if (mapToDecrypt == null) {
+            return null;
+        }
+
+        Map<String, Object> decryptedMap = new HashMap<>();
+        for (var entry: mapToDecrypt.entrySet()) {
+            decryptedMap.put(entry.getKey(), entry.getValue());
             if (entry.getValue() instanceof Map map) {
-                // if some outputs are of type EncryptedString we decode them and replace the object
+                // if some value are of type EncryptedString we decode them and replace the object
                 if (EncryptedString.TYPE.equalsIgnoreCase((String)map.get("type"))) {
                     try {
                         String decoded = decrypt((String) map.get("value"));
-                        outputs.put(entry.getKey(), decoded);
+                        decryptedMap.put(entry.getKey(), decoded);
                     } catch (GeneralSecurityException e) {
                         throw new RuntimeException(e);
                     }
                 }  else {
-                    decryptOutputs((Map<String, Object>) map);
+                    decryptedMap.put(entry.getKey(), decryptOutputs((Map<String, Object>) map));
                 }
             }
         }
+
+        return decryptedMap;
     }
 
     private Map<String, Object> variables(TaskRun taskRun) {
@@ -502,6 +514,8 @@ public class RunContext {
         runContext.runContextLogger = this.runContextLogger;
         runContext.tempBasedPath = this.tempBasedPath;
         runContext.temporaryDirectory = this.temporaryDirectory;
+        runContext.pluginConfiguration = this.pluginConfiguration;
+        runContext.secretKey = this.secretKey;
 
         return runContext;
     }
@@ -583,6 +597,17 @@ public class RunContext {
         return newContext;
     }
 
+    public RunContext forWorkingDirectoryTask(final Task task) {
+        Map<String, Object> decryptedVariables = new HashMap<>(this.variables);
+        if (this.variables.get("outputs") != null) {
+            decryptedVariables.put("outputs", decryptOutputs((Map<String, Object>) this.variables.get("outputs")));
+        }
+
+        RunContext newRunContext = this.clone(decryptedVariables);
+        newRunContext.initPluginConfiguration(applicationContext, task.getClass(), task.getType());
+        return newRunContext;
+    }
+
     public RunContext forTaskRunner(TaskRunner taskRunner) {
         this.initPluginConfiguration(applicationContext, taskRunner.getClass(), taskRunner.getType());
 

core/src/main/java/io/kestra/core/runners/Worker.java

@@ -285,7 +285,7 @@ public class Worker implements Service, Runnable, AutoCloseable {
                     WorkerTask currentWorkerTask = workingDirectory.workerTask(
                         workerTask.getTaskRun(),
                         currentTask,
-                        runContext
+                        runContext.forWorkingDirectoryTask(currentTask)
                     );
 
                     // all tasks will be handled immediately by the worker

core/src/main/java/io/kestra/core/services/SkipExecutionService.java

@@ -12,13 +12,23 @@ import java.util.List;
 public class SkipExecutionService {
     private volatile List<String> skipExecutions = Collections.emptyList();
     private volatile List<FlowId> skipFlows = Collections.emptyList();
+    private volatile List<NamespaceId> skipNamespaces = Collections.emptyList();
+    private volatile List<String> skipTenants = Collections.emptyList();
 
     public synchronized void setSkipExecutions(List<String> skipExecutions) {
-        this.skipExecutions = skipExecutions;
+        this.skipExecutions = skipExecutions == null ? Collections.emptyList() : skipExecutions;
     }
 
     public synchronized void setSkipFlows(List<String> skipFlows) {
-        this.skipFlows = skipFlows == null ? Collections.emptyList() : skipFlows.stream().map(flow -> FlowId.from(flow)).toList();
+        this.skipFlows = skipFlows == null ? Collections.emptyList() : skipFlows.stream().map(FlowId::from).toList();
+    }
+
+    public synchronized void setSkipNamespaces(List<String> skipNamespaces) {
+        this.skipNamespaces = skipNamespaces == null ? Collections.emptyList() : skipNamespaces.stream().map(NamespaceId::from).toList();
+    }
+
+    public synchronized void setSkipTenants(List<String> skipTenants) {
+        this.skipTenants = skipTenants == null ? Collections.emptyList() : skipTenants;
     }
 
     /**
@@ -38,17 +48,30 @@ public class SkipExecutionService {
 
     @VisibleForTesting
     boolean skipExecution(String tenant, String namespace, String flow, String executionId) {
-        return skipExecutions.contains(executionId) ||
+        return (tenant != null && skipTenants.contains(tenant)) ||
-            skipFlows.contains(new FlowId(tenant, namespace, flow));
+            skipNamespaces.contains(new NamespaceId(tenant, namespace)) ||
+            skipFlows.contains(new FlowId(tenant, namespace, flow)) ||
+            (executionId != null && skipExecutions.contains(executionId));
+    }
+
+    private static String[] splitIdParts(String id) {
+        return id.split("\\|");
     }
 
     record FlowId(String tenant, String namespace, String flow) {
         static FlowId from(String flowId) {
-            String[] parts = flowId.split("\\|");
+            String[] parts = SkipExecutionService.splitIdParts(flowId);
             if (parts.length == 3) {
                 return new FlowId(parts[0], parts[1], parts[2]);
             }
             return new FlowId(null, parts[0], parts[1]);
         }
     };
+
+    record NamespaceId(String tenant, String namespace) {
+        static NamespaceId from(String namespaceId) {
+            String[] parts = SkipExecutionService.splitIdParts(namespaceId);
+            return new NamespaceId(parts[0], parts[1]);
+        }
+    };
 }

core/src/main/java/io/kestra/plugin/core/flow/WorkingDirectory.java

@@ -270,7 +270,7 @@ public class WorkingDirectory extends Sequential implements NamespaceFilesInterf
             }
         }
 
-        if (this.namespaceFiles != null ) {
+        if (this.namespaceFiles != null && Boolean.TRUE.equals(this.namespaceFiles.getEnabled())) {
             NamespaceFilesService namespaceFilesService = runContext.getApplicationContext().getBean(NamespaceFilesService.class);
             namespaceFilesService.inject(runContext, taskRun.getTenantId(), taskRun.getNamespace(), runContext.tempDir(), this.namespaceFiles);
         }

core/src/main/java/io/kestra/plugin/core/namespace/DeleteFiles.java

@@ -80,7 +80,6 @@ public class DeleteFiles extends Task implements RunnableTask<DeleteFiles.Output
     private String namespace;
 
     @NotNull
-    @NotEmpty
     @Schema(
         title = "A file or a list of files from the given namespace.",
         description = "String or a list of strings; each string can either be a regex glob pattern or a file path URI.",

core/src/main/java/io/kestra/plugin/core/namespace/DownloadFiles.java

@@ -11,7 +11,6 @@ import io.kestra.core.runners.RunContext;
 import io.kestra.core.services.FlowService;
 import io.kestra.core.utils.Rethrow;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -84,7 +83,6 @@ public class DownloadFiles extends Task implements RunnableTask<DownloadFiles.Ou
     private String namespace;
 
     @NotNull
-    @NotEmpty
     @Schema(
         title = "A file or a list of files from the given namespace.",
         description = "String or a list of strings; each string can either be a regex glob pattern or a file path URI.",
@@ -93,11 +91,19 @@ public class DownloadFiles extends Task implements RunnableTask<DownloadFiles.Ou
     @PluginProperty(dynamic = true)
     private Object files;
 
+    @Schema(
+        title = "The folder where the downloaded files will be stored"
+    )
+    @PluginProperty(dynamic = true)
+    @Builder.Default
+    private String destination = "";
+
 
     @Override
     public Output run(RunContext runContext) throws Exception {
         Logger logger = runContext.logger();
         String renderedNamespace = runContext.render(namespace);
+        String renderedDestination = runContext.render(destination);
         // Check if namespace is allowed
         RunContext.FlowInfo flowInfo = runContext.flowInfo();
         FlowService flowService = runContext.getApplicationContext().getBean(FlowService.class);
@@ -120,7 +126,7 @@ public class DownloadFiles extends Task implements RunnableTask<DownloadFiles.Ou
         namespaceFilesService.recursiveList(flowInfo.tenantId(), renderedNamespace, null).forEach(Rethrow.throwConsumer(uri -> {
             if (patterns.stream().anyMatch(p -> p.matches(Path.of(uri.getPath())))) {
                 try (InputStream inputStream = namespaceFilesService.content(flowInfo.tenantId(), renderedNamespace, uri)) {
-                    downloaded.put(uri.getPath(), runContext.storage().putFile(inputStream, uri.getPath()));
+                    downloaded.put(uri.getPath(), runContext.storage().putFile(inputStream, destination + uri.getPath()));
                     logger.debug(String.format("Downloaded %s", uri));
                 }
             }

core/src/main/java/io/kestra/plugin/core/namespace/UploadFiles.java

@@ -138,10 +138,10 @@ public class UploadFiles extends Task implements RunnableTask<UploadFiles.Output
             });
 
             // check for file in current tempDir that match regexs
-            List<PathMatcher> patterns = regexs.stream().map(reg -> FileSystems.getDefault().getPathMatcher("glob:" + reg)).toList();
+            List<PathMatcher> patterns = regexs.stream().map(reg -> FileSystems.getDefault().getPathMatcher("glob:" + runContext.tempDir().toString() + checkLeadingSlash(reg))).toList();
-            for (File file : Objects.requireNonNull(runContext.tempDir().toFile().listFiles())) {
+            for (File file : Objects.requireNonNull(listFilesRecursively(runContext.tempDir().toFile()))) {
                 if (patterns.stream().anyMatch(p -> p.matches(Path.of(file.toURI().getPath())))) {
-                    String newFilePath = buildPath(renderedDestination, file.getName());
+                    String newFilePath = buildPath(renderedDestination, file.getPath().replace(runContext.tempDir().toString(), ""));
                     storeNewFile(logger, runContext, storageInterface, flowInfo.tenantId(), newFilePath, new FileInputStream(file));
                 }
             }
@@ -199,6 +199,24 @@ public class UploadFiles extends Task implements RunnableTask<UploadFiles.Output
         }
     }
 
+    private List<File> listFilesRecursively(File directory) throws IOException {
+        List<File> files = new ArrayList<>();
+        if (directory == null || !directory.isDirectory()) {
+            return files; // Handle invalid directory or not a directory
+        }
+
+        for (File file : directory.listFiles()) {
+            if (file.isFile()) {
+                files.add(file);
+            } else {
+                // Recursively call for subdirectories
+                files.addAll(listFilesRecursively(file));
+            }
+        }
+        return files;
+    }
+
+
     @Builder
     @Getter
     public static class Output implements io.kestra.core.models.tasks.Output {

core/src/test/java/io/kestra/core/services/SkipExecutionServiceTest.java

@@ -4,6 +4,7 @@ import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.TaskRun;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -16,6 +17,14 @@ class SkipExecutionServiceTest {
     @Inject
     private SkipExecutionService skipExecutionService;
 
+    @BeforeEach
+    void resetAll() {
+        skipExecutionService.setSkipExecutions(null);
+        skipExecutionService.setSkipFlows(null);
+        skipExecutionService.setSkipNamespaces(null);
+        skipExecutionService.setSkipTenants(null);
+    }
+
     @Test
     void skipExecutionByExecutionId() {
         var executionToSkip = "aaabbbccc";
@@ -65,4 +74,25 @@ class SkipExecutionServiceTest {
         assertThat(skipExecutionService.skipExecution(null, "namespace", "not_skipped", "random"), is(false));
         assertThat(skipExecutionService.skipExecution("tenant", "namespace", "not_skipped", "random"), is(false));
     }
+
+    @Test
+    void skipExecutionByNamespace() {
+        skipExecutionService.setSkipNamespaces(List.of("tenant|namespace"));
+
+        assertThat(skipExecutionService.skipExecution("tenant", "namespace", "someFlow", "someExecution"), is(true));
+        assertThat(skipExecutionService.skipExecution(null, "namespace", "someFlow", "someExecution"), is(false));
+        assertThat(skipExecutionService.skipExecution("anotherTenant", "namespace", "someFlow", "someExecution"), is(false));
+        assertThat(skipExecutionService.skipExecution("tenant", "namespace", "anotherFlow", "anotherExecution"), is(true));
+        assertThat(skipExecutionService.skipExecution("tenant", "other.namespace", "someFlow", "someExecution"), is(false));
+    }
+
+    @Test
+    void skipExecutionByTenantId() {
+        skipExecutionService.setSkipTenants(List.of("tenant"));
+
+        assertThat(skipExecutionService.skipExecution("tenant", "namespace", "someFlow", "someExecution"), is(true));
+        assertThat(skipExecutionService.skipExecution("anotherTenant", "namespace", "someFlow", "someExecution"), is(false));
+        assertThat(skipExecutionService.skipExecution("tenant", "another.namespace", "someFlow", "someExecution"), is(true));
+        assertThat(skipExecutionService.skipExecution("anotherTenant", "another.namespace", "someFlow", "someExecution"), is(false));
+    }
 }

core/src/test/java/io/kestra/plugin/core/flow/WorkingDirectoryTest.java

@@ -6,22 +6,23 @@ import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.executions.TaskRun;
 import io.kestra.core.models.flows.Flow;
 import io.kestra.core.models.flows.State;
+import io.kestra.core.models.tasks.common.EncryptedString;
 import io.kestra.core.runners.AbstractMemoryRunnerTest;
+import io.kestra.core.runners.RunContextFactory;
 import io.kestra.core.runners.RunnerUtils;
 import io.kestra.core.storages.InternalStorage;
 import io.kestra.core.storages.StorageContext;
 import io.kestra.core.storages.StorageInterface;
+import io.kestra.core.utils.IdUtils;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.RetryingTest;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
-import java.nio.file.Files;
+import java.security.GeneralSecurityException;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +31,6 @@ import java.util.concurrent.TimeoutException;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.hamcrest.io.FileMatchers.anExistingFile;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -38,6 +38,9 @@ public class WorkingDirectoryTest extends AbstractMemoryRunnerTest {
     @Inject
     Suite suite;
 
+    @Inject
+    RunContextFactory runContextFactory;
+
     @Test
     void success() throws TimeoutException {
        suite.success(runnerUtils);
@@ -83,6 +86,11 @@ public class WorkingDirectoryTest extends AbstractMemoryRunnerTest {
         suite.outputFiles(runnerUtils);
     }
 
+    @Test
+    void encryption() throws Exception {
+        suite.encryption(runnerUtils, runContextFactory);
+    }
+
     @Singleton
     public static class Suite {
         @Inject
@@ -154,8 +162,15 @@ public class WorkingDirectoryTest extends AbstractMemoryRunnerTest {
                 storageContext
                 , storageInterface
             );
-            URI fileURI = URI.create("kestra:" + storageContext.getContextStorageURI() + "/input.txt");
+
-            assertThat(new String(storage.getFile(fileURI).readAllBytes()), is("Hello World"));
+            TaskRun taskRun = execution.getTaskRunList().get(1);
+            Map<String, Object> outputs = taskRun.getOutputs();
+            assertThat(outputs, hasKey("uris"));
+
+            URI uri = URI.create(((Map<String, String>) outputs.get("uris")).get("input.txt"));
+
+            assertTrue(uri.toString().endsWith("input.txt"));
+            assertThat(new String(storage.getFile(uri).readAllBytes()), is("Hello World"));
         }
 
         @SuppressWarnings("unchecked")
@@ -236,6 +251,18 @@ public class WorkingDirectoryTest extends AbstractMemoryRunnerTest {
             assertThat(execution.findTaskRunsByTaskId("t3").get(0).getOutputs().get("value"), is("third"));
         }
 
+        public void encryption(RunnerUtils runnerUtils, RunContextFactory runContextFactory) throws TimeoutException, GeneralSecurityException {
+            Execution execution = runnerUtils.runOne(null, "io.kestra.tests", "working-directory-taskrun-encrypted");
+
+            assertThat(execution.getTaskRunList(), hasSize(3));
+            Map<String, Object> encryptedString = (Map<String, Object>) execution.findTaskRunsByTaskId("encrypted").get(0).getOutputs().get("value");
+            assertThat(encryptedString.get("type"), is(EncryptedString.TYPE));
+            String encryptedValue = (String) encryptedString.get("value");
+            assertThat(encryptedValue, is(not("Hello World")));
+            assertThat(runContextFactory.of().decrypt(encryptedValue), is("Hello World"));
+            assertThat(execution.findTaskRunsByTaskId("decrypted").get(0).getOutputs().get("value"), is("Hello World"));
+        }
+
         private void put(String path, String content) throws IOException {
             storageInterface.put(
                 null,

core/src/test/resources/flows/valids/working-directory-taskrun-encrypted.yml

@@ -0,0 +1,13 @@
+id: working-directory-taskrun-encrypted
+namespace: io.kestra.tests
+
+tasks:
+  - id: workingDir
+    type: io.kestra.plugin.core.flow.WorkingDirectory
+    tasks:
+      - id: encrypted
+        type: io.kestra.core.tasks.test.Encrypted
+        format: "Hello World"
+      - id: decrypted
+        type: io.kestra.plugin.core.debug.Return
+        format: "{{outputs.encrypted.value}}"

gradle.properties

@@ -1,4 +1,4 @@
-version=0.17.0
+version=0.17.5
 
 jacksonVersion=2.16.2
 micronautVersion=4.4.3

script/src/main/java/io/kestra/plugin/scripts/exec/scripts/runners/CommandsWrapper.java

@@ -131,10 +131,10 @@ public class CommandsWrapper implements TaskCommands {
     @SuppressWarnings("unchecked")
     public ScriptOutput run() throws Exception {
         List<String> filesToUpload = new ArrayList<>();
-        if (this.namespaceFiles != null) {
+        String tenantId = ((Map<String, String>) runContext.getVariables().get("flow")).get("tenantId");
-            String tenantId = ((Map<String, String>) runContext.getVariables().get("flow")).get("tenantId");
+        String namespace = ((Map<String, String>) runContext.getVariables().get("flow")).get("namespace");
-            String namespace = ((Map<String, String>) runContext.getVariables().get("flow")).get("namespace");
 
+        if (this.namespaceFiles != null && Boolean.TRUE.equals(this.namespaceFiles.getEnabled())) {
             NamespaceFilesService namespaceFilesService = runContext.getApplicationContext().getBean(NamespaceFilesService.class);
             List<URI> injectedFiles = namespaceFilesService.inject(
                 runContext,

storage-local/src/main/java/io/kestra/storage/local/LocalStorage.java

@@ -78,7 +78,7 @@ public class LocalStorage implements StorageInterface {
 
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-                uris.add(URI.create(file.toString()));
+                uris.add(URI.create(file.toString().replace("\\", "/")));
                 return FileVisitResult.CONTINUE;
             }
 
@@ -90,7 +90,7 @@ public class LocalStorage implements StorageInterface {
             }
         });
 
-        URI fsPathUri = URI.create(fsPath.toString());
+        URI fsPathUri = URI.create(fsPath.toString().replace("\\", "/"));
         return uris.stream().sorted(Comparator.reverseOrder())
             .map(fsPathUri::relativize)
             .map(URI::getPath)
@@ -115,7 +115,7 @@ public class LocalStorage implements StorageInterface {
                     URI relative = URI.create(
                         getPath(tenantId, null).relativize(
                             Path.of(file.toUri())
-                        ).toString()
+                        ).toString().replace("\\", "/")
                     );
                     return getAttributes(tenantId, relative);
                 }))

ui/src/components/EnterpriseTooltip.vue

@@ -1,6 +1,10 @@
 <template>
-    <el-tooltip :persistent="false" :focus-on-show="true" popper-class="ee-tooltip" :disabled="!disabled" :placement="placement">
+    <el-tooltip :visible="visible" :persistent="false" :focus-on-show="true" popper-class="ee-tooltip" :disabled="!disabled" :placement="placement">
         <template #content v-if="link">
+            <el-button circle class="ee-tooltip-close" @click="changeVisibility(false)">
+                <Close />
+            </el-button>
+
             <p>{{ $t("ee-tooltip.features-blocked") }}</p>
 
             <a
@@ -13,7 +17,7 @@
             </a>
         </template>
         <template #default>
-            <span ref="slot-container">
+            <span ref="slot-container" class="cursor-pointer" @click="changeVisibility()">
                 <slot />
                 <lock v-if="disabled" />
             </span>
@@ -22,10 +26,11 @@
 </template>
 
 <script>
+    import Close from "vue-material-design-icons/Close.vue";
     import Lock from "vue-material-design-icons/Lock.vue";
 
     export default {
-        components: {Lock},
+        components: {Close, Lock},
         props: {
             top: {
                 type: Boolean,
@@ -48,6 +53,16 @@
                 default: undefined
             },
         },
+        data() {
+            return {
+                visible: false,
+            }
+        },
+        methods: {
+            changeVisibility(visible = true) {
+                this.visible = visible
+            }
+        },
         computed: {
             link() {
 
@@ -83,5 +98,13 @@
     :deep(.material-design-icon) > .material-design-icon__svg {
         bottom: -0.125em;
     }
+
+    .ee-tooltip-close {
+            position: absolute;
+            top: 0;
+            right: 0;
+            border: none;
+            margin: 0.5rem;
+        }
 </style>
 

ui/src/components/executions/ExecutionRoot.vue

@@ -69,6 +69,14 @@
                 if (oldValue.name === newValue.name && this.previousExecutionId !== this.$route.params.id) {
                     this.follow()
                 }
+                // if we change the execution id, we need to close the sse
+                if (this.$route.params.id != this.execution.id) {
+                    this.closeSSE();
+                    window.removeEventListener("popstate", this.follow)
+                    this.$store.commit("execution/setExecution", undefined);
+                    this.$store.commit("flow/setFlow", undefined);
+                    this.$store.commit("flow/setFlowGraph", undefined);
+                }
             },
         },
         methods: {
@@ -91,13 +99,16 @@
                         }
                         // sse.onerror doesnt return the details of the error
                         // but as our emitter can only throw an error on 404
-                        // we can safely assume that the error
+                        // we can safely assume that the error is a 404
+                        // if execution is not defined
                         this.sse.onerror = () => {
-                            this.$store.dispatch("core/showMessage", {
+                            if (!this.execution) {
-                                variant: "error",
+                                this.$store.dispatch("core/showMessage", {
-                                title: this.$t("error"),
+                                    variant: "error",
-                                message: this.$t("errors.404.flow or execution"),
+                                    title: this.$t("error"),
-                            });
+                                    message: this.$t("errors.404.flow or execution"),
+                                });
+                            }
                         }
                     });
             },

ui/src/components/flows/FlowCreate.vue

@@ -41,7 +41,7 @@
             if (this.$route.query.reset) {
                 localStorage.setItem("tourDoneOrSkip", undefined);
                 this.$store.commit("core/setGuidedProperties", {tourStarted: false});
-                this.$tours["guidedTour"].start();
+                this.$tours["guidedTour"]?.start();
             }
             this.setupFlow()
         },

ui/src/components/flows/FlowEdit.vue

@@ -67,7 +67,7 @@
         },
         methods: {
             stopTour() {
-                this.$tours["guidedTour"].stop();
+                this.$tours["guidedTour"]?.stop();
                 this.$store.commit("core/setGuidedProperties", {tourStarted: false});
             },
         },
@@ -79,7 +79,7 @@
                 if (!this.guidedProperties.tourStarted
                     && localStorage.getItem("tourDoneOrSkip") !== "true"
                     && this.total === 0) {
-                    this.$tours["guidedTour"].start();
+                    this.$tours["guidedTour"]?.start();
                 }
             }, 200)
             window.addEventListener("popstate", () => {

ui/src/components/flows/FlowRoot.vue

@@ -55,7 +55,7 @@
                 handler: function (newValue) {
                     if (newValue?.manuallyContinue) {
                         setTimeout(() => {
-                            this.$tours["guidedTour"].nextStep();
+                            this.$tours["guidedTour"]?.nextStep();
                             this.$store.commit("core/setGuidedProperties", {manuallyContinue: false});
                         }, 500);
                     }

ui/src/components/flows/TriggerFlow.vue

@@ -91,12 +91,12 @@
         },
         methods: {
             onClick() {
-                if (this.$tours["guidedTour"].isRunning.value) {
+                if (this.$tours["guidedTour"]?.isRunning?.value) {
-                    this.$tours["guidedTour"].nextStep();
+                    this.$tours["guidedTour"]?.nextStep();
                     this.$store.dispatch("api/events", {
                         type: "ONBOARDING",
                         onboarding: {
-                            step: this.$tours["guidedTour"].currentStep._value,
+                            step: this.$tours["guidedTour"]?.currentStep?._value,
                             action: "next",
                             template: this.guidedProperties.template
                         },

ui/src/components/flows/ValidationError.vue

@@ -185,9 +185,9 @@
             padding: calc(2 * var(--spacer)) $spacer !important;
             font-family: $font-family-monospace;
             background-color: white;
-            white-space: pre;
+            white-space: normal;
             border-top: 1px solid var(--bs-gray-300);
-            text-wrap: initial;
+            text-wrap: wrap;
 
             html.dark & {
                 color: white;

ui/src/components/home/Home.vue

@@ -188,6 +188,11 @@
             }
         },
         created() {
+            // Auth but no permission at all or no permission to load execution stats
+            if (this.user && (!this.user.hasAnyRole() || !this.user.hasAnyActionOnAnyNamespace(permission.EXECUTION, action.READ))) {
+                this.$router.push({name:"errors/403"});
+                return;
+            }
             this.load();
         },
         watch: {
@@ -239,8 +244,10 @@
                 return _merge(base, queryFilter)
             },
             load() {
-                this.loadStats();
+                if (this.user && this.user.hasAnyActionOnAnyNamespace(permission.EXECUTION, action.READ)) {
-                this.haveExecutions();
+                    this.loadStats();
+                    this.haveExecutions();
+                }
             },
             haveExecutions() {
                 let params = {

ui/src/components/inputs/EditorSidebar.vue

@@ -141,8 +141,8 @@
             </template>
             <template #default="{data, node}">
                 <el-dropdown
-                    :ref="`dropdown__${data.fileName}`"
+                    :ref="`dropdown__${data.id}`"
-                    @contextmenu.prevent.stop="toggleDropdown(`dropdown__${data.fileName}`)"
+                    @contextmenu.prevent.stop="toggleDropdown(`dropdown__${data.id}`)"
                     trigger="contextmenu"
                     class="w-100"
                 >
@@ -385,7 +385,7 @@
         },
         computed: {
             ...mapState({
-                flows: (state) => state.flow.flows,
+                flow: (state) => state.flow.flow,
                 explorerVisible: (state) => state.editor.explorerVisible,
             }),
             folders() {
@@ -883,9 +883,9 @@
             },
         },
         watch: {
-            flows: {
+            flow: {
                 handler(flow) {
-                    if (flow && flow.length) {
+                    if (flow) {
                         this.changeOpenedTabs({
                             action: "open",
                             name: "Flow",

ui/src/components/inputs/EditorView.vue

@@ -114,6 +114,8 @@
         },
     });
 
+    const isCurrentTabFlow = computed(() => currentTab?.value?.extension === undefined)
+
     const flowErrors = computed(() => {
         const isFlow = currentTab?.value?.extension === undefined;
 
@@ -639,7 +641,6 @@
                 })
                     .then(() => {
                         overrideFlow.value = true;
-                        console.log("pop");
                         return true;
                     })
                     .catch(() => {
@@ -989,7 +990,7 @@
                 @save="save"
                 @execute="execute"
                 v-model="flowYaml"
-                schema-type="flow"
+                :schema-type="isCurrentTabFlow? 'flow': undefined"
                 :lang="currentTab?.extension === undefined ? 'yaml' : undefined"
                 :extension="currentTab?.extension"
                 @update:model-value="editorUpdate"

ui/src/components/inputs/InputsForm.vue

@@ -39,18 +39,26 @@
                 @update:model-value="onChange"
                 show-password
             />
-            <el-input-number
+            <span v-if="input.type === 'INT'">
-                v-if="input.type === 'INT'"
+                <el-input-number
-                v-model="inputs[input.id]"
+                    v-model="inputs[input.id]"
-                @update:model-value="onChange"
+                    @update:model-value="onChange"
-                :step="1"
+                    :min="input.min"
-            />
+                    :max="input.max && input.max >= (input.min || -Infinity) ? input.max : Infinity"
-            <el-input-number
+                    :step="1"
-                v-if="input.type === 'FLOAT'"
+                />
-                v-model="inputs[input.id]"
+                <div v-if="input.min || input.max" class="hint">{{ numberHint(input) }}</div>
-                @update:model-value="onChange"
+            </span>
-                :step="0.001"
+            <span v-if="input.type === 'FLOAT'">
-            />
+                <el-input-number
+                    v-model="inputs[input.id]"
+                    @update:model-value="onChange"
+                    :min="input.min"
+                    :max="input.max && input.max >= (input.min || -Infinity) ? input.max : Infinity"
+                    :step="0.001"
+                />
+                <div v-if="input.min || input.max" class="hint">{{ numberHint(input) }}</div>
+            </span>
             <el-radio-group
                 v-if="input.type === 'BOOLEAN'"
                 v-model="inputs[input.id]"
@@ -182,6 +190,18 @@
                 this.inputs[input.id] = e.target.files[0];
                 this.onChange();
             },
+            numberHint(input){
+                const {min, max} = input;
+
+                if (min !== undefined && max !== undefined) {
+                    if(min > max) return `Minimum value ${min} is larger than maximum value ${max}, so we've removed the upper limit.`;
+                    return `Minimum value is ${min}, maximum value is ${max}.`;
+                } else if (min !== undefined) {
+                    return `Minimum value is ${min}.`;
+                } else if (max !== undefined) {
+                    return `Maximum value is ${max}.`;
+                } else return false;
+            }
         },
         watch: {
             inputs: {
@@ -199,5 +219,8 @@
 </script>
 
 <style scoped lang="scss">
-
+.hint {
+    font-size: var(--font-size-xs);
+    color: var(--bs-gray-700);
+}
 </style>

ui/src/components/inputs/MonacoEditor.vue

@@ -16,6 +16,7 @@
     import JsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
     import {configureMonacoYaml} from "monaco-yaml";
     import {yamlSchemas} from "override/utils/yamlSchemas";
+    import {editorViewTypes} from "../../utils/constants";
     import Utils from "../../utils/utils";
     import YamlUtils from "../../utils/yamlUtils";
     import uniqBy from "lodash/uniqBy";
@@ -56,7 +57,8 @@
             ...mapState({
                 currentTab: (state) => state.editor.current,
                 tabs: (state) => state.editor.tabs,
-                flow: (state) => state.flow.flow
+                flow: (state) => state.flow.flow,
+                view: (state) => state.editor.view
             }),
             prefix() {
                 return this.schemaType ? `${this.schemaType}-` : "";
@@ -430,7 +432,8 @@
                                 id: subflowTask.flowId,
                                 revision: subflowTask.revision,
                                 source: false,
-                                store: false
+                                store: false,
+                                deleted: true
                             }
                         )).inputs?.map(input => input.id) ?? [];
                     } catch (e) {
@@ -631,6 +634,8 @@
                         }
                     }
                 });
+
+                setTimeout(() => monaco.editor.remeasureFonts(), 1)
                 this.$emit("editorDidMount", this.editor);
             },
             async changeTab(pathOrName, valueSupplier, useModelCache = true) {
@@ -672,6 +677,8 @@
                 this.editor.focus();
             },
             destroy: function () {
+                if(this.view === editorViewTypes.TOPOLOGY) return;
+
                 this.subflowAutocompletionProvider?.dispose();
                 this.pebbleAutocompletion?.dispose();
                 this.nestedFieldAutocompletionProvider?.dispose();

ui/src/components/inputs/SwitchView.vue

@@ -28,6 +28,8 @@
 </script>
 
 <script>
+    import {mapMutations} from "vuex";
+
     export default {
         props: {
             type: {
@@ -37,7 +39,10 @@
         },
         emits: ["switch-view"],
         methods: {
+            ...mapMutations("editor", ["changeView"]),
+
             switchView(view) {
+                this.changeView(view)
                 this.$emit("switch-view", view)
             },
             buttonType(view) {

ui/src/components/layout/Labels.vue

@@ -48,9 +48,13 @@
                     []
                 )
                     .forEach(label => {
-                        const split = label.split(":");
+                        const separatorIndex = label.indexOf(":");
 
-                        labels.set(split[0], split[1]);
+                        if (separatorIndex === -1) {
+                            return;
+                        }
+
+                        labels.set(label.slice(0, separatorIndex), label.slice(separatorIndex + 1));
                     })
 
                 return labels;

ui/src/components/layout/TopNavBar.vue

@@ -69,7 +69,7 @@
                                 <Slack class="align-middle" /> {{ $t("join community") }}
                             </a>
                             <a
-                                href="https://kestra.io/contact-us?utm_source=app&utm_content=top-nav-bar"
+                                href="https://kestra.io/demo?utm_source=app&utm_content=top-nav-bar"
                                 target="_blank"
                                 class="d-flex gap-2 el-dropdown-menu__item"
                             >
@@ -147,7 +147,7 @@
                 localStorage.setItem("tourDoneOrSkip", undefined);
                 this.$store.commit("core/setGuidedProperties", {tourStarted: false});
 
-                this.$tours["guidedTour"].start();
+                this.$tours["guidedTour"]?.start();
             }
         }
     };

ui/src/components/namespace/NamespaceSelect.vue

@@ -21,6 +21,8 @@
 <script>
     import {mapState} from "vuex";
     import _uniqBy from "lodash/uniqBy";
+    import permission from "../../models/permission";
+    import action from "../../models/action";
 
     export default {
         props: {
@@ -43,14 +45,17 @@
         },
         emits: ["update:modelValue"],
         created() {
-            this.$store
+            if (this.user && this.user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
-                .dispatch("namespace/loadNamespacesForDatatype", {dataType: this.dataType})
+                this.$store
-                .then(() => {
+                    .dispatch("namespace/loadNamespacesForDatatype", {dataType: this.dataType})
-                    this.groupedNamespaces = this.groupNamespaces(this.datatypeNamespaces);
+                    .then(() => {
-                });
+                        this.groupedNamespaces = this.groupNamespaces(this.datatypeNamespaces);
+                    });
+            }
         },
         computed: {
-            ...mapState("namespace", ["datatypeNamespaces"])
+            ...mapState("namespace", ["datatypeNamespaces"]),
+            ...mapState("auth", ["user"]),
         },
         data() {
             return {

ui/src/components/settings/BasicSettings.vue

@@ -5,7 +5,7 @@
         <Block :heading="$t('settings.blocks.configuration.label')">
             <template #content>
                 <Row>
-                    <Column :label="$t('settings.blocks.localization.fields.language')">
+                    <Column :label="$t('settings.blocks.configuration.fields.language')">
                         <el-select :model-value="lang" @update:model-value="onLang">
                             <el-option
                                 v-for="item in langOptions"
@@ -124,7 +124,7 @@
             </template>
         </Block>
 
-        <Block :heading="$t('settings.blocks.localization.label')">
+        <Block :heading="$t('settings.blocks.localization.label')" :note="$t('settings.blocks.localization.note')">
             <template #content>
                 <Row>
                     <Column :label="$t('settings.blocks.localization.fields.time_zone')">

ui/src/components/settings/components/block/Block.vue

@@ -1,14 +1,24 @@
 <template>
     <section>
-        <h1 class="heading" v-text="heading" />
+        <h1 class="heading">
+            <el-popover v-if="note" :content="note" trigger="hover" :width="400" class="info">
+                <template #reference>
+                    <InformationOutline />
+                </template>
+            </el-popover>
+            <span>{{ heading }}</span>
+        </h1>
         <slot name="content" />
         <el-divider v-if="!last" />
     </section>
 </template>
 
 <script setup lang="ts">
+    import InformationOutline from "vue-material-design-icons/InformationOutline.vue";
+
     defineProps({
         heading: {type: String, required: true},
+        note: {type: String, default: undefined},
         last: {type: Boolean, default: false},
     });
 </script>
@@ -20,9 +30,16 @@ section {
     margin: calc($spacer * 2);
 
     & > h1.heading {
+        display: flex;
+        align-items: center;
         margin-bottom: calc($spacer * 2);
         font-size: calc($font-size-base * 1.5);
         font-weight: 600;
+
+        & > span.el-tooltip__trigger {
+            cursor: pointer;
+            margin-right: calc($spacer / 2);
+        }
     }
 }
 </style>

ui/src/mixins/flowTemplateEdit.js

@@ -183,17 +183,17 @@ export default {
             }
         },
         save() {
-            if (this.$tours["guidedTour"].isRunning.value && !this.guidedProperties.saveFlow) {
+            if (this.$tours["guidedTour"]?.isRunning?.value && !this.guidedProperties.saveFlow) {
                 this.$store.dispatch("api/events", {
                     type: "ONBOARDING",
                     onboarding: {
-                        step: this.$tours["guidedTour"].currentStep._value,
+                        step: this.$tours["guidedTour"]?.currentStep?._value,
                         action: "next",
                         template: this.guidedProperties.template
                     },
                     page: pageFromRoute(this.$router.currentRoute.value)
                 });
-                this.$tours["guidedTour"].nextStep();
+                this.$tours["guidedTour"]?.nextStep();
                 return;
             }
 

ui/src/models/permission.js

@@ -1,5 +1,6 @@
 export default {
     FLOW: "FLOW",
     EXECUTION: "EXECUTION",
-    TEMPLATE: "TEMPLATE"
+    TEMPLATE: "TEMPLATE",
+    NAMESPACE: "NAMESPACE"
 }

ui/src/stores/auth.js

@@ -23,6 +23,10 @@ class Me {
     hasAnyActionOnAnyNamespace(permission, action) {
         return true;
     }
+
+    hasAnyRole() {
+        return true;
+    }
 }
 
 export default {

ui/src/stores/editor.js

@@ -6,6 +6,7 @@ export default {
         explorerWidth: 20,
         current: undefined,
         tabs: [],
+        view: undefined,
     },
     mutations: {
         updateOnboarding(state) {
@@ -84,5 +85,12 @@ export default {
                 state.tabs = [state.tabs[0]];
             }
         },
+        closeAllTabs(state) {
+            state.tabs = [];
+            state.current = undefined
+        },
+        changeView(state, view) {
+            state.view = view;
+        },
     },
 };

ui/src/stores/executions.js

@@ -205,7 +205,19 @@ export default {
             return this.$http.get(`${apiUrl(this)}/executions/${options.executionId}/file/preview`, {
                 params: options
             }).then(response => {
-                commit("setFilePreview", response.data)
+                let data = {...response.data}
+
+                // WORKAROUND, related to https://github.com/kestra-io/plugin-aws/issues/456
+                if(data.extension === "ion") {
+                    const notObjects = data.content.some(e => typeof e !== "object");
+                    
+                    if(notObjects) {   
+                        const content = data.content.length === 1 ? data.content[0] : data.content.join("\n");
+                        data = {...data, type: "TEXT", content}
+                    }
+                }
+
+                commit("setFilePreview", data)
             })
         },
         setLabels(_, options) {

ui/src/stores/flow.js

@@ -37,7 +37,7 @@ export default {
             }).then(response => {
                 commit("setFlows", response.data.results)
                 commit("setTotal", response.data.total)
-                commit("setOverallTotal", response.data.total)
+                commit("setOverallTotal", response.data.results.filter(f => f.namespace !== "tutorial").length)
 
                 return response.data;
             })

ui/src/stores/namespaces.js

@@ -1,7 +1,9 @@
 import Utils from "../utils/utils";
 import {apiUrl} from "override/utils/route";
 
-const BASE = (namespace) => `${apiUrl(this)}/namespaces/${namespace}`;
+function base(namespace) {
+    return `${apiUrl(this)}/namespaces/${namespace}`;
+}
 const HEADERS = {headers: {"Content-Type": "multipart/form-data"}};
 
 const slashPrefix = (path) => (path.startsWith("/") ? path : `/${path}`);
@@ -15,13 +17,13 @@ export default {
     actions: {
         // Create a directory
         async createDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files/directory?path=${slashPrefix(payload.path)}`;
+            const URL = `${base.call(this, payload.namespace)}/files/directory?path=${slashPrefix(payload.path)}`;
             await this.$http.post(URL);
         },
 
         // List directory content
         async readDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files/directory${payload.path ? `?path=${slashPrefix(safePath(payload.path))}` : ""}`;
+            const URL = `${base.call(this, payload.namespace)}/files/directory${payload.path ? `?path=${slashPrefix(safePath(payload.path))}` : ""}`;
             const request = await this.$http.get(URL);
 
             return request.data ?? [];
@@ -33,21 +35,21 @@ export default {
             const BLOB = new Blob([payload.content], {type: "text/plain"});
             DATA.append("fileContent", BLOB);
 
-            const URL = `${BASE(payload.namespace)}/files?path=${slashPrefix(payload.path)}`;
+            const URL = `${base.call(this, payload.namespace)}/files?path=${slashPrefix(payload.path)}`;
             await this.$http.post(URL, DATA, HEADERS);
         },
 
         // Get namespace file content
         async readFile(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files?path=${slashPrefix(safePath(payload.path))}`;
+            const URL = `${base.call(this, payload.namespace)}/files?path=${slashPrefix(safePath(payload.path))}`;
-            const request = await this.$http.get(URL);
+            const request = await this.$http.get(URL, {transformResponse: response => response, responseType: "json"})
 
             return request.data ?? [];
         },
 
         // Search for namespace files
         async searchFiles(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files/search?q=${payload.query}`;
+            const URL = `${base.call(this, payload.namespace)}/files/search?q=${payload.query}`;
             const request = await this.$http.get(URL);
 
             return request.data ?? [];
@@ -59,31 +61,31 @@ export default {
             const BLOB = new Blob([payload.content], {type: "text/plain"});
             DATA.append("fileContent", BLOB);
 
-            const URL = `${BASE(payload.namespace)}/files?path=${slashPrefix(safePath(payload.path))}`;
+            const URL = `${base.call(this, payload.namespace)}/files?path=${slashPrefix(safePath(payload.path))}`;
             await this.$http.post(URL, DATA, HEADERS);
         },
 
         // Move a file or directory
         async moveFileDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files?from=${slashPrefix(payload.old)}&to=${slashPrefix(payload.new)}`;
+            const URL = `${base.call(this, payload.namespace)}/files?from=${slashPrefix(payload.old)}&to=${slashPrefix(payload.new)}`;
             await this.$http.put(URL);
         },
 
         // Rename a file or directory
         async renameFileDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files?from=${slashPrefix(payload.old)}&to=${slashPrefix(payload.new)}`;
+            const URL = `${base.call(this, payload.namespace)}/files?from=${slashPrefix(payload.old)}&to=${slashPrefix(payload.new)}`;
             await this.$http.put(URL);
         },
 
         // Delete a file or directory
         async deleteFileDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files?path=${slashPrefix(payload.path)}`;
+            const URL = `${base.call(this, payload.namespace)}/files?path=${slashPrefix(payload.path)}`;
             await this.$http.delete(URL);
         },
 
         // Export namespace files as a ZIP
         async exportFileDirectory(_, payload) {
-            const URL = `${BASE(payload.namespace)}/files/export`;
+            const URL = `${base.call(this, payload.namespace)}/files/export`;
             const request = await this.$http.get(URL);
 
             const name = payload.namespace + "_files.zip";

ui/src/translations/en.json

@@ -310,6 +310,14 @@
         "title": "Page not found",
         "content": "The requested URL was not found on this server. <span class=\"text-muted\">That’s all we know.</span>",
         "flow or execution": "The flow or execution you are looking for does not exist."
+      },
+      "401": {
+        "title": "Unauthorized",
+        "content": "You need to be authenticated to access this page."
+      },
+      "403": {
+        "title": "Access denied",
+        "content": "You don't have the required permissions to access this page."
       }
     },
     "copy logs": "Copy logs",
@@ -546,7 +554,7 @@
     "environment color setting": "Environment color",
     "slack support": "Ask any question via Slack",
     "join community": "Join the Community",
-    "reach us": "Reach out to us",
+    "reach us": "Talk to us",
     "new version": "New version {version} available!",
     "error detected": "Error(s) detected",
     "warning detected": "Warning(s) detected",
@@ -709,6 +717,7 @@
         "configuration": {
           "label": "Main Configuration",
           "fields": {
+            "language": "Language",
             "default_namespace": "Default Namespace",
             "log_level": "Default Log Level",
             "log_display": "Default Log Display",
@@ -729,8 +738,8 @@
         },
         "localization": {
           "label": "Date and Time Settings",
+          "note": "Note that this setting is used for displaying date and time properties in the UI. To schedule your flows in a timezone different than UTC, make sure to set the timezone property on the Schedule trigger in your flow code or your plugin defaults.",
           "fields": {
-            "language": "Language",
             "time_zone": "Time Zone",
             "date_format": "Date Format"
           }

ui/src/translations/fr.json

@@ -299,6 +299,14 @@
         "title": "Page introuvable",
         "content": "L'URL demandé est introuvable sur ce serveur. <span class=\"text-muted\">C'est tout ce que nous savons.</span>",
         "flow or execution": "Le flow ou l'exécution demandé est introuvable."
+      },
+      "401": {
+        "title": "Non authentifié",
+        "content": "Vous devez être authentifié pour accéder à cette page."
+      },
+      "403": {
+        "title": "Accès refusé",
+        "content": "Vous n'avez pas les permissions suffisantes pour accéder à cette page."
       }
     },
     "copy logs": "Copier les logs",
@@ -681,6 +689,7 @@
         "configuration": {
           "label": "Configuration Principale",
           "fields": {
+            "language": "Langue",
             "default_namespace": "Espace de noms par défaut",
             "log_level": "Niveau d'affichage des journaux par défaut",
             "log_display": "Affichage des journaux par défaut",
@@ -701,8 +710,8 @@
         },
         "localization": {
           "label": "Paramètres de Date et d'Heure",
+          "note": "Remarque ce paramètre est utilisé pour afficher les propriétés de date et d'heure dans l'interface utilisateur. Pour planifier vos flux dans un fuseau horaire différent de l'UTC, assurez-vous de définir la propriété de fuseau horaire sur le déclencheur de planification dans le code de votre",
           "fields": {
-            "language": "Langue",
             "time_zone": "Fuseau Horaire",
             "date_format": "Format de Date"
           }

ui/src/utils/inputs.js

@@ -10,10 +10,12 @@ export default class Inputs {
             res = moment(res).toISOString()
         } else if (type === "DURATION" || type === "TIME") {
             res = moment().startOf("day").add(res, "seconds").toString()
-        } else if (type === "JSON" || type === "ARRAY") {
+        } else if (type === "ARRAY") {
-            res = JSON.stringify(res).toString()
+            res = JSON.stringify(res).toString();
         } else if (type === "BOOLEAN" && type === undefined){
             res = "undefined";
+        } else if (type === "STRING" && Array.isArray(res)){
+            res = res.toString();
         }
         return res;
     }

ui/src/utils/submitTask.js

@@ -84,7 +84,7 @@ export const executeTask = (submitor, flow, values, options) => {
                 }
             }
 
-            if(options.nextStep) submitor.$tours["guidedTour"].nextStep();
+            if(options.nextStep) submitor.$tours["guidedTour"]?.nextStep();
 
             return response.data;
         })

webserver/src/main/java/io/kestra/webserver/controllers/api/FlowController.java

@@ -274,7 +274,7 @@ public class FlowController {
             namespace,
             sources
                 .stream()
-                .map(flow -> FlowWithSource.of(yamlFlowParser.parse(flow, Flow.class), flow))
+                .map(flow -> FlowWithSource.of(yamlFlowParser.parse(flow, Flow.class), flow.trim()))
                 .toList(),
             delete
         );
@@ -727,7 +727,7 @@ public class FlowController {
         if (fileName.endsWith(".yaml") || fileName.endsWith(".yml")) {
             List<String> sources = List.of(new String(fileUpload.getBytes()).split("---"));
             for (String source : sources) {
-                this.importFlow(tenantId, source);
+                this.importFlow(tenantId, source.trim());
             }
         } else if (fileName.endsWith(".zip")) {
             try (ZipInputStream archive = new ZipInputStream(fileUpload.getInputStream())) {

webserver/src/main/java/io/kestra/webserver/controllers/api/PluginController.java

@@ -138,17 +138,13 @@ public class PluginController {
     public MutableHttpResponse<Map<String, PluginIcon>> icons() {
         Map<String, PluginIcon> icons = pluginRegistry.plugins()
             .stream()
-            .flatMap(plugin -> Stream
+            .flatMap(plugin -> Stream.of(
-                .concat(
                     plugin.getTasks().stream(),
-                    Stream.concat(
+                    plugin.getTriggers().stream(),
-                        Stream.concat(
+                    plugin.getConditions().stream(),
-                            plugin.getTriggers().stream(),
+                    plugin.getTaskRunners().stream()
-                            plugin.getConditions().stream()
-                        ),
-                        plugin.getTaskRunners().stream()
-                    )
                 )
+                .flatMap(i -> i)
                 .map(e -> new AbstractMap.SimpleEntry<>(
                     e.getName(),
                     new PluginIcon(
@@ -160,6 +156,20 @@ public class PluginController {
             )
             .filter(entry -> entry.getKey() != null)
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
+
+        // add aliases
+        Map<String, PluginIcon> aliasIcons = pluginRegistry.plugins().stream()
+            .flatMap(plugin -> plugin.getAliases().values().stream().map(e -> new AbstractMap.SimpleEntry<>(
+                e.getKey(),
+                new PluginIcon(
+                    e.getKey().substring(e.getKey().lastIndexOf('.') + 1),
+                    plugin.icon(e.getValue()),
+                    FlowableTask.class.isAssignableFrom(e.getValue())
+                ))))
+            .filter(entry -> entry.getKey() != null)
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
+        icons.putAll(aliasIcons);
+
         return HttpResponse.ok(icons).header(HttpHeaders.CACHE_CONTROL, CACHE_DIRECTIVE);
     }
 

webserver/src/test/java/io/kestra/webserver/controllers/api/PluginControllerTest.java

@@ -86,6 +86,8 @@ class PluginControllerTest {
             );
 
             assertThat(list.entrySet().stream().filter(e -> e.getKey().equals(Log.class.getName())).findFirst().orElseThrow().getValue().getIcon(), is(notNullValue()));
+            // test an alias
+            assertThat(list.entrySet().stream().filter(e -> e.getKey().equals("io.kestra.core.tasks.log.Log")).findFirst().orElseThrow().getValue().getIcon(), is(notNullValue()));
         });
     }