vagrant-unbundled 2.2.6.2 → 2.2.14.0

data/plugins/providers/hyperv/scripts/dismount_vhd.ps1

@@ -0,0 +1,13 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$DiskFilePath
+)
+
+try {
+    Hyper-V\Dismount-VHD -path $DiskFilePath
+} catch {
+    Write-ErrorMessage "Failed to dismount disk info from disk file path ${DiskFilePath}: ${PSItem}"
+    exit 1
+}

data/plugins/providers/hyperv/scripts/get_vhd.ps1

@@ -0,0 +1,16 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$DiskFilePath
+)
+
+try {
+    $Disk = Hyper-V\Get-VHD -path $DiskFilePath
+} catch {
+    Write-ErrorMessage "Failed to retrieve disk info from disk file path ${DiskFilePath}: ${PSItem}"
+    exit 1
+}
+
+$result = ConvertTo-json $Disk
+Write-OutputMessage $result

data/plugins/providers/hyperv/scripts/get_vm_status.ps1

@@ -14,7 +14,7 @@ try
     # type was loaded in Microsoft.HyperV.PowerShell
     [void][System.Reflection.Assembly]::LoadWithPartialName('Microsoft.HyperV.PowerShell.Objects, Culture=neutral, PublicKeyToken=31bf3856ad364e35')
 } catch {
-	# Empty catch ok, since if we didn't load the types, we will fail in the next block
+  # Empty catch ok, since if we didn't load the types, we will fail in the next block
 }
 
 $VmmsPath = if ([environment]::Is64BitProcess) { "$($env:SystemRoot)\System32\vmms.exe" } else { "$($env:SystemRoot)\Sysnative\vmms.exe" }

data/plugins/providers/hyperv/scripts/list_hdds.ps1

@@ -0,0 +1,17 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId
+)
+
+try {
+    $VM = Hyper-V\Get-VM -Id $VmId
+    $Disks = @(Hyper-V\Get-VMHardDiskDrive -VMName $VM.Name)
+} catch {
+    Write-ErrorMessage "Failed to retrieve all disk info from ${VM}: ${PSItem}"
+    exit 1
+}
+
+$result = ConvertTo-json $Disks
+Write-OutputMessage $result

data/plugins/providers/hyperv/scripts/new_vhd.ps1

@@ -0,0 +1,31 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$Path,
+    [Parameter(Mandatory=$true)]
+    [UInt64]$SizeBytes,
+    [switch]$Fixed,
+    [switch]$Differencing,
+    [string]$ParentPath,
+    [Uint32]$BlockSizeBytes,
+    [UInt32]$LogicalSectorSizeBytes,
+    [UInt32]$PhysicalSectorSizeBytes,
+    [UInt32]$SourceDisk
+)
+
+$Params = @{}
+
+foreach ($key in $MyInvocation.BoundParameters.keys) {
+  $value = (Get-Variable -Exclude "ErrorAction" $key).Value
+  if ($key -ne "ErrorAction") {
+    $Params.Add($key, $value)
+  }
+}
+
+try {
+    Hyper-V\New-VHD @Params
+} catch {
+    Write-ErrorMessage "Failed to create disk ${DiskFilePath}: ${PSItem}"
+    exit 1
+}

data/plugins/providers/hyperv/scripts/remove_disk_drive.ps1

@@ -0,0 +1,25 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [Parameter(Mandatory=$true)]
+    [string]$ControllerType,
+    [Parameter(Mandatory=$true)]
+    [string]$ControllerNumber,
+    [Parameter(Mandatory=$true)]
+    [string]$ControllerLocation,
+    [Parameter(Mandatory=$true)]
+    [string]$DiskFilePath
+)
+
+try {
+    $VM = Hyper-V\Get-VM -Id $VmId
+
+    Hyper-v\Remove-VMHardDiskDrive -VMName $VM.Name -ControllerType $ControllerType -ControllerNumber $ControllerNumber -ControllerLocation $ControllerLocation
+
+    Remove-Item -Path $DiskFilePath
+} catch {
+    Write-ErrorMessage "Failed to remove disk ${DiskFilePath} to VM ${VM}: ${PSItem}"
+    exit 1
+}

data/plugins/providers/hyperv/scripts/resize_disk_drive.ps1

@@ -0,0 +1,18 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [Parameter(Mandatory=$true)]
+    [string]$DiskFilePath,
+    [Parameter(Mandatory=$true)]
+    [UInt64]$DiskSize
+)
+
+try {
+    $VM = Hyper-V\Get-VM -Id $VmId
+    Hyper-V\Resize-VHD -Path $DiskFilePath -SizeBytes $DiskSize
+} catch {
+    Write-ErrorMessage "Failed to resize disk ${DiskFilePath} for VM ${VM}: ${PSItem}"
+    exit 1
+}

