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 handling of runlabel IMAGE and NAME #10193

Merged
merged 1 commit into from
May 5, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented May 3, 2021

Fixes: #10192

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 3, 2021
@vrothberg
Copy link
Member

@rhatdan , can we hold that back until #10147 is merged? It's terribly close to completion.

@rhatdan
Copy link
Member Author

rhatdan commented May 3, 2021

Sure, but I doubt this conflicts.

@vrothberg
Copy link
Member

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))
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

Theoretically yes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link
Collaborator

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ashley-cui
Copy link
Member

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 5, 2021
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 5, 2021
newarg := strings.ReplaceAll(arg, "$NAME", name)
return strings.ReplaceAll(newarg, "${NAME}", name)
newarg = strings.ReplaceAll(newarg, "${NAME}", name)
if strings.HasSuffix(newarg, "=NAME") {
Copy link
Member

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.

Copy link
Member Author

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.

@TomSweeneyRedHat
Copy link
Member

LGTM
The fedora 34 test failed for reasons unknown, I've restarted

@rhatdan
Copy link
Member Author

rhatdan commented May 5, 2021

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 5, 2021
@openshift-merge-robot openshift-merge-robot merged commit ed6f399 into containers:master May 5, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Parsing of IMAGE in runlabel command changed behavior in 4d4baba
7 participants