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

[Backport 2.x] Update dependency com.pinterest:ktlint to 0.47.1 and fix CVE-2023-6378 for common-utils #588

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

jowg-amazon
Copy link
Collaborator

Description

Manual Backport of #585 to 2.x

Cherry picked 418f56f97745f999d951a201caee3808802cb3a8 and 816235c090c27716255312dd2d216f6b007f6e18 then ran ./gradlew ktlintformat to fix ktlint.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Copy link

codecov bot commented Feb 6, 2024

Codecov Report

Attention: 24 lines in your changes are missing coverage. Please review.

Comparison is base (6a579cd) 72.87% compared to head (a0c50e6) 72.86%.

Files Patch % Lines
...n/org/opensearch/commons/alerting/model/Monitor.kt 28.57% 3 Missing and 2 partials ⚠️
...ch/commons/alerting/action/IndexWorkflowRequest.kt 71.42% 4 Missing ⚠️
...lin/org/opensearch/commons/alerting/model/Alert.kt 62.50% 2 Missing and 1 partial ⚠️
...arch/commons/alerting/action/GetMonitorResponse.kt 0.00% 2 Missing ⚠️
...rch/commons/alerting/action/GetWorkflowResponse.kt 0.00% 2 Missing ⚠️
...arch/commons/alerting/model/ClusterMetricsInput.kt 77.77% 0 Missing and 2 partials ⚠️
...opensearch/commons/alerting/model/action/Action.kt 0.00% 1 Missing and 1 partial ⚠️
...earch/commons/alerting/action/GetMonitorRequest.kt 0.00% 1 Missing ⚠️
...n/bucketselectorext/BucketSelectorExtAggregator.kt 0.00% 1 Missing ⚠️
...pensearch/commons/alerting/model/CompositeInput.kt 66.66% 1 Missing ⚠️
... and 1 more
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x     #588      +/-   ##
============================================
- Coverage     72.87%   72.86%   -0.01%     
  Complexity      863      863              
============================================
  Files           133      133              
  Lines          5810     5823      +13     
  Branches        715      716       +1     
============================================
+ Hits           4234     4243       +9     
- Misses         1261     1266       +5     
+ Partials        315      314       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eirsep eirsep merged commit fed6838 into opensearch-project:2.x Feb 6, 2024
9 of 11 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.5 2.5
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.5
# Create a new branch
git switch --create backport-588-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.5
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport-588-to-2.5.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.7 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.7 2.7
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.7
# Create a new branch
git switch --create backport-588-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.7
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.7

Then, create a pull request where the base branch is 2.7 and the compare/head branch is backport-588-to-2.7.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.9 2.9
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.9
# Create a new branch
git switch --create backport-588-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport-588-to-2.9.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.11
# Create a new branch
git switch --create backport-588-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport-588-to-2.11.

AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
CVE-2023-6378 for common-utils (opensearch-project#588)

* add logback-classic for CVE-2023-6378

Signed-off-by: Joanne Wang <[email protected]>

* updated com.pinterest:ktlint to v0.47.1

Signed-off-by: jowg-amazon <[email protected]>

* ran ./gradlew ktlintformat

Signed-off-by: jowg-amazon <[email protected]>

---------

Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: jowg-amazon <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants