Merge branch 'main' into feat/add-repo-informer-cache

chmouel · web-flow · commit 58ed5030daeb · 2026-04-10T14:33:19.000+02:00
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -110,7 +110,7 @@ jobs:
       TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
       TEST_BITBUCKET_CLOUD_USER: cboudjna
 
-      # Bitbucket Server
+      # Bitbucket Data Center
       TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
       TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
       TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
@@ -296,7 +296,7 @@ jobs:
           TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
           TEST_BITBUCKET_CLOUD_USER: cboudjna
 
-          # Bitbucket Server
+          # Bitbucket Data Center
           TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
           TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
           TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@ GOLANGCI_LINT=golangci-lint
 GOFUMPT=gofumpt
 TKN_BINARY_NAME := tkn
 TKN_BINARY_URL := https://tekton.dev/docs/cli/\#installation
+DEFAULT_GOTESTSUM_FORMAT ?= testdox
 LDFLAGS=
 OUTPUT_DIR=bin
 GO           = go
@@ -68,7 +69,7 @@ test-unit: ## Run unit tests
 	@mkdir -p tmp/
 	@echo "Running unit tests..."
 	@if command -v gotestsum >/dev/null 2>&1; then \
-		gotestsum --format testdox -- $(DEFAULT_GO_TEST_FLAGS) $(GO_TEST_FLAGS) -timeout $(TIMEOUT_UNIT) ./pkg/...; \
+		gotestsum --format ${DEFAULT_GOTESTSUM_FORMAT} -- $(DEFAULT_GO_TEST_FLAGS) $(GO_TEST_FLAGS) -timeout $(TIMEOUT_UNIT) ./pkg/...; \
 	else \
 		$(GO) test $(DEFAULT_GO_TEST_FLAGS) $(GO_TEST_FLAGS) -timeout $(TIMEOUT_UNIT) ./pkg/...; \
 	fi
diff --git a/docs/content/docs/guides/gitops-commands/push-commands.md b/docs/content/docs/guides/gitops-commands/push-commands.md
@@ -5,7 +5,7 @@ weight: 1
 
 This page explains how to trigger GitOps commands on pushed commits. Use these commands when you want to retest or cancel PipelineRuns triggered by push events rather than pull requests.
 
-{{< support_matrix github_app="true" github_webhook="true" forgejo="false" gitlab="true" bitbucket_cloud="false" bitbucket_server="false" >}}
+{{< support_matrix github_app="true" github_webhook="true" forgejo="false" gitlab="true" bitbucket_cloud="false" bitbucket_datacenter="false" >}}
 
 You can trigger GitOps commands on a pushed commit by including them in your commit messages. Pipelines-as-Code supports two scopes:
 
@@ -80,7 +80,7 @@ The following sections show how to add a GitOps comment on a pushed commit in ea
 
 ## Triggering PipelineRuns on Git Tags
 
-{{< support_matrix github_app="true" github_webhook="true" forgejo="false" gitlab="true" bitbucket_cloud="false" bitbucket_server="false" >}}
+{{< support_matrix github_app="true" github_webhook="true" forgejo="false" gitlab="true" bitbucket_cloud="false" bitbucket_datacenter="false" >}}
 
 **What it does:** You can retrigger a PipelineRun against a specific Git tag by commenting on the tagged commit. Pipelines-as-Code resolves the tag to its commit SHA and runs the matching PipelineRun against that commit.
 
diff --git a/docs/content/docs/guides/running-pipelines.md b/docs/content/docs/guides/running-pipelines.md
@@ -123,7 +123,7 @@ the pull request describing the error. Pipelines-as-Code also logs the error in
 Despite validation errors, Pipelines-as-Code continues to run other correctly parsed and matched PipelineRuns.
 However, a YAML syntax error in any PipelineRun halts the execution of all PipelineRuns, even those that are syntactically correct.
 