data/plugins/providers/hyperv/scripts/set_enhanced_session_transport_type.ps1

@@ -0,0 +1,24 @@
+#Requires -Modules VagrantMessages
+
+param (
+    [parameter (Mandatory=$true)]
+    [Guid] $VMID,
+    [parameter (Mandatory=$true)]
+    [string] $Type
+)
+
+$ErrorActionPreference = "Stop"
+
+try {
+    $VM = Hyper-V\Get-VM -Id $VMID
+} catch {
+    Write-ErrorMessage "Failed to locate VM: ${PSItem}"
+    exit 1
+}
+
+try {
+    Hyper-V\Set-VM -VM $VM -EnhancedSessionTransportType $Type
+} catch {
+    Write-ErrorMessage "Failed to assign EnhancedSessionTransportType to ${Type}: ${PSItem}"
+    exit 1
+}

data/plugins/providers/hyperv/scripts/set_vm_integration_services.ps1

@@ -4,7 +4,7 @@ param (
     [parameter (Mandatory=$true)]
     [string] $VMID,
     [parameter (Mandatory=$true)]
-    [string] $Name,
+    [string] $Id,
     [parameter (Mandatory=$false)]
     [switch] $Enable
 )
@@ -19,9 +19,9 @@ try {
 }
 
 try {
-    Set-VagrantVMService -VM $VM -Name $Name -Enable $Enable
+    Set-VagrantVMService -VM $VM -Id $Id -Enable $Enable
 } catch {
     if($Enable){ $action = "enable" } else { $action = "disable" }
-    Write-ErrorMessage "Failed to ${action} VM integration service ${Name}: ${PSItem}"
+    Write-ErrorMessage "Failed to ${action} VM integration service id ${Id}: ${PSItem}"
     exit 1
 }

data/plugins/providers/hyperv/scripts/utils/VagrantVM/VagrantVM.psm1

