Browse Source

Fix anonymous GL migration (#12862)

* Fix anonymous GL migration

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Rely on password instead

Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: zeripath <art27@cantab.net>
pull/12881/head
John Olheiser 1 year ago
committed by GitHub
parent
commit
d9085fe176
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      modules/migrations/gitlab.go

7
modules/migrations/gitlab.go

@ -76,9 +76,10 @@ type GitlabDownloader struct {
func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, password, token string) (*GitlabDownloader, error) {
var gitlabClient *gitlab.Client
var err error
if token != "" {
gitlabClient, err = gitlab.NewClient(token, gitlab.WithBaseURL(baseURL))
} else {
gitlabClient, err = gitlab.NewClient(token, gitlab.WithBaseURL(baseURL))
// Only use basic auth if token is blank and password is NOT
// Basic auth will fail with empty strings, but empty token will allow anonymous public API usage
if token == "" && password != "" {
gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL))
}

Loading…
Cancel
Save