puppet 5.3.4 → 6.29.0

data/spec/unit/configurer_spec.rb

@@ -1,451 +1,482 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/configurer'
 
 describe Puppet::Configurer do
+  include PuppetSpec::Files
+
   before do
-    Puppet.settings.stubs(:use).returns(true)
-    @agent = Puppet::Configurer.new
-    @agent.stubs(:init_storage)
-    Puppet::Util::Storage.stubs(:store)
     Puppet[:server] = "puppetmaster"
     Puppet[:report] = true
-  end
 
-  it "should include the Fact Handler module" do
-    expect(Puppet::Configurer.ancestors).to be_include(Puppet::Configurer::FactHandler)
+    catalog.add_resource(resource)
+
+    Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+    ---
+    version:
+      config: 1624882680
+      puppet: #{Puppet.version}
+    application:
+      initial_environment: #{Puppet[:environment]}
+      converged_environment: #{Puppet[:environment]}
+      run_mode: agent
+    SUMMARY
   end
 
+  let(:node_name) { Puppet[:node_name_value] }
+  let(:configurer) { Puppet::Configurer.new }
+  let(:report) { Puppet::Transaction::Report.new }
+  let(:catalog) { Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
+  let(:resource) { Puppet::Resource.new(:notice, 'a') }
+  let(:facts) { Puppet::Node::Facts.new(node_name) }
+
   describe "when executing a pre-run hook" do
     it "should do nothing if the hook is set to an empty string" do
       Puppet.settings[:prerun_command] = ""
-      Puppet::Util.expects(:exec).never
+      expect(Puppet::Util::Execution).not_to receive(:execute)
 
-      @agent.execute_prerun_command
+      configurer.execute_prerun_command
     end
 
     it "should execute any pre-run command provided via the 'prerun_command' setting" do
       Puppet.settings[:prerun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      @agent.execute_prerun_command
+      configurer.execute_prerun_command
     end
 
     it "should fail if the command fails" do
       Puppet.settings[:prerun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      expect(@agent.execute_prerun_command).to be_falsey
+      expect(configurer.execute_prerun_command).to be_falsey
     end
   end
 
   describe "when executing a post-run hook" do
     it "should do nothing if the hook is set to an empty string" do
       Puppet.settings[:postrun_command] = ""
-      Puppet::Util.expects(:exec).never
+      expect(Puppet::Util::Execution).not_to receive(:execute)
 
-      @agent.execute_postrun_command
+      configurer.execute_postrun_command
     end
 
     it "should execute any post-run command provided via the 'postrun_command' setting" do
       Puppet.settings[:postrun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      @agent.execute_postrun_command
+      configurer.execute_postrun_command
     end
 
     it "should fail if the command fails" do
       Puppet.settings[:postrun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      expect(@agent.execute_postrun_command).to be_falsey
+      expect(configurer.execute_postrun_command).to be_falsey
     end
   end
 
-  describe "when executing a catalog run" do
+  describe "when executing a catalog run without stubbing valid_server_environment?" do
     before do
-      Puppet.settings.stubs(:use).returns(true)
-      @agent.stubs(:download_plugins)
-      Puppet::Node::Facts.indirection.terminus_class = :memory
-      @facts = Puppet::Node::Facts.new(Puppet[:node_name_value])
-      Puppet::Node::Facts.indirection.save(@facts)
-
-      @catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
-      @catalog.stubs(:to_ral).returns(@catalog)
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
-      Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
-      @agent.stubs(:send_report)
-      @agent.stubs(:save_last_run_summary)
+      allow(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(catalog)
+    end
+
+    it 'skips initial plugin sync if environment is not found and no strict_environment_mode' do
+      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/plugins?}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
 
-      Puppet::Util::Log.stubs(:close_all)
+      configurer.run(:pluginsync => true)
+
+      expect(@logs).to include(an_object_having_attributes(level: :notice, message: %r{Environment 'production' not found on server, skipping initial pluginsync.}))
+      expect(@logs).to include(an_object_having_attributes(level: :notice, message: /Applied catalog in .* seconds/))
     end
 
-    after :all do
-      Puppet::Node::Facts.indirection.reset_terminus_class
-      Puppet::Resource::Catalog.indirection.reset_terminus_class
+    it 'if strict_environment_mode is set and environment is not found, aborts the puppet run' do
+      Puppet[:strict_environment_mode] = true
+      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/plugins?}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
+
+      configurer.run(:pluginsync => true)
+
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: %r{Failed to apply catalog: Environment 'production' not found on server, aborting run.}))
     end
+  end
 
-    it "should initialize storage" do
-      Puppet::Util::Storage.expects(:load)
-      @agent.run
+  describe "when executing a catalog run" do
+    before do
+      Puppet::Resource::Catalog.indirection.terminus_class = :rest
+      allow(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(catalog)
+      allow_any_instance_of(described_class).to(
+        receive(:valid_server_environment?).and_return(true)
+      )
     end
 
     it "downloads plugins when told" do
-      @agent.expects(:download_plugins)
-      @agent.run(:pluginsync => true)
+      expect(configurer).to receive(:download_plugins)
+      configurer.run(:pluginsync => true)
     end
 
     it "does not download plugins when told" do
-      @agent.expects(:download_plugins).never
-      @agent.run(:pluginsync => false)
+      expect(configurer).not_to receive(:download_plugins)
+      configurer.run(:pluginsync => false)
     end
 
-    it "should carry on when it can't fetch its node definition" do
-      error = Net::HTTPError.new(400, 'dummy server communication error')
-      Puppet::Node.indirection.expects(:find).raises(error)
-      expect(@agent.run).to eq(0)
+    it "does not download plugins when specified environment is not vaild on server" do
+      expect(configurer).to receive(:valid_server_environment?).and_return(false)
+      expect(configurer).not_to receive(:download_plugins)
+      configurer.run(:pluginsync => true)
     end
 
-    it "applies a cached catalog when it can't connect to the master" do
-      error = Errno::ECONNREFUSED.new('Connection refused - connect(2)')
+    it "fails the run if pluginsync fails when usecacheonfailure is false" do
+      Puppet[:ignore_plugin_errors] = false
 
-      Puppet::Node.indirection.expects(:find).raises(error)
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entry(:ignore_cache => true)).raises(error)
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entry(:ignore_terminus => true)).returns(@catalog)
+      # --test implies these, set them so we don't fall back to a cached catalog
+      Puppet[:use_cached_catalog] = false
+      Puppet[:usecacheonfailure] = false
 
-      expect(@agent.run).to eq(0)
-    end
+      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
+      stub_request(:get, %r{/puppet/v3/file_metadata/pluginfacts}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
 
-    it "should initialize a transaction report if one is not provided" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns report
+      configurer.run(pluginsync: true)
 
-      @agent.run
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: %r{Failed to apply catalog: Failed to retrieve pluginfacts: Could not retrieve information from environment production source\(s\) puppet:///pluginfacts}))
     end
 
-    it "should respect node_name_fact when setting the host on a report" do
-      Puppet[:node_name_fact] = 'my_name_fact'
-      @facts.values = {'my_name_fact' => 'node_name_from_fact'}
-
-      report = Puppet::Transaction::Report.new
+    it "applies a cached catalog if pluginsync fails when usecacheonfailure is true" do
+      Puppet[:ignore_plugin_errors] = false
 
-      @agent.run(:report => report)
-      expect(report.host).to eq('node_name_from_fact')
-    end
+      Puppet[:use_cached_catalog] = false
+      Puppet[:usecacheonfailure] = true
 
-    it "should pass the new report to the catalog" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.stubs(:new).returns report
-      @catalog.expects(:apply).with{|options| options[:report] == report}
+      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
+      stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
+      stub_request(:get, %r{/puppet/v3/file_metadata/pluginfacts}).to_return(
+        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
+      )
 
-      @agent.run
+      expect(configurer.run(pluginsync: true, :report => report)).to eq(0)
+      expect(report.cached_catalog_status).to eq('on_failure')
     end
 
-    it "should use the provided report if it was passed one" do
-      report = Puppet::Transaction::Report.new
-      @catalog.expects(:apply).with {|options| options[:report] == report}
+    it "applies a cached catalog when it can't connect to the master" do
+      error = Errno::ECONNREFUSED.new('Connection refused - connect(2)')
+
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(:ignore_cache => true)).and_raise(error)
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(:ignore_terminus => true)).and_return(catalog)
 
-      @agent.run(:report => report)
+      expect(configurer.run).to eq(0)
     end
 
-    it "should set the report as a log destination" do
-      report = Puppet::Transaction::Report.new
-
-      report.expects(:<<).with(instance_of(Puppet::Util::Log)).at_least_once
+    it "should initialize a transaction report if one is not provided" do
+      # host and settings catalogs each create a report...
+      expect(Puppet::Transaction::Report).to receive(:new).and_return(report).twice
 
-      @agent.run(:report => report)
+      configurer.run
     end
 
-    it "should retrieve the catalog" do
-      @agent.expects(:retrieve_catalog)
+    it "should respect node_name_fact when setting the host on a report" do
+      Puppet[:node_name_value] = nil
+      Puppet[:node_name_fact] = 'my_name_fact'
+      facts.values = {'my_name_fact' => 'node_name_from_fact'}
+      Puppet::Node::Facts.indirection.save(facts)
 
-      @agent.run
+      configurer.run(:report => report)
+      expect(report.host).to eq('node_name_from_fact')
     end
 
-    it "should log a failure and do nothing if no catalog can be retrieved" do
-      @agent.expects(:retrieve_catalog).returns nil
+    it "creates a new report when applying the catalog" do
+      options = {}
+      configurer.run(options)
 
-      Puppet.expects(:err).with "Could not retrieve catalog; skipping run"
-
-      @agent.run
+      expect(options[:report].metrics['time']['catalog_application']).to be_an_instance_of(Float)
     end
 
-    it "should apply the catalog with all options to :run" do
-      @agent.expects(:retrieve_catalog).returns @catalog
+    it "uses the provided report when applying the catalog" do
+      configurer.run(:report => report)
 
-      @catalog.expects(:apply).with { |args| args[:one] == true }
-      @agent.run :one => true
+      expect(report.metrics['time']['catalog_application']).to be_an_instance_of(Float)
     end
 
-    it "should accept a catalog and use it instead of retrieving a different one" do
-      @agent.expects(:retrieve_catalog).never
+    it "should log a failure and do nothing if no catalog can be retrieved" do
+      expect(configurer).to receive(:retrieve_catalog).and_return(nil)
 
-      @catalog.expects(:apply)
-      @agent.run :one => true, :catalog => @catalog
-    end
+      expect(Puppet).to receive(:err).with("Could not retrieve catalog; skipping run")
 
-    it "should benchmark how long it takes to apply the catalog" do
-      @agent.expects(:benchmark).with(:notice, instance_of(String))
+      configurer.run
+    end
 
-      @agent.expects(:retrieve_catalog).returns @catalog
+    it "passes arbitrary options when applying the catalog" do
+      expect(catalog).to receive(:apply).with(hash_including(one: true))
 
-      @catalog.expects(:apply).never # because we're not yielding
-      @agent.run
+      configurer.run(catalog: catalog, one: true)
     end
 
-    it "should execute post-run hooks after the run" do
-      @agent.expects(:execute_postrun_command)
+    it "should benchmark how long it takes to apply the catalog" do
+      configurer.run(report: report)
 
-      @agent.run
+      expect(report.logs).to include(an_object_having_attributes(level: :notice, message: /Applied catalog in .* seconds/))
     end
 
     it "should create report with passed transaction_uuid and job_id" do
-      @agent = Puppet::Configurer.new(Puppet::Configurer::DownloaderFactory.new, "test_tuuid", "test_jid")
-      @agent.stubs(:init_storage)
+      configurer = Puppet::Configurer.new("test_tuuid", "test_jid")
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      Puppet::Transaction::Report.expects(:new).with(anything, anything, 'test_tuuid', 'test_jid').returns(report)
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Transaction::Report).to receive(:new).with(anything, anything, 'test_tuuid', 'test_jid', anything).and_return(report)
+      expect(configurer).to receive(:send_report).with(report)
 
-      @agent.run
+      configurer.run
     end
 
     it "should send the report" do
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      Puppet::Transaction::Report.expects(:new).returns(report)
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
+      expect(configurer).to receive(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      @agent.run
+      configurer.run
     end
 
     it "should send the transaction report even if the catalog could not be retrieved" do
-      @agent.expects(:retrieve_catalog).returns nil
+      expect(configurer).to receive(:retrieve_catalog).and_return(nil)
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      Puppet::Transaction::Report.expects(:new).returns(report)
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
+      expect(configurer).to receive(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      @agent.run
+      configurer.run
     end
 
     it "should send the transaction report even if there is a failure" do
-      @agent.expects(:retrieve_catalog).raises "whatever"
+      expect(configurer).to receive(:retrieve_catalog).and_raise("whatever")
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      Puppet::Transaction::Report.expects(:new).returns(report)
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
+      expect(configurer).to receive(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run).to be_nil
     end
 
     it "should remove the report as a log destination when the run is finished" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
-      @agent.run
+      configurer.run(report: report)
 
       expect(Puppet::Util::Log.destinations).not_to include(report)
     end
 
-    it "should return the report exit_status as the result of the run" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-      report.expects(:exit_status).returns(1234)
+    it "should return an exit status of 2 due to the notify resource 'changing'" do
+      cat = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
+      cat.add_resource(Puppet::Type.type(:notify).new(:name => 'something changed'))
+
+      expect(configurer.run(catalog: cat, report: report)).to eq(2)
+    end
+
+    it "should return nil if catalog application fails" do
+      expect(catalog).to receive(:apply).and_raise(Puppet::Error, 'One or more resource dependency cycles detected in graph')
 
-      expect(@agent.run).to eq(1234)
+      expect(configurer.run(catalog: catalog, report: report)).to be_nil
     end
 
     it "should send the transaction report even if the pre-run command fails" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
+      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
 
       Puppet.settings[:prerun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      expect(configurer).to receive(:send_report).with(report)
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run).to be_nil
     end
 
     it "should include the pre-run command failure in the report" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
       Puppet.settings[:prerun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run(report: report)).to be_nil
       expect(report.logs.find { |x| x.message =~ /Could not run command from prerun_command/ }).to be
     end
 
     it "should send the transaction report even if the post-run command fails" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
       Puppet.settings[:postrun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
-      @agent.expects(:send_report).with(report)
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      expect(configurer).to receive(:send_report).with(report)
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run(report: report)).to be_nil
     end
 
     it "should include the post-run command failure in the report" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
       Puppet.settings[:postrun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      report.expects(:<<).with { |log| log.message.include?("Could not run command from postrun_command") }
+      expect(report).to receive(:<<) { |log, _| expect(log.message).to match(/Could not run command from postrun_command/) }.at_least(:once)
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run(report: report)).to be_nil
     end
 
     it "should execute post-run command even if the pre-run command fails" do
       Puppet.settings[:prerun_command] = "/my/precommand"
       Puppet.settings[:postrun_command] = "/my/postcommand"
-      Puppet::Util::Execution.expects(:execute).with(["/my/precommand"]).raises(Puppet::ExecutionFailure, "Failed")
-      Puppet::Util::Execution.expects(:execute).with(["/my/postcommand"])
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/precommand"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/postcommand"])
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run).to be_nil
     end
 
     it "should finalize the report" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
