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

Catalog constraints added in oscal_catalog_metaschema.xml - see issue #1949 #1952

Merged
merged 7 commits into from
Nov 29, 2023
Merged

Catalog constraints added in oscal_catalog_metaschema.xml - see issue #1949 #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7cf6920
Two additional allowed values for catalog/group/part/@name and catalo…
Oct 14, 2023
1c4accf
aligned the description of group/part@name='statement' and control/pa…
Oct 22, 2023
1d40d6b
Merge branch 'develop' into 1949-imichaela-catalog-part-name
iMichaela Oct 24, 2023
af343fa
Fixed typo in the oscal_ssp_metaschema and updated controversial cons…
Nov 29, 2023
14f63e6
Merge branch 'develop' into 1949-imichaela-catalog-part-name
iMichaela Nov 29, 2023
0b7b81e
Update src/metaschema/oscal_catalog_metaschema.xml
iMichaela Nov 29, 2023
0df1476
Merge branch 'develop' into 1949-imichaela-catalog-part-name
Nov 29, 2023
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
4 changes: 3 additions & 1 deletion src/metaschema/oscal_catalog_metaschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
</allowed-values>
<allowed-values target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
<enum value="overview">An introduction to a control or a group of controls.</enum>
<enum value="instruction">Information providing directions for a control or a group of controls.</enum>
</allowed-values>
</constraint>
<remarks>
Expand Down Expand Up @@ -254,9 +255,10 @@
target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
<enum value="overview">An introduction to a control or a group of
controls.</enum>
<enum value="statement">A set of control implementation requirements.</enum>
<enum value="statement">A set of implementation requirements or recommendations.</enum>
<enum value="guidance">Additional information to consider when selecting,
implementing, assessing, and monitoring a control.</enum>
<enum value="example">An example of an implemented requirement or control statement.</enum>
<enum value="assessment" deprecated="1.0.1">**(deprecated)** Use
'assessment-method' instead.</enum>
<enum value="assessment-method">The part describes a method-based assessment
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_ssp_metaschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
</enum>
<enum value="community-cloud">The community cloud deployment model as defined by <a href="https://doi.org/10.6028/NIST.SP.800-145">The NIST Definition of Cloud Computing</a>.
</enum>
<enum value="hybrid-cloud">The hybrid cloud deployment model as defined by as defined by <a href="https://doi.org/10.6028/NIST.SP.800-145">The NIST Definition of Cloud Computing</a>.
<enum value="hybrid-cloud">The hybrid cloud deployment model as defined by <a href="https://doi.org/10.6028/NIST.SP.800-145">The NIST Definition of Cloud Computing</a>.
</enum>
<!-- TODO: consider generalizing this in a way that applies to other usage contexts. -->
<enum value="government-only-cloud">A specific type of community-cloud for use only by government services.</enum>
Expand Down