puppet 6.21.1 → 6.25.0

data/spec/unit/util/selinux_spec.rb

@@ -3,26 +3,29 @@ require 'spec_helper'
 require 'pathname'
 require 'puppet/util/selinux'
 
-unless defined?(Selinux)
-  module Selinux
-    def self.is_selinux_enabled
-      false
-    end
-  end
-end
-
 describe Puppet::Util::SELinux do
   include Puppet::Util::SELinux
 
+  let(:selinux) { double('selinux', is_selinux_enabled: false) }
+
+  before :each do
+    stub_const('Selinux', selinux)
+  end
+
   describe "selinux_support?" do
-    it "should return :true if this system has SELinux enabled" do
+    it "should return true if this system has SELinux enabled" do
       expect(Selinux).to receive(:is_selinux_enabled).and_return(1)
-      expect(selinux_support?).to be_truthy
+      expect(selinux_support?).to eq(true)
     end
 
-    it "should return :false if this system lacks SELinux" do
+    it "should return false if this system has SELinux disabled" do
       expect(Selinux).to receive(:is_selinux_enabled).and_return(0)
-      expect(selinux_support?).to be_falsey
+      expect(selinux_support?).to eq(false)
+    end
+
+    it "should return false if this system lacks SELinux" do
+      hide_const('Selinux')
+      expect(selinux_support?).to eq(false)
     end
 
     it "should return nil if /proc/mounts does not exist" do
@@ -156,7 +159,7 @@ describe Puppet::Util::SELinux do
       end
     end
 
-    it "handles no such file or directory errors by issuing a warning" do
+    it "backward compatibly handles no such file or directory errors by issuing a warning when resource_ensure not set" do
       without_partial_double_verification do
         allow(self).to receive(:selinux_support?).and_return(true)
         allow(self).to receive(:selinux_label_support?).and_return(true)
@@ -167,6 +170,51 @@ describe Puppet::Util::SELinux do
       end
     end
 
+    it "should determine mode based on resource ensure when set to file" do
+      without_partial_double_verification do
+        allow(self).to receive(:selinux_support?).and_return(true)
+        allow(self).to receive(:selinux_label_support?).and_return(true)
+        allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 32768).and_return(-1)
+        allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
+
+        expect(get_selinux_default_context("/root/chuj", :present)).to be_nil
+        expect(get_selinux_default_context("/root/chuj", :file)).to be_nil
+      end
+    end
+
+    it "should determine mode based on resource ensure when set to dir" do
+      without_partial_double_verification do
+        allow(self).to receive(:selinux_support?).and_return(true)
+        allow(self).to receive(:selinux_label_support?).and_return(true)
+        allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 16384).and_return(-1)
+        allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
+
+        expect(get_selinux_default_context("/root/chuj", :directory)).to be_nil
+      end
+    end
+
+    it "should determine mode based on resource ensure when set to link" do
+      without_partial_double_verification do
+        allow(self).to receive(:selinux_support?).and_return(true)
+        allow(self).to receive(:selinux_label_support?).and_return(true)
+        allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 40960).and_return(-1)
+        allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
+
+        expect(get_selinux_default_context("/root/chuj", :link)).to be_nil
+      end
+    end
+
+    it "should determine mode based on resource ensure when set to unknown" do
+      without_partial_double_verification do
+        allow(self).to receive(:selinux_support?).and_return(true)
+        allow(self).to receive(:selinux_label_support?).and_return(true)
+        allow(Selinux).to receive(:matchpathcon).with("/root/chuj", 0).and_return(-1)
+        allow(self).to receive(:file_lstat).with("/root/chuj").and_raise(Errno::ENOENT, "/root/chuj")
+
+        expect(get_selinux_default_context("/root/chuj", "unknown")).to be_nil
+      end
+    end
+
     it "should return nil if matchpathcon returns failure" do
       without_partial_double_verification do
         expect(self).to receive(:selinux_support?).and_return(true)
