diff options
| author | 6543 <6543@obermui.de> | 2020-09-11 00:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:29:19 +0100 |
| commit | fd60ebfe14927657ff5cfa4e75f975eaadae65f1 (patch) | |
| tree | 38c3d70146920a13c228fed91bc1a55c9be72436 /modules/migrations | |
| parent | daefdd1385d12bf0c8321f291dbb6ab242b41c99 (diff) | |
| download | gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.tar.gz gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.zip | |
[API] Migration: Change ServiceType String (#12672)
* use different structs for MigrateRepoOptions on UI and API
* Fix TokenAuth and rename UID to an understandable Name
* fix swagger doc
* simplify & mk redable
* R E F A C T O R:
migration has now internal 3 structs to store its options:
* the Options for WebUI: modules/auth/repo_form.go
* the Options for API: modules/structs/repo.go
* the option struct with after validation for internal prossessing: modules/migrations/base/options.go
* Copyright Header
* Deprecate UID - add RepoOwner
* adopt repo.go -> migrate.go
* add comment about each struct purpose
* lint
Diffstat (limited to 'modules/migrations')
| -rw-r--r-- | modules/migrations/base/options.go | 26 | ||||
| -rw-r--r-- | modules/migrations/gitea.go | 2 | ||||
| -rw-r--r-- | modules/migrations/gitea_test.go | 3 |
3 files changed, 28 insertions, 3 deletions
diff --git a/modules/migrations/base/options.go b/modules/migrations/base/options.go index 2d180b61d9..dbc40b138a 100644 --- a/modules/migrations/base/options.go +++ b/modules/migrations/base/options.go @@ -8,4 +8,28 @@ package base import "code.gitea.io/gitea/modules/structs" // MigrateOptions defines the way a repository gets migrated -type MigrateOptions = structs.MigrateRepoOption +// this is for internal usage by migrations module and func who interact with it +type MigrateOptions struct { + // required: true + CloneAddr string `json:"clone_addr" binding:"Required"` + AuthUsername string `json:"auth_username"` + AuthPassword string `json:"auth_password"` + AuthToken string `json:"auth_token"` + // required: true + UID int `json:"uid" binding:"Required"` + // required: true + RepoName string `json:"repo_name" binding:"Required"` + Mirror bool `json:"mirror"` + Private bool `json:"private"` + Description string `json:"description"` + OriginalURL string + GitServiceType structs.GitServiceType + Wiki bool + Issues bool + Milestones bool + Labels bool + Releases bool + Comments bool + PullRequests bool + MigrateToRepoID int64 +} diff --git a/modules/migrations/gitea.go b/modules/migrations/gitea.go index 082ddcd5fb..b70ad7b0ce 100644 --- a/modules/migrations/gitea.go +++ b/modules/migrations/gitea.go @@ -123,7 +123,7 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate return err } - r, err = repository.MigrateRepositoryGitData(g.doer, owner, r, structs.MigrateRepoOption{ + r, err = repository.MigrateRepositoryGitData(g.doer, owner, r, base.MigrateOptions{ RepoName: g.repoName, Description: repo.Description, OriginalURL: repo.OriginalURL, diff --git a/modules/migrations/gitea_test.go b/modules/migrations/gitea_test.go index 62c8f71322..2dbd8ffd44 100644 --- a/modules/migrations/gitea_test.go +++ b/modules/migrations/gitea_test.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" @@ -32,7 +33,7 @@ func TestGiteaUploadRepo(t *testing.T) { uploader = NewGiteaLocalUploader(graceful.GetManager().HammerContext(), user, user.Name, repoName) ) - err := migrateRepository(downloader, uploader, structs.MigrateRepoOption{ + err := migrateRepository(downloader, uploader, base.MigrateOptions{ CloneAddr: "https://github.com/go-xorm/builder", RepoName: repoName, AuthUsername: "", |