feat(scm): Add Bitbucket Cloud SCM #699

ushiradineth · 2025-11-17T14:07:44Z

Fixes #179

Adds Bitbucket Cloud integration as an SCM provider

codecov-commenter · 2025-11-17T14:08:43Z

Bundle Report

Bundle size has no change ✅

crenshaw-dev · 2025-11-17T18:39:55Z

Thanks @ushiradineth! Just so you know, the latest code fixes a security scan failure. :-)

codecov-commenter · 2025-11-17T21:00:41Z

Codecov Report

❌ Patch coverage is 0.63898% with 311 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.62%. Comparing base (422c6ea) to head (09465ab).

Files with missing lines	Patch %	Lines
internal/scms/bitbucket_cloud/pullrequest.go	0.00%	171 Missing ⚠️
internal/scms/bitbucket_cloud/commit_status.go	0.00%	46 Missing ⚠️
internal/scms/bitbucket_cloud/utils.go	0.00%	36 Missing ⚠️
internal/scms/bitbucket_cloud/git_operations.go	0.00%	24 Missing ⚠️
internal/webhookreceiver/server.go	12.50%	14 Missing ⚠️
...ternal/controller/argocdcommitstatus_controller.go	0.00%	6 Missing ⚠️
...rnal/controller/changetransferpolicy_controller.go	0.00%	6 Missing ⚠️
internal/controller/commitstatus_controller.go	0.00%	6 Missing ⚠️
internal/controller/pullrequest_controller.go	0.00%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #699      +/-   ##
==========================================
- Coverage   55.70%   51.62%   -4.09%     
==========================================
  Files          37       41       +4     
  Lines        3958     4271     +313     
==========================================
  Hits         2205     2205              
- Misses       1460     1772     +312     
- Partials      293      294       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Ushira Dineth <[email protected]>

- Replace type assertions with errors.As for wrapped error handling - Replace interface{} with any for Go 1.18+ compatibility - Add default cases to switch statements per revive rules - Remove underscore receiver names per revive receiver-naming rule - Merge variable declarations with assignments per staticcheck - Replace fmt.Errorf with errors.New for static error messages - Check exists before using map values to avoid unnecessary blank assignments These changes address all 25 linter issues (6 errorlint, 17 revive, 2 staticcheck) while maintaining the existing functionality of the Bitbucket SCM provider. Signed-off-by: Ushira Dineth <[email protected]>

zachaller · 2025-11-17T21:23:53Z

Will also mentioned that you will probably want to enable webhook support as well, it's not technically required but it makes the user experience so much better that I feel it is really should be required.

ushiradineth · 2025-11-17T21:27:06Z

Thanks @crenshaw-dev! I've synced the PR with the main branch and the checks have succeeded now.

ushiradineth · 2025-11-17T21:31:15Z

Will also mentioned that you will probably want to enable webhook support as well, it's not technically required but it makes the user experience so much better that I feel it is really should be required.

@zachaller I did not notice this haha :D. I will go ahead implement this as well.

Signed-off-by: Ushira Dineth <[email protected]>

ushiradineth · 2025-11-18T14:27:45Z

@crenshaw-dev @zachaller I have added webhook support and checks are passing.

Additionally, I renamed bitbucket to bitbucket_cloud (and other instances) incase of a future Bitbucket Server intergration.

crenshaw-dev

Great work! Overall looking good, just did a first pass.

crenshaw-dev · 2025-11-18T21:38:14Z

api/v1alpha1/common_types.go

+	// Workspace is the workspace of the repository.
+	// +kubebuilder:validation:Required
+	Workspace string `json:"workspace"`
+	// Repository is the repository of the repository.
+	// +kubebuilder:validation:Required
+	Repository string `json:"repository"`


Is there any additional validation that we can apply to these fields? At minimum, I think we should have a min length of 1 char if they're both really required.

I mainly followed the validations defined on the other repo types, I've added MinLength=1.