-{{< support_matrix github_app="true" github_webhook="true" forgejo="true" gitlab="true" bitbucket_cloud="false" bitbucket_server="false" >}}
+{{< support_matrix github_app="true" github_webhook="true" forgejo="true" gitlab="true" bitbucket_cloud="false" bitbucket_datacenter="false" >}}
 
 When an event triggers from a pull request, Pipelines-as-Code creates a new comment on
 the pull request detailing the error.
diff --git a/docs/content/docs/providers/_index.md b/docs/content/docs/providers/_index.md
@@ -12,6 +12,6 @@ Configure Pipelines-as-Code with your Git provider: GitHub, GitLab, Bitbucket, o
   {{< card link="github-webhook" title="GitHub Webhook" subtitle="Webhook-based GitHub setup" >}}
   {{< card link="gitlab" title="GitLab" subtitle="GitLab.com and self-hosted" >}}
   {{< card link="bitbucket-cloud" title="Bitbucket Cloud" subtitle="Bitbucket.org" >}}
-  {{< card link="bitbucket-datacenter" title="Bitbucket Data Center" subtitle="Self-hosted Bitbucket Server" >}}
+  {{< card link="bitbucket-datacenter" title="Bitbucket Data Center" subtitle="Self-hosted Bitbucket Data Center" >}}
   {{< card link="forgejo" title="Forgejo" subtitle="Forgejo and Gitea" >}}
 {{< /cards >}}
diff --git a/docs/content/docs/providers/bitbucket-datacenter.md b/docs/content/docs/providers/bitbucket-datacenter.md
@@ -3,7 +3,7 @@ title: Bitbucket Data Center
 weight: 5
 ---
 
