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 duplicate OVAL ids (gpgkey package, GDM login) #11377

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

evgenyz
Copy link
Member

@evgenyz evgenyz commented Dec 13, 2023

Description:

  • These rules share same IDs in their OVAL sub-components. If they ever meet in the same DS conflict is imminent.

Rationale:

  • The only thing that prevents them from colliding is prodtype. As we are going to get rid of it we shall get prepared.

Review Hints:

  • The gnome_gdm_disable_unattended_automatic_login rule is in conflicts with gnome_gdm_disable_automatic_login.

These rules share same IDs in their OVAL sub-components. If they ever
meet in a single DS, conflict is imminent.
@evgenyz evgenyz added the Infrastructure Our content build system label Dec 13, 2023
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_ensure_redhat_gpgkey_installed' differs.
--- oval:ssg-ensure_redhat_gpgkey_installed:def:1
+++ oval:ssg-ensure_redhat_gpgkey_installed:def:1
@@ -2,9 +2,9 @@
 criteria AND
 criteria OR
 extend_definition oval:ssg-installed_OS_is_rhel8:def:1
-criterion oval:ssg-test_package_gpgkey-fd431d51-4ae0493b_installed:tst:1
+criterion oval:ssg-test_redhat_package_gpgkey-fd431d51-4ae0493b_installed:tst:1
 criteria OR
-criterion oval:ssg-test_package_gpgkey-d4082792-5b32db75_installed:tst:1
+criterion oval:ssg-test_redhat_package_gpgkey-d4082792-5b32db75_installed:tst:1
 criteria AND
 extend_definition oval:ssg-installed_OS_is_centos8:def:1
-criterion oval:ssg-test_package_gpgkey-8483c65d-5ccc5b19_installed:tst:1
+criterion oval:ssg-test_redhat_package_gpgkey-8483c65d-5ccc5b19_installed:tst:1

Copy link

codeclimate bot commented Dec 13, 2023

Code Climate has analyzed commit 7587a45 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.

@evgenyz
Copy link
Member Author

evgenyz commented Dec 13, 2023

By the look of it test results are bogus. Changes should not affect Bash or Ansible code.

@Mab879
Copy link
Member

Mab879 commented Dec 13, 2023

/packit retest-failed

@Mab879 Mab879 self-assigned this Dec 13, 2023
@Mab879 Mab879 added this to the 0.1.72 milestone Dec 13, 2023
@Mab879
Copy link
Member

Mab879 commented Dec 13, 2023

By the look of it test results are bogus. Changes should not affect Bash or Ansible code.

Agreed. After checking master the test results for ensure_redhat_gpgkey_installed are the same.

I have created #11380 to track the issue with the Ansible tests.

Copy link
Member

@Mab879 Mab879 left a comment

Choose a reason for hiding this comment

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

LGTM.

Thanks.

@Mab879 Mab879 merged commit 25d2b60 into ComplianceAsCode:master Dec 13, 2023
33 of 37 checks passed
@evgenyz evgenyz deleted the fix-oval-duplicates branch December 13, 2023 14:34
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.

2 participants