Add wave mirror vs module bundles conflicst warning

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Oct 20, 2024 · b37a8a5 · b37a8a5
1 parent a69407d
commit b37a8a5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/ContainerConfig.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/ContainerConfig.groovy
@@ -29,7 +29,7 @@ import nextflow.util.CacheHelper
  */
 @Canonical
 @CompileStatic
-@ToString(includePackage = false, includeNames = true)
+@ToString(includePackage = false, includeNames = true, ignoreNulls = true)
 class ContainerConfig {
 
     List<String> entrypoint
@@ -108,4 +108,16 @@ class ContainerConfig {
         }
         return CacheHelper.hasher(allMeta).hash().toString()
     }
+
+    boolean asBoolean() {
+        return !empty()
+    }
+
+    boolean empty() {
+        return !entrypoint &&
+            !cmd &&
+            !env &&
+            !workingDir &&
+            !layers
+    }
 }
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy
@@ -171,7 +171,7 @@ class WaveClient {
     }
 
     SubmitContainerTokenRequest makeRequest(WaveAssets assets) {
-        final containerConfig = assets.containerConfig ?: new ContainerConfig()
+        ContainerConfig containerConfig = assets.containerConfig ?: new ContainerConfig()
         // prepend the bundle layer
         if( assets.moduleResources!=null && assets.moduleResources.hasEntries() ) {
             containerConfig.prependLayer(makeLayer(assets.moduleResources))
@@ -202,6 +202,11 @@ class WaveClient {
         if( config.mirrorMode() && !assets.containerImage )
             throw new IllegalArgumentException("Invalid container mirror operation - missing source container")
 
+        if( config.mirrorMode() && containerConfig ) {
+            log.warn1("Wave configuration setting 'wave.mirror' conflicts with the use of module bundles - ignoring custom config for container: $assets.containerImage")
+            containerConfig = null
+        }
+
         return new SubmitContainerTokenRequest(
                 containerImage: assets.containerImage,
                 containerPlatform: assets.containerPlatform,

diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/ContainerConfigTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/ContainerConfigTest.groovy
@@ -161,4 +161,20 @@ class ContainerConfigTest extends Specification {
         fusion1.fingerprint() != fusion2.fingerprint()
         config1.fingerprint() == config2.fingerprint()
     }
+
+    def 'should validate empty' () {
+        expect:
+        new ContainerConfig().empty()
+        new ContainerConfig([], null, null, null, null).empty()
+        new ContainerConfig(null, [], null, null, null).empty()
+        new ContainerConfig(null, null, [], null, null).empty()
+        new ContainerConfig(null, null, null, '', null).empty()
+        new ContainerConfig(null, null, null, null, []).empty()
+        and:
+        !new ContainerConfig(['x'], null, null, null, null).empty()
+        !new ContainerConfig(null, ['x'], null, null, null).empty()
+        !new ContainerConfig(null, null, ['x'], null, null).empty()
+        !new ContainerConfig(null, null, null, 'x', null).empty()
+        !new ContainerConfig(null, null, null, null, [new ContainerLayer()]).empty()
+    }
 }