Fiz commit revision type for Azure DevOps repos (#3721)

Signed-off-by: Ben Sherman <[email protected]>

Author: bentsherman

modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy

@@ -17,6 +17,8 @@
 
 package nextflow.scm
 
+import java.util.regex.Pattern
+
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.transform.Memoized
@@ -30,6 +32,8 @@ import groovy.transform.Memoized
 @CompileStatic
 final class AzureRepositoryProvider extends RepositoryProvider {
 
+    private static final Pattern COMMIT_REGEX = ~/[a-zA-Z0-9]{40}/
+
     private String user
     private String repo
     private String continuationToken
@@ -74,8 +78,12 @@ final class AzureRepositoryProvider extends RepositoryProvider {
                 '$format':'json',
                 'path':path
         ] as Map<String,Object>
-        if( revision )
+        if( revision ) {
             queryParams['versionDescriptor.version']=revision
+
+            if( COMMIT_REGEX.matcher(revision).matches() )
+                queryParams['versionDescriptor.versionType'] = 'commit'
+        }
         def queryString = queryParams.collect({ "$it.key=$it.value"}).join('&')
         def result = "$endpointUrl/items?$queryString"
         result

modules/nextflow/src/test/groovy/nextflow/scm/AzureRepositoryProviderTest.groovy

@@ -202,4 +202,21 @@ class AzureRepositoryProviderTest extends Specification {
         then:
         result=='hello\n'
     }
+
+    @IgnoreIf({System.getenv('NXF_SMOKE')})
+    @Requires({System.getenv('NXF_AZURE_REPOS_TOKEN')})
+    def 'should infer revision type for commit revision'() {
+        given:
+        def token = System.getenv('NXF_AZURE_REPOS_TOKEN')
+        def config = new ProviderConfig('azurerepos').setAuth(token)
+
+        when:
+        // uses repo at
+        //  https://pditommaso.visualstudio.com/nf-azure-repo/_git/nf-azure-repo
+        def repo = new AzureRepositoryProvider('pditommaso/nf-azure-repo', config)
+        repo.revision = 'cc0ca18640a5c995231e22d91f1527d5155d024b'
+        def result = repo.readText('file-on-dev.txt')
+        then:
+        result=='hello\n'
+    }
 }