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.

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

Integrate Updated OSCAL CI/CD with Profile Checker #148

Conversation

aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Oct 21, 2022

Committer Notes

This PR takes the OSCAL CI/CD enhancements for #128 and integrates them into this repo with actual profiles.

This is ready for review but not mergeable. Two conditions must be met.

  • Bug JSON Schema Generation Yields Undesired Allowed Values metaschema#240 has broken the CI builds in develop so this is still not mergeable until that is merged into usnistgov/metaschema develop
  • The updated submodule from ☝️ must be merged into usnistgov/OSCAL is merged into that repo
  • The testing submodule on origin (usnistgov/OSCAL) that is a copy of the actualy PR in my fork (aj-stein-nist/OSCAL) has been updated, as I cannot configure the remote for inline PR testing and only make final merge of this more complex. That PR must be merged first.

NOTE: I wanted to fully test this with a purposefully broken commit in b65f528 that reverted with a force push to clean this up as usnistgov/metaschema#240 continues to break other validation steps in CI, so this is not immediately mergeable and, here or in my fork, I cannot easily demonstrate it like I can in local docker-compose setup.

image

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • 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 written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?

@aj-stein-nist aj-stein-nist self-assigned this Oct 21, 2022
@aj-stein-nist aj-stein-nist changed the base branch from main to develop October 21, 2022 01:43
@aj-stein-nist aj-stein-nist linked an issue Oct 21, 2022 that may be closed by this pull request
4 tasks
@aj-stein-nist aj-stein-nist force-pushed the 128-integrate-profile-checker-schematron branch 2 times, most recently from 7fb9935 to 3ce2a83 Compare October 21, 2022 02:00
@aj-stein-nist aj-stein-nist marked this pull request as ready for review October 21, 2022 02:00
@aj-stein-nist aj-stein-nist force-pushed the 128-integrate-profile-checker-schematron branch from 3ce2a83 to ba8070f Compare October 21, 2022 02:24
@aj-stein-nist
Copy link
Contributor Author

Updates are good but it fails for the reasons I expected:

/home/runner/work/oscal-content/oscal-content/git-content/src/examples/ssp/json/ssp-example.json invalid
[
  {
    keyword: 'enum',
    dataPath: '/system-security-plan/system-characteristics/props/0/name',
    schemaPath: '#/properties/name/allOf/1/enum',
    params: { allowedValues: [Array] },
    message: 'should be equal to one of the allowed values'
  }
]

Validation of extant src OSCAL JSON SSPs fail to due to usnistgov/metaschema#240 bug. Will hold off on merging this until that is resolved.

https://github.com/usnistgov/oscal-content/actions/runs/3294342588/jobs/5431756943

aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Nov 1, 2022
dependabot bot and others added 4 commits November 1, 2022 17:39
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3.1.2 to 4.3.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@98f2ad0...13ae5bb)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Make sure that we keep the compiled Schematron->XSLT output for running
the Schematron business rules and then store the SVRL output results for
later debugging.

NOTE: The collection of files in path runner.temp var for the GHA workflow is in
main branch already as of  d3c227d so I will not double-add it for now.
@david-waltermire
Copy link
Contributor

@aj-stein-nist Once we advance the submodules and the CI is fixed, I'll merge this.

@david-waltermire
Copy link
Contributor

This will be merged once usnistgov/metaschema#253 is merged. This PR will need to be rebased to get the latest metaschema submodule.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integrate profile checker Schematron into CI/CD
3 participants