[FEAT] add Forgero Git Service

Signed-off-by: cassiozareck <cassiomilczareck@gmail.com> (cherry picked from commit a878adfe62) Adding description and Forgejo SVG (cherry picked from commit 13738c0380) Undo reordering and tmpl redirection (cherry picked from commit 9ae51c46f4) (cherry picked from commit 70fffdc61d) (cherry picked from commit c0ebfa9da3) (cherry picked from commit 9922c92787) (cherry picked from commit 00c0effbc7) (cherry picked from commit e4c9525b13) (cherry picked from commit 09d7b83211) (cherry picked from commit bbcd5975c9) (cherry picked from commit 55c70a0e18) (cherry picked from commit 76596410c0) (cherry picked from commit 1308043931) (cherry picked from commit 919d6aedfe) [FEAT] add Forgero Git Service (squash) more tests Previously only Gitea service was being tested under self-hosted migrations. Since Forgejo is also self-hosted and in fact use the same downloader/migrator we can add to this suite another test that will do the same, migrating the same repository under the same local instance but for the Forgejo service (represented by 9) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1709 Co-authored-by: zareck <cassiomilczareck@gmail.com> Co-committed-by: zareck <cassiomilczareck@gmail.com> (cherry picked from commit 40a4b8f1a8)
2023-08-14 16:52:44 -03:00 · 2023-08-14 16:52:44 -03:00 · 3198b4a642
commit 3198b4a642
parent 358386fab7
8 changed files with 71 additions and 30 deletions
--- a/modules/structs/repo.go
+++ b/modules/structs/repo.go
@ -287,6 +287,7 @@ const (
 	OneDevService                          // 6 onedev service
 	GitBucketService                       // 7 gitbucket service
 	CodebaseService                        // 8 codebase service
+	ForgejoService                         // 9 forgejo service
 )

 // Name represents the service type's name
@ -312,6 +313,8 @@ func (gt GitServiceType) Title() string {
 		return "GitBucket"
 	case CodebaseService:
 		return "Codebase"
+	case ForgejoService:
+		return "Forgejo"
 	case PlainGitService:
 		return "Git"
 	}