-      report.expects(:finalize_report)
-      @agent.run
+      expect(report).to receive(:finalize_report)
+      configurer.run(report: report)
     end
 
     it "should not apply the catalog if the pre-run command fails" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
       Puppet.settings[:prerun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      @catalog.expects(:apply).never()
-      @agent.expects(:send_report)
+      expect_any_instance_of(Puppet::Resource::Catalog).not_to receive(:apply)
+      expect(configurer).to receive(:send_report)
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run(report: report)).to be_nil
     end
 
     it "should apply the catalog, send the report, and return nil if the post-run command fails" do
-      report = Puppet::Transaction::Report.new
-      Puppet::Transaction::Report.expects(:new).returns(report)
-
       Puppet.settings[:postrun_command] = "/my/command"
-      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      @catalog.expects(:apply)
-      @agent.expects(:send_report)
+      expect_any_instance_of(Puppet::Resource::Catalog).to receive(:apply)
+      expect(configurer).to receive(:send_report)
 
-      expect(@agent.run).to be_nil
+      expect(configurer.run(report: report)).to be_nil
     end
 
-    it "should refetch the catalog if the server specifies a new environment in the catalog" do
-      catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
-      @agent.expects(:retrieve_catalog).returns(catalog).twice
+    it 'includes total time metrics in the report after successfully applying the catalog' do
+      configurer.run(report: report)
 
-      @agent.run
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
     end
 
-    it "should change the environment setting if the server specifies a new environment in the catalog" do
-      @catalog.stubs(:environment).returns("second_env")
+    it 'includes total time metrics in the report even if prerun fails' do
+      Puppet.settings[:prerun_command] = "/my/command"
+      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
 
-      @agent.run
+      configurer.run(report: report)
 
-      expect(@agent.environment).to eq("second_env")
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
     end
 
-    it "should fix the report if the server specifies a new environment in the catalog" do
-      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      Puppet::Transaction::Report.expects(:new).returns(report)
-      @agent.expects(:send_report).with(report)
+    it 'includes total time metrics in the report even if catalog retrieval fails' do
+      allow(configurer).to receive(:prepare_and_retrieve_catalog_from_cache).and_raise
+      configurer.run(:report => report)
+
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
+    end
+
+    it "should refetch the catalog if the server specifies a new environment in the catalog" do
+      catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote('second_env'))
+      expect(configurer).to receive(:retrieve_catalog).and_return(catalog).twice
 
-      @catalog.stubs(:environment).returns("second_env")
-      @agent.stubs(:retrieve_catalog).returns(@catalog)
+      configurer.run
+    end
 
-      @agent.run
+    it "changes the configurer's environment if the server specifies a new environment in the catalog" do
+      allow_any_instance_of(Puppet::Resource::Catalog).to receive(:environment).and_return("second_env")
+
+      configurer.run
+
+      expect(configurer.environment).to eq("second_env")
+    end
+
+    it "changes the report's environment if the server specifies a new environment in the catalog" do
+      allow_any_instance_of(Puppet::Resource::Catalog).to receive(:environment).and_return("second_env")
+
+      configurer.run(report: report)
 
       expect(report.environment).to eq("second_env")
     end
 
     it "sends the transaction uuid in a catalog request" do
-      @agent.instance_variable_set(:@transaction_uuid, 'aaa')
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:transaction_uuid => 'aaa'))
-      @agent.run
+      configurer = Puppet::Configurer.new('aaa')
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(transaction_uuid: 'aaa'))
+      configurer.run
     end
 
     it "sends the transaction uuid in a catalog request" do
-      @agent.instance_variable_set(:@job_id, 'aaa')
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:job_id => 'aaa'))
-      @agent.run
+      configurer = Puppet::Configurer.new('b', 'aaa')
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(job_id: 'aaa'))
+      configurer.run
     end
 
     it "sets the static_catalog query param to true in a catalog request" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:static_catalog => true))
-      @agent.run
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(static_catalog: true))
+      configurer.run
     end
 
     it "sets the checksum_type query param to the default supported_checksum_types in a catalog request" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything,
-        has_entries(:checksum_type => 'md5.sha256'))
-      @agent.run
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything,
+        hash_including(checksum_type: 'md5.sha256.sha384.sha512.sha224'))
+      configurer.run
     end
 
     it "sets the checksum_type query param to the supported_checksum_types setting in a catalog request" do
-      # Regenerate the agent to pick up the new setting
       Puppet[:supported_checksum_types] = ['sha256']
-      @agent = Puppet::Configurer.new
-      @agent.stubs(:init_storage)
-      @agent.stubs(:download_plugins)
-      @agent.stubs(:send_report)
-      @agent.stubs(:save_last_run_summary)
+      # Regenerate the agent to pick up the new setting
+      configurer = Puppet::Configurer.new
 
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:checksum_type => 'sha256'))
-      @agent.run
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(checksum_type: 'sha256'))
+      configurer.run
     end
 
     describe "when not using a REST terminus for catalogs" do
       it "should not pass any facts when retrieving the catalog" do
+        # This is weird, we collect facts when constructing the node,
+        # but we don't send them in the indirector request. Then the compiler
+        # looks up the node, and collects its facts, which we could have sent
+        # in the first place. This seems like a bug.
         Puppet::Resource::Catalog.indirection.terminus_class = :compiler
-        @agent.expects(:facts_for_uploading).never
-        Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options|
-          options[:facts].nil?
-        }.returns @catalog
 
-        @agent.run
+        expect(Puppet::Resource::Catalog.indirection).to receive(:find) do |name, options|
+          expect(options[:facts]).to be_nil
+        end.and_return(catalog)
+
+        configurer.run
       end
     end
 
     describe "when using a REST terminus for catalogs" do
-      it "should pass the prepared facts and the facts format as arguments when retrieving the catalog" do
+      it "should pass the url encoded facts and facts format as arguments when retrieving the catalog" do
         Puppet::Resource::Catalog.indirection.terminus_class = :rest
-        @agent.expects(:facts_for_uploading).returns(:facts => "myfacts", :facts_format => :foo)
-        Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options|
-          options[:facts] == "myfacts" and options[:facts_format] == :foo
-        }.returns @catalog
 
-        @agent.run
-      end
-    end
-  end
+        facts.values = { 'foo' => 'bar' }
+        Puppet::Node::Facts.indirection.save(facts)
 
-  describe "when initialized with a transaction_uuid" do
-    it "stores it" do
-      SecureRandom.expects(:uuid).never
-      configurer = Puppet::Configurer.new(Puppet::Configurer::DownloaderFactory.new, 'foo')
-      expect(configurer.instance_variable_get(:@transaction_uuid) == 'foo')
+        expect(
+          Puppet::Resource::Catalog.indirection
+        ).to receive(:find) do |_, options|
+          expect(options[:facts_format]).to eq("application/json")
+
+          unescaped = JSON.parse(CGI.unescape(options[:facts]))
+          expect(unescaped).to include("values" => {"foo" => "bar"})
+        end.and_return(catalog)
+
+        configurer.run
+      end
     end
   end
 
@@ -453,65 +484,72 @@ describe Puppet::Configurer do
     include PuppetSpec::Files
 
     before do
-      Puppet.settings.stubs(:use).returns(true)
-      @configurer = Puppet::Configurer.new
       Puppet[:lastrunfile] = tmpfile('last_run_file')
-
-      @report = Puppet::Transaction::Report.new
       Puppet[:reports] = "none"
     end
 
     it "should print a report summary if configured to do so" do
       Puppet.settings[:summarize] = true
 
-      @report.expects(:summary).returns "stuff"
+      expect(report).to receive(:summary).and_return("stuff")
 
-      @configurer.expects(:puts).with("stuff")
-      @configurer.send_report(@report)
+      expect(configurer).to receive(:puts).with("stuff")
+      configurer.send_report(report)
     end
 
     it "should not print a report summary if not configured to do so" do
       Puppet.settings[:summarize] = false
 
-      @configurer.expects(:puts).never
-      @configurer.send_report(@report)
+      expect(configurer).not_to receive(:puts)
+      configurer.send_report(report)
     end
 
     it "should save the report if reporting is enabled" do
       Puppet.settings[:report] = true
 
-      Puppet::Transaction::Report.indirection.expects(:save).with(@report, nil, instance_of(Hash))
-      @configurer.send_report(@report)
+      expect(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, instance_of(Hash)).twice
+      configurer.send_report(report)
     end
 
     it "should not save the report if reporting is disabled" do
       Puppet.settings[:report] = false
 
-      Puppet::Transaction::Report.indirection.expects(:save).with(@report, nil, instance_of(Hash)).never
-      @configurer.send_report(@report)
+      expect(Puppet::Transaction::Report.indirection).not_to receive(:save).with(report, nil, instance_of(Hash))
+      configurer.send_report(report)
     end
 
     it "should save the last run summary if reporting is enabled" do
       Puppet.settings[:report] = true
 
-      @configurer.expects(:save_last_run_summary).with(@report)
-      @configurer.send_report(@report)
+      expect(configurer).to receive(:save_last_run_summary).with(report)
+      configurer.send_report(report)
     end
 
     it "should save the last run summary if reporting is disabled" do
       Puppet.settings[:report] = false
 
-      @configurer.expects(:save_last_run_summary).with(@report)
-      @configurer.send_report(@report)
+      expect(configurer).to receive(:save_last_run_summary).with(report)
+      configurer.send_report(report)
     end
 
     it "should log but not fail if saving the report fails" do
       Puppet.settings[:report] = true
 
-      Puppet::Transaction::Report.indirection.expects(:save).raises("whatever")
+      expect(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, hash_including(ignore_cache: true)).and_raise("whatever")
+      expect(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, hash_including(ignore_terminus: true))
 
-      Puppet.expects(:err)
-      expect { @configurer.send_report(@report) }.not_to raise_error
+      configurer.send_report(report)
+
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: 'Could not send report: whatever'))
+    end
+
+    it "should save the cached report if fails to send the report" do
+      allow(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, hash_including(ignore_terminus: true)).and_call_original
+      allow(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, hash_including(ignore_cache: true)).and_raise("whatever")
+
+      expect(File).to_not be_exist(Puppet[:lastrunfile])
+      configurer.send_report(report)
+      expect(File.read(Puppet[:lastrunfile])).to match(/puppet: #{Puppet::PUPPETVERSION}/)
     end
   end
 
@@ -519,22 +557,17 @@ describe Puppet::Configurer do
     include PuppetSpec::Files
 
     before do
-      Puppet.settings.stubs(:use).returns(true)
-      @configurer = Puppet::Configurer.new
-
-      @report = stub 'report', :raw_summary => {}
-
       Puppet[:lastrunfile] = tmpfile('last_run_file')
     end
 
     it "should write the last run file" do
-      @configurer.save_last_run_summary(@report)
+      configurer.save_last_run_summary(report)
       expect(Puppet::FileSystem.exist?(Puppet[:lastrunfile])).to be_truthy
     end
 
     it "should write the raw summary as yaml" do
-      @report.expects(:raw_summary).returns("summary")
-      @configurer.save_last_run_summary(@report)
+      expect(report).to receive(:raw_summary).and_return("summary")
+      configurer.save_last_run_summary(report)
       expect(File.read(Puppet[:lastrunfile])).to eq(YAML.dump("summary"))
     end
 
@@ -547,15 +580,16 @@ describe Puppet::Configurer do
         end
       end.new
 
-      Puppet::Util.expects(:replace_file).yields(fh)
+      expect(Puppet::Util).to receive(:replace_file).and_yield(fh)
 
-      Puppet.expects(:err)
-      expect { @configurer.save_last_run_summary(@report) }.to_not raise_error
+      configurer.save_last_run_summary(report)
+
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: 'Could not save last run local report: failed to do print'))
     end
 
     it "should create the last run file with the correct mode" do
-      Puppet.settings.setting(:lastrunfile).expects(:mode).returns('664')
-      @configurer.save_last_run_summary(@report)
+      expect(Puppet.settings.setting(:lastrunfile)).to receive(:mode).and_return('664')
+      configurer.save_last_run_summary(report)
 
       if Puppet::Util::Platform.windows?
         require 'puppet/util/windows/security'
@@ -567,66 +601,52 @@ describe Puppet::Configurer do
     end
 
     it "should report invalid last run file permissions" do
-      Puppet.settings.setting(:lastrunfile).expects(:mode).returns('892')
-      Puppet.expects(:err).with(regexp_matches(/Could not save last run local report.*892 is invalid/))
-      @configurer.save_last_run_summary(@report)
-    end
-  end
+      expect(Puppet.settings.setting(:lastrunfile)).to receive(:mode).and_return('892')
 
-  describe "when requesting a node" do
-    it "uses the transaction uuid in the request" do
-      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:transaction_uuid => anything)).twice
-      @agent.run
-    end
+      configurer.save_last_run_summary(report)
 
-    it "sends an explicitly configured environment request" do
-      Puppet.settings.expects(:set_by_config?).with(:environment).returns(true)
-      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:configured_environment => Puppet[:environment])).twice
-      @agent.run
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: /Could not save last run local report.*892 is invalid/))
     end
+  end
 
-    it "does not send a configured_environment when using the default" do
-      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:configured_environment => nil)).twice
-      @agent.run
-    end
+  def expects_pluginsync
+    metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":420,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
+    stub_request(:get, %r{/puppet/v3/file_metadatas/(plugins|locales)}).to_return(status: 200, body: metadata, headers: {'Content-Type' => 'application/json'})
+
+    # response retains owner/group/mode due to source_permissions => use
+    facts_metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":500,\"group\":500,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
+    stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(status: 200, body: facts_metadata, headers: {'Content-Type' => 'application/json'})
   end
 
   def expects_new_catalog_only(catalog)
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns catalog
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.never
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true, check_environment: true)).and_return(catalog)
+    expect(Puppet::Resource::Catalog.indirection).not_to receive(:find).with(anything, hash_including(ignore_terminus: true))
   end
 
   def expects_cached_catalog_only(catalog)
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns catalog
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.never
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
+    expect(Puppet::Resource::Catalog.indirection).not_to receive(:find).with(anything, hash_including(ignore_cache: true))
   end
 
   def expects_fallback_to_cached_catalog(catalog)
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns catalog
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
   end
 
   def expects_fallback_to_new_catalog(catalog)
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns nil
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns catalog
+    expects_pluginsync
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(nil)
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true, check_environment: true)).and_return(catalog)
   end
 
   def expects_neither_new_or_cached_catalog
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
-    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns nil
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
+    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(nil)
   end
 
   describe "when retrieving a catalog" do
     before do
-      Puppet.settings.stubs(:use).returns(true)
-      @agent.stubs(:facts_for_uploading).returns({})
-      @agent.stubs(:download_plugins)
-
-      # retrieve a catalog in the current environment, so we don't try to converge unexpectedly
-      @catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
-
-      # this is the default when using a Configurer instance
-      Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :rest
+      allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class).and_return(:rest)
     end
 
     describe "and configured to only retrieve a catalog from the cache" do
@@ -635,100 +655,119 @@ describe Puppet::Configurer do
       end
 
       it "should first look in the cache for a catalog" do
-        expects_cached_catalog_only(@catalog)
-
-        expect(@agent.retrieve_catalog({})).to eq(@catalog)
-      end
-
-      it "should not make a node request or pluginsync when a cached catalog is successfully retrieved" do
-        Puppet::Node.indirection.expects(:find).never
-        expects_cached_catalog_only(@catalog)
-        @agent.expects(:download_plugins).never
+        expects_cached_catalog_only(catalog)
 
-        @agent.run
+        configurer.run
       end
 
-      it "should make a node request and pluginsync when a cached catalog cannot be retrieved" do
-        Puppet::Node.indirection.expects(:find).returns nil
-        expects_fallback_to_new_catalog(@catalog)
-        @agent.expects(:download_plugins)
+      it "should not pluginsync when a cached catalog is successfully retrieved" do
+        expects_cached_catalog_only(catalog)
+        expect(configurer).not_to receive(:download_plugins)
 
-        @agent.run
+        configurer.run
       end
 
       it "should set its cached_catalog_status to 'explicitly_requested'" do
-        expects_cached_catalog_only(@catalog)
+        expects_cached_catalog_only(catalog)
 
-        @agent.retrieve_catalog({})
-        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('explicitly_requested')
+        options = {}
+        configurer.run(options)
+
+        expect(options[:report].cached_catalog_status).to eq('explicitly_requested')
       end
 
       it "should set its cached_catalog_status to 'explicitly requested' if the cached catalog is from a different environment" do
-        cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
+        cached_catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote('second_env'))
         expects_cached_catalog_only(cached_catalog)
 
-        @agent.retrieve_catalog({})
-        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('explicitly_requested')
-      end
-
-      it "should compile a new catalog if none is found in the cache" do
-        expects_fallback_to_new_catalog(@catalog)
+        options = {}
+        configurer.run(options)
 
-        expect(@agent.retrieve_catalog({})).to eq(@catalog)
+        expect(options[:report].cached_catalog_status).to eq('explicitly_requested')
       end
 
-      it "should set its cached_catalog_status to 'not_used' if no catalog is found in the cache" do
-        expects_fallback_to_new_catalog(@catalog)
+      it "should pluginsync and compile a new catalog if none is found in the cache" do
+        expects_fallback_to_new_catalog(catalog)
+        stub_request(:get, %r{/puppet/v3/file_metadatas?/plugins}).to_return(:status => 404)
+        stub_request(:get, %r{/puppet/v3/file_metadatas?/pluginfacts}).to_return(:status => 404)
+
+        options = {}
+        configurer.run(options)
 
-        @agent.retrieve_catalog({})
-        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
+        expect(options[:report].cached_catalog_status).to eq('not_used')
       end
 
       it "should not attempt to retrieve a cached catalog again if the first attempt failed" do
-        Puppet::Node.indirection.expects(:find).returns(nil)
         expects_neither_new_or_cached_catalog
+        expects_pluginsync
 
-        @agent.run
+        # after failing to use a cached catalog, we'll need to pluginsync before getting
+        # a new catalog, which also fails.
+        stub_request(:get, %r{/puppet/v3/file_metadatas?/plugins}).to_return(:status => 404)
+        stub_request(:get, %r{/puppet/v3/file_metadatas?/pluginfacts}).to_return(:status => 404)
+
+        configurer.run
       end
 
       it "should return the cached catalog when the environment doesn't match" do
-        cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
+        cached_catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote('second_env'))
         expects_cached_catalog_only(cached_catalog)
 
-        Puppet.expects(:info).with("Using cached catalog from environment 'second_env'")
-        expect(@agent.retrieve_catalog({})).to eq(cached_catalog)
+        allow(Puppet).to receive(:info)
+        expect(Puppet).to receive(:info).with("Using cached catalog from environment 'second_env'")
+
+        configurer.run
+      end
+
+      it "applies the catalog passed as options when the catalog cache terminus is not set" do
+        expects_pluginsync
+
+        catalog.add_resource(Puppet::Resource.new('notify', 'from apply'))
+        configurer.run(catalog: catalog.to_ral)
+
+        # make sure cache class is not set to avoid surprises later
+        expect(Puppet::Resource::Catalog.indirection).to_not be_cache
+        expect(@logs).to include(an_object_having_attributes(level: :notice, message: /defined 'message' as 'from apply'/))
+      end
+
+      it "applies the cached catalog when the catalog cache terminus is set, ignoring the catalog passed as options" do
+        Puppet::Resource::Catalog.indirection.cache_class = :json
+
+        cached_catalog = Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet[:environment])
+        cached_catalog.add_resource(Puppet::Resource.new('notify', 'from cache'))
+
+        # update cached catalog
+        Puppet.settings.use(:main, :agent)
+        path = Puppet::Resource::Catalog.indirection.cache.path(cached_catalog.name)
+        FileUtils.mkdir(File.dirname(path))
+        File.write(path, cached_catalog.render(:json))
+
+        configurer.run(catalog: catalog.to_ral)
+
+        expect(@logs).to include(an_object_having_attributes(level: :notice, message: /defined 'message' as 'from cache'/))
       end
     end
 
     describe "and strict environment mode is set" do
       before do
-        @catalog.stubs(:to_ral).returns(@catalog)
-        @catalog.stubs(:write_class_file)
-        @catalog.stubs(:write_resource_file)
-        @agent.stubs(:send_report)
-        @agent.stubs(:save_last_run_summary)
         Puppet.settings[:strict_environment_mode] = true
       end
 
-      it "should not make a node request" do
-        Puppet::Node.indirection.expects(:find).never
-
-        @agent.run
-      end
-
       it "should return nil when the catalog's environment doesn't match the agent specified environment" do
-        @agent.instance_variable_set(:@environment, 'second_env')
-        expects_new_catalog_only(@catalog)
+        Puppet[:environment] = 'second_env'
+        configurer = Puppet::Configurer.new
+
+        catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote("production"))
+        expects_new_catalog_only(catalog)
 
-        Puppet.expects(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
-        expect(@agent.run).to be_nil
+        expect(Puppet).to receive(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
+        expect(configurer.run).to be_nil
       end
 
-      it "should not return nil when the catalog's environment matches the agent specified environment" do
-        @agent.instance_variable_set(:@environment, 'production')
-        expects_new_catalog_only(@catalog)
+      it "should return 0 when the catalog's environment matches the agent specified environment" do
+        expects_new_catalog_only(catalog)
 
-        expect(@agent.run).to eq(0)
+        expect(configurer.run).to eq(0)
       end
 
       describe "and a cached catalog is explicitly requested" do
@@ -737,202 +776,274 @@ describe Puppet::Configurer do
         end
 
         it "should return nil when the cached catalog's environment doesn't match the agent specified environment" do
-          @agent.instance_variable_set(:@environment, 'second_env')
-          expects_cached_catalog_only(@catalog)
+          Puppet[:environment] = 'second_env'
+          configurer = Puppet::Configurer.new
 
-          Puppet.expects(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
-          expect(@agent.run).to be_nil
+          catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote("production"))
+          expects_cached_catalog_only(catalog)
+
+          expect(Puppet).to receive(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
+          expect(configurer.run).to be_nil
         end
 
-        it "should proceed with the cached catalog if its environment matchs the local environment" do
-          Puppet.settings[:use_cached_catalog] = true
-          @agent.instance_variable_set(:@environment, 'production')
-          expects_cached_catalog_only(@catalog)
+        it "should proceed with the cached catalog if its environment matches the local environment" do
+          expects_cached_catalog_only(catalog)
 
-          expect(@agent.run).to eq(0)
+          expect(configurer.run).to eq(0)
         end
       end
     end
 
-    it "should use the Catalog class to get its catalog" do
-      Puppet::Resource::Catalog.indirection.expects(:find).returns @catalog
-
-      @agent.retrieve_catalog({})
-    end
-
     it "should set its cached_catalog_status to 'not_used' when downloading a new catalog" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(catalog)
+
+      options = {}
+      configurer.run(options)
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
+      expect(options[:report].cached_catalog_status).to eq('not_used')
     end
 
     it "should use its node_name_value to retrieve the catalog" do
-      Facter.stubs(:value).returns "eh"
-      Puppet.settings[:node_name_value] = "myhost.domain.com"
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| name == "myhost.domain.com" }.returns @catalog
-
-      @agent.retrieve_catalog({})
-    end
+      myhost_facts = Puppet::Node::Facts.new("myhost.domain.com")
+      Puppet::Node::Facts.indirection.save(myhost_facts)
 
-    it "should default to returning a catalog retrieved directly from the server, skipping the cache" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
+      Puppet.settings[:node_name_value] = "myhost.domain.com"
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with("myhost.domain.com", anything).and_return(catalog)
 
-      expect(@agent.retrieve_catalog({})).to eq(@catalog)
+      configurer.run
     end
 
-    it "should log and return the cached catalog when no catalog can be retrieved from the server" do
-      expects_fallback_to_cached_catalog(@catalog)
+    it "should log when no catalog can be retrieved from the server" do
+      expects_fallback_to_cached_catalog(catalog)
 
-      Puppet.expects(:info).with("Using cached catalog from environment 'production'")
-      expect(@agent.retrieve_catalog({})).to eq(@catalog)
+      allow(Puppet).to receive(:info)
+      expect(Puppet).to receive(:info).with("Using cached catalog from environment 'production'")
+      configurer.run
     end
 
     it "should set its cached_catalog_status to 'on_failure' when no catalog can be retrieved from the server" do
-      expects_fallback_to_cached_catalog(@catalog)
+      expects_fallback_to_cached_catalog(catalog)
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
+      options = {}
+      configurer.run(options)
+
+      expect(options[:report].cached_catalog_status).to eq('on_failure')
     end
 
     it "should not look in the cache for a catalog if one is returned from the server" do
-      expects_new_catalog_only(@catalog)
+      expects_new_catalog_only(catalog)
 
-      expect(@agent.retrieve_catalog({})).to eq(@catalog)
+      configurer.run
     end
 
     it "should return the cached catalog when retrieving the remote catalog throws an exception" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.raises "eh"
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns @catalog
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_raise("eh")
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
 
-      expect(@agent.retrieve_catalog({})).to eq(@catalog)
+      configurer.run
     end
 
     it "should set its cached_catalog_status to 'on_failure' when retrieving the remote catalog throws an exception" do
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.raises "eh"
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns @catalog
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_raise("eh")
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
+
+      options = {}
+      configurer.run(options)
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
+      expect(options[:report].cached_catalog_status).to eq('on_failure')
     end
 
     it "should log and return nil if no catalog can be retrieved from the server and :usecacheonfailure is disabled" do
       Puppet[:usecacheonfailure] = false
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
 
-      Puppet.expects(:warning).with('Not using cache on failed catalog')
+      expect(Puppet).to receive(:warning).with('Not using cache on failed catalog')
 
-      expect(@agent.retrieve_catalog({})).to be_nil
+      expect(configurer.run).to be_nil
     end
 
     it "should set its cached_catalog_status to 'not_used' if no catalog can be retrieved from the server and :usecacheonfailure is disabled or fails to retrieve a catalog" do
       Puppet[:usecacheonfailure] = false
-      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
+      options = {}
+      configurer.run(options)
+
+      expect(options[:report].cached_catalog_status).to eq('not_used')
     end
 
     it "should return nil if no cached catalog is available and no catalog can be retrieved from the server" do
       expects_neither_new_or_cached_catalog
 
-      expect(@agent.retrieve_catalog({})).to be_nil
+      expect(configurer.run).to be_nil
     end
 
     it "should return nil if its cached catalog environment doesn't match server-specified environment" do
-      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
-      @agent.instance_variable_set(:@node_environment, 'production')
+      cached_catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote('second_env'))
 
       expects_fallback_to_cached_catalog(cached_catalog)
 
-      Puppet.expects(:err).with("Not using cached catalog because its environment 'second_env' does not match 'production'")
-      expect(@agent.retrieve_catalog({})).to be_nil
+      allow(Puppet).to receive(:err)
+      expect(Puppet).to receive(:err).with("Not using cached catalog because its environment 'second_env' does not match 'production'")
+      expect(configurer.run).to be_nil
     end
 
     it "should set its cached_catalog_status to 'not_used' if the cached catalog environment doesn't match server-specified environment" do
-      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
-      @agent.instance_variable_set(:@node_environment, 'production')
+      cached_catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote('second_env'))
 
       expects_fallback_to_cached_catalog(cached_catalog)
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
+      options = {}
+      configurer.run(options)
+      expect(options[:report].cached_catalog_status).to eq('not_used')
     end
 
-    it "should return its cached catalog if the environment matches the server-specified environment" do
-      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment]))
-      @agent.instance_variable_set(:@node_environment, cached_catalog.environment)
+    it "should set its cached_catalog_status to 'on_failure' if the cached catalog environment matches server-specified environment" do
+      expects_fallback_to_cached_catalog(catalog)
 
-      expects_fallback_to_cached_catalog(cached_catalog)
+      options = {}
+      configurer.run(options)
+      expect(options[:report].cached_catalog_status).to eq('on_failure')
+    end
+
+    it "should not update the cached catalog in noop mode" do
+      Puppet[:noop] = true
 
-      expect(@agent.retrieve_catalog({})).to eq(cached_catalog)
+      stub_request(:post, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
+
+      Puppet::Resource::Catalog.indirection.cache_class = :json
+      path = Puppet::Resource::Catalog.indirection.cache.path(catalog.name)
+
+      expect(File).to_not be_exist(path)
+      configurer.run
+      expect(File).to_not be_exist(path)
     end
 
-    it "should set its cached_catalog_status to 'on_failure' if the cached catalog environment matches server-specified environment" do
-      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment]))
-      @agent.instance_variable_set(:@node_environment, cached_catalog.environment)
+    it "should update the cached catalog when not in noop mode" do
+      Puppet[:noop] = false
+      Puppet[:log_level] = 'info'
 
-      expects_fallback_to_cached_catalog(cached_catalog)
+      stub_request(:post, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
+
+      Puppet::Resource::Catalog.indirection.cache_class = :json
+      cache_path = Puppet::Resource::Catalog.indirection.cache.path(Puppet[:node_name_value])
+
+      expect(File).to_not be_exist(cache_path)
+      configurer.run
+      expect(File).to be_exist(cache_path)
+
+      expect(@logs).to include(an_object_having_attributes(level: :info, message: "Caching catalog for #{Puppet[:node_name_value]}"))
+    end
 
-      @agent.retrieve_catalog({})
-      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
+    it "successfully applies the catalog without a cache" do
+      stub_request(:post, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
+
+      Puppet::Resource::Catalog.indirection.cache_class = nil
+
+      expect(configurer.run).to eq(0)
+    end
+
+    it "should not update the cached catalog when running puppet apply" do
+      Puppet::Resource::Catalog.indirection.cache_class = :json
+      path = Puppet::Resource::Catalog.indirection.cache.path(catalog.name)
+
+      expect(File).to_not be_exist(path)
+      configurer.run(catalog: catalog)
+      expect(File).to_not be_exist(path)
     end
   end
 
-  describe "when converting the catalog" do
-    before do
-      Puppet.settings.stubs(:use).returns(true)
+  describe "when converging the environment" do
+    let(:apple) { Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet::Node::Environment.remote('apple')) }
+    let(:banana) { Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet::Node::Environment.remote('banana')) }
 
-      catalog.stubs(:to_ral).returns ral_catalog
+    before :each do
+      apple.add_resource(resource)
+      banana.add_resource(resource)
     end
 
-    let (:catalog) { Puppet::Resource::Catalog.new('tester', Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
-    let (:ral_catalog) { Puppet::Resource::Catalog.new('tester', Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
+    it "converges after multiple attempts" do
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(apple, banana, banana)
+
+      allow(Puppet).to receive(:notice)
+      allow(Puppet).to receive(:push_context)
+      expect(Puppet).to receive(:notice).with("Local environment: 'production' doesn't match server specified environment 'apple', restarting agent run with environment 'apple'")
+      expect(Puppet).to receive(:notice).with("Local environment: 'apple' doesn't match server specified environment 'banana', restarting agent run with environment 'banana'")
 
-    it "should convert the catalog to a RAL-formed catalog" do
-      expect(@agent.convert_catalog(catalog, 10)).to equal(ral_catalog)
+      expect(Puppet).to receive(:push_context).with(
+        hash_including(current_environment: an_object_having_attributes(name: :production)),
+        'Local node environment production for configurer transaction'
+      )
+      expect(Puppet).to receive(:push_context).with(
+        hash_including(current_environment: an_object_having_attributes(name: :apple)),
+        'Local node environment apple for configurer transaction'
+      )
+      expect(Puppet).to receive(:push_context).with(
+        hash_including(current_environment: an_object_having_attributes(name: :banana)),
+        'Local node environment banana for configurer transaction'
+      )
+
+      configurer.run
     end
 
-    it "should finalize the catalog" do
-      ral_catalog.expects(:finalize)
+    it "raises if it can't converge after 4 tries after the initial catalog request" do
+      expect(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(apple, banana, apple, banana, apple)
+
+      configurer.run
 
-      @agent.convert_catalog(catalog, 10)
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: "Failed to apply catalog: Catalog environment didn't stabilize after 4 fetches, aborting run"))
     end
+  end
 
-    it "should record the passed retrieval time with the RAL catalog" do
-      ral_catalog.expects(:retrieval_duration=).with 10
+  describe "when converting the catalog" do
+    it "converts Puppet::Resource into Puppet::Type::Notify" do
+      expect(configurer).to receive(:apply_catalog) do |ral, _|
+        expect(ral.resources).to contain(an_instance_of(Puppet::Type::Notify))
+      end
 
-      @agent.convert_catalog(catalog, 10)
+      configurer.run(catalog: catalog)
     end
 
-    it "should write the RAL catalog's class file" do
-      ral_catalog.expects(:write_class_file)
+    it "adds default schedules" do
+      expect(configurer).to receive(:apply_catalog) do |ral, _|
+        expect(ral.resources.map(&:to_ref)).to contain(%w{Schedule[puppet] Schedule[hourly] Schedule[daily] Schedule[weekly] Schedule[monthly] Schedule[never]})
+      end
 
-      @agent.convert_catalog(catalog, 10)
+      configurer.run
     end
 
-    it "should write the RAL catalog's resource file" do
-      ral_catalog.expects(:write_resource_file)
+    it "records the retrieval duration to the catalog" do
+      expect(configurer).to receive(:apply_catalog) do |ral, _|
+        expect(ral.retrieval_duration).to be_an_instance_of(Float)
+      end
 
-      @agent.convert_catalog(catalog, 10)
+      configurer.run
     end
-  end
 
-  describe "when determining whether to pluginsync" do
-    it "should default to Puppet[:pluginsync] when explicitly set by the commandline" do
-      Puppet.settings[:pluginsync] = false
-      Puppet.settings.expects(:set_by_cli?).returns(true)
+    it "writes the class file containing applied settings classes" do
+      expect(File).to_not be_exist(Puppet[:classfile])
 
-      expect(described_class).not_to be_should_pluginsync
+      configurer.run
+
+      expect(File.read(Puppet[:classfile]).chomp).to eq('settings')
     end
 
-    it "should default to Puppet[:pluginsync] when explicitly set by config" do
-      Puppet.settings[:pluginsync] = false
-      Puppet.settings.expects(:set_by_config?).returns(true)
+    it "writes an empty resource file since no resources are 'managed'" do
+      expect(File).to_not be_exist(Puppet[:resourcefile])
 
-      expect(described_class).not_to be_should_pluginsync
+      configurer.run
+
+      expect(File.read(Puppet[:resourcefile]).chomp).to eq("")
     end
 
+    it "adds the conversion time to the report" do
+      configurer.run(report: report)
+
+      expect(report.metrics['time']['convert_catalog']).to be_an_instance_of(Float)
+    end
+  end
+
+  describe "when determining whether to pluginsync" do
     it "should be true if use_cached_catalog is false" do
       Puppet.settings[:use_cached_catalog] = false
 
@@ -949,46 +1060,306 @@ describe Puppet::Configurer do
   describe "when attempting failover" do
     it "should not failover if server_list is not set" do
       Puppet.settings[:server_list] = []
-      @agent.expects(:find_functional_server).never
-      @agent.run
+      configurer.run
     end
 
     it "should not failover during an apply run" do
       Puppet.settings[:server_list] = ["myserver:123"]
-      @agent.expects(:find_functional_server).never
-      catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
-      @agent.run :catalog => catalog
+      catalog = Puppet::Resource::Catalog.new(node_name, Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
+      configurer.run(catalog: catalog)
     end
 
-    it "should select a server when provided" do
+    it "should select a server when it receives 200 OK response" do
       Puppet.settings[:server_list] = ["myserver:123"]
-      pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
-      Puppet::Network::HTTP::Pool.expects(:new).returns(pool)
-      Puppet.expects(:override).with({:http_pool => pool}).yields
-      Puppet.expects(:override).with({:server => "myserver", :serverport => '123'}).twice.yields
-      Puppet::Node.indirection.expects(:find).returns(nil)
-      @agent.expects(:run_internal).returns(nil)
-      @agent.run
+
+      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 200)
+
+      options = {}
+      configurer.run(options)
+      expect(options[:report].master_used).to eq('myserver:123')
+      expect(options[:report].server_used).to eq('myserver:123')
     end
 
-    it "should fallback to an empty server when failover fails" do
+    it "should report when usecacheonfailure is false and server is unavailable" do
       Puppet.settings[:server_list] = ["myserver:123"]
-      pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
-      Puppet::Network::HTTP::Pool.expects(:new).returns(pool)
-      Puppet.expects(:override).with({:http_pool => pool}).yields
-      Puppet.expects(:override).with({:server => "myserver", :serverport => '123'}).yields
-      Puppet.expects(:override).with({:server => nil, :serverport => nil}).yields
-      error = Net::HTTPError.new(400, 'dummy server communication error')
-      Puppet::Node.indirection.expects(:find).raises(error)
-      @agent.expects(:run_internal).returns(nil)
-      @agent.run
-    end
-
-    it "should not make multiple node requets when the server is found" do
-      Puppet.settings[:server_list] = ["myserver:123"]
-      Puppet::Node.indirection.expects(:find).returns("mynode").once
-      @agent.expects(:prepare_and_retrieve_catalog).returns(nil)
-      @agent.run
+      Puppet[:usecacheonfailure] = false
+
+      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: [500, "Internal Server Error"])
+
+      expect {
+        configurer.run
+      }.to raise_error(Puppet::Error, /Could not select a functional puppet server from server_list:/)
+
+      expect(@logs).to include(an_object_having_attributes(level: :err, message: /Puppet server myserver:123 is unavailable: 500 Internal Server Error/))
+    end
+
+    it "should error when no servers in 'server_list' are reachable" do
+      Puppet.settings[:server_list] = "myserver:123,someotherservername"
+      Puppet[:usecacheonfailure] = false
+
+      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 400)
+      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/master').to_return(status: 400)
+
+      expect{
+        configurer.run
+      }.to raise_error(Puppet::Error, /Could not select a functional puppet server from server_list: 'myserver:123,someotherservername'/)
+    end
+
+    it "should warn when servers in 'server_list' are unreachable" do
+      Puppet.settings[:server_list] = "mybadserver1:123,mybadserver2:123,mygoodserver"
+      Puppet[:usecacheonfailure] = false
+
+      stub_request(:get, 'https://mybadserver1:123/status/v1/simple/master').and_raise(Puppet::HTTP::HTTPError)
+      stub_request(:get, 'https://mybadserver2:123/status/v1/simple/master').and_raise(Puppet::HTTP::HTTPError)
+      stub_request(:get, 'https://mygoodserver:8140/status/v1/simple/master').to_return(status: 200)
+      
+      expect(Puppet).to receive(:warning).with(/^Unable to connect to server from server_list setting:.*Trying with next server from server_list.$/).twice
+      configurer.run
+    end
+
+    it "should warn when servers in 'server_list' respond with error" do
+      Puppet.settings[:server_list] = "mybadserver:123,someotherservername"
+      Puppet[:usecacheonfailure] = false
+
+      stub_request(:get, 'https://mybadserver:123/status/v1/simple/master').to_return(status: 400)
+      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/master').to_return(status: 200)
+
+      expect(Puppet).to receive(:warning).with(/^Puppet server mybadserver:123 is unavailable: 400  Trying with next server from server_list.$/)
+      configurer.run
+    end
+
+    it "should not error when usecacheonfailure is true and no servers in 'server_list' are reachable" do
+      Puppet.settings[:server_list] = "myserver:123,someotherservername"
+      Puppet[:usecacheonfailure] = true
+
+      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 400)
+      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/master').to_return(status: 400)
+
+      options = {}
+
+      expect(configurer.run(options)).to eq(0)
+      expect(options[:report].server_used).to be_nil
+    end
+  end
+
+  describe "when selecting an environment" do
+    include PuppetSpec::Settings
+
+    describe "when the last used environment is available" do
+      let(:last_server_specified_environment) { 'development' }
+
+      before do
+        Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+        ---
+        version:
+          config: 1624882680
+          puppet: 6.24.0
+        application:
+          initial_environment: #{Puppet[:environment]}
+          converged_environment: #{last_server_specified_environment}
+          run_mode: agent
+        SUMMARY
+      end
+
+      describe "when the use_last_environment is set to true" do
+        before do
+          expect(Puppet::Node.indirection).not_to receive(:find)
+          .with(anything, hash_including(:ignore_cache => true, :fail_on_404 => true))
+        end
+
+        it "prefers the environment set via cli" do
+          Puppet.settings.handlearg('--environment', 'usethis')
+          configurer.run
+
+          expect(configurer.environment).to eq('usethis')
+        end
+
+        it "prefers the environment set via lastrunfile over config" do
+          FileUtils.mkdir_p(Puppet[:confdir])
+          set_puppet_conf(Puppet[:confdir], <<~CONF)
+          [main]
+          environment = usethis
+          lastrunfile = #{Puppet[:lastrunfile]}
+          CONF
+
+          Puppet.initialize_settings
+          configurer.run
+
+          expect(configurer.environment).to eq(last_server_specified_environment)
+        end
+
+        it "uses the environment from Puppet[:environment] if given a catalog" do
+          configurer.run(catalog: catalog)
+
+          expect(configurer.environment).to eq(Puppet[:environment])
+        end
+
+        it "uses the environment from Puppet[:environment] if use_cached_catalog = true" do
+          Puppet[:use_cached_catalog] = true
+          expects_cached_catalog_only(catalog)
+          configurer.run
+
+          expect(configurer.environment).to eq(Puppet[:environment])
+        end
+
+        describe "when the environment is not set via CLI" do
+          it "uses the environment found in lastrunfile if the key exists" do
+            configurer.run
+
+            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 the environment from Puppet[:environment] if strict_environment_mode is set" do
+            Puppet[:strict_environment_mode] = true
+            configurer.run
+
+            expect(configurer.environment).to eq(Puppet[:environment])
+          end
+
+          it "uses the environment from Puppet[:environment] if initial_environment is the same as converged_environment" do
+            Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+            ---
+            version:
+              config: 1624882680
+              puppet: 6.24.0
+            application:
+              initial_environment: development
+              converged_environment: development
+              run_mode: agent
+            SUMMARY
+            configurer.run
+
+            expect(configurer.environment).to eq(Puppet[:environment])
+          end
+        end
+      end
+
+      describe "when the use_last_environment setting is set to false" do
+        let(:node_environment) { Puppet::Node::Environment.remote(:salam) }
+        let(:node) { Puppet::Node.new(Puppet[:node_name_value]) }
+
+        before do
+          Puppet[:use_last_environment] = false
+          node.environment = node_environment
+
+          allow(Puppet::Node.indirection).to receive(:find)
+          allow(Puppet::Node.indirection).to receive(:find)
+            .with(anything, hash_including(:ignore_cache => true, :fail_on_404 => true))
+            .and_return(node)
+        end
+
+        it "does a node request" do
+          expect(Puppet::Node.indirection).to receive(:find)
+          .with(anything, hash_including(:ignore_cache => true, :fail_on_404 => true))
+
+          configurer.run
+        end
+
+        it "uses the node environment from the node request" do
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+      end
+    end
+
+    describe "when the last used environment is not available" do
+      describe "when the node request succeeds" do
+        let(:node_environment) { Puppet::Node::Environment.remote(:salam) }
+        let(:node) { Puppet::Node.new(Puppet[:node_name_value]) }
+        let(:last_server_specified_environment) { 'development' }
+
+        before do
+          node.environment = node_environment
+
+          allow(Puppet::Node.indirection).to receive(:find)
+          allow(Puppet::Node.indirection).to receive(:find)
+            .with(anything, hash_including(:ignore_cache => true, :fail_on_404 => true))
+            .and_return(node)
+        end
+
+        it "uses the environment from the node request if the run mode doesn't match" do
+          Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+            ---
+            version:
+              config: 1624882680
+              puppet: 6.24.0
+            application:
+              initial_environment: #{Puppet[:environment]}
+              converged_environment: #{last_server_specified_environment}
+              run_mode: user
+          SUMMARY
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+
+        it "uses the environment from the node request if lastrunfile does not contain the expected keys" do
+          Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+            ---
+            version:
+              config: 1624882680
+              puppet: 6.24.0
+          SUMMARY
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+
+        it "uses the environment from the node request if lastrunfile is invalid YAML" do
+          Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', <<~SUMMARY)
+            Key: 'this is my very very very ' +
+                 'long string'
+          SUMMARY
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+
+        it "uses the environment from the node request if lastrunfile exists but is empty" do
+          Puppet[:lastrunfile] = file_containing('last_run_summary.yaml', '')
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+
+        it "uses the environment from the node request if the last used one cannot be found" do
+          Puppet[:lastrunfile] = tmpfile('last_run_summary.yaml')
+          configurer.run
+
+          expect(configurer.environment).to eq(node_environment.name.to_s)
+        end
+      end
+
+      describe "when the node request fails" do
+        before do
+          allow(Puppet::Node.indirection).to receive(:find).and_call_original
+          allow(Puppet::Node.indirection).to receive(:find)
+            .with(anything, hash_including(:ignore_cache => true, :fail_on_404 => true))
+            .and_raise(Puppet::Error)
+        end
+
+        it "uses the environment from Puppet[:environment] if the last used one cannot be found" do
+          Puppet[:lastrunfile] = tmpfile('last_run_summary.yaml')
+          configurer.run
+
+          expect(configurer.environment).to eq(Puppet[:environment])
+        end
+      end
     end
   end
 end