5a7e00c5b1
Vagrant::Box.load_metadata did not provide a way to specify the HTTPS download options that could be specified when downloading boxes (ca cert, ca path, client cert, insecure). As a result, while it was possible to add a box whose metadata file needed to be downloaded with one of those options specified, it was impossible to check for updates. The following changes have been made to address the situation: 1. Create a DownloadMixins module to provide the --insecure, --cacert, --capth, and --cert command line options to all of `vagrant box add`, `vagrant box update`, and `vagrant box outdated`. 2. Extend `Vagrant::Box.has_update?` and `Vagrant::Box.load_metadata` to accept said download options. 3. Extend `box outdated` and `box update` commands to pass download options down. 4. Extend `Vagrant::Builtin::Action::BoxCheckOutdated` to honour download options. 5. Options specified on the command line take precedence over options specified in the machine configuration, if any. 6. Fix bug in `vagrant box add` where client cert was being passed down using the wrong environment key. 7. Unit test coverage in update_test and box_check_outdated_test. Resolves #4420
97 lines
2.8 KiB
Ruby
97 lines
2.8 KiB
Ruby
require 'optparse'
|
|
|
|
require_relative 'download_mixins'
|
|
|
|
module VagrantPlugins
|
|
module CommandBox
|
|
module Command
|
|
class Outdated < Vagrant.plugin("2", :command)
|
|
include DownloadMixins
|
|
|
|
def execute
|
|
options = {}
|
|
download_options = {}
|
|
|
|
opts = OptionParser.new do |o|
|
|
o.banner = "Usage: vagrant box outdated [options]"
|
|
o.separator ""
|
|
o.separator "Checks if there is a new version available for the box"
|
|
o.separator "that are you are using. If you pass in the --global flag,"
|
|
o.separator "all boxes will be checked for updates."
|
|
o.separator ""
|
|
o.separator "Options:"
|
|
o.separator ""
|
|
|
|
o.on("--global", "Check all boxes installed") do |g|
|
|
options[:global] = g
|
|
end
|
|
|
|
build_download_options(o, download_options)
|
|
end
|
|
|
|
argv = parse_options(opts)
|
|
return if !argv
|
|
|
|
# If we're checking the boxes globally, then do that.
|
|
if options[:global]
|
|
outdated_global(download_options)
|
|
return 0
|
|
end
|
|
|
|
with_target_vms(argv) do |machine|
|
|
@env.action_runner.run(Vagrant::Action.action_box_outdated, {
|
|
box_outdated_force: true,
|
|
box_outdated_refresh: true,
|
|
box_outdated_success_ui: true,
|
|
machine: machine,
|
|
}.merge(download_options))
|
|
end
|
|
end
|
|
|
|
def outdated_global(download_options)
|
|
boxes = {}
|
|
@env.boxes.all.reverse.each do |name, version, provider|
|
|
next if boxes[name]
|
|
boxes[name] = @env.boxes.find(name, provider, version)
|
|
end
|
|
|
|
boxes.values.each do |box|
|
|
if !box.metadata_url
|
|
@env.ui.output(I18n.t(
|
|
"vagrant.box_outdated_no_metadata",
|
|
name: box.name))
|
|
next
|
|
end
|
|
|
|
md = nil
|
|
begin
|
|
md = box.load_metadata(download_options)
|
|
rescue Vagrant::Errors::DownloaderError => e
|
|
@env.ui.error(I18n.t(
|
|
"vagrant.box_outdated_metadata_error",
|
|
name: box.name,
|
|
message: e.extra_data[:message]))
|
|
next
|
|
end
|
|
|
|
current = Gem::Version.new(box.version)
|
|
latest = Gem::Version.new(md.versions.last)
|
|
if latest <= current
|
|
@env.ui.success(I18n.t(
|
|
"vagrant.box_up_to_date",
|
|
name: box.name,
|
|
version: box.version))
|
|
else
|
|
@env.ui.warn(I18n.t(
|
|
"vagrant.box_outdated",
|
|
name: box.name,
|
|
current: box.version,
|
|
latest: latest.to_s,))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|