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

generate systemd: quote arguments with whitespace #7350

Merged
merged 1 commit into from
Aug 19, 2020

Conversation

vrothberg
Copy link
Member

Make sure that arguments with whitespace are properly quoted so they are
interpreted as one (and not multiple ones) by systemd.

Now -e tz="america/new york" will be generated as -e "tz=america/new york".
The quotes are moving but the argument is still correct.

Fixes: #7285
Signed-off-by: Valentin Rothberg [email protected]

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

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

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

@mheon a late candidate for 2.0.

@edsantiago, I need a head nod from you before we can merge. Can you think of a case where the changes could lead to a regression?

@rhatdan
Copy link
Member

rhatdan commented Aug 18, 2020

LGTM

Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

I'm embarrassed not to have caught this in my testing. LGTM in principle but I'd like an added test, and possibly a rethinking of using regex.

pkg/systemd/generate/common.go Outdated Show resolved Hide resolved
pkg/systemd/generate/pods_test.go Show resolved Hide resolved
@vrothberg vrothberg force-pushed the fix-7285 branch 3 times, most recently from 7d0ad7c to d70727d Compare August 18, 2020 12:19
@edsantiago
Copy link
Member

/lgtm
/hold
/good-luck-with-ci

@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 Aug 18, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2020
@mheon
Copy link
Member

mheon commented Aug 18, 2020

Nice catch, LGTM

@TomSweeneyRedHat
Copy link
Member

LGTM
and I think #7195 is biting this too

@edsantiago
Copy link
Member

No, it's the CI hang. @vrothberg you need to rebase on master, I'm sorry.

Make sure that arguments with whitespace are properly quoted so they are
interpreted as one (and not multiple ones) by systemd.

Now `-e tz="america/new york"` will be generated as `-e "tz=america/new york"`.
The quotes are moving but the argument is still correct.

Fixes: containers#7285
Signed-off-by: Valentin Rothberg <[email protected]>
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2020
@vrothberg
Copy link
Member Author

merge me :)

@edsantiago
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2020
@mheon
Copy link
Member

mheon commented Aug 19, 2020

/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 Aug 19, 2020
@openshift-merge-robot openshift-merge-robot merged commit dd4e0da into containers:master Aug 19, 2020
@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 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 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.

systemd unit with --new fails to control or update the container
7 participants