From a194057fc04f6c8e1a66e0a2eb14aa537622e86f Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 8 Mar 2018 14:20:21 -0800
Subject: [PATCH 01/95] Add trigger config plugin

---
 plugins/kernel_v2/config/trigger.rb | 46 +++++++++++++++++++++++++++++
 plugins/kernel_v2/plugin.rb         |  5 ++++
 2 files changed, 51 insertions(+)
 create mode 100644 plugins/kernel_v2/config/trigger.rb

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
new file mode 100644
index 000000000..7e23ee8c8
--- /dev/null
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -0,0 +1,46 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Kernel_V2
+    class TriggerConfig < Vagrant.plugin("2", :config)
+
+      attr_accessor :name
+
+      def initialize
+        @logger = Log4r::Logger.new("vagrant::config::trigger")
+
+        # Internal state
+        @name = UNSET_VALUE
+      end
+
+      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Block] block The defined after block
+      def before(command, &block)
+      end
+
+      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Block] block The defined after block
+      def after(command, &block)
+      end
+
+      #-------------------------------------------------------------------
+      # Internal methods, don't call these.
+      #-------------------------------------------------------------------
+
+      def finalize!
+        @name = nil if @name == UNSET_VALUE
+      end
+
+      # Validate all pushes
+      def validate(machine)
+      end
+
+      # The String representation of this Trigger.
+      #
+      # @return [String]
+      def to_s
+        "Trigger"
+      end
+    end
+  end
+end
diff --git a/plugins/kernel_v2/plugin.rb b/plugins/kernel_v2/plugin.rb
index 27737854f..4c836424f 100644
--- a/plugins/kernel_v2/plugin.rb
+++ b/plugins/kernel_v2/plugin.rb
@@ -39,6 +39,11 @@ module VagrantPlugins
         require File.expand_path("../config/vm", __FILE__)
         VMConfig
       end
+
+      config("trigger") do
+        require File.expand_path("../config/trigger", __FILE__)
+        TriggerConfig
+      end
     end
   end
 end

From 813ffd06ec7abfe3e63d73d09a7a719a58068eaa Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 8 Mar 2018 15:31:58 -0800
Subject: [PATCH 02/95] Add more trigger config options

---
 plugins/kernel_v2/config/trigger.rb | 56 ++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 7e23ee8c8..32946629b 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -3,24 +3,65 @@ require "vagrant"
 module VagrantPlugins
   module Kernel_V2
     class TriggerConfig < Vagrant.plugin("2", :config)
+      DEFAULT_ON_ERROR = :halt
 
+      # Name for the given Trigger. Defaults to nil.
+      #
+      # @return [String]
       attr_accessor :name
 
+      # A string to print at the WARN level
+      #
+      # @return [String]
+      attr_accessor :info
+
+      # A string to print at the WARN level
+      #
+      # @return [String]
+      attr_accessor :warn
+
+      # Determines what how a Trigger should behave if it runs into an error.
+      # Defaults to :halt, otherwise can only be set to :continue.
+      #
+      # @return [Symbol]
+      attr_accessor :on_error
+
+      # If set, will not run trigger for the configured Vagrant commands.
+      #
+      # @return [String, Array]
+      attr_accessor :ignore
+
+
+      # If set, will only run trigger for guests that match keys for this parameter.
+      #
+      # @return [String, Array]
+      attr_accessor :only_on
+
       def initialize
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
         # Internal state
         @name = UNSET_VALUE
+        @info = UNSET_VALUE
+        @warn = UNSET_VALUE
+        @on_error = UNSET_VALUE
+        @ignore = UNSET_VALUE
+        @only_on = UNSET_VALUE
       end
 
-      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Array, Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
-      def before(command, &block)
+      def before(**command, &block)
       end
 
-      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Array, Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
-      def after(command, &block)
+      def after(**command, &block)
+      end
+
+      # @param [Array, Symbol] command Vagrant command to create trigger on
+      # @return [ActionHook] returns action hook?
+      def parse_trigger_block(**command)
       end
 
       #-------------------------------------------------------------------
@@ -29,9 +70,14 @@ module VagrantPlugins
 
       def finalize!
         @name = nil if @name == UNSET_VALUE
+        @info = nil if @info == UNSET_VALUE
+        @warn = nil if @warn == UNSET_VALUE
+        @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
+        @ignore = nil if @ignore == UNSET_VALUE
+        @only_on = :halt if @only_on == UNSET_VALUE
       end
 
-      # Validate all pushes
+      # Validate Trigger settings
       def validate(machine)
       end
 

From 0142722787a6f947146efed71a746c40b6f0dd4c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 8 Mar 2018 15:34:39 -0800
Subject: [PATCH 03/95] Add run and run_remote scaffolding

---
 plugins/kernel_v2/config/trigger.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 32946629b..acf779644 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -37,6 +37,16 @@ module VagrantPlugins
       # @return [String, Array]
       attr_accessor :only_on
 
+      # A local inline or file script to execute for the trigger
+      #
+      # @return [???]
+      attr_accessor :run
+
+      # A remote inline or file script to execute for the trigger
+      #
+      # @return [???]
+      attr_accessor :run_remote
+
       def initialize
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
@@ -47,6 +57,8 @@ module VagrantPlugins
         @on_error = UNSET_VALUE
         @ignore = UNSET_VALUE
         @only_on = UNSET_VALUE
+        @run = UNSET_VALUE
+        @run_remote = UNSET_VALUE
       end
 
       # @param [Array, Symbol] command Vagrant command to create trigger on
@@ -74,7 +86,9 @@ module VagrantPlugins
         @warn = nil if @warn == UNSET_VALUE
         @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
         @ignore = nil if @ignore == UNSET_VALUE
-        @only_on = :halt if @only_on == UNSET_VALUE
+        @only_on = nil if @only_on == UNSET_VALUE
+        @run = nil if @run == UNSET_VALUE
+        @run_remote = nil if @run_remote == UNSET_VALUE
       end
 
       # Validate Trigger settings

From 01b904061d8da1cddc7b6da1bb26759153fea295 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 8 Mar 2018 16:00:51 -0800
Subject: [PATCH 04/95] Use proper command reference for command whitelist
 params

---
 plugins/kernel_v2/config/trigger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index acf779644..f83323e6f 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -63,12 +63,12 @@ module VagrantPlugins
 
       # @param [Array, Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
-      def before(**command, &block)
+      def before(*command, &block)
       end
 
       # @param [Array, Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
-      def after(**command, &block)
+      def after(*command, &block)
       end
 
       # @param [Array, Symbol] command Vagrant command to create trigger on

From 7cccddc009dde3ca2eeb7851e7abb6e9281e1f67 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 8 Mar 2018 16:12:36 -0800
Subject: [PATCH 05/95] Add basic scaffolding for command parsing

---
 plugins/kernel_v2/config/trigger.rb | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index f83323e6f..1e6d39e06 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -39,18 +39,21 @@ module VagrantPlugins
 
       # A local inline or file script to execute for the trigger
       #
-      # @return [???]
+      # @return [Hash]
       attr_accessor :run
 
       # A remote inline or file script to execute for the trigger
       #
-      # @return [???]
+      # @return [Hash]
       attr_accessor :run_remote
 
       def initialize
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
         # Internal state
+        @_commands = []
+
+        # Trigger config options
         @name = UNSET_VALUE
         @info = UNSET_VALUE
         @warn = UNSET_VALUE
@@ -71,9 +74,10 @@ module VagrantPlugins
       def after(*command, &block)
       end
 
-      # @param [Array, Symbol] command Vagrant command to create trigger on
-      # @return [ActionHook] returns action hook?
-      def parse_trigger_block(**command)
+      # Sets the internal Trigger state for which commands the Trigger will run on
+      #
+      # @param [Array, Symbol, Args] command Vagrant command to create trigger on
+      def parse_command_whitelist(*command)
       end
 
       #-------------------------------------------------------------------
@@ -93,6 +97,15 @@ module VagrantPlugins
 
       # Validate Trigger settings
       def validate(machine)
+        if !@run.nil?
+          # validate proper keys
+          # WARN if invalid keys are used?
+        end
+
+        if !@run_remote.nil?
+          # validate proper keys
+          # WARN if invalid keys are used?
+        end
       end
 
       # The String representation of this Trigger.

From bb2f3b35b9c1dd042208e14fa5e6afb11ca0d05b Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 9 Mar 2018 13:06:26 -0800
Subject: [PATCH 06/95] Add basic unit test

---
 plugins/kernel_v2/config/trigger.rb           |  4 ++
 .../plugins/kernel_v2/config/trigger_test.rb  | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 test/unit/plugins/kernel_v2/config/trigger_test.rb

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 1e6d39e06..882953154 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -97,6 +97,8 @@ module VagrantPlugins
 
       # Validate Trigger settings
       def validate(machine)
+        errors = _detected_errors
+
         if !@run.nil?
           # validate proper keys
           # WARN if invalid keys are used?
@@ -106,6 +108,8 @@ module VagrantPlugins
           # validate proper keys
           # WARN if invalid keys are used?
         end
+
+        {"triggers" => errors}
       end
 
       # The String representation of this Trigger.
diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
new file mode 100644
index 000000000..be7d1a6c1
--- /dev/null
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -0,0 +1,40 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/kernel_v2/config/trigger")
+
+describe VagrantPlugins::Kernel_V2::TriggerConfig do
+  include_context "unit"
+
+  subject { described_class.new }
+
+  let(:machine) { double("machine") }
+
+  def assert_invalid
+    errors = subject.validate(machine)
+    if !errors.values.any? { |v| !v.empty? }
+      raise "No errors: #{errors.inspect}"
+    end
+  end
+
+  def assert_valid
+    errors = subject.validate(machine)
+    if !errors.values.all? { |v| v.empty? }
+      raise "Errors: #{errors.inspect}"
+    end
+  end
+
+  before do
+    env = double("env")
+    allow(env).to receive(:root_path).and_return(nil)
+    allow(machine).to receive(:env).and_return(env)
+    allow(machine).to receive(:provider_config).and_return(nil)
+    allow(machine).to receive(:provider_options).and_return({})
+
+    subject.name = "foo"
+  end
+
+  it "is valid with test defaults" do
+    subject.finalize!
+    assert_valid
+  end
+end

From fdf1b5857035f42f40a6f4e5a52c776c9d758d27 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 9 Mar 2018 16:45:48 -0800
Subject: [PATCH 07/95] Introduce ids for trigger blocks

---
 plugins/kernel_v2/config/trigger.rb | 75 ++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 18 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 882953154..22f462872 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -10,6 +10,15 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :name
 
+      # Internal unique name for this provisioner
+      # Set to the given :name if exists, otherwise
+      # it's set as a UUID.
+      #
+      # Note: This is for internal use only.
+      #
+      # @return [String]
+      attr_reader :id
+
       # A string to print at the WARN level
       #
       # @return [String]
@@ -51,7 +60,13 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
         # Internal state
-        @_commands = []
+        @id = SecureRandom.uuid
+        # Expected to store state like:
+        # {@id=>{"command" => [Triggers],"command2"=>[Triggers]}}
+        # finalize will take this data structure and construct action hooks
+        # Does this make sense
+        @_before_triggers = {} # A hash of all before triggers and their settings
+        @_after_triggers  = {} # A hash of all after triggers and their settings
 
         # Trigger config options
         @name = UNSET_VALUE
@@ -64,27 +79,61 @@ module VagrantPlugins
         @run_remote = UNSET_VALUE
       end
 
+      # Reads in and parses Vagrant command whitelist and settings for a defined
+      # trigger
+      #
       # @param [Array, Symbol] command Vagrant command to create trigger on
-      # @param [Block] block The defined after block
+      # @param [Block] block The defined before block
       def before(*command, &block)
+        if block_given?
+          puts "the command: #{command}"
+          puts "the block: #{block}"
+          command.each do |cmd|
+            @_before_triggers[@id] = {cmd=>block}
+          end
+          puts @_before_triggers
+        elsif command.last.is_a?(Hash)
+          blck = command.pop
+          command.each do |cmd|
+            @_before_triggers[@id] = {cmd=>blck}
+          end
+        else
+          # No config block given at all, validation step should throw error?
+        end
+        puts "The trigger: #{@_before_triggers}"
       end
 
       # @param [Array, Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
       def after(*command, &block)
-      end
-
-      # Sets the internal Trigger state for which commands the Trigger will run on
-      #
-      # @param [Array, Symbol, Args] command Vagrant command to create trigger on
-      def parse_command_whitelist(*command)
+        if block_given?
+          store_after_trigger(command, block)
+        elsif command.last.is_a?(Hash)
+          blck = command.pop
+          store_after_trigger(command, blck)
+        else
+          # No config block given at all, validation step should throw error?
+        end
       end
 
       #-------------------------------------------------------------------
       # Internal methods, don't call these.
       #-------------------------------------------------------------------
 
+      def store_before_trigger(*command, block)
+        command.each do |cmd|
+          @_before_triggers[@id] = {cmd=>block}
+        end
+      end
+
+      def store_after_trigger(*command, block)
+        command.each do |cmd|
+          @_after_triggers[@id] = {cmd=>block}
+        end
+      end
+
       def finalize!
+        # Ensure all config options are set to nil if untouched by user
         @name = nil if @name == UNSET_VALUE
         @info = nil if @info == UNSET_VALUE
         @warn = nil if @warn == UNSET_VALUE
@@ -99,16 +148,6 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if !@run.nil?
-          # validate proper keys
-          # WARN if invalid keys are used?
-        end
-
-        if !@run_remote.nil?
-          # validate proper keys
-          # WARN if invalid keys are used?
-        end
-
         {"triggers" => errors}
       end
 

From 6f00eb56797acec91362925f846de48113ab0a2b Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 9 Mar 2018 16:46:29 -0800
Subject: [PATCH 08/95] Move trigger options into own plugin class

---
 plugins/kernel_v2/config/trigger.rb           | 167 ++++++------------
 plugins/kernel_v2/config/vm_trigger.rb        | 112 ++++++++++++
 .../plugins/kernel_v2/config/trigger_test.rb  |   2 -
 .../kernel_v2/config/vm_trigger_test.rb       |  40 +++++
 4 files changed, 207 insertions(+), 114 deletions(-)
 create mode 100644 plugins/kernel_v2/config/vm_trigger.rb
 create mode 100644 test/unit/plugins/kernel_v2/config/vm_trigger_test.rb

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 22f462872..6216fc4a4 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -1,152 +1,95 @@
 require "vagrant"
+require 'pry'
+
+require File.expand_path("../vm_trigger", __FILE__)
 
 module VagrantPlugins
   module Kernel_V2
     class TriggerConfig < Vagrant.plugin("2", :config)
-      DEFAULT_ON_ERROR = :halt
-
-      # Name for the given Trigger. Defaults to nil.
-      #
-      # @return [String]
-      attr_accessor :name
-
-      # Internal unique name for this provisioner
-      # Set to the given :name if exists, otherwise
-      # it's set as a UUID.
-      #
-      # Note: This is for internal use only.
-      #
-      # @return [String]
-      attr_reader :id
-
-      # A string to print at the WARN level
-      #
-      # @return [String]
-      attr_accessor :info
-
-      # A string to print at the WARN level
-      #
-      # @return [String]
-      attr_accessor :warn
-
-      # Determines what how a Trigger should behave if it runs into an error.
-      # Defaults to :halt, otherwise can only be set to :continue.
-      #
-      # @return [Symbol]
-      attr_accessor :on_error
-
-      # If set, will not run trigger for the configured Vagrant commands.
-      #
-      # @return [String, Array]
-      attr_accessor :ignore
-
-
-      # If set, will only run trigger for guests that match keys for this parameter.
-      #
-      # @return [String, Array]
-      attr_accessor :only_on
-
-      # A local inline or file script to execute for the trigger
-      #
-      # @return [Hash]
-      attr_accessor :run
-
-      # A remote inline or file script to execute for the trigger
-      #
-      # @return [Hash]
-      attr_accessor :run_remote
 
       def initialize
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
-        # Internal state
-        @id = SecureRandom.uuid
-        # Expected to store state like:
-        # {@id=>{"command" => [Triggers],"command2"=>[Triggers]}}
-        # finalize will take this data structure and construct action hooks
-        # Does this make sense
-        @_before_triggers = {} # A hash of all before triggers and their settings
-        @_after_triggers  = {} # A hash of all after triggers and their settings
-
-        # Trigger config options
-        @name = UNSET_VALUE
-        @info = UNSET_VALUE
-        @warn = UNSET_VALUE
-        @on_error = UNSET_VALUE
-        @ignore = UNSET_VALUE
-        @only_on = UNSET_VALUE
-        @run = UNSET_VALUE
-        @run_remote = UNSET_VALUE
+        # Internal State
+        @_before_triggers = [] # An array of VagrantConfigTrigger objectrs
+        @_after_triggers  = [] # An array of VagrantConfigTrigger objectrs
       end
 
       # Reads in and parses Vagrant command whitelist and settings for a defined
       # trigger
       #
-      # @param [Array, Symbol] command Vagrant command to create trigger on
+      # @param [Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined before block
       def before(*command, &block)
-        if block_given?
-          puts "the command: #{command}"
-          puts "the block: #{block}"
-          command.each do |cmd|
-            @_before_triggers[@id] = {cmd=>block}
-          end
-          puts @_before_triggers
-        elsif command.last.is_a?(Hash)
-          blck = command.pop
-          command.each do |cmd|
-            @_before_triggers[@id] = {cmd=>blck}
-          end
+        blk = block
+        if !block_given? && command.last.is_a?(Hash)
+          # We were given a hash rather than a block,
+          # so the last element should be the "config block"
+          # and the rest are commands for the trigger
+          blk = command.pop
         else
           # No config block given at all, validation step should throw error?
         end
-        puts "The trigger: #{@_before_triggers}"
+
+        command.each do |cmd|
+          trigger = VagrantConfigTrigger.new(cmd)
+          trigger.add_config(blk)
+          @_before_triggers << trigger
+        end
       end
 
-      # @param [Array, Symbol] command Vagrant command to create trigger on
-      # @param [Block] block The defined after block
+      # Reads in and parses Vagrant command whitelist and settings for a defined
+      # trigger
+      #
+      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Block] block The defined before block
       def after(*command, &block)
-        if block_given?
-          store_after_trigger(command, block)
-        elsif command.last.is_a?(Hash)
-          blck = command.pop
-          store_after_trigger(command, blck)
+        blk = block
+        if !block_given? && command.last.is_a?(Hash)
+          # We were given a hash rather than a block,
+          # so the last element should be the "config block"
+          # and the rest are commands for the trigger
+          blk = command.pop
         else
           # No config block given at all, validation step should throw error?
         end
+
+        command.each do |cmd|
+          trigger = VagrantConfigTrigger.new(cmd)
+          trigger.add_config(blk)
+          @_after_triggers << trigger
+        end
       end
 
       #-------------------------------------------------------------------
       # Internal methods, don't call these.
       #-------------------------------------------------------------------
 
-      def store_before_trigger(*command, block)
-        command.each do |cmd|
-          @_before_triggers[@id] = {cmd=>block}
-        end
-      end
-
-      def store_after_trigger(*command, block)
-        command.each do |cmd|
-          @_after_triggers[@id] = {cmd=>block}
-        end
-      end
-
       def finalize!
-        # Ensure all config options are set to nil if untouched by user
-        @name = nil if @name == UNSET_VALUE
-        @info = nil if @info == UNSET_VALUE
-        @warn = nil if @warn == UNSET_VALUE
-        @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
-        @ignore = nil if @ignore == UNSET_VALUE
-        @only_on = nil if @only_on == UNSET_VALUE
-        @run = nil if @run == UNSET_VALUE
-        @run_remote = nil if @run_remote == UNSET_VALUE
+        # read through configured settings blocks and set their values
+        # and then set up action hooks here?
+        # for some reason not all triggers are showing up here
+        #puts @_before_triggers if !@_before_triggers.empty?
+        #puts @_after_triggers if !@_after_triggers.empty?
+        if !@_before_triggers.empty?
+          binding.pry
+        end
       end
 
       # Validate Trigger settings
       def validate(machine)
+        if !@_before_triggers.empty?
+          binding.pry
+        end
+
         errors = _detected_errors
+        @_before_triggers.each do |bt|
+          errors << bt.validate(machine)
+        end
+
+        @_after_triggers.each do |at|
+          errors << at.validate(machine)
+        end
 
         {"triggers" => errors}
       end
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
new file mode 100644
index 000000000..59871339a
--- /dev/null
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -0,0 +1,112 @@
+require 'log4r'
+require 'pry'
+
+module VagrantPlugins
+  module Kernel_V2
+    # Represents a single configured provisioner for a VM.
+    class VagrantConfigTrigger < Vagrant.plugin("2", :config)
+      DEFAULT_ON_ERROR = :halt
+
+      # Internal unique name for this trigger
+      #
+      # Note: This is for internal use only.
+      #
+      # @return [String]
+      attr_reader :id
+
+      # Name for the given Trigger. Defaults to nil.
+      #
+      # @return [String]
+      attr_accessor :name
+
+      # Command to fire the trigger on
+      #
+      # @return [Symbol]
+      attr_reader :command
+
+      # A string to print at the WARN level
+      #
+      # @return [String]
+      attr_accessor :info
+
+      # A string to print at the WARN level
+      #
+      # @return [String]
+      attr_accessor :warn
+
+      # Determines what how a Trigger should behave if it runs into an error.
+      # Defaults to :halt, otherwise can only be set to :continue.
+      #
+      # @return [Symbol]
+      attr_accessor :on_error
+
+      # If set, will not run trigger for the configured Vagrant commands.
+      #
+      # @return [String, Array]
+      attr_accessor :ignore
+
+
+      # If set, will only run trigger for guests that match keys for this parameter.
+      #
+      # @return [String, Array]
+      attr_accessor :only_on
+
+      # A local inline or file script to execute for the trigger
+      #
+      # @return [Hash]
+      attr_accessor :run
+
+      # A remote inline or file script to execute for the trigger
+      #
+      # @return [Hash]
+      attr_accessor :run_remote
+
+      def initialize(command)
+        @logger = Log4r::Logger.new("vagrant::config::vm::trigger::config")
+        #@logger.debug("Trigger defined: #{name}")
+
+        @name = UNSET_VALUE
+        @info = UNSET_VALUE
+        @warn = UNSET_VALUE
+        @on_error = UNSET_VALUE
+        @ignore = UNSET_VALUE
+        @only_on = UNSET_VALUE
+        @run = UNSET_VALUE
+        @run_remote = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+        @command = command.to_sym
+      end
+
+      # Expecting a ruby block of a trigger config
+      def add_config(config_block)
+        if config_block.is_a?(Hash)
+          # We have a ruby hash
+          self.set_options(config_block)
+        else
+          # We have a ruby block
+        end
+      end
+
+      def finalize!
+        # Ensure all config options are set to nil if untouched by user
+        @name = nil if @name == UNSET_VALUE
+        @info = nil if @info == UNSET_VALUE
+        @warn = nil if @warn == UNSET_VALUE
+        @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
+        @ignore = nil if @ignore == UNSET_VALUE
+        @only_on = nil if @only_on == UNSET_VALUE
+        @run = nil if @run == UNSET_VALUE
+        @run_remote = nil if @run_remote == UNSET_VALUE
+      end
+
+      def validate(machine)
+        binding.pry
+        errors = _detected_errors
+        # Validate that each config option has the right values and is the right type
+        {"triggers" => errors}
+      end
+    end
+  end
+end
diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
index be7d1a6c1..79199bd84 100644
--- a/test/unit/plugins/kernel_v2/config/trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -29,8 +29,6 @@ describe VagrantPlugins::Kernel_V2::TriggerConfig do
     allow(machine).to receive(:env).and_return(env)
     allow(machine).to receive(:provider_config).and_return(nil)
     allow(machine).to receive(:provider_options).and_return({})
