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 compare datastream check to correctly treat new line characters. #10667

Merged
merged 1 commit into from
Jun 1, 2023

Conversation

ggbecker
Copy link
Member

@ggbecker ggbecker commented Jun 1, 2023

Try a fix for the following:

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff
ansible remediation for rule 'xccdf_org.ssgproject.content_rule_configure_tmux_lock_keybinding' differs.%0A--- xccdf_org.ssgproject.content_rule_configure_tmux_lock_keybinding%0A+++ xccdf_org.ssgproject.content_rule_configure_tmux_lock_keybinding%0A@@ -42,7 +42,7 @@%0A - name: Insert correct line into /etc/tmux.conf%0A   lineinfile:%0A     path: /etc/tmux.conf%0A-    create: null%0A+    create: true%0A     regexp: \s*bind\s+\w\s+lock-session.*$%0A     mode: '0644'%0A     line: bind X lock-session

The break line characters were necessary before: #10588

Implementation according: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#example-of-a-multiline-string

@github-actions
Copy link

github-actions bot commented Jun 1, 2023

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@Mab879 Mab879 self-assigned this Jun 1, 2023
@ggbecker
Copy link
Member Author

ggbecker commented Jun 1, 2023

@Mab879 This is one of the cases that we will have to merge it first in order to understand if it works because of:

pull_request_target:

which allows posting comment but only runs what is already merged. I'll see if I can test on my fork first.

@ggbecker
Copy link
Member Author

ggbecker commented Jun 1, 2023

This seems to fix the problem as tested in this PR:

ggbecker#38 (comment)

@codeclimate
Copy link

codeclimate bot commented Jun 1, 2023

Code Climate has analyzed commit 5cbbf3c and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 52.8% (0.0% change).

View more on Code Climate.

@Mab879 Mab879 added this to the 0.1.69 milestone Jun 1, 2023
@Mab879 Mab879 added the Infrastructure Our content build system label Jun 1, 2023
@Mab879 Mab879 merged commit 343bb89 into ComplianceAsCode:master Jun 1, 2023
31 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Our content build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants