Skip to content

Fix: Rev 4 to Rev 5 #1990

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

Closed
sebastiantorrescodes wants to merge 8 commits into from
Closed

Fix: Rev 4 to Rev 5 #1990

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4711ff
Fix: Rev 4 to Rev 5
sebastiantorrescodes Nov 26, 2025
f12260c
Merge branch 'develop' into develop
degenaro Jan 6, 2026
a35405e
Merge branch 'develop' into develop
degenaro Jan 31, 2026
6365b29
Merge branch 'develop' into develop
degenaro Feb 9, 2026
1e5760c
Merge branch 'develop' into develop
degenaro Feb 9, 2026
9dcbadb
Merge branch 'develop' into develop
degenaro Feb 16, 2026
10632f3
Merge branch 'develop' into develop
degenaro Feb 23, 2026
2e2e853
Merge branch 'develop' into develop
degenaro Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/experiments/json_serialize_ben.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ def run(path: pathlib.Path, count: int) -> None:


if __name__ == '__main__':
path = pathlib.Path('nist-content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json')
path = pathlib.Path('nist-content/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json')
count = 50
run(path, count)
2 changes: 1 addition & 1 deletion tests/data/author/ssp/ssp_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
]
},
"import-profile": {
"href": "../../../nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_LOW-baseline_profile.json"
"href": "../../../nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_LOW-baseline_profile.json"
},
"system-characteristics": {
"system-ids": [
Expand Down
2 changes: 1 addition & 1 deletion tests/manual_tests/split_test_issue_630.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mkdir test_trestle
cd test_trestle
trestle init
#UPDATE HERE!!!!!!
trestle import -f path_to/NIST_SP-800-53_rev4_catalog.json -o mycatalog
trestle import -f path_to/NIST_SP-800-53_rev5_catalog.json -o mycatalog
#UPDATE HERE!!!!!!
cd catalogs
cd mycatalog
Expand Down
2 changes: 1 addition & 1 deletion tests/manual_tests/split_validate_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rm -rf test_trestle
mkdir test_trestle
cd test_trestle
trestle init
trestle import -f path_to/NIST_SP-800-53_rev4_catalog.json -o mycatalog
trestle import -f path_to/NIST_SP-800-53_rev5_catalog.json -o mycatalog

cd catalogs
cd mycatalog
Expand Down
6 changes: 3 additions & 3 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
JSON_NIST_DATA_PATH = pathlib.Path(TEST_DIR / '../nist-content/nist.gov/SP800-53/rev5/json/').resolve()
JSON_NIST_CATALOG_NAME = 'NIST_SP-800-53_rev5_catalog.json'
JSON_NIST_PROFILE_NAME = 'NIST_SP-800-53_rev5_MODERATE-baseline_profile.json'
JSON_NIST_REV_4_DATA_PATH = pathlib.Path(TEST_DIR / '../nist-content/nist.gov/SP800-53/rev4/json/').resolve()
JSON_NIST_REV_4_CATALOG_NAME = 'NIST_SP-800-53_rev4_catalog.json'
JSON_NIST_REV_4_DATA_PATH = pathlib.Path(TEST_DIR / '../nist-content/nist.gov/SP800-53/rev5/json/').resolve()

@degenaro degenaro Feb 18, 2026

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.

The variable name should be changed to reflect REV5.

JSON_NIST_REV_4_CATALOG_NAME = 'NIST_SP-800-53_rev5_catalog.json'
JSON_NIST_REV_5_CATALOG_NAME = 'nist-rev5-catalog-full.json'
JSON_NIST_REV_4_PROFILE_NAME = 'NIST_SP-800-53_rev4_MODERATE-baseline_profile.json'
JSON_NIST_REV_4_PROFILE_NAME = 'NIST_SP-800-53_rev5_MODERATE-baseline_profile.json'

@degenaro degenaro Feb 18, 2026

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.

Same as above.

SIMPLIFIED_NIST_CATALOG_NAME = 'simplified_nist_catalog.json'
SIMPLIFIED_NIST_PROFILE_NAME = 'simplified_nist_profile.json'
TASK_XLSX_OUTPUT_PATH = pathlib.Path(TEST_DIR / 'data/tasks/xlsx/output').resolve()
Expand Down
2 changes: 1 addition & 1 deletion tests/trestle/core/utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

def load_good_catalog() -> catalog.Catalog:
"""Load nist 800-53 as a catalog example."""
good_sample_path = TEST_DIR / '../nist-content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json'
good_sample_path = TEST_DIR / '../nist-content/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json'

assert good_sample_path.exists()
return catalog.Catalog.oscal_read(good_sample_path)
Expand Down
Loading