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

Update puma to version 6 #2925

Merged
merged 3 commits into from
Aug 29, 2023
Merged

Update puma to version 6 #2925

merged 3 commits into from
Aug 29, 2023

Conversation

mFelgate
Copy link
Contributor

@mFelgate mFelgate commented Aug 28, 2023

Desired Outcome

Update dependencies in the gemfile to prepare for th eFips upgrade

Implemented Changes

Describe how the desired outcome above has been achieved with this PR. In
particular, consider:

  • What's changed? Why were these changes made?
  • updated the gemfiles, notice files, and some tests that required a syntax change

Connected Issue/Story

Resolves #[relevant GitHub issue(s), e.g. 76]

CyberArk internal issue ID: CNJR-2564

Changelog

  • The CHANGELOG has been updated, or
  • This PR does not include user-facing changes and doesn't require a
    CHANGELOG update

Test coverage

  • This PR includes new unit and integration tests to go with the code
    changes, or
  • The changes in this PR do not require tests

Documentation

  • Docs (e.g. READMEs) were updated in this PR
  • A follow-up issue to update official docs has been filed here: [insert issue ID]
  • This PR does not require updating any documentation

Behavior

  • This PR changes product behavior and has been reviewed by a PO, or
  • These changes are part of a larger initiative that will be reviewed later, or
  • No behavior was changed with this PR

Security

  • Security architect has reviewed the changes in this PR,
  • These changes are part of a larger initiative with a separate security review, or
  • There are no security aspects to these changes

@mFelgate mFelgate force-pushed the Update-puma branch 6 times, most recently from 38da735 to 1900a89 Compare August 29, 2023 13:03
@mFelgate mFelgate marked this pull request as ready for review August 29, 2023 13:50
@mFelgate mFelgate requested a review from a team as a code owner August 29, 2023 13:50
Copy link
Contributor

@micahlee micahlee left a comment

Choose a reason for hiding this comment

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

Hey @mFelgate, could you also please update the Changelog to include the puma change, since it specifically address a CVE. See the UI repo for an example:
https://github.cyberng.com/Conjur-Enterprise/conjur-ui/blob/master/CHANGELOG.md#security

Since this does require an additional push, would you also please move the NOTICES.txt updates for puma to the same commit where we bump puma as well?

The rest looks good, thanks!

Thanks!

@codeclimate
Copy link

codeclimate bot commented Aug 29, 2023

Code Climate has analyzed commit cab6fff and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 88.3% (-0.2% change).

View more on Code Climate.

Copy link
Contributor

@micahlee micahlee left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @mFelgate!

@mFelgate mFelgate merged commit 3530cc6 into master Aug 29, 2023
5 of 6 checks passed
@mFelgate mFelgate deleted the Update-puma branch August 29, 2023 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants