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

Generate XCCDF 1.2 directly #9464

Merged
merged 7 commits into from
Sep 23, 2022
Merged

Conversation

jan-cerny
Copy link
Collaborator

@jan-cerny jan-cerny commented Sep 2, 2022

Description:

Generate XCCDF 1.2 directly from the resolved YAML files. Stop using interim XCCDF 1.1 build step. The build/$product/shorthand.xml becomes a valid XCCDF 1.2 file.

For more details, please read commit messages of every commit.

Rationale:

  • Reduces build complexity by removing the XCCDF 1.1 build step
  • Build no longer depends on the XSLT template converting XCCDF 1.1 to 1.2 provided by openscap RPM package
  • Stop using outdated XCCDF 1.1 standard
  • Enables improvements in CPE AL in future.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 2, 2022
@openshift-ci
Copy link

openshift-ci bot commented Sep 2, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@pep8speaks
Copy link

pep8speaks commented Sep 2, 2022

Hello @jan-cerny! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2022-09-02 11:03:28 UTC

@github-actions
Copy link

github-actions bot commented Sep 2, 2022

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

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@jan-cerny jan-cerny added the Infrastructure Our content build system label Sep 2, 2022
@evgenyz evgenyz added the CPE-AL CPE Applicability Language label Sep 2, 2022
@jan-cerny
Copy link
Collaborator Author

I have rebased the PR on the top of the latest master branch and I have resolved the Code Climate problems.

@jan-cerny jan-cerny marked this pull request as ready for review September 14, 2022 13:10
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Sep 14, 2022
@jan-cerny jan-cerny added this to the 0.1.64 milestone Sep 15, 2022
@jan-cerny jan-cerny requested review from marcusburghardt, mildas and yuumasato and removed request for marcusburghardt September 16, 2022 08:00
@vojtapolasek vojtapolasek modified the milestones: 0.1.64, 0.1.65 Sep 19, 2022
Use ssg-${PRODUCT}-xccdf.xml instead of ssg-${PRODUCT}-xccdf-1.2.xml
everywhere, because both files are now actually in XCCDF 1.2 namespace.
This change will allow us to remove the CMake target that converts
ssg-${PRODUCT}-xccdf.xml to ssg-${PRODUCT}-xccdf-1.2.xml
in future.
The ssg-${product}-xccdf.xml is already an XCCDF 1.2 document
so we don't need another XCCDF 1.2 document.
@jan-cerny
Copy link
Collaborator Author

I have resolved the conflict and rebased this PR on the top of the latest upstream master branch.

@codeclimate
Copy link

codeclimate bot commented Sep 21, 2022

Code Climate has analyzed commit 27b8324 and detected 2 issues on this pull request.

Here's the issue category breakdown:

Category Count
Duplication 2

The test coverage on the diff in this pull request is 8.3% (50% is the threshold).

This pull request will bring the total coverage in the repository to 40.6% (0.1% change).

View more on Code Climate.

@jan-cerny jan-cerny removed the request for review from mildas September 22, 2022 07:28
@jan-cerny jan-cerny requested review from ggbecker and removed request for yuumasato, evgenyz and matusmarhefka September 22, 2022 07:28
@ggbecker ggbecker self-assigned this Sep 22, 2022
@ggbecker ggbecker merged commit ea5e130 into ComplianceAsCode:master Sep 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CPE-AL CPE Applicability Language Infrastructure Our content build system XCCDF12
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants