fix(tasks): leading slash not required in user-given blob patterns in…

… PushNamespaceFiles
kestra-io · May 31, 2024 · ab54872 · ab54872
1 parent c34d213
commit ab54872
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/io/kestra/plugin/git/PushNamespaceFiles.java b/src/main/java/io/kestra/plugin/git/PushNamespaceFiles.java
@@ -5,6 +5,7 @@
 import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.runners.NamespaceFilesService;
 import io.kestra.core.runners.RunContext;
+import io.kestra.core.utils.PathUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -141,11 +142,11 @@ protected Map<Path, Supplier<InputStream>> instanceResourcesContentByPath(RunCon
             null
         ).stream();
         if (globs != null) {
-            List<PathMatcher> matchers = globs.stream().map(glob -> FileSystems.getDefault().getPathMatcher("glob:" + glob)).toList();
+            List<PathMatcher> matchers = globs.stream().map(glob -> FileSystems.getDefault().getPathMatcher("glob:" + PathUtil.checkLeadingSlash(glob))).toList();
             uriStream = uriStream.filter(uri ->
             {
                 Path path = Path.of(uri.getPath());
-                return matchers.stream().anyMatch(matcher -> matcher.matches(path) || matcher.matches(path.getFileName()));
+                return matchers.stream().anyMatch(matcher -> matcher.matches(path) || matcher.matches(Path.of(PathUtil.checkLeadingSlash(path.getFileName().toString()))));
             });
         }
 

diff --git a/src/test/java/io/kestra/plugin/git/PushNamespaceFilesTest.java b/src/test/java/io/kestra/plugin/git/PushNamespaceFilesTest.java
@@ -95,7 +95,7 @@ void defaultCase_SingleRegex() throws Exception {
             .authorEmail("{{email}}")
             .authorName("{{name}}")
             .namespace("{{namespace}}")
-            .files("second*")
+            .files("nested/*")
             .gitDirectory("{{gitDirectory}}")
             .build();