Skip to content

fix: add target branch support for bitbucket cloud pull request gener… #22402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
May 2, 2025
Merged

fix: add target branch support for bitbucket cloud pull request gener… #22402

merged 6 commits into from
May 2, 2025

Conversation

@mihallis
Copy link
Contributor

@mihallis mihallis commented Mar 19, 2025

Fix #22005

@mihallis mihallis requested a review from a team as a code owner March 19, 2025 09:12
@bunnyshell
Copy link

bunnyshell bot commented Mar 19, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@mihallis mihallis force-pushed the bugfix/add-target-branch-bitbucket-cloud branch from 0fe88ba to 7eb28a4 Compare March 19, 2025 09:18
@codecov
Copy link

codecov bot commented Mar 19, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 56.14%. Comparing base (7d81d1a) to head (e83f598).
⚠️ Report is 479 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #22402      +/-   ##
==========================================
+ Coverage   56.09%   56.14%   +0.04%     
==========================================
  Files         343      343              
  Lines       57545    57546       +1     
==========================================
+ Hits        32282    32310      +28     
+ Misses      22616    22602      -14     
+ Partials     2647     2634      -13

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

crenshaw-dev
crenshaw-dev previously requested changes Mar 19, 2025
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Could you add unit tests?

@mihallis
Copy link
Contributor Author

mihallis commented Mar 19, 2025

Thanks for the PR! Could you add unit tests?

Done

@mihallis mihallis requested a review from crenshaw-dev March 20, 2025 13:18
ishitasequeira
ishitasequeira reviewed Mar 24, 2025
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @CMDMichalKoval !!

Could you also update the documentation explaining the new field here ?

@mihallis mihallis requested a review from a team as a code owner March 24, 2025 17:00
@mihallis
Copy link
Contributor Author

mihallis commented Mar 24, 2025

@ishitasequeira I have updated the docs and added more examples for filters

@mihallis mihallis requested a review from ishitasequeira March 24, 2025 17:05
@mihallis
Copy link
Contributor Author

mihallis commented Mar 28, 2025

@crenshaw-dev @ishitasequeira can you look at this, please?

@mihallis
Copy link
Contributor Author

mihallis commented Apr 15, 2025

@crenshaw-dev can you please unblock PR and merge it ?

@mihallis mihallis force-pushed the bugfix/add-target-branch-bitbucket-cloud branch from f1012db to dba7c93 Compare April 24, 2025 07:54
olivergondza
olivergondza reviewed Apr 24, 2025
View reviewed changes
applicationset/services/pull_request/bitbucket_cloud.go Outdated
}

type BitbucketCloudPullRequestDestinationBranch struct {
BitbucketCloudPullRequestSourceBranch
Copy link
Contributor

@olivergondza olivergondza Apr 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I advise not to reuse the fields for source in destination, even when they are the same now. That will let the two evolve separately without nasty surprises to future maintainers.

Copy link
Contributor Author

@mihallis mihallis Apr 24, 2025

Choose a reason for hiding this comment

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

Good point! I already updated it with own type

@mihallis mihallis requested a review from olivergondza April 24, 2025 12:38
olivergondza
olivergondza reviewed Apr 24, 2025
View reviewed changes
Copy link
Contributor

@olivergondza olivergondza left a comment

Choose a reason for hiding this comment

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

The code looks good to me!

ishitasequeira
ishitasequeira approved these changes Apr 27, 2025
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

LGTM!!

@ishitasequeira ishitasequeira enabled auto-merge (squash) April 27, 2025 21:37
@ishitasequeira ishitasequeira disabled auto-merge April 27, 2025 21:37
@ishitasequeira
Copy link
Member

ishitasequeira commented Apr 27, 2025

@crenshaw-dev , any more concerns on the PR?

@crenshaw-dev crenshaw-dev merged commit 99faf82 into argoproj:master May 2, 2025
27 checks passed
LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 4, 2025
@mihallis @ishitasequeira @LyhengTep
feat(appset): add target branch support for bitbucket cloud pull requ…
c165fa6 
…est generator (argoproj#22402)

Signed-off-by: Michal Koval <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
ranakan19 pushed a commit to ranakan19/argo-cd that referenced this pull request May 20, 2025
@mihallis @ishitasequeira @ranakan19
feat(appset): add target branch support for bitbucket cloud pull requ…
702cfde 
…est generator (argoproj#22402)

Signed-off-by: Michal Koval <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
Signed-off-by: Kanika Rana <[email protected]>
olivergondza pushed a commit to olivergondza/argo-cd that referenced this pull request May 20, 2025
@mihallis @ishitasequeira @olivergondza
feat(appset): add target branch support for bitbucket cloud pull requ…
5e2b835 
…est generator (argoproj#22402)

Signed-off-by: Michal Koval <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
Signed-off-by: Oliver Gondža <[email protected]>
chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
@mihallis @ishitasequeira @chansuke
feat(appset): add target branch support for bitbucket cloud pull requ…
b2b07eb 
…est generator (argoproj#22402)

Signed-off-by: Michal Koval <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ishitasequeira ishitasequeira ishitasequeira approved these changes

@crenshaw-dev crenshaw-dev Awaiting requested review from crenshaw-dev

+1 more reviewer

@olivergondza olivergondza olivergondza left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

targetBranchMatch filter does not work with pullRequest generator for Bitbucket Cloud

4 participants

@mihallis @ishitasequeira @olivergondza @crenshaw-dev