haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change remaining box_client_cert refs 

This fixes issues with box add/update when self hosting with client
certs. The --cert option was not being added to the curl subprocess
in these cases.
This commit is contained in:
Matt Adams 2019-01-28 08:45:24 -06:00
parent 87214ed840
commit a3836f5fec
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/commands/box/command/add.rb
View File

@ -86,7 +86,7 @@ module VagrantPlugins
box_force: options[:force], box_force: options[:force],
box_download_ca_cert: options[:ca_cert], box_download_ca_cert: options[:ca_cert],
box_download_ca_path: options[:ca_path], box_download_ca_path: options[:ca_path],
box_client_cert: options[:client_cert], box_download_client_cert: options[:client_cert],
box_download_insecure: options[:insecure], box_download_insecure: options[:insecure],
box_download_location_trusted: options[:location_trusted], box_download_location_trusted: options[:location_trusted],
ui: Vagrant::UI::Prefixed.new(@env.ui, "box"), ui: Vagrant::UI::Prefixed.new(@env.ui, "box"),

2
plugins/commands/box/command/update.rb
View File

@ -158,7 +158,7 @@ module VagrantPlugins
box_version: update[1].version, box_version: update[1].version,
ui: ui, ui: ui,
box_force: force, box_force: force,
box_client_cert: download_options[:client_cert], box_download_client_cert: download_options[:client_cert],
box_download_ca_cert: download_options[:ca_cert], box_download_ca_cert: download_options[:ca_cert],
box_download_ca_path: download_options[:ca_path], box_download_ca_path: download_options[:ca_path],
box_download_insecure: download_options[:insecure] box_download_insecure: download_options[:insecure]

8
test/unit/plugins/commands/box/command/update_test.rb
View File

@ -100,7 +100,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
expect(opts[:box_version]).to eq("1.1") expect(opts[:box_version]).to eq("1.1")
expect(opts[:box_download_ca_path]).to be_nil expect(opts[:box_download_ca_path]).to be_nil
expect(opts[:box_download_ca_cert]).to be_nil expect(opts[:box_download_ca_cert]).to be_nil
expect(opts[:box_client_cert]).to be_nil expect(opts[:box_download_client_cert]).to be_nil
expect(opts[:box_download_insecure]).to be_nil expect(opts[:box_download_insecure]).to be_nil
end end
@ -206,7 +206,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
action_called = true action_called = true
expect(opts[:box_download_ca_cert]).to eq("foo") expect(opts[:box_download_ca_cert]).to eq("foo")
expect(opts[:box_download_ca_path]).to eq("bar") expect(opts[:box_download_ca_path]).to eq("bar")
expect(opts[:box_client_cert]).to eq("baz") expect(opts[:box_download_client_cert]).to eq("baz")
expect(opts[:box_download_insecure]).to be(true) expect(opts[:box_download_insecure]).to be(true)
end end
@ -355,7 +355,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
expect(action_runner).to receive(:run).with(any_args) { |action, opts| expect(action_runner).to receive(:run).with(any_args) { |action, opts|
expect(opts[:box_download_ca_cert]).to eq("oof") expect(opts[:box_download_ca_cert]).to eq("oof")
expect(opts[:box_download_ca_path]).to eq("rab") expect(opts[:box_download_ca_path]).to eq("rab")
expect(opts[:box_client_cert]).to eq("zab") expect(opts[:box_download_client_cert]).to eq("zab")
expect(opts[:box_download_insecure]).to be(false) expect(opts[:box_download_insecure]).to be(false)
true true
} }
@ -378,7 +378,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
expect(action_runner).to receive(:run).with(any_args) { |action, opts| expect(action_runner).to receive(:run).with(any_args) { |action, opts|
expect(opts[:box_download_ca_cert]).to eq("foo") expect(opts[:box_download_ca_cert]).to eq("foo")
expect(opts[:box_download_ca_path]).to eq("bar") expect(opts[:box_download_ca_path]).to eq("bar")
expect(opts[:box_client_cert]).to eq("baz") expect(opts[:box_download_client_cert]).to eq("baz")
expect(opts[:box_download_insecure]).to be(true) expect(opts[:box_download_insecure]).to be(true)
true true
} }