diff options
| author | John Olheiser <john.olheiser@gmail.com> | 2020-09-21 09:36:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 10:36:51 -0400 |
| commit | ec6a35aeb1d006c4eb65d8ae149e64dc5ea1c947 (patch) | |
| tree | 8c9597a19bbdfb9b398c29be5ea73ffd98edc254 /modules | |
| parent | 2dbca92a0f145ddf6d0e3d4487be28071f6fd792 (diff) | |
| download | gitea-ec6a35aeb1d006c4eb65d8ae149e64dc5ea1c947.tar.gz gitea-ec6a35aeb1d006c4eb65d8ae149e64dc5ea1c947.zip | |
Hopefully support GH enterprise (#12863)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/migrations/gitea_test.go | 2 | ||||
| -rw-r--r-- | modules/migrations/github.go | 8 | ||||
| -rw-r--r-- | modules/migrations/github_test.go | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/modules/migrations/gitea_test.go b/modules/migrations/gitea_test.go index 2dbd8ffd44..8432a1eecd 100644 --- a/modules/migrations/gitea_test.go +++ b/modules/migrations/gitea_test.go @@ -28,7 +28,7 @@ func TestGiteaUploadRepo(t *testing.T) { user := models.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User) var ( - downloader = NewGithubDownloaderV3(context.Background(), "", "", "", "go-xorm", "builder") + downloader = NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", "", "go-xorm", "builder") repoName = "builder-" + time.Now().Format("2006-01-02-15-04-05") uploader = NewGiteaLocalUploader(graceful.GetManager().HammerContext(), user, user.Name, repoName) ) diff --git a/modules/migrations/github.go b/modules/migrations/github.go index d31db136e6..c053596c17 100644 --- a/modules/migrations/github.go +++ b/modules/migrations/github.go @@ -47,13 +47,14 @@ func (f *GithubDownloaderV3Factory) New(ctx context.Context, opts base.MigrateOp return nil, err } + baseURL := u.Scheme + "://" + u.Host fields := strings.Split(u.Path, "/") oldOwner := fields[1] oldName := strings.TrimSuffix(fields[2], ".git") log.Trace("Create github downloader: %s/%s", oldOwner, oldName) - return NewGithubDownloaderV3(ctx, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, oldOwner, oldName), nil + return NewGithubDownloaderV3(ctx, baseURL, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, oldOwner, oldName), nil } // GitServiceType returns the type of git service @@ -74,7 +75,7 @@ type GithubDownloaderV3 struct { } // NewGithubDownloaderV3 creates a github Downloader via github v3 API -func NewGithubDownloaderV3(ctx context.Context, userName, password, token, repoOwner, repoName string) *GithubDownloaderV3 { +func NewGithubDownloaderV3(ctx context.Context, baseURL, userName, password, token, repoOwner, repoName string) *GithubDownloaderV3 { var downloader = GithubDownloaderV3{ userName: userName, password: password, @@ -98,6 +99,9 @@ func NewGithubDownloaderV3(ctx context.Context, userName, password, token, repoO client = oauth2.NewClient(downloader.ctx, ts) } downloader.client = github.NewClient(client) + if baseURL != "https://github.com" { + downloader.client, _ = github.NewEnterpriseClient(baseURL, baseURL, client) + } return &downloader } diff --git a/modules/migrations/github_test.go b/modules/migrations/github_test.go index 955050107c..3a1affbc2f 100644 --- a/modules/migrations/github_test.go +++ b/modules/migrations/github_test.go @@ -65,7 +65,7 @@ func assertLabelEqual(t *testing.T, name, color, description string, label *base func TestGitHubDownloadRepo(t *testing.T) { GithubLimitRateRemaining = 3 //Wait at 3 remaining since we could have 3 CI in // - downloader := NewGithubDownloaderV3(context.Background(), "", "", os.Getenv("GITHUB_READ_TOKEN"), "go-gitea", "test_repo") + downloader := NewGithubDownloaderV3(context.Background(), "https://github.com", "", "", os.Getenv("GITHUB_READ_TOKEN"), "go-gitea", "test_repo") err := downloader.RefreshRate() assert.NoError(t, err) |