fix(core): possible NPE on namespace files usage

Fixes #4078
kestra-io · Jun 20, 2024 · ca39844 · ca39844
1 parent 7f8bcdf
commit ca39844
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/io/kestra/core/runners/NamespaceFilesService.java b/core/src/main/java/io/kestra/core/runners/NamespaceFilesService.java
@@ -21,6 +21,9 @@
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * @deprecated should not be used anymore
+ */
 @Deprecated
 @Singleton
 public class NamespaceFilesService {
@@ -36,7 +39,7 @@ public NamespaceFilesService(final StorageInterface storageInterface) {
 
     @Deprecated
     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();
         }
 

diff --git a/core/src/main/java/io/kestra/plugin/core/flow/WorkingDirectory.java b/core/src/main/java/io/kestra/plugin/core/flow/WorkingDirectory.java
@@ -263,7 +263,7 @@ public void preExecuteTasks(RunContext runContext, TaskRun taskRun) throws Excep
             }
         }
 
-        if (this.namespaceFiles != null && this.namespaceFiles.getEnabled()) {
+        if (this.namespaceFiles != null && Boolean.TRUE.equals(this.namespaceFiles.getEnabled())) {
             runContext.storage()
                 .namespace()
                 .findAllFilesMatching(this.namespaceFiles.getInclude(), this.namespaceFiles.getExclude())

diff --git a/script/src/main/java/io/kestra/plugin/scripts/exec/scripts/runners/CommandsWrapper.java b/script/src/main/java/io/kestra/plugin/scripts/exec/scripts/runners/CommandsWrapper.java
@@ -133,7 +133,7 @@ public CommandsWrapper addEnv(Map<String, String> envs) {
 
     public ScriptOutput run() throws Exception {
         List<String> filesToUpload = new ArrayList<>();
-        if (this.namespaceFiles != null && this.namespaceFiles.getEnabled()) {
+        if (this.namespaceFiles != null && Boolean.TRUE.equals(this.namespaceFiles.getEnabled())) {
 
             List<NamespaceFile> matchedNamespaceFiles = runContext.storage()
                 .namespace()