-
Notifications
You must be signed in to change notification settings - Fork 124
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.
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
Add Examples of OSCAL Actions Assembly #139
Add Examples of OSCAL Actions Assembly #139
Conversation
@david-waltermire-nist, sorry, I cannot change it to draft back bc of perms/I am the author the PR. This is WIP until otherwise stated, can you help me change it back? :-) |
2d4e427
to
6bb77d9
Compare
e4b56d3
to
f46dc3a
Compare
b337a98
to
b5b1bd9
Compare
OK, so I talked with Wendell through a potential bug in the supermodel -> converter generator -> running the OSCAL XML to JSON converter on some example files in here, specifically <nm:ERROR xmlns:err="http://www.w3.org/2005/xqt-errors" xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="err:FOJS0006">xml-to-json: Child elements of <map> must have a key attribute</nm:ERROR> It would seem this has something to do with how specifically this The <group in-json="ARRAY" key="system-ids">
<field collapsible="no" as-type="string" name="system-id" gi="system-id"><!-- NOTE: the field should have an in-json="SCALAR" attribute or something sensible, but it does not. -->
<value as-type="string" key="id" in-json="string">saas_system_iaas_customer</value>
</field>
</group> I will potentially convert this into a metaschema bug report when I am sure it is a bug and know more when discussing with Wendell on Monday or early next week. Some other examples in the example document instance converted to the supermodel I hadn't noticed before. (Interesting and also of note: the <group in-json="ARRAY" key="information-type-ids">
<field collapsible="no" as-type="string" name="information-type-id"
gi="information-type-id" in-json="SCALAR">
<value as-type="string" in-json="string">C.3.5.8</value>
</field>
</group> <group in-json="ARRAY" key="role-ids">
<field collapsible="no" as-type="token" name="role-id" gi="role-id" in-json="SCALAR">
<value as-type="token" in-json="string">admin</value>
</field>
</group> <group in-json="ARRAY" key="functions-performed">
<field collapsible="no" as-type="string" name="function-performed"
gi="function-performed" in-json="SCALAR">
<value as-type="string" in-json="string">Manages the components within the
SaaS.</value>
</field>
</group> <group in-json="ARRAY" key="values">
<field collapsible="no" as-type="string" name="parameter-value" gi="value"
in-json="SCALAR">
<value as-type="string" in-json="string">privileged and
non-privileged</value>
</field>
</group> |
b5b1bd9
to
64e6e77
Compare
To move this along for now: I rebased this off of the current PR #144 for #116. Since that is a branch off my fork, I cannot really point that as the target of this PR. If the CI/CD fixes land, I can rebase again, examples will validate, and builds will work when this work is reviewed and merged as well. |
ed3f0d1
to
a3b2752
Compare
eceb818
to
7c203f2
Compare
This still needs rebasing after usnistgov/metaschema#240 and usnistgov/metaschema#241 are merged into usnistgov/OSCAL and the submodule can be updated to touch up CI/CD issues, but the example content is in a good place for the NIST team and OSCAL community to review the examples content on its merits separate of those issues. |
e4022c7
to
1f75384
Compare
Convert and validate most of the XML-source examples.
f775f71
to
db43fbe
Compare
3fad845
to
c9c6223
Compare
c9c6223
to
26f0fe1
Compare
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
@aj-stein-nist As we discussed today, this needs to be rebased to address the CI problems. Let me know when this is done and I can merge this PR. |
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
* Update metaschema for current datatype regexes for #1703. * Back-port Metaschema XSD relocation. As part of the OSCAL build process, we validate the structure of the metaschema definitions of the OSCAL models themselves against the schema of Metaschema definitions XSD from the metaschema repo. Recently, a path update was fixed in the OSCAL develop branch but not in the release-1.0 branch or main because these changes occurred after 1.0.4 publication. The files were relocated and reorganized. This adjustment must be made to account for that. Pull release/main back into develop should be minor and a rebase may not be necessary. If so, we will adjust accordingly. In develop, see This commit: 84d2d46 * Workaround maven.restlet.org service cert expiry. (#1602) This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1 * Update metaschema submodule again.
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
Committer Notes
This PR closes #130.
Depends on usnistgov/metaschema#240 and usnistgov/metaschema#241
All Submissions:
Changes to Core Features:
Have you written new tests for your core changes, as applicable?