Skip to content

Yarn Berry: Fixes subdependency security updates #5930

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.

Sign up for GitHub

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

Merged
pavera merged 2 commits into from
Oct 20, 2022
Merged

Yarn Berry: Fixes subdependency security updates #5930

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
147e3ea
Fixes subdependency security updates for yarn berry
pavera Oct 19, 2022
c4221a0
Need to chdir into path and a lint fix
pavera Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/subdependency_version_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ def update_subdependency_in_lockfile(lockfile)
lockfile_name = Pathname.new(lockfile.name).basename.to_s
path = Pathname.new(lockfile.name).dirname.to_s

updated_files = if lockfile.name.end_with?("yarn.lock")
updated_files = if lockfile.name.end_with?("yarn.lock") && yarn_berry?(lockfile)
run_yarn_berry_updater(path, lockfile_name)
elsif lockfile.name.end_with?("yarn.lock")
run_yarn_updater(path, lockfile_name)
else
run_npm_updater(path, lockfile_name, lockfile.content)
Expand All @@ -68,6 +70,15 @@ def update_subdependency_in_lockfile(lockfile)
updated_files.fetch(lockfile_name)
end

def yarn_berry?(yarn_lock)
return false unless Experiments.enabled?(:yarn_berry)

yaml = YAML.safe_load(yarn_lock.content)
yaml.key?("__metadata")
rescue StandardError
false
end

def version_from_updated_lockfiles(updated_lockfiles)
updated_files = dependency_files -
dependency_files_builder.yarn_locks -
Expand Down Expand Up @@ -109,6 +120,17 @@ def run_yarn_updater(path, lockfile_name)
sleep(rand(3.0..10.0)) && retry
end

def run_yarn_berry_updater(path, lockfile_name)
SharedHelpers.with_git_configured(credentials: credentials) do
Dir.chdir(path) do
Helpers.run_yarn_commands(
"yarn up -R #{dependency.name}"
)
{ lockfile_name => File.read(lockfile_name) }
end
end
end

def run_npm_updater(path, lockfile_name, lockfile_content)
SharedHelpers.with_git_configured(credentials: credentials) do
Dir.chdir(path) do
Expand Down