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: JSON unmarshaling error handling and nil return #18700

Merged
merged 3 commits into from
Jun 18, 2024
Merged

fix: JSON unmarshaling error handling and nil return #18700

merged 3 commits into from
Jun 18, 2024

Conversation

Yuni-sa
Copy link
Contributor

@Yuni-sa Yuni-sa commented Jun 17, 2024 •
edited
Loading

Closes #18604
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).

@Yuni-sa
fix: JSON unmarshaling error handling and nil return in ExecuteHealth…
afc6b48 
…Lua function

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>
@Yuni-sa Yuni-sa requested a review from a team as a code owner June 17, 2024 04:53
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Jun 17, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@codecov Codecov
Copy link

codecov bot commented Jun 17, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 50.28%. Comparing base (4c6ad9d) to head (cb40979).
Report is 484 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #18700      +/-   ##
==========================================
- Coverage   50.28%   50.28%   -0.01%     
==========================================
  Files         312      312              
  Lines       43020    43025       +5     
==========================================
  Hits        21633    21633              
- Misses      18905    18913       +8     
+ Partials     2482     2479       -3

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

agaudreault
agaudreault approved these changes Jun 17, 2024
View reviewed changes
Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

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

LGTM 👍

util/lua/lua.go Show resolved Hide resolved
crenshaw-dev and others added 2 commits June 17, 2024 17:43
@crenshaw-dev @agaudreault
Update util/lua/lua.go
eebfe1e 
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@Yuni-sa
Merge branch 'master' into fix-lua-nil-return
cb40979
ishitasequeira
ishitasequeira approved these changes Jun 18, 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 18, 2024 01:47
@ishitasequeira ishitasequeira merged commit f8e2ca7 into argoproj:master Jun 18, 2024
26 checks passed
ggjulio pushed a commit to ggjulio/argo-cd that referenced this pull request Jul 21, 2024
@Yuni-sa @crenshaw-dev
@agaudreault @ggjulio
fix: JSON unmarshaling error handling and nil return (argoproj#18700)
f9745ef 
* fix: JSON unmarshaling error handling and nil return in ExecuteHealthLua function

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>

* Update util/lua/lua.go

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
jsolana pushed a commit to jsolana/argo-cd that referenced this pull request Jul 24, 2024
@Yuni-sa @crenshaw-dev @agaudreault
fix: JSON unmarshaling error handling and nil return (argoproj#18700)
feba5f8 
* fix: JSON unmarshaling error handling and nil return in ExecuteHealthLua function

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>

* Update util/lua/lua.go

Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: Yonatan Sasson <yonatanxd7@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
Signed-off-by: Javier Solana <javier.solana@cabify.com>
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

@agaudreault agaudreault agaudreault approved these changes

Assignees

@agaudreault agaudreault

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

Successfully merging this pull request may close these issues.

Health Lua script cannot return nil status object
4 participants
@Yuni-sa @ishitasequeira @agaudreault @crenshaw-dev