-
-    subject.name = "foo"
   end
 
   it "is valid with test defaults" do
diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
new file mode 100644
index 000000000..245fab5bf
--- /dev/null
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -0,0 +1,40 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/kernel_v2/config/vm_trigger")
+
+describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
+  include_context "unit"
+
+  subject { described_class.new }
+
+  let(:machine) { double("machine") }
+
+  def assert_invalid
+    errors = subject.validate(machine)
+    if !errors.values.any? { |v| !v.empty? }
+      raise "No errors: #{errors.inspect}"
+    end
+  end
+
+  def assert_valid
+    errors = subject.validate(machine)
+    if !errors.values.all? { |v| v.empty? }
+      raise "Errors: #{errors.inspect}"
+    end
+  end
+
+  before do
+    env = double("env")
+    allow(env).to receive(:root_path).and_return(nil)
+    allow(machine).to receive(:env).and_return(env)
+    allow(machine).to receive(:provider_config).and_return(nil)
+    allow(machine).to receive(:provider_options).and_return({})
+
+    subject.name = "foo"
+  end
+
+  it "is valid with test defaults" do
+    subject.finalize!
+    assert_valid
+  end
+end

From e0a5b1d64787d4b55560c7bd022f50652176a028 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 11:07:41 -0700
Subject: [PATCH 09/95] Parse block trigger configs

---
 plugins/kernel_v2/config/trigger.rb    | 21 ++++++++++++++++-----
 plugins/kernel_v2/config/vm_trigger.rb | 12 +++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 6216fc4a4..01a4e6b3f 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -32,8 +32,7 @@ module VagrantPlugins
         end
 
         command.each do |cmd|
-          trigger = VagrantConfigTrigger.new(cmd)
-          trigger.add_config(blk)
+          trigger = create_trigger(cmd, blk)
           @_before_triggers << trigger
         end
       end
@@ -42,7 +41,7 @@ module VagrantPlugins
       # trigger
       #
       # @param [Symbol] command Vagrant command to create trigger on
-      # @param [Block] block The defined before block
+      # @param [Block] block The defined after block
       def after(*command, &block)
         blk = block
         if !block_given? && command.last.is_a?(Hash)
@@ -55,8 +54,7 @@ module VagrantPlugins
         end
 
         command.each do |cmd|
-          trigger = VagrantConfigTrigger.new(cmd)
-          trigger.add_config(blk)
+          trigger = create_trigger(cmd, blk)
           @_after_triggers << trigger
         end
       end
@@ -65,6 +63,19 @@ module VagrantPlugins
       # Internal methods, don't call these.
       #-------------------------------------------------------------------
 
+      # @param [Symbol] command Vagrant command to create trigger on
+      # @param [Block] block The defined config block
+      def create_trigger(command, block)
+        trigger = VagrantConfigTrigger.new(cmd)
+        if block.is_a?(Hash)
+          trigger.set_options(block)
+        else
+          block.call(trigger, VagrantConfigTrigger)
+        end
+        trigger.finalize!
+        return trigger
+      end
+
       def finalize!
         # read through configured settings blocks and set their values
         # and then set up action hooks here?
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 59871339a..7afedb080 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -79,15 +79,9 @@ module VagrantPlugins
         @command = command.to_sym
       end
 
-      # Expecting a ruby block of a trigger config
-      def add_config(config_block)
-        if config_block.is_a?(Hash)
-          # We have a ruby hash
-          self.set_options(config_block)
-        else
-          # We have a ruby block
-        end
-      end
+      #-------------------------------------------------------------------
+      # Internal methods, don't call these.
+      #-------------------------------------------------------------------
 
       def finalize!
         # Ensure all config options are set to nil if untouched by user

From c10ae070b66c77956ae1d7b7a183d0d7b17ec1bb Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 11:13:25 -0700
Subject: [PATCH 10/95] Store correct command for trigger

---
 plugins/kernel_v2/config/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 01a4e6b3f..674c5537c 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -66,7 +66,7 @@ module VagrantPlugins
       # @param [Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined config block
       def create_trigger(command, block)
-        trigger = VagrantConfigTrigger.new(cmd)
+        trigger = VagrantConfigTrigger.new(command)
         if block.is_a?(Hash)
           trigger.set_options(block)
         else

From 50ecf45d505f88b91f81ac7452f1d80729fdf1ce Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 11:25:35 -0700
Subject: [PATCH 11/95] Add more doc to create_trigger function

---
 plugins/kernel_v2/config/trigger.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 674c5537c..1dd38d017 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -63,8 +63,13 @@ module VagrantPlugins
       # Internal methods, don't call these.
       #-------------------------------------------------------------------
 
+      # Creates a new trigger config. If a block is given, parse that block
+      # by calling it with the created trigger. Otherwise set the options if it's
+      # a hash.
+      #
       # @param [Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined config block
+      # @return [VagrantConfigTrigger]
       def create_trigger(command, block)
         trigger = VagrantConfigTrigger.new(command)
         if block.is_a?(Hash)

From 3c5e4b2464715f6d1ed99e46e5c36d27f0732d7e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 11:33:48 -0700
Subject: [PATCH 12/95] Fix variable doc

---
 plugins/kernel_v2/config/trigger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 1dd38d017..6a06bdc3e 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -11,8 +11,8 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::config::trigger")
 
         # Internal State
-        @_before_triggers = [] # An array of VagrantConfigTrigger objectrs
-        @_after_triggers  = [] # An array of VagrantConfigTrigger objectrs
+        @_before_triggers = [] # An array of VagrantConfigTrigger objects
+        @_after_triggers  = [] # An array of VagrantConfigTrigger objects
       end
 
       # Reads in and parses Vagrant command whitelist and settings for a defined

From 375e8d71532a1d86f2a5dddbe0a75b1eff3b7dde Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 11:36:25 -0700
Subject: [PATCH 13/95] Remove old comments

---
 plugins/kernel_v2/config/trigger.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 6a06bdc3e..3a6049917 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -84,9 +84,6 @@ module VagrantPlugins
       def finalize!
         # read through configured settings blocks and set their values
         # and then set up action hooks here?
-        # for some reason not all triggers are showing up here
-        #puts @_before_triggers if !@_before_triggers.empty?
-        #puts @_after_triggers if !@_after_triggers.empty?
         if !@_before_triggers.empty?
           binding.pry
         end

From 8e72ae5bd65d85c2f37805806a66c9bbf425697c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 14:35:24 -0700
Subject: [PATCH 14/95] Add basic validation for trigger config objects

---
 plugins/kernel_v2/config/trigger.rb    | 18 +++----
 plugins/kernel_v2/config/vm_trigger.rb | 68 ++++++++++++++++++++++++--
 templates/locales/en.yml               | 21 ++++++++
 3 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 3a6049917..b486aaf55 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -84,27 +84,25 @@ module VagrantPlugins
       def finalize!
         # read through configured settings blocks and set their values
         # and then set up action hooks here?
-        if !@_before_triggers.empty?
-          binding.pry
-        end
+        #if !@_before_triggers.empty?
+        #  binding.pry
+        #end
       end
 
       # Validate Trigger settings
       def validate(machine)
-        if !@_before_triggers.empty?
-          binding.pry
-        end
-
         errors = _detected_errors
         @_before_triggers.each do |bt|
-          errors << bt.validate(machine)
+          error = bt.validate(machine)
+          errors.concat error if !error.empty?
         end
 
         @_after_triggers.each do |at|
-          errors << at.validate(machine)
+          error = at.validate(machine)
+          errors.concat error if !error.empty?
         end
 
-        {"triggers" => errors}
+        {"trigger" => errors}
       end
 
       # The String representation of this Trigger.
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 7afedb080..03c070fc8 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -90,16 +90,76 @@ module VagrantPlugins
         @warn = nil if @warn == UNSET_VALUE
         @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
         @ignore = nil if @ignore == UNSET_VALUE
-        @only_on = nil if @only_on == UNSET_VALUE
         @run = nil if @run == UNSET_VALUE
         @run_remote = nil if @run_remote == UNSET_VALUE
+        @only_on = nil if @only_on == UNSET_VALUE
+
+        # these values are expected to always be an Array internally,
+        # but can be set as a single String or Symbol
+        if @only_on.is_a?(String)
+          @logger.debug("Updating @only_on variable to be an Array")
+          @only_on = Array(@only_on)
+        end
+
+        if @ignore.is_a?(String)
+          @logger.debug("Updating @ignore variable to be an Array and Symbol")
+          @ignore = Array(@ignore.to_sym)
+        elsif @ignore.is_a?(Symbol)
+          @logger.debug("Updating @ignore variable to be an Array")
+          @ignore = Array(@ignore)
+        end
       end
 
       def validate(machine)
-        binding.pry
         errors = _detected_errors
-        # Validate that each config option has the right values and is the right type
-        {"triggers" => errors}
+
+        if !@run.nil?
+          if !@run.is_a?(Hash)
+            # Run must be a hash
+            errors << I18n.t("vagrant.config.triggers.run.bad_type", cmd: @command)
+          end
+
+          if !@run.key?(:inline) && !@run.key?(:file)
+            errors << I18n.t("vagrant.config.triggers.run.missing_context", cmd: @command)
+          end
+        end
+
+        if !@run_remote.nil?
+          if !@run_remote.is_a?(Hash)
+            errors << I18n.t("vagrant.config.triggers.run_remote.bad_type", cmd: @command)
+          end
+        end
+
+        if !@name.nil? && !@name.is_a?(String)
+          errors << I18n.t("vagrant.config.triggers.name_bad_type", cmd: @command)
+        end
+
+        if !@info.nil? && !@info.is_a?(String)
+          errors << I18n.t("vagrant.config.triggers.info_bad_type", cmd: @command)
+        end
+
+        if !@warn.nil? && !@warn.is_a?(String)
+          errors << I18n.t("vagrant.config.triggers.warn_bad_type", cmd: @command)
+        end
+
+        if @on_error != :halt
+          if @on_error != :continue
+            # must be :halt or :continue
+            errors << I18n.t("vagrant.config.triggers.on_error_bad_type", cmd: @command)
+          end
+        end
+
+        # @ignore validations?
+        # @only_on validations?
+
+        errors
+      end
+
+      # The String representation of this Trigger.
+      #
+      # @return [String]
+      def to_s
+        "Trigger Config"
       end
     end
   end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index c0897632b..e663515f0 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1677,6 +1677,27 @@ en:
         paranoid_deprecated: |-
           The key `paranoid` is deprecated. Please use `verify_host_key`. Supported
           values are exactly the same, only the name of the option has changed.
+      triggers:
+        name_bad_type: |-
+          Invalid type set for `name` on trigger for command '%{cmd}'. `name` should be a String.
+        on_error_bad_type: |-
+          Invalid type set for `on_error` on trigger for command '%{cmd}'. `on_error` can
+          only be `:halt` (default) or `:continue`.
+        run:
+          bad_type: |-
+            Invalid type set for `run` on trigger for command '%{cmd}'. `run` must be a
+            Hash with either key `:inline` or `:file`
+          missing_context: |-
+            Missing key for trigger config setting `run` for command '%{cmd}'. `run` is expected
+            to be given either an `:inline` or `:file` setting.
+        run_remote:
+          bad_type: |-
+            Invalid type set for `run_remote` on trigger for command '%{cmd}'. `run` must be a
+            Hash with either key `:inline` or `:file`
+          missing_context: |-
+            Missing key for trigger config setting `run` for command '%{cmd}'. `run_remote` is expected
+            to be given either an `:inline` or `:file` setting.
+
       vm:
         bad_version: |-
           Invalid box version constraints: %{version}

From 60ff2489c4030a158769077bc78a6f5ea5256fc0 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 15:14:18 -0700
Subject: [PATCH 15/95] Display warning if vagrant command for trigger is not
 found

---
 plugins/kernel_v2/config/vm_trigger.rb | 11 +++++++++++
 templates/locales/en.yml               |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 03c070fc8..7211bca88 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -113,6 +113,17 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
+        commands = []
+        # TODO: Should this be cached...?
+        Vagrant.plugin("2").manager.commands.each do |key,data|
+          commands.push(key)
+        end
+
+        if !commands.include?(@command)
+          machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
+                                cmd: @command))
+        end
+
         if !@run.nil?
           if !@run.is_a?(Hash)
             # Run must be a hash
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index e663515f0..06a50ef95 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1678,6 +1678,8 @@ en:
           The key `paranoid` is deprecated. Please use `verify_host_key`. Supported
           values are exactly the same, only the name of the option has changed.
       triggers:
+        bad_command_warning: |-
+          The command '%{cmd}' was not found for this trigger.
         name_bad_type: |-
           Invalid type set for `name` on trigger for command '%{cmd}'. `name` should be a String.
         on_error_bad_type: |-

From a96baad0d7008b8c47bb26cdd17d20aeb470e239 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 13 Mar 2018 16:24:46 -0700
Subject: [PATCH 16/95] Add comments for later dev

---
 plugins/kernel_v2/config/trigger.rb    | 1 +
 plugins/kernel_v2/config/vm_trigger.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index b486aaf55..6e77f225f 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -90,6 +90,7 @@ module VagrantPlugins
       end
 
       # Validate Trigger settings
+      # TODO: Validate not called if there are providers defined in vagrantfile
       def validate(machine)
         errors = _detected_errors
         @_before_triggers.each do |bt|
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 7211bca88..72bccdd3a 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -114,12 +114,12 @@ module VagrantPlugins
         errors = _detected_errors
 
         commands = []
-        # TODO: Should this be cached...?
         Vagrant.plugin("2").manager.commands.each do |key,data|
           commands.push(key)
         end
 
         if !commands.include?(@command)
+          # does this make sense to print on this machine?
           machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
                                 cmd: @command))
         end

From b04f13657b906df90ae65e0dcd4892862a1725ac Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 10:08:41 -0700
Subject: [PATCH 17/95] Move warning to logger rather than guest

---
 plugins/kernel_v2/config/vm_trigger.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 72bccdd3a..2e45236ca 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -119,8 +119,7 @@ module VagrantPlugins
         end
 
         if !commands.include?(@command)
-          # does this make sense to print on this machine?
-          machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
+          @logger.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
                                 cmd: @command))
         end
 

From 5ca1d1ab64ea2ff58d33d4da5cedb6897b4ebf41 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 13:43:50 -0700
Subject: [PATCH 18/95] Finalize config in plugins finalize, improve docs

---
 plugins/kernel_v2/config/trigger.rb    | 37 +++++++++++++++++++++-----
 plugins/kernel_v2/config/vm_trigger.rb | 27 ++++++++++++-------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 6e77f225f..62754eea7 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -15,13 +15,34 @@ module VagrantPlugins
         @_after_triggers  = [] # An array of VagrantConfigTrigger objects
       end
 
+      #-------------------------------------------------------------------
+      # Trigger before/after functions
+      #-------------------------------------------------------------------
+      #
+      # Commands are expected to be ether:
+      #   - splat
+      #     + config.trigger.before :up, :destroy, :halt do |trigger|....
+      #   - array
+      #     + config.trigger.before [:up, :destroy, :halt] do |trigger|....
+      #
+      # Config is expected to be given as a block, or the last parameter as a hash
+      #
+      #   - block
+      #     + config.trigger.before :up, :destroy, :halt do |trigger|
+      #         trigger.option = "option"
+      #       end
+      #   - hash
+      #     + config.trigger.before :up, :destroy, :halt, options: "option"
+
       # Reads in and parses Vagrant command whitelist and settings for a defined
       # trigger
       #
       # @param [Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined before block
       def before(*command, &block)
+        command.flatten!
         blk = block
+
         if !block_given? && command.last.is_a?(Hash)
           # We were given a hash rather than a block,
           # so the last element should be the "config block"
@@ -43,6 +64,7 @@ module VagrantPlugins
       # @param [Symbol] command Vagrant command to create trigger on
       # @param [Block] block The defined after block
       def after(*command, &block)
+        command.flatten!
         blk = block
         if !block_given? && command.last.is_a?(Hash)
           # We were given a hash rather than a block,
@@ -77,20 +99,23 @@ module VagrantPlugins
         else
           block.call(trigger, VagrantConfigTrigger)
         end
-        trigger.finalize!
         return trigger
       end
 
       def finalize!
         # read through configured settings blocks and set their values
         # and then set up action hooks here?
-        #if !@_before_triggers.empty?
-        #  binding.pry
-        #end
+        if !@_before_triggers.empty?
+          @_before_triggers.map { |t| t.finalize! }
+        end
+
+        if !@_after_triggers.empty?
+          @_after_triggers.map { |t| t.finalize! }
+        end
       end
 
       # Validate Trigger settings
-      # TODO: Validate not called if there are providers defined in vagrantfile
+      # TODO: Validate not called if there are guests defined in vagrantfile
       def validate(machine)
         errors = _detected_errors
         @_before_triggers.each do |bt|
@@ -110,7 +135,7 @@ module VagrantPlugins
       #
       # @return [String]
       def to_s
-        "Trigger"
+        "trigger"
       end
     end
   end
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 2e45236ca..e9030c362 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -12,7 +12,7 @@ module VagrantPlugins
       # Note: This is for internal use only.
       #
       # @return [String]
-      attr_reader :id
+      attr_accessor :id
 
       # Name for the given Trigger. Defaults to nil.
       #
@@ -96,18 +96,23 @@ module VagrantPlugins
 
         # these values are expected to always be an Array internally,
         # but can be set as a single String or Symbol
-        if @only_on.is_a?(String)
-          @logger.debug("Updating @only_on variable to be an Array")
+        #
+        # map to all be strings
+        if !@only_on.nil?
           @only_on = Array(@only_on)
         end
 
-        if @ignore.is_a?(String)
-          @logger.debug("Updating @ignore variable to be an Array and Symbol")
+        if !@ignore.nil?
           @ignore = Array(@ignore.to_sym)
-        elsif @ignore.is_a?(Symbol)
-          @logger.debug("Updating @ignore variable to be an Array")
-          @ignore = Array(@ignore)
         end
+
+        # Convert @run and @run_remote to be a "Shell provisioner"
+        if @run
+        end
+
+        if @run_remote
+        end
+
       end
 
       def validate(machine)
@@ -119,7 +124,7 @@ module VagrantPlugins
         end
 
         if !commands.include?(@command)
-          @logger.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
+          machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
                                 cmd: @command))
         end
 
@@ -138,6 +143,10 @@ module VagrantPlugins
           if !@run_remote.is_a?(Hash)
             errors << I18n.t("vagrant.config.triggers.run_remote.bad_type", cmd: @command)
           end
+
+          if !@run_remote.key?(:inline) && !@run_remote.key?(:file)
+            errors << I18n.t("vagrant.config.triggers.run_remote.missing_context", cmd: @command)
+          end
         end
 
         if !@name.nil? && !@name.is_a?(String)

From d26a925bd7b3f5baea5dae787b7daa3fcac364fd Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 13:47:01 -0700
Subject: [PATCH 19/95] Update variable doc

---
 plugins/kernel_v2/config/vm_trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index e9030c362..870d17e0a 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -42,7 +42,7 @@ module VagrantPlugins
 
       # If set, will not run trigger for the configured Vagrant commands.
       #
-      # @return [String, Array]
+      # @return [Symbol, Array]
       attr_accessor :ignore
 
 

From 607368a66cba897e9add4d6c5d6132b60b54a506 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 15:54:38 -0700
Subject: [PATCH 20/95] Introduce merge function to preserve internal state

---
 plugins/kernel_v2/config/trigger.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 62754eea7..1cbd88a25 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -102,6 +102,19 @@ module VagrantPlugins
         return trigger
       end
 
+      # Solve the mystery of disappearing state??
+      def merge(other)
+        super.tap do |result|
+          other_defined_before_triggers = other.instance_variable_get(:@_before_triggers)
+          other_defined_after_triggers = other.instance_variable_get(:@_after_triggers)
+
+          #overrides???
+
+          result.instance_variable_set(:@_before_triggers, other_defined_before_triggers)
+          result.instance_variable_set(:@_after_triggers, other_defined_after_triggers)
+        end
+      end
+
       def finalize!
         # read through configured settings blocks and set their values
         # and then set up action hooks here?

From 0cbf6970fc683297777d16321fe34f9971ef446b Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 15:57:21 -0700
Subject: [PATCH 21/95] Update config class setting

---
 plugins/kernel_v2/config/vm_trigger.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 870d17e0a..2570a4392 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -7,6 +7,10 @@ module VagrantPlugins
     class VagrantConfigTrigger < Vagrant.plugin("2", :config)
       DEFAULT_ON_ERROR = :halt
 
+      #-------------------------------------------------------------------
+      # Config class for a given Trigger
+      #-------------------------------------------------------------------
+
       # Internal unique name for this trigger
       #
       # Note: This is for internal use only.
@@ -79,10 +83,6 @@ module VagrantPlugins
         @command = command.to_sym
       end
 
-      #-------------------------------------------------------------------
-      # Internal methods, don't call these.
-      #-------------------------------------------------------------------
-
       def finalize!
         # Ensure all config options are set to nil if untouched by user
         @name = nil if @name == UNSET_VALUE
@@ -103,7 +103,8 @@ module VagrantPlugins
         end
 
         if !@ignore.nil?
-          @ignore = Array(@ignore.to_sym)
+          @ignore = @ignore.to_sym if @ignore.is_a?(String)
+          @ignore = Array(@ignore)
         end
 
         # Convert @run and @run_remote to be a "Shell provisioner"

From 51e4118cc271dba2993894d6cd9154daee2461bc Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 14 Mar 2018 15:57:48 -0700
Subject: [PATCH 22/95] Debug commit

---
 lib/vagrant/config/v2/root.rb       | 2 ++
 plugins/kernel_v2/config/ssh.rb     | 1 +
 plugins/kernel_v2/config/trigger.rb | 1 +
 3 files changed, 4 insertions(+)

diff --git a/lib/vagrant/config/v2/root.rb b/lib/vagrant/config/v2/root.rb
index b41e5c031..e2d33fd42 100644
--- a/lib/vagrant/config/v2/root.rb
+++ b/lib/vagrant/config/v2/root.rb
@@ -1,4 +1,5 @@
 require "set"
+require 'pry'
 
 require "vagrant/config/v2/util"
 
@@ -63,6 +64,7 @@ module Vagrant
         def validate(machine)
           # Go through each of the configuration keys and validate
           errors = {}
+          binding.pry
           @keys.each do |_key, instance|
             if instance.respond_to?(:validate)
               # Validate this single item, and if we have errors then
diff --git a/plugins/kernel_v2/config/ssh.rb b/plugins/kernel_v2/config/ssh.rb
index 1dc3d51c9..4efd89951 100644
--- a/plugins/kernel_v2/config/ssh.rb
+++ b/plugins/kernel_v2/config/ssh.rb
@@ -1,4 +1,5 @@
 require "vagrant"
+require 'pry'
 
 require_relative "ssh_connect"
 
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 1cbd88a25..25d63c7a3 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -130,6 +130,7 @@ module VagrantPlugins
       # Validate Trigger settings
       # TODO: Validate not called if there are guests defined in vagrantfile
       def validate(machine)
+        binding.pry
         errors = _detected_errors
         @_before_triggers.each do |bt|
           error = bt.validate(machine)

From f0ec7c750bab2245470da13566c138880afbe4e3 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 15 Mar 2018 12:21:14 -0700
Subject: [PATCH 23/95] Potential solution for trigger validation when guest is
 defined

Send the defined before and or after triggers in the merge function if
triggers exist already
---
 lib/vagrant/config/v2/root.rb       |  1 -
 plugins/kernel_v2/config/trigger.rb | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/config/v2/root.rb b/lib/vagrant/config/v2/root.rb
index e2d33fd42..8fde6f267 100644
--- a/lib/vagrant/config/v2/root.rb
+++ b/lib/vagrant/config/v2/root.rb
@@ -64,7 +64,6 @@ module Vagrant
         def validate(machine)
           # Go through each of the configuration keys and validate
           errors = {}
