This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Merge the v1.1.1 branch #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The itertools.groupby() function only correctly functions if the list it is grouping is pre-sorted in the same manner as the grouping key. If the list is not similarly sorted it will result in lost list items. We also switch to using `.lower()` instead of `.upper()` to be consistent with other sorting in this project.
Fix bug in the `convert-cisagov` command
Sort the entries in each group of converted entries by vendor and then product. Both are converted to lowercase to create a case-insensitive sort. This will provide the most human-friendly sort.
Update the sort rules in the normalize-yml command to be consistent with the sorting done in the convert-cisagov command. That is to sort by vendor and then product for a human-friendly sorted output.
β¦l_files Consistently sort output YAML
Since the conversion is logically one moment in time then the timestamp used for records that do not have one should be the same.
Use the logging library to output messages when handling exceptions instead of manually redirecting print to stderr.
Ensure that only truthy values that have been cast to str are passed to len() checks when outputting rows. This will ensure that numeric values are correctly handled if they were not stored as strings in the source YAML file.
β¦amp_when_converting Use the same default timestamp for converted data in `convert-cisagov`
β¦sion Ensure values are `str` types when converting from YAML to Markdown
Disable the use of aliases in YAML output in this project to allow each entry to store all the data it needs. This will ensure that no matter how often our YAML files are run through the normalize-yml command they will retain all information necessary regardless of entry changes.
Disable aliases in YAML output
Pull Request Test Coverage Report for Build 1741836073
π - Coveralls |
jsf9k
approved these changes
Jan 24, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:=
dav3r
approved these changes
Jan 24, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
bug
This issue or pull request addresses broken functionality
improvement
This issue or pull request will add new or improve existing functionality
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
π£ Description
This pull request merges the
v1.1.1
branch with the following changes:convert-cisagov
commandΒ #9convert-cisagov
Β #11str
types when converting from YAML to MarkdownΒ #12π Motivation and context
The desired changes for
v1.1.1
have been made and now need to be rolled out as a new release.π§ͺ Testing
Automated tests pass. This branch was tested in this Actions run.
β Pre-approval checklist
β Pre-merge checklist
β Post-merge checklist