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

Rename inconsistent shared OVAL IDs (Oracle Linux) #11392

Merged

Conversation

evgenyz
Copy link
Member

@evgenyz evgenyz commented Dec 18, 2023

Description:

The IDs are not uniform with other similar checks (RHEL, SUSE, Fedora etc), but there is no reason for them to be unique.

This is sort of a continuation of #11377.

Rationale:

  • Less confusion
  • It'd allow us to combine all these checks into a single platform template later
  • This inconsistency is standing in the way of gradual prodtype removal

Review Hints:

  • The change per se is purely cosmetic, it does not change any logic in OVALs

The ID are not uniform with other similar checks (RHEL, SUSE,
Fedora etc), but there is no reason for them to be unique.
@evgenyz evgenyz requested a review from a team as a code owner December 18, 2023 03:52
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
OVAL for rule 'xccdf_org.ssgproject.content_rule_installed_OS_is_FIPS_certified' differs.
--- oval:ssg-installed_OS_is_FIPS_certified:def:1
+++ oval:ssg-installed_OS_is_FIPS_certified:def:1
@@ -2,7 +2,7 @@
 extend_definition oval:ssg-installed_OS_is_rhel7:def:1
 extend_definition oval:ssg-installed_OS_is_rhel8:def:1
 extend_definition oval:ssg-installed_OS_is_rhcos4:def:1
-extend_definition oval:ssg-installed_OS_is_ol7_family:def:1
+extend_definition oval:ssg-installed_OS_is_ol7:def:1
 extend_definition oval:ssg-installed_OS_is_sle12:def:1
 extend_definition oval:ssg-installed_OS_is_sle15:def:1
 extend_definition oval:ssg-installed_OS_is_ubuntu1604:def:1

OVAL for rule 'xccdf_org.ssgproject.content_rule_installed_OS_is_vendor_supported' differs.
--- oval:ssg-installed_OS_is_vendor_supported:def:1
+++ oval:ssg-installed_OS_is_vendor_supported:def:1
@@ -2,7 +2,7 @@
 extend_definition oval:ssg-installed_OS_is_rhel7:def:1
 extend_definition oval:ssg-installed_OS_is_rhel8:def:1
 extend_definition oval:ssg-installed_OS_is_rhel9:def:1
-extend_definition oval:ssg-installed_OS_is_ol7_family:def:1
-extend_definition oval:ssg-installed_OS_is_ol8_family:def:1
+extend_definition oval:ssg-installed_OS_is_ol7:def:1
+extend_definition oval:ssg-installed_OS_is_ol8:def:1
 extend_definition oval:ssg-installed_OS_is_sle12:def:1
 extend_definition oval:ssg-installed_OS_is_sle15:def:1

Copy link

codeclimate bot commented Dec 18, 2023

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

View more on Code Climate.

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.

LGTM

@ComplianceAsCode/oracle-maintainers PTAL

@jan-cerny jan-cerny added this to the 0.1.72 milestone Dec 18, 2023
@jan-cerny jan-cerny added the OVAL OVAL update. Related to the systems assessments. label Dec 18, 2023
@marcusburghardt
Copy link
Member

FYI @Xeicker

@marcusburghardt marcusburghardt self-assigned this Dec 18, 2023
@marcusburghardt
Copy link
Member

Overriding CODEOWNERS since a Oracle approver is not currently available.

@marcusburghardt marcusburghardt merged commit 239a7ab into ComplianceAsCode:master Dec 18, 2023
37 checks passed
@evgenyz evgenyz deleted the fix-shared-ol-ovals branch December 18, 2023 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OVAL OVAL update. Related to the systems assessments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants