Fix tests

Signed-off-by: Paolo Di Tommaso <[email protected]>

Author: pditommaso

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

@@ -186,10 +186,10 @@ public class App implements Runnable {
     @Option(names = {"--name-strategy"}, paramLabel = "false", description = "Specify the name strategy for the container name, it can be 'none' or 'tagPrefix' or 'imageSuffix'", hidden = true)
     private ImageNameStrategy nameStrategy;
 
-    @Option(names = {"--mirror-to"}, paramLabel = "false", description = "Specify registry where the container should be mirrored e.g. 'docker.io'")
-    private String mirrorToRegistry;
+    @Option(names = {"-m","--mirror-registry"}, paramLabel = "false", description = "Specify registry where the container should be mirrored e.g. 'docker.io'")
+    private String mirrorRegistry;
 
-    @Option(names = {"--scan-mode"}, paramLabel = "false", description = "Specify container security scan mode, it can be 'none', 'lazy' 'async' or 'sync'")
+    @Option(names = {"--scan-mode"}, paramLabel = "false", description = "Specify container security scan mode, it can be 'none', 'async' or 'required'")
     private ScanMode scanMode;
 
     @Option(names = {"--scan-level"}, paramLabel = "false", description = "Specify one or more security scan vulnerabilities level allowed in the container e.g. low,medium,high,critical")
@@ -354,26 +354,26 @@ protected void validateArgs() {
                 throw new IllegalCliArgumentException("Context path is not a directory - offending value: " + contextDir);
         }
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(containerFile) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --containerfile conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(containerFile) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --containerfile conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(condaFile) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --conda-file conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(condaFile) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --conda-file conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(condaPackages) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --conda-package conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(condaPackages) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --conda-package conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(contextDir) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --context conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(contextDir) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --context conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && freeze )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --freeze conflict each other");
+        if( !isEmpty(mirrorRegistry) && freeze )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --freeze conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(buildRepository) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --build-repository conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(buildRepository) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --build-repository conflict each other");
 
-        if( !isEmpty(mirrorToRegistry) && !isEmpty(cacheRepository) )
-            throw new IllegalCliArgumentException("Argument --mirror-to and --cache-repository conflict each other");
+        if( !isEmpty(mirrorRegistry) && !isEmpty(cacheRepository) )
+            throw new IllegalCliArgumentException("Argument --mirror-registry and --cache-repository conflict each other");
 
         if( dryRun && await != null )
             throw new IllegalCliArgumentException("Options --dry-run and --await conflicts each other");
@@ -406,7 +406,7 @@ protected SubmitContainerTokenRequest createRequest() {
                 .withDryRun(dryRun)
                 .withContainerIncludes(includes)
                 .withNameStrategy(nameStrategy)
-                .withMirrorRegistry(mirrorToRegistry)
+                .withMirrorRegistry(mirrorRegistry)
                 .withScanMode(scanMode)
                 .withScanLevels(scanLevels)
                 ;

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

@@ -100,11 +100,11 @@ class AppTest extends Specification {
         )
         def status = new ContainerStatusResponse(
                 "12345",
-                ContainerStatus.READY,
+                ContainerStatus.DONE,
                 "98765",
                 null,
                 "scan-1234",
-                [medium:1, high:2],
+                [MEDIUM:1, HIGH:2],
                 true,
                 "All ok",
                 "http://foo.com",
@@ -125,12 +125,12 @@ class AppTest extends Specification {
             duration: PT1M
             expiration: '1970-01-20T13:57:19.913Z'
             reason: All ok
-            status: READY
+            status: DONE
             succeeded: true
             targetImage: docker.io/some/repo
             vulnerabilities:
-              medium: 1
-              high: 2
+              MEDIUM: 1
+              HIGH: 2
             '''.stripIndent(true)
     }
 
@@ -257,15 +257,15 @@ class AppTest extends Specification {
     def 'should set scan levels' () {
         given:
         def app = new App()
-        String[] args = ["--scan-level", 'low', "--scan-level", 'medium']
+        String[] args = ["--scan-level", 'LOW', "--scan-level", 'MEDIUM']
 
         when:
         new CommandLine(app).parseArgs(args)
         and:
         def req = app.createRequest()
         then:
         req.scanMode == null
-        req.scanLevels == List.of(ScanLevel.low, ScanLevel.medium)
+        req.scanLevels == List.of(ScanLevel.LOW, ScanLevel.MEDIUM)
     }
 
     def 'should not allow dry-run and await' () {
@@ -470,7 +470,7 @@ class AppTest extends Specification {
     def 'should fail when specifying mirror registry and container file' () {
         given:
         def app = new App()
-        String[] args = ["--mirror-to", "docker.io", "-f", "foo"]
+        String[] args = ["--mirror-registry", "docker.io", "-f", "foo"]
 
         when:
         def cli = new CommandLine(app)
@@ -480,13 +480,13 @@ class AppTest extends Specification {
         then:
         def e = thrown(IllegalCliArgumentException)
         and:
-        e.getMessage() == "Argument --mirror-to and --containerfile conflict each other"
+        e.getMessage() == "Argument --mirror-registry and --containerfile conflict each other"
     }
 
     def 'should fail when specifying mirror registry and conda package' () {
         given:
         def app = new App()
-        String[] args = ["--mirror-to", "docker.io", "--conda-package", "foo"]
+        String[] args = ["--mirror-registry", "docker.io", "--conda-package", "foo"]
 
         when:
         def cli = new CommandLine(app)
@@ -496,13 +496,13 @@ class AppTest extends Specification {
         then:
         def e = thrown(IllegalCliArgumentException)
         and:
-        e.getMessage() == "Argument --mirror-to and --conda-package conflict each other"
+        e.getMessage() == "Argument --mirror-registry and --conda-package conflict each other"
     }
 
     def 'should fail when specifying mirror registry and freeze' () {
         given:
         def app = new App()
-        String[] args = ["--mirror-to", "docker.io", "--image", "foo", "--freeze"]
+        String[] args = ["--mirror-registry", "docker.io", "--image", "foo", "--freeze"]
 
         when:
         def cli = new CommandLine(app)
@@ -512,7 +512,7 @@ class AppTest extends Specification {
         then:
         def e = thrown(IllegalCliArgumentException)
         and:
-        e.getMessage() == "Argument --mirror-to and --freeze conflict each other"
+        e.getMessage() == "Argument --mirror-registry and --freeze conflict each other"
     }
 
 }