@@ -326,21 +374,44 @@ describe Puppet::Util::SELinux do
     end
 
     it "should return nil if no default context exists" do
-      expect(self).to receive(:get_selinux_default_context).with("/foo").and_return(nil)
+      expect(self).to receive(:get_selinux_default_context).with("/foo", nil).and_return(nil)
       expect(set_selinux_default_context("/foo")).to be_nil
     end
 
     it "should do nothing and return nil if the current context matches the default context" do
-      expect(self).to receive(:get_selinux_default_context).with("/foo").and_return("user_u:role_r:type_t")
+      expect(self).to receive(:get_selinux_default_context).with("/foo", nil).and_return("user_u:role_r:type_t")
       expect(self).to receive(:get_selinux_current_context).with("/foo").and_return("user_u:role_r:type_t")
       expect(set_selinux_default_context("/foo")).to be_nil
     end
 
     it "should set and return the default context if current and default do not match" do
-      expect(self).to receive(:get_selinux_default_context).with("/foo").and_return("user_u:role_r:type_t")
+      expect(self).to receive(:get_selinux_default_context).with("/foo", nil).and_return("user_u:role_r:type_t")
       expect(self).to receive(:get_selinux_current_context).with("/foo").and_return("olduser_u:role_r:type_t")
       expect(self).to receive(:set_selinux_context).with("/foo", "user_u:role_r:type_t").and_return(true)
       expect(set_selinux_default_context("/foo")).to eq("user_u:role_r:type_t")
     end
   end
+
+  describe "get_create_mode" do
+    it "should return 0 if the resource is absent" do
+      expect(get_create_mode(:absent)).to eq(0)
+    end
+
+    it "should return mode with file type set to S_IFREG when resource is file" do
+      expect(get_create_mode(:present)).to eq(32768)
+      expect(get_create_mode(:file)).to eq(32768)
+    end
+
+    it "should return mode with file type set to S_IFDIR when resource is dir" do
+      expect(get_create_mode(:directory)).to eq(16384)
+    end
+
+    it "should return mode with file type set to S_IFLNK when resource is link" do
+      expect(get_create_mode(:link)).to eq(40960)
+    end
+
+    it "should return 0 for everything else" do
+      expect(get_create_mode("unknown")).to eq(0)
+    end
+  end
 end

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

@@ -131,33 +131,74 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       expect(subject.name_to_principal(unknown_name)).to be_nil
     end
 
+    it "should print a debug message if the account does not exist" do
+      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal(unknown_name)
+    end
+
     it "should return a Puppet::Util::Windows::SID::Principal instance for any valid sid" do
       expect(subject.name_to_principal(sid)).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
     end
 
+    it "should not print debug messages for valid sid" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).not_to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal(sid)
+    end
+
+    it "should print a debug message for invalid sid" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('S-1-5-21-INVALID-SID')
+    end
+
     it "should accept unqualified account name" do
       # NOTE: lookup by name works in localized environments only for a few instances
       # this works in French Windows, even though the account is really Syst\u00E8me
       expect(subject.name_to_principal('SYSTEM').sid).to eq(sid)
     end
 
+    it "should not print debug messages for unqualified account name" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).not_to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('SYSTEM')
+    end
+
     it "should be case-insensitive" do
       # NOTE: lookup by name works in localized environments only for a few instances
       # this works in French Windows, even though the account is really Syst\u00E8me
       expect(subject.name_to_principal('SYSTEM')).to eq(subject.name_to_principal('system'))
     end
 
+    it "should not print debug messages for wrongly cased account name" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).not_to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('system')
+    end
+
     it "should be leading and trailing whitespace-insensitive" do
       # NOTE: lookup by name works in localized environments only for a few instances
       # this works in French Windows, even though the account is really Syst\u00E8me
       expect(subject.name_to_principal('SYSTEM')).to eq(subject.name_to_principal(' SYSTEM '))
     end
 