@ -353,7 +356,7 @@ type MigrateRepoOptions struct {
 // TokenAuth represents whether a service type supports token-based auth
 func (gt GitServiceType) TokenAuth() bool {
 	switch gt {
-	case GithubService, GiteaService, GitlabService:
+	case GithubService, GiteaService, GitlabService, ForgejoService:
 		return true
 	}
 	return false
@ -364,6 +367,7 @@ func (gt GitServiceType) TokenAuth() bool {
 var SupportedFullGitService = []GitServiceType{
 	GithubService,
 	GitlabService,
+	ForgejoService,
 	GiteaService,
 	GogsService,
 	OneDevService,
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@ -1091,6 +1091,7 @@ migrate.migrating_failed_no_addr = Migration failed.
 migrate.github.description = Migrate data from github.com or other GitHub instances.
 migrate.git.description = Migrate a repository only from any Git service.
 migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances.
+migrate.forgejo.description = Migrate data from codeberg.org or other Forgejo instances.
 migrate.gitea.description = Migrate data from gitea.com or other Gitea instances.
 migrate.gogs.description = Migrate data from notabug.org or other Gogs instances.
 migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances.
--- a/public/assets/img/svg/gitea-forgejo.svg
+++ b/public/assets/img/svg/gitea-forgejo.svg
@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="-15 0 256 256" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(28,28)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
+    <circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
+    <circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+    <circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+  </g>
+</svg>
--- 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 "forgejo":
+		return structs.ForgejoService
 	default:
 		return structs.PlainGitService
 	}
--- a/services/convert/utils_test.go
+++ b/services/convert/utils_test.go
@ -28,6 +28,8 @@ func TestToGitServiceType(t *testing.T) {
 		typ: "gitlab", enum: 4,
 	}, {
 		typ: "gogs", enum: 5,
+	}, {
+		typ: "forgejo", enum: 9,
 	}, {
 		typ: "trash", enum: 1,
 	}}
--- a/templates/repo/migrate/forgejo.tmpl
+++ b/templates/repo/migrate/forgejo.tmpl
@ -0,0 +1 @@
+{{template "repo/migrate/gitea" .}}
--- a/tests/integration/migrate_test.go
+++ b/tests/integration/migrate_test.go
@ -4,6 +4,7 @@
 package integration

 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@ -18,6 +19,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/services/migrations"
+	"code.gitea.io/gitea/services/repository"

 	"github.com/stretchr/testify/assert"
 )
@ -49,7 +51,7 @@ func TestMigrateLocalPath(t *testing.T) {
 	setting.ImportLocalPaths = old
 }

-func TestMigrateGiteaForm(t *testing.T) {
+func TestMigrate(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		AllowLocalNetworks := setting.Migrations.AllowLocalNetworks
 		setting.Migrations.AllowLocalNetworks = true
@ -69,33 +71,44 @@ func TestMigrateGiteaForm(t *testing.T) {
 		session := loginUser(t, ownerName)
 		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeReadMisc)

-		// Step 0: verify the repo is available
-		req := NewRequestf(t, "GET", fmt.Sprintf("/%s/%s", ownerName, repoName))
-		_ = session.MakeRequest(t, req, http.StatusOK)
-		// Step 1: get the Gitea migration form
-		req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", structs.GiteaService)
-		resp := session.MakeRequest(t, req, http.StatusOK)
-		// Step 2: load the form
-		htmlDoc := NewHTMLParser(t, resp.Body)
-		link, exists := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`).Attr("action")
-		assert.True(t, exists, "The template has changed")
-		// Step 4: submit the migration to only migrate issues
-		migratedRepoName := "otherrepo"
-		req = NewRequestWithValues(t, "POST", link, map[string]string{
-			"_csrf":       htmlDoc.GetCSRF(),
-			"service":     fmt.Sprintf("%d", structs.GiteaService),
-			"clone_addr":  fmt.Sprintf("%s%s/%s", u, ownerName, repoName),
-			"auth_token":  token,
-			"issues":      "on",
-			"repo_name":   migratedRepoName,
-			"description": "",
-			"uid":         fmt.Sprintf("%d", repoOwner.ID),
-		})
-		resp = session.MakeRequest(t, req, http.StatusSeeOther)
-		// Step 5: a redirection displays the migrated repository
-		loc := resp.Header().Get("Location")
-		assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), loc)
-		// Step 6: check the repo was created
-		unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName})
+		for _, s := range []struct {
+			svc structs.GitServiceType
+		}{
+			{svc: structs.GiteaService},
+			{svc: structs.ForgejoService},
+		} {
+			// Step 0: verify the repo is available
+			req := NewRequestf(t, "GET", fmt.Sprintf("/%s/%s", ownerName, repoName))
+			_ = session.MakeRequest(t, req, http.StatusOK)
+			// Step 1: get the Gitea migration form
+			req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc)
+			resp := session.MakeRequest(t, req, http.StatusOK)
+			// Step 2: load the form
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			link, exists := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`).Attr("action")
+			assert.True(t, exists, "The template has changed")
+			// Step 4: submit the migration to only migrate issues
+			migratedRepoName := "otherrepo"
+			req = NewRequestWithValues(t, "POST", link, map[string]string{
+				"_csrf":       htmlDoc.GetCSRF(),
+				"service":     fmt.Sprintf("%d", s.svc),
+				"clone_addr":  fmt.Sprintf("%s%s/%s", u, ownerName, repoName),
+				"auth_token":  token,
+				"issues":      "on",
+				"repo_name":   migratedRepoName,
+				"description": "",
+				"uid":         fmt.Sprintf("%d", repoOwner.ID),
+			})
+			resp = session.MakeRequest(t, req, http.StatusSeeOther)
+			// Step 5: a redirection displays the migrated repository
+			loc := resp.Header().Get("Location")
+			assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), loc)
+			// Step 6: check the repo was created
+			repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName})
+
+			// Step 7: delete the repository, so we can test with other services
+			err := repository.DeleteRepository(context.Background(), repoOwner, repo, false)
+			assert.NoError(t, err)
+		}
 	})
 }
--- a/web_src/svg/gitea-forgejo.svg
+++ b/web_src/svg/gitea-forgejo.svg
@ -0,0 +1,9 @@
+<svg width="64" height="64" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" class="forgejo-logo" aria-hidden="true">
+  <g transform="translate(28,28)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
+    <circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
+    <circle cx="142" cy="88" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+    <circle cx="58" cy="180" r="18" fill="none" stroke="#d40000" stroke-width="15" />
+  </g>
+</svg>