From acea48b8ea506fb1645b69a62d811457c7f5d123 Mon Sep 17 00:00:00 2001
From: Weronika Sosnowska <weronika.sosnowska@seqera.io>
Date: Wed, 10 Jul 2024 10:55:15 +0200
Subject: [PATCH 1/5] bump tower-java-sdk to 1.9.6

---
 build.gradle                                         |  2 +-
 .../tower/cli/commands/computeenvs/ExportCmd.java    |  8 ++++----
 .../tower/cli/commands/computeenvs/ImportCmd.java    |  4 ++--
 .../cli/commands/computeenvs/add/AbstractAddCmd.java | 12 ++++++------
 .../computeenvs/platforms/AbstractPlatform.java      |  9 ++++-----
 .../computeenvs/platforms/AltairPlatform.java        |  4 ++--
 .../computeenvs/platforms/AwsBatchForgePlatform.java |  4 ++--
 .../platforms/AwsBatchManualPlatform.java            |  2 +-
 .../computeenvs/platforms/AzBatchForgePlatform.java  |  5 ++---
 .../computeenvs/platforms/AzBatchManualPlatform.java |  2 +-
 .../commands/computeenvs/platforms/EksPlatform.java  |  2 +-
 .../commands/computeenvs/platforms/GkePlatform.java  |  2 +-
 .../computeenvs/platforms/GoogleBatchPlatform.java   |  2 +-
 .../platforms/GoogleLifeSciencesPlatform.java        |  4 ++--
 .../commands/computeenvs/platforms/K8sPlatform.java  |  2 +-
 .../commands/computeenvs/platforms/LsfPlatform.java  |  2 +-
 .../commands/computeenvs/platforms/MoabPlatform.java |  4 ++--
 .../cli/commands/computeenvs/platforms/Platform.java |  4 ++--
 .../computeenvs/platforms/SlurmPlatform.java         |  4 ++--
 .../computeenvs/platforms/UnivaPlatform.java         |  6 +++---
 .../commands/credentials/AbstractCredentialsCmd.java |  2 +-
 .../io/seqera/tower/cli/commands/runs/ViewCmd.java   |  4 ++--
 22 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/build.gradle b/build.gradle
index 22f3290f..28ab0d24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation 'org.slf4j:slf4j-api:1.7.36'
     implementation 'ch.qos.logback:logback-core:1.2.11'
     implementation 'ch.qos.logback:logback-classic:1.2.11'
-    implementation 'io.seqera.tower:tower-java-sdk:1.9.5'
+    implementation 'io.seqera.tower:tower-java-sdk:1.9.6'
     implementation 'info.picocli:picocli:4.6.3'
     implementation 'org.apache.commons:commons-compress:1.22'
     implementation 'org.tukaani:xz:1.9'
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
index bdc1c6e6..0c24f24f 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
@@ -27,7 +27,7 @@
 import io.seqera.tower.cli.shared.ComputeEnvExportFormat;
 import io.seqera.tower.cli.utils.FilesHelper;
 import io.seqera.tower.model.AwsBatchConfig;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import picocli.CommandLine;
 
