Merge pull request '[v7.0/forgejo] FIX gogs migration if gogs is hosted at a subpath' (#3588) from bp-v7.0/forgejo-4a2959b into v7.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3588 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
commit
f45a6cb3b7
3 changed files with 96 additions and 4 deletions
1
release-notes/8.0.0/3572.md
Normal file
1
release-notes/8.0.0/3572.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix gogs migration if gogs is hosted at a subpath
|
|
@ -38,17 +38,24 @@ func (f *GogsDownloaderFactory) New(ctx context.Context, opts base.MigrateOption
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
baseURL := u.Scheme + "://" + u.Host
|
|
||||||
repoNameSpace := strings.TrimSuffix(u.Path, ".git")
|
repoNameSpace := strings.TrimSuffix(u.Path, ".git")
|
||||||
repoNameSpace = strings.Trim(repoNameSpace, "/")
|
repoNameSpace = strings.Trim(repoNameSpace, "/")
|
||||||
|
|
||||||
fields := strings.Split(repoNameSpace, "/")
|
fields := strings.Split(repoNameSpace, "/")
|
||||||
if len(fields) < 2 {
|
numFields := len(fields)
|
||||||
|
if numFields < 2 {
|
||||||
return nil, fmt.Errorf("invalid path: %s", repoNameSpace)
|
return nil, fmt.Errorf("invalid path: %s", repoNameSpace)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Trace("Create gogs downloader. BaseURL: %s RepoOwner: %s RepoName: %s", baseURL, fields[0], fields[1])
|
repoOwner := fields[numFields-2]
|
||||||
return NewGogsDownloader(ctx, baseURL, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, fields[0], fields[1]), nil
|
repoName := fields[numFields-1]
|
||||||
|
|
||||||
|
u.Path = ""
|
||||||
|
u = u.JoinPath(fields[:numFields-2]...)
|
||||||
|
baseURL := u.String()
|
||||||
|
|
||||||
|
log.Trace("Create gogs downloader. BaseURL: %s RepoOwner: %s RepoName: %s", baseURL, repoOwner, repoName)
|
||||||
|
return NewGogsDownloader(ctx, baseURL, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, repoOwner, repoName), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GitServiceType returns the type of git service
|
// GitServiceType returns the type of git service
|
||||||
|
|
|
@ -137,3 +137,87 @@ func TestGogsDownloadRepo(t *testing.T) {
|
||||||
_, _, err = downloader.GetPullRequests(1, 3)
|
_, _, err = downloader.GetPullRequests(1, 3)
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGogsDownloaderFactory_New(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args base.MigrateOptions
|
||||||
|
baseURL string
|
||||||
|
repoOwner string
|
||||||
|
repoName string
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Gogs_at_root",
|
||||||
|
args: base.MigrateOptions{
|
||||||
|
CloneAddr: "https://git.example.com/user/repo.git",
|
||||||
|
AuthUsername: "username",
|
||||||
|
AuthPassword: "password",
|
||||||
|
AuthToken: "authtoken",
|
||||||
|
},
|
||||||
|
baseURL: "https://git.example.com/",
|
||||||
|
repoOwner: "user",
|
||||||
|
repoName: "repo",
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Gogs_at_sub_path",
|
||||||
|
args: base.MigrateOptions{
|
||||||
|
CloneAddr: "https://git.example.com/subpath/user/repo.git",
|
||||||
|
AuthUsername: "username",
|
||||||
|
AuthPassword: "password",
|
||||||
|
AuthToken: "authtoken",
|
||||||
|
},
|
||||||
|
baseURL: "https://git.example.com/subpath",
|
||||||
|
repoOwner: "user",
|
||||||
|
repoName: "repo",
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Gogs_at_2nd_sub_path",
|
||||||
|
args: base.MigrateOptions{
|
||||||
|
CloneAddr: "https://git.example.com/sub1/sub2/user/repo.git",
|
||||||
|
AuthUsername: "username",
|
||||||
|
AuthPassword: "password",
|
||||||
|
AuthToken: "authtoken",
|
||||||
|
},
|
||||||
|
baseURL: "https://git.example.com/sub1/sub2",
|
||||||
|
repoOwner: "user",
|
||||||
|
repoName: "repo",
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Gogs_URL_too_short",
|
||||||
|
args: base.MigrateOptions{
|
||||||
|
CloneAddr: "https://git.example.com/repo.git",
|
||||||
|
AuthUsername: "username",
|
||||||
|
AuthPassword: "password",
|
||||||
|
AuthToken: "authtoken",
|
||||||
|
},
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
f := &GogsDownloaderFactory{}
|
||||||
|
opts := base.MigrateOptions{
|
||||||
|
CloneAddr: tt.args.CloneAddr,
|
||||||
|
AuthUsername: tt.args.AuthUsername,
|
||||||
|
AuthPassword: tt.args.AuthPassword,
|
||||||
|
AuthToken: tt.args.AuthToken,
|
||||||
|
}
|
||||||
|
got, err := f.New(context.Background(), opts)
|
||||||
|
if (err != nil) != tt.wantErr {
|
||||||
|
t.Errorf("GogsDownloaderFactory.New() error = %v, wantErr %v", err, tt.wantErr)
|
||||||
|
return
|
||||||
|
} else if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.IsType(t, &GogsDownloader{}, got)
|
||||||
|
assert.EqualValues(t, tt.baseURL, got.(*GogsDownloader).baseURL)
|
||||||
|
assert.EqualValues(t, tt.repoOwner, got.(*GogsDownloader).repoOwner)
|
||||||
|
assert.EqualValues(t, tt.repoName, got.(*GogsDownloader).repoName)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue