CMP-3282: Add interactive script to update ocp rule assertions #13245
Conversation
This file contains hidden or 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
Vincent056
force-pushed
the
assert-script
branch
from
7569292 to
1e1016f
Compare
Mab879
reviewed
Mar 27, 2025
Add interactive script to update ocp rule assertions Example usage ``` ~/ws-compliance/cac-content-fork/tests$ ./update_assertions.py Enter the rule name to search for: audit-rules-time-stime Found 44 matching rule_results for 'audit-rules-time-stime': 1. File: assertions/ocp4/rhcos4-e8-4.14.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 2. File: assertions/ocp4/rhcos4-e8-4.14.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 3. File: assertions/ocp4/rhcos4-e8-4.15.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 4. File: assertions/ocp4/rhcos4-e8-4.15.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 5. File: assertions/ocp4/rhcos4-e8-4.16.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 6. File: assertions/ocp4/rhcos4-e8-4.16.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 7. File: assertions/ocp4/rhcos4-e8-4.12.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 8. File: assertions/ocp4/rhcos4-e8-4.12.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 9. File: assertions/ocp4/rhcos4-high-4.15.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 10. File: assertions/ocp4/rhcos4-high-4.15.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 11. File: assertions/ocp4/rhcos4-high-4.16.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 12. File: assertions/ocp4/rhcos4-high-4.16.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 13. File: assertions/ocp4/rhcos4-high-4.2.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 14. File: assertions/ocp4/rhcos4-high-4.2.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 15. File: assertions/ocp4/rhcos4-moderate-4.13.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 16. File: assertions/ocp4/rhcos4-moderate-4.13.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 17. File: assertions/ocp4/rhcos4-moderate-4.14.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 18. File: assertions/ocp4/rhcos4-moderate-4.14.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 19. File: assertions/ocp4/rhcos4-moderate-4.15.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 20. File: assertions/ocp4/rhcos4-moderate-4.15.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 21. File: assertions/ocp4/rhcos4-moderate-4.16.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 22. File: assertions/ocp4/rhcos4-moderate-4.16.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 23. File: assertions/ocp4/rhcos4-high-4.12.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 24. File: assertions/ocp4/rhcos4-high-4.12.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 25. File: assertions/ocp4/rhcos4-high-4.13.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 26. File: assertions/ocp4/rhcos4-high-4.13.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 27. File: assertions/ocp4/rhcos4-high-4.14.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 28. File: assertions/ocp4/rhcos4-high-4.14.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 29. File: assertions/ocp4/rhcos4-moderate-4.12.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 30. File: assertions/ocp4/rhcos4-moderate-4.12.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL result_after_remediation: PASS 31. File: assertions/ocp4/rhcos4-e8-4.13.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 32. File: assertions/ocp4/rhcos4-e8-4.13.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 33. File: assertions/ocp4/rhcos4-e8-4.17.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 34. File: assertions/ocp4/rhcos4-e8-4.17.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 35. File: assertions/ocp4/rhcos4-e8-4.18.yml Key: e2e-e8-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 36. File: assertions/ocp4/rhcos4-e8-4.18.yml Key: e2e-e8-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 37. File: assertions/ocp4/rhcos4-high-4.17.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 38. File: assertions/ocp4/rhcos4-high-4.17.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 39. File: assertions/ocp4/rhcos4-high-4.18.yml Key: e2e-high-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 40. File: assertions/ocp4/rhcos4-high-4.18.yml Key: e2e-high-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 41. File: assertions/ocp4/rhcos4-moderate-4.17.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 42. File: assertions/ocp4/rhcos4-moderate-4.17.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 43. File: assertions/ocp4/rhcos4-moderate-4.18.yml Key: e2e-moderate-master-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE 44. File: assertions/ocp4/rhcos4-moderate-4.18.yml Key: e2e-moderate-worker-audit-rules-time-stime default_result: FAIL OR NOT-APPLICABLE result_after_remediation: PASS OR NOT-APPLICABLE Do you want to update ALL of these assertions in bulk? [y/N]: y Bulk update selected. New default_result [PASS/FAIL/NOT-APPLICABLE/FAIL OR NOT-APPLICABLE/PASS OR NOT-APPLICABLE]: FAIL OR NOT-APPLICABLE Do you want to set 'result_after_remediation'? [y/N]: y New result_after_remediation [PASS/FAIL/NOT-APPLICABLE/FAIL OR NOT-APPLICABLE/PASS OR NOT-APPLICABLE]: PASS OR NOT-APPLICABLE The following files will be updated: - assertions/ocp4/rhcos4-e8-4.14.yml - assertions/ocp4/rhcos4-e8-4.15.yml - assertions/ocp4/rhcos4-e8-4.16.yml - assertions/ocp4/rhcos4-e8-4.12.yml - assertions/ocp4/rhcos4-high-4.15.yml - assertions/ocp4/rhcos4-high-4.16.yml - assertions/ocp4/rhcos4-high-4.2.yml - assertions/ocp4/rhcos4-moderate-4.13.yml - assertions/ocp4/rhcos4-moderate-4.14.yml - assertions/ocp4/rhcos4-moderate-4.15.yml - assertions/ocp4/rhcos4-moderate-4.16.yml - assertions/ocp4/rhcos4-high-4.12.yml - assertions/ocp4/rhcos4-high-4.13.yml - assertions/ocp4/rhcos4-high-4.14.yml - assertions/ocp4/rhcos4-moderate-4.12.yml - assertions/ocp4/rhcos4-e8-4.13.yml - assertions/ocp4/rhcos4-e8-4.17.yml - assertions/ocp4/rhcos4-e8-4.18.yml - assertions/ocp4/rhcos4-high-4.17.yml - assertions/ocp4/rhcos4-high-4.18.yml - assertions/ocp4/rhcos4-moderate-4.17.yml - assertions/ocp4/rhcos4-moderate-4.18.yml Confirm save changes to disk? [y/N]: y Writing updates to assertions/ocp4/rhcos4-e8-4.14.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.15.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.16.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.12.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.15.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.16.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.2.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.13.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.14.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.15.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.16.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.12.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.13.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.14.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.12.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.13.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.17.yml ... Writing updates to assertions/ocp4/rhcos4-e8-4.18.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.17.yml ... Writing updates to assertions/ocp4/rhcos4-high-4.18.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.17.yml ... Writing updates to assertions/ocp4/rhcos4-moderate-4.18.yml ... Updates completed successfully. ```
Vincent056
force-pushed
the
assert-script
branch
from
1e1016f to
67df772
Compare
|
Code Climate has analyzed commit 67df772 and detected 19 issues on this pull request. Here's the issue category breakdown:
Note: there is 1 critical issue. 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 62.0% (0.0% change). View more on Code Climate. |
rhmdnd
reviewed
Apr 1, 2025
| matches.append((yf, key, dres, rres, file_version)) | ||
|
|
||
| if not matches: | ||
| print(f"\nNo matching rule_results found that end with '{rule_name}' " |
There was a problem hiding this comment.
Something that might be nice here would be to give users the option to add new assertions. If it's a new assertion, it could prompt the use for the profiles to add it to (based on what's available?).
Vincent056
changed the title
|
let's close this one since we want to improve on our CI testing assertions |
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.
Add interactive script to update ocp rule assertions Example usage
Description:
Rationale:
Rationale here. Replace this text. Don't use the italics format!
Fixes # Issue number here (e.g. Updating sysctl XCCDF naming #26) or remove this line if no issue exists.
Review Hints:
Review hints here. Replace this text. Don't use the italics format!
Use this optional section to give any relevant information which could help the reviewer to more quickly and assertively understand and test the changes.
Good examples are useful commands, if it is better to review all commits together or in a suggested sequence, any relevant discussion in other PRs or issues, etc.