Skip to content

Fix GitLab repository tree pagination #7403

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

Draft
gavinelder wants to merge 1 commit into
base: feature/gitlab-linked-pagination
Choose a base branch
from
Draft

Fix GitLab repository tree pagination #7403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 6 deletions modules/nextflow/src/main/groovy/nextflow/scm/GitlabRepositoryProvider.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,12 @@ class GitlabRepositoryProvider extends RepositoryProvider {
if (depth > 1) {
params.add("recursive=true")
}
params.add("per_page=${MAX_PER_PAGE}")

if (params) {
url += "?" + params.join("&")
}
url += "?" + params.join("&")

// Make the API call and parse response
String response = invoke(url)
List<Map> treeEntries = response ? new JsonSlurper().parseText(response) as List<Map> : []
// Make the API call and parse response, fetching all pages
List<Map> treeEntries = this.<Map>invokeAndResponseWithPaging(url, { Map entry -> entry })

if (!treeEntries) {
return []
Expand Down
28 changes: 28 additions & 0 deletions modules/nextflow/src/test/groovy/nextflow/scm/GitlabRepositoryProviderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,34 @@ class GitlabRepositoryProviderTest extends Specification {
entries.every { it.path && it.sha }
}

def 'should follow all GitLab pagination links when listing a directory' () {
given:
def provider = Spy(GitlabRepositoryProvider, constructorArgs: ['pditommaso/hello', new ProviderConfig('gitlab')])
provider.setRevision('main')
and:
def base = 'https://gitlab.com/api/v4/projects/pditommaso%2Fhello/repository/tree?ref=main&per_page=100'
int page = 0

when:
def entries = provider.listDirectory('/', 1)

then:
101 * provider.invokeResponse(_ as String) >> { String url ->
page++
assert url == (page == 1 ? base : "${base}&page=${page}")
final next = page < 101 ? "${base}&page=${page + 1}" : null
final link = next ? "<${next}>; rel=\"next\"" : null
response(
url,
"""[{"id":"sha-${page}","name":"file-${page}.nf","type":"blob","path":"file-${page}.nf"}]""",
link
)
}
and:
entries.size() == 101
entries.every { it.type == RepositoryProvider.EntryType.FILE && it.path && it.sha }
}

def 'should follow GitLab pagination links when listing branches' () {
given:
def provider = Spy(GitlabRepositoryProvider, constructorArgs: ['pditommaso/hello', new ProviderConfig('gitlab')])
Expand Down
Loading