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

fix: Import issues with hyphen named files #371

Merged
merged 6 commits into from
Feb 23, 2021
Merged

Conversation

butler54
Copy link
Collaborator

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commits are signed-off.

Import had an issue, due to using some legacy parsing functionality which was broken, which meant that importing a 'system-security-plan' or other file with a hyphenated name would fail.

This PR corrects the issue - and cleans up some of the code in the parser and import to decrease but not eliminate duplication of code.

…iple levels.

Signed-off-by: Chris Butler <chris@thebutlers.me>
… import as a result.

Signed-off-by: Chris Butler <chris@thebutlers.me>
@butler54 butler54 requested review from fsuits and jeffdmgit February 22, 2021 04:08
Signed-off-by: Chris Butler <chris@thebutlers.me>
…heck of website content.

Signed-off-by: Chris Butler <chris@thebutlers.me>
Signed-off-by: Chris Butler <chris@thebutlers.me>
@codecov
Copy link

codecov bot commented Feb 23, 2021

Codecov Report

Merging #371 (5d452c4) into develop (a5510aa) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #371      +/-   ##
===========================================
- Coverage    99.12%   99.12%   -0.01%     
===========================================
  Files           53       54       +1     
  Lines         6489     6481       -8     
===========================================
- Hits          6432     6424       -8     
  Misses          57       57              
Impacted Files Coverage Δ
trestle/core/commands/import_.py 100.00% <100.00%> (ø)
trestle/core/parser.py 94.64% <100.00%> (-0.82%) ⬇️
trestle/oscal/component.py 100.00% <100.00%> (ø)
trestle/__init__.py 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a5510aa...5a91238. Read the comment docs.

Copy link
Contributor

@fsuits fsuits left a comment

Choose a reason for hiding this comment

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

LGTM. All tests passed on my windows machine.

@butler54 butler54 merged commit 07493ad into develop Feb 23, 2021
@butler54 butler54 deleted the fix/import_issues branch February 24, 2021 03:24
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.

2 participants