vagrant-vmware-desktop 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa4d46aabdc2dfaf78c6c69cf57c3fd2b447192b78495333a1f73e1190d3ddc
-  data.tar.gz: 9113eb7729d89bfaf3bb288f6fed490297d117ab20e196f0ea55b86c36f84211
+  metadata.gz: 9dd285ae1a9f79d6f50dd355d0c60754a313a78b37e3043da5ab92798a83d6d5
+  data.tar.gz: 9adb28da0c78efbd6b568354b576970cd4345674335525cd3018c3bc34299286
 SHA512:
-  metadata.gz: 061b173c5a4d767ec3e8c27144487e85f79b538fa6828443c3068564c1886d2ec750a5cfad57e8e397c41c08cc86a894092462f0e6b0443ff8d3dd5ec5d00b4b
-  data.tar.gz: 6e749f952549f49419af194a2e889d2c22861d254ea9cdefb0544c5450bb57f111e6f447a54427802815420875d923a4c5bebf6eb0c331dc42002eec8bac9f91
+  metadata.gz: 7ae03876f39b3d05f9aac2e1c1a6c1def94a8bb43a125c0352addb4883aa26efa1400d82066949c70bb781ab833cface015bd784a497e94c0f6256623f137a66
+  data.tar.gz: 66f3645377f66995c29354efb70876b8f78732ad530d8d6eaac1cdf4a02ce7d3a9e4d0d26f3e74e77ef41f899c3388c4909e21eef005698c942fbc2175b19cab

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

@@ -0,0 +1,72 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+module HashiCorp
+  module VagrantVMwareDesktop
+    module Action
+      # This inspects the Vagrantfile provided by the
+      # box (if one was provided) and checks if it
+      # set the `base_mac` value. If it did, a warning
+      # will be generated to the user.
+      #
+      # NOTE: This action is merely a "best effort" at
+      # providing the warning. It is using non-public
+      # Vagrant internals to inspect box Vagrantfile.
+      # As such, any errors encountered will be ignored
+      # with only a debug log.
+      class BaseMacConfigWarning
+        include Common
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("hashicorp::provider::vmware::basemacwarning")
+        end
+
+        def call(env)
+          catch(:complete) do
+            begin
+              # Attempt to extract the vagrantfile loader
+              loader = env[:machine].vagrantfile.instance_variable_get(:@loader)
+              if !loader
+                @logger.debug("base_mac check in box vagrantfile failed - cannot access loader")
+                throw :complete
+              end
+
+              # Attempt to get the Vagrantfile source for the box
+              # provided Vagrantfile
+              source = loader.instance_variable_get(:@sources)&.keys&.last
+              if !source
+                @logger.debug("base_mac check in box vagrantfile failed - cannot get box source")
+                throw :complete
+              end
+
+              begin
+                # Attempt to load the partial config
+                partial = loader.partial_load(source)
+
+                # Only proceed to display warning if the base_mac value
+                # in the partial load matches the base_mac in the final
+                # config
+                throw :complete if partial.vm.base_mac != env[:machine].config.vm.base_mac
+
+                # Display the warning message
+                env[:ui].warn(
+                  I18n.t(
+                    "hashicorp.vagrant_vmware_desktop.box_base_mac_warning",
+                    base_mac: env[:machine].config.vm.base_mac
+                  )
+                )
+              rescue KeyError => err
+                @logger.debug("base_mac check in box vagrantfile failed - partial load failure #{err.class}: #{err}")
+              end
+            rescue => err
+              @logger.debug("base_mac check in box vagrantfile failed - #{err.class}: #{err}")
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,7 @@ module HashiCorp
       include Vagrant::Action::Builtin
       include Vagrant::Action::General
 
+      autoload :BaseMacConfigWarning, "vagrant-vmware-desktop/action/base_mac_config_warning"
       autoload :BaseMacToIp, "vagrant-vmware-desktop/action/base_mac_to_ip"
       autoload :Boot, "vagrant-vmware-desktop/action/boot"
       autoload :CheckExistingNetwork, "vagrant-vmware-desktop/action/check_existing_network"
@@ -329,7 +330,7 @@ module HashiCorp
 
           b.use Call, Running do |env, b2|
             if env[:result]
-              b2.use MessageAlreadyRunning
+              b2.use action_provision
               next
             end
 
@@ -433,6 +434,8 @@ module HashiCorp
               b2.use SetDisplayName
             end
 
+            b2.use BaseMacConfigWarning
+
             b2.use action_start
           end
           b.use Checkpoint

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

@@ -17,7 +17,7 @@ module HashiCorp
         DEFAULT_DVD_BUS = "ide".freeze
         DEFAULT_DVD_DEVICE_TYPE = "cdrom-image"
         # Adapter types (from vmware-vdiskmanager -h)
-        DISK_ADAPTER_TYPES = ["ide", "buslogic", "lsilogic"].map(&:freeze).freeze
+        DISK_ADAPTER_TYPES = ["ide", "buslogic", "lsilogic", "pvscsi"].map(&:freeze).freeze
         DEFAULT_ADAPTER_TYPE = "lsilogic".freeze
         # Disk types (from vmware-vdiskmanager -h)
         # 0 : single growable virtual disk
@@ -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_SLOTS = ["scsi0:0", "sata0:0", "ide0:0"].map(&:freeze).freeze
+        PRIMARY_DISK_SLOTS = ["nvme0:0", "scsi0:0", "sata0:0", "ide0:0"].map(&:freeze).freeze
 
         def self.set_default_disk_ext(machine)
           DEFAULT_DISK_EXT
@@ -114,9 +114,13 @@ module HashiCorp
           if disk.primary
             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"
+              if disk_info
+                @@logger.debug("disk info for primary slot #{primary_slot} - #{disk_info}")
+                return disk_info if disk_info["present"].to_s.upcase == "TRUE"
+              end
             end
+
+            nil
           else
             if disk.type == :dvd
               all_disks.values.detect { |v| v["filename"] == disk.file }
@@ -142,6 +146,8 @@ module HashiCorp
           current_disk = get_disk(disk, attached_disks)
 
           if current_disk.nil?
+            raise Errors::DiskPrimaryMissing if disk.primary
+
             disk_path = create_disk(machine, disk, attached_disks)
           else
             # If the path matches the disk name + some extra characters then
@@ -184,9 +190,9 @@ module HashiCorp
           if disk.provider_config && disk.provider_config.key?(:vmware_desktop)
             disk_provider_config = disk.provider_config[:vmware_desktop]
             if !BUS_TYPES.include?(disk_provider_config[:bus_type])
+              @@logger.warn("#{disk_provider_config[:bus_type]} is not valid. Should be one of " \
+                "#{BUS_TYPES.join(', ')}. Setting bus type to #{DEFAULT_DVD_BUS}")
               disk_provider_config[:bus_type] = DEFAULT_DVD_BUS
-              @@logger.warn("#{disk_provider_config[:bus_type]} is not a valid. Should be one of " \
-                "#{BUS_TYPES.join(', ')}! Setting adapter type to #{DEFAULT_DVD_BUS}")
             end
           end
 
@@ -213,18 +219,18 @@ module HashiCorp
             # Create a new disk if a file is not provided, or that path does not exist
             disk_filename = "#{disk_config.name}.#{disk_config.disk_ext}"
             disk_provider_config = {}
-
             if disk_config.provider_config && disk_config.provider_config.key?(:vmware_desktop)
               disk_provider_config = disk_config.provider_config[:vmware_desktop]
+
               if !DISK_ADAPTER_TYPES.include?(disk_provider_config[:adapter_type])
+                @@logger.warn("#{disk_provider_config[:adapter_type]} is not valid. Should be one " \
+                  "of #{DISK_ADAPTER_TYPES.join(', ')}. Setting adapter type to #{DEFAULT_ADAPTER_TYPE}")
                 disk_provider_config[:adapter_type] = DEFAULT_ADAPTER_TYPE
-                @@logger.warn("#{disk_provider_config[:adapter_type]} is not a valid. Should be one " \
-                  "of #{DISK_ADAPTER_TYPES.join(', ')}! Setting adapter type to #{DEFAULT_ADAPTER_TYPE}")
               end
               if !BUS_TYPES.include?(disk_provider_config[:bus_type])
+                @@logger.warn("#{disk_provider_config[:bus_type]} is not valid. Should be one of " \
+                  "#{BUS_TYPES.join(', ')}. Setting bus type to #{DEFAULT_BUS}")
                 disk_provider_config[:bus_type] = DEFAULT_BUS
-                @@logger.warn("#{disk_provider_config[:bus_type]} is not a valid. Should be one of " \
-                  "#{BUS_TYPES.join(', ')}! Setting adapter type to #{DEFAULT_BUS}")
               end
             end
             disk_type = DEFAULT_DISK_TYPE

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

@@ -0,0 +1,12 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+module HashiCorp
+  module VagrantVMwareDesktop
+    module Cap
+      autoload :Disk, "vagrant-vmware-desktop/cap/disk"
+      autoload :Provider, "vagrant-vmware-desktop/cap/provider"
+      autoload :Snapshot, "vagrant-vmware-desktop/cap/snapshot"
+    end
+  end
+end

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

@@ -33,6 +33,10 @@ module HashiCorp
         # Number of bytes in disk sector
         SECTOR_TO_BYTES = 512.freeze
 
+        # Number of seconds to allow the vmrun start command
+        # to complete
+        VMRUN_START_TIMEOUT = 300.freeze
+
         # Vagrant utility version requirement which must be satisfied to properly
         # work with this version of the plugin. This should be used when new API
         # end points are added to the utility to ensure expected functionality.
@@ -944,10 +948,10 @@ module HashiCorp
         # This will start the VMware machine.
         def start(gui=false)
           gui_arg = gui ? "gui" : "nogui"
-          vmrun("start", host_vmx_path, gui_arg, retryable: true, timeout: 45)
+          vmrun("start", host_vmx_path, gui_arg, retryable: true, timeout: VMRUN_START_TIMEOUT)
         rescue Vagrant::Util::Subprocess::TimeoutExceeded
           # Sometimes vmrun just hangs. We give it a generous timeout
-          # of 45 seconds, and then throw this.
+          # and then throw this.
           raise Errors::StartTimeout
         end
 

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

@@ -1,13 +1,11 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-require "vagrant/util/platform"
-
-require "vagrant-vmware-desktop/driver/base"
-
 module HashiCorp
   module VagrantVMwareDesktop
     module Driver
+      autoload :Base, "vagrant-vmware-desktop/driver/base"
+
       # This returns a new driver for the given VM directory, using the
       # proper underlying platform driver.
       def self.create(vm_dir, config)

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

@@ -47,6 +47,10 @@ module HashiCorp
         error_key(:disk_not_resized_snapshot)
       end
 
+      class DiskPrimaryMissing < Base
+        error_key(:disk_primary_missing)
+      end
+
       class MissingNATDevice < Base
         error_key(:missing_nat_device)
       end

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

@@ -0,0 +1,13 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+module HashiCorp
+  module VagrantVMwareDesktop
+    module GuestCap
+      module Linux
+        autoload :VerifyVMwareHGFS, "vagrant-vmware-desktop/guest_cap/linux/verify_vmware_hgfs"
+        autoload :MountVMwareSharedFolder, "vagrant-vmware-desktop/guest_cap/linux/mount_vmware_shared_folder"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+module HashiCorp
+  module VagrantVMwareDesktop
+    module GuestCap
+      autoload :Linux, "vagrant-vmware-desktop/guest_cap/linux"
+    end
+  end
+end

data/lib/vagrant-vmware-desktop/helper/vagrant_utility.rb

@@ -179,6 +179,7 @@ module HashiCorp
           rescue Net::HTTPServiceUnavailable
             raise Errors::DriverAPIConnectionFailed
           rescue => err
+            @logger.debug("unexpected error - #{err.class}: #{err}")
             raise Errors::DriverAPIRequestUnexpectedError, error: err
           end
         end

data/lib/vagrant-vmware-desktop.rb

@@ -19,11 +19,15 @@ module HashiCorp
       "vagrant-vmware-workstation"
     ].map(&:freeze).freeze
 
-    lib_path = Pathname.new(File.expand_path("../vagrant-vmware-desktop", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Driver, lib_path.join("driver")
-    autoload :Errors, lib_path.join("errors")
-    autoload :SudoHelper, lib_path.join("sudo_helper")
+    autoload :Action, "vagrant-vmware-desktop/action"
+    autoload :Cap, "vagrant-vmware-desktop/cap"
+    autoload :CheckpointClient, "vagrant-vmware-desktop/checkpoint_client"
+    autoload :Config, "vagrant-vmware-desktop/config"
+    autoload :Driver, "vagrant-vmware-desktop/driver"
+    autoload :Errors, "vagrant-vmware-desktop/errors"
+    autoload :Provider, "vagrant-vmware-desktop/provider"
+    autoload :SetupPlugin, "vagrant-vmware-desktop/setup_plugin"
+    autoload :SyncedFolder, "vagrant-vmware-desktop/synced_folder"
 
     # This initializes the i18n load path so that the plugin-specific
     # translations work.

data/locales/en.yml

@@ -4,6 +4,20 @@
 en:
   hashicorp:
     vagrant_vmware_desktop:
+      box_base_mac_warning: |-
+        Detected guest `base_mac` value set within the Vagrantfile
+        included with this box. Having the `base_mac` value set
+        for VMware guests may cause issues properly identifying
+        the guest IP address due to MAC collisions.
+
+          Current value: %{base_mac}
+
+        To disable the `base_mac` value so it will be randomly
+        generated, set the value to nil in the Vagrantfile:
+
+          config.vm.base_mac = nil
+
+        https://www.vagrantup.com/docs/vagrantfile/machine_settings#config-vm-base_mac
       already_running: |-
         Machine is already running.
       booted_and_ready: |-
@@ -192,6 +206,8 @@ en:
           disk please remove snapshots associated with the VM.
 
           Path: %{path}
+        disk_primary_missing: |-
+          Failed to locate the primary disk for the guest.
         destroy_invalid_state: |-
           The VMware machine cannot be destroyed beacuse it is still
           running. Please make sure the machine is properly halted before
@@ -609,6 +625,8 @@ en:
           again. If this error persists, please open a new issue at:
 
             https://github.com/hashicorp/vagrant-vmware-desktop/issues
+
+          Encountered error: %{error}
         driver_api_invalid_response: |-
           Vagrant failed to properly process a result from the Vagrant VMware
           Utility driver. Please try to run the command again. If this error

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-desktop
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Vagrant Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
-dependencies: []
+date: 2025-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
 description: Enables Vagrant to power VMware Workstation/Fusion machines.
 email: vagrant@hashicorp.com
 executables: []
@@ -18,6 +74,7 @@ extra_rdoc_files: []
 files:
 - lib/vagrant-vmware-desktop.rb
 - lib/vagrant-vmware-desktop/action.rb
+- lib/vagrant-vmware-desktop/action/base_mac_config_warning.rb
 - lib/vagrant-vmware-desktop/action/base_mac_to_ip.rb
 - lib/vagrant-vmware-desktop/action/boot.rb
 - lib/vagrant-vmware-desktop/action/check_existing_network.rb
@@ -57,6 +114,7 @@ files:
 - lib/vagrant-vmware-desktop/action/wait_for_address.rb
 - lib/vagrant-vmware-desktop/action/wait_for_communicator_compat.rb
 - lib/vagrant-vmware-desktop/action/wait_for_vmx_halt.rb
+- lib/vagrant-vmware-desktop/cap.rb
 - lib/vagrant-vmware-desktop/cap/disk.rb
 - lib/vagrant-vmware-desktop/cap/provider.rb
 - lib/vagrant-vmware-desktop/cap/snapshot.rb
@@ -66,6 +124,8 @@ files:
 - lib/vagrant-vmware-desktop/driver.rb
 - lib/vagrant-vmware-desktop/driver/base.rb
 - lib/vagrant-vmware-desktop/errors.rb
+- lib/vagrant-vmware-desktop/guest_cap.rb
+- lib/vagrant-vmware-desktop/guest_cap/linux.rb
 - lib/vagrant-vmware-desktop/guest_cap/linux/mount_vmware_shared_folder.rb
 - lib/vagrant-vmware-desktop/guest_cap/linux/verify_vmware_hgfs.rb
 - lib/vagrant-vmware-desktop/helper/lock.rb
@@ -80,7 +140,19 @@ homepage: http://www.vagrantup.com
 licenses:
 - MPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message: |
+  Thank you for installing the Vagrant VMware Desktop
+  plugin. This plugin requires the Vagrant VMware
+  Utility to be installed. To learn more about the
+  Vagrant VMware Utility, please visit:
+
+    https://www.vagrantup.com/docs/providers/vmware/vagrant-vmware-utility
+
+  To install the Vagrant VMware Utility, please
+  download the appropriate installer for your
+  system from:
+
+    https://www.vagrantup.com/downloads/vmware
 rdoc_options: []
 require_paths:
 - lib