adding gitea test suite

Signed-off-by: Soule BA <[email protected]>

Author: souleb

.github/workflows/e2e-gitea.yaml

@@ -0,0 +1,39 @@
+---
+name: e2e-gitea
+
+"on":
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+    tags-ignore: ["*"]
+
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: Restore Go cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: Setup Go
+        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        with:
+          go-version: 1.20.x
+      - name: Start Provider instances
+        run: make start-provider-instances-gitea GITEA_VERSION=latest
+      - name: Run tests [gitea]
+        run: |
+          export GITEA_TOKEN=$(cat /tmp/gitea-token)
+          make test-e2e-gitea
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        with:
+          files: ./coverage.txt

.github/workflows/e2e-gitlab.yaml

@@ -28,7 +28,7 @@ jobs:
         with:
           go-version: 1.20.x
       - name: Start Provider instances
-        run: make start-provider-instances GITLAB_VERSION=latest
+        run: make start-provider-instances-gitlab GITLAB_VERSION=latest
       - name: Run tests [gitlab]
         run: make test-e2e-gitlab
       - name: Upload coverage to Codecov

Makefile

@@ -22,11 +22,19 @@ GITLAB_TEST_REPO_NAME ?= fluxcd-testing-repo
 GITLAB_TEST_SUBGROUP ?= fluxcd-testing-sub-group
 GITLAB_TEST_TEAM_NAME ?= fluxcd-testing-2
 
+# Gitea specific testing variables
+GITEA_USER_UID ?= 1000
+GITEA_BASE_URL ?= http://127.0.0.1:3000
+GITEA_TOKEN ?= not-set
+GITEA_TEST_TEAM_NAME ?= fluxcd-testing-2
+
 start-provider-instances-gitlab:
 	GITLAB_TOKEN=$(GITLAB_TOKEN) GIT_PROVIDER_USER=$(GIT_PROVIDER_USER) GIT_PROVIDER_ORGANIZATION=$(GIT_PROVIDER_ORGANIZATION) GITLAB_TEST_REPO_NAME=$(GITLAB_TEST_REPO_NAME) GITLAB_TEST_SUBGROUP=$(GITLAB_TEST_SUBGROUP) GITLAB_TEST_TEAM_NAME=$(GITLAB_TEST_TEAM_NAME) docker compose up -d gitlab
 	GITLAB_BASE_URL=$(GITLAB_BASE_URL) GITLAB_TOKEN=$(GITLAB_TOKEN) ./tests/gitlab/await-healthy.sh
 
-start-provider-instances: start-provider-instances-gitlab
+start-provider-instances-gitea:
+	GITEA_TEST_TEAM_NAME=$(GITEA_TEST_TEAM_NAME) GIT_PROVIDER_ORGANIZATION=$(GIT_PROVIDER_ORGANIZATION) GITEA_USER=$(GIT_PROVIDER_USER) docker compose up -d gitea
+	GITEA_USER=$(GIT_PROVIDER_USER) GITEA_BASE_URL=$(GITEA_BASE_URL) ./tests/gitea/await-healthy.sh
 
 stop-provider-instances:
 	docker compose down --volumes
@@ -43,3 +51,7 @@ test-e2e-gitlab: tidy fmt vet
 test-e2e-stash: tidy fmt vet
 	go test ${TEST_FLAGS} -race -coverprofile=coverage.txt -covermode=atomic -tags=e2e ./stash/...
 
+test-e2e-gitea: tidy fmt vet
+	GITEA_BASE_URL=$(GITEA_BASE_URL) GITEA_TOKEN=$(GITEA_TOKEN) GITEA_TEST_TEAM_NAME=$(GITEA_TEST_TEAM_NAME) \
+	GIT_PROVIDER_ORGANIZATION=$(GIT_PROVIDER_ORGANIZATION) GITEA_USER=$(GIT_PROVIDER_USER) \
+	go test ${TEST_FLAGS} -race -coverprofile=coverage.txt -covermode=atomic -tags=e2e ./gitea/...

docker-compose.yml

@@ -27,8 +27,30 @@ services:
       test: /healthcheck-and-setup.sh
       interval: 60s
       timeout: 10m
+  gitea:
+    image: gitea/gitea:${GITEA_VERSION:-latest}
+    platform: linux/amd64
+    ports:
+      - 3000:3000
+    environment:
+      - USER_UID=${GITEA_USER_UID:-1000}
+      - USER_GID=1000
+      - GITEA__security__INSTALL_LOCK=${GITEA_INSTALL_LOCK:-true}
+      - GIT_PROVIDER_ORGANIZATION=$GIT_PROVIDER_ORGANIZATION
+      - GITEA_USER=$GITEA_USER
+      - GITEA_TEST_TEAM_NAME=$GITEA_TEST_TEAM_NAME
+    labels:
+      go-git-provider-gitea/owned: ""
+    volumes:
+      - gitea:/data
+      - ${PWD}/tests/gitea/healthcheck-and-setup.sh:/healthcheck-and-setup.sh:Z
+    healthcheck:
+      test: /healthcheck-and-setup.sh
+      interval: 60s
+      timeout: 10m
 
 volumes:
   gitlab-config:
   gitlab-logs:
   gitlab-data:
+  gitea:

gitea/auth_test.go