+    it "should not print debug messages for account name with leading and trailing whitespace" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).not_to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal(' SYSTEM ')
+    end
+
     it "should accept domain qualified account names" do
       # NOTE: lookup by name works in localized environments only for a few instances
       # 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 not print debug messages for domain qualified account names" do
+      expect(Puppet).not_to receive(:debug).with(/Could not retrieve raw SID bytes from/)
+      expect(Puppet).not_to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('NT AUTHORITY\SYSTEM')
+    end
   end
 
   context "#ads_to_principal" do

data/tasks/generate_cert_fixtures.rake

@@ -40,6 +40,7 @@ task(:gen_cert_fixtures) do
   # 127.0.0.1.pem                     |   +- /CN=127.0.0.1 (with dns alt names)
   # tampered-cert.pem                 |   +- /CN=signed (with different public key)
   # ec.pem                            |   +- /CN=ec (with EC private key)
+  # oid.pem                           |   +- /CN=oid (with custom oid)
   #                                   |
   #                                   + /CN=Test CA Agent Subauthority
   #                                   |  |
@@ -49,7 +50,7 @@ task(:gen_cert_fixtures) do
   #
   # bad-basic-constraints.pem        /CN=Test CA (bad isCA constraint)
   #
-  # unknown-ca.pemm                  /CN=Unknown CA
+  # unknown-ca.pem                   /CN=Unknown CA
   #                                   |
   # unknown-127.0.0.1.pem             +- /CN=127.0.0.1
   #
@@ -103,6 +104,14 @@ task(:gen_cert_fixtures) do
   save(dir, '127.0.0.1.pem', signed[:cert])
   save(dir, '127.0.0.1-key.pem', signed[:private_key])
 
+  # Create an SSL cert with extensions containing custom oids
+  extensions = [
+    ['1.3.6.1.4.1.34380.1.2.1.1', OpenSSL::ASN1::UTF8String.new('somevalue'), false],
+  ]
+  oid = ca.create_cert('oid', inter[:cert], inter[:private_key], extensions: extensions)
+  save(dir, 'oid.pem', oid[:cert])
+  save(dir, 'oid-key.pem', oid[:private_key])
+
   # Create a leaf/entity key and cert for host "revoked", issued by "Test CA Subauthority"
   # and revoke the cert
   revoked = ca.create_cert('revoked', inter[:cert], inter[:private_key])
@@ -173,12 +182,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(1024).public_key
+  tampered_csr.public_key = OpenSSL::PKey::RSA.new(2048).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(1024).public_key
+  tampered_cert.public_key = OpenSSL::PKey::RSA.new(2048).public_key
   save(dir, 'tampered-cert.pem', tampered_cert)
 end

data/tasks/parallel.rake

@@ -5,9 +5,9 @@ require 'thread'
 begin
   require 'rspec'
   require 'rspec/core/formatters/helpers'
-  require 'facter'
+  require 'etc'
 rescue LoadError
-  # Don't define the task if we don't have rspec or facter present
+  # Don't define the task if we don't have rspec present
 else
   module Parallel
     module RSpec
@@ -401,7 +401,7 @@ else
       # Default group size in rspec examples
       DEFAULT_GROUP_SIZE = 1000
 
-      process_count = [(args[:process_count] || Facter.value("processorcount")).to_i, 1].max
+      process_count = [(args[:process_count] || Etc.nprocessors).to_i, 1].max
       group_size = [(args[:group_size] || DEFAULT_GROUP_SIZE).to_i, 1].max
 
       abort unless Parallel::RSpec::Parallelizer.new(process_count, group_size, color_output?, args.extras).run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.21.1
+  version: 6.25.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -184,6 +184,13 @@ files:
 - conf/fileserver.conf
 - conf/hiera.yaml
 - conf/puppet.conf
+- examples/enc/regexp_nodes/classes/databases
+- examples/enc/regexp_nodes/classes/webservers
+- examples/enc/regexp_nodes/environment/development
+- examples/enc/regexp_nodes/parameters/service/prod
+- examples/enc/regexp_nodes/parameters/service/qa
+- examples/enc/regexp_nodes/parameters/service/sandbox
+- examples/enc/regexp_nodes/regexp_nodes.rb
 - examples/hiera/README.md
 - examples/hiera/etc/hiera.yaml
 - examples/hiera/etc/hieradb/common.yaml
