Skip to content

Stop building -ds-1.2.xml data streams#11990

Merged
marcusburghardt merged 4 commits into
ComplianceAsCode:masterfrom
jan-cerny:remove_scap12
May 15, 2024
Merged

Stop building -ds-1.2.xml data streams#11990
marcusburghardt merged 4 commits into
ComplianceAsCode:masterfrom
jan-cerny:remove_scap12

Conversation

@jan-cerny
Copy link
Copy Markdown
Collaborator

@jan-cerny jan-cerny commented May 10, 2024

Description:

This change will stop building the -ds-1.2.xml data streams.

These data streams are marked as SCAP 1.2 data streams, but they aren't SCAP 1.2 compatible, because they contain OVAL 5.11 which isn't a part of SCAP 1.2 line of standards.

These data streams differ in the value of scap-version and schematron-version attributes and they don't have separate component for the remote checks used in rules security_patches_up_to_date, the remote OVAL check is referenced directly in the rule. Otherwise they are the same as the -ds.xml files.

Users should use -ds.xml files instead. They're SCAP 1.3 data streams. SCAP 1.3 is widely adopted and we package the SCAP 1.3 data streams in downstream.

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

Rationale:

Simplify, streamline, stop producing legacy artifacts.

jan-cerny added 4 commits May 10, 2024 16:03
This patch moves the call function upgrade_ds_to_scap_13 to
compose_ds because building SCAP 1.3 data streams becomes
the only option.
We don't need to upgrade content to SCAP 1.3, we can create
an SCAP 1.3 data stream directly.
@jan-cerny jan-cerny added the Infrastructure Our content build system label May 10, 2024
@jan-cerny jan-cerny added this to the 0.1.74 milestone May 10, 2024
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label May 10, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 10, 2024

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

@github-actions
Copy link
Copy Markdown

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

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions
Copy link
Copy Markdown

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:11990
This image was built from commit: 60333ec

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:11990

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:11990 make deploy-local

@qlty-cloud-legacy
Copy link
Copy Markdown

Code Climate has analyzed commit 60333ec 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 59.4% (0.0% change).

View more on Code Climate.

@jan-cerny jan-cerny marked this pull request as ready for review May 13, 2024 06:52
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label May 13, 2024
Copy link
Copy Markdown
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.

It makes sense to me. I will leave it open so others can also take a look.
FYI @ComplianceAsCode/red-hatters @ComplianceAsCode/suse-maintainers @ComplianceAsCode/ubuntu-maintainers @ComplianceAsCode/oracle-maintainers

Copy link
Copy Markdown
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!

@marcusburghardt marcusburghardt merged commit 7425c4e into ComplianceAsCode:master May 15, 2024
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.

3 participants