Merge branch 'main' into add-github-step-summary

Author: chmouel

.github/workflows/e2e.yaml

@@ -110,12 +110,12 @@ jobs:
       TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
       TEST_BITBUCKET_CLOUD_USER: cboudjna
 
-      # Bitbucket Server
-      TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
-      TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
-      TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
-      TEST_BITBUCKET_SERVER_USER: pipelines
-      TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
+      # 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 }}
+      TEST_BITBUCKET_DATA_CENTER_USER: pipelines
+      TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
       TESTRR_URL: https://testrr.pipelinesascode.com
       TESTRR_PROJECT: pipelinesascode
       TESTRR_USERNAME: pac
@@ -296,12 +296,12 @@ jobs:
           TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
           TEST_BITBUCKET_CLOUD_USER: cboudjna
 
-          # Bitbucket Server
-          TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
-          TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
-          TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
-          TEST_BITBUCKET_SERVER_USER: pipelines
-          TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
+          # 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 }}
+          TEST_BITBUCKET_DATA_CENTER_USER: pipelines
+          TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
         with:
           detached: true
@@ -377,9 +377,9 @@ jobs:
           TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
           TEST_GITLAB_SECOND_TOKEN: ${{ secrets.TEST_GITLAB_SECOND_TOKEN }}
           TEST_GITLAB_SECOND_GROUP: ${{ vars.TEST_GITLAB_SECOND_GROUP }}
-          TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
-          TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
-          TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
+          TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
+          TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
+          TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
           TEST_GITEA_SMEEURL: ${{ steps.gosmee-url.outputs.url }}
           TEST_GITLAB_SMEEURL: ${{ steps.gosmee-gitlab-url.outputs.url }}
           TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}

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.
 

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.

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 >}}

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
 

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",
 		},
 	}
 

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",

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)

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)

test/README.md

@@ -55,11 +55,11 @@ this repo should differ from the one which is configured as part of `TEST_GITHUB
 - `TEST_GITEA_PASSWORD` - set password as **pac**
 - `TEST_GITEA_USERNAME` - set username as **pac**
 - `TEST_GITEA_REPO_OWNER` - set repo owner as **pac/pac**
-- `TEST_BITBUCKET_SERVER_USER` - Bitbucket Data Center Username
-- `TEST_BITBUCKET_SERVER_TOKEN` - Bitbucket Data Center token
-- `TEST_BITBUCKET_SERVER_E2E_REPOSITORY` - Bitbucket Data Center repository (i.e. `project/repo`)
-- `TEST_BITBUCKET_SERVER_API_URL` - URL where your Bitbucket Data Center instance is running.
-- `TEST_BITBUCKET_SERVER_WEBHOOK_SECRET` - Webhook secret
+- `TEST_BITBUCKET_DATA_CENTER_USER` - Bitbucket Data Center Username
+- `TEST_BITBUCKET_DATA_CENTER_TOKEN` - Bitbucket Data Center token
+- `TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY` - Bitbucket Data Center repository (i.e. `project/repo`)
+- `TEST_BITBUCKET_DATA_CENTER_API_URL` - URL where your Bitbucket Data Center instance is running.
+- `TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET` - Webhook secret
 
 - `PAC_API_INSTRUMENTATION_DIR` - Optional. When set, E2E tests write per-test JSON reports of GitHub API calls parsed from controller logs to this directory. Useful for analyzing API usage and rate limits. Example: `export PAC_API_INSTRUMENTATION_DIR=/tmp/api-instrumentation`.
 
@@ -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