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.

Sign up for GitHub

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

Jump to bottom

Create <define-assembly name="impact"> (fix #1129) #1171

Merged
merged 2 commits into from
Aug 25, 2022
Merged

Create <define-assembly name="impact"> (fix #1129) #1171

merged 2 commits into from
Aug 25, 2022

Conversation

guyzyl
Copy link
Contributor

@guyzyl guyzyl commented Mar 13, 2022 •
edited by aj-stein-nist
Loading

Committer Notes

This PR fixes issue #1129 .
See issue for the reasoning (and discussion) behind this PR.

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?

@david-waltermire david-waltermire added this to the OSCAL 1.1.0 milestone Mar 15, 2022
@david-waltermire david-waltermire self-assigned this Mar 15, 2022
aj-stein-nist
aj-stein-nist reviewed Mar 15, 2022
View reviewed changes
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

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

I might want to circle back with the team on the docs, but looks good so far. I will test it locally more more rigorously than just eyeballing it, and come back with formal approval or to request changes. Still want this question cleared up in advance.

src/metaschema/oscal_ssp_metaschema.xml Show resolved Hide resolved
wendellpiez
wendellpiez previously approved these changes Mar 15, 2022
View reviewed changes
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.

The use-name feature may not have been available when this was originally sketched - nice find, @guyzyl

@guyzyl
Copy link
Contributor Author

guyzyl commented Mar 16, 2022

@wendellpiez thanks! But the credit goes to @david-waltermire-nist for pointing it out to me.

@david-waltermire david-waltermire linked an issue Mar 17, 2022 that may be closed by this pull request
Create an #assembly_oscal-ssp_impact SSP model #1129
Closed
3 tasks
@david-waltermire
Copy link
Contributor

The one problem with this change is that the formal names for the individual impact metrics will be normalized. I'd like to add a feature to Metaschema that will allow the model references to override the formal names, preserving the current naming for the documentation.

I am going to push this to 1.1.0 to allow time to make this refinement.

@david-waltermire david-waltermire mentioned this pull request Mar 17, 2022
Closed
4 tasks
@david-waltermire
Copy link
Contributor

david-waltermire commented Jul 14, 2022 •
edited
Loading

The necessary change to the Metaschema model are in usnistgov/metaschema#197.

See https://github.com/usnistgov/metaschema/blob/0b61192f3559218b7097b86deeeac837794f5388/schema/xml/metaschema.xsd#L445

The changes to complete this PR can be made once usnistgov/metaschema#197 is merged and issue #1338 is resolved.

david-waltermire
david-waltermire approved these changes Aug 25, 2022
View reviewed changes
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 Thanks! Finally completed this.

@david-waltermire david-waltermire merged commit 3198f05 into usnistgov:develop Aug 25, 2022
@guyzyl
Copy link
Contributor Author

guyzyl commented Aug 25, 2022

@david-waltermire-nist really glad to finally see this merged 🙂

@guyzyl guyzyl deleted the fix-1129 branch August 25, 2022 12:21
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Oct 6, 2022
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
97a9837 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit that referenced this pull request Oct 18, 2022
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix #1129) (#1171)
2379d20 
* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves #1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
david-waltermire added a commit that referenced this pull request Oct 31, 2022
@guyzyl @david-waltermire
Create <define-assembly name="impact"> (fix #1129) (#1171)
a8bc96c 
* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves #1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jan 10, 2023
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
c040810 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Feb 6, 2023
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
2f0d79f 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jun 29, 2023
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
a002939 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jul 10, 2023
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
b43142a 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
aj-stein-nist pushed a commit to galtm/OSCAL that referenced this pull request Sep 28, 2023
@guyzyl @david-waltermire @aj-stein-nist
Create <define-assembly name="impact"> (fix usnistgov#1129) (usnist…
b06aac9 
…gov#1171)

* Create`<define-assembly name="impact">`
* Restored C/I/A formal names and descriptions.

Resolves usnistgov#1129.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aj-stein-nist aj-stein-nist aj-stein-nist left review comments

@david-waltermire david-waltermire david-waltermire approved these changes

@wendellpiez wendellpiez wendellpiez left review comments

Assignees

@david-waltermire david-waltermire

Labels
None yet
Projects
None yet
Milestone
v1.1.0
Development

Successfully merging this pull request may close these issues.

Create an #assembly_oscal-ssp_impact SSP model
4 participants
@guyzyl @david-waltermire @wendellpiez @aj-stein-nist