From b12730f69fa765883455ebee385493a419505a83 Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Tue, 16 Dec 2025 17:46:22 +0100 Subject: [PATCH 1/3] increase await with tower token Signed-off-by: munishchouhan --- app/src/main/java/io/seqera/wave/cli/App.java | 5 +++++ .../groovy/io/seqera/wave/cli/AppTest.groovy | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index 1b22a84..57dc75b 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -313,6 +313,11 @@ else if( isEmpty(waveEndpoint) ) { waveEndpoint = Client.DEFAULT_ENDPOINT; } + if (await != null && await.toMillis() == Duration.ofMinutes(15).toMillis() + && towerToken != null && !towerToken.isEmpty()) { + await = Duration.ofMinutes(25); + } + } protected void validateArgs() { diff --git a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy index 45e9e86..30f3e93 100644 --- a/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy +++ b/app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy @@ -500,6 +500,24 @@ class AppTest extends Specification { and: app.@await == Duration.ofMinutes(15) } + + def 'should get the default await duration when --tower-token is provided'(){ + given: + def app = new App() + String[] args = ["-i", "ubuntu:latest", '--await', '--tower-token', 'token'] + + when: + def cli = new CommandLine(app) + cli.registerConverter(Duration.class, new DurationConverter()) + cli.parseArgs(args) + and: + app.validateArgs() + app.defaultArgs() + then: + noExceptionThrown() + and: + app.@await == Duration.ofMinutes(25) + } def 'should get the correct name strategy'(){ given: From 15f2b01a0430a2e3195c66e3bde0ab92c686d321 Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Tue, 16 Dec 2025 18:33:21 +0100 Subject: [PATCH 2/3] changes as per review Signed-off-by: munishchouhan --- app/src/main/java/io/seqera/wave/cli/App.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index 57dc75b..8e011c8 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -313,8 +313,8 @@ else if( isEmpty(waveEndpoint) ) { waveEndpoint = Client.DEFAULT_ENDPOINT; } - if (await != null && await.toMillis() == Duration.ofMinutes(15).toMillis() - && towerToken != null && !towerToken.isEmpty()) { + if ( await != null && await.toMinutes() == Duration.ofMinutes(15).toMinutes() + && !isEmpty(towerToken) ) { await = Duration.ofMinutes(25); } From ad0518efd2870fcde109f70458e5665b1dece62a Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Tue, 16 Dec 2025 19:08:32 +0100 Subject: [PATCH 3/3] changes as per review Signed-off-by: munishchouhan --- app/src/main/java/io/seqera/wave/cli/App.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java index 8e011c8..7c8e0d6 100644 --- a/app/src/main/java/io/seqera/wave/cli/App.java +++ b/app/src/main/java/io/seqera/wave/cli/App.java @@ -313,8 +313,7 @@ else if( isEmpty(waveEndpoint) ) { waveEndpoint = Client.DEFAULT_ENDPOINT; } - if ( await != null && await.toMinutes() == Duration.ofMinutes(15).toMinutes() - && !isEmpty(towerToken) ) { + if ( Duration.ofMinutes(15).equals(await) && !isEmpty(towerToken) ) { await = Duration.ofMinutes(25); }