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

Compress safety and mission impacts fix for #1 (+11 squashed commits) #51

Merged
merged 1 commit into from
Oct 29, 2020

Conversation

ahouseholder
Copy link
Contributor

Fixes #1

Squashed commits:
[07497bd] compress SafetyImpact into PublicSafetyImpact
[6b9c932] ignore a helper xlsx file
[576f968] reset inadvertent change
[419349d] remove index on supplier csv (+1 squashed commit)
Squashed commits:
[6486a57] add full supplier csv
[6918107] remove index on simplified csv (+1 squashed commit)
Squashed commits:
[1845f90] add simplified csv
[7d07685] add combined safety/mission impact column
[52dd62a] remove duplicates after collapsing from 5-4. Keep highest outcome
[898a082] collapse two lowest mission and safety impacts into one level each and remove duplicates
[b344dea] remove row indices (make future diffs cleaner)
[420559c] copy csv files for version 2
[d07e953] fix some straggling Applier / Developers (+2 squashed commits)
Squashed commits:
[878a91d] wip commit (+1 squashed commit)
Squashed commits:
[59637d6] fix applier/deployer sub

wip commit
[80dd092] revert unintended change

Squashed commits:
[07497bd] compress SafetyImpact into PublicSafetyImpact
[6b9c932] ignore a helper xlsx file
[576f968] reset inadvertent change
[419349d] remove index on supplier csv (+1 squashed commit)
Squashed commits:
[6486a57] add full supplier csv
[6918107] remove index on simplified csv (+1 squashed commit)
Squashed commits:
[1845f90] add simplified csv
[7d07685] add combined safety/mission impact column
[52dd62a] remove duplicates after collapsing from 5-4. Keep highest outcome
[898a082] collapse two lowest mission and safety impacts into one level each and remove duplicates
[b344dea] remove row indices (make future diffs cleaner)
[420559c] copy csv files for version 2
[d07e953] fix some straggling Applier / Developers (+2 squashed commits)
Squashed commits:
[878a91d] wip commit (+1 squashed commit)
Squashed commits:
[59637d6] fix applier/deployer sub

wip commit
[80dd092] revert unintended change
@ahouseholder ahouseholder added this to the SSVC v2 milestone Oct 26, 2020
@ahouseholder ahouseholder requested a review from j--- October 26, 2020 18:20
@ahouseholder
Copy link
Contributor Author

ahouseholder commented Oct 26, 2020

Notes:

  • This pull request adds new csv files to the data dir: a "simple" version of the supplier and deployer tables, and a "full" version of the same. The "full" version contains the columns that feed into the sub-tables (utility, safetymission) in addition to the condensed ones. The "full" version also retains duplicate rows where the same inputs landed in a different outcome. The intent is that these can be used for reasoning about outcomes while v2 is in development. I don't know that they will need to persist beyond the development process. These will need to be deduplicated once we revisit the outcomes for the revised tables.

  • I moved the "exposure" section in 040_...md up so that we could have safety and mission impacts land right next to each other without having a nonsequitur section on the way to the combined SafetyMissionImpact table.

@ahouseholder ahouseholder requested a review from zmanion October 26, 2020 18:32
Copy link
Collaborator

@j--- j--- left a comment

Choose a reason for hiding this comment

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

This all looks good to me.

@zmanion
Copy link
Contributor

zmanion commented Oct 28, 2020

So does the new csv represent new trees for v2? Do we have new trees decided for v2?

@j---
Copy link
Collaborator

j--- commented Oct 29, 2020

So does the new csv represent new trees for v2? Do we have new trees decided for v2?

They're the start of new trees for v2 that address this issue. They are not finalized, because there are other issues open that will change them further. Specifically, for sure #19 and maybe #35. Also maybe #8, but based on the discussion #8 might not get implemented.

@zmanion zmanion merged commit aa55a3c into CERTCC:main Oct 29, 2020
@ahouseholder ahouseholder deleted the feature/fix_1 branch October 29, 2020 14:51
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.

Split safety impact into supplier / deployer safety impacts
3 participants