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.

Sign up for GitHub

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

Profile specification #1017

Merged
merged 13 commits into from
Dec 10, 2021
Merged

Profile specification #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
068981a
Updated readme in utils/util (#1014)
wendellpiez Aug 27, 2021
2b4abbd
First draft of profile resolution specification rework
stephenbanghart Aug 5, 2021
b508585
Updating to reflect most recent changes. See TODOs in file
stephenbanghart Aug 28, 2021
c5aef05
Integrated feedback from 8/31 meeting w/Dave and Wendell
stephenbanghart Sep 1, 2021
da92b75
Batch Commit of simple review changes
stephenbanghart Oct 4, 2021
06eef9b
Pushing review updates
canb227 Oct 14, 2021
8ffa7c6
Addressing second half of resolved PR comments. Review PR Resolved Di…
canb227 Oct 14, 2021
7cef95a
Committing review changes prior to "explicit/implicit" requirement re…
canb227 Oct 21, 2021
90c61fc
Removal of Explicit/Implicit, Added last examples, Target section cle…
canb227 Oct 25, 2021
aa79625
Resolves #1047 #1046 #1043 #1042 #1041 #1040 #1039
canb227 Dec 3, 2021
3488d49
Fixing "flat" and "as-is" to use an empty assembly instead of a field…
canb227 Dec 3, 2021
a34c08b
Reverting changes to as-is to protect backwards compatibility.
canb227 Dec 9, 2021
0429672
Update specml-html-preview.xsl
david-waltermire Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/metaschema/oscal_profile_metaschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<assembly ref="combine"/>
<choice>
<field ref="as-is"/>
<assembly ref="flat"/>
<assembly ref="custom"/>
</choice>
</model>
Expand All @@ -113,6 +114,10 @@
<formal-name>As is</formal-name>
<description>An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</description>
</define-field>
<define-assembly name="flat">
<formal-name>Flat</formal-name>
<description>A Flat element indicates that the controls should be structured in a completely flat list. It does not contain any elements or attributes.</description>
</define-assembly>
<define-flag name="method" as-type="string">
<formal-name>Combination method</formal-name>
<description>How clashing controls should be handled</description>
Expand Down
Loading