Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

v1.1.0 update #7

Merged
merged 12 commits into from
Jan 11, 2022
Merged

v1.1.0 update #7

merged 12 commits into from
Jan 11, 2022

Conversation

mcdonnnj
Copy link
Member

πŸ—£ Description

This pull requests serves to merge the v1.1.0 release into develop . This release includes the following updates;

πŸ’­ Motivation and context

This will bring the v1.1.0 feature set into release for this project.

πŸ§ͺ Testing

Automates tests pass. I have done functionality testing in cisagov/github-actions-playground/testing/log4j_list_update.

βœ… Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • All new and existing tests pass.

βœ… Pre-merge checklist

  • Finalize version.

βœ… Post-merge checklist

  • Add a tag or create a release.

mcdonnnj and others added 12 commits January 4, 2022 18:46
Instead of printing one large YAML file to stdout we instead group the
read software entires by the uppercased first character of the vendor
name and output a file for each of these groups. All non-alphabet
vendor entries are grouped in the "0-9" group manually. When testing
the only entries that were non-alphabet were numeric. This will generate
files that are small enough to be edited using the GitHub web UI.
Add an option to output the result of the normalize-yml script in the
same format as the files it is expected to ingest. This allows the
script to be used to collate multiple files into one authoratitve file.
Use a more general (and accurate) key for the group of vendors that
begin with a non-alphabetic character.

Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
…al_format

Add option to output normalized YAML in our software list schema
…vendors

Output separate YAML files for cisagov conversion
Instead of creating a `reporter` key for every entry in the converted
Markdown we instead establish data ownership at in the YAML file as a
whole. This will ensure that all data in a given YAML file is attributed
to a specific source as was intended by the `reporter` key.
This updates the normalize-yml and yml2md scripts to work with the
addition of the owners key to the YAML format. This includes handling
different owners per ingested file, multiple owners in an ingested
file, and de-duplicating owner entries for output.
Update the docstring for the normalize_yml.munge function to reflect
the functionality added related to the document top-level "owners" key.

Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
Remove the `reporter` key from the `software` example entry in the
README and make sure the keys are correctly sorted.
Refactor the logic in the normalize-yml script to treat the "owners"
key data consistently. This is a result of lgtm warning about modifying
a parameter with a default value. Relying on Python's pass-by-reference
is also a somewhat ugly way to approach handling that data in the first
place.
Replace individual `reporter` keys with a document top-level `owners` key
@mcdonnnj mcdonnnj added the improvement This issue or pull request will add new or improve existing functionality label Jan 10, 2022
@mcdonnnj mcdonnnj requested a review from dav3r as a code owner January 10, 2022 22:11
@mcdonnnj mcdonnnj self-assigned this Jan 10, 2022
@coveralls
Copy link

Pull Request Test Coverage Report for Build 1679728331

  • 8 of 52 (15.38%) changed or added relevant lines in 2 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-8.2%) to 24.612%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/mdyml/convert_cisagov.py 2 21 9.52%
src/yml/normalize_yml.py 6 31 19.35%
Files with Coverage Reduction New Missed Lines %
src/mdyml/convert_cisagov.py 1 20.81%
Totals Coverage Status
Change from base Build 1638702480: -8.2%
Covered Lines: 103
Relevant Lines: 336

πŸ’› - Coveralls

Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

Looks great, ship it! :shipit:

@mcdonnnj mcdonnnj merged commit 09f5540 into develop Jan 11, 2022
@mcdonnnj mcdonnnj deleted the v1.1.0 branch January 11, 2022 17:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
improvement This issue or pull request will add new or improve existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants