Change rule prodtype search and make tests more content change proof #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
No prodtype, now rule must be a part of some profile.
Use rpm_verify_* rule changes as they are not expected to be templated because of their specificity.
ggbecker
reviewed
Feb 1, 2024
| for control in self.find_rule_controls(rule): | ||
| for product in self.find_control_products(control): | ||
| products.append(product) | ||
|
|
||
| products = sorted(products, key=lambda k: (k!="rhel8", k!="rhel7", k!="ocp4", k)) |
There was a problem hiding this comment.
not related to this pull request, but I believe we will need to reevaluate this priority list at some point.
There was a problem hiding this comment.
for example, do we want to give priority to RHEL9, (and RHEL10 in the future)
|
PR looks good to me. That's a great improvement. |
ggbecker
approved these changes
Feb 1, 2024
jan-cerny
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, CTF was taking products only from
prodtype. That was wrong as it ignored implicit "all products".Now, with ComplianceAsCode/content#11378 prodtype removal, all rules must be part of some profile (at least the
default.profile) to get to benchmark. And to get to profile, they might get there via controls (that was ignored as well by CTF).This PR adds support for searching rules in control files (works with control_dirs as well) and changes the prodtype search to new approach - products are determined based on used profiles.
Test changes come from #47
For testing, you can for example try:
to check that ocp4 product is selected (the rule introduced in this PR is only in controls file). (related to ComplianceAsCode/content#11501 (comment))