-          binding.pry
           @keys.each do |_key, instance|
             if instance.respond_to?(:validate)
               # Validate this single item, and if we have errors then
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 25d63c7a3..4e99a2163 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -105,13 +105,22 @@ module VagrantPlugins
       # Solve the mystery of disappearing state??
       def merge(other)
         super.tap do |result|
+          new_before_triggers = []
+          new_after_triggers = []
           other_defined_before_triggers = other.instance_variable_get(:@_before_triggers)
           other_defined_after_triggers = other.instance_variable_get(:@_after_triggers)
 
-          #overrides???
+          # TODO: Is this the right solution?
+          # If a guest in a Vagrantfile exists beyond the default, this check
+          # will properly set up the defined triggers and validate them.
+          # overrides??? check for duplicate ids?
+          if other_defined_before_triggers.empty? && !@_before_triggers.empty?
+            result.instance_variable_set(:@_before_triggers, @_before_triggers)
+          end
 
-          result.instance_variable_set(:@_before_triggers, other_defined_before_triggers)
-          result.instance_variable_set(:@_after_triggers, other_defined_after_triggers)
+          if other_defined_before_triggers.empty? && !@_after_triggers.empty?
+            result.instance_variable_set(:@_after_triggers, @_after_triggers)
+          end
         end
       end
 
@@ -130,7 +139,6 @@ module VagrantPlugins
       # Validate Trigger settings
       # TODO: Validate not called if there are guests defined in vagrantfile
       def validate(machine)
-        binding.pry
         errors = _detected_errors
         @_before_triggers.each do |bt|
           error = bt.validate(machine)

From 1591ae99169ddb6356afa8aa933d6321e2e72920 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 15 Mar 2018 14:42:59 -0700
Subject: [PATCH 24/95] Make run and run_remote settings shell provisioner
 configs

---
 plugins/kernel_v2/config/vm_trigger.rb | 30 ++++++++------------------
 templates/locales/en.yml               | 14 ++++--------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 2570a4392..cde23e34c 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -1,5 +1,6 @@
 require 'log4r'
 require 'pry'
+require Vagrant.source_root.join('plugins/provisioners/shell/config')
 
 module VagrantPlugins
   module Kernel_V2
@@ -109,9 +110,17 @@ module VagrantPlugins
 
         # Convert @run and @run_remote to be a "Shell provisioner"
         if @run
+          new_run = VagrantPlugins::Shell::Config.new()
+          new_run.set_options(@run)
+          new_run.finalize!
+          @run = new_run
         end
 
         if @run_remote
+          new_run = VagrantPlugins::Shell::Config.new()
+          new_run.set_options(@run_remote)
+          new_run.finalize!
+          @run_remote = new_run
         end
 
       end
@@ -129,27 +138,6 @@ module VagrantPlugins
                                 cmd: @command))
         end
 
-        if !@run.nil?
-          if !@run.is_a?(Hash)
-            # Run must be a hash
-            errors << I18n.t("vagrant.config.triggers.run.bad_type", cmd: @command)
-          end
-
-          if !@run.key?(:inline) && !@run.key?(:file)
-            errors << I18n.t("vagrant.config.triggers.run.missing_context", cmd: @command)
-          end
-        end
-
-        if !@run_remote.nil?
-          if !@run_remote.is_a?(Hash)
-            errors << I18n.t("vagrant.config.triggers.run_remote.bad_type", cmd: @command)
-          end
-
-          if !@run_remote.key?(:inline) && !@run_remote.key?(:file)
-            errors << I18n.t("vagrant.config.triggers.run_remote.missing_context", cmd: @command)
-          end
-        end
-
         if !@name.nil? && !@name.is_a?(String)
           errors << I18n.t("vagrant.config.triggers.name_bad_type", cmd: @command)
         end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 06a50ef95..8f8706f1f 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1687,18 +1687,12 @@ en:
           only be `:halt` (default) or `:continue`.
         run:
           bad_type: |-
-            Invalid type set for `run` on trigger for command '%{cmd}'. `run` must be a
-            Hash with either key `:inline` or `:file`
-          missing_context: |-
-            Missing key for trigger config setting `run` for command '%{cmd}'. `run` is expected
-            to be given either an `:inline` or `:file` setting.
+            Invalid type set for `run` on trigger for command '%{cmd}'. `run`
+            must be a Hash.
         run_remote:
           bad_type: |-
-            Invalid type set for `run_remote` on trigger for command '%{cmd}'. `run` must be a
-            Hash with either key `:inline` or `:file`
-          missing_context: |-
-            Missing key for trigger config setting `run` for command '%{cmd}'. `run_remote` is expected
-            to be given either an `:inline` or `:file` setting.
+            Invalid type set for `run` on trigger for command '%{cmd}'. `run`
+            must be a Hash.
 
       vm:
         bad_version: |-

From d3dde739fe1821f442f3d4a75d2f038caef9cdb6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 15 Mar 2018 14:43:39 -0700
Subject: [PATCH 25/95] Update trigger code docs

---
 plugins/kernel_v2/config/trigger.rb    | 3 +--
 plugins/kernel_v2/config/vm_trigger.rb | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 4e99a2163..41e9bf641 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -136,8 +136,7 @@ module VagrantPlugins
         end
       end
 
-      # Validate Trigger settings
-      # TODO: Validate not called if there are guests defined in vagrantfile
+      # Validate Trigger Arrays
       def validate(machine)
         errors = _detected_errors
         @_before_triggers.each do |bt|
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index cde23e34c..5d7b3481b 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -53,7 +53,7 @@ module VagrantPlugins
 
       # If set, will only run trigger for guests that match keys for this parameter.
       #
-      # @return [String, Array]
+      # @return [String, Regex, Array]
       attr_accessor :only_on
 
       # A local inline or file script to execute for the trigger
@@ -167,7 +167,7 @@ module VagrantPlugins
       #
       # @return [String]
       def to_s
-        "Trigger Config"
+        "trigger config"
       end
     end
   end

From e752878de93b6967fd8aa0fd322af12aa7a2cbb8 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 16 Mar 2018 14:06:39 -0700
Subject: [PATCH 26/95] Update finalize method for run and run_remote objects

---
 plugins/kernel_v2/config/vm_trigger.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 5d7b3481b..9c45fbf8a 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -98,17 +98,19 @@ module VagrantPlugins
         # these values are expected to always be an Array internally,
         # but can be set as a single String or Symbol
         #
-        # map to all be strings
+        # Guests are stored internally as strings
         if !@only_on.nil?
           @only_on = Array(@only_on)
+          @only_on.map { |o| o.to_s }
         end
 
+        # Commands must be stored internally as symbols
         if !@ignore.nil?
-          @ignore = @ignore.to_sym if @ignore.is_a?(String)
           @ignore = Array(@ignore)
+          @ignore.map { |i| i.to_sym }
         end
 
-        # Convert @run and @run_remote to be a "Shell provisioner"
+        # Convert @run and @run_remote to be a "Shell provisioner" config
         if @run
           new_run = VagrantPlugins::Shell::Config.new()
           new_run.set_options(@run)

From 60c4ffa8a618f200a7ce93529a7aafb52df49320 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 16 Mar 2018 14:38:11 -0700
Subject: [PATCH 27/95] Ensure run & run_remote are Hashes before updating to
 shell config

---
 plugins/kernel_v2/config/vm_trigger.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 9c45fbf8a..2e95c496a 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -111,14 +111,14 @@ module VagrantPlugins
         end
 
         # Convert @run and @run_remote to be a "Shell provisioner" config
-        if @run
+        if @run && @run.is_a?(Hash)
           new_run = VagrantPlugins::Shell::Config.new()
           new_run.set_options(@run)
           new_run.finalize!
           @run = new_run
         end
 
-        if @run_remote
+        if @run_remote && @run_remote.is_a?(Hash)
           new_run = VagrantPlugins::Shell::Config.new()
           new_run.set_options(@run_remote)
           new_run.finalize!
@@ -135,6 +135,18 @@ module VagrantPlugins
           commands.push(key)
         end
 
+        # TODO: Does it make sense to strip out the "shell provisioner" error key here?
+        #       We could add more context around triggers?
+        if @run
+          errorz = @run.validate(machine)
+          errors.concat errorz["shell provisioner"] if !errorz.empty?
+        end
+
+        if @run_remote
+          errorz = @run_remote.validate(machine)
+          errors.concat errorz["shell provisioner"] if !errorz.empty?
+        end
+
         if !commands.include?(@command)
           machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
                                 cmd: @command))

From d0d69e59c9739abeed53535af4a18e84e9777fe5 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 16 Mar 2018 15:39:38 -0700
Subject: [PATCH 28/95] Update return doc string on validate

---
 plugins/kernel_v2/config/vm_trigger.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 2e95c496a..cdbf6a6dd 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -127,6 +127,7 @@ module VagrantPlugins
 
       end
 
+      # @return [Array] array of strings of error messages from config option validation
       def validate(machine)
         errors = _detected_errors
 

From 42419bbd4945e21950f3764756e669f622be5af3 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 10:56:09 -0700
Subject: [PATCH 29/95] Fix rspec tests

---
 lib/vagrant/config/v2/root.rb                         | 1 -
 plugins/kernel_v2/config/ssh.rb                       | 1 -
 plugins/kernel_v2/config/trigger.rb                   | 1 -
 plugins/kernel_v2/config/vm_trigger.rb                | 2 +-
 test/unit/plugins/kernel_v2/config/vm_trigger_test.rb | 8 +++++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/vagrant/config/v2/root.rb b/lib/vagrant/config/v2/root.rb
index 8fde6f267..b41e5c031 100644
--- a/lib/vagrant/config/v2/root.rb
+++ b/lib/vagrant/config/v2/root.rb
@@ -1,5 +1,4 @@
 require "set"
-require 'pry'
 
 require "vagrant/config/v2/util"
 
diff --git a/plugins/kernel_v2/config/ssh.rb b/plugins/kernel_v2/config/ssh.rb
index 4efd89951..1dc3d51c9 100644
--- a/plugins/kernel_v2/config/ssh.rb
+++ b/plugins/kernel_v2/config/ssh.rb
@@ -1,5 +1,4 @@
 require "vagrant"
-require 'pry'
 
 require_relative "ssh_connect"
 
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 41e9bf641..0b24b450c 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -1,5 +1,4 @@
 require "vagrant"
-require 'pry'
 
 require File.expand_path("../vm_trigger", __FILE__)
 
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index cdbf6a6dd..edee528ba 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -1,5 +1,5 @@
 require 'log4r'
-require 'pry'
+
 require Vagrant.source_root.join('plugins/provisioners/shell/config')
 
 module VagrantPlugins
diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index 245fab5bf..c7b7fb139 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -5,20 +5,22 @@ require Vagrant.source_root.join("plugins/kernel_v2/config/vm_trigger")
 describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
   include_context "unit"
 
-  subject { described_class.new }
+  let(:command) { :up }
+
+  subject { described_class.new(command) }
 
   let(:machine) { double("machine") }
 
   def assert_invalid
     errors = subject.validate(machine)
-    if !errors.values.any? { |v| !v.empty? }
+    if !errors.empty? { |v| !v.empty? }
       raise "No errors: #{errors.inspect}"
     end
   end
 
   def assert_valid
     errors = subject.validate(machine)
-    if !errors.values.all? { |v| v.empty? }
+    if !errors.empty? { |v| v.empty? }
       raise "Errors: #{errors.inspect}"
     end
   end

From 3dec6869bb18826edd31d44937f7666dbe581fed Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 15:02:51 -0700
Subject: [PATCH 30/95] Update trigger unit tests

---
 .../plugins/kernel_v2/config/trigger_test.rb  | 100 ++++++++++++++++++
 .../kernel_v2/config/vm_trigger_test.rb       |  13 ++-
 2 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
index 79199bd84..a14f2a1ad 100644
--- a/test/unit/plugins/kernel_v2/config/trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -35,4 +35,104 @@ describe VagrantPlugins::Kernel_V2::TriggerConfig do
     subject.finalize!
     assert_valid
   end
+
+  let (:hash_block) { {info: "hi", run: {inline: "echo 'hi'"}} }
+  let (:splat) { [:up, :destroy, :halt] }
+  let (:arr) { [[:up, :destroy, :halt]] }
+
+  describe "creating a before trigger" do
+    it "creates a trigger with the splat syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before(:up, hash_block)
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(1)
+    end
+
+    it "creates a trigger with the array syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before([:up], hash_block)
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(1)
+    end
+
+    it "creates a trigger with the block syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before :up do |trigger|
+        trigger.name = "rspec"
+      end
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(1)
+    end
+
+    it "creates multiple triggers with the splat syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before(splat, hash_block)
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(3)
+    end
+
+    it "creates multiple triggers with the block syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before splat do |trigger|
+        trigger.name = "rspec"
+      end
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(3)
+    end
+
+    it "creates multiple triggers with the array syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.before(arr, hash_block)
+      bf_trigger = subject.instance_variable_get(:@_before_triggers)
+      expect(bf_trigger.size).to eq(3)
+    end
+  end
+
+  describe "creating an after trigger" do
+    it "creates a trigger with the splat syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after(:up, hash_block)
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(1)
+    end
+
+    it "creates a trigger with the array syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after([:up], hash_block)
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(1)
+    end
+
+    it "creates a trigger with the block syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after :up do |trigger|
+        trigger.name = "rspec"
+      end
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(1)
+    end
+
+    it "creates multiple triggers with the splat syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after(splat, hash_block)
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(3)
+    end
+
+    it "creates multiple triggers with the block syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after splat do |trigger|
+        trigger.name = "rspec"
+      end
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(3)
+    end
+
+    it "creates multiple triggers with the array syntax" do
+      allow(subject).to receive(:create_trigger).and_return([:foo])
+      subject.after(arr, hash_block)
+      af_trigger = subject.instance_variable_get(:@_after_triggers)
+      expect(af_trigger.size).to eq(3)
+    end
+  end
 end
diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index c7b7fb139..71a04bb4b 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -35,8 +35,15 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
     subject.name = "foo"
   end
 
-  it "is valid with test defaults" do
-    subject.finalize!
-    assert_valid
+  describe "with defaults" do
+    it "is valid with test defaults" do
+      subject.finalize!
+      assert_valid
+    end
+
+    it "sets a command" do
+      expect(subject.command).to eq(command)
+    end
   end
+
 end

From 6cbb5d8e5d46cc5971d64484219704a9e71d13f3 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 15:29:58 -0700
Subject: [PATCH 31/95] Add unit tests for config, fix type change bug with
 map!

---
 plugins/kernel_v2/config/vm_trigger.rb        |  4 +-
 .../kernel_v2/config/vm_trigger_test.rb       | 67 +++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index edee528ba..c0220f4ea 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -101,13 +101,13 @@ module VagrantPlugins
         # Guests are stored internally as strings
         if !@only_on.nil?
           @only_on = Array(@only_on)
-          @only_on.map { |o| o.to_s }
+          @only_on.map! { |o| o.to_s }
         end
 
         # Commands must be stored internally as symbols
         if !@ignore.nil?
           @ignore = Array(@ignore)
-          @ignore.map { |i| i.to_sym }
+          @ignore.map! { |i| i.to_sym }
         end
 
         # Convert @run and @run_remote to be a "Shell provisioner" config
diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index 71a04bb4b..da4b7f108 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -46,4 +46,71 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
     end
   end
 
+  describe "defining a new config that needs to match internal restraints" do
+    let(:cmd) { :destroy }
+    let(:cfg) { described_class.new(cmd) }
+    let(:arr_cfg) { described_class.new(cmd) }
+
+    before do
+      cfg.only_on = :guest
+      cfg.ignore = "up"
+      arr_cfg.only_on = [:guest, :other]
+      arr_cfg.ignore = ["up", "destroy"]
+    end
+
+    it "ensures only_on is an array of strings" do
+      cfg.finalize!
+      arr_cfg.finalize!
+
+      expect(cfg.only_on).to be_a(Array)
+      expect(arr_cfg.only_on).to be_a(Array)
+
+      cfg.only_on.each do |a|
+        expect(a).to be_a(String)
+      end
+
+      arr_cfg.only_on.each do |a|
+        expect(a).to be_a(String)
+      end
+    end
+
+    it "ensures ignore is an array of symbols" do
+      cfg.finalize!
+      arr_cfg.finalize!
+
+      expect(cfg.ignore).to be_a(Array)
+      expect(arr_cfg.ignore).to be_a(Array)
+
+      cfg.ignore.each do |a|
+        expect(a).to be_a(Symbol)
+      end
+
+      arr_cfg.ignore.each do |a|
+        expect(a).to be_a(Symbol)
+      end
+    end
+  end
+
+  describe "defining a basic trigger config" do
+    let(:cmd) { :up }
+    let(:cfg) { described_class.new(cmd) }
+
+    before do
+      cfg.info = "Hello there"
+      cfg.warn = "Warning!!"
+      cfg.on_error = :continue
+      cfg.ignore = :up
+      cfg.only_on = "guest"
+    end
+
+    it "sets the options" do
+      cfg.finalize!
+      expect(cfg.info).to eq("Hello there")
+      expect(cfg.warn).to eq("Warning!!")
+      expect(cfg.on_error).to eq(:continue)
+      expect(cfg.ignore).to eq([:up])
+      expect(cfg.only_on).to eq(["guest"])
+    end
+  end
+
 end

From abb6d77442d68a6d1f278f5300f65273a5d5c2df Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 15:34:35 -0700
Subject: [PATCH 32/95] Move location of command validator

---
 plugins/kernel_v2/config/vm_trigger.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index c0220f4ea..5ce358431 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -136,6 +136,11 @@ module VagrantPlugins
           commands.push(key)
         end
 
+        if !commands.include?(@command)
+          machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
+                                cmd: @command))
+        end
+
         # TODO: Does it make sense to strip out the "shell provisioner" error key here?
         #       We could add more context around triggers?
         if @run
@@ -148,11 +153,6 @@ module VagrantPlugins
           errors.concat errorz["shell provisioner"] if !errorz.empty?
         end
 
-        if !commands.include?(@command)
-          machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
-                                cmd: @command))
-        end
-
         if !@name.nil? && !@name.is_a?(String)
           errors << I18n.t("vagrant.config.triggers.name_bad_type", cmd: @command)
         end

From 7b1b044e7245a5d50d26e61bb4b07d5b2bad1336 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 15:39:15 -0700
Subject: [PATCH 33/95] Check for default on_error behavior setting

---
 test/unit/plugins/kernel_v2/config/vm_trigger_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index da4b7f108..3619cefe9 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -42,8 +42,14 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
     end
 
     it "sets a command" do
+      subject.finalize!
       expect(subject.command).to eq(command)
     end
+
+    it "uses default error behavior" do
+      subject.finalize!
+      expect(subject.on_error).to eq(:halt)
+    end
   end
 
   describe "defining a new config that needs to match internal restraints" do

From e157362ace882a3a8751537ca4906c9260a5aeac Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 16:16:33 -0700
Subject: [PATCH 34/95] Add run and run_remote expectations

---
 test/unit/plugins/kernel_v2/config/vm_trigger_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index 3619cefe9..a7f064f4f 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -107,6 +107,8 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
       cfg.on_error = :continue
       cfg.ignore = :up
       cfg.only_on = "guest"
+      cfg.run = {inline: "apt-get update"}
+      cfg.run_remote = {inline: "apt-get update", env: {"VAR"=>"VAL"}}
     end
 
     it "sets the options" do
@@ -116,6 +118,8 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
       expect(cfg.on_error).to eq(:continue)
       expect(cfg.ignore).to eq([:up])
       expect(cfg.only_on).to eq(["guest"])
+      expect(cfg.run).to be_a(VagrantPlugins::Shell::Config)
+      expect(cfg.run_remote).to be_a(VagrantPlugins::Shell::Config)
     end
   end
 

From fc526a164aab2ba948da7da1b30fe943e0bf529c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 19 Mar 2018 16:33:06 -0700
Subject: [PATCH 35/95] Add basic create_trigger rspec test

---
 .../plugins/kernel_v2/config/trigger_test.rb    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
index a14f2a1ad..a044eff0b 100644
--- a/test/unit/plugins/kernel_v2/config/trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -135,4 +135,21 @@ describe VagrantPlugins::Kernel_V2::TriggerConfig do
       expect(af_trigger.size).to eq(3)
     end
   end
+
+  describe "#create_trigger" do
+    let(:command) { :up }
+    let(:hash_block) { {info: "hi", run: {inline: "echo 'hi'"}} }
+
+    it "returns a new VagrantConfigTrigger object if given a hash" do
+      trigger = subject.create_trigger(command, hash_block)
+      expect(trigger).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
+    end
+
+    it "returns a new VagrantConfigTrigger object if given a block" do
+      block = Proc.new { |b| b.info = "test"}
+
+      trigger = subject.create_trigger(command, block)
+      expect(trigger).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
+    end
+  end
 end

From 7dae1acd21b58f740bc8a938137a4531833c2e68 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 20 Mar 2018 11:14:19 -0700
Subject: [PATCH 36/95] Add some "default" options to be validated

---
 test/unit/plugins/kernel_v2/config/vm_trigger_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index a7f064f4f..9edae20ea 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -33,6 +33,12 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
     allow(machine).to receive(:provider_options).and_return({})
 
     subject.name = "foo"
+    subject.info = "Hello there"
+    subject.warn = "Warning!!"
+    subject.ignore = :up
+    subject.only_on = "guest"
+    subject.run = {inline: "apt-get update"}
+    subject.run_remote = {inline: "apt-get update", env: {"VAR"=>"VAL"}}
   end
 
   describe "with defaults" do

From 956ed004bbfb7f2bb182282b70686b3ab243e156 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 20 Mar 2018 15:44:23 -0700
Subject: [PATCH 37/95] Update trigger config merge function

---
 plugins/kernel_v2/config/trigger.rb           | 43 +++++++++++++++----
 .../plugins/kernel_v2/config/trigger_test.rb  | 39 +++++++++++++++++
 2 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 0b24b450c..0535e0565 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -101,7 +101,6 @@ module VagrantPlugins
         return trigger
       end
 
-      # Solve the mystery of disappearing state??
       def merge(other)
         super.tap do |result|
           new_before_triggers = []
@@ -109,17 +108,43 @@ module VagrantPlugins
           other_defined_before_triggers = other.instance_variable_get(:@_before_triggers)
           other_defined_after_triggers = other.instance_variable_get(:@_after_triggers)
 
-          # TODO: Is this the right solution?
-          # If a guest in a Vagrantfile exists beyond the default, this check
-          # will properly set up the defined triggers and validate them.
-          # overrides??? check for duplicate ids?
-          if other_defined_before_triggers.empty? && !@_before_triggers.empty?
-            result.instance_variable_set(:@_before_triggers, @_before_triggers)
+          @_before_triggers.each do |bt|
+            other_bft = other_defined_before_triggers.find { |o| bt.id == o.id }
+            if other_bft
+              # Override, take it
+              other_bft = bt.merge(other_bft)
+
+              # Preserve order, always
+              bt = other_bft
+              other_defined_before_triggers.delete(other_bft)
+            end
+
+            new_before_triggers << bt.dup
           end
 
-          if other_defined_before_triggers.empty? && !@_after_triggers.empty?
-            result.instance_variable_set(:@_after_triggers, @_after_triggers)
+          other_defined_before_triggers.each do |obt|
+            new_before_triggers << obt.dup
           end
+          result.instance_variable_set(:@_before_triggers, new_before_triggers)
+
+          @_after_triggers.each do |at|
+            other_aft = other_defined_after_triggers.find { |o| at.id == o.id }
+            if other_aft
+              # Override, take it
+              other_aft = at.merge(other_aft)
+
+              # Preserve order, always
+              at = other_aft
+              other_defined_after_triggers.delete(other_aft)
+            end
+
+            new_after_triggers << at.dup
+          end
+
+          other_defined_after_triggers.each do |oat|
+            new_after_triggers << oat.dup
+          end
+          result.instance_variable_set(:@_after_triggers, new_after_triggers)
         end
       end
 
diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
index a044eff0b..4b5e1ed1f 100644
--- a/test/unit/plugins/kernel_v2/config/trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -152,4 +152,43 @@ describe VagrantPlugins::Kernel_V2::TriggerConfig do
       expect(trigger).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
   end
+
+  describe "#merge" do
+    it "merges defined triggers" do
+      a = described_class.new()
+      b = described_class.new()
+
+      a.before(splat, hash_block)
+      a.after(arr, hash_block)
+      b.before(splat, hash_block)
+      b.after(arr, hash_block)
+
+      result = a.merge(b)
+      bf_trigger = result.instance_variable_get(:@_before_triggers)
+      af_trigger = result.instance_variable_get(:@_after_triggers)
+
+      expect(bf_trigger).to be_a(Array)
+      expect(af_trigger).to be_a(Array)
+      expect(bf_trigger.size).to eq(6)
+      expect(af_trigger.size).to eq(6)
+    end
+
+    it "merges the other triggers if a class is empty" do
+      a = described_class.new()
+      b = described_class.new()
+
+      a.before(splat, hash_block)
+      a.after(arr, hash_block)
+
+      b_bf_trigger = b.instance_variable_get(:@_before_triggers)
+      b_af_trigger = b.instance_variable_get(:@_after_triggers)
+
+      result = a.merge(b)
+      bf_trigger = result.instance_variable_get(:@_before_triggers)
+      af_trigger = result.instance_variable_get(:@_after_triggers)
+
+      expect(bf_trigger.size).to eq(3)
+      expect(af_trigger.size).to eq(3)
+    end
+  end
 end

From e7274f1b6ced09ad2bd923ee4368d49446fd2094 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 20 Mar 2018 15:44:38 -0700
Subject: [PATCH 38/95] Improve config rspec tests

---
 .../plugins/kernel_v2/config/trigger_test.rb  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/unit/plugins/kernel_v2/config/trigger_test.rb b/test/unit/plugins/kernel_v2/config/trigger_test.rb
index 4b5e1ed1f..a9bf3bbc2 100644
--- a/test/unit/plugins/kernel_v2/config/trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/trigger_test.rb
@@ -42,97 +42,97 @@ describe VagrantPlugins::Kernel_V2::TriggerConfig do
 
   describe "creating a before trigger" do
     it "creates a trigger with the splat syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before(:up, hash_block)
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(1)
+      expect(bf_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates a trigger with the array syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before([:up], hash_block)
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(1)
+      expect(bf_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates a trigger with the block syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before :up do |trigger|
         trigger.name = "rspec"
       end
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(1)
+      expect(bf_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates multiple triggers with the splat syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before(splat, hash_block)
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(3)
+      bf_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
 
     it "creates multiple triggers with the block syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before splat do |trigger|
         trigger.name = "rspec"
       end
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(3)
+      bf_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
 
     it "creates multiple triggers with the array syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.before(arr, hash_block)
       bf_trigger = subject.instance_variable_get(:@_before_triggers)
       expect(bf_trigger.size).to eq(3)
+      bf_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
   end
 
   describe "creating an after trigger" do
     it "creates a trigger with the splat syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after(:up, hash_block)
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(1)
+      expect(af_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates a trigger with the array syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after([:up], hash_block)
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(1)
+      expect(af_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates a trigger with the block syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after :up do |trigger|
         trigger.name = "rspec"
       end
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(1)
+      expect(af_trigger.first).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger)
     end
 
     it "creates multiple triggers with the splat syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after(splat, hash_block)
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(3)
+      af_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
 
     it "creates multiple triggers with the block syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after splat do |trigger|
         trigger.name = "rspec"
       end
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(3)
+      af_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
 
     it "creates multiple triggers with the array syntax" do
-      allow(subject).to receive(:create_trigger).and_return([:foo])
       subject.after(arr, hash_block)
       af_trigger = subject.instance_variable_get(:@_after_triggers)
       expect(af_trigger.size).to eq(3)
+      af_trigger.map { |t| expect(t).to be_a(VagrantPlugins::Kernel_V2::VagrantConfigTrigger) }
     end
   end
 

From a5d8cc1caa52e3bd86a760a3cfef7731036279d6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 21 Mar 2018 10:23:03 -0700
Subject: [PATCH 39/95] Update trigger classes with comments

---
 plugins/kernel_v2/config/trigger.rb    | 6 +++---
 plugins/kernel_v2/config/vm_trigger.rb | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 0535e0565..8a9b49cd3 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -1,5 +1,4 @@
 require "vagrant"
-
 require File.expand_path("../vm_trigger", __FILE__)
 
 module VagrantPlugins
@@ -48,6 +47,7 @@ module VagrantPlugins
           # and the rest are commands for the trigger
           blk = command.pop
         else
+          # TODO:
           # No config block given at all, validation step should throw error?
         end
 
@@ -71,6 +71,7 @@ module VagrantPlugins
           # and the rest are commands for the trigger
           blk = command.pop
         else
+          # TODO:
           # No config block given at all, validation step should throw error?
         end
 
@@ -148,9 +149,8 @@ module VagrantPlugins
         end
       end
 
+      # Iterates over all defined triggers and finalizes their config objects
       def finalize!
-        # read through configured settings blocks and set their values
-        # and then set up action hooks here?
         if !@_before_triggers.empty?
           @_before_triggers.map { |t| t.finalize! }
         end
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 5ce358431..ed09d8900 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -1,11 +1,11 @@
 require 'log4r'
-
 require Vagrant.source_root.join('plugins/provisioners/shell/config')
 
 module VagrantPlugins
   module Kernel_V2
     # Represents a single configured provisioner for a VM.
     class VagrantConfigTrigger < Vagrant.plugin("2", :config)
+      # Defaults
       DEFAULT_ON_ERROR = :halt
 
       #-------------------------------------------------------------------
@@ -68,7 +68,6 @@ module VagrantPlugins
 
       def initialize(command)
         @logger = Log4r::Logger.new("vagrant::config::vm::trigger::config")
-        #@logger.debug("Trigger defined: #{name}")
 
         @name = UNSET_VALUE
         @info = UNSET_VALUE
@@ -82,10 +81,13 @@ module VagrantPlugins
         # Internal options
         @id = SecureRandom.uuid
         @command = command.to_sym
+
+        @logger.debug("Trigger defined for command: #{command}")
       end
 
       def finalize!
-        # Ensure all config options are set to nil if untouched by user
+        # Ensure all config options are set to nil or default value if untouched
+        # by user
         @name = nil if @name == UNSET_VALUE
         @info = nil if @info == UNSET_VALUE
         @warn = nil if @warn == UNSET_VALUE

From 4ecf6822659dd0d0936958f083a60b5994138eda Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 22 Mar 2018 15:40:17 -0700
Subject: [PATCH 40/95] Add basic trigger plugin scaffold

---
 lib/vagrant/plugin/v2.rb         |  1 +
 lib/vagrant/plugin/v2/trigger.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 lib/vagrant/plugin/v2/trigger.rb

diff --git a/lib/vagrant/plugin/v2.rb b/lib/vagrant/plugin/v2.rb
index 953f73ff6..5bf2cdd41 100644
--- a/lib/vagrant/plugin/v2.rb
+++ b/lib/vagrant/plugin/v2.rb
@@ -19,6 +19,7 @@ module Vagrant
       autoload :Push, "vagrant/plugin/v2/push"
       autoload :Provisioner, "vagrant/plugin/v2/provisioner"
       autoload :SyncedFolder, "vagrant/plugin/v2/synced_folder"
+      autoload :Trigger, "vagrant/plugin/v2/trigger"
     end
   end
 end
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
new file mode 100644
index 000000000..175529e48
--- /dev/null
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -0,0 +1,23 @@
+require 'log4r'
+
+module Vagrant
+  module Plugin
+    module V2
+      # This is the base class for a trigger for the V2 API. A provisioner
+      # is primarily responsible for installing software on a Vagrant guest.
+      class Trigger
+        attr_reader :config
+
+        # Trigger
+        #
+        # @param [Object] env Vagrant environment
+        # @param [Object] config Trigger configuration
+        def initialize(env, config)
+          @env = env
+          @config  = config
+          @logger = Log4r::Logger.new("vagrant::trigger::#{self.class.to_s.downcase}")
+        end
+      end
+    end
+  end
+end

From 372a6a7911d48e10a3bbce67b0acd3e77a103d09 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 28 Mar 2018 15:02:58 -0700
Subject: [PATCH 41/95] Initial trigger plugin scaffolding

---
 lib/vagrant/machine.rb              |   4 ++
 lib/vagrant/plugin/v2/command.rb    |   2 +-
 lib/vagrant/plugin/v2/trigger.rb    | 108 ++++++++++++++++++++++++++--
 plugins/kernel_v2/config/trigger.rb |  10 +++
 4 files changed, 119 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 2f2a9fb7c..7dd643434 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -110,6 +110,7 @@ module Vagrant
       @ui              = Vagrant::UI::Prefixed.new(@env.ui, @name)
       @ui_mutex        = Mutex.new
       @state_mutex     = Mutex.new
+      @triggers        = Vagrant::Plugin::V2::Trigger.new(@env, @ui, @config.trigger)
 
       # Read the ID, which is usually in local storage
       @id = nil
@@ -159,6 +160,7 @@ module Vagrant
     #   as extra data set on the environment hash for the middleware
     #   runner.
     def action(name, opts=nil)
+      @triggers.fire_before_triggers(name, @name)
       @logger.info("Calling action: #{name} on provider #{@provider}")
 
       opts ||= {}
@@ -203,6 +205,8 @@ module Vagrant
         ui.machine("action", name.to_s, "end")
         action_result
       end
+
+      @triggers.fire_after_triggers(name, @name)
     rescue Errors::EnvironmentLockedError
       raise Errors::MachineActionLockedError,
         action: name,
diff --git a/lib/vagrant/plugin/v2/command.rb b/lib/vagrant/plugin/v2/command.rb
index 94e554dc5..5b39ef49f 100644
--- a/lib/vagrant/plugin/v2/command.rb
+++ b/lib/vagrant/plugin/v2/command.rb
@@ -45,7 +45,7 @@ module Vagrant
         def parse_options(opts=nil)
           # make sure optparse doesn't use POSIXLY_CORRECT parsing
           ENV["POSIXLY_CORRECT"] = nil
-          
+
           # Creating a shallow copy of the arguments so the OptionParser
           # doesn't destroy the originals.
           argv = @argv.dup
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 175529e48..d30326d17 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,22 +1,122 @@
 require 'log4r'
 
+require 'pry'
+
 module Vagrant
   module Plugin
     module V2
-      # This is the base class for a trigger for the V2 API. A provisioner
-      # is primarily responsible for installing software on a Vagrant guest.
       class Trigger
+        # @return [Kernel_V2/Config/Trigger]
         attr_reader :config
 
-        # Trigger
+        # This class is responsible for setting up basic triggers that were
+        # defined inside a Vagrantfile. It should take the Trigger config
+        # and convert it to action hooks.
         #
         # @param [Object] env Vagrant environment
+        # @param [Object] ui Machines ui object
         # @param [Object] config Trigger configuration
-        def initialize(env, config)
+        def initialize(env, ui, config)
           @env = env
+          @machine_ui = ui
           @config  = config
+
           @logger = Log4r::Logger.new("vagrant::trigger::#{self.class.to_s.downcase}")
         end
+
+        # Fires all before triggers, if any are defined for the action and guest
+        #
+        # @param [Symbol] action Vagrant command to fire trigger on
+        # @param [String] guest_name The guest that invoked firing the triggers
+        def fire_before_triggers(action, guest_name)
+          # get all triggers matching action
+          triggers = []
+          triggers << config.before_triggers.map do |trigger|
+            trigger if trigger.command == action
+          end.compact
+          triggers = triggers.first
+          triggers = filter_triggers(triggers, guest_name)
+
+          binding.pry
+          unless triggers.empty?
+            @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
+            # TODO I18N me
+            @machine_ui.info("Running triggers before #{action}...")
+            fire(triggers, guest_name)
+          end
+        end
+
+        # Fires all after triggers, if any are defined for the action and guest
+        #
+        # @param [Symbol] action Vagrant command to fire trigger on
+        # @param [String] guest_name The guest that invoked firing the triggers
+        def fire_after_triggers(action, guest_name)
+          # get all triggers matching action
+          triggers = []
+          triggers << config.after_triggers.map do |trigger|
+            trigger if trigger.command == action
+          end.compact
+          triggers = triggers.first
+          triggers = filter_triggers(triggers, guest_name)
+
+          binding.pry
+          unless triggers.empty?
+            @logger.info("Firing triggers for action #{action} on guest #{guest_name}")
+            # TODO I18N me
+            @machine_ui.info("Running triggers after #{action}...")
+            fire(triggers, guest_name)
+          end
+        end
+
+        protected
+
+        #-------------------------------------------------------------------
+        # Internal methods, don't call these.
+        #-------------------------------------------------------------------
+
+        # Filters triggers to be fired based on restraints
+        #
+        # @param [Array] triggers An array of triggers to be filtered
+        # @return [Array] The filtered array of triggers
+        def filter_triggers(triggers, guest_name)
+          return triggers
+        end
+
+        # Fires off all triggers in the given array
+        #
+        # @param [Array] triggers An array of triggers to be fired
+        def fire(triggers)
+          # ensure on_error is respected by exiting or continuing
+
+          triggers.each do |trigger|
+          end
+        end
+
+        # Prints the given message at info level for a trigger
+        #
+        # @param [String] message The string to be printed
+        def info(message)
+          @machine_ui.info(message)
+        end
+
+        # Prints the given message at warn level for a trigger
+        #
+        # @param [String] message The string to be printed
+        def warn(message)
+          @machine_ui.warn(message)
+        end
+
+        # Runs a script on a guest
+        #
+        # @param [ShellProvisioner/Config] config A Shell provisioner config
+        def run(config)
+        end
+
+        # Runs a script on the host
+        #
+        # @param [ShellProvisioner/Config] config A Shell provisioner config
+        def run_remote(config)
+        end
       end
     end
   end
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 8a9b49cd3..c959dd501 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -176,6 +176,16 @@ module VagrantPlugins
         {"trigger" => errors}
       end
 
+      # return [Array]
+      def before_triggers
+        @_before_triggers
+      end
+
+      # return [Array]
+      def after_triggers
+        @_after_triggers
+      end
+
       # The String representation of this Trigger.
       #
       # @return [String]

From 1462b3f71800839c6c73f4f27911776de62e9ca4 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 28 Mar 2018 15:34:16 -0700
Subject: [PATCH 42/95] Simplify trigger command filtering

---
 lib/vagrant/plugin/v2/trigger.rb | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index d30326d17..373b506a1 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -30,11 +30,9 @@ module Vagrant
         # @param [String] guest_name The guest that invoked firing the triggers
         def fire_before_triggers(action, guest_name)
           # get all triggers matching action
-          triggers = []
-          triggers << config.before_triggers.map do |trigger|
-            trigger if trigger.command == action
-          end.compact
-          triggers = triggers.first
+          triggers = config.before_triggers.select do |trigger|
+            trigger.command == action
+          end
           triggers = filter_triggers(triggers, guest_name)
 
           binding.pry
@@ -51,12 +49,10 @@ module Vagrant
         # @param [Symbol] action Vagrant command to fire trigger on
         # @param [String] guest_name The guest that invoked firing the triggers
         def fire_after_triggers(action, guest_name)
-          # get all triggers matching action
           triggers = []
-          triggers << config.after_triggers.map do |trigger|
-            trigger if trigger.command == action
-          end.compact
-          triggers = triggers.first
+          triggers = config.after_triggers.select do |trigger|
+            trigger.command == action
+          end
           triggers = filter_triggers(triggers, guest_name)
 
           binding.pry
@@ -110,12 +106,15 @@ module Vagrant
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run(config)
+          @logger.info("Running script on the host...")
         end
 
         # Runs a script on the host
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run_remote(config)
+          @logger.info("Running script on the guest...")
+          # make sure guest actually exists, if not, display a WARNING
         end
       end
     end

From 0e5cd900f8b8f650a1a80c0284c00b8e55591372 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 28 Mar 2018 15:38:08 -0700
Subject: [PATCH 43/95] Add missing param

---
 lib/vagrant/plugin/v2/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 373b506a1..639b1af8c 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -81,7 +81,7 @@ module Vagrant
         # Fires off all triggers in the given array
         #
         # @param [Array] triggers An array of triggers to be fired
-        def fire(triggers)
+        def fire(triggers, guest_name)
           # ensure on_error is respected by exiting or continuing
 
           triggers.each do |trigger|

From 76418b9fcd954647627eab24ca850ae52db5150a Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 28 Mar 2018 16:22:50 -0700
Subject: [PATCH 44/95] Simplify trigger selection

---
 lib/vagrant/plugin/v2/trigger.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 639b1af8c..39644725d 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -30,9 +30,7 @@ module Vagrant
         # @param [String] guest_name The guest that invoked firing the triggers
         def fire_before_triggers(action, guest_name)
           # get all triggers matching action
-          triggers = config.before_triggers.select do |trigger|
-            trigger.command == action
-          end
+          triggers = config.before_triggers.select { |t| t.command == action }
           triggers = filter_triggers(triggers, guest_name)
 
           binding.pry
@@ -49,10 +47,8 @@ module Vagrant
         # @param [Symbol] action Vagrant command to fire trigger on
         # @param [String] guest_name The guest that invoked firing the triggers
         def fire_after_triggers(action, guest_name)
-          triggers = []
-          triggers = config.after_triggers.select do |trigger|
-            trigger.command == action
-          end
+          # get all triggers matching action
+          triggers = config.after_triggers.select { |t| t.command == action }
           triggers = filter_triggers(triggers, guest_name)
 
           binding.pry

From 6373441ab21da5b57b71ce2001c9fabb7dfd6285 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 28 Mar 2018 16:59:41 -0700
Subject: [PATCH 45/95] Ensure guest name is a string

---
 lib/vagrant/machine.rb           | 4 ++--
 lib/vagrant/plugin/v2/trigger.rb | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 7dd643434..ce2278b3b 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -160,7 +160,7 @@ module Vagrant
     #   as extra data set on the environment hash for the middleware
     #   runner.
     def action(name, opts=nil)
-      @triggers.fire_before_triggers(name, @name)
+      @triggers.fire_before_triggers(name, @name.to_s)
       @logger.info("Calling action: #{name} on provider #{@provider}")
 
       opts ||= {}
@@ -206,7 +206,7 @@ module Vagrant
         action_result
       end
 
-      @triggers.fire_after_triggers(name, @name)
+      @triggers.fire_after_triggers(name, @name.to_s)
     rescue Errors::EnvironmentLockedError
       raise Errors::MachineActionLockedError,
         action: name,
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 39644725d..e6e73f528 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -71,6 +71,8 @@ module Vagrant
         # @param [Array] triggers An array of triggers to be filtered
         # @return [Array] The filtered array of triggers
         def filter_triggers(triggers, guest_name)
+          binding.pry
+          # look for only_on triggers and if it doesn't match guest name, throw it away
           return triggers
         end
 

From 09bb98679cf1d372d9d6b31984a3ac247bd1e07c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 09:08:25 -0700
Subject: [PATCH 46/95] Add basic website pages for triggers

---
 website/source/docs/triggers/configuration.html.md | 10 ++++++++++
 website/source/docs/triggers/index.html.md         | 10 ++++++++++
 website/source/docs/triggers/usage.html.md         | 10 ++++++++++
 website/source/layouts/docs.erb                    |  8 ++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 website/source/docs/triggers/configuration.html.md
 create mode 100644 website/source/docs/triggers/index.html.md
 create mode 100644 website/source/docs/triggers/usage.html.md

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
new file mode 100644
index 000000000..5e26d0e11
--- /dev/null
+++ b/website/source/docs/triggers/configuration.html.md
@@ -0,0 +1,10 @@
+---
+layout: "docs"
+page_title: "Vagrant Triggers Configuration"
+sidebar_current: "triggers-configuration"
+description: |-
+  Description goes here
+---
+
+# Vagrant Triggers Configuration
+
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
new file mode 100644
index 000000000..394695d9d
--- /dev/null
+++ b/website/source/docs/triggers/index.html.md
@@ -0,0 +1,10 @@
+---
+layout: "docs"
+page_title: "Vagrant Triggers"
+sidebar_current: "triggers"
+description: |-
+  Description goes here
+---
+
+# Vagrant Triggers
+
diff --git a/website/source/docs/triggers/usage.html.md b/website/source/docs/triggers/usage.html.md
new file mode 100644
index 000000000..3b8d86d7c
--- /dev/null
+++ b/website/source/docs/triggers/usage.html.md
@@ -0,0 +1,10 @@
+---
+layout: "docs"
+page_title: "Vagrant Triggers Usage"
+sidebar_current: "triggers-usage"
+description: |-
+  Description goes here
+---
+
+# Vagrant Triggers Usage
+
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 984887372..de509850c 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -207,6 +207,14 @@
         </ul>
       </li>
 
+      <li<%= sidebar_current("triggers") %>>
+        <a href="/docs/triggers/">Triggers</a>
+        <ul class="nav">
+          <li<%= sidebar_current("configuration") %>><a href="/docs/triggers/configuration.html">Configuration</a></li>
+          <li<%= sidebar_current("usage") %>><a href="/docs/triggers/usage.html">Usage</a></li>
+        </ul>
+      </li>
+
       <li<%= sidebar_current("other") %>>
         <a href="/docs/other/">Other</a>
         <ul class="nav">

From eac2fcf71e21bb63f16a44da221c51e221e45d40 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 10:22:57 -0700
Subject: [PATCH 47/95] Filter triggers based on only_on restraint

---
 lib/vagrant/plugin/v2/trigger.rb       | 60 +++++++++++++++++++++-----
 plugins/kernel_v2/config/trigger.rb    |  3 ++
 plugins/kernel_v2/config/vm_trigger.rb |  1 -
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index e6e73f528..aaab484a1 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -10,8 +10,7 @@ module Vagrant
         attr_reader :config
 
         # This class is responsible for setting up basic triggers that were
-        # defined inside a Vagrantfile. It should take the Trigger config
-        # and convert it to action hooks.
+        # defined inside a Vagrantfile.
         #
         # @param [Object] env Vagrant environment
         # @param [Object] ui Machines ui object
@@ -33,7 +32,6 @@ module Vagrant
           triggers = config.before_triggers.select { |t| t.command == action }
           triggers = filter_triggers(triggers, guest_name)
 
-          binding.pry
           unless triggers.empty?
             @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
             # TODO I18N me
@@ -51,7 +49,6 @@ module Vagrant
           triggers = config.after_triggers.select { |t| t.command == action }
           triggers = filter_triggers(triggers, guest_name)
 
-          binding.pry
           unless triggers.empty?
             @logger.info("Firing triggers for action #{action} on guest #{guest_name}")
             # TODO I18N me
@@ -66,13 +63,28 @@ module Vagrant
         # Internal methods, don't call these.
         #-------------------------------------------------------------------
 
-        # Filters triggers to be fired based on restraints
+        # Filters triggers to be fired based on configured restraints
         #
         # @param [Array] triggers An array of triggers to be filtered
+        # @param [String] guest_name The name of the current guest
         # @return [Array] The filtered array of triggers
         def filter_triggers(triggers, guest_name)
-          binding.pry
-          # look for only_on triggers and if it doesn't match guest name, throw it away
+          # look for only_on trigger constraint and if it doesn't match guest
+          # name, throw it away also be sure to preserve order
+          filter = triggers.dup
+
+          filter.each do |trigger|
+            index = nil
+            if !trigger.only_on.nil?
+              index = trigger.only_on.index { |i| i.match?(guest_name) }
+            end
+
+            if !index.nil?
+              @logger.debug("Trigger #{trigger.id} will be ignored for #{guest_name}")
+              triggers.delete_at(index)
+            end
+          end
+
           return triggers
         end
 
@@ -83,6 +95,34 @@ module Vagrant
           # ensure on_error is respected by exiting or continuing
 
           triggers.each do |trigger|
+            @logger.debug("Running trigger #{trigger.id}...")
+
+            # TODO: I18n me
+            if !trigger.name.nil?
+              @machine_ui.info("Running trigger: #{trigger.name}...")
+            else
+              @machine_ui.info("Running trigger...")
+            end
+
+            if !trigger.info.nil?
+              @logger.debug("Executing trigger info message...")
+              self.info(trigger.info)
+            end
+
+            if !trigger.warn.nil?
+              @logger.debug("Executing trigger warn message...")
+              self.warn(trigger.info)
+            end
+
+            if !trigger.run.nil?
+              @logger.debug("Executing trigger run script...")
+              self.run(trigger.run, trigger.on_error)
+            end
+
+            if !trigger.run_remote.nil?
+              @logger.debug("Executing trigger run_remote script on #{guest_name}...")
+              self.run_remote(trigger.run, trigger.on_error, guest_name)
+            end
           end
         end
 
@@ -103,15 +143,13 @@ module Vagrant
         # Runs a script on a guest
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
-        def run(config)
-          @logger.info("Running script on the host...")
+        def run(config, on_error)
         end
 
         # Runs a script on the host
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
-        def run_remote(config)
-          @logger.info("Running script on the guest...")
+        def run_remote(config, on_error, guest_name)
           # make sure guest actually exists, if not, display a WARNING
         end
       end
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index c959dd501..3c40135e8 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -4,6 +4,9 @@ require File.expand_path("../vm_trigger", __FILE__)
 module VagrantPlugins
   module Kernel_V2
     class TriggerConfig < Vagrant.plugin("2", :config)
+      # The TriggerConfig class is what gets called when a user
+      # defines a new trigger in their Vagrantfile. The two entry points are
+      # either `config.trigger.before` or `config.trigger.after`.
 
       def initialize
         @logger = Log4r::Logger.new("vagrant::config::trigger")
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index ed09d8900..804cae991 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -103,7 +103,6 @@ module VagrantPlugins
         # Guests are stored internally as strings
         if !@only_on.nil?
           @only_on = Array(@only_on)
-          @only_on.map! { |o| o.to_s }
         end
 
         # Commands must be stored internally as symbols

From bbf4e3c521cea8ee317b50228b646bf986956418 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 10:42:06 -0700
Subject: [PATCH 48/95] Reduce fire trigger methods to a single method

---
 lib/vagrant/machine.rb           |  4 ++--
 lib/vagrant/plugin/v2/trigger.rb | 37 ++++++++++++++------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index ce2278b3b..12ea8b8dc 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -160,7 +160,7 @@ module Vagrant
     #   as extra data set on the environment hash for the middleware
     #   runner.
     def action(name, opts=nil)
-      @triggers.fire_before_triggers(name, @name.to_s)
+      @triggers.fire_triggers(name, :before, @name.to_s)
       @logger.info("Calling action: #{name} on provider #{@provider}")
 
       opts ||= {}
@@ -206,7 +206,7 @@ module Vagrant
         action_result
       end
 
-      @triggers.fire_after_triggers(name, @name.to_s)
+      @triggers.fire_triggers(name, :after, @name.to_s)
     rescue Errors::EnvironmentLockedError
       raise Errors::MachineActionLockedError,
         action: name,
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index aaab484a1..45b611a51 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -23,36 +23,31 @@ module Vagrant
           @logger = Log4r::Logger.new("vagrant::trigger::#{self.class.to_s.downcase}")
         end
 
-        # Fires all before triggers, if any are defined for the action and guest
+        # Fires all triggers, if any are defined for the action and guest
         #
         # @param [Symbol] action Vagrant command to fire trigger on
+        # @param [Symbol] stage :before or :after
         # @param [String] guest_name The guest that invoked firing the triggers
-        def fire_before_triggers(action, guest_name)
+        def fire_triggers(action, stage, guest_name)
           # get all triggers matching action
-          triggers = config.before_triggers.select { |t| t.command == action }
+          triggers = []
+          if stage == :before
+            triggers = config.before_triggers.select { |t| t.command == action }
+          elsif stage == :after
+            triggers = config.after_triggers.select { |t| t.command == action }
+          else
+            # raise error, stage was not given
+            # This is an internal error
+            # TODO: Make sure this error exist
+            raise Errors::Triggers::NoStageGiven
+          end
+
           triggers = filter_triggers(triggers, guest_name)
 
           unless triggers.empty?
             @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
             # TODO I18N me
-            @machine_ui.info("Running triggers before #{action}...")
-            fire(triggers, guest_name)
-          end
-        end
-
-        # Fires all after triggers, if any are defined for the action and guest
-        #
-        # @param [Symbol] action Vagrant command to fire trigger on
-        # @param [String] guest_name The guest that invoked firing the triggers
-        def fire_after_triggers(action, guest_name)
-          # get all triggers matching action
-          triggers = config.after_triggers.select { |t| t.command == action }
-          triggers = filter_triggers(triggers, guest_name)
-
-          unless triggers.empty?
-            @logger.info("Firing triggers for action #{action} on guest #{guest_name}")
-            # TODO I18N me
-            @machine_ui.info("Running triggers after #{action}...")
+            @machine_ui.info("Running triggers #{stage} #{action}...")
             fire(triggers, guest_name)
           end
         end

From 93af398f9e92f7b44ed4b0bfabef1c88a19868c9 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 10:54:49 -0700
Subject: [PATCH 49/95] Update params for NoStageGiven error

---
 lib/vagrant/plugin/v2/trigger.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 45b611a51..83dd075b7 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -39,7 +39,10 @@ module Vagrant
             # raise error, stage was not given
             # This is an internal error
             # TODO: Make sure this error exist
-            raise Errors::Triggers::NoStageGiven
+            raise Errors::Triggers::NoStageGiven,
+              action: action,
+              stage: stage,
+              guest_name: guest_name
           end
 
           triggers = filter_triggers(triggers, guest_name)

From 48b7c682ad6a21314b7b5c7e5d7c157bafa4657e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 11:24:06 -0700
Subject: [PATCH 50/95] Use active machine object

---
 lib/vagrant/machine.rb           |  3 ++-
 lib/vagrant/plugin/v2/trigger.rb | 35 +++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 12ea8b8dc..8633bd196 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -110,7 +110,6 @@ module Vagrant
       @ui              = Vagrant::UI::Prefixed.new(@env.ui, @name)
       @ui_mutex        = Mutex.new
       @state_mutex     = Mutex.new
-      @triggers        = Vagrant::Plugin::V2::Trigger.new(@env, @ui, @config.trigger)
 
       # Read the ID, which is usually in local storage
       @id = nil
@@ -150,6 +149,8 @@ module Vagrant
       # Output a bunch of information about this machine in
       # machine-readable format in case someone is listening.
       @ui.machine("metadata", "provider", provider_name)
+
+      @triggers = Vagrant::Plugin::V2::Trigger.new(@env, @config.trigger, self)
     end
 
     # This calls an action on the provider. The provider may or may not
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 83dd075b7..4dcb1604e 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,4 +1,5 @@
 require 'log4r'
+require "vagrant/util/subprocess"
 
 require 'pry'
 
@@ -13,12 +14,12 @@ module Vagrant
         # defined inside a Vagrantfile.
         #
         # @param [Object] env Vagrant environment
-        # @param [Object] ui Machines ui object
         # @param [Object] config Trigger configuration
-        def initialize(env, ui, config)
-          @env = env
-          @machine_ui = ui
-          @config  = config
+        # @param [Object] machine Active Machine
+        def initialize(env, config, machine)
+          @env        = env
+          @config     = config
+          @machine    = machine
 
           @logger = Log4r::Logger.new("vagrant::trigger::#{self.class.to_s.downcase}")
         end
@@ -50,7 +51,7 @@ module Vagrant
           unless triggers.empty?
             @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
             # TODO I18N me
-            @machine_ui.info("Running triggers #{stage} #{action}...")
+            @machine.ui.info("Running triggers #{stage} #{action}...")
             fire(triggers, guest_name)
           end
         end
@@ -97,9 +98,9 @@ module Vagrant
 
             # TODO: I18n me
             if !trigger.name.nil?
-              @machine_ui.info("Running trigger: #{trigger.name}...")
+              @machine.ui.info("Running trigger: #{trigger.name}...")
             else
-              @machine_ui.info("Running trigger...")
+              @machine.ui.info("Running trigger...")
             end
 
             if !trigger.info.nil?
@@ -128,20 +129,26 @@ module Vagrant
         #
         # @param [String] message The string to be printed
         def info(message)
-          @machine_ui.info(message)
+          @machine.ui.info(message)
         end
 
         # Prints the given message at warn level for a trigger
         #
         # @param [String] message The string to be printed
         def warn(message)
-          @machine_ui.warn(message)
+          @machine.ui.warn(message)
         end
 
         # Runs a script on a guest
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run(config, on_error)
+          begin
+          rescue Error
+            if on_error == :halt
+              raise Error
+            end
+          end
         end
 
         # Runs a script on the host
@@ -149,6 +156,14 @@ module Vagrant
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run_remote(config, on_error, guest_name)
           # make sure guest actually exists, if not, display a WARNING
+          #
+          # get machine, and run shell provisioner on it
+          begin
+          rescue Error
+            if on_error == :halt
+              raise Error
+            end
+          end
         end
       end
     end

From 616b0f9ba6635afa016b218e4d18ad25c2042504 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 11:44:53 -0700
Subject: [PATCH 51/95] Preserve returning environment after machine action
 gets called

---
 lib/vagrant/machine.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 8633bd196..fefbbc376 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -188,7 +188,7 @@ module Vagrant
       locker = @env.method(:lock) if lock && !name.to_s.start_with?("ssh")
 
       # Lock this machine for the duration of this action
-      locker.call("machine-action-#{id}") do
+      return_env = locker.call("machine-action-#{id}") do
         # Get the callable from the provider.
         callable = @provider.action(name)
 
@@ -208,6 +208,8 @@ module Vagrant
       end
 
       @triggers.fire_triggers(name, :after, @name.to_s)
+      # preserve returning environment after machine action runs
+      return return_env
     rescue Errors::EnvironmentLockedError
       raise Errors::MachineActionLockedError,
         action: name,

From 0953287262e56c994f0288e5b5b0b6ac1bec9226 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 11:46:42 -0700
Subject: [PATCH 52/95] Relax only_on rspec tests

only_on can be either a string or regex
---
 .../unit/plugins/kernel_v2/config/vm_trigger_test.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
index 9edae20ea..a98068d29 100644
--- a/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_trigger_test.rb
@@ -66,24 +66,16 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigTrigger do
     before do
       cfg.only_on = :guest
       cfg.ignore = "up"
-      arr_cfg.only_on = [:guest, :other]
+      arr_cfg.only_on = ["guest", /other/]
       arr_cfg.ignore = ["up", "destroy"]
     end
 
-    it "ensures only_on is an array of strings" do
+    it "ensures only_on is an array" do
       cfg.finalize!
       arr_cfg.finalize!
 
       expect(cfg.only_on).to be_a(Array)
       expect(arr_cfg.only_on).to be_a(Array)
-
-      cfg.only_on.each do |a|
-        expect(a).to be_a(String)
-      end
-
-      arr_cfg.only_on.each do |a|
-        expect(a).to be_a(String)
-      end
     end
 
     it "ensures ignore is an array of symbols" do

From fbad4c749d0d84137e63ea90ceecf7f6310974a0 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 12:07:32 -0700
Subject: [PATCH 53/95] Add basic spec test for trigger class

---
 test/unit/vagrant/plugin/v2/trigger_test.rb | 68 +++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 test/unit/vagrant/plugin/v2/trigger_test.rb

diff --git a/test/unit/vagrant/plugin/v2/trigger_test.rb b/test/unit/vagrant/plugin/v2/trigger_test.rb
new file mode 100644
index 000000000..4644ca91d
--- /dev/null
+++ b/test/unit/vagrant/plugin/v2/trigger_test.rb
@@ -0,0 +1,68 @@
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Plugin::V2::Trigger do
+  include_context "unit"
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    isolated_environment.tap do |env|
+      env.vagrantfile("")
+    end
+  end
+  let(:iso_vagrant_env) { iso_env.create_vagrant_env }
+  let(:machine) { iso_vagrant_env.machine(iso_vagrant_env.machine_names[0], :dummy) }
+  let(:config)  { double("config") } # actually flush this out into a trigger config
+  let(:env) { {
+    machine: machine,
+    ui: Vagrant::UI::Silent.new,
+  } }
+
+
+  let(:subject) { described_class.new(env, config, machine) }
+
+  context "firing before triggers" do
+  end
+
+  context "firing after triggers" do
+  end
+
+  context "filtering triggers" do
+  end
+
+  context "firing triggers" do
+  end
+
+  context "executing info" do
+    let(:message) { "Printing some info" }
+
+    it "prints messages at INFO" do
+      output = ""
+      allow(machine.ui).to receive(:info) do |data|
+        output << data
+      end
+
+      subject.send(:info, message)
+      expect(output).to include(message)
+    end
+  end
+
+  context "executing warn" do
+    let(:message) { "Printing some warnings" }
+
+    it "prints messages at WARN" do
+      output = ""
+      allow(machine.ui).to receive(:warn) do |data|
+        output << data
+      end
+
+      subject.send(:warn, message)
+      expect(output).to include(message)
+    end
+  end
+
+  context "executing run" do
+  end
+
+  context "executing run_remote" do
+  end
+end

From d750169f6ea9c8cec6f4c252220bf05f02ab36dd Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 12:08:04 -0700
Subject: [PATCH 54/95] Add some logging around run and run_remote

---
 lib/vagrant/plugin/v2/trigger.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 4dcb1604e..5aaa14704 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,7 +1,7 @@
 require 'log4r'
 require "vagrant/util/subprocess"
 
-require 'pry'
+#require 'pry'
 
 module Vagrant
   module Plugin
@@ -148,6 +148,7 @@ module Vagrant
             if on_error == :halt
               raise Error
             end
+            @logger.debug("Trigger run encountered an error. Continuing on anyway...")
           end
         end
 
@@ -163,6 +164,7 @@ module Vagrant
             if on_error == :halt
               raise Error
             end
+            @logger.debug("Trigger run_remote encountered an error. Continuing on anyway...")
           end
         end
       end

From 975b8e774c0e81b3901ed8463c7faaf4141450c8 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 14:04:28 -0700
Subject: [PATCH 55/95] Get basic run triggers executing inline scripts

---
 lib/vagrant/plugin/v2/trigger.rb | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 5aaa14704..b836cfc3b 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,4 +1,6 @@
 require 'log4r'
+require 'shellwords'
+
 require "vagrant/util/subprocess"
 
 #require 'pry'
@@ -143,12 +145,33 @@ module Vagrant
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run(config, on_error)
+          if !config.inline.nil?
+            cmd = Shellwords.split(config.inline)
+            @machine.ui.info("Running local: Inline script")
+          else
+            @machine.ui.info("Running local: File script #{config.path}")
+          end
+
           begin
-          rescue Error
-            if on_error == :halt
-              raise Error
+            result = Vagrant::Util::Subprocess.execute(*cmd, :notify => [:stdout, :stderr]) do |type,data|
+              case type
+              when :stdout
+                @machine.ui.info(data)
+              when :stderr
+                @machine.ui.warn(data)
+              end
+            end
+
+          rescue Exception => e
+            #binding.pry
+            if on_error == :halt
+              @logger.debug("Trigger run encountered an error. Halting on error...")
+              raise e
+            else
+              @logger.debug("Trigger run encountered an error. Continuing on anyway...")
+              @machine.ui.warn("Trigger run failed:")
+              @machine.ui.warn(e.message)
             end
-            @logger.debug("Trigger run encountered an error. Continuing on anyway...")
           end
         end
 

From 59965f4fd6a72c9e4fcdae87acc2cbd08f15f31f Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 14:04:50 -0700
Subject: [PATCH 56/95] Properly filter triggers

---
 lib/vagrant/plugin/v2/trigger.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index b836cfc3b..fca77775c 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -77,7 +77,11 @@ module Vagrant
           filter.each do |trigger|
             index = nil
             if !trigger.only_on.nil?
-              index = trigger.only_on.index { |i| i.match?(guest_name) }
+              trigger.only_on.each do |o|
+                if o.match?(guest_name)
+                  index = triggers.index(trigger)
+                end
+              end
             end
 
             if !index.nil?

From 8b70abd4d0fe42f01d077b1b15e2eaa1b3766c27 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 14:05:04 -0700
Subject: [PATCH 57/95] Send the correct config message to warn

---
 lib/vagrant/plugin/v2/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index fca77775c..faca79405 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -116,7 +116,7 @@ module Vagrant
 
             if !trigger.warn.nil?
               @logger.debug("Executing trigger warn message...")
-              self.warn(trigger.info)
+              self.warn(trigger.warn)
             end
 
             if !trigger.run.nil?

From e078767b2b5feae2b8b3537a739112fe2aaeea2f Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 15:46:45 -0700
Subject: [PATCH 58/95] run now supports script files as well as inline scripts

---
 lib/vagrant/plugin/v2/trigger.rb | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index faca79405..17c0469c9 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,5 +1,6 @@
 require 'log4r'
 require 'shellwords'
+require 'fileutils'
 
 require "vagrant/util/subprocess"
 
@@ -126,7 +127,7 @@ module Vagrant
 
             if !trigger.run_remote.nil?
               @logger.debug("Executing trigger run_remote script on #{guest_name}...")
-              self.run_remote(trigger.run, trigger.on_error, guest_name)
+              self.run_remote(trigger.run, trigger.on_error)
             end
           end
         end
@@ -149,32 +150,36 @@ module Vagrant
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run(config, on_error)
+          # TODO: I18n me
           if !config.inline.nil?
             cmd = Shellwords.split(config.inline)
-            @machine.ui.info("Running local: Inline script")
+            @machine.ui.info("Executing local: Inline script")
           else
-            @machine.ui.info("Running local: File script #{config.path}")
+            cmd = File.expand_path(config.path, @env.root_path)
+            FileUtils.chmod("+x", cmd) # TODO: what about windows
+            @machine.ui.info("Executing local: File script #{config.path}")
           end
 
           begin
+            # TODO: should we check config or command for sudo? And if so, WARN the user?
             result = Vagrant::Util::Subprocess.execute(*cmd, :notify => [:stdout, :stderr]) do |type,data|
               case type
               when :stdout
-                @machine.ui.info(data)
+                @machine.ui.detail(data)
               when :stderr
-                @machine.ui.warn(data)
+                @machine.ui.error(data)
               end
             end
 
           rescue Exception => e
-            #binding.pry
             if on_error == :halt
               @logger.debug("Trigger run encountered an error. Halting on error...")
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              @machine.ui.warn("Trigger run failed:")
-              @machine.ui.warn(e.message)
+              # TODO: I18n me and write better message
+              @machine.ui.error("Trigger run failed:")
+              @machine.ui.error(e.message)
             end
           end
         end
@@ -182,16 +187,21 @@ module Vagrant
         # Runs a script on the host
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
-        def run_remote(config, on_error, guest_name)
+        def run_remote(config, on_error)
           # make sure guest actually exists, if not, display a WARNING
           #
           # get machine, and run shell provisioner on it
           begin
-          rescue Error
+          rescue Exception => e
             if on_error == :halt
-              raise Error
+              @logger.debug("Trigger run encountered an error. Halting on error...")
+              raise e
+            else
+              @logger.debug("Trigger run encountered an error. Continuing on anyway...")
+              # TODO: I18n me and write better message
+              @machine.ui.error("Trigger run failed:")
+              @machine.ui.error(e.message)
             end
-            @logger.debug("Trigger run_remote encountered an error. Continuing on anyway...")
           end
         end
       end

From fd2878309b71614c3d0d397d73361b79b359f297 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 29 Mar 2018 15:52:46 -0700
Subject: [PATCH 59/95] Move exception warnings in run function

---
 lib/vagrant/plugin/v2/trigger.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 17c0469c9..1eb407a94 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -170,16 +170,17 @@ module Vagrant
                 @machine.ui.error(data)
               end
             end
-
           rescue Exception => e
+            # TODO: I18n me and write better message
+            @machine.ui.error("Trigger run failed:")
+            @machine.ui.error(e.message)
+
             if on_error == :halt
               @logger.debug("Trigger run encountered an error. Halting on error...")
+              # Raise proper Vagrant error to avoid ugly stacktrace
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              # TODO: I18n me and write better message
-              @machine.ui.error("Trigger run failed:")
-              @machine.ui.error(e.message)
             end
           end
         end

From 2c30eab723536371acef431b5a300ef9b2d483b7 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 11:00:08 -0700
Subject: [PATCH 60/95] Don't run local commands as sudo by default

---
 plugins/kernel_v2/config/vm_trigger.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 804cae991..30f53acfb 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -115,6 +115,8 @@ module VagrantPlugins
         if @run && @run.is_a?(Hash)
           new_run = VagrantPlugins::Shell::Config.new()
           new_run.set_options(@run)
+          # don't run local commands as sudo by default
+          new_run.privileged = false
           new_run.finalize!
           @run = new_run
         end

From a4faaa1a4d04cdb74259fb7860b8890c50c408e6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 11:21:33 -0700
Subject: [PATCH 61/95] Provision run_remote using the shell provisioner

---
 lib/vagrant/plugin/v2/trigger.rb | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 1eb407a94..6788bcd94 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -3,6 +3,7 @@ require 'shellwords'
 require 'fileutils'
 
 require "vagrant/util/subprocess"
+require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
 
 #require 'pry'
 
@@ -127,7 +128,7 @@ module Vagrant
 
             if !trigger.run_remote.nil?
               @logger.debug("Executing trigger run_remote script on #{guest_name}...")
-              self.run_remote(trigger.run, trigger.on_error)
+              self.run_remote(trigger.run_remote, trigger.on_error)
             end
           end
         end
@@ -189,10 +190,21 @@ module Vagrant
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run_remote(config, on_error)
-          # make sure guest actually exists, if not, display a WARNING
-          #
-          # get machine, and run shell provisioner on it
+          unless @machine.state.id == :running
+            # TODO: I18n me, improve message, etc
+            @machine.ui.error("Could not run remote script on #{@machine.name} because its state is #{@machine.state.id}")
+            if on_error == :halt
+              raise Errors::Triggers::RunRemoteGuestNotExist
+            else
+              @machine.ui.warn("Trigger configured to continue on error....")
+              return
+            end
+          end
+
+          prov = VagrantPlugins::Shell::Provisioner.new(@machine, config)
+
           begin
+            prov.provision
           rescue Exception => e
             if on_error == :halt
               @logger.debug("Trigger run encountered an error. Halting on error...")

From 8b71c24f909cb1be57a66e33d0623e527c25a7dc Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 11:54:15 -0700
Subject: [PATCH 62/95] Match properly on guests with trigger filtering

---
 lib/vagrant/plugin/v2/trigger.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 6788bcd94..162b086d3 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -5,7 +5,7 @@ require 'fileutils'
 require "vagrant/util/subprocess"
 require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
 
-#require 'pry'
+require 'pry'
 
 module Vagrant
   module Plugin
@@ -78,12 +78,17 @@ module Vagrant
 
           filter.each do |trigger|
             index = nil
+            match = false
             if !trigger.only_on.nil?
               trigger.only_on.each do |o|
                 if o.match?(guest_name)
-                  index = triggers.index(trigger)
+                  # trigger matches on current guest, so we're fine to use it
+                  match = true
+                  break
                 end
               end
+              # no matches found, so don't use trigger for guest
+              index = triggers.index(trigger) unless match == true
             end
 
             if !index.nil?
@@ -182,6 +187,7 @@ module Vagrant
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
+              @machine.ui.warn("Trigger configured to continue on error....")
             end
           end
         end
@@ -194,6 +200,7 @@ module Vagrant
             # TODO: I18n me, improve message, etc
             @machine.ui.error("Could not run remote script on #{@machine.name} because its state is #{@machine.state.id}")
             if on_error == :halt
+              # TODO: Make sure I exist
               raise Errors::Triggers::RunRemoteGuestNotExist
             else
               @machine.ui.warn("Trigger configured to continue on error....")

From a857056136a446397127ac58f3069377897bb16a Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 12:48:16 -0700
Subject: [PATCH 63/95] Update color for run_remote to match shell provisioner
 colors

---
 lib/vagrant/plugin/v2/trigger.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 162b086d3..c8e2cdf5a 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -169,12 +169,15 @@ module Vagrant
           begin
             # TODO: should we check config or command for sudo? And if so, WARN the user?
             result = Vagrant::Util::Subprocess.execute(*cmd, :notify => [:stdout, :stderr]) do |type,data|
+              options = {}
               case type
               when :stdout
-                @machine.ui.detail(data)
+                options[:color] = :green if !config.keep_color
               when :stderr
-                @machine.ui.error(data)
+                options[:color] = :red if !config.keep_color
               end
+
+              @machine.ui.detail(data, options)
             end
           rescue Exception => e
             # TODO: I18n me and write better message

From a1e4fe4411e024bb2d0e569e27924e82405faab5 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 13:07:39 -0700
Subject: [PATCH 64/95] Align how local provisioner looks with shell
 provisioner

---
 lib/vagrant/plugin/v2/trigger.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index c8e2cdf5a..c72fa4659 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -159,11 +159,11 @@ module Vagrant
           # TODO: I18n me
           if !config.inline.nil?
             cmd = Shellwords.split(config.inline)
-            @machine.ui.info("Executing local: Inline script")
+            @machine.ui.detail("Running local: Inline script")
           else
             cmd = File.expand_path(config.path, @env.root_path)
             FileUtils.chmod("+x", cmd) # TODO: what about windows
-            @machine.ui.info("Executing local: File script #{config.path}")
+            @machine.ui.detail("Running local script: #{config.path}")
           end
 
           begin
@@ -195,7 +195,7 @@ module Vagrant
           end
         end
 
-        # Runs a script on the host
+        # Runs a script on the guest
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run_remote(config, on_error)

From 600557ff242b1cc4e6df26d4f913939f6255644f Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 14:25:08 -0700
Subject: [PATCH 65/95] Move strings to translation file

---
 lib/vagrant/errors.rb            |  8 +++++++
 lib/vagrant/plugin/v2/trigger.rb | 40 ++++++++++++++------------------
 templates/locales/en.yml         | 30 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index 128449cf8..a1b3df969 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -776,6 +776,14 @@ module Vagrant
       error_key(:synced_folder_unusable)
     end
 
+    class TriggersGuestNotRunning < VagrantError
+      error_key(:triggers_guest_not_running)
+    end
+
+    class TriggersNoStageGiven < VagrantError
+      error_key(:triggers_no_stage_given)
+    end
+
     class UIExpectsTTY < VagrantError
       error_key(:ui_expects_tty)
     end
diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index c72fa4659..32f782e55 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -5,8 +5,6 @@ require 'fileutils'
 require "vagrant/util/subprocess"
 require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
 
-require 'pry'
-
 module Vagrant
   module Plugin
     module V2
@@ -41,10 +39,7 @@ module Vagrant
           elsif stage == :after
             triggers = config.after_triggers.select { |t| t.command == action }
           else
-            # raise error, stage was not given
-            # This is an internal error
-            # TODO: Make sure this error exist
-            raise Errors::Triggers::NoStageGiven,
+            raise Errors::TriggersNoStageGiven,
               action: action,
               stage: stage,
               guest_name: guest_name
@@ -54,8 +49,7 @@ module Vagrant
 
           unless triggers.empty?
             @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
-            # TODO I18N me
-            @machine.ui.info("Running triggers #{stage} #{action}...")
+            @machine.ui.info(I18n.t("vagrant.trigger.start", stage: stage, action: action))
             fire(triggers, guest_name)
           end
         end
@@ -111,9 +105,10 @@ module Vagrant
 
             # TODO: I18n me
             if !trigger.name.nil?
-              @machine.ui.info("Running trigger: #{trigger.name}...")
+              @machine.ui.info(I18n.t("vagrant.trigger.fire_with_name",
+                                      name: trigger.name))
             else
-              @machine.ui.info("Running trigger...")
+              @machine.ui.info(I18n.t("vagrant.trigger.fire"))
             end
 
             if !trigger.info.nil?
@@ -156,14 +151,13 @@ module Vagrant
         #
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run(config, on_error)
-          # TODO: I18n me
           if !config.inline.nil?
             cmd = Shellwords.split(config.inline)
-            @machine.ui.detail("Running local: Inline script")
+            @machine.ui.detail(I18n.t("vagrant.trigger.run.inline"))
           else
             cmd = File.expand_path(config.path, @env.root_path)
             FileUtils.chmod("+x", cmd) # TODO: what about windows
-            @machine.ui.detail("Running local script: #{config.path}")
+            @machine.ui.detail(I18n.t("vagrant.trigger.run.script", path: config.path))
           end
 
           begin
@@ -180,8 +174,7 @@ module Vagrant
               @machine.ui.detail(data, options)
             end
           rescue Exception => e
-            # TODO: I18n me and write better message
-            @machine.ui.error("Trigger run failed:")
+            @machine.ui.error(I18n.t("vagrant.errors.triggers.run_fail"))
             @machine.ui.error(e.message)
 
             if on_error == :halt
@@ -190,7 +183,7 @@ module Vagrant
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              @machine.ui.warn("Trigger configured to continue on error....")
+              @machine.ui.warn(I18n.t("vagrant.trigger.on_error_continue"))
             end
           end
         end
@@ -200,13 +193,15 @@ module Vagrant
         # @param [ShellProvisioner/Config] config A Shell provisioner config
         def run_remote(config, on_error)
           unless @machine.state.id == :running
-            # TODO: I18n me, improve message, etc
-            @machine.ui.error("Could not run remote script on #{@machine.name} because its state is #{@machine.state.id}")
             if on_error == :halt
-              # TODO: Make sure I exist
-              raise Errors::Triggers::RunRemoteGuestNotExist
+              raise Errors::TriggersGuestNotRunning,
+                machine_name: @machine.name,
+                state: @machine.state.id
             else
-              @machine.ui.warn("Trigger configured to continue on error....")
+              @machine.ui.error(I18n.t("vagrant.errors.triggers_guest_not_running",
+                                        machine_name: @machine.name,
+                                        state: @machine.state.id))
+              @machine.ui.warn(I18n.t("vagrant.trigger.on_error_continue"))
               return
             end
           end
@@ -221,8 +216,7 @@ module Vagrant
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              # TODO: I18n me and write better message
-              @machine.ui.error("Trigger run failed:")
+              @machine.ui.error(I18n.t("vagrant.errors.triggers.run_fail"))
               @machine.ui.error(e.message)
             end
           end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 8f8706f1f..547e5367f 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -279,6 +279,23 @@ en:
       up some disk space.
 
       Press the Enter or Return key to continue.
+
+    trigger:
+      on_error_continue: |-
+        Trigger configured to continue on error...
+      start: |-
+        Running triggers %{stage} %{action} ...
+      fire_with_name: |-
+        Running trigger: %{name}...
+      fire: |-
+        Running trigger...
+      run:
+        inline: |-
+          Running local: Inline script
+        script: |-
+          Running local script: %{path}
+
+
     version_current: |-
       Installed Version: %{version}
     version_latest: |-
@@ -1392,6 +1409,19 @@ en:
         The synced folder type '%{type}' is reporting as unusable for
         your current setup. Please verify you have all the proper
         prerequisites for using this shared folder type and try again.
+
+      triggers_run_fail: |-
+        Trigger run failed
+      triggers_guest_not_running: |-
+        Could not run remote script on %{machine_name} because its state is %{state}
+      triggers_no_stage_given: |-
+        The incorrect stage was given to the trigger plugin:
+        Guest: %{guest_name}
+        Action: %{action}
+        Stage: %{stage}
+
+        This is an internal error that should be reported as a bug.
+
       ui_expects_tty: |-
         Vagrant is attempting to interface with the UI in a way that requires
         a TTY. Most actions in Vagrant that require a TTY have configuration

From 85dedf25d93e7dbdd75559c4d336f90a8186260c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 15:37:03 -0700
Subject: [PATCH 66/95] Ensure that :all triggers don't get filtered out

---
 lib/vagrant/plugin/v2/trigger.rb       | 8 ++++++--
 plugins/kernel_v2/config/vm_trigger.rb | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 32f782e55..c0b0bc478 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -35,9 +35,13 @@ module Vagrant
           # get all triggers matching action
           triggers = []
           if stage == :before
-            triggers = config.before_triggers.select { |t| t.command == action }
+            triggers = config.before_triggers.select do |t|
+              t.command == action || (t.command == :all && !t.ignore.any?(action))
+            end
           elsif stage == :after
-            triggers = config.after_triggers.select { |t| t.command == action }
+            triggers = config.after_triggers.select do |t|
+              t.command == action || (t.command == :all && !t.ignore.any?(action))
+            end
           else
             raise Errors::TriggersNoStageGiven,
               action: action,
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 30f53acfb..91783f150 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -92,7 +92,7 @@ module VagrantPlugins
         @info = nil if @info == UNSET_VALUE
         @warn = nil if @warn == UNSET_VALUE
         @on_error = DEFAULT_ON_ERROR if @on_error == UNSET_VALUE
-        @ignore = nil if @ignore == UNSET_VALUE
+        @ignore = [] if @ignore == UNSET_VALUE
         @run = nil if @run == UNSET_VALUE
         @run_remote = nil if @run_remote == UNSET_VALUE
         @only_on = nil if @only_on == UNSET_VALUE
@@ -139,7 +139,7 @@ module VagrantPlugins
           commands.push(key)
         end
 
-        if !commands.include?(@command)
+        if !commands.include?(@command) && @command != :all
           machine.ui.warn(I18n.t("vagrant.config.triggers.bad_command_warning",
                                 cmd: @command))
         end

From 6ea781940230f249def10d092a637a67193686e8 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 15:37:31 -0700
Subject: [PATCH 67/95] Update rspec tests for trigger plugin

---
 test/unit/vagrant/plugin/v2/trigger_test.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/unit/vagrant/plugin/v2/trigger_test.rb b/test/unit/vagrant/plugin/v2/trigger_test.rb
index 4644ca91d..fe0b0da3b 100644
--- a/test/unit/vagrant/plugin/v2/trigger_test.rb
+++ b/test/unit/vagrant/plugin/v2/trigger_test.rb
@@ -20,19 +20,20 @@ describe Vagrant::Plugin::V2::Trigger do
 
   let(:subject) { described_class.new(env, config, machine) }
 
-  context "firing before triggers" do
+  context "#fire_triggers" do
+    it "raises an error if an inproper stage is given" do
+      expect{ subject.fire_triggers(:up, :not_real, "guest") }.
+       to raise_error(Vagrant::Errors::TriggersNoStageGiven)
+    end
   end
 
-  context "firing after triggers" do
+  context "#filter_triggers" do
   end
 
-  context "filtering triggers" do
+  context "#fire" do
   end
 
-  context "firing triggers" do
-  end
-
-  context "executing info" do
+  context "#info" do
     let(:message) { "Printing some info" }
 
     it "prints messages at INFO" do
@@ -46,7 +47,7 @@ describe Vagrant::Plugin::V2::Trigger do
     end
   end
 
-  context "executing warn" do
+  context "#warn" do
     let(:message) { "Printing some warnings" }
 
     it "prints messages at WARN" do
@@ -60,9 +61,9 @@ describe Vagrant::Plugin::V2::Trigger do
     end
   end
 
-  context "executing run" do
+  context "#run" do
   end
 
-  context "executing run_remote" do
+  context "#run_remote" do
   end
 end

From c83216884612c4f6d223d5650b62636d9d2926b1 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 15:37:43 -0700
Subject: [PATCH 68/95] Update trigger config docs

---
 .../docs/triggers/configuration.html.md       | 24 ++++++++++++++++++-
 website/source/docs/triggers/index.html.md    |  1 +
 website/source/docs/triggers/usage.html.md    |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index 5e26d0e11..2d6f705a7 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -6,5 +6,27 @@ description: |-
   Description goes here
 ---
 
-# Vagrant Triggers Configuration
+# Configuration
 
+## Options
+
+The trigger class takes various options.
+
+* `action` (symbol) - The first argument that comes after either `before` or `after` when defining a new trigger (For example when the action is `:up` : `config.trigger.before :up`).
+Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired.
+
+* `ignore` (symbol, array) - Symbol or array of symbols corresponding to the action that a trigger should not fire on.
+
+* `info` (string) - A message that will be printed at the beginning of a trigger.
+
+* `name` (string) - The name of the trigger
+
+* `on_error` (symbol) - Defines how the trigger should behave if it encounters an error. By default this will be `:halt`, but can be configured to ignore failures and continue on with `:continue`.
+
+* `only_on` (string, regex, array) - Guest or guests to be ignored on the defined trigger. Values can be a string or regex that matches a guest name.
+
+* `run_remote` (hash) - A collection of settings to run a inline or remote script with on the guest. These settings correspond to the [shell provosioner](/docs/provisioning/shell.html).
+
+* `run` (hash) - A collection of settings to run a inline or remote script with on the host. These settings correspond to the [shell provosioner](/docs/provisioning/shell.html).
+
+* `warn` (string) - A warning message that will be printed at the beginning of a trigger.
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index 394695d9d..29882c62e 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -8,3 +8,4 @@ description: |-
 
 # Vagrant Triggers
 
+Some interesting information introducing triggers.
diff --git a/website/source/docs/triggers/usage.html.md b/website/source/docs/triggers/usage.html.md
index 3b8d86d7c..6a81182ac 100644
--- a/website/source/docs/triggers/usage.html.md
+++ b/website/source/docs/triggers/usage.html.md
@@ -6,5 +6,5 @@ description: |-
   Description goes here
 ---
 
-# Vagrant Triggers Usage
+# Usage
 

From ca672eb8e6649269560a39f4bd96faffbc4012ad Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 16:28:23 -0700
Subject: [PATCH 69/95] Trigger plugin cleanup

---
 plugins/kernel_v2/config/trigger.rb    | 7 +------
 plugins/kernel_v2/config/vm_trigger.rb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 3c40135e8..1945ed7a3 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -49,9 +49,6 @@ module VagrantPlugins
           # so the last element should be the "config block"
           # and the rest are commands for the trigger
           blk = command.pop
-        else
-          # TODO:
-          # No config block given at all, validation step should throw error?
         end
 
         command.each do |cmd|
@@ -68,14 +65,12 @@ module VagrantPlugins
       def after(*command, &block)
         command.flatten!
         blk = block
+
         if !block_given? && command.last.is_a?(Hash)
           # We were given a hash rather than a block,
           # so the last element should be the "config block"
           # and the rest are commands for the trigger
           blk = command.pop
-        else
-          # TODO:
-          # No config block given at all, validation step should throw error?
         end
 
         command.each do |cmd|
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 91783f150..4eca2effe 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -17,7 +17,7 @@ module VagrantPlugins
       # Note: This is for internal use only.
       #
       # @return [String]
-      attr_accessor :id
+      attr_reader :id
 
       # Name for the given Trigger. Defaults to nil.
       #

From 3ad4f576c03484066123602f6d3421787f5c605e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 30 Mar 2018 16:28:37 -0700
Subject: [PATCH 70/95] Add only_on validation for config

---
 plugins/kernel_v2/config/vm_trigger.rb | 8 +++++---
 templates/locales/en.yml               | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 4eca2effe..8117a0ed7 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -170,13 +170,15 @@ module VagrantPlugins
 
         if @on_error != :halt
           if @on_error != :continue
-            # must be :halt or :continue
             errors << I18n.t("vagrant.config.triggers.on_error_bad_type", cmd: @command)
           end
         end
 
-        # @ignore validations?
-        # @only_on validations?
+        if !@only_on.nil?
+          if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
+              errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
+          end
+        end
 
         errors
       end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 547e5367f..31bb2e3be 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1715,6 +1715,8 @@ en:
         on_error_bad_type: |-
           Invalid type set for `on_error` on trigger for command '%{cmd}'. `on_error` can
           only be `:halt` (default) or `:continue`.
+        only_on_bad_type: |-
+          Invalid type found for `only_on`. All values must be a `String` or `Regexp`.
         run:
           bad_type: |-
             Invalid type set for `run` on trigger for command '%{cmd}'. `run`

From 693eb2fbbb37cb4b70ce4837103172ed406b12fd Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 2 Apr 2018 13:23:37 -0700
Subject: [PATCH 71/95] Add machine level warning when privileged option is set
 for run

---
 plugins/kernel_v2/config/vm_trigger.rb | 5 +++++
 templates/locales/en.yml               | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 8117a0ed7..2a44ae03c 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -149,6 +149,11 @@ module VagrantPlugins
         if @run
           errorz = @run.validate(machine)
           errors.concat errorz["shell provisioner"] if !errorz.empty?
+
+          if @run.privileged == true
+            machine.ui.warn(I18n.t("vagrant.config.triggers.privileged_ignored",
+                                  command: @command))
+          end
         end
 
         if @run_remote
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 31bb2e3be..e20091fce 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1717,6 +1717,8 @@ en:
           only be `:halt` (default) or `:continue`.
         only_on_bad_type: |-
           Invalid type found for `only_on`. All values must be a `String` or `Regexp`.
+        privileged_ignored: |-
+          The `privileged` setting for option `run` for trigger command '%{command}' will be ignored and set to false.
         run:
           bad_type: |-
             Invalid type set for `run` on trigger for command '%{cmd}'. `run`

From 767a315393caafe20e13a8c8452b169f12bb5e2e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 2 Apr 2018 13:23:57 -0700
Subject: [PATCH 72/95] Trigger cleanup

---
 lib/vagrant/plugin/v2/trigger.rb       | 4 ++--
 plugins/kernel_v2/config/vm_trigger.rb | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index c0b0bc478..5f9d8aeed 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -1,9 +1,9 @@
+require 'fileutils'
 require 'log4r'
 require 'shellwords'
-require 'fileutils'
 
-require "vagrant/util/subprocess"
 require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
+require "vagrant/util/subprocess"
 
 module Vagrant
   module Plugin
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 2a44ae03c..8f71ec5a3 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -180,9 +180,10 @@ module VagrantPlugins
         end
 
         if !@only_on.nil?
-          if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
-              errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
-          end
+          # this check isn't quite right...
+          #if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
+          #    errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
+          #end
         end
 
         errors

From e7d07cb11031d8fadb452b124ef329e5842ec54b Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 2 Apr 2018 15:49:48 -0700
Subject: [PATCH 73/95] Add rspec tests for trigger plugin

---
 test/unit/vagrant/plugin/v2/trigger_test.rb | 222 +++++++++++++++++++-
 1 file changed, 219 insertions(+), 3 deletions(-)

diff --git a/test/unit/vagrant/plugin/v2/trigger_test.rb b/test/unit/vagrant/plugin/v2/trigger_test.rb
index fe0b0da3b..585e63b94 100644
--- a/test/unit/vagrant/plugin/v2/trigger_test.rb
+++ b/test/unit/vagrant/plugin/v2/trigger_test.rb
@@ -1,4 +1,5 @@
 require File.expand_path("../../../../base", __FILE__)
+require Vagrant.source_root.join("plugins/kernel_v2/config/trigger")
 
 describe Vagrant::Plugin::V2::Trigger do
   include_context "unit"
@@ -10,15 +11,32 @@ describe Vagrant::Plugin::V2::Trigger do
     end
   end
   let(:iso_vagrant_env) { iso_env.create_vagrant_env }
-  let(:machine) { iso_vagrant_env.machine(iso_vagrant_env.machine_names[0], :dummy) }
-  let(:config)  { double("config") } # actually flush this out into a trigger config
+  let(:state) { double("state", id: :running) }
+  let(:machine) do
+    iso_vagrant_env.machine(iso_vagrant_env.machine_names[0], :dummy).tap do |m|
+      allow(m).to receive(:state).and_return(state)
+    end
+  end
   let(:env) { {
     machine: machine,
     ui: Vagrant::UI::Silent.new,
   } }
 
+  let(:triggers) { VagrantPlugins::Kernel_V2::TriggerConfig.new }
+  let(:hash_block) { {info: "hi", run: {inline: "echo 'hi'"}} }
+  let(:hash_block_two) { {warn: "WARNING!!", run_remote: {inline: "echo 'hi'"}} }
 
-  let(:subject) { described_class.new(env, config, machine) }
+  before do
+    triggers.before(:up, hash_block)
+    triggers.before(:destroy, hash_block)
+    triggers.before(:halt, hash_block_two)
+    triggers.after(:up, hash_block)
+    triggers.after(:destroy, hash_block)
+    triggers.finalize!
+  end
+
+
+  let(:subject) { described_class.new(env, triggers, machine) }
 
   context "#fire_triggers" do
     it "raises an error if an inproper stage is given" do
@@ -28,9 +46,54 @@ describe Vagrant::Plugin::V2::Trigger do
   end
 
   context "#filter_triggers" do
+    it "returns all triggers if no constraints" do
+      before_triggers = triggers.before_triggers
+      filtered_triggers = subject.send(:filter_triggers, before_triggers, "guest")
+      expect(filtered_triggers).to eq(before_triggers)
+    end
+
+    it "filters a trigger if it doesn't match guest_name" do
+      trigger_config = {info: "no", only_on: "notrealguest"}
+      triggers.after(:up, trigger_config)
+      triggers.finalize!
+
+      after_triggers = triggers.after_triggers
+      expect(after_triggers.size).to eq(3)
+      subject.send(:filter_triggers, after_triggers, "ubuntu")
+      expect(after_triggers.size).to eq(2)
+    end
+
+    it "keeps a trigger that has a restraint that matches guest name" do
+      trigger_config = {info: "no", only_on: /guest/}
+      triggers.after(:up, trigger_config)
+      triggers.finalize!
+
+      after_triggers = triggers.after_triggers
+      expect(after_triggers.size).to eq(3)
+      subject.send(:filter_triggers, after_triggers, "ubuntu-guest")
+      expect(after_triggers.size).to eq(3)
+    end
+
+    it "keeps a trigger that has multiple restraints that matches guest name" do
+      trigger_config = {info: "no", only_on: ["debian", /guest/]}
+      triggers.after(:up, trigger_config)
+      triggers.finalize!
+
+      after_triggers = triggers.after_triggers
+      expect(after_triggers.size).to eq(3)
+      subject.send(:filter_triggers, after_triggers, "ubuntu-guest")
+      expect(after_triggers.size).to eq(3)
+    end
   end
 
   context "#fire" do
+    it "calls the corresponding trigger methods if options set" do
+      expect(subject).to receive(:info).twice
+      expect(subject).to receive(:warn).once
+      expect(subject).to receive(:run).twice
+      expect(subject).to receive(:run_remote).once
+      subject.send(:fire, triggers.before_triggers, "guest")
+    end
   end
 
   context "#info" do
@@ -62,8 +125,161 @@ describe Vagrant::Plugin::V2::Trigger do
   end
 
   context "#run" do
+    let(:trigger_run) { VagrantPlugins::Kernel_V2::TriggerConfig.new }
+    let(:shell_block) { {info: "hi", run: {inline: "echo 'hi'", env: {"KEY"=>"VALUE"}}} }
+    let(:path_block) { {warn: "bye",
+                         run: {path: "script.sh", env: {"KEY"=>"VALUE"}},
+                         on_error: :continue} }
+
+    let(:exit_code) { 0 }
+    let(:options) { {:notify=>[:stdout, :stderr]} }
+
+    let(:subprocess_result) do
+      double("subprocess_result").tap do |result|
+        allow(result).to receive(:exit_code).and_return(exit_code)
+        allow(result).to receive(:stderr).and_return("")
+      end
+    end
+
+    before do
+      trigger_run.after(:up, shell_block)
+      trigger_run.before(:destroy, path_block)
+      trigger_run.finalize!
+    end
+
+    it "executes an inline script" do
+      allow(Vagrant::Util::Subprocess).to receive(:execute).
+        and_return(subprocess_result)
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::Subprocess).to receive(:execute).
+        with("echo", "hi", options)
+      subject.send(:run, shell_config, on_error)
+    end
+
+    it "executes an path script" do
+      allow(Vagrant::Util::Subprocess).to receive(:execute).
+        and_return(subprocess_result)
+      allow(env).to receive(:root_path).and_return("/vagrant/home")
+      allow(FileUtils).to receive(:chmod).and_return(true)
+
+      trigger = trigger_run.before_triggers.first
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::Subprocess).to receive(:execute).
+        with("/vagrant/home/script.sh", options)
+      subject.send(:run, shell_config, on_error)
+    end
+
+    it "continues on error" do
+      allow(Vagrant::Util::Subprocess).to receive(:execute).
+        and_raise("Fail!")
+      allow(env).to receive(:root_path).and_return("/vagrant/home")
+      allow(FileUtils).to receive(:chmod).and_return(true)
+
+      trigger = trigger_run.before_triggers.first
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::Subprocess).to receive(:execute).
+        with("/vagrant/home/script.sh", options)
+      subject.send(:run, shell_config, on_error)
+    end
+
+    it "halts on error" do
+      allow(Vagrant::Util::Subprocess).to receive(:execute).
+        and_raise("Fail!")
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::Subprocess).to receive(:execute).
+        with("echo", "hi", options)
+      expect { subject.send(:run, shell_config, on_error) }.to raise_error("Fail!")
+    end
   end
 
   context "#run_remote" do
