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

Add proper dependency resolution for ssri #457

Merged
merged 1 commit into from
Jun 16, 2021

Conversation

tmarkley
Copy link
Contributor

@tmarkley tmarkley commented Jun 8, 2021

Description

Dependabot bumped the dependency from 6.0.1 to 6.0.2 in #332, but it edited the yarn.lock file directly. This left older versions of the dependency in the lockfile.

Signed-off-by: Tommy Markley markleyt@amazon.com

$ yarn why ssri
yarn why v1.22.10
[1/4] Why do we have the module "ssri"...?
[2/4] Initialising dependency graph...
warning Resolution field "typescript@4.0.2" is incompatible with requested version "typescript@~3.7.2"
[3/4] Finding dependency...
[4/4] Calculating file sizes...
=> Found "ssri@8.0.0"
info Reasons this module exists
   - "_project_#cacache" depends on it
   - Hoisted from "_project_#cacache#ssri"
info Disk size without dependencies: "56KB"
info Disk size with unique dependencies: "104KB"
info Disk size with transitive dependencies: "136KB"
info Number of shared dependencies: 2
=> Found "terser-webpack-plugin#ssri@7.1.0"
info Reasons this module exists
   - "_project_#@osd#optimizer#terser-webpack-plugin#cacache" depends on it
   - Hoisted from "_project_#@osd#optimizer#terser-webpack-plugin#cacache#ssri"
info Disk size without dependencies: "52KB"
info Disk size with unique dependencies: "132KB"
info Disk size with transitive dependencies: "164KB"
info Number of shared dependencies: 3
=> Found "webpack#ssri@6.0.2"
info Reasons this module exists
   - "_project_#@osd#monaco#webpack#terser-webpack-plugin#cacache" depends on it
   - Hoisted from "_project_#@osd#monaco#webpack#terser-webpack-plugin#cacache#ssri"
Done in 1.49s.

Longer term solution involves upgrading webpack for the @osd/optimizer and @osd/monaco packages and remove the manual resolution.

Testing

Changes for #456, #457, #458, #460, #461, and #476 were merged into the same branch and tested together. All tests passed.

Unit

$ yarn test:jest
...
Test Suites: 23 skipped, 1411 passed, 1411 of 1434 total
Tests:       256 skipped, 9 todo, 10364 passed, 10629 total
Snapshots:   2363 passed, 2363 total
Time:        156.76 s
Ran all test suites.
Done in 159.62s.

Integration

$ yarn test:jest_integration
...
Test Suites: 2 skipped, 48 passed, 48 of 50 total
Tests:       19 skipped, 418 passed, 437 total
Snapshots:   73 passed, 73 total
Time:        222.992 s
Ran all test suites.
Done in 225.23s.

Functional

Screen Shot 2021-06-10 at 10 31 39 PM

Issues Resolved

N/A

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

Dependabot bumped the dependency from 6.0.1 to 6.0.2 in opensearch-project#332,
but it edited the yarn.lock file directly. This left older
versions of the dependency in the lockfile.

Signed-off-by: Tommy Markley <markleyt@amazon.com>
@opensearch-ci-bot
Copy link
Collaborator

✅   DCO Check Passed 5691631

Copy link
Contributor

@boktorbb boktorbb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@tmarkley tmarkley merged commit dcaab00 into opensearch-project:main Jun 16, 2021
@tmarkley tmarkley deleted the deps-ssri branch June 16, 2021 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file v1.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants