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

[Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2 #3539

Merged
merged 4 commits into from
Mar 8, 2023

Conversation

joshuarrrr
Copy link
Member

Description

manual backport of #3520

Issues Resolved

Resolves #3167

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
@joshuarrrr joshuarrrr changed the title [Manual Backpor 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2 [Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2 Mar 7, 2023
@codecov-commenter
Copy link

codecov-commenter commented Mar 7, 2023

Codecov Report

Merging #3539 (8fbdf6d) into 1.x (1a8c68f) will decrease coverage by 0.01%.
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             @@
##              1.x    #3539      +/-   ##
==========================================
- Coverage   67.45%   67.44%   -0.01%     
==========================================
  Files        3044     3044              
  Lines       58696    58696              
  Branches     8902     8902              
==========================================
- Hits        39591    39587       -4     
- Misses      16952    16954       +2     
- Partials     2153     2155       +2     
Flag Coverage Δ
Linux 67.44% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
packages/osd-optimizer/src/common/array_helpers.ts 90.47% <0.00%> (-9.53%) ⬇️
...ic/application/models/sense_editor/sense_editor.ts 64.00% <0.00%> (-0.89%) ⬇️

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

@AMoo-Miki
Copy link
Collaborator

@joshuarrrr seems like there is a conflict

@joshuarrrr
Copy link
Member Author

ignoring whitesource failure

@joshuarrrr joshuarrrr merged commit 3a51afd into opensearch-project:1.x Mar 8, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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

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

@joshuarrrr
Copy link
Member Author

this doesn't need backporting, of course - already in #3520

@joshuarrrr joshuarrrr deleted the cve/bump-flat branch March 9, 2023 01:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants