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
108 lines
3.5 KiB
Ruby
108 lines
3.5 KiB
Ruby
require "log4r"
|
|
|
|
module Vagrant
|
|
module Action
|
|
module Builtin
|
|
# This middleware checks if there are outdated boxes. By default,
|
|
# it only checks locally, but if `box_outdated_refresh` is set, it
|
|
# will refresh the metadata associated with a box.
|
|
class BoxCheckOutdated
|
|
def initialize(app, env)
|
|
@app = app
|
|
@logger = Log4r::Logger.new(
|
|
"vagrant::action::builtin::box_check_outdated")
|
|
end
|
|
|
|
def call(env)
|
|
machine = env[:machine]
|
|
|
|
if !env[:box_outdated_force]
|
|
if !machine.config.vm.box_check_update
|
|
@logger.debug(
|
|
"Not checking for update: no force and no update config")
|
|
return @app.call(env)
|
|
end
|
|
end
|
|
|
|
if !machine.box
|
|
# We don't have a box. Just ignore, we can't check for
|
|
# outdated...
|
|
@logger.warn("Not checking for update, no box")
|
|
return @app.call(env)
|
|
end
|
|
|
|
box = machine.box
|
|
if box.version == "0" && !box.metadata_url
|
|
return @app.call(env)
|
|
end
|
|
|
|
constraints = machine.config.vm.box_version
|
|
# Have download options specified in the environment override
|
|
# options specified for the machine.
|
|
download_options = {
|
|
ca_cert: env[:ca_cert] || machine.config.vm.box_download_ca_cert,
|
|
ca_path: env[:ca_path] || machine.config.vm.box_download_ca_path,
|
|
client_cert: env[:client_cert] ||
|
|
machine.config.vm.box_download_client_cert,
|
|
insecure: !env[:insecure].nil? ?
|
|
env[:insecure] : machine.config.vm.box_download_insecure
|
|
}
|
|
|
|
env[:ui].output(I18n.t(
|
|
"vagrant.box_outdated_checking_with_refresh",
|
|
name: box.name))
|
|
update = nil
|
|
begin
|
|
update = box.has_update?(constraints, download_options: download_options)
|
|
rescue Errors::BoxMetadataDownloadError => e
|
|
env[:ui].warn(I18n.t(
|
|
"vagrant.box_outdated_metadata_download_error",
|
|
message: e.extra_data[:message]))
|
|
rescue Errors::VagrantError => e
|
|
raise if !env[:box_outdated_ignore_errors]
|
|
env[:ui].detail(I18n.t(
|
|
"vagrant.box_outdated_metadata_error_single",
|
|
message: e.message))
|
|
end
|
|
env[:box_outdated] = update != nil
|
|
if update
|
|
env[:ui].warn(I18n.t(
|
|
"vagrant.box_outdated_single",
|
|
name: update[0].name,
|
|
current: box.version,
|
|
latest: update[1].version))
|
|
else
|
|
check_outdated_local(env)
|
|
end
|
|
|
|
@app.call(env)
|
|
end
|
|
|
|
def check_outdated_local(env)
|
|
machine = env[:machine]
|
|
|
|
# Make sure we respect the constraints set within the Vagrantfile
|
|
version = machine.config.vm.box_version
|
|
version += ", " if version
|
|
version ||= ""
|
|
version += "> #{machine.box.version}"
|
|
|
|
box = env[:box_collection].find(
|
|
machine.box.name, machine.box.provider, version)
|
|
if box
|
|
env[:ui].warn(I18n.t(
|
|
"vagrant.box_outdated_local",
|
|
name: box.name,
|
|
old: machine.box.version,
|
|
new: box.version))
|
|
env[:box_outdated] = true
|
|
return
|
|
end
|
|
|
|
env[:box_outdated] = false
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|