Skip to content

feat: gen BB-cloud client + alternative merge-strategy support#6315

Merged
fuskovic merged 20 commits into
mainfrom
fuskovic/gen-bb-cloud-client
May 26, 2026
Merged

feat: gen BB-cloud client + alternative merge-strategy support#6315
fuskovic merged 20 commits into
mainfrom
fuskovic/gen-bb-cloud-client

Conversation

@fuskovic

Copy link
Copy Markdown
Member

#6128 was blocked on BB datacenter/server end-to-end testing so I decided to move them into a separate PR to unblock progress on non-server/datacenter logic.

Demo

The promotion workflow is configured to:

  • Make two commits on a new branch.
  • Each commit adds a new file.
  • git-merge-pr is configured to use the squash merge strategy.
  • Demo shows the 2 file updates are consolidated into one commit on merge.
squash.mov

Test repo was using a merge_commit default merge strategy.

This means the merge method we configured was prioritized over the default (as expected) :

default_merge_strategy

fuskovic added 18 commits April 20, 2026 17:36
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
@fuskovic fuskovic self-assigned this May 19, 2026
@fuskovic fuskovic requested a review from a team as a code owner May 19, 2026 12:08
@fuskovic fuskovic added the kind/enhancement An entirely new feature label May 19, 2026
@fuskovic fuskovic requested a review from a team as a code owner May 19, 2026 12:08
@fuskovic fuskovic added priority/low Low commitment from maintainers; progress is likely to be community-driven area/external-providers Related to external API providers labels May 19, 2026
@kargo-governance-bot kargo-governance-bot Bot added area/controller Affects the (main) controller kind/discussion Applied to issues that are simply conversations; consider opening an actual discussion instead kind/refactor Non-functional changes to implementation details labels May 19, 2026
@netlify

netlify Bot commented May 19, 2026

Copy link
Copy Markdown

Deploy Preview for docs-kargo-io ready!

Name Link
🔨 Latest commit fca109c
🔍 Latest deploy log https://app.netlify.com/projects/docs-kargo-io/deploys/6a1574feb7dff7000807c5be
😎 Deploy Preview https://deploy-preview-6315.docs.kargo.io
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@fuskovic fuskovic added this to the v1.11.0 milestone May 19, 2026
Signed-off-by: fuskovic <fhuskovic92@gmail.com>
@fuskovic fuskovic changed the title feat: generate BB-cloud client + merge-strategy-support feat: gen BB-cloud client + alternative merge-strategy support May 19, 2026
@codecov

codecov Bot commented May 19, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 84.34164% with 44 lines in your changes missing coverage. Please review.
✅ Project coverage is 58.15%. Comparing base (6f12e62) to head (fca109c).
⚠️ Report is 51 commits behind head on main.

Files with missing lines Patch % Lines
pkg/gitprovider/bitbucket/cloud/provider.go 84.34% 30 Missing and 14 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6315      +/-   ##
==========================================
+ Coverage   57.90%   58.15%   +0.25%     
==========================================
  Files         496      500       +4     
  Lines       41495    41886     +391     
==========================================
+ Hits        24026    24358     +332     
- Misses      16020    16066      +46     
- Partials     1449     1462      +13     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@fuskovic fuskovic removed kind/discussion Applied to issues that are simply conversations; consider opening an actual discussion instead kind/refactor Non-functional changes to implementation details labels May 19, 2026
Comment thread pkg/gitprovider/bitbucket/cloud/provider.go

@hairyhum hairyhum left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: fuskovic <fhuskovic92@gmail.com>
@fuskovic fuskovic added this pull request to the merge queue May 26, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 26, 2026
@fuskovic fuskovic added this pull request to the merge queue May 26, 2026
@fuskovic fuskovic removed this pull request from the merge queue due to a manual request May 26, 2026
@fuskovic fuskovic added this pull request to the merge queue May 26, 2026
Merged via the queue into main with commit 7ef8a31 May 26, 2026
21 checks passed
@fuskovic fuskovic deleted the fuskovic/gen-bb-cloud-client branch May 26, 2026 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/controller Affects the (main) controller area/external-providers Related to external API providers kind/enhancement An entirely new feature priority/low Low commitment from maintainers; progress is likely to be community-driven

Projects

None yet

Development

Successfully merging this pull request may close these issues.

proposal: generate a Bitbucket Cloud API client from the official OpenAPI spec feat: support alternatively specified merge strategies for bitbucket

2 participants