@@ -198,113 +205,25 @@ files:
 - examples/hiera/modules/users/manifests/dc1.pp
 - examples/hiera/modules/users/manifests/development.pp
 - examples/hiera/site.pp
-- ext/README.environment
+- examples/nagios/check_puppet.rb
+- ext/README.md
 - ext/build_defaults.yaml
-- ext/dbfix.sql
-- ext/debian/README.Debian
-- ext/debian/README.source
-- ext/debian/TODO.Debian
-- ext/debian/changelog.erb
-- ext/debian/compat
-- ext/debian/control
-- ext/debian/copyright
-- ext/debian/docs
-- ext/debian/fileserver.conf
-- ext/debian/puppet-common.dirs
-- ext/debian/puppet-common.install
-- ext/debian/puppet-common.lintian-overrides
-- ext/debian/puppet-common.manpages
-- ext/debian/puppet-common.postinst
-- ext/debian/puppet-common.postrm
-- ext/debian/puppet-el.dirs
-- ext/debian/puppet-el.emacsen-install
-- ext/debian/puppet-el.emacsen-remove
-- ext/debian/puppet-el.emacsen-startup
-- ext/debian/puppet-el.install
-- ext/debian/puppet-testsuite.install
-- ext/debian/puppet-testsuite.lintian-overrides
 - ext/debian/puppet.default
 - ext/debian/puppet.init
-- ext/debian/puppet.lintian-overrides
-- ext/debian/puppet.logrotate
-- ext/debian/puppet.postinst
-- ext/debian/puppet.postrm
-- ext/debian/puppet.preinst
-- ext/debian/puppetmaster-common.install
-- ext/debian/puppetmaster-common.manpages
-- ext/debian/puppetmaster-common.postinst
-- ext/debian/puppetmaster-passenger.dirs
-- ext/debian/puppetmaster-passenger.postinst
-- ext/debian/puppetmaster-passenger.postrm
-- ext/debian/puppetmaster.README.debian
-- ext/debian/puppetmaster.default
-- ext/debian/puppetmaster.init
-- ext/debian/puppetmaster.lintian-overrides
-- ext/debian/puppetmaster.postinst
-- ext/debian/puppetmaster.postrm
-- ext/debian/puppetmaster.preinst
-- ext/debian/rules
-- ext/debian/source/format
-- ext/debian/source/options
-- ext/debian/vim-puppet.README.Debian
-- ext/debian/vim-puppet.dirs
-- ext/debian/vim-puppet.yaml
-- ext/debian/watch
-- ext/freebsd/puppetd
-- ext/freebsd/puppetmasterd
-- ext/gentoo/conf.d/puppet
-- ext/gentoo/conf.d/puppetmaster
-- ext/gentoo/init.d/puppet
-- ext/gentoo/init.d/puppetmaster
-- ext/gentoo/puppet/fileserver.conf
 - ext/hiera/hiera.yaml
-- ext/ips/puppet-agent
-- ext/ips/puppet-master
-- ext/ips/puppet.p5m.erb
-- ext/ips/puppetagent.xml
-- ext/ips/puppetmaster.xml
-- ext/ips/rules
-- ext/ips/transforms
-- ext/ldap/puppet.schema
-- ext/logcheck/puppet
-- ext/nagios/check_puppet.rb
-- ext/osx/file_mapping.yaml
-- ext/osx/postflight.erb
-- ext/osx/preflight.erb
-- ext/osx/prototype.plist.erb
 - ext/osx/puppet.plist
 - ext/project_data.yaml
 - ext/redhat/client.init
 - ext/redhat/client.sysconfig
-- ext/redhat/fileserver.conf
-- ext/redhat/logrotate
-- ext/redhat/puppet.spec.erb
-- ext/redhat/server.init
-- ext/redhat/server.sysconfig
-- ext/regexp_nodes/classes/databases
-- ext/regexp_nodes/classes/webservers
-- ext/regexp_nodes/environment/development
-- ext/regexp_nodes/parameters/service/prod
-- ext/regexp_nodes/parameters/service/qa
-- ext/regexp_nodes/parameters/service/sandbox
-- ext/regexp_nodes/regexp_nodes.rb
-- ext/solaris/pkginfo
 - ext/solaris/smf/puppet
 - ext/solaris/smf/puppet.xml
-- ext/solaris/smf/puppetd.xml
-- ext/solaris/smf/puppetmasterd.xml
-- ext/solaris/smf/svc-puppetd
-- ext/solaris/smf/svc-puppetmasterd
 - ext/suse/client.init
-- ext/suse/puppet.spec
-- ext/suse/server.init
 - ext/systemd/puppet.service
 - ext/windows/puppet_interactive.bat
 - ext/windows/puppet_shell.bat
 - ext/windows/run_puppet_interactive.bat
 - ext/windows/service/daemon.bat
 - ext/windows/service/daemon.rb
-- ext/yaml_nodes.rb
 - install.rb
 - lib/hiera/puppet_function.rb
 - lib/hiera/scope.rb
@@ -409,6 +328,7 @@ files:
 - lib/puppet/face/report.rb
 - lib/puppet/face/resource.rb
 - lib/puppet/face/status.rb
+- lib/puppet/facter_impl.rb
 - lib/puppet/feature/base.rb
 - lib/puppet/feature/bolt.rb
 - lib/puppet/feature/cfpropertylist.rb
@@ -442,6 +362,7 @@ files:
 - lib/puppet/file_serving/mount/modules.rb
 - lib/puppet/file_serving/mount/pluginfacts.rb
 - lib/puppet/file_serving/mount/plugins.rb
+- lib/puppet/file_serving/mount/scripts.rb
 - lib/puppet/file_serving/mount/tasks.rb
 - lib/puppet/file_serving/terminus_helper.rb
 - lib/puppet/file_serving/terminus_selector.rb
@@ -1411,8 +1332,16 @@ 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/agent/lib/facter/agent_spec_role.rb
 - 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/l10n/envs/prod/modules/demo/Gemfile
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -1458,6 +1387,8 @@ files:
 - spec/fixtures/ssl/intermediate-crl.pem
 - spec/fixtures/ssl/intermediate.pem
 - spec/fixtures/ssl/netlock-arany-utf8.pem
+- spec/fixtures/ssl/oid-key.pem
+- spec/fixtures/ssl/oid.pem
 - spec/fixtures/ssl/pluto-key.pem
 - spec/fixtures/ssl/pluto.pem
 - spec/fixtures/ssl/request-key.pem
@@ -1468,6 +1399,7 @@ files:
 - spec/fixtures/ssl/signed.pem
 - spec/fixtures/ssl/tampered-cert.pem
 - spec/fixtures/ssl/tampered-csr.pem
+- spec/fixtures/ssl/trusted_oid_mapping.yaml
 - 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
@@ -1787,6 +1719,7 @@ files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.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
@@ -1816,6 +1749,8 @@ 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/application/ssl_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -1830,6 +1765,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/l10n/compiler_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -1875,10 +1811,8 @@ 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
@@ -1928,6 +1862,7 @@ files:
 - spec/shared_contexts/checksum.rb
 - spec/shared_contexts/digests.rb
 - spec/shared_contexts/https.rb
+- spec/shared_contexts/l10n.rb
 - spec/shared_contexts/types_setup.rb
 - spec/shared_examples/rhel_package_provider.rb
 - spec/spec_helper.rb
@@ -1991,6 +1926,7 @@ files:
 - spec/unit/face/plugin_spec.rb
 - spec/unit/face/status_spec.rb
 - spec/unit/face_spec.rb
+- spec/unit/facter_impl_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
 - spec/unit/file_serving/base_spec.rb
@@ -2005,6 +1941,7 @@ files:
 - spec/unit/file_serving/mount/modules_spec.rb
 - spec/unit/file_serving/mount/pluginfacts_spec.rb
 - spec/unit/file_serving/mount/plugins_spec.rb
+- spec/unit/file_serving/mount/scripts_spec.rb
 - spec/unit/file_serving/mount/tasks_spec.rb
 - spec/unit/file_serving/mount_spec.rb
 - spec/unit/file_serving/terminus_helper_spec.rb
@@ -2176,7 +2113,6 @@ files:
 - 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
 - spec/unit/indirector_spec.rb
@@ -2651,7 +2587,8 @@ files:
 - tasks/parser.rake
 - tasks/yard.rake
 homepage: https://github.com/puppetlabs/puppet
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -2681,8 +2618,16 @@ 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/agent/lib/facter/agent_spec_role.rb
 - 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/l10n/envs/prod/modules/demo/Gemfile
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/config.yaml
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/ja/puppet-l10n.po
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/locales/puppet-l10n.pot
+- spec/fixtures/integration/l10n/envs/prod/modules/demo/metadata.json
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
@@ -2728,6 +2673,8 @@ test_files:
 - spec/fixtures/ssl/intermediate-crl.pem
 - spec/fixtures/ssl/intermediate.pem
 - spec/fixtures/ssl/netlock-arany-utf8.pem
+- spec/fixtures/ssl/oid-key.pem
+- spec/fixtures/ssl/oid.pem
 - spec/fixtures/ssl/pluto-key.pem
 - spec/fixtures/ssl/pluto.pem
 - spec/fixtures/ssl/request-key.pem
@@ -2738,6 +2685,7 @@ test_files:
 - spec/fixtures/ssl/signed.pem
 - spec/fixtures/ssl/tampered-cert.pem
 - spec/fixtures/ssl/tampered-csr.pem
+- spec/fixtures/ssl/trusted_oid_mapping.yaml
 - 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
@@ -3057,6 +3005,7 @@ test_files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.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
@@ -3086,6 +3035,8 @@ 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/application/ssl_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -3100,6 +3051,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/l10n/compiler_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -3145,10 +3097,8 @@ 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
@@ -3198,6 +3148,7 @@ test_files:
 - spec/shared_contexts/checksum.rb
 - spec/shared_contexts/digests.rb
 - spec/shared_contexts/https.rb
+- spec/shared_contexts/l10n.rb
 - spec/shared_contexts/types_setup.rb
 - spec/shared_examples/rhel_package_provider.rb
 - spec/spec_helper.rb
@@ -3261,6 +3212,7 @@ test_files:
 - spec/unit/face/plugin_spec.rb
 - spec/unit/face/status_spec.rb
 - spec/unit/face_spec.rb
+- spec/unit/facter_impl_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
 - spec/unit/file_serving/base_spec.rb
@@ -3275,6 +3227,7 @@ test_files:
 - spec/unit/file_serving/mount/modules_spec.rb
 - spec/unit/file_serving/mount/pluginfacts_spec.rb
 - spec/unit/file_serving/mount/plugins_spec.rb
+- spec/unit/file_serving/mount/scripts_spec.rb
 - spec/unit/file_serving/mount/tasks_spec.rb
 - spec/unit/file_serving/mount_spec.rb
 - spec/unit/file_serving/terminus_helper_spec.rb
@@ -3446,7 +3399,6 @@ test_files:
 - 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
 - spec/unit/indirector_spec.rb

data/ext/README.environment

@@ -1,8 +0,0 @@
-This is an example environment directory. The environment's modules can be
-placed in a "modules" subdirectory. The environments initial manifests are
-placed in a "manifests" subdirectory. By default the environment also has any
-modules that are installed globally (normally in /etc/puppetlabs/code/modules) for the
-puppet master.
-
-For more information see
-https://puppet.com/docs/puppet/latest/environments_about.html