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

Resolving json5 to latest version #478

Merged
merged 1 commit into from
Mar 10, 2023

Conversation

amsiglan
Copy link
Collaborator

@amsiglan amsiglan commented Mar 9, 2023

Description

Currently some packages are using version 2.2.1 of json5 as part of their dependencies which is marked as vulnerable. Pinning the resolution for json5 to semver ^2.2.3 so that the latest version is used.

Issues Resolved

https://github.com/opensearch-project/security-analytics-dashboards-plugin/security/dependabot/5

Check List

  • 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.

Signed-off-by: Amardeepsingh Siglani <[email protected]>
@amsiglan amsiglan requested a review from a team March 9, 2023 20:45
@amsiglan amsiglan added backport 2.x backport 2.5 backport 2.6 Used for marking changes that must be merged into 2.6 branch labels Mar 9, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #478 (b41dfb0) into main (a88c791) will not change coverage.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff           @@
##             main     #478   +/-   ##
=======================================
  Coverage   35.21%   35.21%           
=======================================
  Files         116      116           
  Lines        3149     3149           
  Branches      501      501           
=======================================
  Hits         1109     1109           
  Misses       1920     1920           
  Partials      120      120           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@amsiglan amsiglan merged commit 326fdbc into opensearch-project:main Mar 10, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-478-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 326fdbca07190aac2008a6d0d40745f0a04ead05
# Push it to GitHub
git push --set-upstream origin backport/backport-478-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-478-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 326fdbca07190aac2008a6d0d40745f0a04ead05
# Push it to GitHub
git push --set-upstream origin backport/backport-478-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.6 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.6 2.6
# Navigate to the new working tree
cd .worktrees/backport-2.6
# Create a new branch
git switch --create backport/backport-478-to-2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 326fdbca07190aac2008a6d0d40745f0a04ead05
# Push it to GitHub
git push --set-upstream origin backport/backport-478-to-2.6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.6

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

amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Mar 14, 2023
amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Mar 14, 2023
amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Mar 14, 2023
amsiglan added a commit that referenced this pull request Mar 14, 2023
amsiglan added a commit that referenced this pull request Mar 14, 2023
amsiglan added a commit that referenced this pull request Mar 14, 2023
AWSHurneyt pushed a commit to AWSHurneyt/security-analytics-dashboards-plugin that referenced this pull request Oct 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.5 backport 2.6 Used for marking changes that must be merged into 2.6 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants