PLAT-1242 - remove condaEnv override option; simplify waitStatus addi…

…tional steps logic;
seqeralabs · Jan 24, 2025 · 764677c · 764677c
1 parent 384d182
commit 764677c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/src/main/java/io/seqera/tower/cli/commands/datastudios/AbstractStudiosCmd.java b/src/main/java/io/seqera/tower/cli/commands/datastudios/AbstractStudiosCmd.java
@@ -48,7 +48,6 @@ public ProgressStepMessageSupplier(String sessionId, Long workspaceId) {
 
         @Override
         public String get() {
-
             try {
                 DataStudioDto dataStudioDto = api().describeDataStudio(sessionId, workspaceId);
 
@@ -63,9 +62,9 @@ public String get() {
                             : String.format("\n  %s - Error encountered: %s", currentProgressStep.getMessage(), dataStudioDto.getStatusInfo().getMessage());
                 }
 
-                return null;
+                return "";
             } catch (Exception e) {
-                return null;
+                return "";
             }
         }
     }

diff --git a/src/main/java/io/seqera/tower/cli/commands/datastudios/DataStudioConfigurationOptions.java b/src/main/java/io/seqera/tower/cli/commands/datastudios/DataStudioConfigurationOptions.java
@@ -35,7 +35,4 @@ public class DataStudioConfigurationOptions {
     @CommandLine.Option(names = {"--mount-data"}, description = "Optional configuration override for 'mountData' setting (comma separate list of datalinkIds)", split = ",")
     public List<String> mountData;
 
-    @CommandLine.Option(names = {"--conda-env"}, description = "Optional configuration override for 'condaEnvironment' setting (YAML conda packages configurations)")
-    public String condaEnvironment;
-
 }
diff --git a/src/main/java/io/seqera/tower/cli/commands/datastudios/StartCmd.java b/src/main/java/io/seqera/tower/cli/commands/datastudios/StartCmd.java
@@ -134,9 +134,6 @@ private DataStudioStartRequest getStartRequestWithOverridesApplied(DataStudioDto
         dataStudioConfiguration.setMountData(dataStudioConfigOptions.mountData == null
                 ? dataStudioConfiguration.getMountData()
                 : dataStudioConfigOptions.mountData);
-        dataStudioConfiguration.setCondaEnvironment(dataStudioConfigOptions.condaEnvironment == null
-                ? dataStudioConfiguration.getCondaEnvironment()
-                : dataStudioConfigOptions.condaEnvironment);
 
         String appliedDescription = description == null
                 ? dataStudioDto.getDescription()

diff --git a/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java b/src/main/java/io/seqera/tower/cli/utils/ResponseHelper.java
@@ -173,10 +173,7 @@ public static <S extends Enum<?>> Integer waitStatus(PrintWriter out, boolean sh
                     lastReported = status;
                 }
                 if (additionalProgressSteps != null) {
-                    String progressStep = additionalProgressSteps.get();
-                    if (progressStep != null) {
-                        out.print(progressStep);
-                    }
+                    out.print(additionalProgressSteps.get());
                 }
                 out.flush();
             }
@@ -187,10 +184,7 @@ public static <S extends Enum<?>> Integer waitStatus(PrintWriter out, boolean sh
 
         if (showProgress) {
             if (additionalProgressSteps != null) {
-                String progressStep = additionalProgressSteps.get();
-                if (progressStep != null) {
-                    out.print(progressStep);
-                }
+                out.print(additionalProgressSteps.get());
             }
             out.print(currentPos == targetPos ? "  [DONE]\n\n" : "  [ERROR]\n\n");
             out.flush();

diff --git a/src/test/java/io/seqera/tower/cli/datastudios/DataStudiosCmdTest.java b/src/test/java/io/seqera/tower/cli/datastudios/DataStudiosCmdTest.java
@@ -566,7 +566,7 @@ void testStart(OutputType format, MockServerClient mock) {
         ExecOut out = exec(format, mock, "studios", "start", "-w", "75887156211589", "-i" ,"3e8370e7");
 
         assertOutput(format, out, new DataStudioStartSubmitted("3e8370e7", 75887156211589L,
-                "[organization1 / workspace1]", "https://a3e8370e7.dev-tower.com", true));
+                "[organization1 / workspace1]",  "http://localhost:"+mock.getPort()+"/orgs/organization1/workspaces/workspace1", true));
     }
 
     @ParameterizedTest
@@ -615,7 +615,7 @@ void testStartWithConfigOverride(OutputType format, MockServerClient mock) {
         ExecOut out = exec(format, mock, "studios", "start", "-w", "75887156211589", "-i" ,"3e8370e7", "-c", "4", "--description", "Override description");
 
         assertOutput(format, out, new DataStudioStartSubmitted("3e8370e7", 75887156211589L,
-                "[organization1 / workspace1]", "https://a3e8370e7.dev-tower.com", true));
+                "[organization1 / workspace1]", "http://localhost:"+mock.getPort()+"/orgs/organization1/workspaces/workspace1", true));
     }
 
     // Only run this test in json output format, since extra stdout output is printed out to console with --wait flag
@@ -676,7 +676,7 @@ void testStartWithWait(OutputType format, MockServerClient mock) {
         ExecOut out = exec(format, mock, "studios", "start", "-w", "75887156211589", "-i" ,"3e8370e7", "--wait", "RUNNING");
 
         assertOutput(format, out, new DataStudioStartSubmitted("3e8370e7", 75887156211589L,
-                "[organization1 / workspace1]", "https://a3e8370e7.dev-tower.com", true));
+                "[organization1 / workspace1]", "http://localhost:"+mock.getPort()+"/orgs/organization1/workspaces/workspace1", true));
 
         // verify the API has been polled additionally for the status
         mock.verify(request().withMethod("GET").withPath("/studios/3e8370e7"), VerificationTimes.exactly(4));