@@ -223,6 +223,7 @@ function New-VagrantVMXML {
 
     # Determine if secure boot is enabled
     $SecureBoot = (Select-Xml -XML $VMConfig -XPath "//secure_boot_enabled").Node."#text"
+    $SecureBootTemplate = (Select-Xml -XML $VMConfig -XPath "//secure_boot_template").Node."#text"
 
     $NewVMConfig = @{
         Name = $VMName;
@@ -242,6 +243,13 @@ function New-VagrantVMXML {
     if($Gen -gt 1) {
         if($SecureBoot -eq "True") {
             Hyper-V\Set-VMFirmware -VM $VM -EnableSecureBoot On
+            if ( 
+                    ( ![System.String]::IsNullOrEmpty($SecureBootTemplate) )`
+                     -and`
+                    ( (Get-Command Hyper-V\Set-VMFirmware).Parameters.Keys.Contains("secureboottemplate") ) 
+                ) {
+                    Hyper-V\Set-VMFirmware -VM $VM -SecureBootTemplate $SecureBootTemplate
+                }
         } else {
             Hyper-V\Set-VMFirmware -VM $VM -EnableSecureBoot Off
         }
@@ -614,15 +622,15 @@ function Set-VagrantVMService {
         [parameter (Mandatory=$true)]
         [Microsoft.HyperV.PowerShell.VirtualMachine] $VM,
         [parameter (Mandatory=$true)]
-        [string] $Name,
+        [string] $Id,
         [parameter (Mandatory=$true)]
         [bool] $Enable
     )
 
     if($Enable) {
-        Hyper-V\Enable-VMIntegrationService -VM $VM -Name $Name
+        Hyper-V\Get-VMIntegrationService -VM $VM | ?{$_.Id -match $Id} | Hyper-V\Enable-VMIntegrationService
     } else {
-        Hyper-V\Disable-VMIntegrationService -VM $VM -Name $Name
+        Hyper-V\Get-VMIntegrationService -VM $VM | ?{$_.Id -match $Id} | Hyper-V\Disable-VMIntegrationService
     }
     return $VM
 <#
@@ -634,9 +642,9 @@ Enable or disable Hyper-V VM integration services.
 
 Hyper-V VM for modification.
 
-.PARAMETER Name
+.PARAMETER Id
 
-Name of the integration service.
+Id of the integration service.
 
 .PARAMETER Enable
 
@@ -722,7 +730,7 @@ function Check-VagrantHyperVAccess {
     )
     $acl = Get-ACL -Path $Path
     $systemACL = $acl.Access | where {
-        $_.IdentityReference.Translate([System.Security.Principal.SecurityIdentifier]).Value -eq "S-1-5-18" -and
+        try { return $_.IdentityReference.Translate([System.Security.Principal.SecurityIdentifier]).Value -eq "S-1-5-18" } catch { return $false } -and
         $_.FileSystemRights -eq "FullControl" -and
         $_.AccessControlType -eq "Allow" -and
         $_.IsInherited -eq $true}

data/plugins/providers/virtualbox/action.rb

@@ -79,10 +79,22 @@ module VagrantPlugins
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
+          b.use Call, IsEnvSet, :cloud_init do |env, b2|
+            if env[:result]
+              b2.use CloudInitSetup
+            end
+          end
+          b.use CleanupDisks
+          b.use Disk
           b.use Customize, "pre-boot"
           b.use Boot
           b.use Customize, "post-boot"
           b.use WaitForCommunicator, [:starting, :running]
+          b.use Call, IsEnvSet, :cloud_init do |env, b2|
+            if env[:result]
+              b2.use CloudInitWait
+            end
+          end
           b.use Customize, "post-comm"
           b.use CheckGuestAdditions
         end
@@ -104,7 +116,7 @@ module VagrantPlugins
                 b3.use ConfigValidate
                 b3.use ProvisionerCleanup, :before
                 b3.use CheckAccessible
-                b3.use EnvSet, force_halt: true
+                b3.use EnvSet, force_halt: env2[:force_halt]
                 b3.use action_halt
                 b3.use Destroy
                 b3.use CleanMachineFolder
@@ -409,6 +421,7 @@ module VagrantPlugins
             end
           end
 
+          b.use EnvSet, cloud_init: true
           b.use action_start
         end
       end

data/plugins/providers/virtualbox/action/clean_machine_folder.rb

@@ -13,7 +13,16 @@ module VagrantPlugins
         end
 
         def call(env)
-          clean_machine_folder(env[:machine].provider.driver.read_machine_folder)
+          machine_folder = env[:machine].provider.driver.read_machine_folder
+
+          begin
+            clean_machine_folder(machine_folder)
+          rescue Errno::EPERM
+            raise Vagrant::Errors::MachineFolderNotAccessible,
+              name: env[:machine].name,
+              path: machine_folder
+          end
+
           @app.call(env)
         end
 

data/plugins/providers/virtualbox/action/export.rb

@@ -23,8 +23,10 @@ module VagrantPlugins
         def export
           @env[:ui].info I18n.t("vagrant.actions.vm.export.exporting")
           @env[:machine].provider.driver.export(ovf_path) do |progress|
-            @env[:ui].clear_line
-            @env[:ui].report_progress(progress.percent, 100, false)
+            @env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress.percent, 100, false)
+            end
           end
 
           # Clear the line a final time so the next data can appear

data/plugins/providers/virtualbox/action/forward_ports.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
             # bridged networking don't require port-forwarding and establishing
             # forwarded ports on these attachment types has uncertain behaviour.
             @env[:ui].detail(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry",
-                                    message_attributes))
+                                    **message_attributes))
 
             # Verify we have the network interface to attach to
             if !interfaces[fp.adapter]
@@ -62,7 +62,7 @@ module VagrantPlugins
             # so verify that that is the case.
             if interfaces[fp.adapter][:type] != :nat
               @env[:ui].detail(I18n.t("vagrant.actions.vm.forward_ports.non_nat",
-                                    message_attributes))
+                                    **message_attributes))
               next
             end
 

data/plugins/providers/virtualbox/action/import.rb

@@ -19,8 +19,10 @@ module VagrantPlugins
           env[:ui].info I18n.t("vagrant.actions.vm.clone.creating")
           env[:machine].id = env[:machine].provider.driver.clonevm(
             env[:clone_id], env[:clone_snapshot]) do |progress|
-            env[:ui].clear_line
-            env[:ui].report_progress(progress, 100, false)
+            env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress, 100, false)
+            end
           end
 
           # Clear the line one last time since the progress meter doesn't
@@ -51,8 +53,10 @@ module VagrantPlugins
           # Import the virtual machine
           ovf_file = env[:machine].box.directory.join("box.ovf").to_s
           id = env[:machine].provider.driver.import(ovf_file) do |progress|
-            env[:ui].clear_line
-            env[:ui].report_progress(progress, 100, false)
+            env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress, 100, false)
+            end
           end
 
           # Set the machine ID

data/plugins/providers/virtualbox/action/prepare_clone_snapshot.rb

@@ -55,8 +55,10 @@ module VagrantPlugins
           @logger.info("Creating base snapshot for master VM.")
           env[:machine].provider.driver.create_snapshot(
             env[:clone_id], name) do |progress|