+    let (:trigger_run) { VagrantPlugins::Kernel_V2::TriggerConfig.new }
+    let (:shell_block) { {info: "hi", run_remote: {inline: "echo 'hi'", env: {"KEY"=>"VALUE"}}} }
+    let (:path_block) { {warn: "bye",
+                         run_remote: {path: "script.sh", env: {"KEY"=>"VALUE"}},
+                         on_error: :continue} }
+    let(:provision) { double("provision") }
+
+    before do
+      trigger_run.after(:up, shell_block)
+      trigger_run.before(:destroy, path_block)
+      trigger_run.finalize!
+    end
+
+    it "raises an error and halts if guest is not running" do
+      allow(machine.state).to receive(:id).and_return(:not_running)
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run_remote
+      on_error = trigger.on_error
+
+      expect { subject.send(:run_remote, shell_config, on_error) }.
+        to raise_error(Vagrant::Errors::TriggersGuestNotRunning)
+    end
+
+    it "continues on if guest is not running but is configured to continue on error" do
+      allow(machine.state).to receive(:id).and_return(:not_running)
+
+      allow(env).to receive(:root_path).and_return("/vagrant/home")
+      allow(FileUtils).to receive(:chmod).and_return(true)
+
+      trigger = trigger_run.before_triggers.first
+      shell_config = trigger.run_remote
+      on_error = trigger.on_error
+
+      subject.send(:run_remote, shell_config, on_error)
+    end
+
+    it "calls the provision function on the shell provisioner" do
+      allow(machine.state).to receive(:id).and_return(:running)
+      allow(provision).to receive(:provision).and_return("Provision!")
+      allow(VagrantPlugins::Shell::Provisioner).to receive(:new).
+        and_return(provision)
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run_remote
+      on_error = trigger.on_error
+
+      subject.send(:run_remote, shell_config, on_error)
+    end
+
+    it "continues on if provision fails" do
+      allow(machine.state).to receive(:id).and_return(:running)
+      allow(provision).to receive(:provision).and_raise("Nope!")
+      allow(VagrantPlugins::Shell::Provisioner).to receive(:new).
+        and_return(provision)
+
+      trigger = trigger_run.before_triggers.first
+      shell_config = trigger.run_remote
+      on_error = trigger.on_error
+
+      subject.send(:run_remote, shell_config, on_error)
+    end
+
+    it "fails if it encounters an error" do
+      allow(machine.state).to receive(:id).and_return(:running)
+      allow(provision).to receive(:provision).and_raise("Nope!")
+      allow(VagrantPlugins::Shell::Provisioner).to receive(:new).
+        and_return(provision)
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run_remote
+      on_error = trigger.on_error
+
+      expect { subject.send(:run_remote, shell_config, on_error) }.
+        to raise_error("Nope!")
+    end
   end
 end

