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

Bring bash version in-sync with Ansible #12398

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

droopy4096
Copy link
Contributor

Description:

  • Currently ash script for adjusting umask in /etc/bashrc is breaking existing /etc/bashrc

Rationale:

Ansible script uses much more reasonable regexp to replace only umask value whereas bash script replaces value and anything that follows.

Review Hints:

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Sep 18, 2024
Copy link

openshift-ci bot commented Sep 18, 2024

Hi @droopy4096. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

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

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

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

Click here to see the full diff
bash remediation for rule 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc' differs.
--- xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc
+++ xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc
@@ -9,7 +9,7 @@
 
 
 grep -q "^[^#]*\bumask" /etc/bashrc && \
-  sed -i -E -e "s/^([^#]*\bumask).*/\1 $var_accounts_user_umask/g" /etc/bashrc
+  sed -i -E -e "s/^([^#]*\bumask)[[:space:]]+[[:digit:]]+/\1 $var_accounts_user_umask/g" /etc/bashrc
 if ! [ $? -eq 0 ]; then
     echo "umask $var_accounts_user_umask" >> /etc/bashrc
 fi

@Mab879 Mab879 added this to the 0.1.75 milestone Sep 18, 2024
@Mab879 Mab879 added the Bash Bash remediation update. label Sep 18, 2024
@Mab879
Copy link
Member

Mab879 commented Sep 18, 2024

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Sep 18, 2024
Copy link

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:12398
This image was built from commit: 8516678

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:12398

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:12398 make deploy-local

Copy link

codeclimate bot commented Sep 18, 2024

Code Climate has analyzed commit 8516678 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 59.5% (0.0% change).

View more on Code Climate.

@droopy4096
Copy link
Contributor Author

I'm failing to see what the issue is from CI output. Can someone take a look and let me know what needs to be fixed there?

Copy link
Collaborator

@jan-cerny jan-cerny left a comment

Choose a reason for hiding this comment

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

The CI problem occurs only on Debian, on other systems it doesn't manifest. I have checked the logs (you can download them in the Summary tab in the test run details of the action). The problem is that the test scenarios fail to prepare because there is no /etc/bashrc on Debian. I think the test scenarios should be changed to ensure that this bashrc file always exist prior to the modification. But this problem has already been there and isn't caused by your PR. Thank you.

@jan-cerny jan-cerny merged commit da1fa23 into ComplianceAsCode:master Sep 20, 2024
98 of 100 checks passed
@jan-cerny jan-cerny self-assigned this Sep 20, 2024
@jan-cerny
Copy link
Collaborator

On Debian and other systems the name of the file "/etc/bash.bashrc". I have reported an issue about it: #12409.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bash Bash remediation update. ok-to-test Used by openshift-ci bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants