puppet 6.12.0-x64-mingw32 → 6.17.0-x64-mingw32

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

@@ -599,27 +599,27 @@ describe "Puppet::Util::Windows::Service", :if => Puppet.features.microsoft_wind
     end
   end
 
-  describe "#set_startup_mode" do
+  describe "#set_startup_configuration" do
     let(:status_checks) { sequence('status_checks') }
 
     context "when the service control manager cannot be opened" do
       let(:scm) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.set_startup_mode(mock_service_name, :SERVICE_DEMAND_START) }.to raise_error(Puppet::Error)
+        expect{ subject.set_startup_configuration(mock_service_name, options: {startup_type: :SERVICE_DEMAND_START}) }.to raise_error(Puppet::Error)
       end
     end
 
     context "when the service cannot be opened" do
       let(:service) { FFI::Pointer::NULL_HANDLE }
       it "raises a puppet error" do
-        expect{ subject.set_startup_mode(mock_service_name, :SERVICE_DEMAND_START) }.to raise_error(Puppet::Error)
+        expect{ subject.set_startup_configuration(mock_service_name, options: {startup_type: :SERVICE_DEMAND_START}) }.to raise_error(Puppet::Error)
       end
     end
 
     context "when the service can be opened" do
       it "Raises an error on an unsuccessful change" do
         expect(subject).to receive(:ChangeServiceConfigW).and_return(FFI::WIN32_FALSE)
-        expect{ subject.set_startup_mode(mock_service_name, :SERVICE_DEMAND_START) }.to raise_error(Puppet::Error)
+        expect{ subject.set_startup_configuration(mock_service_name, options: {startup_type: :SERVICE_DEMAND_START}) }.to raise_error(Puppet::Error)
       end
     end
   end

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

@@ -201,9 +201,9 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       principal = subject.ads_to_principal(unresolvable_user)
 
       expect(principal).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
-      expect(principal.account).to eq('S-1-1-1 (unresolvable)')
+      expect(principal.account).to eq('S-1-1-1')
       expect(principal.domain).to eq(nil)
-      expect(principal.domain_account).to eq('S-1-1-1 (unresolvable)')
+      expect(principal.domain_account).to eq('S-1-1-1')
       expect(principal.sid).to eq('S-1-1-1')
       expect(principal.sid_bytes).to eq(valid_octet_invalid_user)
       expect(principal.account_type).to eq(:SidTypeUnknown)

data/spec/unit/util_spec.rb

@@ -299,11 +299,11 @@ describe Puppet::Util do
       expect(uri.to_s.encoding).to eq(expected_encoding)
       expect(uri.path).to eq("/foo+foo%20bar")
       # either + or %20 is correct for an encoded space in query
-      # + is usually used for backward compatibility, but %20 is preferred for compat with Uri.unescape
+      # + is usually used for backward compatibility, but %20 is preferred for compat with Puppet::Util.uri_unescape
       expect(uri.query).to eq("foo%2Bfoo%20bar")
       # complete roundtrip
-      expect(URI.unescape(uri.to_s).sub(%r{^file:(//)?}, '')).to eq(path)
-      expect(URI.unescape(uri.to_s).encoding).to eq(expected_encoding)
+      expect(Puppet::Util.uri_unescape(uri.to_s).sub(%r{^file:(//)?}, '')).to eq(path)
+      expect(Puppet::Util.uri_unescape(uri.to_s).encoding).to eq(expected_encoding)
     end
 
     it "should perform UTF-8 URI escaping" do

data/spec/unit/x509/cert_provider_spec.rb

@@ -5,7 +5,7 @@ describe Puppet::X509::CertProvider do
   include PuppetSpec::Files
 
   def create_provider(options)
-    described_class.new(options)
+    described_class.new(**options)
   end
 
   def expects_public_file(path)

data/tasks/generate_cert_fixtures.rake

@@ -49,6 +49,10 @@ task(:gen_cert_fixtures) do
   #
   # bad-basic-constraints.pem        /CN=Test CA (bad isCA constraint)
   #
+  # unknown-ca.pemm                  /CN=Unknown CA
+  #                                   |
+  # unknown-127.0.0.1.pem             +- /CN=127.0.0.1
+  #
   # Keys
   # ====
   #
@@ -61,10 +65,20 @@ task(:gen_cert_fixtures) do
   # `request.pem` contains a valid CSR for /CN=pending, while `tampered_csr.pem`
   # is the same as `request.pem`, but it's public key has been replaced.
   #
-  ca = Puppet::TestCa.new
   dir = File.join(RAKE_ROOT, 'spec/fixtures/ssl')
 
+  # Create self-signed CA & key
+  unknown_ca = Puppet::TestCa.new('Unknown CA')
+  save(dir, 'unknown-ca.pem', unknown_ca.ca_cert)
+  save(dir, 'unknown-ca-key.pem', unknown_ca.key)
+
+  # Create an SSL cert for 127.0.0.1
+  signed = unknown_ca.create_cert('127.0.0.1', unknown_ca.ca_cert, unknown_ca.key, subject_alt_names: 'DNS:127.0.0.1,DNS:127.0.0.2')
+  save(dir, 'unknown-127.0.0.1.pem', signed[:cert])
+  save(dir, 'unknown-127.0.0.1-key.pem', signed[:private_key])
+
   # Create Test CA & CRL
+  ca = Puppet::TestCa.new
   save(dir, 'ca.pem', ca.ca_cert)
   save(dir, 'crl.pem', ca.ca_crl)
 

data/tasks/manpages.rake

@@ -1,27 +1,17 @@
-# require 'fileutils'
-
 desc "Build Puppet manpages"
 task :gen_manpages do
   require 'puppet/face'
   require 'fileutils'
 
-  # TODO: this line is unfortunate.  In an ideal world, faces would serve
-  #  as a clear, well-defined entry-point into the code and could be
-  #  responsible for state management all on their own; this really should
-  #  not be necessary.  When we can, we should get rid of it.
-  #  --cprice 2012-05-16
-  Puppet.initialize_settings()
-
+  Puppet.initialize_settings
   helpface = Puppet::Face[:help, '0.0.1']
-  manface  = Puppet::Face[:man, '0.0.1']
 
-  sbins = Dir.glob(%w{sbin/*})
   bins  = Dir.glob(%w{bin/*})
   non_face_applications = helpface.legacy_applications
   faces = Puppet::Face.faces.map(&:to_s)
   apps = non_face_applications + faces
 
-  ronn_args = '--manual="Puppet manual" --organization="Puppet, Inc." -r'
+  ronn_args = '--manual="Puppet manual" --organization="Puppet, Inc." --roff'
 
   # Locate ronn
   begin
@@ -35,14 +25,6 @@ task :gen_manpages do
     abort("Ronn does not appear to be installed")
   end
 
-#   def write_manpage(text, filename)
-#     IO.popen("#{ronn} #{ronn_args} -r > #{filename}") do |fh| fh.write text end
-#   end
-
-  # Create puppet.conf.5 man page
-#   IO.popen("#{ronn} #{ronn_args} > ./man/man5/puppet.conf.5", 'w') do |fh|
-#     fh.write %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration}
-#   end
   %x{mkdir -p ./man/man5 ./man/man8}
   %x{RUBYLIB=./lib:$RUBYLIB bin/puppet doc --reference configuration > ./man/man5/puppetconf.5.ronn}
   %x{#{ronn} #{ronn_args} ./man/man5/puppetconf.5.ronn}
@@ -50,31 +32,19 @@ task :gen_manpages do
   FileUtils.rm("./man/man5/puppetconf.5.ronn")
 
   # Create LEGACY binary man pages (i.e. delete me for 2.8.0)
-  binary = bins + sbins
-  binary.each do |bin|
+  bins.each do |bin|
     b = bin.gsub( /^s?bin\//, "")
     %x{RUBYLIB=./lib:$RUBYLIB #{bin} --help > ./man/man8/#{b}.8.ronn}
     %x{#{ronn} #{ronn_args} ./man/man8/#{b}.8.ronn}
     FileUtils.rm("./man/man8/#{b}.8.ronn")
   end
 
-  # Create regular non-face man pages
-  non_face_applications.each do |app|
-    %x{RUBYLIB=./lib:$RUBYLIB bin/puppet #{app} --help > ./man/man8/puppet-#{app}.8.ronn}
+  apps.each do |app|
+    %x{RUBYLIB=./lib:$RUBYLIB bin/puppet help #{app} --ronn > ./man/man8/puppet-#{app}.8.ronn}
     %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{app}.8.ronn}
     FileUtils.rm("./man/man8/puppet-#{app}.8.ronn")
   end
 
-  # Create face man pages
-  faces.each do |face|
-    File.open("./man/man8/puppet-#{face}.8.ronn", 'w') do |fh|
-      fh.write manface.man("#{face}")
-    end
-
-    %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{face}.8.ronn}
-    FileUtils.rm("./man/man8/puppet-#{face}.8.ronn")
-  end
-
   # Delete orphaned manpages if binary was deleted
   Dir.glob(%w{./man/man8/puppet-*.8}) do |app|
     appname = app.match(/puppet-(.*)\.8/)[1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.12.0
+  version: 6.17.0
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -19,7 +19,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,6 @@ extra_rdoc_files: []
 files:
 - CODEOWNERS
 - CODE_OF_CONDUCT.md
-- COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -652,6 +651,7 @@ files:
 - lib/puppet/http.rb
 - lib/puppet/http/client.rb
 - lib/puppet/http/errors.rb
+- lib/puppet/http/external_client.rb
 - lib/puppet/http/redirector.rb
 - lib/puppet/http/resolver.rb
 - lib/puppet/http/resolver/server_list.rb
@@ -661,6 +661,8 @@ files:
 - lib/puppet/http/retry_after_handler.rb
 - lib/puppet/http/service.rb
 - lib/puppet/http/service/ca.rb
+- lib/puppet/http/service/compiler.rb
+- lib/puppet/http/service/file_server.rb
 - lib/puppet/http/service/report.rb
 - lib/puppet/http/session.rb
 - lib/puppet/indirector.rb
@@ -804,6 +806,7 @@ files:
 - 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
@@ -1236,6 +1239,7 @@ files:
 - lib/puppet/settings/errors.rb
 - lib/puppet/settings/file_or_directory_setting.rb
 - lib/puppet/settings/file_setting.rb
+- lib/puppet/settings/http_extra_headers_setting.rb
 - lib/puppet/settings/ini_file.rb
 - lib/puppet/settings/path_setting.rb
 - lib/puppet/settings/priority_setting.rb
@@ -1361,6 +1365,18 @@ files:
 - lib/puppet/util/network_device/transport.rb
 - lib/puppet/util/network_device/transport/base.rb
 - lib/puppet/util/package.rb
+- lib/puppet/util/package/version/debian.rb
+- lib/puppet/util/package/version/gem.rb
+- lib/puppet/util/package/version/pip.rb
+- lib/puppet/util/package/version/range.rb
+- lib/puppet/util/package/version/range/eq.rb
+- lib/puppet/util/package/version/range/gt.rb
+- lib/puppet/util/package/version/range/gt_eq.rb
+- lib/puppet/util/package/version/range/lt.rb
+- lib/puppet/util/package/version/range/lt_eq.rb
+- lib/puppet/util/package/version/range/min_max.rb
+- lib/puppet/util/package/version/range/simple.rb
+- lib/puppet/util/package/version/rpm.rb
 - lib/puppet/util/pidlock.rb
 - lib/puppet/util/platform.rb
 - lib/puppet/util/plist.rb
@@ -1383,6 +1399,7 @@ files:
 - lib/puppet/util/reference.rb
 - lib/puppet/util/resource_template.rb
 - lib/puppet/util/retry_action.rb
+- lib/puppet/util/rpm_compare.rb
 - lib/puppet/util/rubygems.rb
 - lib/puppet/util/run_mode.rb
 - lib/puppet/util/selinux.rb
@@ -1525,6 +1542,10 @@ files:
 - spec/fixtures/ssl/signed.pem
 - spec/fixtures/ssl/tampered-cert.pem
 - spec/fixtures/ssl/tampered-csr.pem
+- spec/fixtures/ssl/unknown-127.0.0.1-key.pem
+- spec/fixtures/ssl/unknown-127.0.0.1.pem
+- spec/fixtures/ssl/unknown-ca-key.pem
+- spec/fixtures/ssl/unknown-ca.pem
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/application/environments/production/data/common.yaml
 - spec/fixtures/unit/application/environments/production/environment.conf
@@ -1794,7 +1815,7 @@ files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -1822,8 +1843,10 @@ files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-plugin-output.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out
 - spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
@@ -1856,9 +1879,12 @@ files:
 - spec/fixtures/yaml/report2.6.x.yaml
 - spec/fixtures/yaml/test.local.yaml
 - spec/integration/agent/logging_spec.rb
+- spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
 - spec/integration/application/doc_spec.rb
+- spec/integration/application/filebucket_spec.rb
 - spec/integration/application/lookup_spec.rb
+- spec/integration/application/plugin_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -1869,7 +1895,6 @@ files:
 - spec/integration/environments/settings_spec.rb
 - spec/integration/faces/config_spec.rb
 - spec/integration/faces/documentation_spec.rb
-- spec/integration/faces/plugin_spec.rb
 - spec/integration/file_bucket/file_spec.rb
 - spec/integration/file_serving/content_spec.rb
 - spec/integration/file_serving/fileset_spec.rb
@@ -1882,6 +1907,7 @@ 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/module_tool/forge_spec.rb
 - spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
@@ -1916,7 +1942,6 @@ files:
 - spec/integration/ssl/certificate_request_spec.rb
 - spec/integration/ssl/host_spec.rb
 - spec/integration/ssl/key_spec.rb
-- spec/integration/test/test_helper_spec.rb
 - spec/integration/transaction/report_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
@@ -1970,6 +1995,7 @@ files:
 - spec/lib/puppet_spec/modules.rb
 - spec/lib/puppet_spec/network.rb
 - spec/lib/puppet_spec/pops.rb
+- spec/lib/puppet_spec/puppetserver.rb
 - spec/lib/puppet_spec/scope.rb
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/ssl.rb
@@ -1989,6 +2015,7 @@ files:
 - spec/shared_behaviours/things_that_declare_options.rb
 - spec/shared_contexts/checksum.rb
 - spec/shared_contexts/digests.rb
+- spec/shared_contexts/https.rb
 - spec/shared_contexts/types_setup.rb
 - spec/shared_examples/rhel_package_provider.rb
 - spec/spec_helper.rb
@@ -2166,8 +2193,12 @@ files:
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/http/client_spec.rb
+- spec/unit/http/external_client_spec.rb
 - spec/unit/http/resolver_spec.rb
+- spec/unit/http/response_spec.rb
 - spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service/compiler_spec.rb
+- spec/unit/http/service/file_server_spec.rb
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
@@ -2201,6 +2232,7 @@ files:
 - spec/unit/indirector/file_content/selector_spec.rb
 - spec/unit/indirector/file_metadata/file_server_spec.rb
 - spec/unit/indirector/file_metadata/file_spec.rb
+- spec/unit/indirector/file_metadata/http_spec.rb
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
@@ -2548,6 +2580,7 @@ files:
 - spec/unit/settings/enum_setting_spec.rb
 - spec/unit/settings/environment_conf_spec.rb
 - 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/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
@@ -2570,6 +2603,7 @@ files:
 - 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
 - spec/unit/transaction/event_manager_spec.rb
 - spec/unit/transaction/event_spec.rb
@@ -2638,6 +2672,10 @@ files:
 - spec/unit/util/network_device/config_spec.rb
 - spec/unit/util/network_device/transport/base_spec.rb
 - spec/unit/util/network_device_spec.rb
+- spec/unit/util/package/version/debian_spec.rb
+- spec/unit/util/package/version/pip_spec.rb
+- spec/unit/util/package/version/range_spec.rb
+- spec/unit/util/package/version/rpm_spec.rb
 - spec/unit/util/package_spec.rb
 - spec/unit/util/pidlock_spec.rb
 - spec/unit/util/plist_spec.rb
@@ -2652,6 +2690,7 @@ files:
 - spec/unit/util/reference_spec.rb
 - spec/unit/util/resource_template_spec.rb
 - spec/unit/util/retry_action_spec.rb
+- spec/unit/util/rpm_compare_spec.rb
 - spec/unit/util/rubygems_spec.rb
 - spec/unit/util/run_mode_spec.rb
 - spec/unit/util/selinux_spec.rb
@@ -2718,7 +2757,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool
@@ -2780,6 +2819,10 @@ test_files:
 - spec/fixtures/ssl/signed.pem
 - spec/fixtures/ssl/tampered-cert.pem
 - spec/fixtures/ssl/tampered-csr.pem
+- spec/fixtures/ssl/unknown-127.0.0.1-key.pem
+- spec/fixtures/ssl/unknown-127.0.0.1.pem
+- spec/fixtures/ssl/unknown-ca-key.pem
+- spec/fixtures/ssl/unknown-ca.pem
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/application/environments/production/data/common.yaml
 - spec/fixtures/unit/application/environments/production/environment.conf
@@ -3049,7 +3092,7 @@ test_files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
-- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -3077,8 +3120,10 @@ test_files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-plugin-output.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out
 - spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
@@ -3111,9 +3156,12 @@ test_files:
 - spec/fixtures/yaml/report2.6.x.yaml
 - spec/fixtures/yaml/test.local.yaml
 - spec/integration/agent/logging_spec.rb
+- spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
 - spec/integration/application/doc_spec.rb
+- spec/integration/application/filebucket_spec.rb
 - spec/integration/application/lookup_spec.rb
+- spec/integration/application/plugin_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -3124,7 +3172,6 @@ test_files:
 - spec/integration/environments/settings_spec.rb
 - spec/integration/faces/config_spec.rb
 - spec/integration/faces/documentation_spec.rb
-- spec/integration/faces/plugin_spec.rb
 - spec/integration/file_bucket/file_spec.rb
 - spec/integration/file_serving/content_spec.rb
 - spec/integration/file_serving/fileset_spec.rb
@@ -3137,6 +3184,7 @@ 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/module_tool/forge_spec.rb
 - spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/network/authconfig_spec.rb
@@ -3171,7 +3219,6 @@ test_files:
 - spec/integration/ssl/certificate_request_spec.rb
 - spec/integration/ssl/host_spec.rb
 - spec/integration/ssl/key_spec.rb
-- spec/integration/test/test_helper_spec.rb
 - spec/integration/transaction/report_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/type/exec_spec.rb
@@ -3225,6 +3272,7 @@ test_files:
 - spec/lib/puppet_spec/modules.rb
 - spec/lib/puppet_spec/network.rb
 - spec/lib/puppet_spec/pops.rb
+- spec/lib/puppet_spec/puppetserver.rb
 - spec/lib/puppet_spec/scope.rb
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/ssl.rb
@@ -3244,6 +3292,7 @@ test_files:
 - spec/shared_behaviours/things_that_declare_options.rb
 - spec/shared_contexts/checksum.rb
 - spec/shared_contexts/digests.rb
+- spec/shared_contexts/https.rb
 - spec/shared_contexts/types_setup.rb
 - spec/shared_examples/rhel_package_provider.rb
 - spec/spec_helper.rb
@@ -3421,8 +3470,12 @@ test_files:
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/http/client_spec.rb
+- spec/unit/http/external_client_spec.rb
 - spec/unit/http/resolver_spec.rb
+- spec/unit/http/response_spec.rb
 - spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service/compiler_spec.rb
+- spec/unit/http/service/file_server_spec.rb
 - spec/unit/http/service/report_spec.rb
 - spec/unit/http/service_spec.rb
 - spec/unit/http/session_spec.rb
@@ -3456,6 +3509,7 @@ test_files:
 - spec/unit/indirector/file_content/selector_spec.rb
 - spec/unit/indirector/file_metadata/file_server_spec.rb
 - spec/unit/indirector/file_metadata/file_spec.rb
+- spec/unit/indirector/file_metadata/http_spec.rb
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
@@ -3803,6 +3857,7 @@ test_files:
 - spec/unit/settings/enum_setting_spec.rb
 - spec/unit/settings/environment_conf_spec.rb
 - 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/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
@@ -3825,6 +3880,7 @@ test_files:
 - 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
 - spec/unit/transaction/event_manager_spec.rb
 - spec/unit/transaction/event_spec.rb
@@ -3893,6 +3949,10 @@ test_files:
 - spec/unit/util/network_device/config_spec.rb
 - spec/unit/util/network_device/transport/base_spec.rb
 - spec/unit/util/network_device_spec.rb
+- spec/unit/util/package/version/debian_spec.rb
+- spec/unit/util/package/version/pip_spec.rb
+- spec/unit/util/package/version/range_spec.rb
+- spec/unit/util/package/version/rpm_spec.rb
 - spec/unit/util/package_spec.rb
 - spec/unit/util/pidlock_spec.rb
 - spec/unit/util/plist_spec.rb
@@ -3907,6 +3967,7 @@ test_files:
 - spec/unit/util/reference_spec.rb
 - spec/unit/util/resource_template_spec.rb
 - spec/unit/util/retry_action_spec.rb
+- spec/unit/util/rpm_compare_spec.rb
 - spec/unit/util/rubygems_spec.rb
 - spec/unit/util/run_mode_spec.rb
 - spec/unit/util/selinux_spec.rb