Skip to content

Schema criteria or criteria groups #41

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

Merged

Conversation

kristovatlas
Copy link
Member

This updates the schema and working obpp3 model to remove unnecessary “criteria-groups” arrays that enclose criteria when there was previously only one group present.

…r a countermeasure

Also updated the threat model example by removing encapsulating
“criteria-groups” from criteria when there was not more than one group.

QA:
1. All unit tests pass:
```
$ ./run_quick_test.sh
..............
----------------------------------------------------------------------
Ran 14 tests in 0.066s

OK

```
2. Verified that example JSON validates:
```
$ python validate_json.py "threat model example.json"
'threat model example.json' matches the specified schema.
```

3. Verified that markdown generated by docgen is the same as it was
before after being rendered by markdown app Typora and comparing the
pasted text.
Kristov Atlas added 2 commits November 5, 2016 16:38
Only 5 criteria groups remain, used to separate mutually exclusive
criteria.

QA:
1. Verified that Hjson still validates:
```
$ python validate_json.py "obpp3.hjson"
'obpp3.hjson' matches the specified schema.
```
2. Compared pasted plaintext of rendered markdown before and after to
verify they are identical.
@crwatkins
Copy link

LGTM

@dcousens
Copy link

dcousens commented Nov 8, 2016

ACK

@kristovatlas kristovatlas merged commit 0502510 into reorg-to-scoring-system Nov 10, 2016
@kristovatlas kristovatlas deleted the schema-criteria-or-criteria-groups branch November 10, 2016 00:03
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.

3 participants