docs/getting-started.md

crenshaw-dev · 2025-11-18T21:40:52Z

internal/controller/pullrequest_controller.go

 		return github.NewGithubPullRequestProvider(ctx, r.Client, scmProvider, *secret, gitRepository.Spec.GitHub.Owner) //nolint:wrapcheck
 	case scmProvider.GetSpec().GitLab != nil:
 		return gitlab.NewGitlabPullRequestProvider(r.Client, *secret, scmProvider.GetSpec().GitLab.Domain) //nolint:wrapcheck
+	case scmProvider.GetSpec().Bitbucket != nil:


Should we go ahead and name it BitbucketCloud to disambiguate the implementations from the start?

I have done a through check and have renamed all Bitbucket/bitbucket appearances to BitbucketCloud/bitbucket_cloud/bitbucketCloud.

docs/getting-started.md

crenshaw-dev · 2025-11-18T21:43:10Z

internal/scms/bitbucket_cloud/commit_status.go

+	// Parse error message to determine status code
+	statusCode := http.StatusCreated
+	if err != nil {
+		statusCode = http.StatusInternalServerError
+		var bbErr *bitbucket.UnexpectedResponseStatusError
+		if errors.As(err, &bbErr) {
+			errMsg := bbErr.Error()
+			switch {
+			case strings.HasPrefix(errMsg, "401"):
+				statusCode = http.StatusUnauthorized
+			case strings.HasPrefix(errMsg, "404"):
+				statusCode = http.StatusNotFound
+			default:
+				statusCode = http.StatusInternalServerError
+			}
+		}
+	}


Maybe pull this into a helper function?

I have abstracted the error code parsing into a util.

crenshaw-dev · 2025-11-18T21:44:17Z

internal/scms/bitbucket_cloud/commit_status.go

+	}
+
+	// Extract state
+	state, _ := resultMap["state"].(string)


Any risk of a panic here? Maybe just go ahead and check the cast success?

crenshaw-dev · 2025-11-18T21:44:59Z

internal/scms/bitbucket_cloud/commit_status.go

+	commitStatus.Status.Sha = commitStatus.Spec.Sha
+
+	// Bitbucket doesn't return an ID for commit statuses, use key as identifier
+	commitStatus.Status.Id = commitStatus.Spec.Name


@zachaller any concerns here? Seems maybe as good as any option?

It does look like bitbucket returns a uuid

{ "type": "<string>", "links": { "self": { "href": "<string>", "name": "<string>" }, "commit": { "href": "<string>", "name": "<string>" } }, "uuid": "<string>", "key": "<string>", "refname": "<string>", "url": "<string>", "state": "FAILED", "name": "<string>", "description": "<string>", "created_on": "<string>", "updated_on": "<string>" }

Sorry for overlooking this, I have fixed this now.

@zachaller @ushiradineth the doc https://developer.atlassian.com/cloud/bitbucket/rest/api-group-commit-statuses/#api-repositories-workspace-repo-slug-commit-commit-statuses-build-post say it returns the UUID as the base level but from what I can see running the code it is return in a repository object

Below you will see the output of the result object after being converted to json.

