Skip to content

fix: upgrade expr to bring in bugfix. Fixes #15093 #15168

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
Joibel merged 1 commit into from
Dec 16, 2025
Merged

fix: upgrade expr to bring in bugfix. Fixes #15093 #15168

Joibel merged 1 commit into from
Dec 16, 2025

Conversation

@MasonM
Copy link
Member

@MasonM MasonM commented Dec 16, 2025 •
edited
Loading

Fixes #15093

Motivation

As @dmarquez-splunk discovered, the expr upgrade in #14307 introduced a regression when evaluating an expression that has a call to a variadic function with nil. This was fixed in expr-lang/expr#868, which was released as v1.17.7.

Modifications

Update expr

Verification

Added a test case

Documentation

N/A

@MasonM
fix: upgrade Sprig to bring in bugfix. Fixes argoproj#15093
e2b7ef0 
As @dmarquez-splunk discovered, the Sprig upgrade in argoproj#14307 introduced a
regression when evaluating an expression that has a call to a variadic
Sprig function with `nil`. This was fixed in
expr-lang/expr#868, which was released as
[v1.17.7](https://github.com/expr-lang/expr/releases/tag/v1.17.7).

I also added a test case to prevent regressions.

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
@MasonM MasonM changed the title fix: upgrade Sprig to bring in bugfix. Fixes #15093 fix: upgrade expr to bring in bugfix. Fixes #15093 Dec 16, 2025
@MasonM MasonM added type/regression Regression from previous behavior (a specific type of bug) cherry-pick/3.7 Cherry-pick this to release-3.7 labels Dec 16, 2025
@MasonM MasonM mentioned this pull request Dec 16, 2025
Closed
4 tasks
@MasonM MasonM added the cherry-pick/3.6 Cherry-pick this to release-3.6 label Dec 16, 2025
@MasonM MasonM marked this pull request as ready for review December 16, 2025 04:16
@MasonM MasonM requested a review from Joibel December 16, 2025 04:17
@Joibel Joibel merged commit 4117a1e into argoproj:main Dec 16, 2025
49 checks passed
@Joibel
Copy link
Member

Joibel commented Dec 16, 2025

Thank you

@argo-cd-cherry-pick-bot
Copy link

argo-cd-cherry-pick-bot bot commented Dec 16, 2025

❌ Cherry-pick failed for 3.6. Please check the workflow logs for details.

argo-cd-cherry-pick-bot bot pushed a commit that referenced this pull request Dec 16, 2025
@MasonM @github-actions
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
fe214f8 
Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
@argo-cd-cherry-pick-bot
Copy link

argo-cd-cherry-pick-bot bot commented Dec 16, 2025

🍒 Cherry-pick PR created for 3.7: #15171

@argo-cd-cherry-pick-bot argo-cd-cherry-pick-bot bot mentioned this pull request Dec 16, 2025
Merged
@dmarquez-splunk
Copy link
Contributor

dmarquez-splunk commented Dec 16, 2025

❌ Cherry-pick failed for 3.6. Please check the workflow logs for details.

Do we need to manually cherry-pik to 3.6? I'd like these changes to be incorporated into the prev version to avoid requiring an upgrade to resolve this issue for us in the short term if possible!

Joibel pushed a commit that referenced this pull request Dec 16, 2025
@MasonM @Joibel
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
a007770 
Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Joibel pushed a commit that referenced this pull request Dec 16, 2025
@MasonM @Joibel
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
1eacc70 
(cherry picked from commit 4117a1e)

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Signed-off-by: Alan Clucas <alan@clucas.org>
@Joibel Joibel mentioned this pull request Dec 16, 2025
Merged
Joibel pushed a commit that referenced this pull request Dec 16, 2025
@MasonM @Joibel
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
876ff8e 
(cherry picked from commit 4117a1e)

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Signed-off-by: Alan Clucas <alan@clucas.org>
Joibel pushed a commit that referenced this pull request Dec 16, 2025
@MasonM @Joibel
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
dc54f23 
(cherry picked from commit 4117a1e)

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Signed-off-by: Alan Clucas <alan@clucas.org>
@Joibel
Copy link
Member

Joibel commented Dec 16, 2025

❌ Cherry-pick failed for 3.6. Please check the workflow logs for details.

Do we need to manually cherry-pik to 3.6? I'd like these changes to be incorporated into the prev version to avoid requiring an upgrade to resolve this issue for us in the short term if possible!

I've got tooling to help with this - so I've already done it. I use the labels for tracking them, and then discover failed cherry-picks and do them locally. Sometimes I appreciate someone else doing it, so thanks, but I've got this one.

MasonM added a commit that referenced this pull request Dec 17, 2025
@MasonM
fix: upgrade expr to bring in bugfix. Fixes #15093 (#15168)
29c9610 
(cherry picked from commit 4117a1e)

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Signed-off-by: Alan Clucas <alan@clucas.org>
Willem-J-an pushed a commit to Willem-J-an/argo-workflows that referenced this pull request Dec 31, 2025
@argo-cd-cherry-pick-bot @MasonM
fix: upgrade expr to bring in bugfix. Fixes argoproj#15093 (cherry-pick
7ff6dde 
argoproj#15168 for 3.7) (argoproj#15171)

Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Co-authored-by: Mason Malone <651224+MasonM@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Joibel Joibel Joibel approved these changes

Assignees

No one assigned

Labels

cherry-pick/3.6 Cherry-pick this to release-3.6 cherry-pick/3.7 Cherry-pick this to release-3.7 type/regression Regression from previous behavior (a specific type of bug)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Sprig templating not respected

3 participants

@MasonM @Joibel @dmarquez-splunk