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(appcontroller): if a history limit is negative, automatically converted to 0 #22036

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

fix(appcontroller): if a history limit is negative, automatically converted to 0 #22036

wants to merge 12 commits into from
+3 −0

Conversation

kingbj940429
Copy link

Related to #21691

There are two Expected Behaviors

  1. A readable error message pointing out that negative values are not allowed.
  2. Silently interpreting the revisionHistoryLimit as 0.

I choose num 2.

Before

image
image

After

image
image

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).

@kingbj940429 kingbj940429 requested a review from a team as a code owner February 26, 2025 17:02
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Feb 26, 2025 •
edited
Loading

✅ Preview Environment deployed on Bunnyshell

Component Endpoints
argocd https://argocd-nhe6hb.bunnyenv.com/
argocd-ttyd https://argocd-web-cli-nhe6hb.bunnyenv.com/

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔴 /bns:stop to stop the environment
  • 🚀 /bns:deploy to redeploy the environment
  • ❌ /bns:delete to remove the environment

kingbj940429 and others added 11 commits February 27, 2025 02:09
@kingbj940429
WIP on master
37d429a 
fix(appcontroller): if a history limit is negative, automatically converted to 0

Signed-off-by: kingbj0429 <[email protected]>
@rumstead @ishitasequeira
@blakepettersson @kingbj940429
fix(appset): generated app errors should use the default requeue (arg…
c3bef5e 
…oproj#21887) (argoproj#21936)

Signed-off-by: rumstead <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
Co-authored-by: Blake Pettersson <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@agaudreault @kingbj940429
chore(deps): bump go 1.23.5 & tools (argoproj#21748)
5d88902 
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@reggie-k @rumstead
@agaudreault @kingbj940429
feat!: Logs rbac enforce by default (argoproj#21678)
4d117e9 
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Regina Voloshin <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: rumstead <[email protected]>
Co-authored-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@leoluz @kingbj940429
docs: add applicationset controller doc to preserve annotations and l…
7da9162 
…abels (argoproj#22008)

Signed-off-by: Leonardo Luz Almeida <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@dependabot @kingbj940429
chore(deps): bump golang.org/x/oauth2 from 0.26.0 to 0.27.0 (argoproj…
d865076 
…#21990)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: kingbj0429 <[email protected]>
@dependabot @kingbj940429
chore(deps): bump github.com/go-jose/go-jose/v4 from 4.0.2 to 4.0.5 (a…
50a0713 
…rgoproj#21989)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: kingbj0429 <[email protected]>
@igaskin @kingbj940429
chore: version bumping helm3 (argoproj#22009)
233828b 
Signed-off-by: Isaac Gaskin <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@toyamagu-2021 @kingbj940429
fix: fetch syncedRevision in UpdateRevisionForPaths (argoproj#21014) (a…
ddd2751 
…rgoproj#21015)

Signed-off-by: toyamagu2021 <[email protected]>
Signed-off-by: toyamagu-2021 <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@nitishfy @blakepettersson @kingbj940429
docs: add more info on what login --core does (argoproj#21487)
b302d00 
Signed-off-by: nitishfy <[email protected]>
Signed-off-by: Nitish Kumar <[email protected]>
Co-authored-by: Blake Pettersson <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@surajyadav1108 @kingbj940429
fix(ui): Added SSV option to helm type repos (argoproj#22006)
bb59553 
Signed-off-by: Surajyadav <[email protected]>
Signed-off-by: kingbj0429 <[email protected]>
@kingbj940429 kingbj940429 force-pushed the kingbj940429/fix-history-causes-panic branch from 0a156f9 to bb59553 Compare February 26, 2025 17:10
@kingbj940429 kingbj940429 requested review from a team as code owners February 26, 2025 17:10
rumstead
rumstead reviewed Feb 26, 2025
View reviewed changes
pkg/apis/application/v1alpha1/types.go
@@ -1287,6 +1287,9 @@ func (in RevisionHistories) LastRevisionHistory() RevisionHistory {

// Trunc truncates the list of history items to size n
func (in RevisionHistories) Trunc(n int) RevisionHistories {
if n < 0 {
Copy link
Member

Choose a reason for hiding this comment

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

although a smallish change, we should add some test cases

Copy link
Author

Choose a reason for hiding this comment

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

which test cases do I add? :)

Copy link
Member

Choose a reason for hiding this comment

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

I would expand on Test_appStateManager_persistRevisionHistory and add a case where "-1" becomes 0. It should be pretty easy to get 100% code coverage on your changes :)

@codecov Codecov
Copy link

codecov bot commented Feb 26, 2025

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@b88ad57). Learn more about missing BASE report.
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
pkg/apis/application/v1alpha1/types.go 0.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #22036   +/-   ##
=========================================
  Coverage          ?   55.74%           
=========================================
  Files             ?      342           
  Lines             ?    57077           
  Branches          ?        0           
=========================================
  Hits              ?    31816           
  Misses            ?    22619           
  Partials          ?     2642

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rumstead rumstead rumstead left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@kingbj940429 @rumstead @agaudreault @reggie-k @leoluz @igaskin @toyamagu-2021 @nitishfy @surajyadav1108