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.

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

fix(appset): return error on invalid annotations (#13730) #13743

Merged

Conversation

raxod502-plaid
Copy link
Contributor

@raxod502-plaid raxod502-plaid commented May 25, 2023

Closes #13730.

Basically, when we run into a fatal error while trying to manipulate annotations or labels, return that error, instead of silently ignoring it as described in the linked issue. For cases where we were already ignoring errors at a higher level, I kept ignoring them, but I tried to abort in cases where it is important for the returned value to be correct. Added unit tests to cover the error cases.

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.
  • Optional. My organization is added to USERS.md.
  • 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.

Signed-off-by: Radon Rosborough <rrosborough@plaid.com>
@raxod502-plaid raxod502-plaid force-pushed the rr-handle-nonstring-annotations branch from cb85d20 to dce871d Compare May 25, 2023 14:37
@raxod502-plaid raxod502-plaid changed the title fix(appset): return error on invalid annotations fix(appset): return error on invalid annotations (#13730) May 25, 2023
@raxod502-plaid raxod502-plaid marked this pull request as ready for review May 28, 2023 18:17
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, @raxod502-plaid!

@crenshaw-dev crenshaw-dev merged commit d49d2ae into argoproj:master May 28, 2023
@raxod502-plaid raxod502-plaid deleted the rr-handle-nonstring-annotations branch May 29, 2023 21:08
@raxod502-plaid
Copy link
Contributor Author

Thank you!!

yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
Signed-off-by: Radon Rosborough <rrosborough@plaid.com>
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
Signed-off-by: Radon Rosborough <rrosborough@plaid.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Non-string annotation results in all annotations being deleted in diff
3 participants