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: ensure_fedora_gpgkey_installed/bash: use bash_package_install #10571

Merged
merged 1 commit into from
May 15, 2023

Conversation

maage
Copy link
Contributor

@maage maage commented May 15, 2023

Description:

Use common macro bash_package_install to package installs.

Rationale:

Even if there is platform limiter and so on I still think it is better to use the macro.

Review Hints:

Simple change, the rule remediation should be tested.

@openshift-ci
Copy link

openshift-ci bot commented May 15, 2023

Hi @maage. 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/test-infra repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label May 15, 2023
@github-actions
Copy link

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

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

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions
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_ensure_fedora_gpgkey_installed' differs.
--- xccdf_org.ssgproject.content_rule_ensure_fedora_gpgkey_installed
+++ xccdf_org.ssgproject.content_rule_ensure_fedora_gpgkey_installed
@@ -1,5 +1,7 @@
 
-dnf install -y gpg
+if ! rpm -q --quiet "gpg" ; then
+ dnf install -y "gpg"
+fi
 
 fedora_version=$(grep -oP '[[:digit:]]+' /etc/redhat-release)

@Mab879 Mab879 self-assigned this May 15, 2023
@Mab879 Mab879 added this to the 0.1.68 milestone May 15, 2023
@Mab879 Mab879 added the Bash Bash remediation update. label May 15, 2023
@codeclimate
Copy link

codeclimate bot commented May 15, 2023

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

View more on Code Climate.

@Mab879
Copy link
Member

Mab879 commented May 15, 2023

Automatus failures are expected since this rule is not applicable on CS8 and CS9.

@Mab879 Mab879 merged commit a64b1a1 into ComplianceAsCode:master May 15, 2023
30 of 32 checks passed
@maage
Copy link
Contributor Author

maage commented May 16, 2023

Thanks

@maage maage deleted the bash_package-2 branch May 16, 2023 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bash Bash remediation update. needs-ok-to-test Used by openshift-ci bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants