Fix tests

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

Author: pditommaso

app/conf/reflect-config.json

@@ -266,7 +266,7 @@
 },
 {
   "name":"io.seqera.wave.api.PackagesSpec$Type",
-  "fields":[{"name":"CONDA"}]
+  "fields":[{"name":"CONDA"}, {"name":"SPACK"}]
 },
 {
   "name":"io.seqera.wave.api.ScanLevel",
@@ -365,6 +365,11 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.wave.config.SpackOpts",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"io.seqera.wave.core.spec.ConfigSpec",
   "allDeclaredFields":true,

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

@@ -57,6 +57,7 @@
 import io.seqera.wave.config.CondaOpts;
 import io.seqera.wave.util.DockerIgnoreFilter;
 import io.seqera.wave.util.Packer;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import static io.seqera.wave.cli.util.Checkers.isEmpty;
@@ -441,7 +442,7 @@ public void run() {
         SubmitContainerTokenResponse resp = client.submit(request);
         // await build to be completed
         if( await != null && resp.status!=null && resp.status!=ContainerStatus.DONE ) {
-            ContainerStatusResponse status = client.awaitReadiness(resp.requestId, await);
+            ContainerStatusResponse status = client.awaitCompletion(resp.requestId, await);
             // print the wave container name
             System.out.println(dumpOutput(new SubmitContainerTokenResponseEx(resp, status)));
         }
@@ -620,6 +621,18 @@ protected PackagesSpec packagesSpec() {
         return null;
     }
 
+    protected String dumpOutput(SubmitContainerTokenResponseEx resp) {
+        if( outputFormat==null && !resp.succeeded ) {
+            String message = "Container provisioning did not complete successfully";
+            if( !StringUtils.isEmpty(resp.reason) )
+                message += "\n- Reason: " + resp.reason;
+            if( !StringUtils.isEmpty(resp.detailsUri) )
+                message += "\n- Find out more here: " + resp.detailsUri;
+            throw new BadClientResponseException(message);
+        }
+        return dumpOutput((SubmitContainerTokenResponse)resp);
+    }
+
     protected String dumpOutput(SubmitContainerTokenResponse resp) {
         if( "yaml".equals(outputFormat) ) {
             return YamlHelper.toYaml(resp);

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

@@ -199,7 +199,7 @@ protected URI imageToManifestUri(String image) {
         return URI.create(result);
     }
 
-    ContainerStatusResponse awaitReadiness(String requestId, Duration await) {
+    ContainerStatusResponse awaitCompletion(String requestId, Duration await) {
         if( StringUtils.isEmpty(requestId) )
             throw new IllegalArgumentException("Argument 'requestId' cannot be empty");
         log.debug("Waiting for build completion: {} - timeout: {} Seconds", requestId, await.toSeconds());

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

@@ -27,6 +27,7 @@ import io.seqera.wave.api.ImageNameStrategy
 import io.seqera.wave.api.ScanLevel
 import io.seqera.wave.api.ScanMode
 import io.seqera.wave.api.SubmitContainerTokenResponse
+import io.seqera.wave.cli.exception.BadClientResponseException
 import io.seqera.wave.cli.exception.IllegalCliArgumentException
 import io.seqera.wave.cli.model.ContainerInspectResponseEx
 import io.seqera.wave.cli.model.SubmitContainerTokenResponseEx
@@ -134,6 +135,45 @@ class AppTest extends Specification {
             '''.stripIndent(true)
     }
 
+    def 'should throw exception on failure' (){
+        given:
+        def app = new App()
+        String[] args = []
+        and:
+        def resp = new SubmitContainerTokenResponse(
+                containerToken: "12345",
+                targetImage: 'docker.io/some/repo',
+                containerImage: 'docker.io/some/container',
+                expiration: Instant.ofEpochMilli(1691839913),
+                buildId: '98765',
+                cached: false
+        )
+        def status = new ContainerStatusResponse(
+                "12345",
+                ContainerStatus.DONE,
+                "98765",
+                null,
+                "scan-1234",
+                [MEDIUM:1, HIGH:2],
+                false,
+                "Something went wrong",
+                "http://foo.com/bar/1234",
+                Instant.now(),
+                Duration.ofMinutes(1)
+        )
+
+        when:
+        new CommandLine(app).parseArgs(args)
+        app.dumpOutput(new SubmitContainerTokenResponseEx(resp, status))
+        then:
+        def e = thrown(BadClientResponseException)
+        e.message == '''\
+            Container provisioning did not complete successfully
+            - Reason: Something went wrong
+            - Find out more here: http://foo.com/bar/1234\
+            '''.stripIndent()
+    }
+
     def 'should dump response to json' () {
         given:
         def app = new App()