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

Replace define-assembly for include-all with assembly ref #1144

Merged
merged 3 commits into from
Feb 26, 2022

Conversation

guyzyl
Copy link
Contributor

@guyzyl guyzyl commented Feb 20, 2022

Committer Notes

Updated the include-all fields in the assessment metaschema to a ref to the profile instead of define-assembly
This fixes issue #1137, see full explanation there.

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?

Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

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

@guyzyl This looks good. Can you clean up the closing tags?

src/metaschema/oscal_assessment-common_metaschema.xml Outdated Show resolved Hide resolved
src/metaschema/oscal_assessment-common_metaschema.xml Outdated Show resolved Hide resolved
src/metaschema/oscal_assessment-common_metaschema.xml Outdated Show resolved Hide resolved
@david-waltermire david-waltermire changed the base branch from develop to release-1.0 February 25, 2022 22:28
Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

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

I made the changed. Thanks for the fix.

@david-waltermire david-waltermire merged commit 09b3cd2 into usnistgov:release-1.0 Feb 26, 2022
david-waltermire added a commit that referenced this pull request Feb 26, 2022
* Replace `define-assembly` for `include-all` with `assembly ref`
* Apply suggestions from code review
* Moved include-all to oscal_control-common_metaschema.xml to allow for proper importing.

Resolves #1137

Co-authored-by: David Waltermire <[email protected]>
oscalbuilder pushed a commit that referenced this pull request Feb 26, 2022
@guyzyl
Copy link
Contributor Author

guyzyl commented Mar 1, 2022

@guyzyl This looks good. Can you clean up the closing tags?

@david-waltermire-nist sorry, I was on vacation and didn't see your request until now :)

@david-waltermire
Copy link
Contributor

@guyzyl No need to apologize. I hope you enjoyed your time off. Thanks for all the contributions.

stephenbanghart pushed a commit to stephenbanghart/OSCAL that referenced this pull request Mar 14, 2022
…stgov#1144)

* Replace `define-assembly` for `include-all` with `assembly ref`
* Apply suggestions from code review
* Moved include-all to oscal_control-common_metaschema.xml to allow for proper importing.

Resolves usnistgov#1137

Co-authored-by: David Waltermire <[email protected]>
@david-waltermire david-waltermire added this to the OSCAL 1.0.2 milestone Mar 18, 2022
iMichaela pushed a commit to iMichaela/OSCAL that referenced this pull request Apr 7, 2022
…stgov#1144)

* Replace `define-assembly` for `include-all` with `assembly ref`
* Apply suggestions from code review
* Moved include-all to oscal_control-common_metaschema.xml to allow for proper importing.

Resolves usnistgov#1137

Co-authored-by: David Waltermire <[email protected]>
Rene2mt pushed a commit to Rene2mt/OSCAL that referenced this pull request May 17, 2022
…stgov#1144)

* Replace `define-assembly` for `include-all` with `assembly ref`
* Apply suggestions from code review
* Moved include-all to oscal_control-common_metaschema.xml to allow for proper importing.

Resolves usnistgov#1137

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

include-all type mismatch between Profile and Assessment Plan
2 participants