vagrant-vmware-desktop 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba545200e0b56b039bbb5f2e562b6b95bc0101cfdfc2b1b8bb7112c03d4bc163
-  data.tar.gz: 2f06179843c86955a7eb81170090daa184b2fb54aedf96bd13c408366fd2c819
+  metadata.gz: faa4d46aabdc2dfaf78c6c69cf57c3fd2b447192b78495333a1f73e1190d3ddc
+  data.tar.gz: 9113eb7729d89bfaf3bb288f6fed490297d117ab20e196f0ea55b86c36f84211
 SHA512:
-  metadata.gz: b3c33c80806c0519d5f104456efe882e2d8d81d3392b1c36b9e3c23d4bd3344779a629c0f03e3654406af12ac7e9db0d00803253e7d2f4373bd63e8c493811a0
-  data.tar.gz: 3118c1fad9e990dd7fc81d0ebf2f7be35c5ac8dd1afe6e550c060488495e71d820b4a916a56ca2235e468e76f8d07444c6200015109bb5af157cd9270140072f
+  metadata.gz: 061b173c5a4d767ec3e8c27144487e85f79b538fa6828443c3068564c1886d2ec750a5cfad57e8e397c41c08cc86a894092462f0e6b0443ff8d3dd5ec5d00b4b
+  data.tar.gz: 6e749f952549f49419af194a2e889d2c22861d254ea9cdefb0544c5450bb57f111e6f447a54427802815420875d923a4c5bebf6eb0c331dc42002eec8bac9f91

data/lib/vagrant-vmware-desktop/action.rb

@@ -361,10 +361,8 @@ module HashiCorp
                 b3.use SetHostname
               end
 
-              Vagrant::Util::Experimental.guard_with(:disks) do
-                b3.use CleanupDisks
-                b3.use Disk
-              end
+              b3.use CleanupDisks
+              b3.use Disk
               b3.use VMXModify
               b3.use PrepareForwardedPortCollisionParams
               b3.use HandleForwardedPortCollisions

data/lib/vagrant-vmware-desktop/cap/disk.rb

@@ -12,7 +12,7 @@ module HashiCorp
         @@logger = Log4r::Logger.new("hashicorp::provider::vmware::cap::disk")
 
         DEFAULT_DISK_EXT = "vmdk".freeze
-        BUS_TYPES = ["sata", "ide", "scsi"].map(&:freeze).freeze
+        BUS_TYPES = ["nvme", "sata", "ide", "scsi"].map(&:freeze).freeze
         DEFAULT_BUS = "scsi".freeze
         DEFAULT_DVD_BUS = "ide".freeze
         DEFAULT_DVD_DEVICE_TYPE = "cdrom-image"
@@ -28,7 +28,7 @@ module HashiCorp
         # 5 : compressed disk optimized for streaming
         # 6 : thin provisioned virtual disk - ESX 3.x and above
         DEFAULT_DISK_TYPE = 0.freeze
-        PRIMARY_DISK_SLOT = "scsi0:0".freeze
+        PRIMARY_DISK_SLOTS = ["scsi0:0", "sata0:0", "ide0:0"].map(&:freeze).freeze
 
         def self.set_default_disk_ext(machine)
           DEFAULT_DISK_EXT
@@ -112,7 +112,11 @@ module HashiCorp
         # @return [Hash, nil] - A hash of the current disk, nil if not found
         def self.get_disk(disk, all_disks)
           if disk.primary
-            return all_disks[PRIMARY_DISK_SLOT]
+            PRIMARY_DISK_SLOTS.each do |primary_slot|
+              disk_info = all_disks[primary_slot]
+              @@logger.debug("disk info for primary slot #{primary_slot} - #{disk_info}")
+              return disk_info if disk_info["present"].to_s.upcase == "TRUE"
+            end
           else
             if disk.type == :dvd
               all_disks.values.detect { |v| v["filename"] == disk.file }
@@ -153,7 +157,12 @@ module HashiCorp
 
             # disk.size is in bytes
             if disk.size > machine.provider.driver.get_disk_size(disk_path)
-              grow_disk(machine, disk_path, disk)
+              if disk.primary && machine.provider.driver.is_linked_clone?
+                machine.env.ui.warn(I18n.t("hashicorp.vagrant_vmware_desktop.disk_not_growing_linked_primary"))
+                @@logger.warn("Not growing primary disk - guest is linked clone")
+              else
+                grow_disk(machine, disk_path, disk)
+              end
             elsif disk.size < machine.provider.driver.get_disk_size(disk_path)
               machine.env.ui.warn(I18n.t("hashicorp.vagrant_vmware_desktop.disk_not_shrinking", path: disk.name))
               @@logger.warn("Not shrinking disk #{disk.name}")

data/lib/vagrant-vmware-desktop/driver/base.rb

@@ -186,17 +186,22 @@ module HashiCorp
         def product_type
           return @product_type if @product_type
 
-          # If the license is standard, the type is player
-          if standard?
-            return @product_type = "player"
-          end
-
+          @logger.debug("determining product type")
           case @product_name.downcase
           when "workstation"
-            @product_type = "ws"
+            # If the license is standard, the type is player
+            if standard?
+              @logger.debug("workstation product with standard license: player")
+              @product_type = "player"
+            else
+              @logger.debug("workstation product with professional license: ws")
+              @product_type = "ws"
+            end
           when "fusion"
+            @logger.debug("fusion product: fusion")
             @product_type = "fusion"
           else
+            @logger.debug("unknown product (#{@product_name}), defaulting: player")
             @product_type = "player"
           end
 
@@ -581,6 +586,43 @@ module HashiCorp
         def read_ip(enable_vmrun_ip_lookup=true)
           @logger.info("Reading an accessible IP for machine...")
 
+          if enable_vmrun_ip_lookup
+            # Try to read the IP using vmrun getGuestIPAddress. This
+            # won't work if the guest doesn't have guest tools installed or
+            # is using an old version of VMware.
+            begin
+              @logger.info("Trying vmrun getGuestIPAddress...")
+              result = vmrun("getGuestIPAddress", host_vmx_path, "-wait", {timeout: 10, retryable: true})
+              result = result.stdout.chomp
+
+              # If returned address ends with a ".1" do not accept address
+              # and allow lookup via VMX.
+              # see: https://github.com/vmware/open-vm-tools/issues/93
+              if result.end_with?(".1")
+                @logger.warn("vmrun getGuestIPAddress returned: #{result}. Result resembles address retrieval from wrong " \
+                  "interface. Discarding value and proceeding with VMX based lookup.")
+                result = nil
+              else
+                # Try to parse the IP Address. This will raise an exception
+                # if it fails, which will halt our attempt to use it.
+                IPAddr.new(result)
+                @logger.info("vmrun getGuestIPAddress success: #{result}")
+                return result
+              end
+            rescue Errors::VMRunError
+              @logger.info("vmrun getGuestIPAddress failed: VMRunError")
+              # Ignore, try the MAC address way.
+            rescue Vagrant::Util::Subprocess::TimeoutExceeded
+              @logger.info("vmrun getGuestIPAddress failed: TimeoutExceeded")
+              # Ignore, try the MAC address way.
+            rescue IPAddr::InvalidAddressError
+              @logger.info("vmrun getGuestIPAddress failed: InvalidAddressError for #{result.inspect}")
+              # Ignore, try the MAC address way.
+            end
+          else
+            @logger.info("Skipping vmrun getGuestIPAddress as requested by config.")
+          end
+
           # NOTE: Read from DHCP leases first so we can attempt to fetch the address
           # for the vmnet8 device first. If multiple networks are defined on the guest
           # it will return the address of the last device, which will fail when doing
@@ -623,39 +665,6 @@ module HashiCorp
             return dhcp_ip if dhcp_ip
           end
 
-          if enable_vmrun_ip_lookup
-            # Try to read the IP using vmrun getGuestIPAddress. This
-            # won't work if the guest doesn't have guest tools installed or
-            # is using an old version of VMware.
-            begin
-              @logger.info("Trying vmrun getGuestIPAddress...")
-              result = vmrun("getGuestIPAddress", host_vmx_path)
-              result = result.stdout.chomp
-
-              # If returned address ends with a ".1" do not accept address
-              # and allow lookup via VMX.
-              # see: https://github.com/vmware/open-vm-tools/issues/93
-              if result.end_with?(".1")
-                @logger.warn("vmrun getGuestIPAddress returned: #{result}. Result resembles address retrieval from wrong " \
-                  "interface. Discarding value and proceeding with VMX based lookup.")
-                result = nil
-              else
-                # Try to parse the IP Address. This will raise an exception
-                # if it fails, which will halt our attempt to use it.
-                IPAddr.new(result)
-                @logger.info("vmrun getGuestIPAddress success: #{result}")
-                return result
-              end
-            rescue Errors::VMRunError
-              @logger.info("vmrun getGuestIPAddress failed: VMRunError")
-              # Ignore, try the MAC address way.
-            rescue IPAddr::InvalidAddressError
-              @logger.info("vmrun getGuestIPAddress failed: InvalidAddressError for #{result.inspect}")
-              # Ignore, try the MAC address way.
-            end
-          else
-            @logger.info("Skipping vmrun getGuestIPAddress as requested by config.")
-          end
           nil
         end
 
@@ -1184,6 +1193,32 @@ module HashiCorp
           disk_size
         end
 
+        # @return [Boolean] Instance is a linked clone
+        def is_linked_clone?
+          if @vmsd_path.nil?
+            @vm_dir.children(true).each do |child|
+              if child.basename.to_s.match(/\.vmsd$/)
+                @vmsd_path = child
+              end
+            end
+          end
+
+          return false if @vmsd_path.nil?
+
+          if @is_clone.nil?
+            @is_clone = false
+
+            File.readlines(@vmsd_path).each do |line|
+              if line.start_with?("cloneOf")
+                @is_clone = true
+                break
+              end
+            end
+          end
+
+          @is_clone
+        end
+
         protected
 
         # This reads the latest DHCP lease for a MAC address on the
@@ -1254,7 +1289,7 @@ module HashiCorp
           command_opts = { :notify => [:stdout, :stderr] }
           command_opts[:timeout] = opts[:timeout] if opts[:timeout]
 
-          command = command.dup
+          command = command.dup.map(&:to_s)
           command << command_opts
 
 
@@ -1264,8 +1299,12 @@ module HashiCorp
               if VagrantVMwareDesktop.wsl?
                 r_path = VagrantVMwareDesktop.windows_to_wsl_path(r_path)
               end
-              result = Vagrant::Util::Subprocess.execute(r_path, *command.map(&:to_s))
+              result = Vagrant::Util::Subprocess.execute(r_path, *command)
               if result.exit_code != 0
+                if result.stdout.include?("operation was canceled") || result.stderr.include?("operation was canceled")
+                  raise_canceled_error!
+                end
+
                 raise Errors::VMExecError,
                   :executable => executable.to_s,
                   :command => command.inspect,
@@ -1347,7 +1386,6 @@ module HashiCorp
           end
         end
 
-
         # This performs common cleanup tasks on a cloned machine.
         def clone_cleanup(destination_vmx)
           destination = destination_vmx.parent
@@ -1375,6 +1413,45 @@ module HashiCorp
           destination_vmx
         end
 
+        # Attempts to extract cause of a vmware canceled operation
+        # by inspecting the vmware.log file for failure information.
+        # If found, an exception will be raised. Otherwise, nothing
+        # will be raised.
+        def raise_canceled_error!
+          vmware_log = @vm_dir.join("vmware.log")
+          return if !vmware_log.exist?
+          error_lines = []
+          found = false
+          File.open(vmware_log.to_s) do |file|
+            until file.eof?
+              line = file.readline.chomp
+              if found
+                break if line.include?("-----------------")
+                error_lines << line
+                next
+              end
+
+              if line.include?("Msg_Post: Error")
+                found = true
+              end
+            end
+          end
+
+          # If error content wasn't found, just return
+          return if !found
+
+          # If the size of the content is unreasonably large, just return
+          return if error_lines.size > 10
+
+          error_lines.map! do |line|
+            line.sub(/^.*? vmx \[.*?\] /, "")
+          end
+
+          raise Errors::VMCancelError,
+            error: error_lines.join("\n"),
+            vmware_log_path: vmware_log.to_s
+        end
+
         # Display warning message about allowlisted VMX ethernet settings
         def display_ethernet_allowlist_warning(vmx_key, vmx_val)
           if VMX_ETHERNET_ALLOWLIST_ENFORCE != :quiet

data/lib/vagrant-vmware-desktop/errors.rb

@@ -263,6 +263,10 @@ module HashiCorp
         error_key(:vmnet_no_ipv6)
       end
 
+      class VMCancelError < Base
+        error_key(:vmcancel_error)
+      end
+
       class VMExecError < Base
         error_key(:vmexec_error)
       end

data/lib/vagrant-vmware-desktop/guest_cap/linux/mount_vmware_shared_folder.rb

@@ -119,7 +119,7 @@ module HashiCorp
               current_mount_point = "#{VAGRANT_ROOT_MOUNT_POINT}/#{uid}-#{gid}"
               hgfs_mount_options = "allow_other,default_permissions,uid=#{uid},gid=#{gid}"
               hgfs_mount_options << ",#{options[:extra]}" if options[:extra]
-              hgfs_mount_options << ",#{options[:mount_options].join(',')}" if options[:mount_options]
+              hgfs_mount_options << ",#{Array(options[:mount_options]).join(',')}" if !Array(options[:mount_options]).empty?
               hgfs_mount = "vmhgfs-fuse -o #{hgfs_mount_options} .host:/ '#{current_mount_point}'"
 
               # Allow user to disable unmounting of default vmhgfs-fuse mount point at /mnt/hgfs

data/lib/vagrant-vmware-desktop/plugin.rb

@@ -99,26 +99,24 @@ module HashiCorp
           Cap::Provider
         end
 
-        Vagrant::Util::Experimental.guard_with(:disks) do
-          provider_capability(p_name, :set_default_disk_ext) do
-            require File.expand_path("../cap/disk", __FILE__)
-            Cap::Disk
-          end
-
-          provider_capability(p_name, :default_disk_exts) do
-            require File.expand_path("../cap/disk", __FILE__)
-            Cap::Disk
-          end
-
-          provider_capability(p_name, :configure_disks) do
-            require File.expand_path("../cap/disk", __FILE__)
-            Cap::Disk
-          end
-
-          provider_capability(p_name, :cleanup_disks) do
-            require File.expand_path("../cap/disk", __FILE__)
-            Cap::Disk
-          end
+        provider_capability(p_name, :set_default_disk_ext) do
+          require File.expand_path("../cap/disk", __FILE__)
+          Cap::Disk
+        end
+
+        provider_capability(p_name, :default_disk_exts) do
+          require File.expand_path("../cap/disk", __FILE__)
+          Cap::Disk
+        end
+
+        provider_capability(p_name, :configure_disks) do
+          require File.expand_path("../cap/disk", __FILE__)
+          Cap::Disk
+        end
+
+        provider_capability(p_name, :cleanup_disks) do
+          require File.expand_path("../cap/disk", __FILE__)
+          Cap::Disk
         end
       end
 

data/locales/en.yml

@@ -16,6 +16,9 @@ en:
         Configuring network adapters within the VM...
       destroying: |-
         Deleting the VM...
+      disk_not_growing_linked_primary: |-
+        Increasing the size of the primary disk is not allowed for linked
+        clones. Primary disk of the guest remains unchanged.
       disk_not_shrinking: |-
         Shrinking disks is not supported. Not shrinking disk %{path}
       discarding_suspended_state: |-
@@ -485,6 +488,15 @@ en:
           The VMware product does not support IPv6 in a robust way like other
           Vagrant providers. This is not a bug in Vagrant - the upstream
           provider does not provide robust support for IPv6.
+        vmcancel_error: |-
+          An error occurred causing VMware to cancel the current operation. Details
+          of the error causing the cancelation:
+
+          %{error}
+
+          The full log can be located at:
+
+          %{vmware_log_path}
         vmexec_error: |-
           An error occurred while executing `%{executable}`, a utility for controlling
           VMware machines. The command and output are below:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-desktop
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Vagrant Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to power VMware Workstation/Fusion machines.
 email: vagrant@hashicorp.com
@@ -95,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to power VMware Workstation/Fusion machines.