Skip to content

Update metaschema for 1.0.6 release#1820

Merged
aj-stein-nist merged 2 commits intorelease-1.0from
chore-release-1.0.6-update-metaschema
Jun 28, 2023
Merged

Update metaschema for 1.0.6 release#1820
aj-stein-nist merged 2 commits intorelease-1.0from
chore-release-1.0.6-update-metaschema

Conversation

@aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Jun 27, 2023

Committer Notes

This PR commit will update the Metaschema submodule to update. We need to update the underlying version of the MIMF to address the following:

Closes #1773.
Closes #1774.

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

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

@aj-stein-nist aj-stein-nist requested a review from a team June 27, 2023 20:38
@aj-stein-nist aj-stein-nist self-assigned this Jun 27, 2023
@aj-stein-nist
Copy link
Contributor Author

Re test failures in this workflow run it is checking the now defunct GSA FedRAMP Automation repo baseline URL that has been addressed in develop or main a while ago, I don't want to expend effort cherry-picking that commit and causing problems later on as we merge main and rebase develop soon enough.

Copy link
Contributor

@wendellpiez wendellpiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Record number of contributors for us I think? 👍

This PR commit will update the Metaschema submodule to update. We need
to update the underlying version of the MIMF to address the following:

Closes #1773.
Closes #1774.
@aj-stein-nist aj-stein-nist force-pushed the chore-release-1.0.6-update-metaschema branch from 2076fbb to ffa1f63 Compare June 27, 2023 22:27
@aj-stein-nist
Copy link
Contributor Author

Just a note the force-push on this PR was to switch to the tagged commit of the newly minted 0.9.0 released that officially dropped this afternoon. The only resulting change that was not officially in yet is the JSON schemas allow you to bind to an OSCAL JSON schema into an example document, but testing review and release will commence tomorrow as planned.

@Compton-US Compton-US self-requested a review June 28, 2023 15:34
Copy link
Contributor

@nikitawootten-nist nikitawootten-nist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EDIT: this is not the only broken link. Some are in the downstream metaschema repo (not worth in this release, but a small bug report or nudge in a future metaschema PR should do it)


/build/ci-cd/README.md

As reported by the markdown link check, the readme /build/ci-cd/README.md uses the old path to the metaschema schema.

Please update line 51 from:

1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/master/toolchains/xslt-M4/validate/metaschema.xsd).

to:

1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/master/schema/xml/metaschema.xsd).

(this change is related to the metaschema-xslt migration which will eventually rip out everything from the /toolchains directory)

Per @nikita-wootten-nist's feedback, fix this URL which has not been updated in either
develop or main branches as the Metaschema 0.9.0 and directory restructuring occurred
during the course of the drafting of the 1.0.6 release.
@aj-stein-nist
Copy link
Contributor Author

EDIT: this is not the only broken link. Some are in the downstream metaschema repo (not worth in this release, but a small bug report or nudge in a future metaschema PR should do it)

/build/ci-cd/README.md

As reported by the markdown link check, the readme /build/ci-cd/README.md uses the old path to the metaschema schema.

Please update line 51 from:

1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/master/toolchains/xslt-M4/validate/metaschema.xsd).

to:

1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/master/schema/xml/metaschema.xsd).

(this change is related to the metaschema-xslt migration which will eventually rip out everything from the /toolchains directory)

Nikita and others looked at this during pairing session to prep release, we would need to change the grep syntax to quickly exclude specific directories from the markdown-link-checker scan uses null-terminated lists of file paths from git and uses an inverse match to exclude them based on the GHA workflow input. Will need to figure out a way to address this maybe as a lot of these path changes will go away with repo restructuring and/or upcoming usnistgov/metaschema updates.

@aj-stein-nist aj-stein-nist merged commit 415206c into release-1.0 Jun 28, 2023
aj-stein-nist added a commit that referenced this pull request Jul 10, 2023
* Update metaschema for 1.0.6 release

This PR commit will update the Metaschema submodule to update. We need
to update the underlying version of the MIMF to address the following:

Closes #1773.
Closes #1774.

* Fix Metaschema XML schema URL

Per @nikita-wootten-nist's feedback, fix this URL which has not been updated in either
develop or main branches as the Metaschema 0.9.0 and directory restructuring occurred
during the course of the drafting of the 1.0.6 release.
@aj-stein-nist aj-stein-nist modified the milestone: v1.0.6 Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants