From c189e4d255f4ef93ada8e6b4d2b2014c13c6c7b8 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 26 Aug 2019 16:05:02 -0700
Subject: [PATCH] Redo how each provisioners are sorted

---
 .../action/builtin/mixin_provisioners.rb      | 30 ++++++++++++-------
 .../action/builtin/mixin_provisioners_test.rb |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/vagrant/action/builtin/mixin_provisioners.rb b/lib/vagrant/action/builtin/mixin_provisioners.rb
index f5a4e12a6..98d510e61 100644
--- a/lib/vagrant/action/builtin/mixin_provisioners.rb
+++ b/lib/vagrant/action/builtin/mixin_provisioners.rb
@@ -90,20 +90,23 @@ module Vagrant
           # Add :each and :all provisioners in reverse to preserve order in Vagrantfile
 
           # add each to final array
-          # TODO: Account for additional tmp_final size after insert for BOTH before/after cases (if both shortcuts are used)
+          # TODO: This doesn't work if before each provisioners are defined before after provisioners
+          #
+          # Maybe do before and after individually instead??
           tmp_final_provs = final_provs.dup
-          before_extra_index = 1 # offset for final array size
-          after_extra_index = 0
-          each_provs.reverse_each do |p,options|
-            idx = 0
-            final_provs.each_with_index.map do |(prv,o), i|
+          index_offset = 0
+          final_provs.each_with_index.map do |(prv,o), i|
+            each_provs.reverse_each do |p, options|
+              idx = 0
               if options[:before]
-                idx = (i+before_extra_index)-1 unless i == 0
-                before_extra_index += 1
+                idx = (i+index_offset+1)-1 unless i == 0
+                puts "b: #{idx}"
+                index_offset += 1
                 tmp_final_provs.insert(idx, [p,options])
               elsif options[:after]
-                idx = (i+after_extra_index)+1
-                after_extra_index += 1
+                idx = (i+index_offset)+1
+                index_offset += 1
+                puts "a: #{idx}"
                 tmp_final_provs.insert(idx, [p,options])
               end
             end
@@ -133,6 +136,13 @@ module Vagrant
           # Return the type map
           @_provisioner_types
         end
+
+        # @private
+        # Reset the cached values for platform. This is not considered a public
+        # API and should only be used for testing.
+        def self.reset!
+          instance_variables.each(&method(:remove_instance_variable))
+        end
       end
     end
   end
diff --git a/test/unit/vagrant/action/builtin/mixin_provisioners_test.rb b/test/unit/vagrant/action/builtin/mixin_provisioners_test.rb
index 3c591a288..9b4934060 100644
--- a/test/unit/vagrant/action/builtin/mixin_provisioners_test.rb
+++ b/test/unit/vagrant/action/builtin/mixin_provisioners_test.rb
@@ -42,6 +42,7 @@ describe Vagrant::Action::Builtin::MixinProvisioners do
 
   after do
     sandbox.close
+    described_class.reset!
   end
 
   describe "#provisioner_instances" do