added --label option

app/src/main/java/io/seqera/wave/cli/App.java

@@ -66,8 +66,20 @@
 import io.seqera.wave.util.Packer;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
+
 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;
+import static io.seqera.wave.util.DockerHelper.condaFileToDockerFile;
+import static io.seqera.wave.util.DockerHelper.condaFileToSingularityFile;
+import static io.seqera.wave.util.DockerHelper.condaPackagesToDockerFile;
+import static io.seqera.wave.util.DockerHelper.condaPackagesToSingularityFile;
+import static io.seqera.wave.util.DockerHelper.spackFileToDockerFile;
+import static io.seqera.wave.util.DockerHelper.spackFileToSingularityFile;
+import static io.seqera.wave.util.DockerHelper.spackPackagesToSpackFile;
 import static io.seqera.wave.cli.util.StreamHelper.tryReadStdin;
 import static picocli.CommandLine.Command;
 import static picocli.CommandLine.Option;
@@ -133,6 +145,9 @@ public class App implements Runnable {
     @Option(names = {"--config-env"}, paramLabel = "''",  description = "Overwrite the environment of the image e.g. NAME=VALUE")
     private List<String> environment;
 
+    @Option(names = {"--config-label"}, paramLabel = "false", description = "Add one or more labels to the container image, e.g. KEY=VALUE.")
+    private List<String> labels;
+
     @Option(names = {"--config-cmd"}, paramLabel = "''", description = "Overwrite the default CMD (command) of the image.")
     private String command;
 
@@ -400,6 +415,7 @@ protected Client client() {
     }
 
     protected SubmitContainerTokenRequest createRequest() {
+
         return new SubmitContainerTokenRequest()
                 .withContainerImage(image)
                 .withContainerFile(containerFileBase64())
@@ -539,6 +555,14 @@ protected ContainerConfig prepareConfig() {
             result.env = environment;
         }
 
+        //add labels if specified
+        if( labels!=null ) {
+            for( String it : labels) {
+                if( !isLabel(it) ) throw new IllegalCliArgumentException("Invalid container image label syntax - offending value: " + it);
+            }
+            result.labels = labels;
+        }
+
         //add the working directory if specified
         if( workingDir != null ){
             if( "".equals(workingDir.trim()) ) throw new IllegalCliArgumentException("The working directory cannot be empty string");

app/src/main/java/io/seqera/wave/cli/util/Checkers.java

@@ -26,6 +26,7 @@
 public class Checkers {
 
     private static final Pattern ENV_REGEX = Pattern.compile("^[A-Za-z_][A-Za-z0-9_]*=.*$");
+    private static final Pattern LABEL_REGEX = Pattern.compile("^[a-z][a-z0-9.-]*[a-z0-9]=.*$");
 
     static public boolean isEmpty(String value) {
         return value==null || "".equals(value.trim());
@@ -38,4 +39,8 @@ static public boolean isEmpty(List list) {
     static public boolean isEnvVar(String value) {
         return value!=null && ENV_REGEX.matcher(value).matches();
     }
+
+    static public boolean isLabel(String value) {
+        return value!=null && LABEL_REGEX.matcher(value).matches();
+    }
 }

app/src/test/groovy/io/seqera/wave/cli/AppTest.groovy

@@ -17,6 +17,7 @@
 
 package io.seqera.wave.cli
 
+import io.seqera.wave.api.ContainerConfig
 import io.seqera.wave.cli.util.DurationConverter
 
 import java.nio.file.Files
@@ -278,6 +279,28 @@ class AppTest extends Specification {
         app.@towerToken == 'xyz'
     }
 
+    def "test valid labels"(){
+        given:
+        def app = new App()
+        String[] args = ["--config-label", "key1=value1","--config-label", "key2=this value2", "--config-label", "[email protected]"]
+
+        when:
+        new CommandLine(app).parseArgs(args)
+        then:
+        app.@labels[0] == "key1=value1"
+        app.@labels[1] == "key2=this value2"
+        app.@labels[2] == "[email protected]"
+
+        when:
+        def config = app.prepareConfig()
+        then:
+        config.labels == [
+                "key1=value1",
+                "key2=this value2",
+                "[email protected]"
+        ]
+    }
+
     def 'should get the correct await duration in minutes'(){
         given:
         def app = new App()