@@ -49,14 +49,14 @@ public class ExportCmd extends AbstractComputeEnvCmd {
     @Override
     protected Response exec() throws ApiException {
         Long wspId = workspaceId(workspace.workspace);
-        
+
         ComputeEnvResponseDto ce = fetchComputeEnv(computeEnvRefOptions, wspId);
 
-        ComputeEnv computeEnv = new ComputeEnv();
+        ComputeEnvComputeConfig computeEnv = new ComputeEnvComputeConfig();
         computeEnv.setDescription(ce.getDescription());
         computeEnv.setCredentialsId(ce.getCredentialsId());
         computeEnv.setMessage(ce.getMessage());
-        computeEnv.setPlatform(ce.getPlatform() != null ? ComputeEnv.PlatformEnum.fromValue(ce.getPlatform().getValue()) : null);
+        computeEnv.setPlatform(ce.getPlatform() != null ? ComputeEnvComputeConfig.PlatformEnum.fromValue(ce.getPlatform().getValue()) : null);
         computeEnv.setConfig(ce.getConfig());
 
         // Remove forged resources
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
index a198a307..bdf18855 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
@@ -25,7 +25,7 @@
 import io.seqera.tower.cli.responses.Response;
 import io.seqera.tower.cli.shared.ComputeEnvExportFormat;
 import io.seqera.tower.cli.utils.FilesHelper;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import picocli.CommandLine;
 
@@ -50,7 +50,7 @@ protected Response exec() throws ApiException, IOException {
 
         ComputeEnvExportFormat ceData = ComputeEnvExportFormat.deserialize(FilesHelper.readString(fileName));
 
-        ComputeEnv.PlatformEnum platform = ComputeEnv.PlatformEnum.fromValue(ceData.getConfig().getDiscriminator());
+        ComputeEnvComputeConfig.PlatformEnum platform = ComputeEnvComputeConfig.PlatformEnum.fromValue(ceData.getConfig().getDiscriminator());
 
         Long wspId = workspaceId(workspace.workspace);
 
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
index 75a1ccd5..eb5e73a2 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
@@ -28,7 +28,7 @@
 import io.seqera.tower.cli.responses.Response;
 import io.seqera.tower.cli.responses.computeenvs.ComputeEnvAdded;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ComputeEnvStatus;
 import io.seqera.tower.model.CreateComputeEnvRequest;
 import io.seqera.tower.model.CreateComputeEnvResponse;
@@ -100,11 +100,11 @@ private ComputeEnvStatus checkComputeEnvStatus(String computeEnvId, Long workspa
         }
     }
 
-    protected ComputeEnvAdded addComputeEnv(ComputeEnv.PlatformEnum platform, ComputeConfig config) throws ApiException {
+    protected ComputeEnvAdded addComputeEnv(ComputeEnvComputeConfig.PlatformEnum platform, ComputeConfig config) throws ApiException {
         return addComputeEnvWithLabels(platform, config, labels);
     }
 
-    protected ComputeEnvAdded addComputeEnvWithLabels(ComputeEnv.PlatformEnum platform, ComputeConfig config, List<Label> labels) throws ApiException {
+    protected ComputeEnvAdded addComputeEnvWithLabels(ComputeEnvComputeConfig.PlatformEnum platform, ComputeConfig config, List<Label> labels) throws ApiException {
 
         Long wspId = workspaceId(workspace.workspace);
 
@@ -114,7 +114,7 @@ protected ComputeEnvAdded addComputeEnvWithLabels(ComputeEnv.PlatformEnum platfo
 
         CreateComputeEnvRequest request =  new CreateComputeEnvRequest()
                 .computeEnv(
-                        new ComputeEnv()
+                        new ComputeEnvComputeConfig()
                                 .name(name)
                                 .platform(platform)
                                 .credentialsId(credsId)
@@ -136,7 +136,7 @@ private List<Long> findLabels(Long wspId, List<Label> labels) throws ApiExceptio
         }
     }
 
-    private String credentialsByRef(ComputeEnv.PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
+    private String credentialsByRef(ComputeEnvComputeConfig.PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
         List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
 
         if (credentials.isEmpty()) {
@@ -157,7 +157,7 @@ private String credentialsByRef(ComputeEnv.PlatformEnum type, Long wspId, String
         return cred.getId();
     }
 
-    private String findWorkspaceCredentials(ComputeEnv.PlatformEnum type, Long wspId) throws ApiException {
+    private String findWorkspaceCredentials(ComputeEnvComputeConfig.PlatformEnum type, Long wspId) throws ApiException {
         List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
         if (credentials.isEmpty()) {
             throw new TowerException("No valid credentials found at the workspace");
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
index e564d756..8e64ea18 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
@@ -21,7 +21,7 @@
 import io.seqera.tower.api.DefaultApi;
 import io.seqera.tower.cli.utils.FilesHelper;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ConfigEnvVariable;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -29,7 +29,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,9 +43,9 @@ public abstract class AbstractPlatform<T extends ComputeConfig> implements Platf
     @ArgGroup(heading = "%nEnvironment variables:%n", validate = false)
     public Environment environment;
 
-    private PlatformEnum type;
+    private ComputeEnvComputeConfig.PlatformEnum type;
 
-    public AbstractPlatform(PlatformEnum type) {
+    public AbstractPlatform(ComputeEnvComputeConfig.PlatformEnum type) {
         this.type = type;
     }
 
@@ -91,7 +90,7 @@ protected List<ConfigEnvVariable> environmentVariables() {
         return vars;
     }
 
-    public PlatformEnum type() {
+    public ComputeEnvComputeConfig.PlatformEnum type() {
         return type;
     }
 
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
index fa9acbe8..cf756889 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
@@ -19,7 +19,7 @@
 
 import io.seqera.tower.ApiException;
 import io.seqera.tower.model.AltairPbsComputeConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
 
@@ -49,7 +49,7 @@ public class AltairPlatform extends AbstractPlatform<AltairPbsComputeConfig> {
     public AdvancedOptions adv;
 
     public AltairPlatform() {
-        super(PlatformEnum.ALTAIR_PLATFORM);
+        super(ComputeEnvComputeConfig.PlatformEnum.ALTAIR_PLATFORM);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
index 37673e3f..13319ce2 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
@@ -20,7 +20,7 @@
 import io.seqera.tower.ApiException;
 import io.seqera.tower.cli.exceptions.TowerException;
 import io.seqera.tower.model.AwsBatchConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ForgeConfig;
 import io.seqera.tower.model.ForgeConfig.AllocStrategyEnum;
 import io.seqera.tower.model.ForgeConfig.TypeEnum;
@@ -76,7 +76,7 @@ public class AwsBatchForgePlatform extends AbstractPlatform<AwsBatchConfig> {
     public AdvancedOptions adv;
 
     public AwsBatchForgePlatform() {
-        super(PlatformEnum.AWS_BATCH);
+        super(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH);
     }
 
     /**
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchManualPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchManualPlatform.java
index 83fd9e56..c36753bf 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchManualPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchManualPlatform.java
@@ -20,7 +20,7 @@
 import io.seqera.tower.ApiException;
 import io.seqera.tower.cli.exceptions.TowerException;
 import io.seqera.tower.model.AwsBatchConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
 
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
index 4a8793df..b12da6e1 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
@@ -22,8 +22,7 @@
 import io.seqera.tower.cli.exceptions.CredentialsNotFoundException;
 import io.seqera.tower.model.AzBatchConfig;
 import io.seqera.tower.model.AzBatchForgeConfig;
-import io.seqera.tower.model.ComputeEnv;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.Credentials;
 import io.seqera.tower.model.JobCleanupPolicy;
 import picocli.CommandLine.ArgGroup;
@@ -64,7 +63,7 @@ public class AzBatchForgePlatform extends AbstractPlatform<AzBatchConfig> {
     public AdvancedOptions adv;
 
     public AzBatchForgePlatform() {
-        super(PlatformEnum.AZURE_BATCH);
+        super(ComputeEnvComputeConfig.PlatformEnum.AZURE_BATCH);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchManualPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchManualPlatform.java
index 566ab8d5..d29acfb4 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchManualPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchManualPlatform.java
@@ -19,7 +19,7 @@
 
 import io.seqera.tower.ApiException;
 import io.seqera.tower.model.AzBatchConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.JobCleanupPolicy;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/EksPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/EksPlatform.java
index 468a2b4a..63a32fdd 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/EksPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/EksPlatform.java
@@ -19,7 +19,7 @@
 
 import io.seqera.tower.ApiException;
 import io.seqera.tower.cli.utils.FilesHelper;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.EksComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GkePlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GkePlatform.java
index 8a678b03..cfd541bd 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GkePlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GkePlatform.java
@@ -19,7 +19,7 @@
 
 import io.seqera.tower.ApiException;
 import io.seqera.tower.cli.utils.FilesHelper;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.GkeComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleBatchPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleBatchPlatform.java
index f680f811..0b9d9ecb 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleBatchPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleBatchPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.GoogleBatchConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
index ccdba9a0..8150fd5f 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.GoogleLifeSciencesConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -46,7 +46,7 @@ public class GoogleLifeSciencesPlatform extends AbstractPlatform<GoogleLifeScien
     public AdvancedOptions adv;
 
     public GoogleLifeSciencesPlatform() {
-        super(PlatformEnum.GOOGLE_LIFESCIENCES);
+        super(ComputeEnvComputeConfig.PlatformEnum.GOOGLE_LIFESCIENCES);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/K8sPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/K8sPlatform.java
index 413c5645..40380087 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/K8sPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/K8sPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.cli.utils.FilesHelper;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.K8sComputeConfig;
 import io.seqera.tower.model.PodCleanupPolicy;
 import picocli.CommandLine.ArgGroup;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/LsfPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/LsfPlatform.java
index dafe1489..a2283888 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/LsfPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/LsfPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.LsfComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/MoabPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/MoabPlatform.java
index 831389e2..1098301d 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/MoabPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/MoabPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.MoabComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -58,10 +58,10 @@ public MoabComputeConfig computeConfig() throws ApiException, IOException {
 
         config
                 // Common
+                .environment(environmentVariables())
                 .workDir(workDir)
                 .preRunScript(preRunScriptString())
                 .postRunScript(postRunScriptString())
-                .environment(environmentVariables())
 
                 // Main
                 .launchDir(launchDir)
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
index ede94225..fe2c1718 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
@@ -20,13 +20,13 @@
 import io.seqera.tower.ApiException;
 import io.seqera.tower.api.DefaultApi;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 
 import java.io.IOException;
 
 public interface Platform {
 
-    PlatformEnum type();
+    ComputeEnvComputeConfig.PlatformEnum type();
 
     ComputeConfig computeConfig(Long workspaceId, DefaultApi api) throws ApiException, IOException;
 }
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/SlurmPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/SlurmPlatform.java
index 1e881397..d71ea547 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/SlurmPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/SlurmPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.SlurmComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -58,10 +58,10 @@ public SlurmComputeConfig computeConfig() throws ApiException, IOException {
 
         config
                 // Common
+                .environment(environmentVariables())
                 .workDir(workDir)
                 .preRunScript(preRunScriptString())
                 .postRunScript(postRunScriptString())
-                .environment(environmentVariables())
 
                 // Main
                 .launchDir(launchDir)
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
index 0b19bec5..8d7af7fb 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnv.PlatformEnum;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.UnivaComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -49,7 +49,7 @@ public class UnivaPlatform extends AbstractPlatform<UnivaComputeConfig> {
     public AdvancedOptions adv;
 
     public UnivaPlatform() {
-        super(PlatformEnum.UGE_PLATFORM);
+        super(ComputeEnvComputeConfig.PlatformEnum.UGE_PLATFORM);
     }
 
     @Override
@@ -58,10 +58,10 @@ public UnivaComputeConfig computeConfig() throws ApiException, IOException {
 
         config
                 // Common
+                .environment(environmentVariables())
                 .workDir(workDir)
                 .preRunScript(preRunScriptString())
                 .postRunScript(postRunScriptString())
-                .environment(environmentVariables())
 
                 // Main
                 .launchDir(launchDir)
diff --git a/src/main/java/io/seqera/tower/cli/commands/credentials/AbstractCredentialsCmd.java b/src/main/java/io/seqera/tower/cli/commands/credentials/AbstractCredentialsCmd.java
index 8108c4a5..b635a65a 100644
--- a/src/main/java/io/seqera/tower/cli/commands/credentials/AbstractCredentialsCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/credentials/AbstractCredentialsCmd.java
@@ -66,7 +66,7 @@ protected void deleteCredentialsByName(String name, Long wspId) throws Credentia
     }
 
     protected void deleteCredentialsById(String id, Long wspId) throws CredentialsNotFoundException, ApiException {
-        api().deleteCredentials(id, wspId);
+        api().deleteCredentials(id, wspId, false);
     }
 
 }
diff --git a/src/main/java/io/seqera/tower/cli/commands/runs/ViewCmd.java b/src/main/java/io/seqera/tower/cli/commands/runs/ViewCmd.java
index b2566fe3..dd02c96e 100644
--- a/src/main/java/io/seqera/tower/cli/commands/runs/ViewCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/runs/ViewCmd.java
@@ -26,7 +26,7 @@
 import io.seqera.tower.cli.exceptions.RunNotFoundException;
 import io.seqera.tower.cli.responses.Response;
 import io.seqera.tower.cli.responses.runs.RunView;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.DescribeWorkflowLaunchResponse;
 import io.seqera.tower.model.DescribeWorkflowResponse;
 import io.seqera.tower.model.ProgressData;
@@ -80,7 +80,7 @@ protected Response exec() throws ApiException {
             WorkflowLoad workflowLoad = workflowLoadByWorkflowId(wspId, id);
 
             DescribeWorkflowLaunchResponse wfLaunch = api().describeWorkflowLaunch(workflow.getId(), wspId);
-            ComputeEnv computeEnv = wfLaunch.getLaunch() != null ? wfLaunch.getLaunch().getComputeEnv() : null;
+            ComputeEnvComputeConfig computeEnv = wfLaunch.getLaunch() != null ? wfLaunch.getLaunch().getComputeEnv() : null;
 
             ProgressData progress = null;
             if (opts.processes || opts.stats || opts.load || opts.utilization) {

From 9b74f7299ceaa41eeaf102b1dd85333c9e239b73 Mon Sep 17 00:00:00 2001
From: Weronika Sosnowska <weronika.sosnowska@seqera.io>
Date: Wed, 10 Jul 2024 10:55:24 +0200
Subject: [PATCH 2/5] fix testAdd

---
 .../io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java | 6 +++---
 .../tower/cli/computeenvs/platforms/AltairPlatformTest.java | 5 ++---
 .../tower/cli/computeenvs/platforms/EksPlatformTest.java    | 3 +--
 .../tower/cli/computeenvs/platforms/GkePlatformTest.java    | 2 +-
 .../platforms/GoogleLifeSciencesPlatformTest.java           | 2 +-
 .../tower/cli/computeenvs/platforms/K8sPlatformTest.java    | 2 +-
 .../tower/cli/computeenvs/platforms/LsfPlatformTest.java    | 4 ++--
 .../tower/cli/computeenvs/platforms/MoabPlatformTest.java   | 2 +-
 .../tower/cli/computeenvs/platforms/SlurmPlatformTest.java  | 2 +-
 .../tower/cli/computeenvs/platforms/UnivaPlatformTest.java  | 2 +-
 .../io/seqera/tower/cli/pipelines/PipelinesCmdTest.java     | 4 ++--
 11 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
index 2cae170b..dc7cc3c3 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
@@ -38,7 +38,7 @@
 import io.seqera.tower.cli.responses.computeenvs.ComputeEnvsPrimarySet;
 import io.seqera.tower.model.AwsBatchConfig;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import io.seqera.tower.model.ComputeEnvStatus;
 import io.seqera.tower.model.ForgeConfig;
@@ -409,7 +409,7 @@ void testImport(OutputType format, MockServerClient mock) throws IOException {
         );
 
         ExecOut out = exec(format, mock, "compute-envs", "import", tempFile(new String(loadResource("cejson"), StandardCharsets.UTF_8), "ce", "json"), "-n", "json", "-c", "6g0ER59L4ZoE5zpOmUP48D");
-        assertOutput(format, out, new ComputeEnvAdded(ComputeEnv.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "json", null, USER_WORKSPACE_NAME));
+        assertOutput(format, out, new ComputeEnvAdded(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "json", null, USER_WORKSPACE_NAME));
     }
 
     @ParameterizedTest
@@ -508,7 +508,7 @@ void testImportWithOverwrite(OutputType format, MockServerClient mock) throws IO
         );
 
         ExecOut out = exec(format, mock, "compute-envs", "import", "--overwrite", tempFile(new String(loadResource("cejson"), StandardCharsets.UTF_8), "ce", "json"), "-n", "demo", "-c", "6g0ER59L4ZoE5zpOmUP48D");
-        assertOutput(format, out, new ComputeEnvAdded(ComputeEnv.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "demo", null, USER_WORKSPACE_NAME));
+        assertOutput(format, out, new ComputeEnvAdded(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "demo", null, USER_WORKSPACE_NAME));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
index 916458e4..76368e0c 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
@@ -46,7 +46,7 @@ void testAdd(OutputType format, MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -65,7 +65,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\",\"maxQueueSize\":200},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\",\"maxQueueSize\":200}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -79,7 +79,6 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
 
     @Test
     void testAddWithEnvVars(MockServerClient mock) {
-
         mock.when(
                 request().withMethod("GET").withPath("/credentials").withQueryStringParameter("platformId", "altair-platform"), exactly(1)
         ).respond(
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
index 7af82617..15a240eb 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
@@ -48,7 +48,7 @@ void testAdd(OutputType format, MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"eks\",\"platform\":\"eks-platform\",\"config\":{\"region\":\"europe\",\"clusterName\":\"tower\",\"workDir\":\"/workdir\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"eks\",\"platform\":\"eks-platform\",\"config\":{\"workDir\":\"/workdir\",\"region\":\"europe\",\"clusterName\":\"tower\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -59,7 +59,6 @@ void testAdd(OutputType format, MockServerClient mock) throws IOException {
 
     @Test
     void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
-
         mock.when(
                 request().withMethod("GET").withPath("/credentials").withQueryStringParameter("platformId", "eks-platform"), exactly(1)
         ).respond(
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
index 3688fcc2..ae912313 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
@@ -48,7 +48,7 @@ void testAdd(OutputType format, MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"gke\",\"platform\":\"gke-platform\",\"config\":{\"region\":\"europe\",\"clusterName\":\"tower\",\"workDir\":\"/workdir\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"gke\",\"platform\":\"gke-platform\",\"config\":{\"workDir\":\"/workdir\",\"region\":\"europe\",\"clusterName\":\"tower\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
index c9acb6fa..fbd6eb46 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
@@ -48,7 +48,7 @@ void testAdd(OutputType format, MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
index 9e559774..6b6aeea4 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
@@ -48,7 +48,7 @@ void testAdd(OutputType format, MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"},\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\",\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
index 73cbf334..25ef21a1 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
@@ -38,7 +38,7 @@ class LsfPlatformTest extends BaseCmdTest {
     @ParameterizedTest
     @EnumSource(OutputType.class)
     void testAdd(OutputType format, MockServerClient mock) {
-
+        mock.openUI();
         mock.when(
                 request().withMethod("GET").withPath("/credentials").withQueryStringParameter("platformId", "lsf-platform"), exactly(1)
         ).respond(
@@ -46,7 +46,7 @@ void testAdd(OutputType format, MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"lsf\",\"platform\":\"lsf-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"lsf\",\"platform\":\"lsf-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
index a05179e3..6d19bd87 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
@@ -46,7 +46,7 @@ void testAdd(OutputType format, MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"moab\",\"platform\":\"moab-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"moab\",\"platform\":\"moab-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
index 50169d38..865811d2 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
@@ -46,7 +46,7 @@ void testAdd(OutputType format, MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"slurm\",\"platform\":\"slurm-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"slurm\",\"platform\":\"slurm-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
index 5c8435c4..f1122d8c 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
@@ -46,7 +46,7 @@ void testAdd(OutputType format, MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"uge\",\"platform\":\"uge-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"uge\",\"platform\":\"uge-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/pipelines/PipelinesCmdTest.java b/src/test/java/io/seqera/tower/cli/pipelines/PipelinesCmdTest.java
index 863b341b..17ca1861 100644
--- a/src/test/java/io/seqera/tower/cli/pipelines/PipelinesCmdTest.java
+++ b/src/test/java/io/seqera/tower/cli/pipelines/PipelinesCmdTest.java
@@ -40,7 +40,7 @@
 import io.seqera.tower.cli.responses.pipelines.PipelinesView;
 import io.seqera.tower.cli.utils.ModelHelper;
 import io.seqera.tower.cli.utils.PaginationInfo;
-import io.seqera.tower.model.ComputeEnv;
+import io.seqera.tower.model.ComputeEnvComputeConfig;
 import io.seqera.tower.model.CreatePipelineRequest;
 import io.seqera.tower.model.Launch;
 import io.seqera.tower.model.PipelineDbDto;
@@ -579,7 +579,7 @@ void testView(MockServerClient mock) throws JsonProcessingException {
                                 .pullLatest(false)
                                 .stubRun(false)
                                 .computeEnv(
-                                        parseJson("{\"id\": \"509cXW9NmIKYTe7KbjxyZn\"}", ComputeEnv.class)
+                                        parseJson("{\"id\": \"509cXW9NmIKYTe7KbjxyZn\"}", ComputeEnvComputeConfig.class)
                                                 .name("slurm_vallibierna")
                                 ),
                 baseUserUrl(mock, USER_WORKSPACE_NAME)

From 9d169276f44ecad69cdbb361188122341ce12ed4 Mon Sep 17 00:00:00 2001
From: Weronika Sosnowska <weronika.sosnowska@seqera.io>
Date: Wed, 10 Jul 2024 11:38:37 +0200
Subject: [PATCH 3/5] fix testAdd with advanced options

---
 .../tower/cli/computeenvs/platforms/AltairPlatformTest.java   | 4 ++--
 .../tower/cli/computeenvs/platforms/EksPlatformTest.java      | 2 +-
 .../tower/cli/computeenvs/platforms/GkePlatformTest.java      | 2 +-
 .../computeenvs/platforms/GoogleLifeSciencesPlatformTest.java | 4 ++--
 .../tower/cli/computeenvs/platforms/K8sPlatformTest.java      | 4 ++--
 .../tower/cli/computeenvs/platforms/LsfPlatformTest.java      | 4 ++--
 .../tower/cli/computeenvs/platforms/MoabPlatformTest.java     | 2 +-
 .../tower/cli/computeenvs/platforms/SlurmPlatformTest.java    | 2 +-
 .../tower/cli/computeenvs/platforms/UnivaPlatformTest.java    | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
index 76368e0c..ba09b900 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/AltairPlatformTest.java
@@ -65,7 +65,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\",\"maxQueueSize\":200}}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"maxQueueSize\":200,\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -86,7 +86,7 @@ void testAddWithEnvVars(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"environment\":[{\"name\":\"HEAD\",\"value\":\"value1\",\"head\":true,\"compute\":false},{\"name\":\"COMPUTE\",\"value\":\"value2\",\"head\":false,\"compute\":true},{\"name\":\"BOTH\",\"value\":\"value3\",\"head\":true,\"compute\":true},{\"name\":\"HEAD\",\"value\":\"value4\",\"head\":true,\"compute\":false}],\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"altair\",\"platform\":\"altair-platform\",\"config\":{\"environment\":[{\"name\":\"HEAD\",\"value\":\"value1\",\"head\":true,\"compute\":false},{\"name\":\"COMPUTE\",\"value\":\"value2\",\"head\":false,\"compute\":true},{\"name\":\"BOTH\",\"value\":\"value3\",\"head\":true,\"compute\":true},{\"name\":\"HEAD\",\"value\":\"value4\",\"head\":true,\"compute\":false}],\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
index 15a240eb..1d48be45 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/EksPlatformTest.java
@@ -66,7 +66,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"eks\",\"platform\":\"eks-platform\",\"config\":{\"region\":\"europe\",\"clusterName\":\"tower\",\"workDir\":\"/workdir\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"eks\",\"platform\":\"eks-platform\",\"config\":{\"workDir\":\"/workdir\",\"region\":\"europe\",\"clusterName\":\"tower\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
index ae912313..769b4858 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GkePlatformTest.java
@@ -67,7 +67,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"gke\",\"platform\":\"gke-platform\",\"config\":{\"region\":\"europe\",\"clusterName\":\"tower\",\"workDir\":\"/workdir\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"gke\",\"platform\":\"gke-platform\",\"config\":{\"workDir\":\"/workdir\",\"region\":\"europe\",\"clusterName\":\"tower\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
index fbd6eb46..636f4ec7 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleLifeSciencesPlatformTest.java
@@ -67,7 +67,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\",\"usePrivateAddress\":true},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\",\"usePrivateAddress\":true}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -89,7 +89,7 @@ void testAddWithFileStore(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\",\"nfsTarget\":\"1.2.3.4:/my_share_name\"},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"google\",\"platform\":\"google-lifesciences\",\"config\":{\"region\":\"europe\",\"workDir\":\"gs://workdir\",\"nfsTarget\":\"1.2.3.4:/my_share_name\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
index 6b6aeea4..355f1809 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/K8sPlatformTest.java
@@ -67,7 +67,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"},\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\",\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\",\"storageMountPath\":\"/workdir\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
@@ -89,7 +89,7 @@ void testAddWithStaging(MockServerClient mock) throws IOException {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"preRunScript\":\"pre_run_me\",\"postRunScript\":\"post_run_me\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"},\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2iEjbUUbqbuOaQEx03OxyH\",\"name\":\"k8s\",\"platform\":\"k8s-platform\",\"config\":{\"workDir\":\"/workdir\",\"preRunScript\":\"pre_run_me\",\"postRunScript\":\"post_run_me\",\"server\":\"k8s.mydomain.net\",\"sslCert\":\"ssl_cert\",\"namespace\":\"nf\",\"headServiceAccount\":\"head\",\"storageClaimName\":\"nf\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
index 25ef21a1..2185f03b 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/LsfPlatformTest.java
@@ -38,7 +38,7 @@ class LsfPlatformTest extends BaseCmdTest {
     @ParameterizedTest
     @EnumSource(OutputType.class)
     void testAdd(OutputType format, MockServerClient mock) {
-        mock.openUI();
+
         mock.when(
                 request().withMethod("GET").withPath("/credentials").withQueryStringParameter("platformId", "lsf-platform"), exactly(1)
         ).respond(
@@ -66,7 +66,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"lsf\",\"platform\":\"lsf-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\",\"maxQueueSize\":200},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"lsf\",\"platform\":\"lsf-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"maxQueueSize\":200,\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
index 6d19bd87..48594539 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/MoabPlatformTest.java
@@ -65,7 +65,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"moab\",\"platform\":\"moab-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\",\"maxQueueSize\":200},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"moab\",\"platform\":\"moab-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"maxQueueSize\":200,\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
index 865811d2..edff408c 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/SlurmPlatformTest.java
@@ -65,7 +65,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"slurm\",\"platform\":\"slurm-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\",\"maxQueueSize\":200},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"slurm\",\"platform\":\"slurm-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"maxQueueSize\":200,\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
index f1122d8c..9cb7663d 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/UnivaPlatformTest.java
@@ -65,7 +65,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) {
         );
 
         mock.when(
-                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"name\":\"uge\",\"platform\":\"uge-platform\",\"config\":{\"workDir\":\"/home/jordeu/nf\",\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"headQueue\":\"normal\",\"maxQueueSize\":200},\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\"}}"), exactly(1)
+                request().withMethod("POST").withPath("/compute-envs").withBody("{\"computeEnv\":{\"credentialsId\":\"2ba2oekqeTEBzwSDgXg7xf\",\"name\":\"uge\",\"platform\":\"uge-platform\",\"config\":{\"userName\":\"jordi\",\"hostName\":\"ssh.mydomain.net\",\"maxQueueSize\":200,\"workDir\":\"/home/jordeu/nf\",\"headQueue\":\"normal\"}}}"), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );

From b9288c78fa885450a14fe7e76505b4579523cc65 Mon Sep 17 00:00:00 2001
From: Weronika Sosnowska <weronika.sosnowska@seqera.io>
Date: Wed, 10 Jul 2024 14:28:23 +0200
Subject: [PATCH 4/5] simplify imports and change name in reflect-config.json

---
 conf/reflect-config.json                                 | 8 ++++----
 .../seqera/tower/cli/commands/computeenvs/ExportCmd.java | 3 ++-
 .../seqera/tower/cli/commands/computeenvs/ImportCmd.java | 4 ++--
 .../cli/commands/computeenvs/add/AbstractAddCmd.java     | 9 +++++----
 .../commands/computeenvs/platforms/AbstractPlatform.java | 8 ++++----
 .../commands/computeenvs/platforms/AltairPlatform.java   | 4 ++--
 .../computeenvs/platforms/AwsBatchForgePlatform.java     | 4 ++--
 .../computeenvs/platforms/AzBatchForgePlatform.java      | 4 ++--
 .../platforms/GoogleLifeSciencesPlatform.java            | 4 ++--
 .../cli/commands/computeenvs/platforms/Platform.java     | 4 ++--
 .../commands/computeenvs/platforms/UnivaPlatform.java    | 4 ++--
 .../seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java | 6 +++---
 12 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/conf/reflect-config.json b/conf/reflect-config.json
index e27a0020..132bc06a 100644
--- a/conf/reflect-config.json
+++ b/conf/reflect-config.json
@@ -2178,14 +2178,14 @@
   "allDeclaredMethods":true
 },
 {
-  "name":"io.seqera.tower.model.ComputeEnv",
+  "name":"io.seqera.tower.model.ComputeEnvComputeConfig",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getConfig","parameterTypes":[] }, {"name":"getCredentialsId","parameterTypes":[] }, {"name":"getDateCreated","parameterTypes":[] }, {"name":"getDeleted","parameterTypes":[] }, {"name":"getDescription","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getLastUpdated","parameterTypes":[] }, {"name":"getLastUsed","parameterTypes":[] }, {"name":"getMessage","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getOrgId","parameterTypes":[] }, {"name":"getPlatform","parameterTypes":[] }, {"name":"getPrimary","parameterTypes":[] }, {"name":"getStatus","parameterTypes":[] }, {"name":"getWorkspaceId","parameterTypes":[] }, {"name":"setConfig","parameterTypes":["io.seqera.tower.model.ComputeConfig"] }, {"name":"setCredentialsId","parameterTypes":["java.lang.String"] }, {"name":"setDescription","parameterTypes":["java.lang.String"] }, {"name":"setMessage","parameterTypes":["java.lang.String"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setPlatform","parameterTypes":["io.seqera.tower.model.ComputeEnv$PlatformEnum"] }, {"name":"setStatus","parameterTypes":["io.seqera.tower.model.ComputeEnvStatus"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getConfig","parameterTypes":[] }, {"name":"getCredentialsId","parameterTypes":[] }, {"name":"getDateCreated","parameterTypes":[] }, {"name":"getDeleted","parameterTypes":[] }, {"name":"getDescription","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getLastUpdated","parameterTypes":[] }, {"name":"getLastUsed","parameterTypes":[] }, {"name":"getMessage","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getOrgId","parameterTypes":[] }, {"name":"getPlatform","parameterTypes":[] }, {"name":"getPrimary","parameterTypes":[] }, {"name":"getStatus","parameterTypes":[] }, {"name":"getWorkspaceId","parameterTypes":[] }, {"name":"setConfig","parameterTypes":["io.seqera.tower.model.ComputeConfig"] }, {"name":"setCredentialsId","parameterTypes":["java.lang.String"] }, {"name":"setDescription","parameterTypes":["java.lang.String"] }, {"name":"setMessage","parameterTypes":["java.lang.String"] }, {"name":"setName","parameterTypes":["java.lang.String"] }, {"name":"setPlatform","parameterTypes":["io.seqera.tower.model.ComputeEnvComputeConfig$PlatformEnum"] }, {"name":"setStatus","parameterTypes":["io.seqera.tower.model.ComputeEnvStatus"] }]
 },
 {
-  "name":"io.seqera.tower.model.ComputeEnv$PlatformEnum",
+  "name":"io.seqera.tower.model.ComputeEnvComputeConfig$PlatformEnum",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "methods":[{"name":"fromValue","parameterTypes":["java.lang.String"] }, {"name":"getValue","parameterTypes":[] }]
@@ -3084,7 +3084,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setComputeEnv","parameterTypes":["io.seqera.tower.model.ComputeEnv"] }, {"name":"setConfigProfiles","parameterTypes":["java.util.List"] }, {"name":"setConfigText","parameterTypes":["java.lang.String"] }, {"name":"setDateCreated","parameterTypes":["java.time.OffsetDateTime"] }, {"name":"setEntryName","parameterTypes":["java.lang.String"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setId","parameterTypes":["java.lang.String"] }, {"name":"setMainScript","parameterTypes":["java.lang.String"] }, {"name":"setOptimizationId","parameterTypes":["java.lang.String"] }, {"name":"setOptimizationTargets","parameterTypes":["java.lang.String"] }, {"name":"setParamsText","parameterTypes":["java.lang.String"] }, {"name":"setPipeline","parameterTypes":["java.lang.String"] }, {"name":"setPipelineId","parameterTypes":["java.lang.Long"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPullLatest","parameterTypes":["java.lang.Boolean"] }, {"name":"setResume","parameterTypes":["java.lang.Boolean"] }, {"name":"setResumeCommitId","parameterTypes":["java.lang.String"] }, {"name":"setResumeDir","parameterTypes":["java.lang.String"] }, {"name":"setRevision","parameterTypes":["java.lang.String"] }, {"name":"setSchemaName","parameterTypes":["java.lang.String"] }, {"name":"setSessionId","parameterTypes":["java.lang.String"] }, {"name":"setStubRun","parameterTypes":["java.lang.Boolean"] }, {"name":"setTowerConfig","parameterTypes":["java.lang.String"] }, {"name":"setUserSecrets","parameterTypes":["java.util.List"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }, {"name":"setWorkspaceSecrets","parameterTypes":["java.util.List"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setComputeEnv","parameterTypes":["io.seqera.tower.model.ComputeEnvComputeConfig"] }, {"name":"setConfigProfiles","parameterTypes":["java.util.List"] }, {"name":"setConfigText","parameterTypes":["java.lang.String"] }, {"name":"setDateCreated","parameterTypes":["java.time.OffsetDateTime"] }, {"name":"setEntryName","parameterTypes":["java.lang.String"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setId","parameterTypes":["java.lang.String"] }, {"name":"setMainScript","parameterTypes":["java.lang.String"] }, {"name":"setOptimizationId","parameterTypes":["java.lang.String"] }, {"name":"setOptimizationTargets","parameterTypes":["java.lang.String"] }, {"name":"setParamsText","parameterTypes":["java.lang.String"] }, {"name":"setPipeline","parameterTypes":["java.lang.String"] }, {"name":"setPipelineId","parameterTypes":["java.lang.Long"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPullLatest","parameterTypes":["java.lang.Boolean"] }, {"name":"setResume","parameterTypes":["java.lang.Boolean"] }, {"name":"setResumeCommitId","parameterTypes":["java.lang.String"] }, {"name":"setResumeDir","parameterTypes":["java.lang.String"] }, {"name":"setRevision","parameterTypes":["java.lang.String"] }, {"name":"setSchemaName","parameterTypes":["java.lang.String"] }, {"name":"setSessionId","parameterTypes":["java.lang.String"] }, {"name":"setStubRun","parameterTypes":["java.lang.Boolean"] }, {"name":"setTowerConfig","parameterTypes":["java.lang.String"] }, {"name":"setUserSecrets","parameterTypes":["java.util.List"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }, {"name":"setWorkspaceSecrets","parameterTypes":["java.util.List"] }]
 },
 {
   "name":"io.seqera.tower.model.WorkflowLoad",
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
index 0c24f24f..21a7279b 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ExportCmd.java
@@ -28,6 +28,7 @@
 import io.seqera.tower.cli.utils.FilesHelper;
 import io.seqera.tower.model.AwsBatchConfig;
 import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import picocli.CommandLine;
 
@@ -56,7 +57,7 @@ protected Response exec() throws ApiException {
         computeEnv.setDescription(ce.getDescription());
         computeEnv.setCredentialsId(ce.getCredentialsId());
         computeEnv.setMessage(ce.getMessage());
-        computeEnv.setPlatform(ce.getPlatform() != null ? ComputeEnvComputeConfig.PlatformEnum.fromValue(ce.getPlatform().getValue()) : null);
+        computeEnv.setPlatform(ce.getPlatform() != null ? PlatformEnum.fromValue(ce.getPlatform().getValue()) : null);
         computeEnv.setConfig(ce.getConfig());
 
         // Remove forged resources
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
index bdf18855..9e5c37eb 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/ImportCmd.java
@@ -25,7 +25,7 @@
 import io.seqera.tower.cli.responses.Response;
 import io.seqera.tower.cli.shared.ComputeEnvExportFormat;
 import io.seqera.tower.cli.utils.FilesHelper;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import picocli.CommandLine;
 
@@ -50,7 +50,7 @@ protected Response exec() throws ApiException, IOException {
 
         ComputeEnvExportFormat ceData = ComputeEnvExportFormat.deserialize(FilesHelper.readString(fileName));
 
-        ComputeEnvComputeConfig.PlatformEnum platform = ComputeEnvComputeConfig.PlatformEnum.fromValue(ceData.getConfig().getDiscriminator());
+        PlatformEnum platform = PlatformEnum.fromValue(ceData.getConfig().getDiscriminator());
 
         Long wspId = workspaceId(workspace.workspace);
 
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
index eb5e73a2..7bf57360 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/add/AbstractAddCmd.java
@@ -29,6 +29,7 @@
 import io.seqera.tower.cli.responses.computeenvs.ComputeEnvAdded;
 import io.seqera.tower.model.ComputeConfig;
 import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ComputeEnvStatus;
 import io.seqera.tower.model.CreateComputeEnvRequest;
 import io.seqera.tower.model.CreateComputeEnvResponse;
@@ -100,11 +101,11 @@ private ComputeEnvStatus checkComputeEnvStatus(String computeEnvId, Long workspa
         }
     }
 
-    protected ComputeEnvAdded addComputeEnv(ComputeEnvComputeConfig.PlatformEnum platform, ComputeConfig config) throws ApiException {
+    protected ComputeEnvAdded addComputeEnv(PlatformEnum platform, ComputeConfig config) throws ApiException {
         return addComputeEnvWithLabels(platform, config, labels);
     }
 
-    protected ComputeEnvAdded addComputeEnvWithLabels(ComputeEnvComputeConfig.PlatformEnum platform, ComputeConfig config, List<Label> labels) throws ApiException {
+    protected ComputeEnvAdded addComputeEnvWithLabels(PlatformEnum platform, ComputeConfig config, List<Label> labels) throws ApiException {
 
         Long wspId = workspaceId(workspace.workspace);
 
@@ -136,7 +137,7 @@ private List<Long> findLabels(Long wspId, List<Label> labels) throws ApiExceptio
         }
     }
 
-    private String credentialsByRef(ComputeEnvComputeConfig.PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
+    private String credentialsByRef(PlatformEnum type, Long wspId, String credentialsRef) throws ApiException {
         List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
 
         if (credentials.isEmpty()) {
@@ -157,7 +158,7 @@ private String credentialsByRef(ComputeEnvComputeConfig.PlatformEnum type, Long
         return cred.getId();
     }
 
-    private String findWorkspaceCredentials(ComputeEnvComputeConfig.PlatformEnum type, Long wspId) throws ApiException {
+    private String findWorkspaceCredentials(PlatformEnum type, Long wspId) throws ApiException {
         List<Credentials> credentials = api().listCredentials(wspId, type.getValue()).getCredentials();
         if (credentials.isEmpty()) {
             throw new TowerException("No valid credentials found at the workspace");
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
index 8e64ea18..2db9ad13 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AbstractPlatform.java
@@ -21,7 +21,7 @@
 import io.seqera.tower.api.DefaultApi;
 import io.seqera.tower.cli.utils.FilesHelper;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ConfigEnvVariable;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -43,9 +43,9 @@ public abstract class AbstractPlatform<T extends ComputeConfig> implements Platf
     @ArgGroup(heading = "%nEnvironment variables:%n", validate = false)
     public Environment environment;
 
-    private ComputeEnvComputeConfig.PlatformEnum type;
+    private PlatformEnum type;
 
-    public AbstractPlatform(ComputeEnvComputeConfig.PlatformEnum type) {
+    public AbstractPlatform(PlatformEnum type) {
         this.type = type;
     }
 
@@ -90,7 +90,7 @@ protected List<ConfigEnvVariable> environmentVariables() {
         return vars;
     }
 
-    public ComputeEnvComputeConfig.PlatformEnum type() {
+    public PlatformEnum type() {
         return type;
     }
 
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
index cf756889..0088c566 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AltairPlatform.java
@@ -19,7 +19,7 @@
 
 import io.seqera.tower.ApiException;
 import io.seqera.tower.model.AltairPbsComputeConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
 
@@ -49,7 +49,7 @@ public class AltairPlatform extends AbstractPlatform<AltairPbsComputeConfig> {
     public AdvancedOptions adv;
 
     public AltairPlatform() {
-        super(ComputeEnvComputeConfig.PlatformEnum.ALTAIR_PLATFORM);
+        super(PlatformEnum.ALTAIR_PLATFORM);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
index 13319ce2..923bb2dd 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AwsBatchForgePlatform.java
@@ -20,7 +20,7 @@
 import io.seqera.tower.ApiException;
 import io.seqera.tower.cli.exceptions.TowerException;
 import io.seqera.tower.model.AwsBatchConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ForgeConfig;
 import io.seqera.tower.model.ForgeConfig.AllocStrategyEnum;
 import io.seqera.tower.model.ForgeConfig.TypeEnum;
@@ -76,7 +76,7 @@ public class AwsBatchForgePlatform extends AbstractPlatform<AwsBatchConfig> {
     public AdvancedOptions adv;
 
     public AwsBatchForgePlatform() {
-        super(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH);
+        super(PlatformEnum.AWS_BATCH);
     }
 
     /**
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
index b12da6e1..046f11f1 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/AzBatchForgePlatform.java
@@ -22,7 +22,7 @@
 import io.seqera.tower.cli.exceptions.CredentialsNotFoundException;
 import io.seqera.tower.model.AzBatchConfig;
 import io.seqera.tower.model.AzBatchForgeConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.Credentials;
 import io.seqera.tower.model.JobCleanupPolicy;
 import picocli.CommandLine.ArgGroup;
@@ -63,7 +63,7 @@ public class AzBatchForgePlatform extends AbstractPlatform<AzBatchConfig> {
     public AdvancedOptions adv;
 
     public AzBatchForgePlatform() {
-        super(ComputeEnvComputeConfig.PlatformEnum.AZURE_BATCH);
+        super(PlatformEnum.AZURE_BATCH);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
index 8150fd5f..2df8f43e 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleLifeSciencesPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.GoogleLifeSciencesConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -46,7 +46,7 @@ public class GoogleLifeSciencesPlatform extends AbstractPlatform<GoogleLifeScien
     public AdvancedOptions adv;
 
     public GoogleLifeSciencesPlatform() {
-        super(ComputeEnvComputeConfig.PlatformEnum.GOOGLE_LIFESCIENCES);
+        super(PlatformEnum.GOOGLE_LIFESCIENCES);
     }
 
     @Override
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
index fe2c1718..01c125b3 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/Platform.java
@@ -20,13 +20,13 @@
 import io.seqera.tower.ApiException;
 import io.seqera.tower.api.DefaultApi;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 
 import java.io.IOException;
 
 public interface Platform {
 
-    ComputeEnvComputeConfig.PlatformEnum type();
+    PlatformEnum type();
 
     ComputeConfig computeConfig(Long workspaceId, DefaultApi api) throws ApiException, IOException;
 }
diff --git a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
index 8d7af7fb..58d14da1 100644
--- a/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
+++ b/src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/UnivaPlatform.java
@@ -18,7 +18,7 @@
 package io.seqera.tower.cli.commands.computeenvs.platforms;
 
 import io.seqera.tower.ApiException;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.UnivaComputeConfig;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
@@ -49,7 +49,7 @@ public class UnivaPlatform extends AbstractPlatform<UnivaComputeConfig> {
     public AdvancedOptions adv;
 
     public UnivaPlatform() {
-        super(ComputeEnvComputeConfig.PlatformEnum.UGE_PLATFORM);
+        super(PlatformEnum.UGE_PLATFORM);
     }
 
     @Override
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
index dc7cc3c3..b4d5ace1 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/ComputeEnvsCmdTest.java
@@ -38,7 +38,7 @@
 import io.seqera.tower.cli.responses.computeenvs.ComputeEnvsPrimarySet;
 import io.seqera.tower.model.AwsBatchConfig;
 import io.seqera.tower.model.ComputeConfig;
-import io.seqera.tower.model.ComputeEnvComputeConfig;
+import io.seqera.tower.model.ComputeEnvComputeConfig.PlatformEnum;
 import io.seqera.tower.model.ComputeEnvResponseDto;
 import io.seqera.tower.model.ComputeEnvStatus;
 import io.seqera.tower.model.ForgeConfig;
@@ -409,7 +409,7 @@ void testImport(OutputType format, MockServerClient mock) throws IOException {
         );
 
         ExecOut out = exec(format, mock, "compute-envs", "import", tempFile(new String(loadResource("cejson"), StandardCharsets.UTF_8), "ce", "json"), "-n", "json", "-c", "6g0ER59L4ZoE5zpOmUP48D");
-        assertOutput(format, out, new ComputeEnvAdded(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "json", null, USER_WORKSPACE_NAME));
+        assertOutput(format, out, new ComputeEnvAdded(PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "json", null, USER_WORKSPACE_NAME));
     }
 
     @ParameterizedTest
@@ -508,7 +508,7 @@ void testImportWithOverwrite(OutputType format, MockServerClient mock) throws IO
         );
 
         ExecOut out = exec(format, mock, "compute-envs", "import", "--overwrite", tempFile(new String(loadResource("cejson"), StandardCharsets.UTF_8), "ce", "json"), "-n", "demo", "-c", "6g0ER59L4ZoE5zpOmUP48D");
-        assertOutput(format, out, new ComputeEnvAdded(ComputeEnvComputeConfig.PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "demo", null, USER_WORKSPACE_NAME));
+        assertOutput(format, out, new ComputeEnvAdded(PlatformEnum.AWS_BATCH.getValue(), "3T6xWeFD63QIuzdAowvSTC", "demo", null, USER_WORKSPACE_NAME));
     }
 
     @ParameterizedTest

From 6303e14f67107488396c90a908eea8bd33527e1a Mon Sep 17 00:00:00 2001
From: Weronika Sosnowska <weronika.sosnowska@seqera.io>
Date: Wed, 10 Jul 2024 16:42:11 +0200
Subject: [PATCH 5/5] Add missing methods for GoogleBatchConfig to
 reflect-config.json

---
 conf/reflect-config.json                                        | 2 +-
 .../cli/computeenvs/platforms/GoogleBatchPlatformTest.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/reflect-config.json b/conf/reflect-config.json
index 132bc06a..52d3eb06 100644
--- a/conf/reflect-config.json
+++ b/conf/reflect-config.json
@@ -2559,7 +2559,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getBootDiskSizeGb","parameterTypes":[] }, {"name":"getCopyImage","parameterTypes":[] }, {"name":"getCpuPlatform","parameterTypes":[] }, {"name":"getDebugMode","parameterTypes":[] }, {"name":"getDiscriminator","parameterTypes":[] }, {"name":"getEnvironment","parameterTypes":[] }, {"name":"getFusion2Enabled","parameterTypes":[] }, {"name":"getHeadJobCpus","parameterTypes":[] }, {"name":"getHeadJobMemoryMb","parameterTypes":[] }, {"name":"getLabels","parameterTypes":[] }, {"name":"getLocation","parameterTypes":[] }, {"name":"getMachineType","parameterTypes":[] }, {"name":"getNetwork","parameterTypes":[] }, {"name":"getNfsMount","parameterTypes":[] }, {"name":"getNfsTarget","parameterTypes":[] }, {"name":"getPostRunScript","parameterTypes":[] }, {"name":"getPreRunScript","parameterTypes":[] }, {"name":"getProjectId","parameterTypes":[] }, {"name":"getServiceAccount","parameterTypes":[] }, {"name":"getSpot","parameterTypes":[] }, {"name":"getSshDaemon","parameterTypes":[] }, {"name":"getSshImage","parameterTypes":[] }, {"name":"getSubnetwork","parameterTypes":[] }, {"name":"getUsePrivateAddress","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"getWorkDir","parameterTypes":[] }, {"name":"setBootDiskSizeGb","parameterTypes":["java.lang.Integer"] }, {"name":"setCopyImage","parameterTypes":["java.lang.String"] }, {"name":"setCpuPlatform","parameterTypes":["java.lang.String"] }, {"name":"setDebugMode","parameterTypes":["java.lang.Integer"] }, {"name":"setEnvironment","parameterTypes":["java.util.List"] }, {"name":"setFusion2Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setLabels","parameterTypes":["java.util.Map"] }, {"name":"setLocation","parameterTypes":["java.lang.String"] }, {"name":"setMachineType","parameterTypes":["java.lang.String"] }, {"name":"setNetwork","parameterTypes":["java.lang.String"] }, {"name":"setNfsMount","parameterTypes":["java.lang.String"] }, {"name":"setNfsTarget","parameterTypes":["java.lang.String"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setProjectId","parameterTypes":["java.lang.String"] }, {"name":"setServiceAccount","parameterTypes":["java.lang.String"] }, {"name":"setSpot","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshDaemon","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshImage","parameterTypes":["java.lang.String"] }, {"name":"setSubnetwork","parameterTypes":["java.lang.String"] }, {"name":"setUsePrivateAddress","parameterTypes":["java.lang.Boolean"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getBootDiskSizeGb","parameterTypes":[] }, {"name":"getCopyImage","parameterTypes":[] }, {"name":"getCpuPlatform","parameterTypes":[] }, {"name":"getDebugMode","parameterTypes":[] }, {"name":"getDiscriminator","parameterTypes":[] }, {"name":"getEnvironment","parameterTypes":[] }, {"name":"getFusion2Enabled","parameterTypes":[] }, {"name":"getHeadJobCpus","parameterTypes":[] }, {"name":"getHeadJobMemoryMb","parameterTypes":[] }, {"name":"getLabels","parameterTypes":[] }, {"name":"getLocation","parameterTypes":[] }, {"name":"getMachineType","parameterTypes":[] }, {"name":"getNetwork","parameterTypes":[] }, {"name":"getNfsMount","parameterTypes":[] }, {"name":"getNfsTarget","parameterTypes":[] }, {"name":"getPostRunScript","parameterTypes":[] }, {"name":"getPreRunScript","parameterTypes":[] }, {"name":"getProjectId","parameterTypes":[] }, {"name":"getServiceAccount","parameterTypes":[] }, {"name":"getSpot","parameterTypes":[] }, {"name":"getSshDaemon","parameterTypes":[] }, {"name":"getSshImage","parameterTypes":[] }, {"name":"getSubnetwork","parameterTypes":[] }, {"name":"getUsePrivateAddress","parameterTypes":[] }, {"name":"getWaveEnabled","parameterTypes":[] }, {"name":"getWorkDir","parameterTypes":[] }, {"name":"getHeadJobInstanceTemplate","parameterTypes":[] }, {"name":"getComputeJobsInstanceTemplate","parameterTypes":[] }, {"name":"getLaunchDir","parameterTypes":[] }, {"name":"getUserName","parameterTypes":[] }, {"name":"getHostName","parameterTypes":[] }, {"name":"getPort","parameterTypes":[] }, {"name":"getMaxQueueSize","parameterTypes":[] }, {"name":"getHeadJobOptions","parameterTypes":[] }, {"name":"getPropagateHeadJobOptions","parameterTypes":[] }, {"name":"setBootDiskSizeGb","parameterTypes":["java.lang.Integer"] }, {"name":"setCopyImage","parameterTypes":["java.lang.String"] }, {"name":"setCpuPlatform","parameterTypes":["java.lang.String"] }, {"name":"setDebugMode","parameterTypes":["java.lang.Integer"] }, {"name":"setEnvironment","parameterTypes":["java.util.List"] }, {"name":"setFusion2Enabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setHeadJobCpus","parameterTypes":["java.lang.Integer"] }, {"name":"setHeadJobMemoryMb","parameterTypes":["java.lang.Integer"] }, {"name":"setLabels","parameterTypes":["java.util.Map"] }, {"name":"setLocation","parameterTypes":["java.lang.String"] }, {"name":"setMachineType","parameterTypes":["java.lang.String"] }, {"name":"setNetwork","parameterTypes":["java.lang.String"] }, {"name":"setNfsMount","parameterTypes":["java.lang.String"] }, {"name":"setNfsTarget","parameterTypes":["java.lang.String"] }, {"name":"setPostRunScript","parameterTypes":["java.lang.String"] }, {"name":"setPreRunScript","parameterTypes":["java.lang.String"] }, {"name":"setProjectId","parameterTypes":["java.lang.String"] }, {"name":"setServiceAccount","parameterTypes":["java.lang.String"] }, {"name":"setSpot","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshDaemon","parameterTypes":["java.lang.Boolean"] }, {"name":"setSshImage","parameterTypes":["java.lang.String"] }, {"name":"setSubnetwork","parameterTypes":["java.lang.String"] }, {"name":"setUsePrivateAddress","parameterTypes":["java.lang.Boolean"] }, {"name":"setWaveEnabled","parameterTypes":["java.lang.Boolean"] }, {"name":"setWorkDir","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"io.seqera.tower.model.GoogleLifeSciencesConfig",
diff --git a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleBatchPlatformTest.java b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleBatchPlatformTest.java
index 41104650..ec194867 100644
--- a/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleBatchPlatformTest.java
+++ b/src/test/java/io/seqera/tower/cli/computeenvs/platforms/GoogleBatchPlatformTest.java
@@ -74,7 +74,7 @@ void testAddWithAdvancedOptions(MockServerClient mock) throws IOException {
 
         mock.when(
                 request().withMethod("POST").withPath("/compute-envs")
-                        .withBody(JsonBody.json("{\"computeEnv\":{\"name\":\"google\",\"platform\":\"google-batch\",\"config\":{\"location\":\"europe\",\"fusion2Enabled\":true,\"waveEnabled\":true,\"workDir\":\"gs://workdir\",\"usePrivateAddress\":true},\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\"}}")), exactly(1)
+                        .withBody(JsonBody.json("{\"computeEnv\":{\"credentialsId\":\"6XfOhoztUq6de3Dw3X9LSb\",\"name\":\"google\",\"platform\":\"google-batch\",\"config\":{\"location\":\"europe\",\"workDir\":\"gs://workdir\",\"usePrivateAddress\":true,\"waveEnabled\":true,\"fusion2Enabled\":true}}}")), exactly(1)
         ).respond(
                 response().withStatusCode(200).withBody("{\"computeEnvId\":\"isnEDBLvHDAIteOEF44ow\"}").withContentType(MediaType.APPLICATION_JSON)
         );