From 28008323ed3193081353acc134f773f567c237cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Tue, 30 Jan 2024 14:54:23 +0100 Subject: [PATCH] fix: test using random didn't work anymore --- .../plugin/fs/AbstractFileTriggerTest.java | 17 +++++++++++------ .../java/io/kestra/plugin/fs/AbstractUtils.java | 3 +++ .../io/kestra/plugin/fs/ftp/DownloadsTest.java | 4 ++-- .../java/io/kestra/plugin/fs/ftp/FtpUtils.java | 15 +++++++++++++++ .../io/kestra/plugin/fs/ftp/UploadsTest.java | 4 ++-- .../io/kestra/plugin/fs/sftp/DownloadsTest.java | 4 ++-- .../io/kestra/plugin/fs/sftp/SftpUtils.java | 17 +++++++++++++++++ .../io/kestra/plugin/fs/sftp/TriggerTest.java | 8 ++++---- .../io/kestra/plugin/fs/sftp/UploadsTest.java | 4 ++-- .../java/io/kestra/plugin/fs/smb/SmbUtils.java | 15 +++++++++++++++ .../io/kestra/plugin/fs/smb/UploadsTest.java | 4 ++-- src/test/resources/application.yml | 3 --- .../resources/flows/ftp-listen-none-action.yaml | 4 ++-- src/test/resources/flows/ftp-listen.yaml | 4 ++-- .../flows/sftp-listen-none-action.yaml | 4 ++-- src/test/resources/flows/sftp-listen.yaml | 4 ++-- .../resources/flows/smb-listen-none-action.yaml | 4 ++-- src/test/resources/flows/smb-listen.yaml | 4 ++-- 18 files changed, 87 insertions(+), 35 deletions(-) diff --git a/src/test/java/io/kestra/plugin/fs/AbstractFileTriggerTest.java b/src/test/java/io/kestra/plugin/fs/AbstractFileTriggerTest.java index 2102b11..75ac19f 100644 --- a/src/test/java/io/kestra/plugin/fs/AbstractFileTriggerTest.java +++ b/src/test/java/io/kestra/plugin/fs/AbstractFileTriggerTest.java @@ -55,9 +55,6 @@ public abstract class AbstractFileTriggerTest { @Inject protected RunContextFactory runContextFactory; - @Value("${kestra.variables.globals.random}") - protected String random; - abstract protected String triggeringFlowId(); abstract protected AbstractUtils utils(); @@ -89,7 +86,7 @@ void moveAction() throws Exception { String out1 = FriendlyId.createFriendlyId(); - String toUploadDir = "/upload/" + random; + String toUploadDir = "/upload/trigger"; utils().upload(toUploadDir + "/" + out1); String out2 = FriendlyId.createFriendlyId(); utils().upload(toUploadDir + "/" + out2); @@ -107,6 +104,9 @@ void moveAction() throws Exception { assertThat(utils().list(toUploadDir).getFiles().isEmpty(), is(true)); assertThat(utils().list(toUploadDir + "-move").getFiles().size(), is(2)); + + utils().delete(toUploadDir + "/" + out1); + utils().delete(toUploadDir + "/" + out2); } } @@ -137,7 +137,7 @@ void noneAction() throws Exception { String out1 = FriendlyId.createFriendlyId(); - String toUploadDir = "/upload/" + random + "-none"; + String toUploadDir = "/upload/trigger-none"; utils().upload(toUploadDir + "/" + out1); String out2 = FriendlyId.createFriendlyId(); utils().upload(toUploadDir + "/" + out2); @@ -154,6 +154,9 @@ void noneAction() throws Exception { assertThat(trigger.size(), is(2)); assertThat(utils().list(toUploadDir).getFiles().size(), is(2)); + + utils().delete(toUploadDir + "/" + out1); + utils().delete(toUploadDir + "/" + out2); } } @@ -190,7 +193,7 @@ void missing() throws Exception { Thread.sleep(1000); String out1 = FriendlyId.createFriendlyId(); - utils().upload("/upload/" + random + "/" + out1); + utils().upload("/upload/trigger/" + out1); queueCount.await(10, TimeUnit.SECONDS); @@ -198,6 +201,8 @@ void missing() throws Exception { java.util.List trigger = (java.util.List) last.get().getTrigger().getVariables().get("files"); assertThat(trigger.size(), is(1)); + + utils().delete("/upload/trigger/" + out1); } } } diff --git a/src/test/java/io/kestra/plugin/fs/AbstractUtils.java b/src/test/java/io/kestra/plugin/fs/AbstractUtils.java index 67caf2f..3f483d3 100644 --- a/src/test/java/io/kestra/plugin/fs/AbstractUtils.java +++ b/src/test/java/io/kestra/plugin/fs/AbstractUtils.java @@ -3,6 +3,7 @@ import com.devskiller.friendly_id.FriendlyId; import io.kestra.core.storages.StorageInterface; import io.kestra.plugin.fs.sftp.Upload; +import io.kestra.plugin.fs.vfs.Delete; import io.kestra.plugin.fs.vfs.List; import jakarta.inject.Inject; @@ -35,4 +36,6 @@ public Upload.Output upload(String to) throws Exception { abstract public Upload.Output upload(URI source, String to) throws Exception; abstract public List.Output list(String dir) throws Exception; + + abstract public Delete.Output delete(String file) throws Exception; } diff --git a/src/test/java/io/kestra/plugin/fs/ftp/DownloadsTest.java b/src/test/java/io/kestra/plugin/fs/ftp/DownloadsTest.java index efd8338..107527e 100644 --- a/src/test/java/io/kestra/plugin/fs/ftp/DownloadsTest.java +++ b/src/test/java/io/kestra/plugin/fs/ftp/DownloadsTest.java @@ -3,6 +3,7 @@ import com.devskiller.friendly_id.FriendlyId; import com.google.common.collect.ImmutableMap; import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.micronaut.context.annotation.Value; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; @@ -21,8 +22,7 @@ class DownloadsTest { @Inject private FtpUtils ftpUtils; - @Value("${kestra.variables.globals.random}") - private String random; + private final String random = IdUtils.create(); @Test void run_DeleteAfterDownloads() throws Exception { diff --git a/src/test/java/io/kestra/plugin/fs/ftp/FtpUtils.java b/src/test/java/io/kestra/plugin/fs/ftp/FtpUtils.java index 5c6e950..ce91a99 100644 --- a/src/test/java/io/kestra/plugin/fs/ftp/FtpUtils.java +++ b/src/test/java/io/kestra/plugin/fs/ftp/FtpUtils.java @@ -43,4 +43,19 @@ public List.Output list(String dir) throws Exception { .build() .run(this.runContextFactory.of()); } + + @Override + public Delete.Output delete(String file) throws Exception { + var task = io.kestra.plugin.fs.ftp.Delete.builder() + .id(FtpUtils.class.getSimpleName()) + .type(FtpUtils.class.getName()) + .uri(file) + .host("localhost") + .port("6621") + .username("guest") + .password("guest") + .build(); + + return task.run(TestsUtils.mockRunContext(runContextFactory, task, ImmutableMap.of())); + } } diff --git a/src/test/java/io/kestra/plugin/fs/ftp/UploadsTest.java b/src/test/java/io/kestra/plugin/fs/ftp/UploadsTest.java index 9b8b80f..e0c024e 100644 --- a/src/test/java/io/kestra/plugin/fs/ftp/UploadsTest.java +++ b/src/test/java/io/kestra/plugin/fs/ftp/UploadsTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.fs.vfs.models.File; import io.micronaut.context.annotation.Value; @@ -24,8 +25,7 @@ class UploadsTest { @Inject private FtpUtils ftpUtils; - @Value("${kestra.variables.globals.random}") - private String random; + private final String random = IdUtils.create(); @Test void run() throws Exception { diff --git a/src/test/java/io/kestra/plugin/fs/sftp/DownloadsTest.java b/src/test/java/io/kestra/plugin/fs/sftp/DownloadsTest.java index 6d7f232..6d51909 100644 --- a/src/test/java/io/kestra/plugin/fs/sftp/DownloadsTest.java +++ b/src/test/java/io/kestra/plugin/fs/sftp/DownloadsTest.java @@ -2,6 +2,7 @@ import com.devskiller.friendly_id.FriendlyId; import com.google.common.collect.ImmutableMap; +import io.kestra.core.utils.IdUtils; import io.micronaut.context.annotation.Value; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import org.junit.jupiter.api.Test; @@ -22,8 +23,7 @@ class DownloadsTest { @Inject private SftpUtils sftpUtils; - @Value("${kestra.variables.globals.random}") - private String random; + private final String random = IdUtils.create(); @Test void run_DeleteAfterDownloads() throws Exception { diff --git a/src/test/java/io/kestra/plugin/fs/sftp/SftpUtils.java b/src/test/java/io/kestra/plugin/fs/sftp/SftpUtils.java index 7219eab..5dae09c 100644 --- a/src/test/java/io/kestra/plugin/fs/sftp/SftpUtils.java +++ b/src/test/java/io/kestra/plugin/fs/sftp/SftpUtils.java @@ -4,6 +4,7 @@ import io.kestra.core.runners.RunContextFactory; import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.fs.AbstractUtils; +import io.kestra.plugin.fs.vfs.Delete; import jakarta.inject.Inject; import jakarta.inject.Singleton; @@ -43,4 +44,20 @@ public io.kestra.plugin.fs.vfs.List.Output list(String dir) throws Exception { .build() .run(this.runContextFactory.of()); } + + @Override + public Delete.Output delete(String file) throws Exception { + var task = io.kestra.plugin.fs.sftp.Delete.builder() + .id(SftpUtils.class.getSimpleName()) + .type(Upload.class.getName()) + .uri(file) + .host("localhost") + .port("6622") + .username("foo") + .password("pass") + .rootDir(true) + .build(); + + return task.run(TestsUtils.mockRunContext(runContextFactory, task, ImmutableMap.of())); + } } diff --git a/src/test/java/io/kestra/plugin/fs/sftp/TriggerTest.java b/src/test/java/io/kestra/plugin/fs/sftp/TriggerTest.java index 2883a6a..d3982c4 100644 --- a/src/test/java/io/kestra/plugin/fs/sftp/TriggerTest.java +++ b/src/test/java/io/kestra/plugin/fs/sftp/TriggerTest.java @@ -46,13 +46,13 @@ void move() throws Exception { .port("6622") .username("foo") .password("pass") - .from("/upload/" + random + "/") + .from("/upload/trigger/") .action(Downloads.Action.MOVE) - .moveDirectory("/upload/" + random + "-move/") + .moveDirectory("/upload/trigger-move/") .build(); String out = FriendlyId.createFriendlyId(); - Upload.Output upload = utils().upload("/upload/" + random + "/" + out + ".yml"); + Upload.Output upload = utils().upload("/upload/trigger/" + out + ".yml"); Map.Entry context = TestsUtils.mockTrigger(runContextFactory, trigger); Optional execution = trigger.evaluate(context.getKey(), context.getValue()); @@ -84,7 +84,7 @@ void move() throws Exception { .port("6622") .username("foo") .password("pass") - .from("/upload/" + random + "-move/" + out + ".yml") + .from("/upload/trigger" + "-move/" + out + ".yml") .build(); io.kestra.plugin.fs.vfs.Download.Output run = task.run(TestsUtils.mockRunContext(runContextFactory, task, ImmutableMap.of())); diff --git a/src/test/java/io/kestra/plugin/fs/sftp/UploadsTest.java b/src/test/java/io/kestra/plugin/fs/sftp/UploadsTest.java index f223f20..b1e6b87 100644 --- a/src/test/java/io/kestra/plugin/fs/sftp/UploadsTest.java +++ b/src/test/java/io/kestra/plugin/fs/sftp/UploadsTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.fs.vfs.Uploads.Output; import io.kestra.plugin.fs.vfs.models.File; @@ -25,8 +26,7 @@ class UploadsTest { @Inject private SftpUtils sftpUtils; - @Value("${kestra.variables.globals.random}") - private String random; + private final String random = IdUtils.create(); @Test void run() throws Exception { diff --git a/src/test/java/io/kestra/plugin/fs/smb/SmbUtils.java b/src/test/java/io/kestra/plugin/fs/smb/SmbUtils.java index 06105fd..f9957da 100644 --- a/src/test/java/io/kestra/plugin/fs/smb/SmbUtils.java +++ b/src/test/java/io/kestra/plugin/fs/smb/SmbUtils.java @@ -4,6 +4,7 @@ import io.kestra.core.runners.RunContextFactory; import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.fs.AbstractUtils; +import io.kestra.plugin.fs.vfs.Delete; import io.kestra.plugin.fs.vfs.List; import jakarta.inject.Inject; import jakarta.inject.Singleton; @@ -45,4 +46,18 @@ public List.Output list(String dir) throws Exception { .build() .run(this.runContextFactory.of()); } + + @Override + public Delete.Output delete(String file) throws Exception { + var task = io.kestra.plugin.fs.smb.Delete.builder() + .id(SmbUtils.class.getSimpleName()) + .type(SmbUtils.class.getName()) + .uri(file) + .host("localhost") + .username("alice") + .password("alipass") + .build(); + + return task.run(TestsUtils.mockRunContext(runContextFactory, task, ImmutableMap.of())); + } } diff --git a/src/test/java/io/kestra/plugin/fs/smb/UploadsTest.java b/src/test/java/io/kestra/plugin/fs/smb/UploadsTest.java index 8146242..95945b3 100644 --- a/src/test/java/io/kestra/plugin/fs/smb/UploadsTest.java +++ b/src/test/java/io/kestra/plugin/fs/smb/UploadsTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import io.kestra.core.runners.RunContextFactory; +import io.kestra.core.utils.IdUtils; import io.kestra.core.utils.TestsUtils; import io.kestra.plugin.fs.vfs.models.File; import io.micronaut.context.annotation.Value; @@ -24,8 +25,7 @@ class UploadsTest { @Inject private SmbUtils smbUtils; - @Value("${kestra.variables.globals.random}") - private String random; + private final String random = IdUtils.create(); @Test void run() throws Exception { diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 809a38e..636ef67 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -7,6 +7,3 @@ kestra: type: local local: base-path: /tmp/unittest - variables: - globals: - random: "${random.shortuuid}" diff --git a/src/test/resources/flows/ftp-listen-none-action.yaml b/src/test/resources/flows/ftp-listen-none-action.yaml index 41488c6..d2da17f 100644 --- a/src/test/resources/flows/ftp-listen-none-action.yaml +++ b/src/test/resources/flows/ftp-listen-none-action.yaml @@ -8,11 +8,11 @@ triggers: port: 6621 username: guest password: guest - from: "/upload/{{ globals.random }}-none/" + from: "/upload/trigger-none/" interval: PT10S action: NONE passiveMode: true - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end diff --git a/src/test/resources/flows/ftp-listen.yaml b/src/test/resources/flows/ftp-listen.yaml index 556090e..d502d7d 100644 --- a/src/test/resources/flows/ftp-listen.yaml +++ b/src/test/resources/flows/ftp-listen.yaml @@ -8,11 +8,11 @@ triggers: port: 6621 username: guest password: guest - from: "/upload/{{ globals.random }}/" + from: "/upload/trigger/" interval: PT10S action: MOVE passiveMode: true - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end diff --git a/src/test/resources/flows/sftp-listen-none-action.yaml b/src/test/resources/flows/sftp-listen-none-action.yaml index 3bfb3ce..a6ffd17 100644 --- a/src/test/resources/flows/sftp-listen-none-action.yaml +++ b/src/test/resources/flows/sftp-listen-none-action.yaml @@ -8,10 +8,10 @@ triggers: port: 6622 username: foo password: pass - from: "/upload/{{ globals.random }}-none/" + from: "/upload/trigger-none/" interval: PT10S action: NONE - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end diff --git a/src/test/resources/flows/sftp-listen.yaml b/src/test/resources/flows/sftp-listen.yaml index 950a0e9..667d8d7 100644 --- a/src/test/resources/flows/sftp-listen.yaml +++ b/src/test/resources/flows/sftp-listen.yaml @@ -8,10 +8,10 @@ triggers: port: 6622 username: foo password: pass - from: "/upload/{{ globals.random }}/" + from: "/upload/trigger/" interval: PT10S action: MOVE - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end diff --git a/src/test/resources/flows/smb-listen-none-action.yaml b/src/test/resources/flows/smb-listen-none-action.yaml index a979d99..aa542f7 100644 --- a/src/test/resources/flows/smb-listen-none-action.yaml +++ b/src/test/resources/flows/smb-listen-none-action.yaml @@ -8,10 +8,10 @@ triggers: port: 445 username: alice password: alipass - from: "/upload/{{ globals.random }}-none/" + from: "/upload/trigger-none/" interval: PT10S action: NONE - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end diff --git a/src/test/resources/flows/smb-listen.yaml b/src/test/resources/flows/smb-listen.yaml index 2ddad42..a6d04f5 100644 --- a/src/test/resources/flows/smb-listen.yaml +++ b/src/test/resources/flows/smb-listen.yaml @@ -8,10 +8,10 @@ triggers: port: 445 username: alice password: alipass - from: "/upload/{{ globals.random }}/" + from: "/upload/trigger/" interval: PT10S action: MOVE - moveDirectory: "/upload/{{ globals.random }}-move/" + moveDirectory: "/upload/trigger-move/" tasks: - id: end