vagrant-unbundled 2.2.10.0 → 2.2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d625edeb97ba13f5f08f17901d1bc642034e6742e3a790c7392487d8b65548d1
-  data.tar.gz: 7b1c09badb49f546e1d13db200840007ed671428f55b702591daed6a23fb512a
+  metadata.gz: 66676a3a6dbd082059b30ec7f0e605c435d33bc9854a2db0184457ba735939b0
+  data.tar.gz: 742ad824c94d7329205e98578cb6fcd4c6c756919e09966c9a83ea23a13fd32f
 SHA512:
-  metadata.gz: 01e2904251bdfc815bf1dd5a6272c2b84a99225842d8ec2a761296af1479ab3fa112ad4c52460604296299471cc28c1a01cfcf237cc13a04867342feb4dc135f
-  data.tar.gz: f1a8ab0331ca605242690523fd479b292ec43a34719fa787e8617fb3a3bd7512824e468b72e32e9b5b89f48867b15e68a9556c52d4c6beb3fbf291ae9d7bb9bd
+  metadata.gz: 88acd31085bcda4390bc37d58078a2be3b6b16f09cd4605c34d9874cbd92ac2b73d36f5e8f9761b5d4396338555aae682baeeaf7603c46f9f6643277a5bfd330
+  data.tar.gz: d31c929eb5c9f55ee68e1d11b96704bb75193b2f8314edd1515e793a20338d2b650f05da038d4efa27802d0e5b5f193d9083b6b5a761dc4af02bb33830a9ee0a

data/CHANGELOG.md

@@ -1,3 +1,63 @@
+## 2.2.14 (November 20, 2020)
+
+IMPROVEMENTS:
+
+- host/windows: Update filesystem type matching on WSL2 [GH-12056]
+
+BUG FIXES:
+
+- core: Track raw actions as they are applied to prevent multiple insertions [GH-12037]
+- core/bundler: Update solution file resolution to support prerelease matching [GH-12054]
+- guest/darwin: Mount vmware synced folders for big sur guests [GH-12053]
+
+## 2.2.13 (November 06, 2020)
+
+BUG FIXES:
+
+- core/bundler: Adjust request sets properly with non-development prerelease [GH-12025]
+
+## 2.2.12 (November 06, 2020)
+
+BUG FIXES:
+
+- core/bundler: Automatically enable prerelease dependency resolution [GH-12023]
+
+NOTE: This is a fix release to resolve an immediate issue with Vagrant
+      plugin functionality
+
+## 2.2.11 (November 05, 2020)
+
+IMPROVEMENTS:
+
+- command/cap: Add ability to specify target [GH-11965]
+- command/cloud: Add --force flag to `version release` command [GH-11912]
+- command/cloud: Updates to utilize the 3.0 version of vagrant_cloud [GH-11916]
+- core: Switch from unmaintained gem erubis to erubi [GH-11893]
+- core: Download Vagrant boxes using auth headers [GH-11835]
+- core: Remove dependency on mime gem [GH-11857]
+- core: Handle Errno::EALREADY exceptions on port check [GH-12008]
+- core: Fix missing hook/trigger insertion into action stack [GH-12014]
+- guest/linux: Make max reboot wait duration configurable [GH-12011]
+- guest/windows: Make max reboot wait duration configurable [GH-12011]
+- providers/virtualbox: Fix availability check of provider [GH-11936]
+- tests: Add integration tests for Docker provider [GH-11907]
+
+BUG FIXES:
+
+- core/synced_folders: Don't persist synced folders to fstab if guest is not reachable [GH-11900]
+- core: Don't try to recover machine without a uuid [GH-11863]
+- config/disks: Transform provider specific config to common form [GH-11939]
+- config/vm: Override synced-folder `:nfs` option [GH-11988]
+- contrib/zsh: Remove newline from beginning of completion script [GH-11963]
+- guests/arch: Install smbclient when setting up arch smb [GH-11923]
+- guest/linux: Check for /etc/fstab before trying to modify [GH-11897]
+- guest/linux: Create an /etc/fstab if does not exist [GH-11909]
+- guest/linux: Persist SMB mounts [GH-11846]
+- guest/debian: Set hostname in /etc/hosts as first step to changing hostname [GH-11885]
+- guest/rhel: Check for existence of network files before trying to update them [GH-11877]
+- guest/suse: Don't use hostnamectl to set hostname if not available on system [GH-11996]
+- tests: Remove rsync dependency from tests [GH-11889]
+
 ## 2.2.10 (August 24, 2020)
 
 FEATURES:

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
   gem 'vagrant-spec', path: "../vagrant-spec"
 else
-  gem 'vagrant-spec', git: "https://github.com/hashicorp/vagrant-spec.git"
+  gem 'vagrant-spec', git: "https://github.com/hashicorp/vagrant-spec.git", branch: :main
 end

data/README.md

@@ -17,7 +17,8 @@ between Windows, Mac OS X, and Linux.
 
 ## Quick Start
 
-Package dependencies: Vagrant requires `bsdtar` to be available on your system PATH to run successfully.
+Package dependencies: Vagrant requires `bsdtar` and `curl` to be available on
+your system PATH to run successfully.
 
 For the quick-start, we'll bring up a development machine on
 [VirtualBox](https://www.virtualbox.org/) because it is free and works
@@ -45,52 +46,11 @@ To learn how to build a fully functional development environment, follow the
 
 ## Installing from Source
 
-If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
+If you want the bleeding edge version of Vagrant, we try to keep main pretty stable
 and you're welcome to give it a shot. Please review the installation page [here](https://www.vagrantup.com/docs/installation/source).
 
 ## Contributing to Vagrant
 
-Once your Vagrant bundle is installed from Git repository, you can run the test suite with:
-
-    bundle exec rake
-
-This will run the unit test suite, which should come back all green!
-
-If you are developing Vagrant on a machine that already has a Vagrant package installation present, both will attempt to use the same folder for their configuration (location of this folder depends on system). This can cause errors when Vagrant attempts to load plugins. In this case, override the `VAGRANT_HOME` environment variable for your development version of Vagrant before running any commands, to be some new folder within the project or elsewhere on your machine. For example, in Bash:
-
-    export VAGRANT_HOME=~/.vagrant-dev
-
-You can now run Vagrant commands against the development version:
-
-    bundle exec vagrant
-
-Please take time to read the [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines) and the [Vagrant Contributing Guide](https://github.com/hashicorp/vagrant/blob/master/.github/CONTRIBUTING.md).
+Please take time to read the [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines) and the [Vagrant Contributing Guide](https://github.com/hashicorp/vagrant/blob/main/.github/CONTRIBUTING.md).
 
 Then you're good to go!
-
-### Acceptance Tests
-
-Vagrant also comes with an acceptance test suite that does black-box
-tests of various Vagrant components. Note that these tests are **extremely
-slow** because actual VMs are spun up and down. The full test suite can
-take hours. Instead, try to run focused component tests.
-
-To run the acceptance test suite, first copy `vagrant-spec.config.example.rb`
-to `vagrant-spec.config.rb` and modify it to valid values. The places you
-should fill in are clearly marked.
-
-Next, see the components that can be tested:
-
-```
-$ rake acceptance:components
-cli
-provider/virtualbox/basic
-...
-```
-
-Then, run one of those components:
-
-```
-$ rake acceptance:run COMPONENTS="cli"
-...
-```

data/RELEASE.md

@@ -22,7 +22,7 @@ targeted at Vagrant core members who have the ability to cut a release.
   to the latest version, commit, and push.
 
 1. Publish the webiste by deleting the `stable-website` branch, recreate the branch,
-  and force push. From the `master` branch, run:
+  and force push. From the `main` branch, run:
 
    ```
    $ git branch -D stable-website

data/contrib/zsh/_vagrant

@@ -1,4 +1,3 @@
-
 #compdef _vagrant vagrant
 
 # ZSH completion for Vagrant
@@ -26,6 +25,7 @@ __plugin_list ()
 function _vagrant () {
 
   local -a sub_commands && sub_commands=(
+    'autocomplete:manages autocomplete installation on host'
     'box:manages boxes: installation, removal, etc.'
     'cloud:manages everything related to Vagrant Cloud'
     'destroy:stops and deletes all traces of the vagrant machine'
@@ -316,6 +316,8 @@ case $state in
 
   (options)
     case $line[1] in
+  autocomplete)
+    __vagrant-autocomplete ;;
   box)
     __vagrant-box ;;
   cloud)

data/contrib/zsh/generate_zsh_completion.rb

@@ -1,7 +1,6 @@
 require 'open3'
 
-HEAD = """
-#compdef _vagrant vagrant
+HEAD = """#compdef _vagrant vagrant
 
 # ZSH completion for Vagrant
 #
@@ -163,4 +162,4 @@ def generate_script
   script
 end
 
-puts generate_script
+puts generate_script

data/lib/vagrant.rb

@@ -93,10 +93,6 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
         date_pattern: "%F %T"
       )
     end
-    # Vagrant Cloud gem uses RestClient to make HTTP requests, so
-    # log them if debug is enabled and use Vagrants logger
-    require 'rest_client'
-    RestClient.log = logger
 
     Log4r::Outputter.stderr.formatter = Vagrant::Util::LoggingFormatter.new(base_formatter)
     logger = nil

data/lib/vagrant/action/builder.rb

@@ -258,7 +258,9 @@ module Vagrant
       # @param [Hash] env Call environment
       # @return [Builder]
       def apply_action_name(env)
+        env[:builder_raw_applied] ||= []
         return self if !env[:action_name]
+
         hook = Hook.new
         machine_name = env[:machine].name if env[:machine]
 
@@ -285,7 +287,9 @@ module Vagrant
         # are the originally implemented trigger style. They run before
         # and after specific provider actions (like :up, :halt, etc) and
         # are different from true action triggers
-        if env[:triggers]
+        if env[:triggers] && !env[:builder_raw_applied].include?(env[:raw_action_name])
+          env[:builder_raw_applied] << env[:raw_action_name]
+
           if !env[:triggers].find(env[:raw_action_name], :before, machine_name, :action, all: true).empty?
             hook.prepend(Vagrant::Action::Builtin::Trigger,
               env[:raw_action_name], env[:triggers], :before, :action, all: true)
@@ -306,21 +310,8 @@ module Vagrant
         # we can just send ourself back
         return self if hook.empty?
 
-        # These are the options to pass into hook application.
-        options = {}
-
-        # If we already ran through once and did append/prepends,
-        # then don't do it again.
-        if env[:action_hooks_already_ran]
-          options[:no_prepend_or_append] = true
-        end
-
-        # Specify that we already ran, so in the future we don't repeat
-        # the prepend/append hooks.
-        env[:action_hooks_already_ran] = true
-
         # Apply all the hooks to the new builder instance
-        hook.apply(self, options)
+        hook.apply(self)
 
         self
       end

data/lib/vagrant/action/builtin/box_add.rb

@@ -436,13 +436,16 @@ module Vagrant
           downloader_options[:location_trusted] = env[:box_download_location_trusted]
           downloader_options[:box_extra_download_options] = env[:box_extra_download_options]
 
-          Util::Downloader.new(url, temp_path, downloader_options)
+          d = Util::Downloader.new(url, temp_path, downloader_options)
+          env[:hook].call(:authenticate_box_downloader, downloader: d)
+          d
         end
 
         def download(url, env, **opts)
           opts[:ui] = true if !opts.key?(:ui)
 
           d = downloader(url, env, **opts)
+          env[:hook].call(:authenticate_box_downloader, downloader: d)
 
           # Download the box to a temporary path. We store the temporary
           # path as an instance variable so that the `#recover` method can
@@ -486,6 +489,7 @@ module Vagrant
         # @return [Boolean] true if metadata
         def metadata_url?(url, env)
           d = downloader(url, env, json: true, ui: false)
+          env[:hook].call(:authenticate_box_downloader, downloader: d)
 
           # If we're downloading a file, cURL just returns no
           # content-type (makes sense), so we just test if it is JSON

data/lib/vagrant/action/builtin/cloud_init_setup.rb

@@ -1,4 +1,4 @@
-require 'mime'
+require 'vagrant/util/mime'
 require 'tmpdir'
 
 module Vagrant
@@ -32,7 +32,7 @@ module Vagrant
         # @param [Vagrant::Machine] machine
         # @param [Vagrant::Environment] env
         # @param [Array<#VagrantPlugins::Kernel_V2::VagrantConfigCloudInit>] user_data_cfgs
-        # @return [MIME::Text] user_data
+        # @return [Vagrant::Util::Mime::MultiPart] user_data
         def setup_user_data(machine, env, user_data_cfgs)
           machine.ui.info(I18n.t("vagrant.actions.vm.cloud_init_user_data_setup"))
 
@@ -47,7 +47,7 @@ module Vagrant
         #
         # @param [Vagrant::Machine] machine
         # @param [VagrantPlugins::Kernel_V2::VagrantConfigCloudInit] cfg
-        # @return [MIME::Text] text_msg
+        # @return [Vagrant::Util::Mime::Entity] text_msg
         def read_text_cfg(machine, cfg)
           if cfg.path
             text = File.read(Pathname.new(cfg.path).expand_path(machine.env.root_path))
@@ -55,13 +55,8 @@ module Vagrant
             text = cfg.inline
           end
 
-          # Note: content_type must remove the leading `text/` because
-          # the MIME::Text initializer hardcodes `text/` already to the type.
-          # We assume content_type is correct due to the validation step
-          # in VagrantConfigCloudInit.
-          content_type = cfg.content_type.split('/', 2).last
-          text_msg = MIME::Text.new(text, content_type)
-
+          text_msg = Vagrant::Util::Mime::Entity.new(text, cfg.content_type)
+          text_msg.disposition = "attachment; filename=\"#{File.basename(cfg.content_disposition_filename).gsub('"', '\"')}\"" if cfg.content_disposition_filename
           text_msg
         end
 
@@ -69,11 +64,11 @@ module Vagrant
         # message
         #
         # @param [Vagrant::Machine] machine
-        # @param [Array<MIME::Text>] text_msg - One or more text configs
-        # @return [MIME::Multipart::Mixed] msg
+        # @param [Array<Vagrant::Util::Mime::Entity>] text_msg - One or more text configs
+        # @return [Vagrant::Util::Mime::Multipart] msg
         def generate_cfg_msg(machine, text_cfgs)
-          msg = MIME::Multipart::Mixed.new
-          msg.headers.set("MIME-Version", "1.0")
+          msg = Vagrant::Util::Mime::Multipart.new
+          msg.headers["MIME-Version"] = "1.0"
 
           text_cfgs.each do |c|
             msg.add(c)
@@ -87,7 +82,7 @@ module Vagrant
         # written to an iso
         #
         # @param [Vagrant::Machine] machine
-        # @param [MIME::Multipart::Mixed] user_data
+        # @param [Vagrant::Util::Mime::Multipart] user_data
         # @param [Hash] meta_data
         def write_cfg_iso(machine, env, user_data, meta_data)
           iso_path = nil

data/lib/vagrant/action/builtin/synced_folders.rb

@@ -129,8 +129,14 @@ module Vagrant
             save_synced_folders(env[:machine], original_folders, **save_opts)
           end
 
-          # Persist the mounts by adding them to fstab
-          if env[:machine].guest.capability?(:persist_mount_shared_folder)
+          # Persist the mounts by adding them to fstab (only if the guest is available)
+          begin
+            persist_mount = env[:machine].guest.capability?(:persist_mount_shared_folder)
+          rescue Errors::MachineGuestNotReady
+            persist_mount = false
+          end
+          if persist_mount
+            # Persist the mounts by adding them to fstab
             if env[:machine].config.vm.allow_fstab_modification
               fstab_folders = original_folders
             else

data/lib/vagrant/action/runner.rb

@@ -85,7 +85,7 @@ module Vagrant
         action_name = environment[:action_name]
 
         # We place a process lock around every action that is called
-        @logger.info("Running action: #{environment[:action_name]} #{callable_id}")
+        @logger.info("Running action: #{action_name} #{callable_id}")
         Util::Busy.busy(int_callback) { callable.call(environment) }
 
         # Return the environment in case there are things in there that

data/lib/vagrant/box.rb

@@ -58,12 +58,14 @@ module Vagrant
     # @param [Pathname] directory The directory where this box exists on
     #   disk.
     # @param [String] metadata_url Metadata URL for box
-    def initialize(name, provider, version, directory, metadata_url: nil)
+    # @param [Hook] hook A hook to apply to the box downloader, for example, for authentication
+    def initialize(name, provider, version, directory, metadata_url: nil, hook: nil)
       @name      = name
       @version   = version
       @provider  = provider
       @directory = directory
       @metadata_url = metadata_url
+      @hook = hook
 
       metadata_file = directory.join("metadata.json")
       raise Errors::BoxMetadataFileNotFound, name: @name if !metadata_file.file?
@@ -133,7 +135,11 @@ module Vagrant
       end
 
       opts = { headers: ["Accept: application/json"] }.merge(download_options)
-      Util::Downloader.new(url, tf.path, opts).download!
+      d = Util::Downloader.new(url, tf.path, opts)
+      if @hook
+        @hook.call(:authenticate_box_downloader, downloader: d)
+      end
+      d.download!
       BoxMetadata.new(File.open(tf.path, "r"))
     rescue Errors::DownloaderError => e
       raise Errors::BoxMetadataDownloadError,

data/lib/vagrant/box_collection.rb

@@ -325,7 +325,7 @@ module Vagrant
 
             return Box.new(
               name, provider, version_dir_map[v.to_s], provider_dir,
-              metadata_url: metadata_url,
+              metadata_url: metadata_url, hook: @hook
             )
           end
         end

data/lib/vagrant/bundler.rb

@@ -23,13 +23,13 @@ module Vagrant
       attr_reader :plugin_file
       # @return [Pathname] path to solution file
       attr_reader :solution_file
-      # @return [Array<Gem::Dependency>] list of required dependencies
+      # @return [Array<Gem::Resolver::DependencyRequest>] list of required dependencies
       attr_reader :dependency_list
 
       # @param [Pathname] plugin_file Path to plugin file
       # @param [Pathname] solution_file Custom path to solution file
       def initialize(plugin_file:, solution_file: nil)
-        @logger = Log4r::Logger.new("vagrant::bundler::signature_file")
+        @logger = Log4r::Logger.new("vagrant::bundler::solution_file")
         @plugin_file = Pathname.new(plugin_file.to_s)
         if solution_file
           @solution_file = Pathname.new(solution_file.to_s)
@@ -46,13 +46,16 @@ module Vagrant
       # Set the list of dependencies for this solution
       #
       # @param [Array<Gem::Dependency>] dependency_list List of dependencies for the solution
+      # @return [Array<Gem::Resolver::DependencyRequest>]
       def dependency_list=(dependency_list)
         Array(dependency_list).each do |d|
           if !d.is_a?(Gem::Dependency)
             raise TypeError, "Expected `Gem::Dependency` but received `#{d.class}`"
           end
         end
-        @dependency_list = dependency_list.map(&:freeze).freeze
+        @dependency_list = dependency_list.map do |d|
+          Gem::Resolver::DependencyRequest.new(d, nil).freeze
+        end.freeze
       end
 
       # @return [Boolean] contained solution is valid
@@ -62,8 +65,9 @@ module Vagrant
 
       # @return [FalseClass] invalidate this solution file
       def invalidate!
-        @logger.debug("manually invalidating solution file")
         @valid = false
+        @logger.debug("manually invalidating solution file #{self}")
+        @valid
       end
 
       # Delete the solution file
@@ -92,7 +96,7 @@ module Vagrant
         @logger.debug("writing solution file contents to disk")
         solution_file.write({
           dependencies: dependency_list.map { |d|
-            [d.name, d.requirements_list]
+            [d.dependency.name, d.dependency.requirements_list]
           },
           checksum: plugin_file_checksum,
           vagrant_version: Vagrant::VERSION
@@ -121,9 +125,10 @@ module Vagrant
           version: solution[:vagrant_version]
         )
         @logger.debug("loading solution dependency list")
-        @dependency_list = solution[:dependencies].map do |name, requirements|
-          Gem::Dependency.new(name, requirements)
-        end
+        @dependency_list = Array(solution[:dependencies]).map do |name, requirements|
+          gd = Gem::Dependency.new(name, requirements)
+          Gem::Resolver::DependencyRequest.new(gd, nil).freeze
+        end.freeze
         @logger.debug("solution dependency list: #{dependency_list}")
         @valid = true
       end
@@ -158,6 +163,7 @@ module Vagrant
           Vagrant::Util::HashWithIndifferentAccess.new(hash)
         rescue => err
           @logger.warn("failed to load solution file, ignoring (error: #{err})")
+          nil
         end
       end
     end
@@ -240,6 +246,12 @@ module Vagrant
       solution = nil
       composed_set = generate_vagrant_set
 
+      # Force the composed set to allow prereleases
+      if Vagrant.allow_prerelease_dependencies?
+        @logger.debug("enabling prerelease dependency matching due to user request")
+        composed_set.prerelease = true
+      end
+
       if solution_file&.valid?
         @logger.debug("loading cached solution set")
         solution = solution_file.dependency_list.map do |dep|
@@ -550,13 +562,19 @@ module Vagrant
 
       # Create the request set for the new plugins
       request_set = Gem::RequestSet.new(*plugin_deps)
-      request_set.prerelease = Vagrant.prerelease?
 
       installer_set = Gem::Resolver.compose_sets(
         installer_set,
         generate_builtin_set(system_plugins),
         generate_plugin_set(skips)
       )
+
+      if Vagrant.allow_prerelease_dependencies?
+        @logger.debug("enabling prerelease dependency matching based on user request")
+        request_set.prerelease = true
+        installer_set.prerelease = true
+      end
+
       @logger.debug("Generating solution set for installation.")
 
       # Generate the required solution set for new plugins
@@ -582,7 +600,7 @@ module Vagrant
       install_path = extra[:env_local] ? env_plugin_gem_path : plugin_gem_path
       result = request_set.install_into(install_path.to_s, true,
         ignore_dependencies: true,
-        prerelease: Vagrant.prerelease?,
+        prerelease: Vagrant.prerelease? || Vagrant.allow_prerelease_dependencies?,
         wrappers: true,
         document: []
       )
@@ -740,7 +758,6 @@ module Vagrant
               request.name == matcher["gem_name"]
             end
             if desired_activation_request && !desired_activation_request.full_spec.activated?
-              activation_request = desired_activation_request
               @logger.warn("Found misordered activation request for #{desired_activation_request.full_name}. Moving to solution HEAD.")
               solution.delete(desired_activation_request)
               solution.unshift(desired_activation_request)
@@ -812,12 +829,22 @@ module Vagrant
       end
 
       def find_all(req)
-        @specs.select do |spec|
-          allow_prerelease = spec.name == "vagrant-unbundled" && Vagrant.prerelease?
-          req.match?(spec, allow_prerelease)
+        r = @specs.select do |spec|
+          # When matching requests against builtin specs, we _always_ enable
+          # prerelease matching since any prerelease that's found in this
+          # set has been added explicitly and should be available for all
+          # plugins to resolve against. This includes Vagrant itself since
+          # it is considered a prerelease when in development mode
+          req.match?(spec, true)
         end.map do |spec|
           Gem::Resolver::InstalledSpecification.new(self, spec)
         end
+        # If any of the results are a prerelease, we need to mark the request
+        # to allow prereleases so the solution can be properly fulfilled
+        if r.any? { |x| x.version.prerelease? }
+          req.dependency.prerelease = true
+        end
+        r
       end
     end
 
@@ -851,7 +878,7 @@ module Vagrant
       # DependencyRequest +req+.
       def find_all(req)
         @specs.values.flatten.select do |spec|
-          req.match?(spec)
+          req.match?(spec, prerelease)
         end.map do |spec|
           source = Gem::Source::Vendor.new(@directories[spec])
           Gem::Resolver::VendorSpecification.new(self, spec, source)
@@ -861,7 +888,7 @@ module Vagrant
       ##
       # Loads a spec with the given +name+. +version+, +platform+ and +source+ are
       # ignored.
-      def load_spec (name, version, platform, source)
+      def load_spec(name, version, platform, source)
         version = Gem::Version.new(version) if !version.is_a?(Gem::Version)
         @specs.fetch(name, []).detect{|s| s.name == name && s.version == version}
       end