Skip to content

Adjust Supplier Tree decisions - #276

Merged
ahouseholder merged 7 commits into
mainfrom
feature/fix_275
Jul 12, 2023
Merged

Adjust Supplier Tree decisions#276
ahouseholder merged 7 commits into
mainfrom
feature/fix_275

Conversation

@ahouseholder

@ahouseholder ahouseholder commented Jul 11, 2023

Copy link
Copy Markdown
Contributor

Fixes #275
Resolves #259

Also includes a separate fix for Deployer.json that we missed in #262 related to #249

@ahouseholder
Update supplier-options.csv
d907e62 
3,none,laborious,total,minimal,defer->scheduled
11,none,super effective,total,minimal,scheduled->out-of-cycle
@ahouseholder
Update Supplier.json
b41294b
@ahouseholder
Update Deployer.json to agree with #262 and #249
4c4268e 
Issue #249 changed the CSV files but we forgot to update Deployer.json
@ahouseholder ahouseholder linked an issue Jul 11, 2023 that may be closed by this pull request
Adjust supplier tree decisions 3 and 11 #275
Closed
@ahouseholder ahouseholder self-assigned this Jul 11, 2023
@ahouseholder ahouseholder added the enhancement New feature or request label Jul 11, 2023
@ahouseholder ahouseholder added this to the SSVC v2.1 milestone Jul 11, 2023
j---
j--- approved these changes Jul 12, 2023
View reviewed changes

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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

These are good.
Just tracking that we need to rerun https://github.com/CERTCC/SSVC/blob/main/src/SSVC_csv-to-latex.py to update the graphics after this pull is accepted.

@ahouseholder

ahouseholder commented Jul 12, 2023

Copy link
Copy Markdown
Contributor Author

Just tracking that we need to rerun https://github.com/CERTCC/SSVC/blob/main/src/SSVC_csv-to-latex.py to update the graphics after this pull is accepted.

I'm going to give this a look before I merge this PR in case I can just roll it in at the same time.

@ahouseholder ahouseholder mentioned this pull request Jul 12, 2023
Closed
@ahouseholder

ahouseholder commented Jul 12, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

For future reference (i.e., relevant to resolving #278): The changes in 8804e52 and
2468e96 were generated as follows:

  • In /src:
python ./SSVC_csv-to-latex.py --input=../data/csvs/supplier-options.csv --output=../doc/graphics/ssvc_2_supplier.tex --delim="," --label=5 --priorities="defer,scheduled,out-of-cycle,immediate" 
python ./SSVC_csv-to-latex.py --input=../data/csvs/deployer-options.csv --output=../doc/graphics/ssvc_2_deployer_SeEUMss.tex --delim="," --label=5 --priorities="defer,scheduled,out-of-cycle,immediate"
  • Then in /doc/graphics:
latexmk -pdf ssvc_2_supplier.tex
latexmk -pdf ssvc_2_deployer_SeEUMss.tex

@ahouseholder
ahouseholder merged commit 7ac49c4 into main Jul 12, 2023
@ahouseholder
ahouseholder deleted the feature/fix_275 branch July 12, 2023 14:55
jeroenh pushed a commit to jeroenh/SSVC that referenced this pull request Oct 18, 2023
@ahouseholder @jeroenh
Adjust Supplier Tree decisions (CERTCC#276)
2b1f069 
* Update supplier-options.csv, Supplier.json

3,none,laborious,total,minimal,defer->scheduled
11,none,super effective,total,minimal,scheduled->out-of-cycle

* Update Deployer.json to agree with CERTCC#262 and CERTCC#249
Issue CERTCC#249 changed the CSV files but we forgot to update Deployer.json
* apply black formatter to SSVC_csv-to-latex.py
* update supplier tree graphics
* update deployer tree graphics
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@j--- j--- j--- approved these changes
@sei-vsarvepalli sei-vsarvepalli Awaiting requested review from sei-vsarvepalli sei-vsarvepalli is a code owner

Assignees

@ahouseholder ahouseholder

Labels

enhancement New feature or request

Projects

None yet

Milestone

SSVC v2.1

Development

Successfully merging this pull request may close these issues.

Adjust supplier tree decisions 3 and 11

2 participants

@ahouseholder @j---