Skip to content

Remove with-parent-controls from implementation#1843

Merged
Compton-US merged 2 commits intodevelopfrom
1816-profile-resolver-remove-with-parent-controls
Dec 6, 2023
Merged

Remove with-parent-controls from implementation#1843
Compton-US merged 2 commits intodevelopfrom
1816-profile-resolver-remove-with-parent-controls

Conversation

@aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Jul 7, 2023

Committer Notes

Remove with-parent-controls from implementation XSLT profile resolver used by oscal-content and current OSCAL release builds and associated tests. Closes #1816.

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

@aj-stein-nist aj-stein-nist linked an issue Jul 7, 2023 that may be closed by this pull request
Revert with-parent-controls from profile schemas and update specification #1816
Open
8 tasks
@aj-stein-nist aj-stein-nist self-assigned this Jul 7, 2023
@aj-stein-nist aj-stein-nist added Scope: Tooling and APIs Issues targeted at development of tooling and APIs to support OSCAL content creation and use. Profile Resolution Issues relating to profile resolution. labels Jul 7, 2023
@aj-stein-nist aj-stein-nist force-pushed the 1816-profile-resolver-remove-with-parent-controls branch from cfb80d7 to a5e2fc1 Compare July 11, 2023 12:42
@wendellpiez
Copy link
Contributor

wendellpiez commented Nov 27, 2023 •
edited
Loading

If we can confirm that the flag with-parent-controls (as supported in the XSLT before this modification) is no longer permitted in the profile model (metaschema), we can accept this PR on the grounds that it aligns the tool better with the model.

By 'the model' here we mean both the profile metaschema and the processing spec for profile resolution. The feature should be either supported or missing in both places.

If the model permits @with-parent-controls we should not merge this PR as it would disable a feature - but the problem of making demonstration samples remains.

I just checked and the flag is not defined in https://github.com/usnistgov/OSCAL/blob/develop/src/metaschema/oscal_profile_metaschema.xml so this PR should be fine.

@Compton-US Compton-US marked this pull request as ready for review November 29, 2023 18:54
@Compton-US Compton-US requested a review from a team as a code owner November 29, 2023 18:54
Compton-US
Compton-US previously approved these changes Dec 6, 2023
View reviewed changes
@Compton-US Compton-US requested a review from a team December 6, 2023 15:40
@Compton-US Compton-US force-pushed the 1816-profile-resolver-remove-with-parent-controls branch from 841544f to e1b2b88 Compare December 6, 2023 15:45
@Compton-US Compton-US added this to the Ready Now milestone Dec 6, 2023
@Compton-US
Copy link
Contributor

Compton-US commented Dec 6, 2023

Performed a rebase to address merge conflicts. Just needs a review.

@Compton-US Compton-US force-pushed the 1816-profile-resolver-remove-with-parent-controls branch from 5f46502 to 72111cc Compare December 6, 2023 16:20
wendellpiez
wendellpiez approved these changes Dec 6, 2023
View reviewed changes
Copy link
Contributor

@wendellpiez wendellpiez left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

@Compton-US Compton-US merged commit c4a99cc into develop Dec 6, 2023
Compton-US pushed a commit that referenced this pull request Dec 6, 2023
@aj-stein-nist
Remove with-parent-controls from implementation (#1843)
e36c374 
* Remove with-parent-controls from XSLT profile resolver for #1816.

* Remove profile resolver with-parent-controls tests for #1816.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@wendellpiez wendellpiez wendellpiez approved these changes

@Compton-US Compton-US Compton-US left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@aj-stein-nist aj-stein-nist

Labels

Profile Resolution Issues relating to profile resolution. Scope: Tooling and APIs Issues targeted at development of tooling and APIs to support OSCAL content creation and use.

Projects

None yet

Milestone

Ready Now

Development

Successfully merging this pull request may close these issues.

Revert with-parent-controls from profile schemas and update specification

3 participants

@aj-stein-nist @wendellpiez @Compton-US