GitlabRepositoryProvider now handles leading slashes for content URLs (#6284)

Signed-off-by: Author Name <[email protected]>
Signed-off-by: Paolo Di Tommaso <[email protected]>
Co-authored-by: Nathan Johnson <[email protected]>
Co-authored-by: Paolo Di Tommaso <[email protected]>

Author: 3 people

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

@@ -88,7 +88,7 @@ class GitlabRepositoryProvider extends RepositoryProvider {
         //  https://docs.gitlab.com/ee/api/repository_files.html#get-raw-file-from-repository
         //
         final ref = revision ?: getDefaultBranch()
-        final encodedPath = URLEncoder.encode(path,'utf-8')
+        final encodedPath = URLEncoder.encode(path.stripStart('/'),'utf-8')
         return "${config.endpoint}/api/v4/projects/${getProjectName()}/repository/files/${encodedPath}?ref=${ref}"
     }
 

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

@@ -121,5 +121,15 @@ class GitlabRepositoryProviderTest extends Specification {
         new GitlabRepositoryProvider('pditommaso/hello', obj)
                 .getContentUrl('conf/extra.conf') == 'https://gitlab.com/api/v4/projects/pditommaso%2Fhello/repository/files/conf%2Fextra.conf?ref=master'
 
+
+        and: // should strip leading slashes
+        new GitlabRepositoryProvider('pditommaso/hello', obj)
+            .getContentUrl('/main.nf') == 'https://gitlab.com/api/v4/projects/pditommaso%2Fhello/repository/files/main.nf?ref=master'
+
+        and:
+        new GitlabRepositoryProvider('pditommaso/hello', obj)
+            .getContentUrl('//conf/extra.conf') == 'https://gitlab.com/api/v4/projects/pditommaso%2Fhello/repository/files/conf%2Fextra.conf?ref=master'
+
+
     }
 }