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

Integration of Profile Resolution NG into Build Process #624

Conversation

david-waltermire
Copy link
Contributor

@david-waltermire david-waltermire commented Feb 7, 2020

Committer Notes

Addressing #561 and usnistgov/oscal-content#128 by implementing profile resolution unit testing.

This PR leverages the commits from PR #559.

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)?
  • 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.

@david-waltermire david-waltermire mentioned this pull request Feb 7, 2020
8 tasks
@david-waltermire david-waltermire changed the title Integration on Profile Resolution NG into Build Process Integration of Profile Resolution NG into Build Process Feb 7, 2020
created under \$TMPDIR if set or in /tmp.
--keep-temp-scratch-dir If a scratch directory is automatically
created, it will not be automatically removed.
-v Provide verbose output
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe add a --verbose equivalent for consistency and ease-of-reading.

case "$arg" in
--scratch-dir)
SCRATCH_DIR="$(realpath "$2")"
shift # past unit_test_dir
Copy link
Contributor

Choose a reason for hiding this comment

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

The comment should probably refer to the scratch dir.

echo -e "${P_INFO}==============================${P_END}"

if [ "$VERBOSE" = "true" ]; then
echo -e "${P_INFO}Using working directory:${P_END} ${WORKING_DIR}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't look like this gets set here.

<xs:element ref="oscal-catalog:param" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="oscal-catalog:control" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="oscal-catalog:group" minOccurs="0" maxOccurs="unbounded"/>
<xs:choice>
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like a change from (or for) a different commit.

bradh and others added 11 commits March 17, 2020 12:30
These are selective imports from the catalogs/abc-simple_catalog.xml, essentially identical except for how the
catalog is referenced.
…le (#16)

This is basically the entire catalog, except for the a1 profile.

The change adds the parent groups, and the children of c1.
This is essentially the same as the catalog, and adds the parent
groups to the existing result.
This adds the parent group, missing params and parts of the control.
This is basically the same as the catalog, less the children on c1
Adds the parent group and title, and missing control c3.a-1
These are essentially identical, since keep is the default.
@david-waltermire david-waltermire force-pushed the daw-profile-resolution-ng-repaired branch from d82ae87 to 7ce3f73 Compare March 17, 2020 16:32
david-waltermire and others added 8 commits March 25, 2020 23:37
Added config option to support profile-resolution.
Updating to latest metaschema.
Fixes to profile catalog references to make them relative.
* fixing a profile resolution bug causing duplicate back-matter when multiple catalogs are used.,
Fixed profile resolution validation errors resulting from invalid catalogs.
Fixed broken schema path in test-profile-resolution.sh.
@david-waltermire david-waltermire marked this pull request as ready for review March 27, 2020 04:25
@david-waltermire david-waltermire merged commit 84a4021 into usnistgov:master Mar 27, 2020
@david-waltermire david-waltermire deleted the daw-profile-resolution-ng-repaired branch March 28, 2020 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment