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: task cis-xlsx-to-oscal-cd #1764

Merged
merged 38 commits into from
Jan 16, 2025
Merged

feat: task cis-xlsx-to-oscal-cd #1764

merged 38 commits into from
Jan 16, 2025

Conversation

degenaro
Copy link
Collaborator

@degenaro degenaro commented Dec 2, 2024 •
edited
Loading

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

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.

@degenaro
task cis-xlsx-to-oscal-cd
80a804f 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro degenaro requested a review from a team as a code owner December 2, 2024 21:03
vikas-agarwal76
vikas-agarwal76 requested changes Dec 4, 2024
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.

Please update the code to fix issue on Python 3.9

trestle/tasks/cis_xlsx_to_oscal_cd.py Outdated

@staticmethod
def compare(item1, item2):
"""Compare."""
Copy link
Collaborator

Choose a reason for hiding this comment

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

Removing "@staticmethod" annotation to compare function solved the issue on python 3.9

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thx! Will give it a try...

degenaro added 18 commits December 4, 2024 07:27
@degenaro
Fix failing macos pipeline (thanks Vikas!)
adc2a4c 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
SortHelper
709bb07 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Add debugging try/except
28f6845 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
2nd try
1922968 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
add utf-8 encoding to open
e2e6a6e 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
bb36e1b 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
2719422 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
e236d96 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
22f11b1 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
fbf822a 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
dcec52f 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
503c612 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Fix sonar code smells
ea7ee72 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Merge branch 'develop' into fix/cisb-to-oscal-cd
8ae4c95
@degenaro
improve test spot checking
e8e1864 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
Merge branch 'develop' into fix/cisb-to-oscal-cd
56e63ea
@degenaro
tests: bad_confg and bad_overwrite
34bb023 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
simplify & improve test coverage
c3a4889 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro degenaro self-assigned this Jan 6, 2025
@degenaro
Copy link
Collaborator Author

degenaro commented Jan 6, 2025

Fixes #1762

@jpower432 jpower432 added this to the v3.7.0 milestone Jan 7, 2025
@degenaro
Simplify & improve test coverage
8d8647e 
Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
100% test coverage!
8edc4e6 
Signed-off-by: Lou DeGenaro <[email protected]>
jpower432
jpower432 approved these changes Jan 7, 2025
View reviewed changes
Copy link
Member

@jpower432 jpower432 left a comment

Choose a reason for hiding this comment

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

LGTM. I left two comments, but they are nitpicks.

trestle/tasks/cis_xlsx_to_oscal_cd.py Outdated Show resolved Hide resolved
tests/trestle/tasks/cis_xlsx_to_oscal_cd_test.py Outdated Show resolved Hide resolved
@degenaro
Fix license.
6a508fd 
Signed-off-by: Lou DeGenaro <[email protected]>
vikas-agarwal76
vikas-agarwal76 approved these changes Jan 16, 2025
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

@degenaro degenaro mentioned this pull request Jan 16, 2025
Closed
@degenaro degenaro merged commit 8171357 into develop Jan 16, 2025
14 checks passed
@degenaro degenaro deleted the fix/cisb-to-oscal-cd branch January 16, 2025 13:23
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

@jpower432 jpower432 jpower432 approved these changes

@AleJo2995 AleJo2995 Awaiting requested review from AleJo2995

@butler54 butler54 Awaiting requested review from butler54

@mrgadgil mrgadgil Awaiting requested review from mrgadgil

Assignees

@degenaro degenaro

Labels
None yet
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.
3 participants
@degenaro @jpower432 @vikas-agarwal76