Add tower plugin when fusion is enabled

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

Author: pditommaso

modules/nf-commons/src/main/nextflow/plugin/PluginsFacade.groovy

@@ -374,7 +374,7 @@ class PluginsFacade implements PluginStateListener {
         }
 
         // add tower plugin when config contains tower options
-        if( (Bolts.navigate(config,'tower.enabled') || env.TOWER_ACCESS_TOKEN ) && !specs.find {it.id == 'nf-tower' } ) {
+        if( (Bolts.navigate(config,'tower.enabled') || Bolts.navigate(config,'fusion.enabled') || env.TOWER_ACCESS_TOKEN ) && !specs.find {it.id == 'nf-tower' } ) {
             specs << defaultPlugins.getPlugin('nf-tower')
         }
         if( (Bolts.navigate(config,'wave.enabled') || Bolts.navigate(config,'fusion.enabled')) && !specs.find {it.id == 'nf-wave' } ) {

modules/nf-commons/src/test/nextflow/plugin/PluginsFacadeTest.groovy

@@ -124,6 +124,13 @@ class PluginsFacadeTest extends Specification {
         then:
         result == [ new PluginSpec('nf-tower', '0.1.0') ]
 
+        // fusion requires both nf-tower and nf-wave
+        when:
+        handler = new PluginsFacade(defaultPlugins: defaults, env: [NXF_PLUGINS_DEFAULT:'true'])
+        result = handler.pluginsRequirement([fusion:[enabled:true]])
+        then:
+        result == [ new PluginSpec('nf-tower', '0.1.0'), new PluginSpec('nf-wave', '0.1.0')  ]
+
         when:
         handler = new PluginsFacade(defaultPlugins: defaults, env: [:])
         result = handler.pluginsRequirement([wave:[enabled:true]])

plugins/nf-tower/src/main/io/seqera/tower/plugin/TowerFusionToken.groovy

@@ -113,7 +113,7 @@ class TowerFusionToken implements FusionToken {
     @Override
     Map<String, String> getEnvironment(String scheme, FusionConfig config) {
         try {
-            getEnvironment0(scheme, config)
+            return getEnvironment0(scheme, config)
         }
         catch (Exception e) {
             final msg = "Unable to validate Fusion license - reason: ${e.message}"