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 dependency com.pinterest:ktlint to 0.47.1 and fix CVE-2023-6378 for common-utils #585

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

jowg-amazon
Copy link
Collaborator

@jowg-amazon jowg-amazon commented Feb 5, 2024

Description

  • Updated dependency for com.pinterest:ktlint to v0.47.1. Then ran ./gradlew ktlintformat to change formatting errors.
  • Fix CVE-2023-6378 for common-utils

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 5, 2024

Codecov Report

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

Comparison is base (0c23cc5) 74.13% compared to head (a5c5690) 74.00%.

Files Patch % Lines
...n/org/opensearch/commons/alerting/model/Monitor.kt 25.00% 3 Missing and 3 partials ⚠️
...ch/commons/alerting/action/IndexWorkflowRequest.kt 71.42% 4 Missing ⚠️
...n/bucketselectorext/BucketSelectorExtAggregator.kt 0.00% 4 Missing ⚠️
.../commons/alerting/model/AggregationResultBucket.kt 0.00% 4 Missing ⚠️
...lin/org/opensearch/commons/alerting/model/Alert.kt 62.50% 2 Missing and 1 partial ⚠️
...search/commons/alerting/model/QueryLevelTrigger.kt 25.00% 3 Missing ⚠️
...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 ⚠️
... and 5 more
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #585      +/-   ##
============================================
- Coverage     74.13%   74.00%   -0.13%     
  Complexity      890      890              
============================================
  Files           133      133              
  Lines          5822     5843      +21     
  Branches        714      715       +1     
============================================
+ Hits           4316     4324       +8     
- Misses         1194     1207      +13     
  Partials        312      312              

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

@jowg-amazon jowg-amazon changed the title Fix CVE-2023-6378 for notifications Fix CVE-2023-6378 for common-utils Feb 6, 2024
@jowg-amazon jowg-amazon changed the title Fix CVE-2023-6378 for common-utils Update dependency com.pinterest:kitlint to 0.47.1 and fix CVE-2023-6378 for common-utils Feb 6, 2024
@sbcd90 sbcd90 merged commit d95978f into opensearch-project:main Feb 6, 2024
10 of 12 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.x
# Create a new branch
git switch --create backport-585-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d95978f7b59298e3a91c86087f362471c72d9508
# Push it to GitHub
git push --set-upstream origin backport-585-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-585-to-2.x.

@jowg-amazon jowg-amazon changed the title Update dependency com.pinterest:kitlint to 0.47.1 and fix CVE-2023-6378 for common-utils Update dependency com.pinterest:ktlint to 0.47.1 and fix CVE-2023-6378 for common-utils Feb 6, 2024
@engechas engechas mentioned this pull request Mar 13, 2024
5 tasks
@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-585-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d95978f7b59298e3a91c86087f362471c72d9508
# Push it to GitHub
git push --set-upstream origin backport-585-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-585-to-2.11.

@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-585-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d95978f7b59298e3a91c86087f362471c72d9508
# Push it to GitHub
git push --set-upstream origin backport-585-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-585-to-2.9.

@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-585-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d95978f7b59298e3a91c86087f362471c72d9508
# Push it to GitHub
git push --set-upstream origin backport-585-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-585-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-585-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d95978f7b59298e3a91c86087f362471c72d9508
# Push it to GitHub
git push --set-upstream origin backport-585-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-585-to-2.7.

jowg-amazon added a commit that referenced this pull request Mar 14, 2024
* fix cve

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

* add queryFieldNames field in Doc Level Queries (#582)

* add queryFieldNames field in Doc Level Queries

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add tests to verify queryFieldNames field in DocLevelQuery

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 75925dc)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: jowg-amazon <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.

4 participants