Skip to content

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

Merged
joshuarrrr merged 4 commits intoopensearch-project:1.xfrom
joshuarrrr:cve/bump-flat
Mar 8, 2023
Merged

[Manual Backport 1.x] [CVE-2020-36632] Bump flat from 4.1.1 to 5.0.2#3539
joshuarrrr merged 4 commits intoopensearch-project:1.xfrom
joshuarrrr:cve/bump-flat

Conversation

@joshuarrrr
Copy link
Copy Markdown
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
Copy Markdown

codecov-commenter commented Mar 7, 2023

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.49%. Comparing base (1a8c68f) to head (8fbdf6d).
⚠️ Report is 38 commits behind head on 1.x.

Additional details and impacted files
@@            Coverage Diff             @@
##              1.x    #3539      +/-   ##
==========================================
+ Coverage   67.45%   67.49%   +0.04%     
==========================================
  Files        3044     3044              
  Lines       58696    58696              
  Branches     8902     8902              
==========================================
+ Hits        39591    39615      +24     
+ Misses      16952    16932      -20     
+ Partials     2153     2149       -4     
Flag Coverage Δ
Linux 67.44% <ø> (-0.01%) ⬇️
Windows 67.44% <ø> (?)

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

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@AMoo-Miki
Copy link
Copy Markdown
Collaborator

@joshuarrrr seems like there is a conflict

@joshuarrrr
Copy link
Copy Markdown
Member Author

ignoring whitesource failure

@joshuarrrr joshuarrrr merged commit 3a51afd into opensearch-project:1.x Mar 8, 2023
@opensearch-trigger-bot
Copy link
Copy Markdown
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
Copy Markdown
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.

5 participants