Merge pull request #8770 from GabrielNagy/PUP-11265/push-environment-context

(PUP-11265) Push last used environment and loaders onto the context

Author: joshcooper

lib/puppet/configurer.rb

@@ -305,6 +305,8 @@ def run_internal(options)
         if last_server_specified_environment
           @environment = last_server_specified_environment
           report.environment = last_server_specified_environment
+
+          push_current_environment_and_loaders
         else
           Puppet.debug(_("Could not find a usable environment in the lastrunfile. Either the file does not exist, does not have the required keys, or the values of 'initial_environment' and 'converged_environment' are identical."))
         end
@@ -315,14 +317,7 @@ def run_internal(options)
       # This is to maintain compatibility with anyone using this class
       # aside from agent, apply, device.
       unless Puppet.lookup(:loaders) { nil }
-        new_env = Puppet::Node::Environment.remote(@environment)
-        Puppet.push_context(
-          {
-            current_environment: new_env,
-            loaders: Puppet::Pops::Loaders.new(new_env, true)
-          },
-          "Local node environment #{@environment} for configurer transaction"
-        )
+        push_current_environment_and_loaders
       end
 
       temp_value = options[:pluginsync]
@@ -358,14 +353,7 @@ def run_internal(options)
         @environment = catalog.environment
         report.environment = @environment
 
-        new_env = Puppet::Node::Environment.remote(@environment)
-        Puppet.push_context(
-          {
-            :current_environment => new_env,
-            :loaders => Puppet::Pops::Loaders.new(new_env, true)
-          },
-          "Local node environment #{@environment} for configurer transaction"
-        )
+        push_current_environment_and_loaders
 
         query_options, facts = get_facts(options)
         query_options[:configured_environment] = configured_environment
@@ -561,6 +549,17 @@ def execute_from_setting(setting)
     end
   end
 
+  def push_current_environment_and_loaders
+    new_env = Puppet::Node::Environment.remote(@environment)
+    Puppet.push_context(
+      {
+        :current_environment => new_env,
+        :loaders => Puppet::Pops::Loaders.new(new_env, true)
+      },
+      "Local node environment #{@environment} for configurer transaction"
+    )
+  end
+
   def retrieve_catalog_from_cache(query_options)
     result = nil
     @duration = thinmark do

spec/unit/configurer_spec.rb

@@ -1159,6 +1159,20 @@ def expects_neither_new_or_cached_catalog
           expect(configurer.environment).to eq(last_server_specified_environment)
         end
 
+        it "pushes the converged environment found in lastrunfile over the existing context" do
+          initial_env = Puppet::Node::Environment.remote('production')
+          Puppet.push_context(
+            current_environment: initial_env,
+            loaders: Puppet::Pops::Loaders.new(initial_env, true))
+
+          expect(Puppet).to receive(:push_context).with(
+            hash_including(:current_environment, :loaders),
+            "Local node environment #{last_server_specified_environment} for configurer transaction"
+          ).once.and_call_original
+
+          configurer.run
+        end
+
         it "uses environment from Puppet[:environment] if strict_environment_mode is set" do
           Puppet[:strict_environment_mode] = true
           configurer.run