Strengthen conda naming strategy

Signed-off-by: Paolo Di Tommaso <[email protected]>
seqeralabs · Dec 12, 2024 · d72b69c · d72b69c
1 parent b743c13
commit d72b69c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/main/groovy/io/seqera/wave/util/ContainerHelper.groovy b/src/main/groovy/io/seqera/wave/util/ContainerHelper.groovy
@@ -225,7 +225,7 @@ class ContainerHelper {
             return null
         }
         catch (Exception e) {
-            log.warn "Unable to infer conda recipe name - cause: ${e.message}", e
+            log.warn "Unable to infer conda recipe name - offending content:\n---\n${condaFileContent}", e
             return null
         }
     }

diff --git a/src/main/groovy/io/seqera/wave/util/NameVersionPair.groovy b/src/main/groovy/io/seqera/wave/util/NameVersionPair.groovy
@@ -33,8 +33,28 @@ class NameVersionPair {
     private static final String SUFFIX = 'pruned'
     private static final int MAX = 5
 
-    Collection<String> names
-    Collection<String> versions
+    private Collection<String> names
+
+    private Collection<String> versions
+
+    protected NameVersionPair() { }
+
+    NameVersionPair(Collection<String> names) {
+        this.names = names
+        if( names==null )
+            throw new IllegalArgumentException("Argument 'names' cannot be null")
+        if( !names )
+            throw new IllegalArgumentException("Argument 'names' cannot be empty")
+    }
+
+    NameVersionPair(Collection<String> names, Collection<String> versions) {
+        this(names)
+        this.versions = versions
+    }
+
+    Collection<String> getNames() { names }
+
+    Collection<String> getVersions() { versions }
 
     private List<String> both() {
         final result = new ArrayList()
@@ -46,8 +66,7 @@ class NameVersionPair {
     }
 
     String friendlyNames(String sep='_') {
-        if( !names )
-            return null
+        assert names
         if( names.size()<=MAX )
             return names.join(sep)
         else
@@ -63,4 +82,8 @@ class NameVersionPair {
         else
             return new ArrayList<>(ret)[0..MAX-2].join(sep) + sep + SUFFIX
     }
+
+    boolean asBoolean() {
+        return names
+    }
 }
diff --git a/src/test/groovy/io/seqera/wave/util/NameVersionPairTest.groovy b/src/test/groovy/io/seqera/wave/util/NameVersionPairTest.groovy
@@ -55,4 +55,12 @@ class NameVersionPairTest extends Specification {
         ['a','b','c','d','e','f']   | ['1','2','3','4','5'] | 'a_b_c_d_pruned'
     }
 
+    def 'should validate truth' () {
+        expect:
+        new NameVersionPair(names:['foo'])
+        and:
+        !new NameVersionPair(names:null)
+        !new NameVersionPair(names:[])
+    }
+
 }