puppet 6.19.0-x86-mingw32 → 7.3.0-x86-mingw32

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,7 +533,6 @@ 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)
@@ -589,7 +582,15 @@ describe Puppet::Util do
     end
   end
 
-  describe "safe_posix_fork" do
+  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
     let(:pid) { 5501 }
 
     before :each do
@@ -669,18 +670,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.19.0
+  version: 7.3.0
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -107,35 +107,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: puppet-resource_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: puppet-resource_api
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -149,7 +149,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: scanf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -182,62 +182,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: win32-dir
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-- !ruby/object:Gem::Dependency
-  name: win32-process
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: win32-security
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-- !ruby/object:Gem::Dependency
-  name: win32-service
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +213,6 @@ files:
 - README.md
 - Rakefile
 - bin/puppet
-- conf/auth.conf
 - conf/environment.conf
 - conf/fileserver.conf
 - conf/hiera.yaml
@@ -407,7 +350,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
@@ -419,9 +361,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
@@ -430,7 +370,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
@@ -481,15 +420,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
@@ -498,7 +432,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
@@ -512,6 +445,14 @@ 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
@@ -650,14 +591,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
@@ -666,6 +614,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
@@ -673,11 +622,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
@@ -686,7 +630,9 @@ files:
 - lib/puppet/indirector/errors.rb
 - lib/puppet/indirector/exec.rb
 - lib/puppet/indirector/face.rb
+- lib/puppet/indirector/fact_search.rb
 - lib/puppet/indirector/facts/facter.rb
+- lib/puppet/indirector/facts/json.rb
 - lib/puppet/indirector/facts/memory.rb
 - lib/puppet/indirector/facts/network_device.rb
 - lib/puppet/indirector/facts/rest.rb
@@ -698,7 +644,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
@@ -712,11 +657,10 @@ 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
+- lib/puppet/indirector/node/json.rb
 - lib/puppet/indirector/node/memory.rb
 - lib/puppet/indirector/node/msgpack.rb
 - lib/puppet/indirector/node/plain.rb
@@ -725,6 +669,7 @@ files:
 - lib/puppet/indirector/node/yaml.rb
 - lib/puppet/indirector/none.rb
 - lib/puppet/indirector/plain.rb
+- lib/puppet/indirector/report/json.rb
 - lib/puppet/indirector/report/msgpack.rb
 - lib/puppet/indirector/report/processor.rb
 - lib/puppet/indirector/report/rest.rb
@@ -734,10 +679,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
@@ -764,7 +705,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
@@ -786,10 +726,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
@@ -801,29 +739,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
@@ -859,11 +784,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
@@ -1054,7 +976,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
@@ -1213,15 +1134,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
@@ -1229,6 +1145,7 @@ 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
@@ -1244,7 +1161,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
@@ -1260,19 +1179,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
@@ -1330,7 +1242,6 @@ 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
@@ -1408,7 +1319,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
@@ -1426,12 +1336,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
@@ -1444,15 +1354,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
@@ -1476,9 +1377,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
@@ -1487,10 +1386,10 @@ 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
@@ -1863,8 +1762,8 @@ 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/user/aix/aix_passwd_file.out
@@ -1890,7 +1789,6 @@ files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
-- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
 - spec/integration/application/help_spec.rb
@@ -1911,8 +1809,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/indirector/report/yaml.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
@@ -1949,7 +1845,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
@@ -2027,11 +1923,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
@@ -2057,23 +1951,18 @@ files:
 - spec/unit/environments_spec.rb
 - spec/unit/etc_spec.rb
 - spec/unit/external/pson_spec.rb
-- spec/unit/face/catalog_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/epp_face_spec.rb
 - 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/module_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
@@ -2187,7 +2076,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
@@ -2197,16 +2091,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
@@ -2214,6 +2105,7 @@ files:
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/face_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
+- spec/unit/indirector/facts/json_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
@@ -2234,10 +2126,10 @@ 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
+- spec/unit/indirector/node/json_spec.rb
 - spec/unit/indirector/node/memory_spec.rb
 - spec/unit/indirector/node/msgpack_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
@@ -2246,6 +2138,7 @@ files:
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/none_spec.rb
 - spec/unit/indirector/plain_spec.rb
+- spec/unit/indirector/report/json_spec.rb
 - spec/unit/indirector/report/msgpack_spec.rb
 - spec/unit/indirector/report/processor_spec.rb
 - spec/unit/indirector/report/rest_spec.rb
@@ -2254,9 +2147,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
@@ -2274,7 +2164,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
@@ -2285,36 +2174,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
@@ -2329,7 +2205,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
@@ -2370,6 +2245,7 @@ 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
@@ -2427,7 +2303,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
@@ -2557,13 +2432,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
@@ -2578,7 +2451,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
@@ -2590,14 +2465,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
@@ -2652,7 +2523,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
@@ -2692,7 +2562,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
@@ -2746,7 +2615,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:
   - - ">"
@@ -2760,6 +2629,7 @@ 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
@@ -3132,8 +3002,8 @@ 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/user/aix/aix_passwd_file.out
@@ -3159,7 +3029,6 @@ test_files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
-- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
 - spec/integration/application/help_spec.rb
@@ -3180,8 +3049,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/indirector/report/yaml.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
@@ -3218,7 +3085,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
@@ -3296,11 +3163,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
@@ -3326,23 +3191,18 @@ test_files:
 - spec/unit/environments_spec.rb
 - spec/unit/etc_spec.rb
 - spec/unit/external/pson_spec.rb
-- spec/unit/face/catalog_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/epp_face_spec.rb
 - 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/module_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
@@ -3456,7 +3316,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
@@ -3466,16 +3331,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
@@ -3483,6 +3345,7 @@ test_files:
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/face_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
+- spec/unit/indirector/facts/json_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
@@ -3503,10 +3366,10 @@ 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
+- spec/unit/indirector/node/json_spec.rb
 - spec/unit/indirector/node/memory_spec.rb
 - spec/unit/indirector/node/msgpack_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
@@ -3515,6 +3378,7 @@ test_files:
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/none_spec.rb
 - spec/unit/indirector/plain_spec.rb
+- spec/unit/indirector/report/json_spec.rb
 - spec/unit/indirector/report/msgpack_spec.rb
 - spec/unit/indirector/report/processor_spec.rb
 - spec/unit/indirector/report/rest_spec.rb
@@ -3523,9 +3387,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
@@ -3543,7 +3404,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
@@ -3554,36 +3414,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
@@ -3598,7 +3445,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
@@ -3639,6 +3485,7 @@ 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
@@ -3696,7 +3543,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
@@ -3826,13 +3672,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
@@ -3847,7 +3691,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
@@ -3859,14 +3705,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
@@ -3921,7 +3763,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
@@ -3961,7 +3802,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