vagrant-vmware-desktop 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdcfbbb304726e177ac071a8842c567ca35ebac76acb944b8b787b4a3c8b95d6
-  data.tar.gz: b871eaf2ccfdf8fb33384feb5c050e8b4e45daf61557158af7c23f7b57b9bf80
+  metadata.gz: ba545200e0b56b039bbb5f2e562b6b95bc0101cfdfc2b1b8bb7112c03d4bc163
+  data.tar.gz: 2f06179843c86955a7eb81170090daa184b2fb54aedf96bd13c408366fd2c819
 SHA512:
-  metadata.gz: 6efa97edc063503dfa6d858160a23d57e0ff73f66cf4f09b9bc16027b9f2fc1000c41536ab9dd16c24e69b417cc9d17c1fec26d6dec6e3ecb37e94af701c64c7
-  data.tar.gz: ae05d94217266dedfb30bdbc392c05ec67a97f1604c17c51810b2cc8df1ae71af1b2e39246b9dcb41373826147b4ef2b286d8d28c4ad00d111ab7ecff588e6b8
+  metadata.gz: b3c33c80806c0519d5f104456efe882e2d8d81d3392b1c36b9e3c23d4bd3344779a629c0f03e3654406af12ac7e9db0d00803253e7d2f4373bd63e8c493811a0
+  data.tar.gz: 3118c1fad9e990dd7fc81d0ebf2f7be35c5ac8dd1afe6e550c060488495e71d820b4a916a56ca2235e468e76f8d07444c6200015109bb5af157cd9270140072f

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 require "ipaddr"
 

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 require "vagrant-vmware-desktop/helper/lock"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "json"
 require "set"
 

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "pathname"
 require "securerandom"
 

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant/action/builtin/lock"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "set"
 
 require "log4r"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require 'vagrant/util/template_renderer'
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 require "vagrant-vmware-desktop/helper/lock"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 require "vagrant/util/scoped_hash_override"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Action

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "pathname"
 
 require "vagrant/action/builder"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant/util/experimental"
 require "vagrant/util/numeric"
 

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "json"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Cap

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 require "singleton"
 require "vagrant-vmware-desktop/config"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant"
 require "ipaddr"
 

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     version_text_path = File.expand_path(File.join(__dir__, "../../versions/desktop.txt"))

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "fileutils"
 require "ipaddr"
 require "pathname"
@@ -18,9 +21,16 @@ module HashiCorp
       # some shared common helpers.
       class Base
 
+        SOURCE_VMXPATH_FILE_NAME = "source-vmx"
+        SOURCE_SNAPSHOT_FILE_NAME = "source-snapshot"
+
         # Default NAT device when detection is unavailable
         DEFAULT_NAT_DEVICE = "vmnet8".freeze
 
+        # Default NIC device when setting up network
+        DEFAULT_NIC_DEVICE="e1000e".freeze
+
+        # Number of bytes in disk sector
         SECTOR_TO_BYTES = 512.freeze
 
         # Vagrant utility version requirement which must be satisfied to properly
@@ -170,6 +180,29 @@ module HashiCorp
           end
         end
 
+        # Product type value used by vmrun based on platform and license
+        #
+        # @return [String] fusion, ws, or player
+        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
+
+          case @product_name.downcase
+          when "workstation"
+            @product_type = "ws"
+          when "fusion"
+            @product_type = "fusion"
+          else
+            @product_type = "player"
+          end
+
+          @product_type
+        end
+
         # @return [Boolean] using standard license
         def standard?
           !professional?
@@ -237,6 +270,13 @@ module HashiCorp
             h_port = fwd[:port]
             f_proto = fwd[:protocol].downcase.to_sym
             result[g_ip] ||= {:tcp => {}, :udp => {}}
+            if f_proto != :tcp && f_proto != :udp
+              raise Errors::PortForwardInvalidProtocol,
+                guest_ip: g_ip,
+                guest_port: g_port,
+                host_port: h_port,
+                protocol: f_proto
+            end
             result[g_ip][f_proto][g_port] = h_port
           end
           if ip
@@ -305,14 +345,24 @@ module HashiCorp
             linked = false
           end
 
+          # Sanity test
+          if !destination.directory?
+            raise Errors::CloneFolderNotFolder, path: destination.to_s
+          end
+
           if linked
             @logger.info("Cloning machine using VMware linked clones.")
             # The filename of the resulting VMX
             destination_vmx = destination.join(source_vmx.basename)
 
             begin
+              snap_name = destination.basename
+              vmrun("snapshot", host_path(source_vmx), snap_name)
               # Do a linked clone!
-              vmrun("clone", host_path(source_vmx), host_path(destination_vmx), "linked")
+              vmrun("clone", host_path(source_vmx), host_path(destination_vmx), "linked", "-snapshot=#{snap_name}")
+              # store the snapshot name
+              File.write(destination.join(SOURCE_SNAPSHOT_FILE_NAME).to_s, snap_name)
+              File.write(destination.join(SOURCE_VMXPATH_FILE_NAME).to_s, source_vmx.to_s)
               # Common cleanup
             rescue Errors::VMRunError => e
               # Check if this version of VMware doesn't support linked clones
@@ -329,10 +379,6 @@ module HashiCorp
 
           if !destination_vmx
             @logger.info("Cloning machine using direct copy.")
-            # Sanity test
-            if !destination.directory?
-              raise Errors::CloneFolderNotFolder, path: destination.to_s
-            end
 
             # Just copy over the files within the folder of the source
             @logger.info("Cloning VM to #{destination}")
@@ -398,7 +444,26 @@ module HashiCorp
         # This deletes the VM.
         def delete
           @logger.info("Deleting VM: #{@vm_dir}")
-          @vm_dir.rmtree
+          begin
+            snap_file = @vmx_path.parent.join(SOURCE_SNAPSHOT_FILE_NAME)
+            source_vmx_file = @vmx_path.parent.join(SOURCE_VMXPATH_FILE_NAME)
+            if snap_file.exist? && source_vmx_file.exist?
+              source_vmx = File.read(source_vmx_file.to_s)
+              snap_name = File.read(snap_file.to_s)
+              @logger.info("source snapshot name found, deleting snapshot (#{snap_name})")
+              begin
+                vmrun("deleteSnapshot", source_vmx, snap_name, "andDeleteChildren")
+              rescue Errors::VMRunError => err
+                # If we failed to remove the source snapshot, just log it and move on
+                @logger.warn("failed to remove source clone snapshot '#{snap_name}': #{err}")
+              end
+            else
+              @logger.debug("source snapshot information not found, ignoring")
+            end
+            @vm_dir.rmtree
+          rescue Errno::ENOTEMPTY
+            FileUtils.rm_rf(@vm_dir.to_s)
+          end
         end
 
         # This discards the suspended state of the machine.
@@ -781,7 +846,7 @@ module HashiCorp
 
               vmx["#{key}.present"] = "TRUE"
               vmx["#{key}.connectiontype"] = adapter[:type].to_s
-              vmx["#{key}.virtualdev"] = "e1000"
+              vmx["#{key}.virtualdev"] = DEFAULT_NIC_DEVICE
 
               if adapter[:mac_address]
                 vmx["#{key}.addresstype"] = "static"
@@ -835,12 +900,28 @@ module HashiCorp
 
         def snapshot_tree
           snapshots = []
+          snap_level = 0
           vmrun("listSnapshots", host_vmx_path, "showTree").stdout.split("\n").each do |line|
             if !line.include?("Total snapshot")
               # if the line starts with white space then it is a child
               # of the previous line
               if line.start_with?(/\s/)
-                name = "#{snapshots.last}/#{line.gsub(/\s/, "")}"
+                current_level = line.count("\t")
+                if current_level > snap_level
+                  name = "#{snapshots.last}/#{line.gsub(/\s/, "")}"
+                elsif current_level == snap_level
+                  path = snapshots.last.split("/")
+                  path.pop
+                  path << line.gsub(/\s/, "")
+                  name = path.join("/")
+                else
+                  path = snapshots.last.split("/")
+                  diff = snap_level - current_level
+                  (0..diff).to_a.each { |i| path.pop }
+                  path << line.gsub(/\s/, "")
+                  name = path.join("/")
+                end
+                snap_level = current_level
                 snapshots << name
               else
                 snapshots << line
@@ -886,7 +967,7 @@ module HashiCorp
 
         # This is called to do any message suppression if we need to.
         def suppress_messages
-          if PRODUCT_NAME == "fusion"
+          if @product_name.downcase == "fusion"
             contents = <<-DATA
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -1183,7 +1264,7 @@ module HashiCorp
               if VagrantVMwareDesktop.wsl?
                 r_path = VagrantVMwareDesktop.windows_to_wsl_path(r_path)
               end
-              result = Vagrant::Util::Subprocess.execute(r_path, *command)
+              result = Vagrant::Util::Subprocess.execute(r_path, *command.map(&:to_s))
               if result.exit_code != 0
                 raise Errors::VMExecError,
                   :executable => executable.to_s,
@@ -1204,7 +1285,8 @@ module HashiCorp
         # This executes the "vmrun" command with the given arguments.
         def vmrun(*command)
           begin
-            vmexec(@vmrun_path, *command)
+            cmd = ["-T", product_type] + command
+            vmexec(@vmrun_path, *cmd)
           rescue Errors::VMExecError => e
             raise Errors::VMRunError,
               :command => e.extra_data[:command],

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant/util/platform"
 
 require "vagrant-vmware-desktop/driver/base"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant"
 
 module HashiCorp
@@ -206,6 +209,10 @@ module HashiCorp
         error_key(:package_not_supported)
       end
 
+      class PortForwardInvalidProtocol < Base
+        error_key(:port_forward_invalid_protocol)
+      end
+
       class RoutingTableError < Base; end
 
       class RoutingTableCommandNotFound < RoutingTableError

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module GuestCap

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module GuestCap

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     module Helper

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "ipaddr"
 
 require "vagrant/util/platform"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 require "net/http"
 require "net/https"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 begin
   require "vagrant"
 rescue LoadError

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "log4r"
 require "thread"
 require "vagrant"

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "vagrant-vmware-desktop/checkpoint_client"
 
 module HashiCorp

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

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 module HashiCorp
   module VagrantVMwareDesktop
     class SyncedFolder < Vagrant.plugin("2", :synced_folder)
@@ -54,7 +57,7 @@ module HashiCorp
         machine.ui.info I18n.t("hashicorp.vagrant_vmware_desktop.sharing_folders")
         machine.provider.driver.enable_shared_folders
         shared_folders.each do |id, data|
-          id        = id.gsub('/', machine.provider_config.shared_folder_special_char)
+          id        = id.gsub(%r{[:\\/]}, machine.provider_config.shared_folder_special_char)
           path      = data[:hostpath]
           guestpath = data[:guestpath]
 

data/lib/vagrant-vmware-desktop.rb

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 require "rbconfig"
 require "pathname"
 require "fileutils"

data/locales/en.yml

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 en:
   hashicorp:
     vagrant_vmware_desktop:
@@ -163,7 +166,9 @@ en:
           to occur across several attempts, it may indicate a problem with the
           base box being used. If this error occurs across multiple boxes, it
           may indicate a VMware configuration problem. Persistent problems can
-          be reported to support@hashicorp.com.
+          be reported to:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
         clone_folder_exists: |-
           The clone folder that Vagrant is attempting to use to import
           the VMware box has existed repeatedly 10 times while generating
@@ -172,7 +177,9 @@ en:
           to your system.
         clone_folder_not_folder: |-
           The clone directory given is not a directory. This is an internal
-          error and should be reported as a bug to support@hashicorp.com.
+          error and should be reported as a bug to:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
 
           Path: %{path}
         disk_not_created: Disk %{name} not created!
@@ -383,6 +390,20 @@ en:
           The "package" command is not supported with VMware. We recommend
           taking a look at Packer (www.packer.io) as an option for creating
           VMware images.
+        port_forward_invalid_protocol: |-
+          An invalid protocol type has been provided for a port forward
+          configuration. Vagrant supports port forwarding protocols values:
+
+            * udp
+            * tcp
+
+          Please update your port forward configuration and run the command
+          again. Below is the invalid port forward entry:
+
+            Guest IP:   %{guest_ip}
+            Guest Port: %{guest_port}
+            Host Port:  %{host_port}
+            Protocol:   %{protocol}
         routing_table_command_not_found: |-
           The external program used to read TCP/IP routing tables in order
           to protect you against creating network collisions could not be
@@ -522,7 +543,9 @@ en:
           service key file. This error can occur if the Vagrant VMware Utility
           has not yet been installed, or if it was installed incorrectly. If
           this error persists after running the Vagrant VMware Utility installer
-          again, please contact support at: support@hashicorp.com
+          again, please open a new issue at:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
 
           Information about the Vagrant VMware Utility, including installation
           instruction, can be found here:
@@ -536,7 +559,9 @@ en:
           service key file. This error can occur if the Vagrant VMware Utility
           has not yet been installed, or if it was installed incorrectly. If
           this error persists after running the Vagrant VMware Utility installer
-          again, please contact support at: support@hashicorp.com
+          again, please open a new issue at:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
 
           Information about the Vagrant VMware Utility, including installation
           instruction, can be found here:
@@ -569,11 +594,15 @@ en:
         driver_api_request_unexpected_error: |-
           Vagrant encountered an unexpected communications error with the
           Vagrant VMware Utility driver. Please try to run the command
-          again. If this error persists, please contact support@hashicorp.com
+          again. If this error persists, please open a new issue at:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
         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
-          persists, please contact support@hashicorp.com
+          persists, please open a new issue at:
+
+            https://github.com/hashicorp/vagrant-vmware-desktop/issues
         driver_api_port_forward_list_error: |-
           Failed to receive list of currently used VMware port forwards. The
           reported cause for the error:
@@ -627,8 +656,7 @@ en:
             Device:  %{device}
             MAC:     %{mac}
             Reason:  %{message}
-      disks: 
+      disks:
         cap:
           disks:
             floppy_not_supported: "Floppy disk configuration not yet supported. Skipping disk '%{name}'..."
-

metadata

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