vagrant-parallels 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc3b37f94bef78ed214b98add9ae9814d6cad49650e5016fce26c7b7641eaaa
-  data.tar.gz: 0e1ffee3b192374a3acc9b36438334605702e7c5b472d1e47857a31acd5c7196
+  metadata.gz: 340fd7bc7a4c4903ee2f67a21435abbd27d0fd3ae531e6e2f45b78d6d40749c6
+  data.tar.gz: ec86770f0a873be4d766e53df5a2ebbae3982924be8ee7974107cdd763a7da55
 SHA512:
-  metadata.gz: f03a6bc1a95f28f95a736d3ce59dc52edb00bd609780e24ef26b38090ef32421ef8db5f362cd9692954aa88292e18af89cd884ea423f9a244d5932cdfff1749d
-  data.tar.gz: 86467aba98c5870183d5da52a0b688ca28f5f06eb5160d983ea26d80a582a20108958e0b54c2c4ee14adb8f3740608ffeaf4f84debdbafb614a79da75c9f8e5b
+  metadata.gz: fa1430cfa50873ac14648f6d1c8269812850be959ada747366a669ca7003fbde48460b4e145ef4d193cbfe6ef47cff52bf0db20ea05b2a4fc768e914f9e1cbdc
+  data.tar.gz: '07178f61772a66d419117fa8bbabf953aa4d82b76e47952bba691d6b9ef38ceea92561314df94b3f13dd9712a701a2feb5480b80604785e048650be75ae212b9'

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## 2.3.0 (March 22, 2022)
+## 2.4.0 (May 22, 2023)
+IMPROVEMENTS:
+  - Implement shared folder support for `.macvm` VMs
+  [[GH-448](https://github.com/Parallels/vagrant-parallels/pull/448)]
+
+BUG FIXES:
+  - Fix shared folder mount error on `.macvm` VMs
+  [[GH-445](https://github.com/Parallels/vagrant-parallels/pull/445)]
+
+## 2.3.1 (March 23, 2023)
+BUG FIXES:
+  - Fix the detection of VM IP. Wait for the IP to become available to
+  avoid connection issues and Vagrant warnings.
+  [[GH-440](https://github.com/Parallels/vagrant-parallels/issues/440)]
+
+## 2.3.0 (March 22, 2023)
 IMPROVEMENTS:
   - Support fetching the VM IP using prlctl
   [[GH-434](https://github.com/Parallels/vagrant-parallels/pull/434)].

data/lib/vagrant-parallels/action/import.rb

@@ -4,7 +4,6 @@ module VagrantPlugins
   module Parallels
     module Action
       class Import
-        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -26,7 +25,7 @@ module VagrantPlugins
 
           # Linked clones are supported only for PD 11 and higher
           # Linked clones are not supported in macvms
-          if env[:machine].provider_config.linked_clone and !is_macvm(env)
+          if env[:machine].provider_config.linked_clone and !Util::Common::is_macvm(env[:machine])
             # Linked clone creation should not be concurrent [GH-206]
             options[:snapshot_id] = env[:clone_snapshot_id]
             options[:linked] = true

data/lib/vagrant-parallels/action/prepare_clone_snapshot.rb

@@ -6,7 +6,6 @@ module VagrantPlugins
   module Parallels
     module Action
       class PrepareCloneSnapshot
-        include VagrantPlugins::Parallels::Util::Common
         @@lock = Mutex.new
 
         def initialize(app, env)
@@ -20,7 +19,7 @@ module VagrantPlugins
             return @app.call(env)
           end
 
-          if is_macvm(env)
+          if Util::Common::is_macvm(env[:machine])
             #Ignore, since macvms doesn't support snapshot creation
             @logger.info('Snapshot creation is not supported yet for macOS ARM Guests, skip snapshot preparing')
             return @app.call(env)

data/lib/vagrant-parallels/action/sane_defaults.rb

@@ -4,7 +4,6 @@ module VagrantPlugins
   module Parallels
     module Action
       class SaneDefaults
-        include VagrantPlugins::Parallels::Util::Common
 
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_parallels::action::sanedefaults')
@@ -30,7 +29,7 @@ module VagrantPlugins
 
         def default_settings
           # Options defined below are not supported for `*.macvm` VMs
-          return {} if is_macvm(@env)
+          return {} if Util::Common::is_macvm(@env[:machine])
 
           {
             tools_autoupdate: 'no',

data/lib/vagrant-parallels/driver/base.rb

@@ -406,6 +406,7 @@ module VagrantPlugins
         # Returns an IP of the virtual machine fetched from the DHCP lease file.
         # It requires that Shared network adapter is configured for this VM
         # and it obtains an IP via DHCP.
+        # Returns an empty string if the IP coudn't be determined this way.
         #
         # @return [String] IP address leased by DHCP server in "Shared" network
         def read_guest_ip_dhcp
@@ -432,12 +433,13 @@ module VagrantPlugins
         end
 
         # Returns an IP of the virtual machine fetched from prlctl.
+        # Returns an empty string if the IP coudn't be determined this way.
         #
         # @return [String] IP address returned by `prlctl list -f` command
         def read_guest_ip_prlctl
           vm_info = json { execute_prlctl('list', @uuid, '--full', '--json') }
-          ip = vm_info.first.fetch('ip_configured', nil)
-          ip == '-' ? nil : ip
+          ip = vm_info.first.fetch('ip_configured', '')
+          ip == '-' ? '' : ip
         end
 
         # Returns path to the Parallels Tools ISO file.
@@ -768,13 +770,25 @@ module VagrantPlugins
         end
 
         # Reads the SSH IP of this VM from DHCP lease file or from `prlctl list`
-        # command - whatever returns a non-empty result.
+        # command - whatever returns a non-empty result first.
         # The method with DHCP does not work for *.macvm VMs on Apple M-series Macs,
         # so we try both sources here.
         #
         # @return [String] IP address to use for SSH connection to the VM.
         def ssh_ip
-          read_guest_ip_dhcp || read_guest_ip_prlctl
+          5.times do
+            ip = read_guest_ip_dhcp
+            return ip unless ip.empty?
+
+            ip = read_guest_ip_prlctl
+            return ip unless ip.empty?
+
+            sleep 2
+          end
+
+          # We didn't manage to determine IP - return nil and
+          # expect SSH client to do a retry
+          return nil
         end
 
         # Reads the SSH port of this VM.

data/lib/vagrant-parallels/plugin.rb

@@ -103,6 +103,16 @@ module VagrantPlugins
         SyncedFolder
       end
 
+      synced_folder(:parallels_macvm) do
+        require_relative 'synced_folder_macvm'
+        SyncedFolderMacVM
+      end
+
+      synced_folder_capability(:parallels_macvm, "mount_name") do
+        require_relative "cap/mount_options"
+        SyncedFolderCap::MountOptions
+      end
+
       synced_folder_capability(:parallels, "mount_name") do
         require_relative "cap/mount_options"
         SyncedFolderCap::MountOptions

data/lib/vagrant-parallels/synced_folder.rb

@@ -4,9 +4,10 @@ module VagrantPlugins
   module Parallels
     class SyncedFolder < Vagrant.plugin('2', :synced_folder)
       def usable?(machine, raise_errors=false)
-        # These synced folders only work if the provider is Parallels
+        # These synced folders only work if the provider is Parallels and the guest is not *.macvm
         machine.provider_name == :parallels &&
-          machine.provider_config.functional_psf
+          machine.provider_config.functional_psf &&
+          !Util::Common::is_macvm(machine)
       end
 
       def prepare(machine, folders, _opts)

data/lib/vagrant-parallels/synced_folder_macvm.rb

@@ -0,0 +1,50 @@
+require 'vagrant/util/platform'
+
+module VagrantPlugins
+  module Parallels
+    class SyncedFolderMacVM < Vagrant.plugin('2', :synced_folder)
+      def usable?(machine, raise_errors=false)
+        # These synced folders only work if the provider is Parallels and the guest is *.macvm
+        machine.provider_name == :parallels && Util::Common::is_macvm(machine)
+      end
+
+      def prepare(machine, folders, _opts)
+        # Setup shared folder definitions in the VM config.
+        defs = []
+        folders.each do |id, data|
+          hostpath = data[:hostpath]
+          if !data[:hostpath_exact]
+            hostpath = Vagrant::Util::Platform.cygwin_windows_path(hostpath)
+          end
+
+          defs << {
+            name: data[:plugin].capability(:mount_name, id, data),
+            hostpath: hostpath.to_s,
+          }
+        end
+
+        driver(machine).share_folders(defs)
+      end
+
+      def enable(machine, folders, _opts)
+        # TBD: Synced folders for *.macvm are not implemented yet
+        return
+      end
+
+      def disable(machine, folders, _opts)
+        # Remove the shared folders from the VM metadata
+        names = folders.map { |id, data| data[:plugin].capability(:mount_name, id, data) }
+        driver(machine).unshare_folders(names)
+      end
+
+      def cleanup(machine, opts)
+        driver(machine).clear_shared_folders if machine.id && machine.id != ''
+      end
+
+      # This is here so that we can stub it for tests
+      def driver(machine)
+        machine.provider.driver
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/util/common.rb

@@ -5,8 +5,8 @@ module VagrantPlugins
 
         # Determines whether the VM's box contains a macOS guest for an Apple Silicon host.
         # In this case the image file ends with '.macvm' instead of '.pvm'
-        def is_macvm(env)
-          return !!Dir.glob(env[:machine].box.directory.join('*.macvm')).first
+        def self.is_macvm(machine)
+          return !!Dir.glob(machine.box.directory.join('*.macvm')).first
         end
 
       end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.3.0'
+    VERSION = '2.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -142,6 +142,7 @@ files:
 - lib/vagrant-parallels/plugin.rb
 - lib/vagrant-parallels/provider.rb
 - lib/vagrant-parallels/synced_folder.rb
+- lib/vagrant-parallels/synced_folder_macvm.rb
 - lib/vagrant-parallels/util/common.rb
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
 - lib/vagrant-parallels/util/unix_mount_helpers.rb