Datatype regex fixes for #1703#1736
Merged
aj-stein-nist merged 4 commits intorelease-1.0from Apr 14, 2023
Merged
Conversation
d4b4197 to
76824ac
Compare
76824ac to
15846e0
Compare
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
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule. usnistgov/oscal-content@26f0fe1
6974307 to
19635d9
Compare
Contributor
Author
|
CI/CD is still failing but that is not a surprise. Some of this work has to be back-ported because Schematron checks on Metaschema model definitions were made more stringent since the last release. If we touch up the Metaschema submodule to use a rebased version of the usnistgov/metaschema#343 PR off of develop to include usnistgov/metaschema#344, this last CI failure will go green and this should be ready. |
9 tasks
Contributor
Author
|
There are transient link check errors so not all the builds steps pass. For this release, I do not want to or intend to backport changes in Markdown files for updates links to the FedRAMP Automation repo's reorganized baseline links. For now, I think this is ready for review. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Committer Notes
Update metaschema for current datatype regexes, closes #1703.
All Submissions:
"?
Do all automated CI/CD checks pass?By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.
Changes to Core Features:
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.