{ "commit": { "hash": "0719fc1ee1174a385ccbc23da4430d4e579d1b47", "links": { "html": { "href": "https://bitbucket.org/djnono8434/argocd-example-apps/commits/0719fc1ee1174a385ccbc23da4430d4e579d1b47" }, "self": { "href": "https://api.bitbucket.org/2.0/repositories/djnono8434/argocd-example-apps/commit/0719fc1ee1174a385ccbc23da4430d4e579d1b47" } }, "type": "commit" }, "created_on": "2025-12-10T23:01:44.697804+00:00", "description": "Waiting for previous environment's \"argocd-health\" commit status to be successful", "key": "build", "links": { "commit": { "href": "https://api.bitbucket.org/2.0/repositories/djnono8434/argocd-example-apps/commit/0719fc1ee1174a385ccbc23da4430d4e579d1b47" }, "self": { "href": "https://api.bitbucket.org/2.0/repositories/djnono8434/argocd-example-apps/commit/0719fc1ee1174a385ccbc23da4430d4e579d1b47/statuses/build/build" } }, "name": "nolan", "refname": null, "repository": { "full_name": "djnono8434/argocd-example-apps", "links": { "avatar": { "href": "https://bytebucket.org/ravatar/%7B1c25d6d7-7863-4cec-9986-12c7135e11d4%7D?ts=default" }, "html": { "href": "https://bitbucket.org/djnono8434/argocd-example-apps" }, "self": { "href": "https://api.bitbucket.org/2.0/repositories/djnono8434/argocd-example-apps" } }, "name": "argocd-example-apps", "type": "repository", "uuid": "{1c25d6d7-7863-4cec-9986-12c7135e11d4}" }, "state": "INPROGRESS", "type": "build", "updated_on": "2025-12-11T00:03:25.431922+00:00", "url": "https://bitbucket.org/djnono8434/argocd-example-apps" }

crenshaw-dev · 2025-11-18T21:46:23Z

internal/scms/bitbucket_cloud/pullrequest.go

+	// The Bitbucket client doesn't return HTTP response metadata, so we parse
+	// the error message to determine status codes (e.g., "400 Bad Request")
+	statusCode := http.StatusCreated
+	if err != nil {
+		statusCode = http.StatusInternalServerError
+		var bbErr *bitbucket.UnexpectedResponseStatusError
+		if errors.As(err, &bbErr) {
+			errMsg := bbErr.Error()
+			switch {
+			case strings.HasPrefix(errMsg, "400"):
+				statusCode = http.StatusBadRequest
+			case strings.HasPrefix(errMsg, "401"):
+				statusCode = http.StatusUnauthorized
+			default:
+				statusCode = http.StatusInternalServerError
+			}
+		}
+	}


Share helper func across similar uses?

crenshaw-dev · 2025-11-18T21:48:58Z

internal/scms/bitbucket_cloud/pullrequest.go

