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.

Sign up for GitHub

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

Jump to bottom

Daily prod fix: return rhel7 prodtypes to some rules #11303

Merged
merged 6 commits into from
Nov 23, 2023
Merged

Daily prod fix: return rhel7 prodtypes to some rules #11303

merged 6 commits into from
Nov 23, 2023

Conversation

vojtapolasek
Copy link
Collaborator

Description:

  • explicitly specify rhel7 prodtypes for some rules which got it removed
  • add warnings if needed

Rationale:

This is continuation of #11296

@vojtapolasek vojtapolasek added Update Rule Issues or pull requests related to Rules updates. Update Profile Issues or pull requests related to Profiles updates. RHEL7 Red Hat Enterprise Linux 7 product related. pci-dss labels Nov 23, 2023
@vojtapolasek vojtapolasek requested a review from a team as a code owner November 23, 2023 10:26
@vojtapolasek vojtapolasek added this to the 0.1.71 milestone Nov 23, 2023
@github-actions GitHub Actions
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

@marcusburghardt marcusburghardt self-assigned this Nov 23, 2023
marcusburghardt
marcusburghardt reviewed Nov 23, 2023
View reviewed changes
linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
warnings:
- general:
{{% if prodtype == "rhel7" %}}
Copy link
Member

Choose a reason for hiding this comment

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

Maybe it would be better if the warning message would recommend to use the service_ntpd_enabled rule instead.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good idea, I added it in 6e60138 ..

@codeclimate CodeClimate
Copy link

codeclimate bot commented Nov 23, 2023

Code Climate has analyzed commit 6e60138 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 58.5%.

View more on Code Climate.

@marcusburghardt
Copy link
Member

The automatus tests failures are expected because the ntp package is not available in those systems. They can be safely waived here.

marcusburghardt
marcusburghardt approved these changes Nov 23, 2023
View reviewed changes
Copy link
Member

@marcusburghardt marcusburghardt left a comment

Choose a reason for hiding this comment

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

LGTM. Let's wait the CI tests to finish.

@marcusburghardt marcusburghardt merged commit 684285c into ComplianceAsCode:master Nov 23, 2023
34 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcusburghardt marcusburghardt marcusburghardt approved these changes

Assignees

@marcusburghardt marcusburghardt

Labels
pci-dss RHEL7 Red Hat Enterprise Linux 7 product related. Update Profile Issues or pull requests related to Profiles updates. Update Rule Issues or pull requests related to Rules updates.
Projects
None yet
Milestone
0.1.71
Development

Successfully merging this pull request may close these issues.
2 participants
@vojtapolasek @marcusburghardt