vagrant-unbundled 2.2.6.2 → 2.2.14.0

data/plugins/kernel_v2/config/vm_provisioner.rb

@@ -9,7 +9,10 @@ module VagrantPlugins
 
       # Unique name for this provisioner
       #
-      # @return [String]
+      # Accepts a string, but is ultimately forced into a symbol in the top level method inside
+      # #Config::VM.provision method while being parsed from a Vagrantfile
+      #
+      # @return [Symbol]
       attr_reader :name
 
       # Internal unique name for this provisioner
@@ -53,6 +56,12 @@ module VagrantPlugins
       # @return [String, Symbol]
       attr_accessor :after
 
+      # Boolean, when true signifies that some communicator must
+      # be available in order for the provisioner to run.
+      #
+      # @return [Boolean]
+      attr_accessor :communicator_required
+
       def initialize(name, type, **options)
         @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
         @logger.debug("Provisioner defined: #{name}")
@@ -66,6 +75,7 @@ module VagrantPlugins
         @type    = type
         @before  = options[:before]
         @after   = options[:after]
+        @communicator_required = options.fetch(:communicator_required, true)
 
         # Attempt to find the provisioner...
         if !Vagrant.plugin("2").manager.provisioners[type]
@@ -115,6 +125,10 @@ module VagrantPlugins
 
         provisioner_names = provisioners.map { |i| i.name.to_s if i.name != name }.compact
 
+        if ![TrueClass, FalseClass].include?(@communicator_required.class)
+          errors << I18n.t("vagrant.provisioners.base.wrong_type", opt: "communicator_required", type: "boolean")
+        end
+
         if @before && @after
           errors << I18n.t("vagrant.provisioners.base.both_before_after_set")
         end
@@ -124,7 +138,7 @@ module VagrantPlugins
             if @before.is_a?(Symbol) && !VALID_BEFORE_AFTER_TYPES.include?(@before)
               errors << I18n.t("vagrant.provisioners.base.invalid_alias_value", opt: "before", alias: VALID_BEFORE_AFTER_TYPES.join(", "))
             elsif !@before.is_a?(String) && !VALID_BEFORE_AFTER_TYPES.include?(@before)
-              errors << I18n.t("vagrant.provisioners.base.wrong_type", opt: "before")
+              errors << I18n.t("vagrant.provisioners.base.wrong_type", opt: "before", type: "string")
             end
 
             if !provisioner_names.include?(@before)
@@ -150,7 +164,7 @@ module VagrantPlugins
             if @after.is_a?(Symbol)
               errors << I18n.t("vagrant.provisioners.base.invalid_alias_value", opt: "after", alias: VALID_BEFORE_AFTER_TYPES.join(", "))
             elsif !@after.is_a?(String)
-              errors << I18n.t("vagrant.provisioners.base.wrong_type", opt: "after")
+              errors << I18n.t("vagrant.provisioners.base.wrong_type", opt: "after", type: "string")
             end
 
             if !provisioner_names.include?(@after)

data/plugins/kernel_v2/config/vm_trigger.rb

@@ -114,7 +114,11 @@ module VagrantPlugins
 
         # Internal options
         @id = SecureRandom.uuid
-        @command = command.to_sym
+        if command.respond_to?(:to_sym)
+          @command = command.to_sym
+        else
+          @command = command
+        end
         @ruby_block = UNSET_VALUE
 
         @logger.debug("Trigger defined for: #{command}")
@@ -214,10 +218,7 @@ module VagrantPlugins
         end
 
         if @type == :command || !@type
-          commands = []
-          Vagrant.plugin("2").manager.commands.each do |key,data|
-            commands.push(key)
-          end
+          commands = Vagrant.plugin("2").manager.commands.keys.map(&:to_s)
 
           if !commands.include?(@command) && @command != :all
             machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",

data/plugins/providers/docker/action.rb

@@ -66,14 +66,8 @@ module VagrantPlugins
                 next
               end
 
-              b3.use Call, HasSSH do |env3, b4|
-                if env3[:result]
-                  b4.use Provision
-                else
-                  b4.use Message,
-                    I18n.t("docker_provider.messages.provision_no_ssh"),
-                    post: true
-                end
+              b3.use Call, HasProvisioner do |env3, b4|
+                b4.use Provision
               end
             end
           end
@@ -216,14 +210,8 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, IsState, :running do |env, b2|
             if env[:machine_action] != :run_command
-              b2.use Call, HasSSH do |env2, b3|
-                if env2[:result]
-                  b3.use Provision
-                else
-                  b3.use Message,
-                    I18n.t("docker_provider.messages.provision_no_ssh"),
-                    post: true
-                end
+              b2.use Call, HasProvisioner do |env2, b3|
+                b3.use Provision
               end
             end
 
@@ -251,14 +239,16 @@ module VagrantPlugins
             if env[:machine_action] != :run_command
               # If the container is NOT created yet, then do some setup steps
               # necessary for creating it.
+
               b2.use Call, IsState, :preparing do |env2, b3|
                 if env2[:result]
                   b3.use EnvSet, port_collision_repair: true
                   b3.use HostMachinePortWarning
                   b3.use HostMachinePortChecker
+                  b3.use ForwardedPorts # This action converts the `ports` param into proper network configs
+                  b3.use PrepareForwardedPortCollisionParams
                   b3.use HandleForwardedPortCollisions
                   b3.use SyncedFolders
-                  b3.use ForwardedPorts
                   b3.use Pull
                   b3.use Create
                   b3.use WaitForRunning
@@ -313,6 +303,7 @@ module VagrantPlugins
       autoload :IsBuild, action_root.join("is_build")
       autoload :IsHostMachineCreated, action_root.join("is_host_machine_created")
       autoload :Login, action_root.join("login")
+      autoload :PrepareForwardedPortCollisionParams, action_root.join("prepare_forwarded_port_collision_params")
       autoload :PrepareNetworks, action_root.join("prepare_networks")
       autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
       autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")

data/plugins/providers/docker/action/forwarded_ports.rb

@@ -6,6 +6,8 @@ module VagrantPlugins
           @app = app
         end
 
+        # Converts the `ports` docker provider param into proper network configs
+        # of type :forwarded_port
         def call(env)
           env[:machine].provider_config.ports.each do |p|
             host_ip = nil

data/plugins/providers/docker/action/prepare_forwarded_port_collision_params.rb

@@ -0,0 +1,61 @@
+module VagrantPlugins
+  module DockerProvider
+    module Action
+      class PrepareForwardedPortCollisionParams
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          machine = env[:machine]
+
+          # Get the forwarded ports used by other containers and
+          # consider those in use as well.
+          other_used_ports = machine.provider.driver.read_used_ports
+          env[:port_collision_extra_in_use] = other_used_ports
+
+          # Build the remap for any existing collision detections
+          #
+          # Note: This remap might not be required yet (as it is with the virtualbox provider)
+          # so for now we leave the remap hash empty.
+          remap = {}
+          env[:port_collision_remap] = remap
+
+          # This port checker method calls the custom port_check method
+          # defined below. If its false, it will go ahead and use the built-in
+          # port_check method to see if there are any live containers with bound
+          # ports
+          docker_port_check = proc { |host_ip, host_port|
+                                      result = port_check(env, host_port)
+                                      if !result
+                                        result = Vagrant::Action::Builtin::HandleForwardedPortCollisions.port_check(machine, host_ip, host_port)
+                                      end
+                                      result}
+          env[:port_collision_port_check] = docker_port_check
+
+          @app.call(env)
+        end
+
+        protected
+
+        # This check is required the docker provider. Containers
+        # can bind ports but be halted. We don't want new containers to
+        # grab these bound ports, so this check is here for that since
+        # the checks above won't detect it
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] host_port
+        # @returns [Bool]
+        def port_check(env, host_port)
+          extra_in_use = env[:port_collision_extra_in_use]
+
+          if extra_in_use
+            return extra_in_use.include?(host_port.to_s)
+          else
+            return false
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/providers/docker/cap/has_communicator.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module DockerProvider
+    module Cap
+      module HasCommunicator
+        def self.has_communicator(machine)
+          return machine.provider_config.has_ssh
+        end
+      end
+    end
+  end
+end

data/plugins/providers/docker/communicator.rb

@@ -151,7 +151,7 @@ module VagrantPlugins
           "-i #{path}"
         end
 
-        # Use ad-hoc SSH options for the hop on the docker proxy 
+        # Use ad-hoc SSH options for the hop on the docker proxy
         if info[:forward_agent]
           ssh_args << "-o ForwardAgent=yes"
         end

data/plugins/providers/docker/driver.rb

@@ -15,19 +15,46 @@ module VagrantPlugins
         @executor = Executor::Local.new
       end
 
+      # Returns the id for a new container built from `docker build`. Raises
+      # an exception if the id was unable to be captured from the output
+      #
+      # @return [String] id - ID matched from the docker build output.
       def build(dir, **opts, &block)
-        args   = Array(opts[:extra_args])
-        args   << dir
-        result = execute('docker', 'build', *args, &block)
-        matches = result.scan(/Successfully built (.+)$/i)
-        if matches.empty?
-          # This will cause a stack trace in Vagrant, but it is a bug
-          # if this happens anyways.
-          raise "UNKNOWN OUTPUT: #{result}"
+        args = Array(opts[:extra_args])
+        args << dir
+        opts = {with_stderr: true}
+        result = execute('docker', 'build', *args, opts, &block)
+        # Check for the new output format 'writing image sha256...'
+        # In this case, docker builtkit is enabled. Its format is different
+        # from standard docker
+        matches = result.scan(/writing image .+:([0-9a-z]+) done/i).last
+        if !matches
+          if podman?
+            # Check for podman format when it is emulating docker CLI.
+            # Podman outputs the full hash of the container on
+            # the last line after a successful build.
+            match = result.split.select { |str| str.match?(/[0-9a-z]{64}/) }.last
+            return match[0..7] unless match.nil?
+          else
+            matches = result.scan(/Successfully built (.+)$/i).last
+          end
+
+          if !matches
+            # This will cause a stack trace in Vagrant, but it is a bug
+            # if this happens anyways.
+            raise Errors::BuildError, result: result
+          end
         end
 
-        # Return the last match, and the capture of it
-        matches[-1][0]
+        # Return the matched group `id`
+        matches[0]
+      end
+
+      # Check if podman emulating docker CLI is enabled.
+      #
+      # @return [Bool]
+      def podman?
+        execute('docker', '--version').include?("podman")
       end
 
       def create(params, **opts, &block)
@@ -99,6 +126,41 @@ module VagrantPlugins
         result =~ /^#{Regexp.escape(id)}$/
       end
 
+      # Reads all current docker containers and determines what ports
+      # are currently registered to be forwarded
+      # {2222=>#<Set: {"127.0.0.1"}>, 8080=>#<Set: {"*"}>, 9090=>#<Set: {"*"}>}
+      #
+      # Note: This is this format because of what the builtin action for resolving colliding
+      # port forwards expects.
+      #
+      # @return [Hash[Set]] used_ports - {forward_port: #<Set: {"host ip address"}>}
+      def read_used_ports
+        used_ports = Hash.new{|hash,key| hash[key] = Set.new}
+
+        all_containers.each do |c|
+          container_info = inspect_container(c)
+
+          if container_info["HostConfig"]["PortBindings"]
+            port_bindings = container_info["HostConfig"]["PortBindings"]
+            next if port_bindings.empty? # Nothing defined, but not nil either
+
+            port_bindings.each do |guest_port,host_mapping|
+              host_mapping.each do |h|
+                if h["HostIp"] == ""
+                  hostip = "*"
+                else
+                  hostip = h["HostIp"]
+                end
+                hostport = h["HostPort"]
+                used_ports[hostport].add(hostip)
+              end
+            end
+          end
+        end
+
+        used_ports
+      end
+
       def running?(cid)
         result = execute('docker', 'ps', '-q', '--no-trunc')
         result =~ /^#{Regexp.escape cid}$/m
@@ -154,6 +216,7 @@ module VagrantPlugins
         return true
       rescue => e
         return false if e.to_s.include?("is using it")
+        return false if e.to_s.include?("is being used")
         raise if !e.to_s.include?("No such image")
       end
 

data/plugins/providers/docker/errors.rb

@@ -5,6 +5,10 @@ module VagrantPlugins
         error_namespace("docker_provider.errors")
       end
 
+      class BuildError < DockerError
+        error_key(:build_error)
+      end
+
       class CommunicatorNonDocker < DockerError
         error_key(:communicator_non_docker)
       end

data/plugins/providers/docker/executor/local.rb

@@ -27,7 +27,13 @@ module VagrantPlugins
               stdout: result.stdout
           end
 
-          result.stdout
+          if opts
+            if opts[:with_stderr]
+              return result.stdout + " " + result.stderr
+            else
+              return result.stdout
+            end
+          end
         end
 
         def windows?

data/plugins/providers/docker/plugin.rb

@@ -67,6 +67,11 @@ module VagrantPlugins
         Cap::ProxyMachine
       end
 
+      provider_capability("docker", "has_communicator") do
+        require_relative "cap/has_communicator"
+        Cap::HasCommunicator
+      end
+
       protected
 
       def self.init!

data/plugins/providers/hyperv/action.rb

@@ -149,10 +149,12 @@ module VagrantPlugins
                   b3.use NetSetMac
                 end
 
+                b3.use CleanupDisks
+                b3.use Disk
+                b3.use SyncedFolderCleanup
                 b3.use StartInstance
                 b3.use WaitForIPAddress
                 b3.use WaitForCommunicator, [:running]
-                b3.use SyncedFolderCleanup
                 b3.use SyncedFolders
                 b3.use SetHostname
               end

data/plugins/providers/hyperv/action/configure.rb

@@ -97,6 +97,14 @@ module VagrantPlugins
               env[:machine].provider_config.vm_integration_services)
           end
 
+          if env[:machine].provider_config.enable_enhanced_session_mode
+            env[:ui].detail(I18n.t("vagrant.hyperv_enable_enhanced_session"))
+            env[:machine].provider.driver.set_enhanced_session_transport_type("HvSocket")
+          else
+            env[:ui].detail(I18n.t("vagrant.hyperv_disable_enhanced_session"))
+            env[:machine].provider.driver.set_enhanced_session_transport_type("VMBus")
+          end
+
           @app.call(env)
         end
       end

data/plugins/providers/hyperv/action/export.rb

@@ -25,8 +25,10 @@ module VagrantPlugins
           @env[:ui].info I18n.t("vagrant.actions.vm.export.exporting")
           export_tmp_dir = Vagrant::Util::Platform.wsl_to_windows_path(@env["export.temp_dir"])
           @env[:machine].provider.driver.export(export_tmp_dir) do |progress|
-            @env[:ui].clear_line
-            @env[:ui].report_progress(progress.percent, 100, false)
+            @env[:ui].rewriting do |ui|
+              ui.clear_line
+              ui.report_progress(progress.percent, 100, false)
+            end
           end
 
           # Clear the line a final time so the next data can appear

data/plugins/providers/hyperv/cap/cleanup_disks.rb

@@ -0,0 +1,54 @@
+require "log4r"
+require "vagrant/util/experimental"
+
+module VagrantPlugins
+  module HyperV
+    module Cap
+      module CleanupDisks
+        LOGGER = Log4r::Logger.new("vagrant::plugins::hyperv::cleanup_disks")
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_disks
+        # @param [Hash] disk_meta_file - A hash of all the previously defined disks from the last configure_disk action
+        def self.cleanup_disks(machine, defined_disks, disk_meta_file)
+          return if disk_meta_file.values.flatten.empty?
+
+          return if !Vagrant::Util::Experimental.feature_enabled?("disks")
+
+          handle_cleanup_disk(machine, defined_disks, disk_meta_file["disk"])
+          # TODO: Floppy and DVD disks
+        end
+
+        protected
+
+        # @param [Vagrant::Machine] machine
+        # @param [VagrantPlugins::Kernel_V2::VagrantConfigDisk] defined_disks
+        # @param [Hash] disk_meta - A hash of all the previously defined disks from the last configure_disk action
+        def self.handle_cleanup_disk(machine, defined_disks, disk_meta)
+          all_disks = machine.provider.driver.list_hdds
+
+          disk_meta.each do |d|
+            # look at Path instead of Name or UUID
+            disk_name  = File.basename(d["Path"], '.*')
+            dsk = defined_disks.select { |dk| dk.name == disk_name }
+
+            if !dsk.empty? || d["primary"] == true
+              next
+            else
+              LOGGER.warn("Found disk not in Vagrantfile config: '#{d["Name"]}'. Removing disk from guest #{machine.name}")
+
+              machine.ui.warn(I18n.t("vagrant.cap.cleanup_disks.disk_cleanup", name: d["Name"]), prefix: true)
+
+              disk_actual = all_disks.select { |a| File.realdirpath(a["Path"]) == File.realdirpath(d["Path"]) }.first
+              if !disk_actual
+                machine.ui.warn(I18n.t("vagrant.cap.cleanup_disks.disk_not_found", name: d["Name"]), prefix: true)
+              else
+                machine.provider.driver.remove_disk(disk_actual["ControllerType"], disk_actual["ControllerNumber"], disk_actual["ControllerLocation"], disk_actual["Path"])
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end