+
+	// Build query to find PRs matching source and target branches and state
+	// Bitbucket query syntax: https://developer.atlassian.com/cloud/bitbucket/rest/intro/#querying
+	query := fmt.Sprintf(`source.branch.name="%s" AND destination.branch.name="%s" AND state="OPEN"`,


The word "injection" comes to mind..... is there a way we can escape the inputs reliably? Maybe strconv.Quote?

Woah I did not notice it, I have fixed it.

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ushira Dineth <[email protected]>

Signed-off-by: Ushira Dineth <[email protected]>

emirot · 2025-12-11T00:14:12Z

@ushiradineth from what I see you, I think you are missing this https://github.com/ushiradineth/gitops-promoter/pull/2/files

emirot · 2025-12-11T00:36:19Z

internal/scms/bitbucket_cloud/commit_status.go

+	commitStatusOptions := &bitbucket.CommitStatusOptions{
+		State:       phaseToBuildState(commitStatus.Spec.Phase),
+		Key:         commitStatus.Spec.Name,
+		Url:         commitStatus.Spec.Url,


@ushiradineth
From what I saw testing it looks like the URL is empty and bitbucket does not allow that it is a required parameter
@zachaller does it need to be the url or having example.org will work just fine?

ushiradineth force-pushed the feat/bitbucket-scm branch from 4adfa9b to fc9c919 Compare November 17, 2025 21:03

ushiradineth added 10 commits November 18, 2025 02:43

feat(scm): add Bitbucket types for SCM provider support

f7aa050

Signed-off-by: Ushira Dineth <[email protected]>

chore(deps): add go-bitbucket client

9745341

Signed-off-by: Ushira Dineth <[email protected]>

feat(scm): implement pull request and git operations providers

0604138

Signed-off-by: Ushira Dineth <[email protected]>

feat(scm): implement commit status provider

7e5edee

Signed-off-by: Ushira Dineth <[email protected]>

feat(scm): wire Bitbucket provider to controllers

a5c27bd

Signed-off-by: Ushira Dineth <[email protected]>

chore(api): generate Kubernetes manifests for Bitbucket types

e3e8cbc

Signed-off-by: Ushira Dineth <[email protected]>

feat(scm): add Bitbucket support to ArgoCD commit status controller

72da69d

Signed-off-by: Ushira Dineth <[email protected]>

docs(scm): add Bitbucket configuration guide

ba1f410

Signed-off-by: Ushira Dineth <[email protected]>

chore(dist): update install manifest with Bitbucket CRD schemas

bbd499b

Signed-off-by: Ushira Dineth <[email protected]>

ushiradineth force-pushed the feat/bitbucket-scm branch from fc9c919 to ddb91e7 Compare November 17, 2025 21:17

ushiradineth added 4 commits November 18, 2025 19:00

feat(scm): add bitbucket webhook support

578dfe6

Signed-off-by: Ushira Dineth <[email protected]>

style: lint fix

4c2c7d4

Signed-off-by: Ushira Dineth <[email protected]>

Merge branch 'main' into feat/bitbucket-scm

43345d1

refactor: rename bitbucket to bitbucket_cloud

8dcded3

Signed-off-by: Ushira Dineth <[email protected]>

ushiradineth force-pushed the feat/bitbucket-scm branch from 43e2a44 to 8dcded3 Compare November 18, 2025 14:17

crenshaw-dev requested changes Nov 18, 2025

View reviewed changes

ushiradineth and others added 5 commits November 21, 2025 17:42

docs: change Bitbucket to Bitbucket Cloud

fd488fd

Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Ushira Dineth <[email protected]>

fix: add BitbucketRepo validation

394cabc

Signed-off-by: Ushira Dineth <[email protected]>

refactor: abstract error handling

d8e478a

Signed-off-by: Ushira Dineth <[email protected]>

refactor: rename bitbucket references to bitbucket cloud

352b2bb

Signed-off-by: Ushira Dineth <[email protected]>

fix: check cast status on resultMap

5436704

Signed-off-by: Ushira Dineth <[email protected]>

ushiradineth added 3 commits November 21, 2025 20:19

fix: use UUID as commit status ID

c0f92db

Signed-off-by: Ushira Dineth <[email protected]>

fix: use strconv.Quote to prevent injection

fc95a70

Signed-off-by: Ushira Dineth <[email protected]>

fix: regen install.yaml

7bde9d9

Signed-off-by: Ushira Dineth <[email protected]>

ushiradineth requested review from crenshaw-dev and zachaller November 26, 2025 09:12

Merge branch 'main' into feat/bitbucket-scm

09465ab

crenshaw-dev changed the title ~~Add Bitbucket Cloud SCM~~ feat(scm): Add Bitbucket Cloud SCM Dec 5, 2025

emirot reviewed Dec 11, 2025

View reviewed changes

feat(scm): Add Bitbucket Cloud SCM #699

Are you sure you want to change the base?

feat(scm): Add Bitbucket Cloud SCM #699

Uh oh!

Conversation

ushiradineth commented Nov 17, 2025

Uh oh!

codecov-commenter commented Nov 17, 2025

Bundle Report

Uh oh!

crenshaw-dev commented Nov 17, 2025

Uh oh!

codecov-commenter commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

zachaller commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ushiradineth commented Nov 17, 2025

Uh oh!

ushiradineth commented Nov 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ushiradineth commented Nov 18, 2025

Uh oh!

crenshaw-dev left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emirot commented Dec 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov-commenter commented Nov 17, 2025 •

edited

Loading

zachaller commented Nov 17, 2025 •

edited

Loading

ushiradineth commented Nov 17, 2025 •

edited

Loading

emirot commented Dec 11, 2025 •

edited

Loading