From e9514817d3e45db6a65bb80eab2d7ab8d00e8413 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Jan 2025 04:43:07 +0000 Subject: [PATCH 1/2] fix --- services/convert/utils.go | 2 ++ services/convert/utils_test.go | 12 +++++++++++- services/migrations/gitea_downloader_test.go | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/services/convert/utils.go b/services/convert/utils.go index 5e9d32cc8edce..b59884ec50815 100644 --- a/services/convert/utils.go +++ b/services/convert/utils.go @@ -36,6 +36,8 @@ func ToGitServiceType(value string) structs.GitServiceType { return structs.OneDevService case "gitbucket": return structs.GitBucketService + case "codebase": + return structs.CodebaseService case "codecommit": return structs.CodeCommitService default: diff --git a/services/convert/utils_test.go b/services/convert/utils_test.go index 1ac03a3097506..1b7b289042423 100644 --- a/services/convert/utils_test.go +++ b/services/convert/utils_test.go @@ -21,6 +21,8 @@ func TestToGitServiceType(t *testing.T) { typ string enum int }{{ + typ: "trash", enum: 1, + }, { typ: "github", enum: 2, }, { typ: "gitea", enum: 3, @@ -29,7 +31,15 @@ func TestToGitServiceType(t *testing.T) { }, { typ: "gogs", enum: 5, }, { - typ: "trash", enum: 1, + typ: "onedev", enum: 6, + }, { + typ: "gitbucket", enum: 7, + }, { + typ: "codebase", enum: 8, + }, { + typ: "codecommit", enum: 9, + }, { + typ: "azuredevops", enum: 10, }} for _, test := range tc { assert.EqualValues(t, test.enum, ToGitServiceType(test.typ)) diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go index c37c70947e36f..d04e12abdbcb5 100644 --- a/services/migrations/gitea_downloader_test.go +++ b/services/migrations/gitea_downloader_test.go @@ -30,10 +30,10 @@ func TestGiteaDownloadRepo(t *testing.T) { downloader, err := NewGiteaDownloader(context.Background(), "https://gitea.com", "gitea/test_repo", "", "", giteaToken) if downloader == nil { - t.Fatal("NewGitlabDownloader is nil") + t.Fatal("NewGiteaDownloader is nil") } if !assert.NoError(t, err) { - t.Fatal("NewGitlabDownloader error occur") + t.Fatal("NewGiteaDownloader error occur") } repo, err := downloader.GetRepoInfo() From 93ef799e313cfedc53e7513a501f355ffe7b78f4 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 8 Jan 2025 05:23:19 +0000 Subject: [PATCH 2/2] fix --- services/convert/utils_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/convert/utils_test.go b/services/convert/utils_test.go index 1b7b289042423..a8363ec6bde2a 100644 --- a/services/convert/utils_test.go +++ b/services/convert/utils_test.go @@ -38,8 +38,6 @@ func TestToGitServiceType(t *testing.T) { typ: "codebase", enum: 8, }, { typ: "codecommit", enum: 9, - }, { - typ: "azuredevops", enum: 10, }} for _, test := range tc { assert.EqualValues(t, test.enum, ToGitServiceType(test.typ))