vagrant-unbundled 2.2.6.0 → 2.2.9.0

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

@@ -0,0 +1,27 @@
+require "log4r"
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Cap
+      module ValidateDiskExt
+        LOGGER = Log4r::Logger.new("vagrant::plugins::virtualbox::validate_disk_ext")
+
+        # The default set of disk formats that VirtualBox supports
+        DEFAULT_DISK_EXT = ["vdi", "vmdk", "vhd"].map(&:freeze).freeze
+
+        # @param [Vagrant::Machine] machine
+        # @param [String] disk_ext
+        # @return [Bool]
+        def self.validate_disk_ext(machine, disk_ext)
+          DEFAULT_DISK_EXT.include?(disk_ext)
+        end
+
+        # @param [Vagrant::Machine] machine
+        # @return [Array]
+        def self.get_default_disk_ext(machine)
+          DEFAULT_DISK_EXT
+        end
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/driver/base.rb

@@ -368,6 +368,21 @@ module VagrantPlugins
         def vm_exists?(uuid)
         end
 
+        # Returns a hash of information about a given virtual machine
+        #
+        # @param [String] uuid
+        # @return [Hash] info
+        def show_vm_info
+          info = {}
+          execute('showvminfo', @uuid, '--machinereadable', retryable: true).split("\n").each do |line|
+            parts = line.partition('=')
+            key = parts.first.gsub('"', '')
+            value = parts.last.gsub('"', '')
+            info[key] = value
+          end
+          info
+        end
+
         # Execute the given subcommand for VBoxManage and return the output.
         def execute(*command, &block)
           # Get the options hash if it exists

data/plugins/providers/virtualbox/driver/meta.rb

@@ -64,6 +64,7 @@ module VagrantPlugins
             "5.1" => Version_5_1,
             "5.2" => Version_5_2,
             "6.0" => Version_6_0,
+            "6.1" => Version_6_1,
           }
 
           if @@version.start_with?("4.2.14")
@@ -96,10 +97,15 @@ module VagrantPlugins
           end
         end
 
-        def_delegators :@driver, :clear_forwarded_ports,
+        def_delegators :@driver,
+          :attach_disk,
+          :clear_forwarded_ports,
           :clear_shared_folders,
+          :clone_disk,
           :clonevm,
+          :close_medium,
           :create_dhcp_server,
+          :create_disk,
           :create_host_only_network,
           :create_snapshot,
           :delete,
@@ -110,9 +116,11 @@ module VagrantPlugins
           :execute_command,
           :export,
           :forward_ports,
+          :get_port_and_device,
           :halt,
           :import,
           :list_snapshots,
+          :list_hdds,
           :read_forwarded_ports,
           :read_bridged_interfaces,
           :read_dhcp_servers,
@@ -129,6 +137,8 @@ module VagrantPlugins
           :read_vms,
           :reconfig_host_only,
           :remove_dhcp_server,
+          :remove_disk,
+          :resize_disk,
           :restore_snapshot,
           :resume,
           :set_mac_address,
@@ -137,9 +147,11 @@ module VagrantPlugins
           :ssh_port,
           :start,
           :suspend,
+          :vdi_to_vmdk,
           :verify!,
           :verify_image,
-          :vm_exists?
+          :vm_exists?,
+          :vmdk_to_vdi
 
         protected
 

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -16,6 +16,28 @@ module VagrantPlugins
           @uuid = uuid
         end
 
+        # Controller-Port-Device looks like:
+        # SATA Controller-ImageUUID-0-0 (sub out ImageUUID)
+        # - Controller: SATA Controller
+        # - Port: 0
+        # - Device: 0
+        #
+        # @param [String] port - port on device to attach disk to
+        # @param [String] device - device on controller for disk
+        # @param [String] file - disk file path
+        # @param [String] type - type of disk to attach
+        # @param [Hash]   opts -  additional options
+        def attach_disk(port, device, file, type="hdd", **opts)
+          # Maybe only support SATA Controller for `:disk`???
+          controller = "SATA Controller"
+
+          comment = "This disk is managed externally by Vagrant. Removing or adjusting settings could potentially cause issues with Vagrant."
+
+          execute('storageattach', @uuid, '--storagectl', controller, '--port',
+                  port.to_s, '--device', device.to_s, '--type', type, '--medium',
+                  file, '--comment', comment)
+        end
+
         def clear_forwarded_ports
           retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
             args = []
@@ -38,6 +60,13 @@ module VagrantPlugins
           end
         end
 
+        # @param [String] source
+        # @param [String] destination
+        # @param [String] disk_format
+        def clone_disk(source, destination, disk_format, **opts)
+          execute("clonemedium", source, destination, '--format', disk_format)
+        end
+
         def clonevm(master_id, snapshot_name)
           machine_name = "temp_clone_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
           args = ["--register", "--name", machine_name]
@@ -49,6 +78,14 @@ module VagrantPlugins
           return get_machine_id(machine_name)
         end
 
+        # Removes a disk from the given virtual machine
+        #
+        # @param [String] disk_uuid or file path
+        # @param [Hash]   opts -  additional options
+        def close_medium(disk_uuid)
+          execute("closemedium", disk_uuid, '--delete')
+        end
+
         def create_dhcp_server(network, options)
           retryable(on: Vagrant::Errors::VBoxManageError, tries: 3, sleep: 1) do
             begin
@@ -65,6 +102,17 @@ module VagrantPlugins
           end
         end
 
+       # Creates a disk. Default format is VDI unless overridden
+       #
+       # @param [String] disk_file
+       # @param [Integer] disk_size - size in bytes
+       # @param [String] disk_format - format of disk, defaults to "VDI"
+        # @param [Hash]  opts -  additional options
+       def create_disk(disk_file, disk_size, disk_format="VDI", **opts)
+         execute("createmedium", '--filename', disk_file, '--sizebyte', disk_size.to_i.to_s, '--format', disk_format)
+       end
+
+
         def create_host_only_network(options)
           # Create the interface
           execute("hostonlyif", "create", retryable: true) =~ /^Interface '(.+?)' was successfully created$/
@@ -130,6 +178,33 @@ module VagrantPlugins
           end
         end
 
+        # Lists all attached harddisks from a given virtual machine. Additionally,
+        # this method adds a new key "Disk Name" based on the disks file path from "Location"
+        #
+        # @return [Array] hdds An array of hashes of harddrive info for a guest
+        def list_hdds
+          hdds = []
+          tmp_drive = {}
+          execute('list', 'hdds', retryable: true).split("\n").each do |line|
+            if line == "" # separator between disks
+              hdds << tmp_drive
+              tmp_drive = {}
+              next
+            end
+            parts = line.partition(":")
+            key = parts.first.strip
+            value = parts.last.strip
+            tmp_drive[key] = value
+
+            if key == "Location"
+              tmp_drive["Disk Name"] = File.basename(value, ".*")
+            end
+          end
+          hdds << tmp_drive unless tmp_drive.empty?
+
+          hdds
+        end
+
         def list_snapshots(machine_id)
           output = execute(
             "snapshot", machine_id, "list", "--machinereadable",
@@ -149,6 +224,21 @@ module VagrantPlugins
           raise
         end
 
+        # @param [String] port - port on device to attach disk to
+        # @param [String] device - device on controller for disk
+        # @param [Hash]   opts -  additional options
+        def remove_disk(port, device)
+          controller = "SATA Controller"
+          execute('storageattach', @uuid, '--storagectl', controller, '--port', port.to_s, '--device', device.to_s, '--medium', "none")
+        end
+
+        # @param [String] disk_file
+        # @param [Integer] disk_size in bytes
+        # @param [Hash]   opts -  additional options
+        def resize_disk(disk_file, disk_size, **opts)
+          execute("modifymedium", disk_file, '--resizebyte', disk_size.to_i.to_s)
+        end
+
         def restore_snapshot(machine_id, snapshot_name)
           # Start with 0%
           last = 0
@@ -295,6 +385,27 @@ module VagrantPlugins
           nil
         end
 
+        # Returns port and device for an attached disk given a disk uuid. Returns
+        # empty hash if disk is not attachd to guest
+        #
+        # @param [Hash] vm_info - A guests information from vboxmanage
+        # @param [String] disk_uuid - the UUID for the disk we are searching for
+        # @return [Hash] disk_info - Contains a device and port number
+        def get_port_and_device(disk_uuid)
+          vm_info = show_vm_info
+
+          disk = {}
+          disk_info_key = vm_info.key(disk_uuid)
+          return disk if !disk_info_key
+
+          disk_info = disk_info_key.split("-")
+
+          disk[:port] = disk_info[2]
+          disk[:device] = disk_info[3]
+
+          return disk
+        end
+
         def halt
           execute("controlvm", @uuid, "poweroff", retryable: true)
         end
@@ -370,7 +481,7 @@ module VagrantPlugins
             end
           end
 
-          return get_machine_id specified_name
+          return get_machine_id(specified_name)
         end
 
         def max_network_adapters
@@ -476,6 +587,11 @@ module VagrantPlugins
 
         def read_guest_ip(adapter_number)
           ip = read_guest_property("/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP")
+          if ip.end_with?(".1")
+            @logger.warn("VBoxManage guest property returned: #{ip}. Result resembles IP of DHCP server and is being ignored.")
+            ip = nil
+          end
+
           if !valid_ip_address?(ip)
             raise Vagrant::Errors::VirtualBoxGuestPropertyNotFound,
               guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
@@ -783,12 +899,36 @@ module VagrantPlugins
           return true
         end
 
+        # @param [VagrantPlugins::VirtualboxProvider::Driver] driver
+        # @param [String] defined_disk_path
+        # @return [String] destination - The cloned disk
+        def vmdk_to_vdi(defined_disk_path)
+          source = defined_disk_path
+          destination = File.join(File.dirname(source), File.basename(source, ".*")) + ".vdi"
+
+          clone_disk(source, destination, 'VDI')
+
+          destination
+        end
+
+        # @param [VagrantPlugins::VirtualboxProvider::Driver] driver
+        # @param [String] defined_disk_path
+        # @return [String] destination - The cloned disk
+        def vdi_to_vmdk(defined_disk_path)
+          source = defined_disk_path
+          destination = File.join(File.dirname(source), File.basename(source, ".*")) + ".vmdk"
+
+          clone_disk(source, destination, 'VMDK')
+
+          destination
+        end
+
         protected
 
         def valid_ip_address?(ip)
           # Filter out invalid IP addresses
           # GH-4658 VirtualBox can report an IP address of 0.0.0.0 for FreeBSD guests.
-          if ip == "0.0.0.0"
+          if ip == "0.0.0.0" || ip.nil?
             return false
           else
             return true

data/plugins/providers/virtualbox/driver/version_6_1.rb

@@ -0,0 +1,39 @@
+require File.expand_path("../version_6_0", __FILE__)
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      # Driver for VirtualBox 6.1.x
+      class Version_6_1 < Version_6_0
+        def initialize(uuid)
+          super
+
+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1")
+        end
+
+        def read_dhcp_servers
+          execute("list", "dhcpservers", retryable: true).split("\n\n").collect do |block|
+            info = {}
+
+            block.split("\n").each do |line|
+              if network = line[/^NetworkName:\s+HostInterfaceNetworking-(.+?)$/, 1]
+                info[:network]      = network
+                info[:network_name] = "HostInterfaceNetworking-#{network}"
+              elsif ip = line[/^Dhcpd IP:\s+(.+?)$/, 1]
+                info[:ip] = ip
+              elsif netmask = line[/^NetworkMask:\s+(.+?)$/, 1]
+                info[:netmask] = netmask
+              elsif lower = line[/^LowerIPAddress:\s+(.+?)$/, 1]
+                info[:lower] = lower
+              elsif upper = line[/^UpperIPAddress:\s+(.+?)$/, 1]
+                info[:upper] = upper
+              end
+            end
+
+            info
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/plugin.rb

@@ -39,6 +39,26 @@ module VagrantPlugins
         Cap::PublicAddress
       end
 
+      provider_capability(:virtualbox, :configure_disks) do
+        require_relative "cap/configure_disks"
+        Cap::ConfigureDisks
+      end
+
+      provider_capability(:virtualbox, :cleanup_disks) do
+        require_relative "cap/cleanup_disks"
+        Cap::CleanupDisks
+      end
+
+      provider_capability(:virtualbox, :validate_disk_ext) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
+      provider_capability(:virtualbox, :get_default_disk_ext) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
       provider_capability(:virtualbox, :snapshot_list) do
         require_relative "cap"
         Cap
@@ -59,6 +79,7 @@ module VagrantPlugins
       autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
       autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
       autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__)
+      autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__)
     end
 
     module Model

data/plugins/provisioners/ansible/cap/guest/alpine/ansible_install.rb

@@ -0,0 +1,44 @@
+require_relative "../facts"
+require_relative "../pip/pip"
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Alpine
+          module AnsibleInstall
+
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
+              case install_mode
+                when :pip
+                  pip_setup machine, pip_install_cmd
+                  Pip::pip_install machine, "ansible", ansible_version, pip_args, true
+                when :pip_args_only
+                  pip_setup machine, pip_install_cmd
+                  Pip::pip_install machine, "", "", pip_args, false
+                else
+                  ansible_apk_install machine
+              end
+            end
+
+            private
+
+            def self.ansible_apk_install(machine)
+              machine.communicate.sudo "apk add --update --no-cache python3 ansible"
+              machine.communicate.sudo "if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi"
+              machine.communicate.sudo "if [ ! -e /usr/bin/pip ]; then ln -sf pip3 /usr/bin/pip ; fi"
+            end
+
+            def self.pip_setup(machine, pip_install_cmd = "")
+              machine.communicate.sudo "apk add --update --no-cache python3"
+              machine.communicate.sudo "if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi"
+              machine.communicate.sudo "apk add --update --no-cache --virtual .build-deps python3-dev libffi-dev openssl-dev build-base"
+              Pip::get_pip machine, pip_install_cmd
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb

@@ -1,4 +1,5 @@
 require_relative "../../../errors"
+require_relative "../pip/pip"
 
 module VagrantPlugins
   module Ansible
@@ -7,15 +8,31 @@ module VagrantPlugins
         module Arch
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
-              if install_mode != :default
-                raise Ansible::Errors::AnsiblePipInstallIsNotSupported
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd = "")
+              case install_mode
+              when :pip
+                pip_setup machine, pip_install_cmd
+                Pip::pip_install machine, "ansible", ansible_version, pip_args, true
+
+              when :pip_args_only
+                pip_setup machine, pip_install_cmd
+                Pip::pip_install machine, "", "", pip_args, false
+
               else
                 machine.communicate.sudo "pacman -Syy --noconfirm"
                 machine.communicate.sudo "pacman -S --noconfirm ansible"
               end
             end
 
+            private
+
+            def self.pip_setup(machine, pip_install_cmd = "")
+              machine.communicate.sudo "pacman -Syy --noconfirm"
+              machine.communicate.sudo "pacman -S --noconfirm base-devel curl git python"
+
+              Pip::get_pip machine, pip_install_cmd
+            end
+
           end
         end
       end