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.

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

chore: Trestle release #1399

Merged
merged 11 commits into from
Jun 26, 2023
Merged

chore: Trestle release #1399

merged 11 commits into from
Jun 26, 2023

Conversation

AleJo2995
Copy link
Collaborator

@AleJo2995 AleJo2995 commented Jun 15, 2023

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

Bumping version from 2.1.1 to 2.2.0

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.

Vikas Agarwal and others added 8 commits May 12, 2023 18:10
Signed-off-by: degenaro <lou.degenaro@gmail.com>
* feat(cli): adds logic to filter ssp by control origination

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 #1361

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* docs: updates trestle author docs with ssp-filter changes for control origination

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* fix: updates control origination flag value in ssp.py

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* fix: adds break to remove duplicate implemented requirements

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>

---------

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
…own (#1390)

* fix: use empty string if part prose is None

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>

* test: add test for checking no prose in part

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>

---------

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>
Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com>
…on (#1395)

* fix: use empty string if part prose is None

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>

* test: add test for checking no prose in part

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>

* fix: write warning instead of exit with code 1 when duplicate parts

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>

---------

Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com>
* feat: oscal-catalog-to-csv

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* Populate testing spot checks.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* fix validate

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* Use 'w' for output file open.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* fix windows csv.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* Fix sonar complaints + improved test coverage

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* Fix sonar complaint.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* Improve test coverage.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

* 100% test coverage.

Signed-off-by: degenaro <lou.degenaro@gmail.com>

---------

Signed-off-by: degenaro <lou.degenaro@gmail.com>
@AleJo2995 AleJo2995 removed the request for review from MRNGJ June 16, 2023 17:56
@AleJo2995
Copy link
Collaborator Author

@vikas-agarwal76 could you approve please? Manjiree seems to have lost admin access to approve

* test: adds testdata for profile init tests

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* feat(cli): adds profile-seed command

Adds profile-seed as author subcommand
Adds profile-seed unit test
Adds SSP testdata

Closes #1388

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* chore: updates flag wording in profile.py

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* test: adds test case for profile-seed

Adds additional test case to check for ids output
when all controls are filtered out

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* test: updates description leveraged ssp testdata

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* docs: updates author and tutorial docs with information on profile-seed command

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* chore: updates command to profile-inherit in docs and code

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* feat: adds excluded controls to the profile-inherit generated profile

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* docs: adds JSON example of profile-inherit import to website docs

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* chore: adds PR feedback on styling

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

---------

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
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

degenaro and others added 2 commits June 26, 2023 14:00
* fix: python 3.7.17 issue

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>

* fix: python 3.7.17 issue

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>

---------

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com>
@AleJo2995 AleJo2995 merged commit c3c28de into main Jun 26, 2023
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.

6 participants