Merge branch 'master' into 4920_azure_tasks_support_disk_directive

nextflow-io · Dec 11, 2024 · fda939a · fda939a
2 parents 9aa2b9d + b325378
commit fda939a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/docs/reference/process.md b/docs/reference/process.md
@@ -1078,11 +1078,11 @@ The following options are available:
 : *Can be specified multiple times*
 : Mounts a [ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) with name and optional key to the given path. If the key is omitted, the path is interpreted as a directory and all entries in the `ConfigMap` are exposed in that path.
 
-`csi: '<name>', mountPath: '</absolute/path>'`
+`csi: '<config>', mountPath: '</absolute/path>'`
 : :::{versionadded} 22.11.0-edge
   :::
 : *Can be specified multiple times*
-: Mounts a [CSI ephemeral volume](https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#csi-ephemeral-volumes) by name to the given path.
+: Mounts a [CSI ephemeral volume](https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#csi-ephemeral-volumes) with the given configuration to the given path.
 
 `emptyDir: <config>, mountPath: '</absolute/path>'`
 : :::{versionadded} 22.11.0-edge

diff --git a/docs/sharing.md b/docs/sharing.md
@@ -14,7 +14,7 @@ You can configure your credentials for various Git providers in the Git configur
 
 ## Using a local repository
 
-Nextflow can work with repositories stored in a local or shared file system. The repository must be created as a [bare repository](https://mijingo.com/blog/what-is-a-bare-git-repository).
+Nextflow can work with repositories stored in a local or shared file system. The repository must be created as a [bare repository](https://craftquest.io/articles/what-is-a-bare-git-repository).
 
 For example, given a bare repository at `/shared/projects/foo.git`, Nextflow is able to run it using the following syntax:
 

diff --git a/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy b/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy
@@ -35,13 +35,15 @@ final class AzureRepositoryProvider extends RepositoryProvider {
 
     private String user
     private String repo
+    private String urlPath;
     private String continuationToken
 
     AzureRepositoryProvider(String project, ProviderConfig config=null) {
         /*
         Azure repo format follows Organization/Project/Repository where Project can be optional
         If Project is not present then Repository is used as Project (and also as Repository)
          */
+        this.urlPath = project
         def tokens = project.tokenize('/')
         this.repo = tokens.removeLast()
         if( tokens.size() == 1){
@@ -164,7 +166,7 @@ final class AzureRepositoryProvider extends RepositoryProvider {
     /** {@inheritDoc} */
     @Override
     String getRepositoryUrl() {
-        "${config.server}/$project"
+        "${config.server}/${urlPath}"
     }
 
     /** {@inheritDoc} */

diff --git a/modules/nextflow/src/test/groovy/nextflow/scm/AzureRepositoryProviderTest.groovy b/modules/nextflow/src/test/groovy/nextflow/scm/AzureRepositoryProviderTest.groovy
@@ -80,7 +80,7 @@ class AzureRepositoryProviderTest extends Specification {
         def obj = new ProviderConfig('azurerepos', config.providers.azurerepos as ConfigObject)
 
         expect:
-        new AzureRepositoryProvider('ORGANIZATION/PROJECT/hello', obj).getRepositoryUrl() == 'https://dev.azure.com/ORGANIZATION/PROJECT'
+        new AzureRepositoryProvider('ORGANIZATION/PROJECT/hello', obj).getRepositoryUrl() == 'https://dev.azure.com/ORGANIZATION/PROJECT/hello'
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ class AzureRepositoryProviderTest extends Specification { @@
             def obj = new ProviderConfig('azurerepos', config.providers.azurerepos as ConfigObject)
             expect:
-            new AzureRepositoryProvider('ORGANIZATION/PROJECT/hello', obj).getRepositoryUrl() == 'https://dev.azure.com/ORGANIZATION/PROJECT'
+            new AzureRepositoryProvider('ORGANIZATION/PROJECT/hello', obj).getRepositoryUrl() == 'https://dev.azure.com/ORGANIZATION/PROJECT/hello'
         }
@@ Expand Down @@