Skip to content

Fix: Rev 4 to Rev 5 - #1990

Closed
sebastiantorrescodes wants to merge 8 commits into
developfrom
unknown repository
Closed

Fix: Rev 4 to Rev 5#1990
sebastiantorrescodes wants to merge 8 commits into
developfrom
unknown repository

Conversation

@sebastiantorrescodes

Copy link
Copy Markdown

Types of changes

  • Hot fix (emergency fix and release)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation (change which affects the documentation site)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Release (develop -> main)

Quality assurance (all should be covered).

  • [ X] My code follows the code style of this project.
  • [ X] Documentation for my change is up to date?
  • [ X] My PR meets testing requirements.
  • [ X] All new and existing tests passed.
  • [ X] All commits are signed-off.

Summary

Key links:

Before you merge

  • Ensure it is a 'squash commit' if not a release.
  • Ensure CI is currently passing
  • Check sonar. If you are working for a fork a maintainer will reach out, if required.

@sebastiantorrescodes
sebastiantorrescodes requested a review from a team as a code owner November 26, 2025 16:57
@degenaro

Copy link
Copy Markdown
Collaborator

Hi @sebastiantorrescodes I enabled the pipelines and they passed. However DCO is failing. See the slack channel for some info on signing. Also, @1aur was successful at signing - perhaps she can share with you.

@degenaro

degenaro commented Dec 2, 2025

Copy link
Copy Markdown
Collaborator

@sebastiantorrescodes Do you want to meet on Teams to move this PR forward? Soon or once semester ends?

@degenaro

Copy link
Copy Markdown
Collaborator

Hi @sebastiantorrescodes please ping here or on slack. When can we meet on Teams this week and try to finish this PR?

@degenaro

degenaro commented Feb 9, 2026

Copy link
Copy Markdown
Collaborator

@sebastiantorrescodes When I download your branch:

degenaro:trestle.sebastian-torres$ grep -r rev4
tests/data/yaml/bad_component_dup_uuid.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/bad_component_dup_uuid.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/bad_component_no_tz.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/bad_component_no_tz.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/good_component.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/good_component.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/good_component_diff_tz.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json
tests/data/yaml/good_component_diff_tz.yaml:        source: https://github.com/usnistgov/OSCAL/blob/v1.0.0-milestone3/content/nist.gov/SP800-53/rev4/json/NIST_SP-800-53_rev4_catalog.json

Comment thread tests/test_utils.py
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()

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.

Comment thread tests/test_utils.py
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'

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.

@degenaro

Copy link
Copy Markdown
Collaborator

Hi @sebastiantorrescodes, could you please fix the variable names. See comments. Also, if you click on DCO it will tell you how to sign and get rid of this red X. Thx!

@degenaro degenaro added good first issue Good for newcomers help wanted Extra attention is needed event/slam Slam Issues labels Feb 25, 2026
@degenaro

Copy link
Copy Markdown
Collaborator

Closing in favor of #2116

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

event/slam Slam Issues good first issue Good for newcomers help wanted Extra attention is needed

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants