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

Trim whitespace from unit files while parsing #18981

Merged
merged 1 commit into from
Jun 26, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jun 23, 2023

Fixes: #18979

Does this PR introduce a user-facing change?

None

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2023
@rhatdan
Copy link
Member Author

rhatdan commented Jun 23, 2023

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM but note that strings.TrimSpace will also left-trim. We may consider using TrimRight instead.

@rhatdan
Copy link
Member Author

rhatdan commented Jun 23, 2023

I went back and forth on that.

Should the following be valid:

" RemapUsers: keep-id "

@vrothberg
Copy link
Member

Probably worth checking how systemd deals with such cases. I am currently flooded and won't find time until Monday to dig into it.

@bachradsusi
Copy link
Contributor

This PR fixes my issue. Thanks!

@rhatdan
Copy link
Member Author

rhatdan commented Jun 23, 2023

# cat /etc/systemd/system/test.service
[Unit]
Description=skeeo

[Service]
Delegate=true
Type=exec
KillMode=process
   ExecStart=sleep 100   

[Install]
WantedBy=default.target

This service script works fine in systemd.

@rhatdan rhatdan force-pushed the quadlet branch 3 times, most recently from e31deb1 to d336eaa Compare June 23, 2023 15:36
@TomSweeneyRedHat
Copy link
Member

LGTM
But Catch-22, lint is choking on the trailing whitespace in the test that you're trying to add to test how it is handled....

@rhatdan rhatdan force-pushed the quadlet branch 3 times, most recently from af4cc46 to d478562 Compare June 24, 2023 15:10
Fixes: containers#18979

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@ygalblum
Copy link
Contributor

LGTM
@vrothberg are you OK with the decision on which trim method is used?

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Yes, I am cool with trimming on both sides. But let's also test that left-trimming works. Right now, we test right-trims only.

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Jun 26, 2023
@openshift-merge-robot openshift-merge-robot merged commit 6a742cb into containers:main Jun 26, 2023
@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. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

quadlet generator is not able to correctly parse lines with trainling whitespaces
6 participants