-              env[:ui].clear_line
-              env[:ui].report_progress(progress, 100, false)
+              env[:ui].rewriting do |ui|
+                ui.clear_line
+                ui.report_progress(progress, 100, false)
+              end
           end
         end
       end

data/plugins/providers/virtualbox/action/snapshot_delete.rb

@@ -12,8 +12,10 @@ module VagrantPlugins
             name: env[:snapshot_name]))
           env[:machine].provider.driver.delete_snapshot(
             env[:machine].id, env[:snapshot_name]) do |progress|
-            env[:ui].clear_line
-            env[:ui].report_progress(progress, 100, false)
+            env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress, 100, false)
+            end
           end
 
           # Clear the line one last time since the progress meter doesn't disappear

data/plugins/providers/virtualbox/action/snapshot_restore.rb

@@ -12,8 +12,10 @@ module VagrantPlugins
             name: env[:snapshot_name]))
           env[:machine].provider.driver.restore_snapshot(
             env[:machine].id, env[:snapshot_name]) do |progress|
-            env[:ui].clear_line
-            env[:ui].report_progress(progress, 100, false)
+            env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress, 100, false)
+            end
           end
 
           # Clear the line one last time since the progress meter doesn't disappear

data/plugins/providers/virtualbox/cap/cleanup_disks.rb

@@ -0,0 +1,85 @@
+require "log4r"
+require "vagrant/util/experimental"
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Cap
+      module CleanupDisks
+        LOGGER = Log4r::Logger.new("vagrant::plugins::virtualbox::cleanup_disks")
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_disks
+        # @param [Hash] disk_meta_file - A hash of all the previously defined disks from the last configure_disk action
+        def self.cleanup_disks(machine, defined_disks, disk_meta_file)
+          return if disk_meta_file.values.flatten.empty?
+
+          return if !Vagrant::Util::Experimental.feature_enabled?("disks")
+
+          handle_cleanup_disk(machine, defined_disks, disk_meta_file["disk"])
+          handle_cleanup_dvd(machine, defined_disks, disk_meta_file["dvd"])
+          # TODO: Floppy disks
+        end
+
+        protected
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_disks
+        # @param [Array<Hash>] disk_meta - An array of all the previously defined disks from the last configure_disk action
+        def self.handle_cleanup_disk(machine, defined_disks, disk_meta)
+          raise TypeError, "Expected `Array` but received `#{disk_meta.class}`" if !disk_meta.is_a?(Array)
+          storage_controllers = machine.provider.driver.read_storage_controllers
+
+          primary = storage_controllers.get_primary_attachment
+          primary_uuid = primary[:uuid]
+
+          disk_meta.each do |d|
+            dsk = defined_disks.select { |dk| dk.name == d["name"] }
+            if !dsk.empty? || d["uuid"] == primary_uuid
+              next
+            else
+              LOGGER.warn("Found disk not in Vagrantfile config: '#{d["name"]}'. Removing disk from guest #{machine.name}")
+              machine.ui.warn(I18n.t("vagrant.cap.cleanup_disks.disk_cleanup", name: d["name"]), prefix: true)
+
+              controller = storage_controllers.get_controller(d["controller"])
+              attachment = controller.get_attachment(uuid: d["uuid"])
+
+              if !attachment
+                LOGGER.warn("Disk '#{d["name"]}' not attached to guest, but still exists.")
+              else
+                machine.provider.driver.remove_disk(controller.name, attachment[:port], attachment[:device])
+              end
+
+              machine.provider.driver.close_medium(d["uuid"])
+            end
+          end
+        end
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_dvds
+        # @param [Array<Hash>] dvd_meta - An array of all the previously defined dvds from the last configure_disk action
+        def self.handle_cleanup_dvd(machine, defined_dvds, dvd_meta)
+          raise TypeError, "Expected `Array` but received `#{dvd_meta.class}`" if !dvd_meta.is_a?(Array)
+          dvd_meta.each do |d|
+            dsk = defined_dvds.select { |dk| dk.name == d["name"] }
+            if !dsk.empty?
+              next
+            else
+              LOGGER.warn("Found dvd not in Vagrantfile config: '#{d["name"]}'. Removing dvd from guest #{machine.name}")
+              machine.ui.warn("DVD '#{d["name"]}' no longer exists in Vagrant config. Removing medium from guest...", prefix: true)
+
+              storage_controllers = machine.provider.driver.read_storage_controllers
+              controller = storage_controllers.get_controller(d["controller"])
+              attachment = controller.get_attachment(uuid: d["uuid"])
+
+              if !attachment
+                LOGGER.warn("DVD '#{d["name"]}' not attached to guest, but still exists.")
+              else
+                machine.provider.driver.remove_disk(controller.name, attachment[:port], attachment[:device])
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end