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.

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

Jump to bottom

feat: adds control origination to ssp-filter #1375

Merged
merged 6 commits into from
May 23, 2023
Merged

feat: adds control origination to ssp-filter #1375

merged 6 commits into from
May 23, 2023

Conversation

jpower432
Copy link
Collaborator

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).

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

Summary

This PR adds an optional control origination flag to the trestle author ssp-filter command. This will filter implemented requirements by the control origination property.

This PR also adds corresponding docs changes to update ssp-filter functionality.

Closes #1361

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.

@jpower432
feat(cli): adds logic to filter ssp by control origination
698d37f 
Adds test to test one and multiple control origination value inputs
Adds test to test bad control origintation value input
Adds filtering logic to ssp.py

Closes oscal-compass#1361

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
@jpower432
docs: updates trestle author docs with ssp-filter changes for control…
0a52c31 
… origination

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
@jpower432
fix: updates control origination flag value in ssp.py
28c4584 
Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
@jpower432 jpower432 changed the title Feat/ssp filter control origination feat: adds control origination to ssp-filter May 10, 2023
@jpower432
fix: adds break to remove duplicate implemented requirements
c3e0d8d 
When filtering for control origination, the property could be
specified more than one time. This change adds a break and changes
to the test component defintion to ensure this case is covered.

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
@AleJo2995 AleJo2995 requested review from vikas-agarwal76 and removed request for vikas-agarwal76 May 11, 2023 01:31
@AleJo2995
Copy link
Collaborator

Hey @jpower432 . Glad to see this PR in place. As soon as you get ready for review please put me and Vikas as reviewers and we will be more than glad to help you with it. If you have any questions or any assistance I can provide, please do not hesitate to reach me out :)

@jpower432 jpower432 marked this pull request as ready for review May 11, 2023 15:42
@jpower432
Copy link
Collaborator Author

Thanks @AleJo2995! This is ready, but I am not able to add reviewers. Would you be able to re-run the failed jobs on this PR? I believe the original failure was due to a GitHub Actions outage.

@jpower432
Copy link
Collaborator Author

@AleJo2995 @vikas-agarwal76 Just wanted to reach out about this PR. I am not able to re-run the failed job for windows, but it looks like it was a pytest internal error. Can you please take a look when you have a chance? Appreciate it!

vikas-agarwal76
vikas-agarwal76 approved these changes May 20, 2023
View reviewed changes
Copy link
Collaborator

@vikas-agarwal76 vikas-agarwal76 left a comment

Choose a reason for hiding this comment

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

LGTM

@jpower432
Copy link
Collaborator Author

Thanks @vikas-agarwal76. Wanted to double check with you and @AleJo2995 about requirements around merging. I see that I need to squash the commit. Any other requirements since I am working from a fork? Thanks :)

@vikas-agarwal76
Copy link
Collaborator

@jpower432 Yes, whenever any branch is merged into develop branch it is "Squash and Merge".
Bur, when we merge develop branch into main to make a release then it is "Merge Commit".

@jpower432 jpower432 merged commit 509afa7 into oscal-compass:develop May 23, 2023
16 checks passed
@AleJo2995 AleJo2995 mentioned this pull request Jun 27, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vikas-agarwal76 vikas-agarwal76 vikas-agarwal76 approved these changes

@AleJo2995 AleJo2995 Awaiting requested review from AleJo2995

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow ssp-filter by control origination
3 participants
@jpower432 @AleJo2995 @vikas-agarwal76