puppet 6.23.0 → 7.0.0

data/spec/unit/util/storage_spec.rb

@@ -143,11 +143,9 @@ describe Puppet::Util::Storage do
       end
 
       it "should raise an error if the state file does not contain valid YAML and cannot be renamed" do
-        allow(File).to receive(:rename).and_call_original
-
         write_state_file('{ invalid')
 
-        expect(File).to receive(:rename).with(@state_file, "#{@state_file}.bad").and_raise(SystemCallError)
+        expect(File).to receive(:rename).and_raise(SystemCallError)
 
         expect { Puppet::Util::Storage.load }.to raise_error(Puppet::Error, /Could not rename/)
       end

data/spec/unit/util/suidmanager_spec.rb

@@ -14,14 +14,12 @@ describe Puppet::Util::SUIDManager do
     pwent = double('pwent', :name => 'fred', :uid => 42, :gid => 42)
     allow(Etc).to receive(:getpwuid).with(42).and_return(pwent)
 
-    unless Puppet::Util::Platform.windows?
-      [:euid, :egid, :uid, :gid, :groups].each do |id|
-        allow(Process).to receive("#{id}=") {|value| xids[id] = value}
-      end
+    [:euid, :egid, :uid, :gid, :groups].each do |id|
+      allow(Process).to receive("#{id}=") {|value| xids[id] = value}
     end
   end
 
-  describe "#initgroups", unless: Puppet::Util::Platform.windows? do
+  describe "#initgroups" do
     it "should use the primary group of the user as the 'basegid'" do
       expect(Process).to receive(:initgroups).with('fred', 42)
       described_class.initgroups(42)
@@ -29,7 +27,7 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#uid" do
-    it "should allow setting euid/egid", unless: Puppet::Util::Platform.windows? do
+    it "should allow setting euid/egid" do
       Puppet::Util::SUIDManager.egid = user[:gid]
       Puppet::Util::SUIDManager.euid = user[:uid]
 
@@ -39,7 +37,8 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#asuser" do
-    it "should not get or set euid/egid when not root", unless: Puppet::Util::Platform.windows? do
+    it "should not get or set euid/egid when not root" do
+      allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       allow(Process).to receive(:uid).and_return(1)
 
       allow(Process).to receive(:egid).and_return(51)
@@ -50,12 +49,13 @@ describe Puppet::Util::SUIDManager do
       expect(xids).to be_empty
     end
 
-    context "when root and not Windows" do
+    context "when root and not windows" do
       before :each do
         allow(Process).to receive(:uid).and_return(0)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
-      it "should set euid/egid", unless: Puppet::Util::Platform.windows? do
+      it "should set euid/egid" do
         allow(Process).to receive(:egid).and_return(51, 51, user[:gid])
         allow(Process).to receive(:euid).and_return(50, 50, user[:uid])
 
@@ -79,23 +79,29 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should just yield if user and group are nil" do
-        expect { |b| Puppet::Util::SUIDManager.asuser(nil, nil, &b) }.to yield_control
+        yielded = false
+        Puppet::Util::SUIDManager.asuser(nil, nil) { yielded = true }
+        expect(yielded).to be_truthy
         expect(xids).to eq({})
       end
 
-      it "should just change group if only group is given", unless: Puppet::Util::Platform.windows? do
-        expect { |b| Puppet::Util::SUIDManager.asuser(nil, 42, &b) }.to yield_control
+      it "should just change group if only group is given" do
+        yielded = false
+        Puppet::Util::SUIDManager.asuser(nil, 42) { yielded = true }
+        expect(yielded).to be_truthy
         expect(xids).to eq({ :egid => 42 })
       end
 
-      it "should change gid to the primary group of uid by default", unless: Puppet::Util::Platform.windows? do
+      it "should change gid to the primary group of uid by default" do
         allow(Process).to receive(:initgroups)
 
-        expect { |b| Puppet::Util::SUIDManager.asuser(42, nil, &b) }.to yield_control
+        yielded = false
+        Puppet::Util::SUIDManager.asuser(42) { yielded = true }
+        expect(yielded).to be_truthy
         expect(xids).to eq({ :euid => 42, :egid => 42 })
       end
 
-      it "should change both uid and gid if given", unless: Puppet::Util::Platform.windows? do
+      it "should change both uid and gid if given" do
         # I don't like the sequence, but it is the only way to assert on the
         # internal behaviour in a reliable fashion, given we need multiple
         # sequenced calls to the same methods. --daniel 2012-02-05
@@ -104,23 +110,21 @@ describe Puppet::Util::SUIDManager do
         expect(Puppet::Util::SUIDManager).to receive(:change_group).with(Puppet::Util::SUIDManager.egid, false).ordered()
         expect(Puppet::Util::SUIDManager).to receive(:change_user).with(Puppet::Util::SUIDManager.euid, false).ordered()
 
-        expect { |b| Puppet::Util::SUIDManager.asuser(42, 43, &b) }.to yield_control
+        yielded = false
+        Puppet::Util::SUIDManager.asuser(42, 43) { yielded = true }
+        expect(yielded).to be_truthy
       end
     end
 
-    it "should just yield on Windows", if: Puppet::Util::Platform.windows? do
-      expect { |b| Puppet::Util::SUIDManager.asuser(1, 2, &b) }.to yield_control
+    it "should not get or set euid/egid on Windows", if: Puppet::Util::Platform.windows? do
+      Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
+
+      expect(xids).to be_empty
     end
   end
 
   describe "#change_group" do
-    it "raises on Windows", if: Puppet::Util::Platform.windows? do
-      expect {
-        Puppet::Util::SUIDManager.change_group(42, true)
-      }.to raise_error(NotImplementedError, /change_privilege\(\) function is unimplemented/)
-    end
-
-    describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
+    describe "when changing permanently" do
       it "should change_privilege" do
         expect(Process::GID).to receive(:change_privilege) do |gid|
           Process.gid = gid
@@ -146,7 +150,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
+    describe "when changing temporarily" do
       it "should change only egid" do
         Puppet::Util::SUIDManager.change_group(42, false)
 
@@ -157,13 +161,7 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#change_user" do
-    it "raises on Windows", if: Puppet::Util::Platform.windows? do
-      expect {
-        Puppet::Util::SUIDManager.change_user(42, true)
-      }.to raise_error(NotImplementedError, /initgroups\(\) function is unimplemented/)
-    end
-
-    describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
+    describe "when changing permanently" do
       it "should change_privilege" do
         expect(Process::UID).to receive(:change_privilege) do |uid|
           Process.uid = uid
@@ -193,7 +191,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
+    describe "when changing temporarily" do
       it "should change only euid and groups" do
         allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
         Puppet::Util::SUIDManager.change_user(42, false)
@@ -223,7 +221,12 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#root?" do
-    describe "on POSIX systems", unless: Puppet::Util::Platform.windows? do
+    describe "on POSIX systems" do
+      before :each do
+        allow(Puppet.features).to receive(:posix?).and_return(true)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+      end
+
       it "should be root if uid is 0" do
         allow(Process).to receive(:uid).and_return(0)
 
@@ -237,7 +240,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "on Windows", :if => Puppet::Util::Platform.windows? do
+    describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
       it "should be root if user is privileged" do
         allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(true)
 
@@ -258,19 +261,13 @@ describe 'Puppet::Util::SUIDManager#groups=' do
     Puppet::Util::SUIDManager
   end
 
-  it "raises on Windows", if: Puppet::Util::Platform.windows? do
-    expect {
-      subject.groups = []
-    }.to raise_error(NotImplementedError, /groups=\(\) function is unimplemented/)
-  end
-
-  it "(#3419) should rescue Errno::EINVAL on OS X", unless: Puppet::Util::Platform.windows? do
+  it "(#3419) should rescue Errno::EINVAL on OS X" do
     expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
     expect(subject).to receive(:osx_maj_ver).and_return('10.7').twice
     subject.groups = ['list', 'of', 'groups']
   end
 
-  it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X", unless: Puppet::Util::Platform.windows? do
+  it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X" do
     expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
     expect(subject).to receive(:osx_maj_ver).and_return(false)
     expect { subject.groups = ['list', 'of', 'groups'] }.to raise_error(Errno::EINVAL)

data/spec/unit/util/windows/sid_spec.rb

@@ -158,12 +158,6 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       # this works in French Windows, even though the account is really AUTORITE NT\\Syst\u00E8me
       expect(subject.name_to_principal('NT AUTHORITY\SYSTEM').sid).to eq(sid)
     end
-
-    it "should print a debug message on failures" do
-      expect(Puppet).to receive(:debug).with(/Could not retrieve raw SID bytes from 'NonExistingUser'/)
-      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
-      subject.name_to_principal('NonExistingUser')
-    end
   end
 
   context "#ads_to_principal" do

data/spec/unit/util/windows/string_spec.rb

@@ -4,15 +4,13 @@ require 'spec_helper'
 require 'puppet/util/windows'
 
 describe "Puppet::Util::Windows::String", :if => Puppet::Util::Platform.windows? do
-  UTF16_NULL = [0, 0]
-
   def wide_string(str)
     Puppet::Util::Windows::String.wide_string(str)
   end
 
   def converts_to_wide_string(string_value)
     expected = string_value.encode(Encoding::UTF_16LE)
-    expected_bytes = expected.bytes.to_a + UTF16_NULL
+    expected_bytes = expected.bytes.to_a
 
     expect(wide_string(string_value).bytes.to_a).to eq(expected_bytes)
   end

data/spec/unit/util/yaml_spec.rb

@@ -139,60 +139,6 @@ FACTS
     end
   end
 
-  context '#load_file' do
-    it_should_behave_like 'yaml file loader', Puppet::Util::Yaml.method(:load_file)
-
-    it 'raises an error when the file is invalid YAML' do
-      write_file(filename, '{ invalid')
-
-      expect {
-        Puppet::Util::Yaml.load_file(filename)
-      }.to raise_error(Puppet::Util::Yaml::YamlLoadError, %r{\(#{filename}\): .* at line \d+ column \d+})
-    end
-
-    it 'raises an error when the filename is illegal' do
-      expect {
-        Puppet::Util::Yaml.load_file("not\0allowed")
-      }.to raise_error(Puppet::Util::Yaml::YamlLoadError, /null byte/)
-    end
-
-    it 'raises an error when the file does not exist' do
-      expect {
-        Puppet::Util::Yaml.load_file('does/not/exist.yaml')
-      }.to raise_error(Puppet::Util::Yaml::YamlLoadError, /No such file or directory/)
-    end
-
-    it 'allows return value to be overridden' do
-      Puppet::FileSystem.touch(filename)
-
-      expect(Puppet::Util::Yaml.load_file(filename, {})).to eq({})
-    end
-
-    it 'loads arbitrary objects' do
-      write_file(filename, "--- !ruby/object {}\n")
-
-      expect(Puppet::Util::Yaml.load_file(filename, {})).to be_instance_of(Object)
-    end
-
-    it 'should allow one to strip ruby tags that would otherwise not parse' do
-      write_file(filename, "---\nweirddata: !ruby/hash:Not::A::Valid::Class {}")
-
-      expect(Puppet::Util::Yaml.load_file(filename, {}, true)).to eq({"weirddata" => {}})
-    end
-
-    it 'should not strip non-ruby tags' do
-      write_file(filename, "---\nweirddata: !binary |-\n          e21kNX04MTE4ZGY2NmM5MTc3OTg4ZWE4Y2JiOWEzMjMyNzFkYg==")
-
-      expect(Puppet::Util::Yaml.load_file(filename, {}, true)).to eq({"weirddata" => "{md5}8118df66c9177988ea8cbb9a323271db"})
-    end
-
-    it 'writes data formatted as YAML to disk' do
-      Puppet::Util::Yaml.dump({ "my" => "data" }, filename)
-
-      expect(Puppet::Util::Yaml.load_file(filename)).to eq({ "my" => "data" })
-    end
-  end
-
   def write_file(name, contents)
     File.open(name, "w:UTF-8") do |fh|
       fh.write(contents)

data/spec/unit/util_spec.rb

@@ -3,12 +3,6 @@ require 'spec_helper'
 describe Puppet::Util do
   include PuppetSpec::Files
 
-  # Discriminator for tests that attempts to unset HOME since that, for reasons currently unknown,
-  # doesn't work in Ruby >= 2.4.0
-  def self.gte_ruby_2_4
-    @gte_ruby_2_4 ||= SemanticPuppet::Version.parse(RUBY_VERSION) >= SemanticPuppet::Version.parse('2.4.0')
-  end
-
   if Puppet::Util::Platform.windows?
     def set_mode(mode, file)
       Puppet::Util::Windows::Security.set_mode(mode, file)
@@ -315,7 +309,7 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(true)
+        allow(Puppet.features).to receive(:posix).and_return(true)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
@@ -328,7 +322,7 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(false)
+        allow(Puppet.features).to receive(:posix).and_return(false)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
@@ -462,7 +456,7 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(true)
+        allow(Puppet.features).to receive(:posix).and_return(true)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
@@ -501,7 +495,7 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(false)
+        allow(Puppet.features).to receive(:posix).and_return(false)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
@@ -539,6 +533,7 @@ describe Puppet::Util do
       expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz'))).to eq('/bar baz')
     end
 
+
     [
       "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E",
       "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E".force_encoding(Encoding::ASCII)
@@ -588,15 +583,7 @@ describe Puppet::Util do
     end
   end
 
-  describe "safe_posix_fork on Windows and JRuby", if: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
-    it "raises not implemented error" do
-      expect {
-        Puppet::Util.safe_posix_fork
-      }.to raise_error(NotImplementedError, /fork/)
-    end
-  end
-
-  describe "safe_posix_fork", unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
+  describe "safe_posix_fork" do
     let(:pid) { 5501 }
 
     before :each do
@@ -676,18 +663,6 @@ describe Puppet::Util do
       expect(Puppet::Util.which('doesnotexist')).to be_nil
     end
 
-    it "should warn if the user's HOME is not set but their PATH contains a ~", :unless => gte_ruby_2_4 do
-      env_path = %w[~/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
-
-      env = {:HOME => nil, :PATH => env_path}
-      env.merge!({:HOMEDRIVE => nil, :USERPROFILE => nil}) if Puppet::Util::Platform.windows?
-
-      expect(Puppet::Util::Warnings).to receive(:warnonce).once
-      Puppet::Util.withenv(env) do
-        Puppet::Util.which('foo')
-      end
-    end
-
     it "should reject directories" do
       expect(Puppet::Util.which(base)).to be_nil
     end

data/tasks/generate_cert_fixtures.rake

@@ -173,12 +173,12 @@ task(:gen_cert_fixtures) do
 
   # Create a request, but replace its public key after it's signed
   tampered_csr = ca.create_request('signed')[:csr]
-  tampered_csr.public_key = OpenSSL::PKey::RSA.new(2048).public_key
+  tampered_csr.public_key = OpenSSL::PKey::RSA.new(1024).public_key
   save(dir, 'tampered-csr.pem', tampered_csr)
 
   # Create a cert issued from the real intermediate CA, but replace its
   # public key
   tampered_cert = ca.create_cert('signed', inter[:cert], inter[:private_key])[:cert]
-  tampered_cert.public_key = OpenSSL::PKey::RSA.new(2048).public_key
+  tampered_cert.public_key = OpenSSL::PKey::RSA.new(1024).public_key
   save(dir, 'tampered-cert.pem', tampered_cert)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.23.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -106,20 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: puppet-resource_api
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +165,6 @@ files:
 - README.md
 - Rakefile
 - bin/puppet
-- conf/auth.conf
 - conf/environment.conf
 - conf/fileserver.conf
 - conf/hiera.yaml
@@ -317,7 +302,6 @@ files:
 - lib/puppet/application/agent.rb
 - lib/puppet/application/apply.rb
 - lib/puppet/application/catalog.rb
-- lib/puppet/application/cert.rb
 - lib/puppet/application/config.rb
 - lib/puppet/application/describe.rb
 - lib/puppet/application/device.rb
@@ -329,9 +313,7 @@ files:
 - lib/puppet/application/generate.rb
 - lib/puppet/application/help.rb
 - lib/puppet/application/indirection_base.rb
-- lib/puppet/application/key.rb
 - lib/puppet/application/lookup.rb
-- lib/puppet/application/man.rb
 - lib/puppet/application/module.rb
 - lib/puppet/application/node.rb
 - lib/puppet/application/parser.rb
@@ -340,7 +322,6 @@ files:
 - lib/puppet/application/resource.rb
 - lib/puppet/application/script.rb
 - lib/puppet/application/ssl.rb
-- lib/puppet/application/status.rb
 - lib/puppet/application_support.rb
 - lib/puppet/coercion.rb
 - lib/puppet/compilable_resource_type.rb
@@ -391,15 +372,10 @@ files:
 - lib/puppet/face/help/face.erb
 - lib/puppet/face/help/global.erb
 - lib/puppet/face/help/man.erb
-- lib/puppet/face/key.rb
-- lib/puppet/face/man.rb
 - lib/puppet/face/module.rb
-- lib/puppet/face/module/build.rb
 - lib/puppet/face/module/changes.rb
-- lib/puppet/face/module/generate.rb
 - lib/puppet/face/module/install.rb
 - lib/puppet/face/module/list.rb
-- lib/puppet/face/module/search.rb
 - lib/puppet/face/module/uninstall.rb
 - lib/puppet/face/module/upgrade.rb
 - lib/puppet/face/node.rb
@@ -408,7 +384,6 @@ files:
 - lib/puppet/face/plugin.rb
 - lib/puppet/face/report.rb
 - lib/puppet/face/resource.rb
-- lib/puppet/face/status.rb
 - lib/puppet/feature/base.rb
 - lib/puppet/feature/bolt.rb
 - lib/puppet/feature/cfpropertylist.rb
@@ -422,9 +397,11 @@ files:
 - lib/puppet/feature/ssh.rb
 - lib/puppet/feature/telnet.rb
 - lib/puppet/feature/zlib.rb
-- lib/puppet/ffi/posix.rb
-- lib/puppet/ffi/posix/constants.rb
-- lib/puppet/ffi/posix/functions.rb
+- lib/puppet/ffi/windows.rb
+- lib/puppet/ffi/windows/api_types.rb
+- lib/puppet/ffi/windows/constants.rb
+- lib/puppet/ffi/windows/functions.rb
+- lib/puppet/ffi/windows/structs.rb
 - lib/puppet/file_bucket.rb
 - lib/puppet/file_bucket/dipper.rb
 - lib/puppet/file_bucket/file.rb
@@ -563,14 +540,21 @@ files:
 - lib/puppet/graph/simple_graph.rb
 - lib/puppet/http.rb
 - lib/puppet/http/client.rb
+- lib/puppet/http/dns.rb
 - lib/puppet/http/errors.rb
 - lib/puppet/http/external_client.rb
+- lib/puppet/http/factory.rb
+- lib/puppet/http/pool.rb
+- lib/puppet/http/pool_entry.rb
+- lib/puppet/http/proxy.rb
 - lib/puppet/http/redirector.rb
 - lib/puppet/http/resolver.rb
 - lib/puppet/http/resolver/server_list.rb
 - lib/puppet/http/resolver/settings.rb
 - lib/puppet/http/resolver/srv.rb
 - lib/puppet/http/response.rb
+- lib/puppet/http/response_converter.rb
+- lib/puppet/http/response_net_http.rb
 - lib/puppet/http/retry_after_handler.rb
 - lib/puppet/http/service.rb
 - lib/puppet/http/service/ca.rb
@@ -579,6 +563,7 @@ files:
 - lib/puppet/http/service/puppetserver.rb
 - lib/puppet/http/service/report.rb
 - lib/puppet/http/session.rb
+- lib/puppet/http/site.rb
 - lib/puppet/indirector.rb
 - lib/puppet/indirector/catalog/compiler.rb
 - lib/puppet/indirector/catalog/json.rb
@@ -586,11 +571,6 @@ files:
 - lib/puppet/indirector/catalog/rest.rb
 - lib/puppet/indirector/catalog/store_configs.rb
 - lib/puppet/indirector/catalog/yaml.rb
-- lib/puppet/indirector/certificate/file.rb
-- lib/puppet/indirector/certificate/rest.rb
-- lib/puppet/indirector/certificate_request/file.rb
-- lib/puppet/indirector/certificate_request/memory.rb
-- lib/puppet/indirector/certificate_request/rest.rb
 - lib/puppet/indirector/code.rb
 - lib/puppet/indirector/data_binding/hiera.rb
 - lib/puppet/indirector/data_binding/none.rb
@@ -613,7 +593,6 @@ files:
 - lib/puppet/indirector/file_content.rb
 - lib/puppet/indirector/file_content/file.rb
 - lib/puppet/indirector/file_content/file_server.rb
-- lib/puppet/indirector/file_content/http.rb
 - lib/puppet/indirector/file_content/rest.rb
 - lib/puppet/indirector/file_content/selector.rb
 - lib/puppet/indirector/file_metadata.rb
@@ -627,8 +606,6 @@ files:
 - lib/puppet/indirector/hiera.rb
 - lib/puppet/indirector/indirection.rb
 - lib/puppet/indirector/json.rb
-- lib/puppet/indirector/key/file.rb
-- lib/puppet/indirector/key/memory.rb
 - lib/puppet/indirector/memory.rb
 - lib/puppet/indirector/msgpack.rb
 - lib/puppet/indirector/node/exec.rb
@@ -651,10 +628,6 @@ files:
 - lib/puppet/indirector/resource/store_configs.rb
 - lib/puppet/indirector/resource/validator.rb
 - lib/puppet/indirector/rest.rb
-- lib/puppet/indirector/ssl_file.rb
-- lib/puppet/indirector/status.rb
-- lib/puppet/indirector/status/local.rb
-- lib/puppet/indirector/status/rest.rb
 - lib/puppet/indirector/store_configs.rb
 - lib/puppet/indirector/terminus.rb
 - lib/puppet/indirector/yaml.rb
@@ -681,7 +654,6 @@ files:
 - lib/puppet/module_tool/applications/application.rb
 - lib/puppet/module_tool/applications/checksummer.rb
 - lib/puppet/module_tool/applications/installer.rb
-- lib/puppet/module_tool/applications/searcher.rb
 - lib/puppet/module_tool/applications/uninstaller.rb
 - lib/puppet/module_tool/applications/unpacker.rb
 - lib/puppet/module_tool/applications/upgrader.rb
@@ -703,10 +675,8 @@ files:
 - lib/puppet/module_tool/tar/gnu.rb
 - lib/puppet/module_tool/tar/mini.rb
 - lib/puppet/network.rb
-- lib/puppet/network/auth_config_parser.rb
 - lib/puppet/network/authconfig.rb
 - lib/puppet/network/authorization.rb
-- lib/puppet/network/authstore.rb
 - lib/puppet/network/client_request.rb
 - lib/puppet/network/format.rb
 - lib/puppet/network/format_handler.rb
@@ -718,29 +688,16 @@ files:
 - lib/puppet/network/http/api/indirection_type.rb
 - lib/puppet/network/http/api/master.rb
 - lib/puppet/network/http/api/master/v3.rb
-- lib/puppet/network/http/api/master/v3/authorization.rb
-- lib/puppet/network/http/api/master/v3/environment.rb
 - lib/puppet/network/http/api/master/v3/environments.rb
-- lib/puppet/network/http/base_pool.rb
-- lib/puppet/network/http/compression.rb
 - lib/puppet/network/http/connection.rb
-- lib/puppet/network/http/connection_adapter.rb
 - lib/puppet/network/http/error.rb
-- lib/puppet/network/http/factory.rb
 - lib/puppet/network/http/handler.rb
 - lib/puppet/network/http/issues.rb
 - lib/puppet/network/http/memory_response.rb
-- lib/puppet/network/http/nocache_pool.rb
-- lib/puppet/network/http/pool.rb
 - lib/puppet/network/http/request.rb
 - lib/puppet/network/http/response.rb
 - lib/puppet/network/http/route.rb
-- lib/puppet/network/http/session.rb
-- lib/puppet/network/http/site.rb
 - lib/puppet/network/http_pool.rb
-- lib/puppet/network/resolver.rb
-- lib/puppet/network/rest_controller.rb
-- lib/puppet/network/rights.rb
 - lib/puppet/network/uri.rb
 - lib/puppet/node.rb
 - lib/puppet/node/environment.rb
@@ -776,11 +733,8 @@ files:
 - lib/puppet/parser/catalog_compiler.rb
 - lib/puppet/parser/compiler.rb
 - lib/puppet/parser/compiler/catalog_validator.rb
-- lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb
 - lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb
-- lib/puppet/parser/compiler/catalog_validator/site_validator.rb
 - lib/puppet/parser/e4_parser_adapter.rb
-- lib/puppet/parser/environment_compiler.rb
 - lib/puppet/parser/files.rb
 - lib/puppet/parser/functions.rb
 - lib/puppet/parser/functions/assert_type.rb
@@ -971,7 +925,6 @@ files:
 - lib/puppet/pops/types/annotatable.rb
 - lib/puppet/pops/types/annotation.rb
 - lib/puppet/pops/types/class_loader.rb
-- lib/puppet/pops/types/enumeration.rb
 - lib/puppet/pops/types/implementation_registry.rb
 - lib/puppet/pops/types/iterable.rb
 - lib/puppet/pops/types/p_binary_type.rb
@@ -1130,15 +1083,10 @@ files:
 - lib/puppet/reports/log.rb
 - lib/puppet/reports/store.rb
 - lib/puppet/resource.rb
-- lib/puppet/resource/capability_finder.rb
 - lib/puppet/resource/catalog.rb
 - lib/puppet/resource/status.rb
 - lib/puppet/resource/type.rb
 - lib/puppet/resource/type_collection.rb
-- lib/puppet/rest/errors.rb
-- lib/puppet/rest/response.rb
-- lib/puppet/rest/route.rb
-- lib/puppet/rest/routes.rb
 - lib/puppet/runtime.rb
 - lib/puppet/scheduler.rb
 - lib/puppet/scheduler/job.rb
@@ -1146,7 +1094,6 @@ files:
 - lib/puppet/scheduler/splay_job.rb
 - lib/puppet/scheduler/timer.rb
 - lib/puppet/settings.rb
-- lib/puppet/settings/alias_setting.rb
 - lib/puppet/settings/array_setting.rb
 - lib/puppet/settings/autosign_setting.rb
 - lib/puppet/settings/base_setting.rb
@@ -1162,7 +1109,9 @@ files:
 - lib/puppet/settings/file_setting.rb
 - lib/puppet/settings/http_extra_headers_setting.rb
 - lib/puppet/settings/ini_file.rb
+- lib/puppet/settings/integer_setting.rb
 - lib/puppet/settings/path_setting.rb
+- lib/puppet/settings/port_setting.rb
 - lib/puppet/settings/priority_setting.rb
 - lib/puppet/settings/server_list_setting.rb
 - lib/puppet/settings/string_setting.rb
@@ -1178,19 +1127,12 @@ files:
 - lib/puppet/ssl/certificate_signer.rb
 - lib/puppet/ssl/digest.rb
 - lib/puppet/ssl/error.rb
-- lib/puppet/ssl/host.rb
-- lib/puppet/ssl/key.rb
 - lib/puppet/ssl/oids.rb
 - lib/puppet/ssl/openssl_loader.rb
 - lib/puppet/ssl/ssl_context.rb
 - lib/puppet/ssl/ssl_provider.rb
 - lib/puppet/ssl/state_machine.rb
-- lib/puppet/ssl/validator.rb
-- lib/puppet/ssl/validator/default_validator.rb
-- lib/puppet/ssl/validator/no_validator.rb
 - lib/puppet/ssl/verifier.rb
-- lib/puppet/ssl/verifier_adapter.rb
-- lib/puppet/status.rb
 - lib/puppet/syntax_checkers.rb
 - lib/puppet/syntax_checkers/base64.rb
 - lib/puppet/syntax_checkers/epp.rb
@@ -1248,14 +1190,12 @@ files:
 - lib/puppet/util/command_line.rb
 - lib/puppet/util/command_line/puppet_option_parser.rb
 - lib/puppet/util/command_line/trollop.rb
-- lib/puppet/util/connection.rb
 - lib/puppet/util/constant_inflector.rb
 - lib/puppet/util/diff.rb
 - lib/puppet/util/docs.rb
 - lib/puppet/util/errors.rb
 - lib/puppet/util/execution.rb
 - lib/puppet/util/execution_stub.rb
-- lib/puppet/util/fact_dif.rb
 - lib/puppet/util/feature.rb
 - lib/puppet/util/file_watcher.rb
 - lib/puppet/util/fileparsing.rb
@@ -1327,7 +1267,6 @@ files:
 - lib/puppet/util/selinux.rb
 - lib/puppet/util/skip_tags.rb
 - lib/puppet/util/splayer.rb
-- lib/puppet/util/ssl.rb
 - lib/puppet/util/storage.rb
 - lib/puppet/util/suidmanager.rb
 - lib/puppet/util/symbolic_file_mode.rb
@@ -1345,12 +1284,12 @@ files:
 - lib/puppet/util/windows/access_control_entry.rb
 - lib/puppet/util/windows/access_control_list.rb
 - lib/puppet/util/windows/adsi.rb
-- lib/puppet/util/windows/api_types.rb
 - lib/puppet/util/windows/com.rb
+- lib/puppet/util/windows/daemon.rb
 - lib/puppet/util/windows/error.rb
 - lib/puppet/util/windows/eventlog.rb
 - lib/puppet/util/windows/file.rb
-- lib/puppet/util/windows/monkey_patches/dir.rb
+- lib/puppet/util/windows/monkey_patches/process.rb
 - lib/puppet/util/windows/principal.rb
 - lib/puppet/util/windows/process.rb
 - lib/puppet/util/windows/registry.rb
@@ -1363,15 +1302,6 @@ files:
 - lib/puppet/util/windows/user.rb
 - lib/puppet/util/yaml.rb
 - lib/puppet/vendor.rb
-- lib/puppet/vendor/load_pathspec.rb
-- lib/puppet/vendor/pathspec/CHANGELOG.md
-- lib/puppet/vendor/pathspec/LICENSE
-- lib/puppet/vendor/pathspec/PUPPET_README.md
-- lib/puppet/vendor/pathspec/README.md
-- lib/puppet/vendor/pathspec/lib/pathspec.rb
-- lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb
-- lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb
-- lib/puppet/vendor/pathspec/lib/pathspec/spec.rb
 - lib/puppet/vendor/require_vendored.rb
 - lib/puppet/version.rb
 - lib/puppet/x509.rb
@@ -1395,9 +1325,7 @@ files:
 - man/man8/puppet-filebucket.8
 - man/man8/puppet-generate.8
 - man/man8/puppet-help.8
-- man/man8/puppet-key.8
 - man/man8/puppet-lookup.8
-- man/man8/puppet-man.8
 - man/man8/puppet-module.8
 - man/man8/puppet-node.8
 - man/man8/puppet-parser.8
@@ -1406,11 +1334,9 @@ files:
 - man/man8/puppet-resource.8
 - man/man8/puppet-script.8
 - man/man8/puppet-ssl.8
-- man/man8/puppet-status.8
 - man/man8/puppet.8
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
-- spec/fixtures/integration/application/agent/cached_deferred_catalog.json
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -1783,11 +1709,10 @@ files:
 - spec/fixtures/unit/provider/service/openbsd/rcctl_getall
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/openrc/rcstatus
-- spec/fixtures/unit/provider/service/smf/svcs.out
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
+- spec/fixtures/unit/provider/service/smf/svcs_instances.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
-- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -1817,7 +1742,6 @@ files:
 - spec/integration/application/lookup_spec.rb
 - spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
-- spec/integration/application/resource_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -1832,7 +1756,6 @@ files:
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
 - spec/integration/network/http_pool_spec.rb
@@ -1869,7 +1792,7 @@ files:
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/windows/adsi_spec.rb
-- spec/integration/util/windows/monkey_patches/dir_spec.rb
+- spec/integration/util/windows/monkey_patches/process_spec.rb
 - spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
 - spec/integration/util/windows/registry_spec.rb
@@ -1877,8 +1800,10 @@ files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
+- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
+- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -1945,11 +1870,9 @@ files:
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/lookup_spec.rb
-- spec/unit/application/man_spec.rb
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/ssl_spec.rb
 - spec/unit/application_spec.rb
-- spec/unit/capability_spec.rb
 - spec/unit/certificate_factory_spec.rb
 - spec/unit/concurrent/lock_spec.rb
 - spec/unit/configurer/downloader_spec.rb
@@ -1980,16 +1903,13 @@ files:
 - spec/unit/face/facts_spec.rb
 - spec/unit/face/generate_spec.rb
 - spec/unit/face/help_spec.rb
-- spec/unit/face/key_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
-- spec/unit/face/module/search_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
-- spec/unit/face/status_spec.rb
 - spec/unit/face_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
@@ -2103,7 +2023,12 @@ files:
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/http/client_spec.rb
+- spec/unit/http/dns_spec.rb
 - spec/unit/http/external_client_spec.rb
+- spec/unit/http/factory_spec.rb
+- spec/unit/http/pool_entry_spec.rb
+- spec/unit/http/pool_spec.rb
+- spec/unit/http/proxy_spec.rb
 - spec/unit/http/resolver_spec.rb
 - spec/unit/http/response_spec.rb
 - spec/unit/http/service/ca_spec.rb
@@ -2113,16 +2038,13 @@ files:
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
+- spec/unit/http/site_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
 - spec/unit/indirector/catalog/rest_spec.rb
 - spec/unit/indirector/catalog/store_configs_spec.rb
 - spec/unit/indirector/catalog/yaml_spec.rb
-- spec/unit/indirector/certificate/file_spec.rb
-- spec/unit/indirector/certificate/rest_spec.rb
-- spec/unit/indirector/certificate_request/file_spec.rb
-- spec/unit/indirector/certificate_request/rest_spec.rb
 - spec/unit/indirector/data_binding/hiera_spec.rb
 - spec/unit/indirector/data_binding/none_spec.rb
 - spec/unit/indirector/direct_file_server_spec.rb
@@ -2151,7 +2073,6 @@ files:
 - spec/unit/indirector/hiera_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/json_spec.rb
-- spec/unit/indirector/key/file_spec.rb
 - spec/unit/indirector/memory_spec.rb
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/node/exec_spec.rb
@@ -2173,9 +2094,6 @@ files:
 - spec/unit/indirector/resource/ral_spec.rb
 - spec/unit/indirector/resource/store_configs_spec.rb
 - spec/unit/indirector/rest_spec.rb
-- spec/unit/indirector/ssl_file_spec.rb
-- spec/unit/indirector/status/local_spec.rb
-- spec/unit/indirector/status/rest_spec.rb
 - spec/unit/indirector/store_configs_spec.rb
 - spec/unit/indirector/terminus_spec.rb
 - spec/unit/indirector/yaml_spec.rb
@@ -2193,7 +2111,6 @@ files:
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/applications/checksummer_spec.rb
 - spec/unit/module_tool/applications/installer_spec.rb
-- spec/unit/module_tool/applications/searcher_spec.rb
 - spec/unit/module_tool/applications/uninstaller_spec.rb
 - spec/unit/module_tool/applications/unpacker_spec.rb
 - spec/unit/module_tool/applications/upgrader_spec.rb
@@ -2204,36 +2121,23 @@ files:
 - spec/unit/module_tool/tar/mini_spec.rb
 - spec/unit/module_tool/tar_spec.rb
 - spec/unit/module_tool_spec.rb
-- spec/unit/network/auth_config_parser_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/authorization_spec.rb
-- spec/unit/network/authstore_spec.rb
 - spec/unit/network/format_handler_spec.rb
 - spec/unit/network/format_spec.rb
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/authorization_spec.rb
-- spec/unit/network/http/api/master/v3/environment_spec.rb
 - spec/unit/network/http/api/master/v3/environments_spec.rb
 - spec/unit/network/http/api/master/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
-- spec/unit/network/http/compression_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
-- spec/unit/network/http/factory_spec.rb
 - spec/unit/network/http/handler_spec.rb
-- spec/unit/network/http/nocache_pool_spec.rb
-- spec/unit/network/http/pool_spec.rb
 - spec/unit/network/http/request_spec.rb
 - spec/unit/network/http/response_spec.rb
 - spec/unit/network/http/route_spec.rb
-- spec/unit/network/http/session_spec.rb
-- spec/unit/network/http/site_spec.rb
 - spec/unit/network/http_pool_spec.rb
-- spec/unit/network/http_spec.rb
-- spec/unit/network/resolver_spec.rb
-- spec/unit/network/rights_spec.rb
 - spec/unit/network/uri_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
@@ -2248,7 +2152,6 @@ files:
 - spec/unit/parser/ast/block_expression_spec.rb
 - spec/unit/parser/ast/leaf_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/environment_compiler_spec.rb
 - spec/unit/parser/files_spec.rb
 - spec/unit/parser/functions/create_resources_spec.rb
 - spec/unit/parser/functions/digest_spec.rb
@@ -2289,7 +2192,6 @@ files:
 - spec/unit/pops/evaluator/collections_ops_spec.rb
 - spec/unit/pops/evaluator/comparison_ops_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
-- spec/unit/pops/evaluator/deferred_resolver_spec.rb
 - spec/unit/pops/evaluator/evaluating_parser_spec.rb
 - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
 - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -2347,7 +2249,6 @@ files:
 - spec/unit/pops/time/timestamp_spec.rb
 - spec/unit/pops/types/class_loader_spec.rb
 - spec/unit/pops/types/deferred_spec.rb
-- spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/error_spec.rb
 - spec/unit/pops/types/iterable_spec.rb
 - spec/unit/pops/types/p_binary_type_spec.rb
@@ -2477,13 +2378,11 @@ files:
 - spec/unit/reports/http_spec.rb
 - spec/unit/reports/store_spec.rb
 - spec/unit/reports_spec.rb
-- spec/unit/resource/capability_finder_spec.rb
 - spec/unit/resource/catalog_spec.rb
 - spec/unit/resource/status_spec.rb
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
-- spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
 - spec/unit/scheduler/splay_job_spec.rb
@@ -2498,7 +2397,9 @@ files:
 - spec/unit/settings/file_setting_spec.rb
 - spec/unit/settings/http_extra_headers_spec.rb
 - spec/unit/settings/ini_file_spec.rb
+- spec/unit/settings/integer_setting_spec.rb
 - spec/unit/settings/path_setting_spec.rb
+- spec/unit/settings/port_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
 - spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
@@ -2510,14 +2411,10 @@ files:
 - spec/unit/ssl/certificate_request_spec.rb
 - spec/unit/ssl/certificate_spec.rb
 - spec/unit/ssl/digest_spec.rb
-- spec/unit/ssl/host_spec.rb
-- spec/unit/ssl/key_spec.rb
 - spec/unit/ssl/oids_spec.rb
 - spec/unit/ssl/ssl_provider_spec.rb
 - spec/unit/ssl/state_machine_spec.rb
-- spec/unit/ssl/validator_spec.rb
 - spec/unit/ssl/verifier_spec.rb
-- spec/unit/status_spec.rb
 - spec/unit/task_spec.rb
 - spec/unit/test/test_helper_spec.rb
 - spec/unit/transaction/additional_resource_generator_spec.rb
@@ -2572,7 +2469,6 @@ files:
 - spec/unit/util/execution_stub_spec.rb
 - spec/unit/util/feature_spec.rb
 - spec/unit/util/filetype_spec.rb
-- spec/unit/util/http_proxy_spec.rb
 - spec/unit/util/inifile_spec.rb
 - spec/unit/util/json_lockfile_spec.rb
 - spec/unit/util/ldap/connection_spec.rb
@@ -2612,7 +2508,6 @@ files:
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/skip_tags_spec.rb
 - spec/unit/util/splayer_spec.rb
-- spec/unit/util/ssl_spec.rb
 - spec/unit/util/storage_spec.rb
 - spec/unit/util/suidmanager_spec.rb
 - spec/unit/util/symbolic_file_mode_spec.rb
@@ -2666,7 +2561,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -2680,7 +2575,6 @@ summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
-- spec/fixtures/integration/application/agent/cached_deferred_catalog.json
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -3053,11 +2947,10 @@ test_files:
 - spec/fixtures/unit/provider/service/openbsd/rcctl_getall
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/openrc/rcstatus
-- spec/fixtures/unit/provider/service/smf/svcs.out
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
+- spec/fixtures/unit/provider/service/smf/svcs_instances.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
-- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -3087,7 +2980,6 @@ test_files:
 - spec/integration/application/lookup_spec.rb
 - spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
-- spec/integration/application/resource_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -3102,7 +2994,6 @@ test_files:
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
 - spec/integration/network/http_pool_spec.rb
@@ -3139,7 +3030,7 @@ test_files:
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/windows/adsi_spec.rb
-- spec/integration/util/windows/monkey_patches/dir_spec.rb
+- spec/integration/util/windows/monkey_patches/process_spec.rb
 - spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
 - spec/integration/util/windows/registry_spec.rb
@@ -3147,8 +3038,10 @@ test_files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
+- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
+- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -3215,11 +3108,9 @@ test_files:
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/lookup_spec.rb
-- spec/unit/application/man_spec.rb
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/ssl_spec.rb
 - spec/unit/application_spec.rb
-- spec/unit/capability_spec.rb
 - spec/unit/certificate_factory_spec.rb
 - spec/unit/concurrent/lock_spec.rb
 - spec/unit/configurer/downloader_spec.rb
@@ -3250,16 +3141,13 @@ test_files:
 - spec/unit/face/facts_spec.rb
 - spec/unit/face/generate_spec.rb
 - spec/unit/face/help_spec.rb
-- spec/unit/face/key_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
-- spec/unit/face/module/search_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
-- spec/unit/face/status_spec.rb
 - spec/unit/face_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
@@ -3373,7 +3261,12 @@ test_files:
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/http/client_spec.rb
+- spec/unit/http/dns_spec.rb
 - spec/unit/http/external_client_spec.rb
+- spec/unit/http/factory_spec.rb
+- spec/unit/http/pool_entry_spec.rb
+- spec/unit/http/pool_spec.rb
+- spec/unit/http/proxy_spec.rb
 - spec/unit/http/resolver_spec.rb
 - spec/unit/http/response_spec.rb
 - spec/unit/http/service/ca_spec.rb
@@ -3383,16 +3276,13 @@ test_files:
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
+- spec/unit/http/site_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
 - spec/unit/indirector/catalog/rest_spec.rb
 - spec/unit/indirector/catalog/store_configs_spec.rb
 - spec/unit/indirector/catalog/yaml_spec.rb
-- spec/unit/indirector/certificate/file_spec.rb
-- spec/unit/indirector/certificate/rest_spec.rb
-- spec/unit/indirector/certificate_request/file_spec.rb
-- spec/unit/indirector/certificate_request/rest_spec.rb
 - spec/unit/indirector/data_binding/hiera_spec.rb
 - spec/unit/indirector/data_binding/none_spec.rb
 - spec/unit/indirector/direct_file_server_spec.rb
@@ -3421,7 +3311,6 @@ test_files:
 - spec/unit/indirector/hiera_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/json_spec.rb
-- spec/unit/indirector/key/file_spec.rb
 - spec/unit/indirector/memory_spec.rb
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/node/exec_spec.rb
@@ -3443,9 +3332,6 @@ test_files:
 - spec/unit/indirector/resource/ral_spec.rb
 - spec/unit/indirector/resource/store_configs_spec.rb
 - spec/unit/indirector/rest_spec.rb
-- spec/unit/indirector/ssl_file_spec.rb
-- spec/unit/indirector/status/local_spec.rb
-- spec/unit/indirector/status/rest_spec.rb
 - spec/unit/indirector/store_configs_spec.rb
 - spec/unit/indirector/terminus_spec.rb
 - spec/unit/indirector/yaml_spec.rb
@@ -3463,7 +3349,6 @@ test_files:
 - spec/unit/module_tool/application_spec.rb
 - spec/unit/module_tool/applications/checksummer_spec.rb
 - spec/unit/module_tool/applications/installer_spec.rb
-- spec/unit/module_tool/applications/searcher_spec.rb
 - spec/unit/module_tool/applications/uninstaller_spec.rb
 - spec/unit/module_tool/applications/unpacker_spec.rb
 - spec/unit/module_tool/applications/upgrader_spec.rb
@@ -3474,36 +3359,23 @@ test_files:
 - spec/unit/module_tool/tar/mini_spec.rb
 - spec/unit/module_tool/tar_spec.rb
 - spec/unit/module_tool_spec.rb
-- spec/unit/network/auth_config_parser_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/authorization_spec.rb
-- spec/unit/network/authstore_spec.rb
 - spec/unit/network/format_handler_spec.rb
 - spec/unit/network/format_spec.rb
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/authorization_spec.rb
-- spec/unit/network/http/api/master/v3/environment_spec.rb
 - spec/unit/network/http/api/master/v3/environments_spec.rb
 - spec/unit/network/http/api/master/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
-- spec/unit/network/http/compression_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
-- spec/unit/network/http/factory_spec.rb
 - spec/unit/network/http/handler_spec.rb
-- spec/unit/network/http/nocache_pool_spec.rb
-- spec/unit/network/http/pool_spec.rb
 - spec/unit/network/http/request_spec.rb
 - spec/unit/network/http/response_spec.rb
 - spec/unit/network/http/route_spec.rb
-- spec/unit/network/http/session_spec.rb
-- spec/unit/network/http/site_spec.rb
 - spec/unit/network/http_pool_spec.rb
-- spec/unit/network/http_spec.rb
-- spec/unit/network/resolver_spec.rb
-- spec/unit/network/rights_spec.rb
 - spec/unit/network/uri_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
@@ -3518,7 +3390,6 @@ test_files:
 - spec/unit/parser/ast/block_expression_spec.rb
 - spec/unit/parser/ast/leaf_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/environment_compiler_spec.rb
 - spec/unit/parser/files_spec.rb
 - spec/unit/parser/functions/create_resources_spec.rb
 - spec/unit/parser/functions/digest_spec.rb
@@ -3559,7 +3430,6 @@ test_files:
 - spec/unit/pops/evaluator/collections_ops_spec.rb
 - spec/unit/pops/evaluator/comparison_ops_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
-- spec/unit/pops/evaluator/deferred_resolver_spec.rb
 - spec/unit/pops/evaluator/evaluating_parser_spec.rb
 - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
 - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -3617,7 +3487,6 @@ test_files:
 - spec/unit/pops/time/timestamp_spec.rb
 - spec/unit/pops/types/class_loader_spec.rb
 - spec/unit/pops/types/deferred_spec.rb
-- spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/error_spec.rb
 - spec/unit/pops/types/iterable_spec.rb
 - spec/unit/pops/types/p_binary_type_spec.rb
@@ -3747,13 +3616,11 @@ test_files:
 - spec/unit/reports/http_spec.rb
 - spec/unit/reports/store_spec.rb
 - spec/unit/reports_spec.rb
-- spec/unit/resource/capability_finder_spec.rb
 - spec/unit/resource/catalog_spec.rb
 - spec/unit/resource/status_spec.rb
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
-- spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
 - spec/unit/scheduler/splay_job_spec.rb
@@ -3768,7 +3635,9 @@ test_files:
 - spec/unit/settings/file_setting_spec.rb
 - spec/unit/settings/http_extra_headers_spec.rb
 - spec/unit/settings/ini_file_spec.rb
+- spec/unit/settings/integer_setting_spec.rb
 - spec/unit/settings/path_setting_spec.rb
+- spec/unit/settings/port_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
 - spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
@@ -3780,14 +3649,10 @@ test_files:
 - spec/unit/ssl/certificate_request_spec.rb
 - spec/unit/ssl/certificate_spec.rb
 - spec/unit/ssl/digest_spec.rb
-- spec/unit/ssl/host_spec.rb
-- spec/unit/ssl/key_spec.rb
 - spec/unit/ssl/oids_spec.rb
 - spec/unit/ssl/ssl_provider_spec.rb
 - spec/unit/ssl/state_machine_spec.rb
-- spec/unit/ssl/validator_spec.rb
 - spec/unit/ssl/verifier_spec.rb
-- spec/unit/status_spec.rb
 - spec/unit/task_spec.rb
 - spec/unit/test/test_helper_spec.rb
 - spec/unit/transaction/additional_resource_generator_spec.rb
@@ -3842,7 +3707,6 @@ test_files:
 - spec/unit/util/execution_stub_spec.rb
 - spec/unit/util/feature_spec.rb
 - spec/unit/util/filetype_spec.rb
-- spec/unit/util/http_proxy_spec.rb
 - spec/unit/util/inifile_spec.rb
 - spec/unit/util/json_lockfile_spec.rb
 - spec/unit/util/ldap/connection_spec.rb
@@ -3882,7 +3746,6 @@ test_files:
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/skip_tags_spec.rb
 - spec/unit/util/splayer_spec.rb
-- spec/unit/util/ssl_spec.rb
 - spec/unit/util/storage_spec.rb
 - spec/unit/util/suidmanager_spec.rb
 - spec/unit/util/symbolic_file_mode_spec.rb