@@ -30,29 +30,32 @@ func Test_DomainVariations(t *testing.T) {
 		expectedErrs []error
 	}{
 		{
-			name: "gitea.com domain",
-			opts: gitprovider.WithDomain("gitea.com"),
-			want: "gitea.com",
+			name: "try.gitea.io domain",
+			opts: gitprovider.WithDomain("try.gitea.io"),
+			want: "try.gitea.io",
 		},
 		{
 			name: "custom domain without protocol",
-			opts: gitprovider.WithDomain("my-gitea.dev.com"),
-			want: "https://my-gitea.dev.com",
+			opts: gitprovider.WithDomain("try.gitea.io"),
+			want: "try.gitea.io",
 		},
 		{
 			name: "custom domain with https protocol",
-			opts: gitprovider.WithDomain("https://my-gitea.dev.com"),
-			want: "https://my-gitea.dev.com",
+			opts: gitprovider.WithDomain("https://try.gitea.io"),
+			want: "https://try.gitea.io",
 		},
 		{
 			name: "custom domain with http protocol",
-			opts: gitprovider.WithDomain("http://my-gitea.dev.com"),
-			want: "http://my-gitea.dev.com",
+			opts: gitprovider.WithDomain("http://try.gitea.io"),
+			want: "http://try.gitea.io",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c1, _ := NewClient("token", tt.opts)
+			c1, err := NewClient("token", tt.opts)
+			if err != nil {
+				t.Fatal(err)
+			}
 			assertEqual(t, tt.want, c1.SupportedDomain())
 
 			c2, _ := NewClient("token", tt.opts)

gitea/client_repository_branch.go

@@ -33,13 +33,14 @@ type BranchClient struct {
 }
 
 // Create creates a branch with the given specifications.
+// Creating a branch from a commit is noy supported by Gitea.
+// see: https://github.com/go-gitea/gitea/issues/22139
 func (c *BranchClient) Create(ctx context.Context, branch, sha string) error {
 
 	// Doesn't seem to support specific sha?
 	opts := gitea.CreateBranchOption{
-		BranchName: branch,
-		// TODO: Explore branching from given SHA
-		// OldBranchName: sha,
+		BranchName:    branch,
+		OldBranchName: sha,
 	}
 	err := opts.Validate()
 	if err != nil {

gitea/client_repository_commit.go

@@ -78,6 +78,10 @@ func (c *CommitClient) Create(ctx context.Context, branch string, message string
 
 	resp, err := c.c.CreateCommits(ctx, c.ref.GetIdentity(), c.ref.GetRepository(), *files[0].Path, &gitea.CreateFileOptions{
 		Content: *files[0].Content,
+		FileOptions: gitea.FileOptions{
+			Message:    message,
+			BranchName: branch,
+		},
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create commit: %w", err)

gitea/client_repository_pullrequest.go

@@ -53,7 +53,10 @@ func (c *PullRequestClient) List(ctx context.Context) ([]gitprovider.PullRequest
 // Create creates a pull request with the given specifications.
 func (c *PullRequestClient) Create(ctx context.Context, title, branch, baseBranch, description string) (gitprovider.PullRequest, error) {
 	prOpts := gitea.CreatePullRequestOption{
+		Base:  baseBranch,
 		Title: title,
+		Head:  branch,
+		Body:  description,
 	}
 	pr, _, err := c.c.Client().CreatePullRequest(c.ref.GetIdentity(), c.ref.GetRepository(), prOpts)
 
@@ -86,6 +89,7 @@ func (c *PullRequestClient) Edit(ctx context.Context, number int, opts gitprovid
 }
 
 // Merge merges a pull request with the given specifications.
+// Supported merge methods are: MergeMethodMerge, MergeMethodRebase, MergeMethodSquash
 func (c *PullRequestClient) Merge(ctx context.Context, number int, mergeMethod gitprovider.MergeMethod, message string) error {
 	mergeOpts := gitea.MergePullRequestOption{
 		Style:   gitea.MergeStyle(mergeMethod),

gitea/giteaclient.go

@@ -89,8 +89,6 @@ type giteaClient interface {
 	// RemoveTeam is a wrapper for "DELETE /repos/{owner}/{repo}/teams/{team_slug}".
 	// This function handles HTTP error wrapping.
 	RemoveTeam(ctx context.Context, orgName, repo, teamName string) error
-
-	//
 }
 
 type giteaClientImpl struct {
@@ -324,10 +322,20 @@ func (c *giteaClientImpl) ListCommits(_ context.Context, owner, repo, branch str
 		},
 		SHA: branch,
 	}
-	apiObjs, _, listErr := c.c.ListRepoCommits(owner, repo, opts)
-	if listErr != nil {
-		return nil, listErr
+	apiObjs := []*gitea.Commit{}
+	err := allPages(&opts.ListOptions, func() (*gitea.Response, error) {
+		pageObjs, resp, listErr := c.c.ListRepoCommits(owner, repo, opts)
+		if len(pageObjs) > 0 {
+			apiObjs = append(apiObjs, pageObjs...)
+			return resp, listErr
+		}
+		return nil, nil
+	})
+
+	if err != nil {
+		return nil, err
 	}
+
 	return apiObjs, nil
 }
 
@@ -365,6 +373,9 @@ func (c *giteaClientImpl) GetTeamPermissions(_ context.Context, orgName, repo, t
 	if err != nil {
 		return nil, handleHTTPError(resp, err)
 	}
+	if apiObj == nil {
+		return nil, fmt.Errorf("team %s not found in repository %s/%s", teamName, orgName, repo)
+	}
 
 	return &apiObj.Permission, nil
 }
@@ -379,6 +390,8 @@ func (c *giteaClientImpl) ListRepoTeams(ctx context.Context, orgName, repo strin
 }
 
 // AddTeam adds the given team to the given repository.
+// We don't support setting permissions for Gitea, so we ignore the permission parameter.
+// see https://github.com/go-gitea/gitea/issues/14717
 func (c *giteaClientImpl) AddTeam(_ context.Context, orgName, repo, teamName string, permission gitprovider.RepositoryPermission) error {
 	res, err := c.c.AddRepoTeam(orgName, repo, teamName)
 	return handleHTTPError(res, err)