-This page covers how to configure Pipelines-as-Code with [Bitbucket Data Center](https://www.atlassian.com/software/bitbucket/enterprise). Use this method when your organization runs a self-hosted Bitbucket Server or Data Center instance.
+This page covers how to configure Pipelines-as-Code with [Bitbucket Data Center](https://www.atlassian.com/software/bitbucket/enterprise). Use this method when your organization runs a self-hosted Bitbucket Data Center instance.
 
 ## Prerequisites
 
diff --git a/pkg/adapter/sinker.go b/pkg/adapter/sinker.go
@@ -159,7 +159,7 @@ func (s *sinker) setupClient(ctx context.Context, repo *v1alpha1.Repository) err
 func (s *sinker) createSkipCIStatus(ctx context.Context) error {
 	statusOpts := status.StatusOpts{
 		Status:     "completed",
-		Conclusion: status.ConclusionNeutral,
+		Conclusion: status.ConclusionSkipped,
 		Title:      "CI Skipped",
 		Summary:    fmt.Sprintf("%s - CI has been skipped", s.pacInfo.ApplicationName),
 		Text:       "Commit contains a skip CI command. Use /test or /retest to manually trigger CI if needed.",
diff --git a/pkg/pipelineascode/client_setup_test.go b/pkg/pipelineascode/client_setup_test.go
@@ -605,16 +605,16 @@ func TestSetupAuthenticatedClientProviderSpecificEvents(t *testing.T) {
 			description: "Bitbucket Cloud PR events should work",
 		},
 		{
-			name:        "Bitbucket Server PR opened",
+			name:        "Bitbucket Data Center PR opened",
 			eventType:   "pr:opened",
 			wantErr:     false,
-			description: "Bitbucket Server PR opened events should work",
+			description: "Bitbucket Data Center PR opened events should work",
 		},
 		{
-			name:        "Bitbucket Server push",
+			name:        "Bitbucket Data Center push",
 			eventType:   "repo:refs_changed",
 			wantErr:     false,
-			description: "Bitbucket Server push events should work",
+			description: "Bitbucket Data Center push events should work",
 		},
 	}
 
diff --git a/pkg/pipelineascode/match.go b/pkg/pipelineascode/match.go
@@ -123,7 +123,7 @@ func (p *PacRun) verifyRepoAndUser(ctx context.Context) (*v1alpha1.Repository, e
 		}
 		// When /ok-to-test is approved, update the parent "Pipelines as Code CI" status to success
 		// to indicate the approval was successful before pipelines start running.
-		if p.event.EventType == opscomments.OkToTestCommentEventType.String() && p.vcx.GetConfig().Name == "gitea" {
+		if p.event.EventType == opscomments.OkToTestCommentEventType.String() && !strings.Contains(p.vcx.GetConfig().Name, "github") {
 			approvalStatus := providerstatus.StatusOpts{
 				Status:     CompletedStatus,
 				Title:      "Approved",
diff --git a/pkg/provider/gitea/gitea.go b/pkg/provider/gitea/gitea.go
@@ -369,8 +369,36 @@ func (v *Provider) createStatusCommit(ctx context.Context, event *info.Event, pa
 	return nil
 }
 
-func (v *Provider) GetCommitStatuses(_ context.Context, _ *info.Event) ([]provider.CommitStatusInfo, error) {
-	return nil, nil
+func (v *Provider) GetCommitStatuses(_ context.Context, event *info.Event) ([]provider.CommitStatusInfo, error) {
+	if v.giteaClient == nil {
+		return nil, fmt.Errorf("no gitea client has been initialized")
+	}
+
+	statuses, _, err := v.Client().ListStatuses(
+		event.Organization, event.Repository, event.SHA,
+		forgejo.ListStatusesOption{},
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	var (
+		result []provider.CommitStatusInfo
+		seen   = map[string]struct{}{}
+	)
+	for _, s := range statuses {
+		key := fmt.Sprintf("%s\x00%s", s.Context, string(s.State))
+		if _, ok := seen[key]; ok {
+			continue
+		}
+		seen[key] = struct{}{}
+		result = append(result, provider.CommitStatusInfo{
+			Name:   s.Context,
+			Status: string(s.State),
+		})
+	}
+
+	return result, nil
 }
 
 func (v *Provider) GetTektonDir(_ context.Context, event *info.Event, path, provenance string) (string, error) {
diff --git a/pkg/provider/gitea/gitea_test.go b/pkg/provider/gitea/gitea_test.go
@@ -1219,3 +1219,112 @@ func TestGetCommitInfoPRLookupPopulatesURLs(t *testing.T) {
 	assert.Equal(t, "https://gitea.com/fork-owner/repo", event.HeadURL, "HeadURL should be populated from PR lookup")
 	assert.Equal(t, "https://gitea.com/owner/repo", event.BaseURL, "BaseURL should be populated from PR lookup")
 }
+
+func TestGetCommitStatuses(t *testing.T) {
+	tests := []struct {
+		name        string
+		event       *info.Event
+		nilClient   bool
+		mockHandler func(http.ResponseWriter, *http.Request)
+		want        []provider.CommitStatusInfo
+		wantErr     string
+	}{
+		{
+			name: "happy path with multiple statuses",
+			event: &info.Event{
+				Organization: "org",
+				Repository:   "repo",
+				SHA:          "abc123",
+			},
+			mockHandler: func(rw http.ResponseWriter, _ *http.Request) {
+				fmt.Fprint(rw, `[
+					{"context":"Pipelines as Code CI / pr-one","status":"success"},
+					{"context":"Pipelines as Code CI / pr-two","status":"failure"}
+				]`)
+			},
+			want: []provider.CommitStatusInfo{
+				{Name: "Pipelines as Code CI / pr-one", Status: "success"},
+				{Name: "Pipelines as Code CI / pr-two", Status: "failure"},
+			},
+		},
+		{
+			name: "deduplicates identical statuses",
+			event: &info.Event{
+				Organization: "org",
+				Repository:   "repo",
+				SHA:          "abc123",
+			},
+			mockHandler: func(rw http.ResponseWriter, _ *http.Request) {
+				fmt.Fprint(rw, `[
+					{"context":"CI / build","status":"success"},
+					{"context":"CI / build","status":"success"},
+					{"context":"CI / build","status":"failure"}
+				]`)
+			},
+			want: []provider.CommitStatusInfo{
+				{Name: "CI / build", Status: "success"},
+				{Name: "CI / build", Status: "failure"},
+			},
+		},
+		{
+			name: "empty response",
+			event: &info.Event{
+				Organization: "org",
+				Repository:   "repo",
+				SHA:          "abc123",
+			},
+			mockHandler: func(rw http.ResponseWriter, _ *http.Request) {
+				fmt.Fprint(rw, `[]`)
+			},
+		},
+		{
+			name:      "nil client returns error",
+			nilClient: true,
+			event: &info.Event{
+				Organization: "org",
+				Repository:   "repo",
+				SHA:          "abc123",
+			},
+			wantErr: "no gitea client has been initialized",
+		},
+		{
+			name: "API error",
+			event: &info.Event{
+				Organization: "org",
+				Repository:   "repo",
+				SHA:          "abc123",
+			},
+			mockHandler: func(rw http.ResponseWriter, _ *http.Request) {
+				rw.WriteHeader(http.StatusInternalServerError)
+			},
+			wantErr: "500",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var p *Provider
+			if tt.nilClient {
+				p = &Provider{}
+			} else {
+				fakeclient, mux, teardown := tgitea.Setup(t)
+				defer teardown()
+
+				mux.HandleFunc(
+					fmt.Sprintf("/repos/%s/%s/commits/%s/statuses",
+						tt.event.Organization, tt.event.Repository, tt.event.SHA),
+					tt.mockHandler,
+				)
+				p = &Provider{giteaClient: fakeclient}
+			}
+
+			got, err := p.GetCommitStatuses(context.Background(), tt.event)
+			if tt.wantErr != "" {
+				assert.ErrorContains(t, err, tt.wantErr)
+				return
+			}
+			assert.NilError(t, err)
+			assert.DeepEqual(t, got, tt.want)
+		})
+	}
+}
diff --git a/pkg/provider/github/acl.go b/pkg/provider/github/acl.go
@@ -25,7 +25,7 @@ func (v *Provider) CheckPolicyAllowing(ctx context.Context, event *info.Event, a
 			members, resp, err := wrapAPI(v, "list_team_members_by_slug", func() ([]*github.User, *github.Response, error) {
 				return v.Client().Teams.ListTeamMembersBySlug(ctx, event.Organization, team, &github.TeamListTeamMembersOptions{ListOptions: opt})
 			})
-			if resp.StatusCode == http.StatusNotFound {
+			if resp != nil && resp.StatusCode == http.StatusNotFound {
 				// we explicitly disallow the policy when the team is not found
 				// maybe we should ignore it instead? i'd rather keep this explicit
 				// and conservative since being security related.
@@ -321,7 +321,7 @@ func (v *Provider) GetStringPullRequestComment(ctx context.Context, runevent *in
 
 	gitOpsCommentPrefix := provider.GetGitOpsCommentPrefix(v.repo)
 
-	for {
+	for page := 0; page < maxCommentPages; page++ {
 		comments, resp, err := wrapAPI(v, "list_issue_comments", func() ([]*github.IssueComment, *github.Response, error) {
 			return v.Client().Issues.ListComments(ctx, runevent.Organization, runevent.Repository,
 				prNumber, opt)
diff --git a/pkg/provider/github/github.go b/pkg/provider/github/github.go
@@ -41,6 +41,11 @@ const (
 	publicRawURLHost = "raw.githubusercontent.com"
 
 	defaultPaginedNumber = 100
+	// maxCommentPages caps the number of pages fetched when scanning PR
+	// comments (e.g. for /ok-to-test). With defaultPaginedNumber=100 this
+	// allows up to 1000 comments, which is generous for legitimate use while
+	// preventing rate-limit exhaustion from comment flooding.
+	maxCommentPages = 10
 )
 
 var _ provider.Interface = (*Provider)(nil)
diff --git a/pkg/provider/gitlab/gitlab.go b/pkg/provider/gitlab/gitlab.go
@@ -308,7 +308,7 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
 
 	switch statusOpts.Conclusion {
 	case providerstatus.ConclusionSkipped:
-		state = gitlab.Canceled
+		state = gitlab.Skipped
 		statusOpts.Title = "skipped validating this commit"
 	case providerstatus.ConclusionNeutral:
 		state = gitlab.Canceled
diff --git a/pkg/provider/gitlab/parse_payload.go b/pkg/provider/gitlab/parse_payload.go
@@ -83,7 +83,7 @@ func (v *Provider) ParsePayload(ctx context.Context, run *params.Run, request *h
 		// GitLab sends same event for both Tag creation and deletion i.e. "Tag Push Hook".
 		// if gitEvent.After is containing all zeros and gitEvent.CheckoutSHA is empty
 		// it is Delete "Tag Push Hook".
-		if isZeroSHA(gitEvent.After) && gitEvent.CheckoutSHA == "" {
+		if provider.IsZeroSHA(gitEvent.After) && gitEvent.CheckoutSHA == "" {
 			return nil, fmt.Errorf("event Delete %s is not supported", event)
 		}
 
@@ -319,7 +319,3 @@ func (v *Provider) handleCommitCommentEvent(ctx context.Context, event *gitlab.C
 	v.Logger.Infof("gitlab commit_comment: pipelinerun %s has been requested on %s/%s#%s", action, processedEvent.Organization, processedEvent.Repository, processedEvent.SHA)
 	return processedEvent, nil
 }
-
-func isZeroSHA(sha string) bool {
-	return sha == "0000000000000000000000000000000000000000"
-}
diff --git a/test/README.md b/test/README.md
@@ -83,7 +83,7 @@ cp test/e2e-config.yaml.example test/e2e-config.yaml
 
 The YAML file groups settings by provider section (`common`, `github`,
 `github_enterprise`, `gitlab`, `gitea`, `bitbucket_cloud`,
-`bitbucket_server`). See `test/e2e-config.yaml.example` for the full list of
+`bitbucket_datacenter`). See `test/e2e-config.yaml.example` for the full list of
 fields.
 
 Environment variables always take precedence over YAML values, so you can use
diff --git a/test/e2e-config.yaml.example b/test/e2e-config.yaml.example
@@ -76,8 +76,8 @@ bitbucket_cloud:
   # Format: workspace/repo
   e2e_repository: ""
 
-# Bitbucket Data Center (Server)
-bitbucket_server:
+# Bitbucket Data Center
+bitbucket_datacenter:
   api_url: ""
   user: ""
   token: ""
diff --git a/test/gitea_retest_pruned_test.go b/test/gitea_retest_pruned_test.go
diff --git a/test/gitlab_access_control_test.go b/test/gitlab_access_control_test.go
diff --git a/test/gitlab_merge_request_retest_pruned_test.go b/test/gitlab_merge_request_retest_pruned_test.go
diff --git a/test/pkg/configfile/config.go b/test/pkg/configfile/config.go
diff --git a/test/pkg/configfile/config_test.go b/test/pkg/configfile/config_test.go
diff --git a/test/pkg/gitlab/scm.go b/test/pkg/gitlab/scm.go
diff --git a/test/pkg/gitlab/test.go b/test/pkg/gitlab/test.go
diff --git a/test/pkg/gitlab/wait.go b/test/pkg/gitlab/wait.go

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func (p PacRun) verifyRepoAndUser(ctx context.Context) (v1alpha1.Repository, e`
`123`	`123`	`}`
`124`	`124`	`// When /ok-to-test is approved, update the parent "Pipelines as Code CI" status to success`
`125`	`125`	`// to indicate the approval was successful before pipelines start running.`
`126`		`- if p.event.EventType == opscomments.OkToTestCommentEventType.String() && p.vcx.GetConfig().Name == "gitea" {`
	`126`	`+ if p.event.EventType == opscomments.OkToTestCommentEventType.String() && !strings.Contains(p.vcx.GetConfig().Name, "github") {`
`127`	`127`	`approvalStatus := providerstatus.StatusOpts{`
`128`	`128`	`Status: CompletedStatus,`
`129`	`129`	`Title: "Approved",`