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

Jump to bottom

[WIP] Metaschema Enhancements Needed for Rule Construct in Component Definition #1160

Merged
merged 3 commits into from
Aug 30, 2022
Merged

[WIP] Metaschema Enhancements Needed for Rule Construct in Component Definition #1160

merged 3 commits into from
Aug 30, 2022

Conversation

aj-stein-nist
Copy link
Contributor

Committer Notes

NOTE: This is a migrated PR from #1124. OSCAL devs should all be using forks now.

These are examples of metaschema model changes that will be required for #1058, and to support example document instances as seen in usnistgov/oscal-content#94.

NOTE: These are labelled WIP (Work In Progress) and are subject to change. Please report feedback on the issue, but also check for updates to the shape of the code as it changes.

All Submissions:

  • Have you selected the correct base branch per Contributing guidance?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

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 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.
  • Have you written new tests for your core changes, as applicable?

@aj-stein-nist aj-stein-nist linked an issue Mar 4, 2022 that may be closed by this pull request
Support for "Rules" in OSCAL Models #1058
Open
12 tasks
@aj-stein-nist aj-stein-nist added the Discussion Needed This issues needs to be reviewed by the OSCAL development team. label Mar 4, 2022
@aj-stein-nist aj-stein-nist mentioned this pull request Mar 4, 2022
Open
12 tasks
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from 4c31de2 to b7d376f Compare June 1, 2022 18:21
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist I pushed up the WIP models after our modeling session where we blew away my old work prior to this week and started fresh. I will be sure to align some examples later this week and as we progress.

@aj-stein-nist aj-stein-nist changed the base branch from main to develop June 1, 2022 22:29
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from f3e2e01 to 8dc7f35 Compare June 16, 2022 01:52
aj-stein-nist added a commit to usnistgov/metaschema that referenced this pull request Jul 27, 2022
@aj-stein-nist @david-waltermire
Implement default values for flags and fields.
759989d 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch 2 times, most recently from 47e5b05 to 2242e65 Compare July 27, 2022 18:11
david-waltermire added a commit to usnistgov/metaschema that referenced this pull request Jul 28, 2022
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (#220)
4185764 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
@david-waltermire david-waltermire linked an issue Jul 28, 2022 that may be closed by this pull request
Design a rule assembly #1339
Closed
2 tasks
@david-waltermire david-waltermire removed a link to an issue Jul 28, 2022
Design a rule assembly #1339
Closed
2 tasks
@david-waltermire david-waltermire linked an issue Jul 28, 2022 that may be closed by this pull request
Review current approaches to defining rules to confirm minimal data fields in rules-related models #1391
Open
3 tasks
@aj-stein-nist aj-stein-nist linked an issue Jul 28, 2022 that may be closed by this pull request
Prototype Metaschema models and mockup data samples #1364
Open
14 tasks
@aj-stein-nist aj-stein-nist removed a link to an issue Jul 28, 2022
Review current approaches to defining rules to confirm minimal data fields in rules-related models #1391
Open
3 tasks
@aj-stein-nist aj-stein-nist mentioned this pull request Jul 28, 2022
Open
3 tasks
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch 2 times, most recently from ac03cbf to f5251a1 Compare August 3, 2022 22:23
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from f5251a1 to 290b497 Compare August 17, 2022 21:04
@aj-stein-nist aj-stein-nist mentioned this pull request Aug 17, 2022
Closed
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch 4 times, most recently from 283f838 to bda40df Compare August 22, 2022 21:32
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch 2 times, most recently from 29db92f to 9bd2799 Compare August 23, 2022 13:55
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from 9bd2799 to dc90650 Compare August 25, 2022 15:25
@aj-stein-nist
Copy link
Contributor Author

TODO: Dave requested in a sync today I collapse this PR into a feature branch, not develop.

@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from dc90650 to f5e4eb7 Compare August 26, 2022 15:07
@aj-stein-nist aj-stein-nist changed the base branch from develop to feature-rules August 30, 2022 02:33
@aj-stein-nist aj-stein-nist force-pushed the issue-1058-rules-metaschema-draft branch from f5e4eb7 to 095f0a6 Compare August 30, 2022 02:44
@aj-stein-nist aj-stein-nist marked this pull request as ready for review August 30, 2022 02:44
This was unlinked from issues Aug 30, 2022
Support for "Rules" in OSCAL Models #1058
Open
Prototype Metaschema models and mockup data samples #1364
Open
@aj-stein-nist aj-stein-nist merged commit 1366460 into usnistgov:feature-rules Aug 30, 2022
@aj-stein-nist aj-stein-nist deleted the issue-1058-rules-metaschema-draft branch August 30, 2022 02:45
david-waltermire added a commit to usnistgov/metaschema that referenced this pull request Dec 7, 2022
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (#220)
0393a22 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 9, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
3bb7457 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 10, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
d879b15 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 10, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
b07504c 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 10, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
bb2488f 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 10, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
cba92bb 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/metaschema that referenced this pull request Jan 10, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (usnistgov#220)
97c97ae 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
david-waltermire added a commit to usnistgov/metaschema that referenced this pull request Mar 9, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (#220)
7764cbe 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
david-waltermire added a commit to usnistgov/metaschema that referenced this pull request Mar 29, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (#220)
d545df9 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
nikitawootten-nist pushed a commit to nikitawootten-nist/metaschema-xslt that referenced this pull request Jul 21, 2023
@aj-stein-nist @david-waltermire
Implement default values for flags and fields. (#220)
e94c16f 
During pairing on usnistgov/OSCAL#1160, we determined there will be a
lot of utility to have default values when enhancing the draft version
of the Rules Model. This PR implements that functionality in the Metaschema
core syntax defined in the XSD.

Co-authored-by: David Waltermire <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@david-waltermire david-waltermire Awaiting requested review from david-waltermire

Assignees
No one assigned
Labels
Discussion Needed This issues needs to be reviewed by the OSCAL development team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@aj-stein-nist