Skip to content

Infer commit revision type for azure repos #3721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2023
Merged

Infer commit revision type for azure repos #3721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc49d62
Infer commit revision type for azure repos
bentsherman Mar 6, 2023
21b34c0
Fix compile errors
bentsherman Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package nextflow.scm

import java.util.regex.Pattern

import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.transform.Memoized
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions modules/nextflow/src/test/groovy/nextflow/scm/AzureRepositoryProviderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}