labels moved to ContainerConfig

Signed-off-by: munishchouhan <[email protected]>
seqeralabs · Mar 15, 2024 · 445b537 · 445b537
1 parent 8cd4d1a
commit 445b537
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java
@@ -58,7 +58,9 @@
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
-import static io.seqera.wave.cli.util.Checkers.*;
+import static io.seqera.wave.cli.util.Checkers.isEmpty;
+import static io.seqera.wave.cli.util.Checkers.isEnvVar;
+import static io.seqera.wave.cli.util.Checkers.isLabel;
 import static io.seqera.wave.util.DockerHelper.addPackagesToSpackFile;
 import static io.seqera.wave.util.DockerHelper.condaFileFromPackages;
 import static io.seqera.wave.util.DockerHelper.condaFileFromPath;
@@ -396,14 +398,7 @@ protected Client client() {
     }
 
     protected SubmitContainerTokenRequest createRequest() {
-        Map<String, String> labels = null;
-        if(label!=null){
-            labels = new HashMap<>();
-            for(String singleLabel: label){
-                String[]  singleLabelArray = singleLabel.split("=");
-                labels.put(singleLabelArray[0], singleLabelArray[1]);
-            }
-        }
+
         return new SubmitContainerTokenRequest()
                 .withContainerImage(image)
                 .withContainerFile(containerFileBase64())
@@ -422,7 +417,6 @@ protected SubmitContainerTokenRequest createRequest() {
                 .withFreezeMode(freeze)
                 .withDryRun(dryRun)
                 .withContainerIncludes(includes)
-                .withLabels(labels)
                 ;
     }
 
@@ -577,6 +571,16 @@ protected ContainerConfig prepareConfig() {
         if( size>=10 * _1MB )
             throw new RuntimeException("Compressed container layers cannot exceed 10 MiB");
 
+        Map<String, String> labels = null;
+        if(label!=null){
+            labels = new HashMap<>();
+            for(String singleLabel: label){
+                String[]  singleLabelArray = singleLabel.split("=");
+                labels.put(singleLabelArray[0], singleLabelArray[1]);
+            }
+        }
+
+        result.labels = labels;
         // return the result
         return !result.empty() ? result : null;
     }