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

Enhance openscap module: add "xccdf_eval" function #63416

Merged
merged 14 commits into from
Aug 1, 2023

Conversation

meaksh
Copy link
Contributor

@meaksh meaksh commented Jan 5, 2023

What does this PR do?

This PR enhance the functionality of openscap module: introduces a new function named xccdf_eval.

This function, allows to pass more parameters than the xccdf function, like --fetch-remote-resources, --rule, --remediate, --tailoring-file, --tailoring-id, etc.

This PR keeps the old xccdf function so this shouldn't break or harm anyone that is using the old function of the module.

This was partially pushed already at #60712 but that PR got eventually closed without being merged.

Merge requirements satisfied?

Commits signed with GPG?

Yes

@meaksh meaksh requested a review from a team as a code owner January 5, 2023 11:06
@meaksh meaksh requested review from twangboy and removed request for a team January 5, 2023 11:06
@meaksh meaksh force-pushed the master-enhance-openscap-module branch from 649cf25 to 03ad012 Compare January 5, 2023 11:17
salt/modules/openscap.py Outdated Show resolved Hide resolved
salt/modules/openscap.py Show resolved Hide resolved
salt/modules/openscap.py Show resolved Hide resolved
tests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
@meaksh meaksh mentioned this pull request Jan 11, 2023
3 tasks
@meaksh
Copy link
Contributor Author

meaksh commented Jan 11, 2023

Hey @Ch3LL, thanks for the review - all requested changes are done now.

salt/modules/openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

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

Of course, the proposed changes should be confirmed working and properly formatted 😁

tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
tests/pytests/unit/modules/test_openscap.py Outdated Show resolved Hide resolved
@meaksh
Copy link
Contributor Author

meaksh commented Jan 23, 2023

@s0undt3ch thanks for the suggestions - all requested changes done now

@meaksh meaksh requested review from s0undt3ch and removed request for twangboy January 23, 2023 11:41
s0undt3ch
s0undt3ch previously approved these changes Jan 23, 2023
@s0undt3ch
Copy link
Collaborator

Thank You @meaksh!

salt/modules/openscap.py Outdated Show resolved Hide resolved
@meaksh meaksh requested review from agraul and Ch3LL and removed request for agraul January 23, 2023 13:31
@meaksh
Copy link
Contributor Author

meaksh commented Jan 24, 2023

@Ch3LL I think this should be now ready :)

@meaksh
Copy link
Contributor Author

meaksh commented Jun 28, 2023

@Ch3LL @s0undt3ch it seems this one PR got lost. It is still waiting for a review. TIA!

s0undt3ch
s0undt3ch previously approved these changes Jun 28, 2023
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:34 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:34 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:34 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 28, 2023 13:43 — with GitHub Actions Inactive
Ch3LL
Ch3LL previously approved these changes Jun 28, 2023
Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

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

Apologies on letting this one get lost. This looks good, just looks like pre-commit is failing.

@meaksh meaksh dismissed stale reviews from Ch3LL and s0undt3ch via 7ee35b5 June 29, 2023 08:09
@meaksh
Copy link
Contributor Author

meaksh commented Jun 29, 2023

@Ch3LL I've fixed the pre-commit issues. This should be now ready. Thanks!

@meaksh meaksh temporarily deployed to ci June 29, 2023 09:07 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 09:08 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 09:10 — with GitHub Actions Inactive
@meaksh meaksh force-pushed the master-enhance-openscap-module branch from 7ee35b5 to d21fd03 Compare June 29, 2023 09:23
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:13 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:13 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:14 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:30 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:31 — with GitHub Actions Inactive
@meaksh meaksh temporarily deployed to ci June 29, 2023 10:34 — with GitHub Actions Inactive
@meaksh meaksh requested a review from Ch3LL June 30, 2023 11:50
@Ch3LL Ch3LL merged commit 1f1420a into saltstack:master Aug 1, 2023
@meaksh meaksh deleted the master-enhance-openscap-module branch August 2, 2023 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants