Add tower endpoint to wave [ci fast]

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Nov 3, 2022 · b725ddc · b725ddc
1 parent 29f9897
commit b725ddc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/SubmitContainerTokenRequest.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/SubmitContainerTokenRequest.groovy
@@ -41,6 +41,11 @@ class SubmitContainerTokenRequest {
      */
     Long towerWorkspaceId
 
+    /**
+     * Tower endpoint
+     */
+    String towerEndpoint
+
     /**
      * Container image to be pulled
      */

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
@@ -145,6 +145,7 @@ class WaveClient {
         final req = makeRequest(assets)
         req.towerAccessToken = tower.accessToken
         req.towerWorkspaceId = tower.workspaceId
+        req.towerEndpoint = tower.endpoint
         return sendRequest(req)
     }
 
@@ -154,7 +155,8 @@ class WaveClient {
                 containerImage: image,
                 containerConfig: containerConfig,
                 towerAccessToken: tower.accessToken,
-                towerWorkspaceId: tower.workspaceId )
+                towerWorkspaceId: tower.workspaceId,
+                towerEndpoint: tower.endpoint )
         return sendRequest(request)
     }
 

diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy
@@ -581,7 +581,8 @@ class WaveClientTest extends Specification {
 
     def 'should send request with tower access token' () {
         given:
-        def sess = Mock(Session) {getConfig() >> [wave:[:], tower:[accessToken:'foo', workspaceId:123]] }
+        def config = [wave:[:], tower:[accessToken:'foo', workspaceId:123, endpoint: 'http://foo.com']]
+        def sess = Mock(Session) {getConfig() >> config }
         and:
         def wave = Spy(new WaveClient(sess))
         def assets = Mock(WaveAssets)
@@ -594,6 +595,7 @@ class WaveClientTest extends Specification {
             assert (it[0] == request)
             assert (it[0] as SubmitContainerTokenRequest).towerAccessToken == 'foo'
             assert (it[0] as SubmitContainerTokenRequest).towerWorkspaceId == 123
+            assert (it[0] as SubmitContainerTokenRequest).towerEndpoint == 'http://foo.com'
         }
 
     }