From 13c91d68a6a37fcb5bba18a76ccaedb15dc24b28 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Mon, 18 May 2020 15:10:53 -0700 Subject: [PATCH] Only grab provider_config if provider key exists and config isn't empty --- plugins/providers/hyperv/cap/configure_disks.rb | 7 +++++-- .../plugins/providers/hyperv/cap/configure_disks_test.rb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/providers/hyperv/cap/configure_disks.rb b/plugins/providers/hyperv/cap/configure_disks.rb index db58cfc73..e2db93d26 100644 --- a/plugins/providers/hyperv/cap/configure_disks.rb +++ b/plugins/providers/hyperv/cap/configure_disks.rb @@ -143,8 +143,11 @@ module VagrantPlugins def self.create_disk(machine, disk_config) machine.ui.detail(I18n.t("vagrant.cap.configure_disks.create_disk", name: disk_config.name)) disk_provider_config = {} - disk_provider_config = disk_config.provider_config[:hyperv] if disk_config.provider_config - # Convert any shortcut options for powershell commands + + if disk_config.provider_config && disk_config.provider_config.key?(:hyperv) + disk_provider_config = disk_config.provider_config[:hyperv] + end + if !disk_provider_config.empty? disk_provider_config = convert_size_vars!(disk_provider_config) end diff --git a/test/unit/plugins/providers/hyperv/cap/configure_disks_test.rb b/test/unit/plugins/providers/hyperv/cap/configure_disks_test.rb index 815e1079e..af51f645e 100644 --- a/test/unit/plugins/providers/hyperv/cap/configure_disks_test.rb +++ b/test/unit/plugins/providers/hyperv/cap/configure_disks_test.rb @@ -207,10 +207,10 @@ describe VagrantPlugins::HyperV::Cap::ConfigureDisks do it "creates a disk and attaches it to a guest" do expect(machine).to receive(:data_dir).and_return(data_dir) - expect(driver).to receive(:create_disk).with(disk_file, disk_config.size, nil) + expect(driver).to receive(:create_disk).with(disk_file, disk_config.size, {}) expect(driver).to receive(:get_disk).with(disk_file).and_return(disk) - expect(driver).to receive(:attach_disk).with(disk_file, nil) + expect(driver).to receive(:attach_disk).with(disk_file, {}) subject.create_disk(machine, disk_config) end