Improve wave logging

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>

plugins/nf-wave/src/main/io/seqera/wave/plugin/ContainerLayer.groovy

@@ -19,16 +19,13 @@ package io.seqera.wave.plugin
 
 import groovy.transform.Canonical
 import groovy.transform.CompileStatic
-import groovy.transform.ToString
 import nextflow.util.CacheHelper
-
 /**
  * Model a container layer meta-info
  *
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
 @Canonical
-@ToString(includeNames = true, includePackage = false)
 @CompileStatic
 class ContainerLayer {
     /**
@@ -72,4 +69,18 @@ class ContainerLayer {
         allMeta.add( tarDigest ?: 'no-tarDigest')
         return CacheHelper.hasher(allMeta).hash().toString()
     }
+
+    @Override
+    String toString() {
+        final loc = toStringLocation0(location)
+        return "ContainerLayer[location=${loc}; tarDigest=$tarDigest; gzipDigest=$gzipDigest; gzipSize=$gzipSize]"
+    }
+
+    private String toStringLocation0(String location){
+        if( !location || !location.startsWith('data:') )
+            return location
+        return location.length()>25
+                ? location.substring(0,25) + '...'
+                : location
+    }
 }

plugins/nf-wave/src/test/io/seqera/wave/plugin/ContainerLayerTest.groovy

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2020-2022, Seqera Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.seqera.wave.plugin
+
+import spock.lang.Specification
+
+/**
+ *
+ * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
+ */
+class ContainerLayerTest extends Specification {
+
+    def 'should convert to string' () {
+        when:
+        def l1 = new ContainerLayer( 'data:ABC1234567890', 'sha256:12345', 100, 'sha256:67890' )
+        then:
+        l1.toString() == 'ContainerLayer[location=data:ABC1234567890; tarDigest=sha256:67890; gzipDigest=sha256:12345; gzipSize=100]'
+
+        when:
+        def l2 = new ContainerLayer( 'data:12345678901234567890', 'sha256:12345', 100, 'sha256:67890' )
+        then:
+        l2.toString() == 'ContainerLayer[location=data:12345678901234567890; tarDigest=sha256:67890; gzipDigest=sha256:12345; gzipSize=100]'
+
+        when:
+        def l3= new ContainerLayer( 'data:12345678901234567890x', 'sha256:12345', 100, 'sha256:67890' )
+        then:
+        l3.toString() == 'ContainerLayer[location=data:12345678901234567890...; tarDigest=sha256:67890; gzipDigest=sha256:12345; gzipSize=100]'
+
+    }
+
+
+}