Skip to content
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

fix(webhook): bitbucket and azure not triggering refresh (#18289) #18765

Merged
merged 7 commits into from
Jun 25, 2024
Merged

fix(webhook): bitbucket and azure not triggering refresh (#18289) #18765

merged 7 commits into from
Jun 25, 2024

Conversation

agaudreault
Copy link
Member

@agaudreault agaudreault commented Jun 21, 2024 •
edited
Loading

Closes #18289

Some optimizations won't be available for all SCMs, but if the SCM does not implement the feature, it is better to cause a refresh.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@agaudreault
fix(webhook): bitbucket and azure webhook not triggering refresh
742fc21 
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault agaudreault requested a review from a team as a code owner June 21, 2024 18:51
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Jun 21, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Jun 21, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@agaudreault agaudreault changed the title fix(webhook): bitbucket and azure webhook not triggering refresh (#18289) fix(webhook): bitbucket and azure not triggering refresh (#18289) Jun 21, 2024
@agaudreault
update unit test
0f72c19 
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault
Copy link
Member Author

This should be cherry picked in 2.11 and 2.12

@agaudreault
Merge branch 'master' into fix-scm-webhook
4f1400f
@agaudreault
fix merge
0351e9d 
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault
adjust logic for reposerver using ls-remote
33d8eb0 
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@codecov Codecov
Copy link

codecov bot commented Jun 25, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 50.29%. Comparing base (56c12db) to head (33d8eb0).
Report is 2 commits behind head on master.

❗ Current head 33d8eb0 differs from pull request most recent head 645475e

Please upload reports for the commit 645475e to get more accurate results.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #18765   +/-   ##
=======================================
  Coverage   50.28%   50.29%           
=======================================
  Files         315      315           
  Lines       43126    43128    +2     
=======================================
+ Hits        21687    21691    +4     
+ Misses      18960    18955    -5     
- Partials     2479     2482    +3

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

ishitasequeira
ishitasequeira approved these changes Jun 25, 2024
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) June 25, 2024 17:22
@ishitasequeira ishitasequeira merged commit f358e8d into argoproj:master Jun 25, 2024
26 checks passed
@agaudreault
Copy link
Member Author

/cherry-pick release-2.12

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jun 25, 2024
@agaudreault
fix(webhook): bitbucket and azure not triggering refresh (#18289) (#1…
4278ae3 
…8765)

* fix(webhook): bitbucket and azure webhook not triggering refresh

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* update unit test

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* fix merge

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* adjust logic for reposerver using ls-remote

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

---------

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Jun 25, 2024
Merged
@agaudreault
Copy link
Member Author

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jun 25, 2024
@agaudreault
fix(webhook): bitbucket and azure not triggering refresh (#18289) (#1…
2dfc6fb 
…8765)

* fix(webhook): bitbucket and azure webhook not triggering refresh

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* update unit test

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* fix merge

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

* adjust logic for reposerver using ls-remote

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

---------

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Jun 25, 2024
Merged
ishitasequeira pushed a commit that referenced this pull request Jun 26, 2024
@gcp-cherry-pick-bot @agaudreault
fix(webhook): bitbucket and azure not triggering refresh (#18289) (#1…
573c771 
…8765) (#18818)

* fix(webhook): bitbucket and azure webhook not triggering refresh



* update unit test



* fix merge



* adjust logic for reposerver using ls-remote



---------

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
ishitasequeira pushed a commit that referenced this pull request Jun 26, 2024
@gcp-cherry-pick-bot @agaudreault
fix(webhook): bitbucket and azure not triggering refresh (#18289) (#1…
07880f3 
…8765) (#18819)

* fix(webhook): bitbucket and azure webhook not triggering refresh



* update unit test



* fix merge



* adjust logic for reposerver using ls-remote



---------

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pasha-codefresh pasha-codefresh pasha-codefresh approved these changes

@ishitasequeira ishitasequeira ishitasequeira approved these changes

@alexymantha alexymantha Awaiting requested review from alexymantha

Assignees
No one assigned
Labels
None yet
Projects
Argo CD Roadmap
Status: Completed
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bug: Webhook trigger from Bitbucket does not refresh Applications in 2.11.0
3 participants
@agaudreault @pasha-codefresh @ishitasequeira