Repository navigation
refactor(exporters): read a nested mapping's child type from the XCCDF model - #64
Merged
Merged
Conversation
…F model A nested mapping's child (check-content inside check) is now found in the target's XCCDF type by its XML name (StyleModels.child_element), which gives its field and type, instead of a class name built from the element name. _element_name_to_type_name is deleted. A child the target's type does not have is refused when the style loads, at field_mappings.<name>.nested.children[0].element, instead of failing the first export with audit text. The guide's nested example shows the one-child form the schema takes, with that error. The 28 exports are byte-identical. Refs: cis-bench-fh9l.13 Signed-off-by: Aaron Lippold <lippold@gmail.com>
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
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.
A nested mapping's child (
check-contentinsidecheck) is now found in the target's XCCDF type by its XML name, using xsdata's metadata (StyleModels.child_element). That metadata gives the child's field and type, so the engine no longer builds a class name and a field name from the element name._element_name_to_type_nameis deleted.field_mappings.<name>.nested.children[0].element. Before, the style loaded and the first export with audit text failed.Checks:
tests/scripts, mypy, ruff andmkdocs build --strictpass.nextand passcis-bench validate.Card: cis-bench-fh9l.13.