realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

finaly fix gitlab migration with subdir (#13629)

Browse source 
* finaly fix #13535

* add logging
This commit is contained in:
6543 2020-11-19 06:17:56 +01:00 committed by GitHub
parent 6626a048df
commit ad2a288622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/migrations/gitlab.go
View file

@ -90,12 +90,17 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw
// split namespace and subdirectory // split namespace and subdirectory
pathParts := strings.Split(strings.Trim(repoPath, "/"), "/") pathParts := strings.Split(strings.Trim(repoPath, "/"), "/")
var resp *gitlab.Response
u, _ := url.Parse(baseURL)
for len(pathParts) > 2 { for len(pathParts) > 2 {
if _, _, err = gitlabClient.Version.GetVersion(); err == nil { _, resp, err = gitlabClient.Version.GetVersion()
if err == nil || resp != nil && resp.StatusCode == 401 {
err = nil // if no authentication given, this still should work
break break
} }
baseURL = path.Join(baseURL, pathParts[0]) u.Path = path.Join(u.Path, pathParts[0])
baseURL = u.String()
pathParts = pathParts[1:] pathParts = pathParts[1:]
_ = gitlab.WithBaseURL(baseURL)(gitlabClient) _ = gitlab.WithBaseURL(baseURL)(gitlabClient)
repoPath = strings.Join(pathParts, "/") repoPath = strings.Join(pathParts, "/")
@ -105,6 +110,8 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw
return nil, err return nil, err
} }
log.Trace("gitlab downloader: use BaseURL: '%s' and RepoPath: '%s'", baseURL, repoPath)
// Grab and store project/repo ID here, due to issues using the URL escaped path // Grab and store project/repo ID here, due to issues using the URL escaped path
gr, _, err := gitlabClient.Projects.GetProject(repoPath, nil, nil, gitlab.WithContext(ctx)) gr, _, err := gitlabClient.Projects.GetProject(repoPath, nil, nil, gitlab.WithContext(ctx))
if err != nil { if err != nil {