-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 handling of runlabel IMAGE and NAME #10193
Conversation
Sure, but I doubt this conflicts. |
Thanks! I touched the runlabel code quite a bit and want to prevent further merge conflicts. |
newarg := strings.ReplaceAll(arg, "$NAME", name) | ||
return strings.ReplaceAll(newarg, "${NAME}", name) | ||
newarg = strings.ReplaceAll(newarg, "${NAME}", name) | ||
return strings.ReplaceAll(newarg, "=NAME", fmt.Sprintf("=%s", name)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could NAME
be the prefix of another variable =NAMEFOO
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Theoretically yes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
Fixes: containers#10192 Signed-off-by: Daniel J Walsh <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/lgtm |
newarg := strings.ReplaceAll(arg, "$NAME", name) | ||
return strings.ReplaceAll(newarg, "${NAME}", name) | ||
newarg = strings.ReplaceAll(newarg, "${NAME}", name) | ||
if strings.HasSuffix(newarg, "=NAME") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to have a trailing space after NAME here? If so, we probably want to trim it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No these are arguments, only if the user wrapped something with "foo=NAME " would that happen, and in that case I think we should ignore.
LGTM |
/hold cancel |
Fixes: #10192
Signed-off-by: Daniel J Walsh [email protected]