feat: allow last retry variables in expressions. Fixes #10364#14450
Merged
Joibel merged 21 commits intoargoproj:mainfrom May 21, 2025
Merged
feat: allow last retry variables in expressions. Fixes #10364#14450Joibel merged 21 commits intoargoproj:mainfrom
Joibel merged 21 commits intoargoproj:mainfrom
Conversation
Signed-off-by: eduardodbr <eduardodbr@hotmail.com>
Signed-off-by: eduardodbr <eduardodbr@hotmail.com>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
isubasinghe
changed the title
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Joibel
requested changes
May 8, 2025
util/template/expression_template.go
Outdated
| return fmt.Fprintf(w, "{{%s%s}}", kindExpression, expression) | ||
| } | ||
|
|
||
| if (hasVariableInExpression(unmarshalledExpression, "lastRetry.exitCode") && !hasVarInEnv(env, "lastRetry.exitCode") || |
Member
There was a problem hiding this comment.
Oh, this hack is horrid. But it mirrors what's happening with retries, so I guess we go with it for now.
Can we make this less evil code wise - perhaps list of all the variables we're going to do this for and iterate? Including retry?
Member
Author
There was a problem hiding this comment.
Sure I think we can do this for lastRetry but I do not want to do this for retries. I think they need to be distinct.
I could maybe be refactored to share some common logic though.
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Member
|
Thanks for resurrecting it! Looks good to me. Did you have the time to check @juliev0 suggestion? #12722 (comment) |
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Signed-off-by: isubasinghe <isitha@pipekit.io>
Joibel
approved these changes
May 21, 2025
|
❌ Cherry-pick failed for 3.6. Please check the workflow logs for details. |
Joibel
pushed a commit
that referenced
this pull request
Nov 13, 2025
Co-authored-by: eduardodbr <eduardodbr@hotmail.com> (cherry picked from commit 81130fb) Signed-off-by: eduardodbr <eduardodbr@hotmail.com> Signed-off-by: isubasinghe <isitha@pipekit.io> Signed-off-by: Alan Clucas <alan@clucas.org>
Member
|
Oops, this is a feature so shouldn't be back ported. I was trying to sort out the dependencies for backporting #15033 to release-3.6 |
Joibel
added a commit
that referenced
this pull request
Nov 13, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #10364
Motivation
This PR resurrects the older PR by @eduardodbr to support last retry variable in expressions.
Modifications
This adds a generic function to replace expressions. My change differs somewhat to @eduardodbr's. I didn't agree with his implementation so I changed it. The actual injection is pretty much exactly how retries get injected.
Verification
Verified with the test.
Documentation
Modified the docs to add documentation on the
lastRetryvariable.