vagrant-unbundled 2.2.9.0 → 2.2.10.0

data/plugins/providers/hyperv/cap/validate_disk_ext.rb

@@ -0,0 +1,34 @@
+require "log4r"
+
+module VagrantPlugins
+  module HyperV
+    module Cap
+      module ValidateDiskExt
+        LOGGER = Log4r::Logger.new("vagrant::plugins::hyperv::validate_disk_ext")
+
+        # The default set of disk formats that Hyper-V supports
+        DEFAULT_DISK_EXT_LIST = ["vhd", "vhdx"].map(&:freeze).freeze
+        DEFAULT_DISK_EXT = "vhdx".freeze
+
+        # @param [Vagrant::Machine] machine
+        # @param [String] disk_ext
+        # @return [Bool]
+        def self.validate_disk_ext(machine, disk_ext)
+          DEFAULT_DISK_EXT_LIST.include?(disk_ext)
+        end
+
+        # @param [Vagrant::Machine] machine
+        # @return [Array]
+        def self.default_disk_exts(machine)
+          DEFAULT_DISK_EXT_LIST
+        end
+
+        # @param [Vagrant::Machine] machine
+        # @return [String]
+        def self.set_default_disk_ext(machine)
+          DEFAULT_DISK_EXT
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/config.rb

@@ -48,6 +48,8 @@ module VagrantPlugins
       attr_accessor :enable_virtualization_extensions
       # @return [Hash] Options for VMServiceIntegration
       attr_accessor :vm_integration_services
+      # @return [Boolean] Enable Enhanced session mode
+      attr_accessor :enable_enhanced_session_mode
 
       def initialize
         @ip_address_timeout = UNSET_VALUE
@@ -65,6 +67,7 @@ module VagrantPlugins
         @enable_automatic_checkpoints = UNSET_VALUE
         @enable_checkpoints = UNSET_VALUE
         @vm_integration_services = {}
+        @enable_enhanced_session_mode = UNSET_VALUE
       end
 
       def finalize!
@@ -102,6 +105,8 @@ module VagrantPlugins
 
         # If automatic checkpoints are enabled, checkpoints will automatically be enabled
         @enable_checkpoints ||= @enable_automatic_checkpoints
+
+        @enable_enhanced_session_mode = false if @enable_enhanced_session_mode == UNSET_VALUE
       end
 
       def validate(machine)

data/plugins/providers/hyperv/driver.rb

@@ -218,6 +218,85 @@ module VagrantPlugins
         execute(:set_name, VMID: vm_id, VMName: vmname)
       end
 
+      #
+      # Disk Driver methods
+      #
+
+      # @param [String] controller_type
+      # @param [String] controller_number
+      # @param [String] controller_location
+      # @param [Hash] opts
+      # @option opts [String] :ControllerType
+      # @option opts [String] :ControllerNumber
+      # @option opts [String] :ControllerLocation
+      def attach_disk(disk_file_path,  **opts)
+        execute(:attach_disk_drive, VmId: @vm_id, Path: disk_file_path, ControllerType: opts[:ControllerType],
+                ControllerNumber: opts[:ControllerNumber], ControllerLocation: opts[:ControllerLocation])
+      end
+
+      # @param [String] path
+      # @param [Int] size_bytes
+      # @param [Hash] opts
+      # @option opts [Bool] :Fixed
+      # @option opts [String] :BlockSizeBytes
+      # @option opts [String] :LogicalSectorSizeBytes
+      # @option opts [String] :PhysicalSectorSizeBytes
+      # @option opts [String] :SourceDisk
+      # @option opts [Bool] :Differencing
+      # @option opts [String] :ParentPath
+      def create_disk(path, size_bytes, **opts)
+        execute(:new_vhd, Path: path, SizeBytes: size_bytes, Fixed: opts[:Fixed],
+               BlockSizeBytes: opts[:BlockSizeBytes], LogicalSectorSizeBytes: opts[:LogicalSectorSizeBytes],
+               PhysicalSectorSizeBytes: opts[:PhysicalSectorSizeBytes],
+               SourceDisk: opts[:SourceDisk], Differencing: opts[:Differencing],
+               ParentPath: opts[:ParentPath])
+      end
+
+      # @param [String] disk_file_path
+      def dismount_disk(disk_file_path)
+        execute(:dismount_vhd, DiskFilePath: disk_file_path)
+      end
+
+      # @param [String] disk_file_path
+      def get_disk(disk_file_path)
+        execute(:get_vhd, DiskFilePath: disk_file_path)
+      end
+
+      # @return [Array[Hash]]
+      def list_hdds
+        execute(:list_hdds, VmId: @vm_id)
+      end
+
+      # @param [String] controller_type
+      # @param [String] controller_number
+      # @param [String] controller_location
+      # @param [String] disk_file_path
+      # @param [Hash] opts
+      # @option opts [String] :ControllerType
+      # @option opts [String] :ControllerNumber
+      # @option opts [String] :ControllerLocation
+      def remove_disk(controller_type, controller_number, controller_location, disk_file_path, **opts)
+        execute(:remove_disk_drive, VmId: @vm_id, ControllerType: controller_type,
+                ControllerNumber: controller_number, ControllerLocation: controller_location,
+                DiskFilePath: disk_file_path)
+      end
+
+      # @param [String] path
+      # @param [Int] size_bytes
+      # @param [Hash] opts
+      def resize_disk(disk_file_path, size_bytes, **opts)
+        execute(:resize_disk_drive, VmId: @vm_id, DiskFilePath: disk_file_path,
+                DiskSize: size_bytes)
+      end
+
+      # Set enhanced session transport type of the VM
+      #
+      # @param [String] enhanced session transport type of the VM
+      # @return [nil]
+      def set_enhanced_session_transport_type(transport_type)
+        execute(:set_enhanced_session_transport_type, VmID: vm_id, type: transport_type)
+      end
+
       protected
 
       def execute_powershell(path, options, &block)
@@ -227,6 +306,7 @@ module VagrantPlugins
         options = options || {}
         ps_options = []
         options.each do |key, value|
+          next if !value || value.to_s.empty?
           next if value == false
           ps_options << "-#{key}"
           # If the value is a TrueClass assume switch

data/plugins/providers/hyperv/plugin.rb

@@ -32,6 +32,31 @@ module VagrantPlugins
         Cap::SnapshotList
       end
 
+      provider_capability(:hyperv, :configure_disks) do
+        require_relative "cap/configure_disks"
+        Cap::ConfigureDisks
+      end
+
+      provider_capability(:hyperv, :cleanup_disks) do
+        require_relative "cap/cleanup_disks"
+        Cap::CleanupDisks
+      end
+
+      provider_capability(:hyperv, :validate_disk_ext) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
+      provider_capability(:hyperv, :default_disk_exts) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
+      provider_capability(:hyperv, :set_default_disk_ext) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
       protected
 
       def self.init!

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

@@ -0,0 +1,28 @@
+#Requires -Modules VagrantMessages
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [Parameter(Mandatory=$true)]
+    [string]$Path,
+    [string]$ControllerType,
+    [string]$ControllerNumber,
+    [string]$ControllerLocation
+)
+
+$Params = @{}
+
+foreach ($key in $MyInvocation.BoundParameters.keys) {
+  $value = (Get-Variable -Exclude "ErrorAction" $key).Value
+  if (($key -ne "VmId") -and ($key -ne "ErrorAction")) {
+    $Params.Add($key, $value)
+  }
+}
+
+try {
+    $VM = Hyper-V\Get-VM -Id $VmId
+    Hyper-V\Add-VMHardDiskDrive -VMName $VM.Name @Params
+} catch {
+    Write-ErrorMessage "Failed to attach disk ${DiskFilePath} to VM ${VM}: ${PSItem}"
+    exit 1
+}

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/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
         }

data/plugins/providers/virtualbox/action.rb

@@ -79,12 +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
@@ -106,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
@@ -411,6 +421,7 @@ module VagrantPlugins
             end
           end
 
+          b.use EnvSet, cloud_init: true
           b.use action_start
         end
       end

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