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

2019 standards update #63

Merged
merged 7 commits into from Aug 26, 2019
Merged

2019 standards update #63

merged 7 commits into from Aug 26, 2019

Conversation

lukoktonos
Copy link
Contributor

@lukoktonos lukoktonos commented Aug 26, 2019 •
edited by mayerm94

PR for feature branch into master

Version/gemspec will be updated in separate PR after this is merged. cqm-models ref has been updated to 3.0 for this PR as the branch it was pointing to no longer exists now that we published cqm-models.

Pull requests into cqm-parsers require the following. Submitter and reviewer should ✅ when done. For items that are not-applicable, note it's not-applicable ("N/A") and ✅.

Submitter:

  • This pull request describes why these changes were made.
  • Internal ticket for this PR: https://jira.mitre.org/browse/BONNIE-2134
  • Internal ticket links to this PR
  • Code diff has been done and been reviewed
  • Tests are included and test edge cases
  • Tests have been run locally and pass

Reviewer 1:

Name: @hossenlopp

  • Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
  • The tests appropriately test the new code, including edge cases
  • You have tried to break the code

Reviewer 2:

Name:

  • Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
  • The tests appropriately test the new code, including edge cases
  • You have tried to break the code

Matt Mayer and others added 4 commits July 15, 2019 12:30
Use 2019-standards-updates models
f684425
@hossenlopp
2019 standards update entry point fix (#54)
1b45d15 
* fixed gem entry point file to be named properly
* updated rubocop rule
@hossenlopp
fix issue with loading api uploaded files (#55)
42224a2
@dependabot-preview
[Security] Bump nokogiri from 1.10.3 to 1.10.4
7e271e0 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.3...v1.10.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@codecov-io
Copy link

codecov-io commented Aug 26, 2019 •
edited

Codecov Report

Merging #63 into bonnie_version will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           bonnie_version      #63   +/-   ##
===============================================
  Coverage           82.39%   82.39%           
===============================================
  Files                  69       69           
  Lines                4316     4316           
===============================================
  Hits                 3556     3556           
  Misses                760      760
Impacted Files Coverage Δ
lib/cqm-parsers.rb 100% <ø> (ø)
lib/measure-loader/mat_measure_files.rb 95.34% <100%> (ø) ⬆️

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 717f2e1...cf5fa36. Read the comment docs.

@lukoktonos lukoktonos changed the base branch from master to bonnie_version August 26, 2019 14:23
@hossenlopp hossenlopp self-requested a review August 26, 2019 16:49
mayerm94
mayerm94 approved these changes Aug 26, 2019
View reviewed changes
Copy link
Contributor

@mayerm94 mayerm94 left a comment

Choose a reason for hiding this comment

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

👍

@lukoktonos lukoktonos merged commit 173cea2 into bonnie_version Aug 26, 2019
@lukoktonos lukoktonos deleted the 2019-standards-update branch August 26, 2019 17:42
dczulada added a commit that referenced this pull request Feb 6, 2020
@lmd59 @hossenlopp
@dczulada @dependabot-preview @adongare
Bonnie version merge (#72)
fd4d124 
* Fixed SDC loading to work with newer DRC measures. And cherry-pick work from master. (#39)

* Fixed SDC loading to work with newer DRC measures.
 - Fixed issues with most data criteria getting thrown out.

* Bring over dependabot nokogiri update and the simplexml_parser removal from #30.
[Security] Update nokogiri requirement from ~> 1.8.5 to >= 1.8.5, < 1.11.0
Updates the requirements on [nokogiri](https://github.com/sparklemotion/nokogiri) to permit the latest version.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.8.5...v1.10.3)

* Add the hqmf identifier to a statement reference (#25)

* Port ratio/proportional cv fix from hds and add tests (#48)

* codeListId and hqmfOid are both needed for sdc uniqueness

* Add descriptive error message if model cannot be found

* 2019 standards update (#63)

* 2019 standards update entry point fix (#54)
* fixed gem entry point file to be named properly
* fix issue with loading api uploaded files (#55)
* [Security] Bump nokogiri from 1.10.3 to 1.10.4
* Bump cqm-models version to 3.0.0

* [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0 (#67)

* [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0

Updates the requirements on [rubyzip](https://github.com/rubyzip/rubyzip) to permit the latest version.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](rubyzip/rubyzip@v1.2.3...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Updated rubyzip dependency to be less than version 2.x, which requires ruby 2.4

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* Bonnie-593(ONCJira) test case fix

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages
Fixed vulnerability: sparklemotion/nokogiri#1943

* BONNIE-587 Error loading VSAC value sets(ONC jira id)

* Updated version of bonnie_version cqm-parser branch (#71)

* Updated version of bonnie_version cqm-parser branch

* Updated cqm-parser (binnie_viersion branch)

* Remove unnecessary fixtures and re-include test_5_4_CQL_measure_with_drc

Co-authored-by: hossenlopp <hossenlopp@mitre.org>
Co-authored-by: Luke Osborne <luke.w.osborne@gmail.com>
Co-authored-by: dczulada <dczulada@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Ashok Dongare <ashok.dongare@semanticbits.com>
dczulada added a commit that referenced this pull request Oct 19, 2021
@dczulada @hossenlopp
@dependabot-preview @adongare @danmee10 @jkotanchik-SB
V4 baseline (#160)
7cb8ae9 
* Fixed SDC loading to work with newer DRC measures. And cherry-pick work from master. (#39)

* Fixed SDC loading to work with newer DRC measures.
 - Fixed issues with most data criteria getting thrown out.

* Bring over dependabot nokogiri update and the simplexml_parser removal from #30.
[Security] Update nokogiri requirement from ~> 1.8.5 to >= 1.8.5, < 1.11.0
Updates the requirements on [nokogiri](https://github.com/sparklemotion/nokogiri) to permit the latest version.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.8.5...v1.10.3)

* Add the hqmf identifier to a statement reference (#25)

* Port ratio/proportional cv fix from hds and add tests (#48)

* codeListId and hqmfOid are both needed for sdc uniqueness

* Add descriptive error message if model cannot be found

* 2019 standards update (#63)

* 2019 standards update entry point fix (#54)
* fixed gem entry point file to be named properly
* fix issue with loading api uploaded files (#55)
* [Security] Bump nokogiri from 1.10.3 to 1.10.4
* Bump cqm-models version to 3.0.0

* [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0 (#67)

* [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0

Updates the requirements on [rubyzip](https://github.com/rubyzip/rubyzip) to permit the latest version.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](rubyzip/rubyzip@v1.2.3...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Updated rubyzip dependency to be less than version 2.x, which requires ruby 2.4

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages

* Bonnie-593(ONCJira) test case fix

* BONNIE-593 Bonnie Unresponsive Message and Error Loading Measure Packages
Fixed vulnerability: sparklemotion/nokogiri#1943

* BONNIE-587 Error loading VSAC value sets(ONC jira id)

* Updated version of bonnie_version cqm-parser branch (#71)

* Updated version of bonnie_version cqm-parser branch

* Updated cqm-parser (binnie_viersion branch)

* BONNIEMAT-614 Bonnie only processing one of two measure observations(oncjira)

* [Security] Bump nokogiri from 1.10.5 to 1.10.8 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.5...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [Security] Bump rake from 12.3.1 to 12.3.3 (#77)

Bumps [rake](https://github.com/ruby/rake) from 12.3.1 to 12.3.3. **This update includes a security fix.**
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](ruby/rake@v12.3.1...v12.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* MAT1385_rails_upgrade_bv (#87)

* made necessary upgrades to line up with bonnie's rails upgrade -> 5.2

* removed deprecated require

* updated codecov (0.1.14 -> 0.2.5) and json (2.1.0 -> 2.3.1) to fix 'Title: json Gem for Ruby Unsafe Object Creation Vulnerability (additional fix)'

* MAT-1308_update_cqm_models (#107)

* cqm-models 3.0.0 -> 3.0.3

* ran bundle install

* Mat 1708 (#112)

* BONNIEMAT-623 & BONNIEMAT-629 cql-integration change

* cqm-models version upgrade

* [MAT-1757] Replacing VSAC Username/Password with API Key in VSAC Calls (#114)

* Replacing vsac username/password with api key.

* Checking for nil via safe navigation on single_code_concepts hash  before checking sub-hash.

When QDM datatype template has includeSubTemplate, the single_code_concepts hash will not have a related key to access the sub-hash.

* Replacing safe nav operator with Hash.dig to better handle the nested hashes.

* pull in cqm-model v3.0.6 version (#129)

* MAT-2803 (#143)

* MAT-2803 Update Bonnie to support UTF8 - QDM

* Ruby 2.7.2 warnings fix

* MAT-2647 Update cqm-parsers to QDM 5.6 (#148)

* MAT-2647 Update cqm-parsers to QDM 5.6

* MAT-2647 Update cqm-parsers to QDM 5.6

* added git actions

* removed travis.yaml

* Integrate from cqm-models MAT-2993 Failed to initialize Data element with class attribute in Bonnie (#149)

* ecurity vulnerabilty nokogiry (#150)

* MAT-2837: Using published version of cqm-models (v4.0.0) instead of branch

* bump nokogiri in case of security vulnerability

* Baseline for v4.0.0 release

* update Gemfile

* git ignore Gemfile.lock

* move ci workflow and add gitleaks.toml

* address rubocop concerns

* revert activesupport to support rails 5

* Bring mongoid back to 6

Co-authored-by: hossenlopp <hossenlopp@mitre.org>
Co-authored-by: Luke Osborne <lwosborne@mitre.org>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Ashok <ashok.dongare@semanticbits.com>
Co-authored-by: Daniel Mee <danmee10@gmail.com>
Co-authored-by: Joe Kotanchik <56264529+jkotanchik-SB@users.noreply.github.com>
Co-authored-by: Joe Kotanchik <joseph.kotanchik@semanticbits.com>
Co-authored-by: Andrew Bird <andrew.bird@semanticbits.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mayerm94 mayerm94 mayerm94 approved these changes

@hossenlopp hossenlopp hossenlopp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukoktonos @codecov-io @mayerm94 @hossenlopp