From 7cdb32f642d5cb6b1aca059b78dec375b4da6885 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 3 Apr 2018 15:32:19 -0700
Subject: [PATCH 74/95] Use inclunde? instead of any? for ruby 2.3

---
 lib/vagrant/plugin/v2/trigger.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 5f9d8aeed..9b1ba5a38 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -36,11 +36,11 @@ module Vagrant
           triggers = []
           if stage == :before
             triggers = config.before_triggers.select do |t|
-              t.command == action || (t.command == :all && !t.ignore.any?(action))
+              t.command == action || (t.command == :all && !t.ignore.include?(action))
             end
           elsif stage == :after
             triggers = config.after_triggers.select do |t|
-              t.command == action || (t.command == :all && !t.ignore.any?(action))
+              t.command == action || (t.command == :all && !t.ignore.include?(action))
             end
           else
             raise Errors::TriggersNoStageGiven,

From a5fe84d64fe54b03319c76519ffd3f1bc14be821 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 3 Apr 2018 15:32:36 -0700
Subject: [PATCH 75/95] Fix string translation

---
 lib/vagrant/plugin/v2/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 9b1ba5a38..5c9e6b242 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -178,7 +178,7 @@ module Vagrant
               @machine.ui.detail(data, options)
             end
           rescue Exception => e
-            @machine.ui.error(I18n.t("vagrant.errors.triggers.run_fail"))
+            @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
             @machine.ui.error(e.message)
 
             if on_error == :halt

From 6bf01965de3e9565273573db1fe6c27be905f19d Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 11:17:31 -0700
Subject: [PATCH 76/95] Fix run command for windows hosts

---
 lib/vagrant/plugin/v2/trigger.rb | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 5c9e6b242..a42887f6b 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -4,6 +4,8 @@ require 'shellwords'
 
 require Vagrant.source_root.join("plugins/provisioners/shell/provisioner")
 require "vagrant/util/subprocess"
+require "vagrant/util/platform"
+require "vagrant/util/powershell"
 
 module Vagrant
   module Plugin
@@ -157,15 +159,27 @@ module Vagrant
         def run(config, on_error)
           if !config.inline.nil?
             cmd = Shellwords.split(config.inline)
+
+            if Vagrant::Util::Platform.windows?
+              powershell_exe = Vagrant::Util::PowerShell.executable
+              cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} '#{cmd.join(' ')}'")
+            end
+
             @machine.ui.detail(I18n.t("vagrant.trigger.run.inline"))
           else
             cmd = File.expand_path(config.path, @env.root_path)
-            FileUtils.chmod("+x", cmd) # TODO: what about windows
+            FileUtils.chmod("+x", cmd)
+
+            if Vagrant::Util::Platform.windows?
+              powershell_exe = Vagrant::Util::PowerShell.executable
+              cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} #{cmd}")
+            end
+
             @machine.ui.detail(I18n.t("vagrant.trigger.run.script", path: config.path))
           end
 
+
           begin
-            # TODO: should we check config or command for sudo? And if so, WARN the user?
             result = Vagrant::Util::Subprocess.execute(*cmd, :notify => [:stdout, :stderr]) do |type,data|
               options = {}
               case type
@@ -220,7 +234,7 @@ module Vagrant
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              @machine.ui.error(I18n.t("vagrant.errors.triggers.run_fail"))
+              @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
               @machine.ui.error(e.message)
             end
           end

From 0054c5aae6ee9f7a0b54b867a20e33fc1f104a53 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 11:31:59 -0700
Subject: [PATCH 77/95] Raise error if incomplete trigger block is defined

---
 lib/vagrant/errors.rb               | 4 ++++
 plugins/kernel_v2/config/trigger.rb | 6 ++++++
 templates/locales/en.yml            | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index a1b3df969..bd9e67c26 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -780,6 +780,10 @@ module Vagrant
       error_key(:triggers_guest_not_running)
     end
 
+    class TriggersNoBlockGiven < VagrantError
+      error_key(:triggers_no_block_given)
+    end
+
     class TriggersNoStageGiven < VagrantError
       error_key(:triggers_no_stage_given)
     end
diff --git a/plugins/kernel_v2/config/trigger.rb b/plugins/kernel_v2/config/trigger.rb
index 1945ed7a3..546901aee 100644
--- a/plugins/kernel_v2/config/trigger.rb
+++ b/plugins/kernel_v2/config/trigger.rb
@@ -49,6 +49,9 @@ module VagrantPlugins
           # so the last element should be the "config block"
           # and the rest are commands for the trigger
           blk = command.pop
+        elsif !block_given?
+          raise Vagrant::Errors::TriggersNoBlockGiven,
+            command: command
         end
 
         command.each do |cmd|
@@ -71,6 +74,9 @@ module VagrantPlugins
           # so the last element should be the "config block"
           # and the rest are commands for the trigger
           blk = command.pop
+        elsif !block_given?
+          raise Vagrant::Errors::TriggersNoBlockGiven,
+            command: command
         end
 
         command.each do |cmd|
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index e20091fce..9d7dac8a4 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1414,6 +1414,9 @@ en:
         Trigger run failed
       triggers_guest_not_running: |-
         Could not run remote script on %{machine_name} because its state is %{state}
+      triggers_no_block_given: |-
+        There was an error parsing the Vagrantfile:
+        No config was given for the trigger(s) %{command}.
       triggers_no_stage_given: |-
         The incorrect stage was given to the trigger plugin:
         Guest: %{guest_name}

From 2dadc0463e8b4c9a7b393a3641096bcb1d876b55 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 14:32:57 -0700
Subject: [PATCH 78/95] Fix trigger doc sidebar

---
 website/source/layouts/docs.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index de509850c..bf17897fe 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -210,8 +210,8 @@
       <li<%= sidebar_current("triggers") %>>
         <a href="/docs/triggers/">Triggers</a>
         <ul class="nav">
-          <li<%= sidebar_current("configuration") %>><a href="/docs/triggers/configuration.html">Configuration</a></li>
-          <li<%= sidebar_current("usage") %>><a href="/docs/triggers/usage.html">Usage</a></li>
+          <li<%= sidebar_current("triggers-configuration") %>><a href="/docs/triggers/configuration.html">Configuration</a></li>
+          <li<%= sidebar_current("triggers-usage") %>><a href="/docs/triggers/usage.html">Usage</a></li>
         </ul>
       </li>
 

From a20404599e3141d43c43cbf1b4c1cc822fb59e9c Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 15:00:26 -0700
Subject: [PATCH 79/95] Add trigger documentation

---
 .../docs/triggers/configuration.html.md       |  9 +-
 website/source/docs/triggers/index.html.md    | 89 ++++++++++++++++++-
 2 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index 2d6f705a7..b0120a1a4 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -3,23 +3,26 @@ layout: "docs"
 page_title: "Vagrant Triggers Configuration"
 sidebar_current: "triggers-configuration"
 description: |-
-  Description goes here
+  Documentation of various configuration options for Vagrnat Triggers
 ---
 
 # Configuration
 
+Vagrant Triggers has a few various options that can be set which define how the
+trigger should behave.
+
 ## Options
 
 The trigger class takes various options.
 
-* `action` (symbol) - The first argument that comes after either `before` or `after` when defining a new trigger (For example when the action is `:up` : `config.trigger.before :up`).
+* `action` (symbol) - The first argument that comes after either __before__ or __after__ when defining a new trigger (For example when the action is `:up` : `config.trigger.before :up`).
 Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired.
 
 * `ignore` (symbol, array) - Symbol or array of symbols corresponding to the action that a trigger should not fire on.
 
 * `info` (string) - A message that will be printed at the beginning of a trigger.
 
-* `name` (string) - The name of the trigger
+* `name` (string) - The name of the trigger. If set, the name will be displayed when firing the trigger.
 
 * `on_error` (symbol) - Defines how the trigger should behave if it encounters an error. By default this will be `:halt`, but can be configured to ignore failures and continue on with `:continue`.
 
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index 29882c62e..e9fca84d4 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -3,9 +3,94 @@ layout: "docs"
 page_title: "Vagrant Triggers"
 sidebar_current: "triggers"
 description: |-
-  Description goes here
+  Introduction to Vagrant Triggers
 ---
 
 # Vagrant Triggers
 
-Some interesting information introducing triggers.
+As of version 2.1.0, Vagrant is capable of executing machine triggers _before_ or
+_after_ Vagrant commands.
+
+Each trigger is expected to be given a command key for when it should be fired
+during the Vagrant command life cycle. These could be defined as a single key or
+an array which acts like a _whitelist_ for the defined trigger.
+
+
+```ruby
+# single command trigger
+config.trigger.after :up do |trigger|
+...
+end
+
+# multiple commands for this trigger
+config.trigger.before [:up, :destroy, :halt, :package] do |trigger|
+...
+end
+
+# or defined as a splat list
+config.trigger.before :up, :destroy, :halt, :package do |trigger|
+...
+end
+```
+
+Alternatively, the key `:all` could be given which would run the trigger for every
+Vagrant command. This trigger will run before or after every Vagrant command.
+This must include the ability to blacklist a command so that the trigger isn’t
+run. The blacklist will be defined within the `:all` config block.
+
+```ruby
+# single command trigger
+config.trigger.before :all do |trigger|
+  trigger.info = "Running a before trigger!"
+  trigger.ignore = [:destroy, :package]
+end
+```
+
+__Note:__ _If a trigger is defined on a command that does not exist, a warning
+will be displayed._
+
+Triggers can be defined as a block or hash in a Vagrantfile. The example below
+will result in the same trigger:
+
+
+```ruby
+config.trigger.after :up do |trigger|
+  trigger.name = "Finished Message"
+  trigger.info = "Machine is up!"
+end
+
+config.trigger.after :up,
+  name: "Finished Message",
+  info: "Machine is up!"
+```
+
+Triggers can also be defined within the scope of guests in a Vagrantfile. These
+triggers will only run on the configured guest. An example of a guest only trigger:
+
+```ruby
+config.vm.define "ubuntu" do |ubuntu|
+  ubuntu.vm.box = "ubuntu"
+  ubuntu.trigger.before :destroy do |trigger|
+    trigger.warn "Dumping database to /vagrant/outfile"
+    trigger.run_remote "pg_dump dbname > /vagrant/outfile"
+  end
+end
+```
+
+Global and machine scopped triggers will execute in the order that they are
+defined within a Vagrantfile. Take for example an abstracted Vagrantfile:
+
+```
+Vagrantfile
+  global trigger 1
+  global trigger 2
+  machine defined
+    machine trigger 3
+  global trigger 4
+end
+```
+
+In this generic case, the triggers would fire in the order: 1 -> 2 -> 3 -> 4
+
+For more information about what options are available for triggers, see the
+[configuration section](/docs/triggers/configuration.html).

From e0806f623c6b4f7b81909792eb4d619d9aba56f6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 15:02:21 -0700
Subject: [PATCH 80/95] Remove TODO

---
 lib/vagrant/plugin/v2/trigger.rb       | 1 -
 plugins/kernel_v2/config/vm_trigger.rb | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index a42887f6b..4fe0d038e 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -109,7 +109,6 @@ module Vagrant
           triggers.each do |trigger|
             @logger.debug("Running trigger #{trigger.id}...")
 
-            # TODO: I18n me
             if !trigger.name.nil?
               @machine.ui.info(I18n.t("vagrant.trigger.fire_with_name",
                                       name: trigger.name))
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 8f71ec5a3..9fa7ebba9 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -144,8 +144,6 @@ module VagrantPlugins
                                 cmd: @command))
         end
 
-        # TODO: Does it make sense to strip out the "shell provisioner" error key here?
-        #       We could add more context around triggers?
         if @run
           errorz = @run.validate(machine)
           errors.concat errorz["shell provisioner"] if !errorz.empty?
@@ -179,13 +177,6 @@ module VagrantPlugins
           end
         end
 
-        if !@only_on.nil?
-          # this check isn't quite right...
-          #if @only_on.all? { |o| !o.is_a?(String) || !o.is_a?(Regexp) }
-          #    errors << I18n.t("vagrant.config.triggers.only_on_bad_type")
-          #end
-        end
-
         errors
       end
 

From c35e0a4f9a502a36d59e86d19581f1e90bdf27b2 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 16:20:27 -0700
Subject: [PATCH 81/95] Update docs with some basic trigger examples

---
 lib/vagrant/plugin/v2/trigger.rb           |  1 -
 website/source/docs/triggers/index.html.md |  4 +-
 website/source/docs/triggers/usage.html.md | 66 +++++++++++++++++++++-
 3 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 4fe0d038e..30b420a60 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -196,7 +196,6 @@ module Vagrant
 
             if on_error == :halt
               @logger.debug("Trigger run encountered an error. Halting on error...")
-              # Raise proper Vagrant error to avoid ugly stacktrace
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index e9fca84d4..ac24fb635 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -71,8 +71,8 @@ triggers will only run on the configured guest. An example of a guest only trigg
 config.vm.define "ubuntu" do |ubuntu|
   ubuntu.vm.box = "ubuntu"
   ubuntu.trigger.before :destroy do |trigger|
-    trigger.warn "Dumping database to /vagrant/outfile"
-    trigger.run_remote "pg_dump dbname > /vagrant/outfile"
+    trigger.warn = "Dumping database to /vagrant/outfile"
+    trigger.run_remote {inline: "pg_dump dbname > /vagrant/outfile"}
   end
 end
 ```
diff --git a/website/source/docs/triggers/usage.html.md b/website/source/docs/triggers/usage.html.md
index 6a81182ac..a8cb54d0f 100644
--- a/website/source/docs/triggers/usage.html.md
+++ b/website/source/docs/triggers/usage.html.md
@@ -3,8 +3,70 @@ layout: "docs"
 page_title: "Vagrant Triggers Usage"
 sidebar_current: "triggers-usage"
 description: |-
-  Description goes here
+  Various Vagrant Triggers examples
 ---
 
-# Usage
+# Basic Usage
 
+Below are some very simple examples of how to use Vagrant Triggers.
+
+## Examples
+
+Running a remote script to save a database on your host before __destroy__ing a
+guest:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "ubuntu" do |ubuntu|
+    ubuntu.vm.box = "ubuntu"
+
+    ubuntu.trigger.before :destroy do |trigger|
+      trigger.warn = "Dumping database to /vagrant/outfile"
+      trigger.run_remote = {inline: "pg_dump dbname > /vagrant/outfile"}
+    end
+  end
+end
+```
+
+Now that the trigger is defined, running the __destroy__ command will fire off
+the defined trigger before Vagrant destroys the machine.
+
+```shell
+$ vagrant destroy ubuntu
+```
+
+An example of defining three triggers that start and stop tinyproxy on your host
+machine using homebrew:
+
+```shell
+#/bin/bash
+# start-tinyproxy.sh
+brew services start tinyproxy
+```
+
+```shell
+#/bin/bash
+# stop-tinyproxy.sh
+brew services stop tinyproxy
+```
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "ubuntu" do |ubuntu|
+    ubuntu.vm.box = "ubuntu"
+
+    ubuntu.trigger.before :up do |trigger|
+      trigger.info = "Starting tinyproxy..."
+      trigger.run = {path: "start-tinyproxy.sh"}
+    end
+
+    ubuntu.trigger.after :destroy, :halt do |trigger|
+      trigger.info = "Stopping tinyproxy..."
+      trigger.run = {path: "stop-tinyproxy.sh"}
+    end
+  end
+end
+```
+
+Running `vagrant up` would fire the before trigger to start tinyproxy, where as
+running either `vagrant destroy` or `vagrant halt` would stop tinyproxy.

From 8451cbf8542265c2e7872e9ef38c910b8a1a96a3 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Wed, 4 Apr 2018 16:48:16 -0700
Subject: [PATCH 82/95] Move up location of error message

---
 lib/vagrant/plugin/v2/trigger.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 30b420a60..0e56fd4b2 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -227,12 +227,13 @@ module Vagrant
           begin
             prov.provision
           rescue Exception => e
+            @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
+
             if on_error == :halt
               @logger.debug("Trigger run encountered an error. Halting on error...")
               raise e
             else
               @logger.debug("Trigger run encountered an error. Continuing on anyway...")
-              @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
               @machine.ui.error(e.message)
             end
           end

From 4e5e4d02144e8a9c5d75ac8260cf72c37337f97b Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 5 Apr 2018 09:08:09 -0700
Subject: [PATCH 83/95] Use args setting for run option in trigger

---
 lib/vagrant/plugin/v2/trigger.rb                   | 4 ++++
 website/source/docs/triggers/configuration.html.md | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 0e56fd4b2..08e67a8f1 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -169,9 +169,13 @@ module Vagrant
             cmd = File.expand_path(config.path, @env.root_path)
             FileUtils.chmod("+x", cmd)
 
+            cmd << " #{config.args.join(' ' )}" if config.args
+
             if Vagrant::Util::Platform.windows?
               powershell_exe = Vagrant::Util::PowerShell.executable
               cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} #{cmd}")
+            else
+              cmd = Shellwords.split(cmd)
             end
 
             @machine.ui.detail(I18n.t("vagrant.trigger.run.script", path: config.path))
diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index b0120a1a4..4fa90b7d9 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -30,6 +30,10 @@ Can be any valid Vagrant command. It also accepts a special value `:all` which w
 
 * `run_remote` (hash) - A collection of settings to run a inline or remote script with on the guest. These settings correspond to the [shell provosioner](/docs/provisioning/shell.html).
 
-* `run` (hash) - A collection of settings to run a inline or remote script with on the host. These settings correspond to the [shell provosioner](/docs/provisioning/shell.html).
+* `run` (hash) - A collection of settings to run a inline or remote script with on the host. These settings correspond to the [shell provosioner](/docs/provisioning/shell.html). However, at the moment the only settings `run` takes advantage of are:
+  + `args`
+  + `inline`
+  + `path`
+  + `powershell_args`
 
 * `warn` (string) - A warning message that will be printed at the beginning of a trigger.

From 6f2b5a9fa0a23ad61fab427ace508be2b7baedde Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 5 Apr 2018 13:56:21 -0700
Subject: [PATCH 84/95] Update trigger docs

---
 website/source/docs/triggers/configuration.html.md | 3 +--
 website/source/docs/triggers/index.html.md         | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index 4fa90b7d9..f66333a79 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -15,8 +15,7 @@ trigger should behave.
 
 The trigger class takes various options.
 
-* `action` (symbol) - The first argument that comes after either __before__ or __after__ when defining a new trigger (For example when the action is `:up` : `config.trigger.before :up`).
-Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired.
+* `action` (symbol, array) - Expected to be a single symbol value, an array of symbols, or a _splat_ of symbols. The first argument that comes after either __before__ or __after__ when defining a new trigger. Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired.
 
 * `ignore` (symbol, array) - Symbol or array of symbols corresponding to the action that a trigger should not fire on.
 
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index ac24fb635..074e09f1d 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -34,9 +34,9 @@ end
 ```
 
 Alternatively, the key `:all` could be given which would run the trigger for every
-Vagrant command. This trigger will run before or after every Vagrant command.
-This must include the ability to blacklist a command so that the trigger isn’t
-run. The blacklist will be defined within the `:all` config block.
+Vagrant command. This trigger will run before or after every Vagrant command. If
+there is a command you don't want the trigger to run on, you can ignore that
+command with the `ignore` option.
 
 ```ruby
 # single command trigger

From 5e9387dca80451648126289e103ae8ff820e689a Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 5 Apr 2018 14:19:35 -0700
Subject: [PATCH 85/95] Add basic triggers example

---
 website/source/docs/triggers/usage.html.md | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/website/source/docs/triggers/usage.html.md b/website/source/docs/triggers/usage.html.md
index a8cb54d0f..1266572d3 100644
--- a/website/source/docs/triggers/usage.html.md
+++ b/website/source/docs/triggers/usage.html.md
@@ -12,6 +12,29 @@ Below are some very simple examples of how to use Vagrant Triggers.
 
 ## Examples
 
+The following is a basic example of two global triggers. One that runs _before_
+the `:up` command and one that runs _after_ the `:up` command:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.trigger.before :up do |trigger|
+    trigger.name = "Hello world"
+    trigger.info = "I am running before vagrant up!!"
+  end
+
+  config.trigger.before :up do |trigger|
+    trigger.name = "Hello world"
+    trigger.info = "I am running after vagrant up!!"
+  end
+
+  config.vm.define "ubuntu" do |ubuntu|
+    ubuntu.vm.box = "ubuntu"
+  end
+end
+```
+
+These will run before and after each defined guest in the Vagrantfile.
+
 Running a remote script to save a database on your host before __destroy__ing a
 guest:
 

From 12b1a3dfe4b8826d9ed957b80f8dda8026551c56 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Thu, 5 Apr 2018 14:59:02 -0700
Subject: [PATCH 86/95] Update triggers based on code review

---
 lib/vagrant/plugin/v2/trigger.rb       | 35 +++++++++++---------------
 plugins/kernel_v2/config/vm_trigger.rb |  4 +--
 templates/locales/en.yml               |  1 +
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 08e67a8f1..007d7aab7 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -11,7 +11,7 @@ module Vagrant
   module Plugin
     module V2
       class Trigger
-        # @return [Kernel_V2/Config/Trigger]
+        # @return [Kernel_V2::Config::Trigger]
         attr_reader :config
 
         # This class is responsible for setting up basic triggers that were
@@ -53,7 +53,7 @@ module Vagrant
 
           triggers = filter_triggers(triggers, guest_name)
 
-          unless triggers.empty?
+          if !triggers.empty?
             @logger.info("Firing trigger for action #{action} on guest #{guest_name}")
             @machine.ui.info(I18n.t("vagrant.trigger.start", stage: stage, action: action))
             fire(triggers, guest_name)
@@ -79,7 +79,7 @@ module Vagrant
           filter.each do |trigger|
             index = nil
             match = false
-            if !trigger.only_on.nil?
+            if trigger.only_on
               trigger.only_on.each do |o|
                 if o.match?(guest_name)
                   # trigger matches on current guest, so we're fine to use it
@@ -116,24 +116,20 @@ module Vagrant
               @machine.ui.info(I18n.t("vagrant.trigger.fire"))
             end
 
-            if !trigger.info.nil?
-              @logger.debug("Executing trigger info message...")
-              self.info(trigger.info)
+            if trigger.info
+              info(trigger.info)
             end
 
-            if !trigger.warn.nil?
-              @logger.debug("Executing trigger warn message...")
-              self.warn(trigger.warn)
+            if trigger.warn
+              warn(trigger.warn)
             end
 
-            if !trigger.run.nil?
-              @logger.debug("Executing trigger run script...")
-              self.run(trigger.run, trigger.on_error)
+            if trigger.run
+              run(trigger.run, trigger.on_error)
             end
 
-            if !trigger.run_remote.nil?
-              @logger.debug("Executing trigger run_remote script on #{guest_name}...")
-              self.run_remote(trigger.run_remote, trigger.on_error)
+            if trigger.run_remote
+              run_remote(trigger.run_remote, trigger.on_error)
             end
           end
         end
@@ -154,7 +150,7 @@ module Vagrant
 
         # Runs a script on a guest
         #
-        # @param [ShellProvisioner/Config] config A Shell provisioner config
+        # @param [Provisioners::Shell::Config] config A Shell provisioner config
         def run(config, on_error)
           if !config.inline.nil?
             cmd = Shellwords.split(config.inline)
@@ -164,10 +160,9 @@ module Vagrant
               cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} '#{cmd.join(' ')}'")
             end
 
-            @machine.ui.detail(I18n.t("vagrant.trigger.run.inline"))
+            @machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline))
           else
             cmd = File.expand_path(config.path, @env.root_path)
-            FileUtils.chmod("+x", cmd)
 
             cmd << " #{config.args.join(' ' )}" if config.args
 
@@ -194,7 +189,7 @@ module Vagrant
 
               @machine.ui.detail(data, options)
             end
-          rescue Exception => e
+          rescue => e
             @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
             @machine.ui.error(e.message)
 
@@ -230,7 +225,7 @@ module Vagrant
 
           begin
             prov.provision
-          rescue Exception => e
+          rescue => e
             @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail"))
 
             if on_error == :halt
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 9fa7ebba9..98969fab7 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -113,7 +113,7 @@ module VagrantPlugins
 
         # Convert @run and @run_remote to be a "Shell provisioner" config
         if @run && @run.is_a?(Hash)
-          new_run = VagrantPlugins::Shell::Config.new()
+          new_run = VagrantPlugins::Shell::Config.new
           new_run.set_options(@run)
           # don't run local commands as sudo by default
           new_run.privileged = false
@@ -122,7 +122,7 @@ module VagrantPlugins
         end
 
         if @run_remote && @run_remote.is_a?(Hash)
-          new_run = VagrantPlugins::Shell::Config.new()
+          new_run = VagrantPlugins::Shell::Config.new
           new_run.set_options(@run_remote)
           new_run.finalize!
           @run_remote = new_run
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 9d7dac8a4..11b8eb807 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -292,6 +292,7 @@ en:
       run:
         inline: |-
           Running local: Inline script
+          %{command}
         script: |-
           Running local script: %{path}
 

From 188fd5d6a666c1235f9d33e4a8701617c66aa02e Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 6 Apr 2018 10:58:39 -0700
Subject: [PATCH 87/95] Split out run methods with Powershell functions

---
 lib/vagrant/plugin/v2/trigger.rb | 29 ++++++++++++++---------------
 lib/vagrant/util/powershell.rb   | 21 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 007d7aab7..1f7242bab 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -152,33 +152,32 @@ module Vagrant
         #
         # @param [Provisioners::Shell::Config] config A Shell provisioner config
         def run(config, on_error)
-          if !config.inline.nil?
+          if config.inline
             cmd = Shellwords.split(config.inline)
 
-            if Vagrant::Util::Platform.windows?
-              powershell_exe = Vagrant::Util::PowerShell.executable
-              cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} '#{cmd.join(' ')}'")
-            end
-
             @machine.ui.detail(I18n.t("vagrant.trigger.run.inline", command: config.inline))
           else
             cmd = File.expand_path(config.path, @env.root_path)
-
             cmd << " #{config.args.join(' ' )}" if config.args
-
-            if Vagrant::Util::Platform.windows?
-              powershell_exe = Vagrant::Util::PowerShell.executable
-              cmd = Shellwords.split("#{powershell_exe} #{config.powershell_args} #{cmd}")
-            else
-              cmd = Shellwords.split(cmd)
-            end
+            cmd = Shellwords.split(cmd)
 
             @machine.ui.detail(I18n.t("vagrant.trigger.run.script", path: config.path))
           end
 
+          # Pick an execution method to run the script or inline string with
+          # Default to Subprocess::Execute
+          exec_method = Vagrant::Util::Subprocess.method(:execute)
+
+          if Vagrant::Util::Platform.windows?
+            if config.inline
+              exec_method = Vagrant::Util::PowerShell.method(:execute_inline)
+            else
+              exec_method = Vagrant::Util::PowerShell.method(:execute)
+            end
+          end
 
           begin
-            result = Vagrant::Util::Subprocess.execute(*cmd, :notify => [:stdout, :stderr]) do |type,data|
+            result = exec_method.call(*cmd, :notify => [:stdout, :stderr]) do |type,data|
               options = {}
               case type
               when :stdout
diff --git a/lib/vagrant/util/powershell.rb b/lib/vagrant/util/powershell.rb
index 7c96485ea..4ffa0a75b 100644
--- a/lib/vagrant/util/powershell.rb
+++ b/lib/vagrant/util/powershell.rb
@@ -87,6 +87,27 @@ module Vagrant
         return r.stdout.chomp
       end
 
+      # Execute a powershell command and return a result
+      #
+      # @param [String] command PowerShell command to execute.
+      # @param [Hash] opts A collection of options for subprocess::execute
+      # @param [Block] block Ruby block
+      def self.execute_inline(*command, **opts, &block)
+        validate_install!
+        c = [
+          executable,
+          "-NoLogo",
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy", "Bypass",
+          "-Command",
+          command
+        ].flatten.compact
+        c << opts
+
+        Subprocess.execute(*c, &block)
+      end
+
       # Returns the version of PowerShell that is installed.
       #
       # @return [String]

From e25cb51f1539672905f7942e7cc1298c3269a5a3 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 6 Apr 2018 11:23:43 -0700
Subject: [PATCH 88/95] Properly print warnings on config settings that aren't
 supported

---
 plugins/kernel_v2/config/vm_trigger.rb          | 17 +++++++++++++++--
 templates/locales/en.yml                        |  2 ++
 .../source/docs/triggers/configuration.html.md  |  1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index 98969fab7..beeb812a1 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -113,10 +113,19 @@ module VagrantPlugins
 
         # Convert @run and @run_remote to be a "Shell provisioner" config
         if @run && @run.is_a?(Hash)
+          # Powershell args and privileged for run commands is currently not supported
+          # so by default use empty string or false if unset. This helps the validate
+          # function determine if the setting was purposefully set, to print a warning
+          if !@run.key?(:powershell_args)
+            @run[:powershell_args] = ""
+          end
+
+          if !@run.key?(:privileged)
+            @run[:privileged] = false
+          end
+
           new_run = VagrantPlugins::Shell::Config.new
           new_run.set_options(@run)
-          # don't run local commands as sudo by default
-          new_run.privileged = false
           new_run.finalize!
           @run = new_run
         end
@@ -152,6 +161,10 @@ module VagrantPlugins
             machine.ui.warn(I18n.t("vagrant.config.triggers.privileged_ignored",
                                   command: @command))
           end
+
+          if @run.powershell_args != ""
+            machine.ui.warn(I18n.t("vagrant.config.triggers.powershell_args_ignored"))
+          end
         end
 
         if @run_remote
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 11b8eb807..a18676f44 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1723,6 +1723,8 @@ en:
           Invalid type found for `only_on`. All values must be a `String` or `Regexp`.
         privileged_ignored: |-
           The `privileged` setting for option `run` for trigger command '%{command}' will be ignored and set to false.
+        powershell_args_ignored: |-
+          The setting `powershell_args` is not supported for the trigger option `run` and will be ignored.
         run:
           bad_type: |-
             Invalid type set for `run` on trigger for command '%{cmd}'. `run`
diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index f66333a79..6ba3ddd1d 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -33,6 +33,5 @@ The trigger class takes various options.
   + `args`
   + `inline`
   + `path`
-  + `powershell_args`
 
 * `warn` (string) - A warning message that will be printed at the beginning of a trigger.

From bd133e172714668dc7301b515a7182189c24bc31 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 6 Apr 2018 11:34:23 -0700
Subject: [PATCH 89/95] Docs updates for triggers

---
 website/source/docs/triggers/index.html.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index 074e09f1d..58e82cd99 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -33,16 +33,15 @@ config.trigger.before :up, :destroy, :halt, :package do |trigger|
 end
 ```
 
-Alternatively, the key `:all` could be given which would run the trigger for every
-Vagrant command. This trigger will run before or after every Vagrant command. If
-there is a command you don't want the trigger to run on, you can ignore that
-command with the `ignore` option.
+Alternatively, the key `:all` could be given which would run the trigger before
+or after every Vagrant command. If there is a command you don't want the trigger
+to run on, you can ignore that command with the `ignore` option.
 
 ```ruby
 # single command trigger
 config.trigger.before :all do |trigger|
   trigger.info = "Running a before trigger!"
-  trigger.ignore = [:destroy, :package]
+  trigger.ignore = [:destroy, :halt]
 end
 ```
 

From 2000a11042c7d0cd6b83be91811015ef959c8c71 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 6 Apr 2018 16:25:14 -0700
Subject: [PATCH 90/95] Add tests for powershell run functions

---
 test/unit/vagrant/plugin/v2/trigger_test.rb | 34 +++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/test/unit/vagrant/plugin/v2/trigger_test.rb b/test/unit/vagrant/plugin/v2/trigger_test.rb
index 585e63b94..8c44a5316 100644
--- a/test/unit/vagrant/plugin/v2/trigger_test.rb
+++ b/test/unit/vagrant/plugin/v2/trigger_test.rb
@@ -131,6 +131,10 @@ describe Vagrant::Plugin::V2::Trigger do
                          run: {path: "script.sh", env: {"KEY"=>"VALUE"}},
                          on_error: :continue} }
 
+    let(:path_block_ps1) { {warn: "bye",
+                         run: {path: "script.ps1", env: {"KEY"=>"VALUE"}},
+                         on_error: :continue} }
+
     let(:exit_code) { 0 }
     let(:options) { {:notify=>[:stdout, :stderr]} }
 
@@ -144,9 +148,39 @@ describe Vagrant::Plugin::V2::Trigger do
     before do
       trigger_run.after(:up, shell_block)
       trigger_run.before(:destroy, path_block)
+      trigger_run.before(:destroy, path_block_ps1)
       trigger_run.finalize!
     end
 
+    it "executes an inline script with powershell if windows" do
+      allow(Vagrant::Util::Platform).to receive(:windows?).and_return(true)
+      allow(Vagrant::Util::PowerShell).to receive(:execute_inline).
+        and_return(subprocess_result)
+
+      trigger = trigger_run.after_triggers.first
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::PowerShell).to receive(:execute_inline).
+        with("echo", "hi", options)
+      subject.send(:run, shell_config, on_error)
+    end
+
+    it "executes an path script with powershell if windows" do
+      allow(Vagrant::Util::Platform).to receive(:windows?).and_return(true)
+      allow(Vagrant::Util::PowerShell).to receive(:execute).
+        and_return(subprocess_result)
+      allow(env).to receive(:root_path).and_return("/vagrant/home")
+
+      trigger = trigger_run.before_triggers[1]
+      shell_config = trigger.run
+      on_error = trigger.on_error
+
+      expect(Vagrant::Util::PowerShell).to receive(:execute).
+        with("/vagrant/home/script.ps1", options)
+      subject.send(:run, shell_config, on_error)
+    end
+
     it "executes an inline script" do
       allow(Vagrant::Util::Subprocess).to receive(:execute).
         and_return(subprocess_result)

From a1ca29c5e4e9cf84e385d18cbe4e4ca8e7583ce6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 17 Apr 2018 09:00:45 -0700
Subject: [PATCH 91/95] Add warn and info validation translation strings

---
 templates/locales/en.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index a18676f44..330624287 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1716,6 +1716,10 @@ en:
           The command '%{cmd}' was not found for this trigger.
         name_bad_type: |-
           Invalid type set for `name` on trigger for command '%{cmd}'. `name` should be a String.
+        info_bad_type: |-
+          Invalid type set for `info` on trigger for command '%{cmd}'. `info` should be a String.
+        warn_bad_type: |-
+          Invalid type set for `warn` on trigger for command '%{cmd}'. `warn` should be a String.
         on_error_bad_type: |-
           Invalid type set for `on_error` on trigger for command '%{cmd}'. `on_error` can
           only be `:halt` (default) or `:continue`.

From daffd87200a0be5cfd67692356a7d391f978b9a6 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Fri, 20 Apr 2018 12:24:32 -0700
Subject: [PATCH 92/95] Use match over match? for Ruby 2.3

---
 lib/vagrant/plugin/v2/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 1f7242bab..59aa8a2f0 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -81,7 +81,7 @@ module Vagrant
             match = false
             if trigger.only_on
               trigger.only_on.each do |o|
-                if o.match?(guest_name)
+                if o.match(guest_name)
                   # trigger matches on current guest, so we're fine to use it
                   match = true
                   break

From 1eabd0901ecbcb2a2eba646a68e4ead48af06c80 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 23 Apr 2018 09:14:31 -0700
Subject: [PATCH 93/95] Website updates based on feedback

---
 website/source/docs/triggers/configuration.html.md | 7 +++----
 website/source/docs/triggers/index.html.md         | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index 6ba3ddd1d..84dceb42f 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -3,19 +3,18 @@ layout: "docs"
 page_title: "Vagrant Triggers Configuration"
 sidebar_current: "triggers-configuration"
 description: |-
-  Documentation of various configuration options for Vagrnat Triggers
+  Documentation of various configuration options for Vagrant Triggers
 ---
 
 # Configuration
 
-Vagrant Triggers has a few various options that can be set which define how the
-trigger should behave.
+Vagrant Triggers has a few options to define trigger behavior.
 
 ## Options
 
 The trigger class takes various options.
 
-* `action` (symbol, array) - Expected to be a single symbol value, an array of symbols, or a _splat_ of symbols. The first argument that comes after either __before__ or __after__ when defining a new trigger. Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired.
+* `action` (symbol, array) - Expected to be a single symbol value, an array of symbols, or a _splat_ of symbols. The first argument that comes after either __before__ or __after__ when defining a new trigger. Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired. A list of valid core commands can be found [here](/docs/cli).
 
 * `ignore` (symbol, array) - Symbol or array of symbols corresponding to the action that a trigger should not fire on.
 
diff --git a/website/source/docs/triggers/index.html.md b/website/source/docs/triggers/index.html.md
index 58e82cd99..a405e60ed 100644
--- a/website/source/docs/triggers/index.html.md
+++ b/website/source/docs/triggers/index.html.md
@@ -12,7 +12,7 @@ As of version 2.1.0, Vagrant is capable of executing machine triggers _before_ o
 _after_ Vagrant commands.
 
 Each trigger is expected to be given a command key for when it should be fired
-during the Vagrant command life cycle. These could be defined as a single key or
+during the Vagrant command lifecycle. These could be defined as a single key or
 an array which acts like a _whitelist_ for the defined trigger.
 
 
@@ -76,7 +76,7 @@ config.vm.define "ubuntu" do |ubuntu|
 end
 ```
 
-Global and machine scopped triggers will execute in the order that they are
+Global and machine-scoped triggers will execute in the order that they are
 defined within a Vagrantfile. Take for example an abstracted Vagrantfile:
 
 ```

From a9be56b356bab5e1e9c80ba861a4855a42b6e5f7 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 24 Apr 2018 10:04:40 -0700
Subject: [PATCH 94/95] Code updates based on PR feedback

---
 lib/vagrant/plugin/v2/trigger.rb       | 10 +++++-----
 plugins/kernel_v2/config/vm_trigger.rb | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb
index 59aa8a2f0..f869af76e 100644
--- a/lib/vagrant/plugin/v2/trigger.rb
+++ b/lib/vagrant/plugin/v2/trigger.rb
@@ -17,9 +17,9 @@ module Vagrant
         # This class is responsible for setting up basic triggers that were
         # defined inside a Vagrantfile.
         #
-        # @param [Object] env Vagrant environment
-        # @param [Object] config Trigger configuration
-        # @param [Object] machine Active Machine
+        # @param [Vagrant::Environment] env Vagrant environment
+        # @param [Kernel_V2::TriggerConfig] config Trigger configuration
+        # @param [Vagrant::Machine] machine Active Machine
         def initialize(env, config, machine)
           @env        = env
           @config     = config
@@ -91,7 +91,7 @@ module Vagrant
               index = triggers.index(trigger) unless match == true
             end
 
-            if !index.nil?
+            if index
               @logger.debug("Trigger #{trigger.id} will be ignored for #{guest_name}")
               triggers.delete_at(index)
             end
@@ -109,7 +109,7 @@ module Vagrant
           triggers.each do |trigger|
             @logger.debug("Running trigger #{trigger.id}...")
 
-            if !trigger.name.nil?
+            if trigger.name
               @machine.ui.info(I18n.t("vagrant.trigger.fire_with_name",
                                       name: trigger.name))
             else
diff --git a/plugins/kernel_v2/config/vm_trigger.rb b/plugins/kernel_v2/config/vm_trigger.rb
index beeb812a1..053d9ae74 100644
--- a/plugins/kernel_v2/config/vm_trigger.rb
+++ b/plugins/kernel_v2/config/vm_trigger.rb
@@ -101,12 +101,12 @@ module VagrantPlugins
         # but can be set as a single String or Symbol
         #
         # Guests are stored internally as strings
-        if !@only_on.nil?
+        if @only_on
           @only_on = Array(@only_on)
         end
 
         # Commands must be stored internally as symbols
-        if !@ignore.nil?
+        if @ignore
           @ignore = Array(@ignore)
           @ignore.map! { |i| i.to_sym }
         end
@@ -172,15 +172,15 @@ module VagrantPlugins
           errors.concat errorz["shell provisioner"] if !errorz.empty?
         end
 
-        if !@name.nil? && !@name.is_a?(String)
+        if @name && !@name.is_a?(String)
           errors << I18n.t("vagrant.config.triggers.name_bad_type", cmd: @command)
         end
 
-        if !@info.nil? && !@info.is_a?(String)
+        if @info && !@info.is_a?(String)
           errors << I18n.t("vagrant.config.triggers.info_bad_type", cmd: @command)
         end
 
-        if !@warn.nil? && !@warn.is_a?(String)
+        if @warn && !@warn.is_a?(String)
           errors << I18n.t("vagrant.config.triggers.warn_bad_type", cmd: @command)
         end
 

From afc074fb11b3071c2f6446cce4958c3cc65d84fb Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Tue, 24 Apr 2018 11:07:37 -0700
Subject: [PATCH 95/95] Document valid trigger commands

---
 website/source/docs/triggers/configuration.html.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/website/source/docs/triggers/configuration.html.md b/website/source/docs/triggers/configuration.html.md
index 84dceb42f..15780e58e 100644
--- a/website/source/docs/triggers/configuration.html.md
+++ b/website/source/docs/triggers/configuration.html.md
@@ -14,7 +14,14 @@ Vagrant Triggers has a few options to define trigger behavior.
 
 The trigger class takes various options.
 
-* `action` (symbol, array) - Expected to be a single symbol value, an array of symbols, or a _splat_ of symbols. The first argument that comes after either __before__ or __after__ when defining a new trigger. Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired. A list of valid core commands can be found [here](/docs/cli).
+* `action` (symbol, array) - Expected to be a single symbol value, an array of symbols, or a _splat_ of symbols. The first argument that comes after either __before__ or __after__ when defining a new trigger. Can be any valid Vagrant command. It also accepts a special value `:all` which will make the trigger fire for every action. An action can be ignored with the `ignore` setting if desired. These are the valid action commands for triggers:
+
+  - `destroy`
+  - `halt`
+  - `provision`
+  - `reload`
+  - `resume`
+  - `up`
 
 * `ignore` (symbol, array) - Symbol or array of symbols corresponding to the action that a trigger should not fire on.