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

Tightened declaration of flags for identifiers to 'NCName' #608

Merged
merged 4 commits into from
Jan 23, 2020
Merged

Tightened declaration of flags for identifiers to 'NCName' #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a70e9d3
Tightened declaration of flags for identifiers to 'NCName' cf #551
wendellpiez Jan 23, 2020
c576621
Tightened declaration of flags for identifiers to 'NCName' cf #551
wendellpiez Jan 23, 2020
8b114ac
Changed the UUID on the root element to be a compliant NCName
david-waltermire Jan 23, 2020
44f3927
Merge pull request #24 from david-waltermire-nist/wendellpiez-issue551
david-waltermire Jan 23, 2020
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
2 changes: 1 addition & 1 deletion src/content/fedramp.gov/xml/FedRAMP_HIGH-baseline-resolved-profile_catalog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="4045631f-a7f3-48b7-9228-052cb2a2e8fe">
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-4045631f-a7f3-48b7-9228-052cb2a2e8fe">
<metadata>
<title>FedRAMP High Baseline [RESOLVED]</title>
<published>2019-11-27T00:00:00.000-05:00</published>
Expand Down
2 changes: 1 addition & 1 deletion src/content/fedramp.gov/xml/FedRAMP_LI-SaaS-baseline-resolved-profile_catalog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="8b898586-6ae4-4685-8e32-600755fe556b">
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-8b898586-6ae4-4685-8e32-600755fe556b">
<metadata>
<title>FedRAMP Tailored Low Impact Software as a Service (LI-SaaS) Baseline [RESOLVED]</title>
<published>2019-11-27T00:00:00.000-05:00</published>
Expand Down
2 changes: 1 addition & 1 deletion src/content/fedramp.gov/xml/FedRAMP_LOW-baseline-resolved-profile_catalog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="5456659f-da22-4d01-a1fa-f0e51f84e363">
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-5456659f-da22-4d01-a1fa-f0e51f84e363">
<metadata>
<title>FedRAMP Low Baseline [RESOLVED]</title>
<published>2019-11-27T00:00:00.000-05:00</published>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_metadata_metaschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@
example) the results of profile resolution.</p>
</remarks>
</define-flag>
<define-flag name="id" as-type="string">
<define-flag name="id" as-type="NCName">
<formal-name>Identifier</formal-name>
<description>Unique identifier of the containing object</description>
<remarks>
Expand Down
18 changes: 9 additions & 9 deletions src/metaschema/oscal_ssp_metaschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<assembly ref="data-flow"/>
<assembly ref="responsible-party" max-occurs="unbounded">
<group-as name="responsible-parties" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -593,7 +593,7 @@
<p>Permissible values to be determined closer to the application, such as by a receiving authority.</p>
</remarks>
</define-assembly>
<define-field name="role-id">
<define-field name="role-id" as-type="NCName">
<formal-name>Role Identifier Reference</formal-name>
<description>A reference to the roles served by the user.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -711,7 +711,7 @@
<assembly ref="responsible-role" max-occurs="unbounded">
<description>Defines a role that has responsibility for the component.</description>
<group-as name="responsible-roles" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -865,7 +865,7 @@
</field>
<assembly ref="responsible-party" max-occurs="unbounded">
<group-as name="responsible-parties" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -964,7 +964,7 @@
</field>
<assembly ref="responsible-party" max-occurs="unbounded">
<group-as name="responsible-parties" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -1053,7 +1053,7 @@
</field>
<assembly ref="responsible-party" max-occurs="unbounded">
<group-as name="responsible-parties" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -1118,7 +1118,7 @@
-->
<assembly ref="responsible-role" max-occurs="unbounded">
<group-as name="responsible-roles" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -1168,7 +1168,7 @@
--> <!-- TODO: Implement parameters -->
<assembly ref="responsible-role" max-occurs="unbounded">
<group-as name="responsible-roles" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down Expand Up @@ -1242,7 +1242,7 @@
</field>
<assembly ref="responsible-role" max-occurs="unbounded">
<group-as name="responsible-roles" in-json="BY_KEY"/>
<flag name="role-id">
<flag name="role-id" as-type="NCName">
<formal-name>Role identifier</formal-name>
<description>Indicates the role assigned to the responsible party.</description>
<allowed-values allow-other="yes">
Expand Down