Add Bitbucket server/Bitbucket Data Center provider for git commit status #639

gdasson · 2023-10-31T05:00:38Z

Atlassian Bitbucket product offers multiple hosting options as documented here

For Flux users that use Bitbucket server or Bitbucket data center solution(mostly enterprises), there is no provider to support posting Git Commit Statuses. This PR provides the git commit status functionality for Bitbucket Server/Data Center.

[ Note: The reason that we can't use existing bitbucket provider and the need for a new bitbucketserver provider stems from the fact that the REST API used by Bitbucket Server/Data Center product is different from Bitbucket Cloud REST API. The existing bitbucket provider can only support Bitbucket cloud. ]

This PR fixes issue: #507

gdasson · 2023-10-31T18:48:14Z

Screenshots attached to show how the Git Commit Statuses will look like on the Bitbucket Server UI once this is implemented.

makkes

Left a couple of comments. My main concern is the pulling-in of that library.

api/v1beta1/provider_types.go

docs/spec/v1beta2/providers.md

internal/notifier/bitbucketserver.go

internal/notifier/bitbucketserver_test.go

internal/notifier/util.go

gdasson · 2023-11-03T17:15:49Z

@makkes : Thanks for the review and feedback. I have reimplemented the http calls using resty/http library.

makkes · 2023-11-03T17:25:49Z

@makkes : Thanks for the review and feedback. I have reimplemented the http calls using resty/http library.

I really don't see the need to pull in any additional library just for a couple of very simple HTTP calls that can just as well be made using net/http.

gdasson · 2023-11-05T03:09:41Z

@makkes I have reimplemented the HTTP calls using native net/http library/package. Please let me know for any other feedback. Thx.

makkes

Looks much better now. I added a couple of additional comments.

docs/spec/v1beta1/providers.md

docs/spec/v1beta2/providers.md

go.mod

internal/notifier/factory.go

internal/notifier/bitbucketserver.go

darkowlzz

The code looks great to me.
Left a few minor suggestions. I think we'll ready to merge after that.

Also, please rebase the commits and squash them to a few relevant commits if possible.

internal/notifier/bitbucketserver.go

internal/notifier/bitbucketserver_test.go

makkes

Just some formatting suggestions. Rest lgtm module what darkowlzz asked for.

docs/spec/v1beta2/providers.md

makkes · 2023-11-18T08:21:19Z

Not sure what happened here but now there's 2 commits and also changes to .github/workflows/ which shouldn't be here. Please rebase on top of main and squash your commits into one.

gdasson · 2023-11-18T19:57:09Z

Sorry I had messed up my branch a li'l bit. I have reduced the commits by squashing. Does this look fine now? @makkes @darkowlzz

makkes · 2023-11-19T07:44:48Z

You still have 3 commits in this PR, two of which are basically the same, plus a merge commit. Please remove the merge commit (rebase instead of merge) and make sure this PR shows a single commit in the "Commits" tab.

Signed-off-by: gdasson <gaurav.dasson@gmail.com>

gdasson · 2023-11-21T05:20:21Z

@makkes : Sorry, I was being a bit lazy there 😆. Rebased and squashed down to 1 commit now. Please review. Thanks.

makkes

Just one last bit, then we're done here. Great job!

makkes · 2023-11-21T08:33:21Z

docs/spec/v1beta2/providers.md

+| ------------------------------------------------| ----------------- |
+| [Azure DevOps](#azure-devops)                   | `azuredevops`     |
+| [Bitbucket](#bitbucket)                         | `bitbucket`       |
+| [BitbucketServer](#bitbucket-serverdata-center) | `bitbucketserver` |


makkes

Oops, selected the wrong item in the previous review.

stefanprodan · 2023-11-21T09:22:45Z

Thanks @gdasson 🏅

gdasson changed the title ~~Add Bitbucket server (a.k.a Bitbucket Data Center) provider for git commit status~~ Add Bitbucket server/Bitbucket Data Center provider for git commit status Oct 31, 2023

makkes reviewed Nov 1, 2023

View reviewed changes

gdasson force-pushed the main branch from b633a65 to 9fd9b81 Compare November 3, 2023 17:07

makkes reviewed Nov 6, 2023

View reviewed changes

darkowlzz reviewed Nov 8, 2023

View reviewed changes

internal/notifier/bitbucketserver.go Outdated Show resolved Hide resolved

internal/notifier/bitbucketserver.go Outdated Show resolved Hide resolved

darkowlzz reviewed Nov 8, 2023

View reviewed changes

internal/notifier/bitbucketserver.go Outdated Show resolved Hide resolved

darkowlzz reviewed Nov 8, 2023

View reviewed changes

internal/notifier/bitbucketserver.go Outdated Show resolved Hide resolved

darkowlzz reviewed Nov 8, 2023

View reviewed changes

darkowlzz reviewed Nov 17, 2023

View reviewed changes

internal/notifier/bitbucketserver.go Outdated Show resolved Hide resolved

internal/notifier/bitbucketserver_test.go Outdated Show resolved Hide resolved

internal/notifier/bitbucketserver_test.go Show resolved Hide resolved

makkes reviewed Nov 17, 2023

View reviewed changes

docs/spec/v1beta2/providers.md Outdated Show resolved Hide resolved

docs/spec/v1beta2/providers.md Outdated Show resolved Hide resolved

gdasson force-pushed the main branch from 6a7a5b1 to 2bc92e9 Compare November 18, 2023 04:29

gdasson force-pushed the main branch from d7c3de2 to ed31937 Compare November 21, 2023 05:06

Adding bitbucketserver provider for git commit status

504dc99

Signed-off-by: gdasson <gaurav.dasson@gmail.com>

gdasson force-pushed the main branch from ed31937 to 504dc99 Compare November 21, 2023 05:18

stefanprodan added the area/alerting Alerting related issues and PRs label Nov 21, 2023

stefanprodan mentioned this pull request Nov 21, 2023

Prepare for Flux v2.2.0 fluxcd/flux2#4410

Closed

14 tasks

makkes approved these changes Nov 21, 2023

View reviewed changes

makkes requested changes Nov 21, 2023

View reviewed changes

makkes approved these changes Nov 21, 2023

View reviewed changes

makkes merged commit 9869e39 into fluxcd:main Nov 21, 2023
7 checks passed

stefanprodan mentioned this pull request Nov 21, 2023

Refactor events and introduce v1beta3 API for Alert and Provider #540

Merged

This was referenced Dec 29, 2023

Panic while using bitbucketserver provider for git commit status #700

Closed

Make bitbucket server/data center git commit status functionality more robust #701

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Bitbucket server/Bitbucket Data Center provider for git commit status #639

Add Bitbucket server/Bitbucket Data Center provider for git commit status #639

gdasson commented Oct 31, 2023 •

edited

gdasson commented Oct 31, 2023 •

edited

makkes left a comment

gdasson commented Nov 3, 2023

makkes commented Nov 3, 2023

gdasson commented Nov 5, 2023

makkes left a comment

darkowlzz left a comment •

edited

makkes left a comment

makkes commented Nov 18, 2023

gdasson commented Nov 18, 2023

makkes commented Nov 19, 2023

gdasson commented Nov 21, 2023 •

edited

makkes left a comment

makkes Nov 21, 2023

makkes left a comment

stefanprodan commented Nov 21, 2023

	\| [BitbucketServer](#bitbucket-serverdata-center) \| `bitbucketserver` \|
	\| [Bitbucket Server/Data Center](#bitbucket-serverdata-center) \| `bitbucketserver` \|

Add Bitbucket server/Bitbucket Data Center provider for git commit status #639

Add Bitbucket server/Bitbucket Data Center provider for git commit status #639

Conversation

gdasson commented Oct 31, 2023 • edited

gdasson commented Oct 31, 2023 • edited

makkes left a comment

Choose a reason for hiding this comment

gdasson commented Nov 3, 2023

makkes commented Nov 3, 2023

gdasson commented Nov 5, 2023

makkes left a comment

Choose a reason for hiding this comment

darkowlzz left a comment • edited

Choose a reason for hiding this comment

makkes left a comment

Choose a reason for hiding this comment

makkes commented Nov 18, 2023

gdasson commented Nov 18, 2023

makkes commented Nov 19, 2023

gdasson commented Nov 21, 2023 • edited

makkes left a comment

Choose a reason for hiding this comment

makkes Nov 21, 2023

Choose a reason for hiding this comment

makkes left a comment

Choose a reason for hiding this comment

stefanprodan commented Nov 21, 2023

gdasson commented Oct 31, 2023 •

edited

gdasson commented Oct 31, 2023 •

edited

darkowlzz left a comment •

edited

gdasson commented Nov 21, 2023 •

edited