puppet 5.5.1 → 5.5.2

data/man/man8/puppet-lookup.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-LOOKUP" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-LOOKUP" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-lookup\fR \- Interactive Hiera lookup
@@ -37,7 +37,7 @@ If \'\-\-explain\' isn\'t specified, lookup exits with 0 if a value was found an
 You can provide multiple lookup keys to this command, but it only returns a value for the first found key, omitting the rest\.
 .
 .P
-For more details about how Hiera works, see the Hiera documentation: https://docs\.puppet\.com/puppet/latest/hiera_intro\.html
+For more details about how Hiera works, see the Hiera documentation: https://puppet\.com/docs/puppet/latest/hiera_intro\.html
 .
 .SH "OPTIONS"
 .

data/man/man8/puppet-man.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MAN" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MAN" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-man\fR \- Display Puppet manual pages\.
@@ -16,7 +16,7 @@ Please use the command \'puppet help \fIsubcommand\fR\' or the system manpage sy
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT

data/man/man8/puppet-master.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MASTER" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MASTER" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-master\fR \- The puppet master daemon
@@ -19,7 +19,7 @@ This command starts an instance of puppet master, running as a daemon and using
 Note that any Puppet setting that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid setting, so you can specify \'\-\-server \fIservername\fR\' as an argument\. Boolean settings translate into \'\-\-setting\' and \'\-\-no\-setting\' pairs\.
 .
 .P
-See the configuration file documentation at https://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html for the full list of acceptable settings\. A commented list of all settings can also be generated by running puppet master with \'\-\-genconfig\'\.
+See the configuration file documentation at https://puppet\.com/docs/puppet/latest/configuration\.html for the full list of acceptable settings\. A commented list of all settings can also be generated by running puppet master with \'\-\-genconfig\'\.
 .
 .TP
 \-\-daemonize

data/man/man8/puppet-module.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MODULE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\.
@@ -16,7 +16,7 @@ This subcommand can find, install, and manage modules from the Puppet Forge, a r
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT
@@ -48,7 +48,7 @@ Given that the context and effects vary depending on the config section \fIhttps
 The search path for modules, as a list of directories separated by the system path separator character\. (The POSIX path separator is \':\', and the Windows path separator is \';\'\.)
 .
 .IP
-Setting a global value for \fBmodulepath\fR in puppet\.conf is not allowed (but it can be overridden from the commandline)\. Please use directory environments instead\. If you need to use something other than the default modulepath of \fB<ACTIVE ENVIRONMENT\'S MODULES DIR>:$basemodulepath\fR, you can set \fBmodulepath\fR in environment\.conf\. For more info, see \fIhttps://docs\.puppet\.com/puppet/latest/reference/environments\.html\fR
+Setting a global value for \fBmodulepath\fR in puppet\.conf is not allowed (but it can be overridden from the commandline)\. Please use directory environments instead\. If you need to use something other than the default modulepath of \fB<ACTIVE ENVIRONMENT\'S MODULES DIR>:$basemodulepath\fR, you can set \fBmodulepath\fR in environment\.conf\. For more info, see \fIhttps://puppet\.com/docs/puppet/latest/environments_about\.html\fR
 .
 .SH "ACTIONS"
 .
@@ -66,7 +66,7 @@ puppet module build [\fIpath\fR]
 Prepares a local module for release on the Puppet Forge by building a ready\-to\-upload archive file\. Note: Module build uses MD5 checksums, which are prohibited on FIPS enabled systems\.
 .
 .IP
-This action uses the metadata\.json file in the module directory to set metadata used by the Forge\. See \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/modules_publishing\.html\fR for more about writing metadata\.json files\.
+This action uses the metadata\.json file in the module directory to set metadata used by the Forge\. See \fIhttps://puppet\.com/docs/puppet/latest/modules_publishing\.html\fR for more about writing metadata\.json files\.
 .
 .IP
 After being built, the release archive file can be found in the module\'s \fBpkg\fR directory\.

data/man/man8/puppet-node.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-NODE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.
@@ -16,7 +16,7 @@ This subcommand interacts with node objects, which are used by Puppet to build a
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT

data/man/man8/puppet-parser.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PARSER" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.
@@ -13,7 +13,7 @@ puppet parser \fIaction\fR
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.
@@ -19,7 +19,7 @@ The puppet master serves Ruby code collected from the \fBlib\fR directories of i
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.
@@ -13,7 +13,7 @@ puppet report \fIaction\fR [\-\-terminus _TERMINUS] [\-\-extra HASH]
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell
@@ -25,7 +25,7 @@ If given a type, a name, and a series of \fIattribute\fR=\fIvalue\fR pairs, pupp
 Note that any setting that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid setting, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
 .
 .P
-See the configuration file documentation at https://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
+See the configuration file documentation at https://puppet\.com/docs/puppet/latest/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
 .
 .TP
 \-\-debug

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog
@@ -22,7 +22,7 @@ When provided with a modulepath, via command line or config file, puppet script
 Note that any setting that\'s valid in the configuration file is also a valid long argument\. For example, \'environment\' is a valid setting, so you can specify \'\-\-environment mytest\' as an argument\.
 .
 .P
-See the configuration file documentation at https://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
+See the configuration file documentation at https://puppet\.com/docs/puppet/latest/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
 .
 .TP
 \-\-debug

data/man/man8/puppet-status.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-STATUS" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.
@@ -13,7 +13,7 @@ puppet status \fIaction\fR [\-\-terminus _TERMINUS] [\-\-extra HASH]
 Note that any setting that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR and \fBrun_mode\fR are valid settings, so you can specify \fB\-\-server <servername>\fR, or \fB\-\-run_mode <runmode>\fR as an argument\.
 .
 .P
-See the configuration file documentation at \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+See the configuration file documentation at \fIhttps://puppet\.com/docs/puppet/latest/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
 .
 .TP
 \-\-render\-as FORMAT
@@ -69,7 +69,7 @@ A "true" response or a low\-level connection error\. When used from the Ruby API
 \fBNOTES\fR
 .
 .IP
-This action requires that the server\'s \fBauth\.conf\fR file allow find access to the \fBstatus\fR REST terminus\. Puppet agent does not use this facility, and it is turned off by default\. See \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/config_file_auth\.html\fR for more details\.
+This action requires that the server\'s \fBauth\.conf\fR file allow find access to the \fBstatus\fR REST terminus\. Puppet agent does not use this facility, and it is turned off by default\. See \fIhttps://puppet\.com/docs/puppet/latest/config_file_auth\.html\fR for more details\.
 .
 .TP
 \fBinfo\fR \- Print the default terminus class for this face\.

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "April 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "May 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -16,4 +16,4 @@ Available subcommands:
 agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests certificate Provide access to the CA for certificate management\. certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. (Deprecated) master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell script Run a puppet manifests as a script without compiling a catalog status View puppet server status\. (Deprecated)
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.5\.1
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.5\.2

data/spec/integration/type/file_spec.rb

@@ -80,6 +80,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   before do
     # stub this to not try to create state.yaml
     Puppet::Util::Storage.stubs(:store)
+
+    Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+    Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -414,6 +417,13 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
               expect(get_mode(path) & 07777).to eq(0600)
             end
 
+            it "should not give a deprecation warning about using a checksum in content when using source to define content" do
+              FileUtils.touch(path)
+              Puppet.expects(:puppet_deprecation_warning).never
+              catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
+              catalog.apply
+            end
+
             context "overwriting a file" do
               before :each do
                 FileUtils.touch(path)
@@ -592,10 +602,30 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
     end
 
+    it "should not give a deprecation warning when given actual content" do
+      Puppet.expects(:puppet_deprecation_warning).never
+      catalog.add_resource described_class.new(:path => path, :content => 'this is content')
+      catalog.apply
+    end
+
     with_digest_algorithms do
       it_should_behave_like "files are backed up", {} do
         let(:filebucket_digest) { method(:digest) }
       end
+
+      it "should give a deprecation warning" do
+        Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
+        d = digest("this is some content")
+        catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
+        catalog.apply
+      end
+
+      it "should not give a deprecation warning when no content is specified while checksum and checksum value are used" do
+        Puppet.expects(:puppet_deprecation_warning).never
+        d = digest("this is some content")
+        catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
+        catalog.apply
+      end
     end
 
     CHECKSUM_TYPES_TO_TRY.each do |checksum_type, checksum|

data/spec/unit/defaults_spec.rb

@@ -123,4 +123,18 @@ describe "Defaults" do
       Puppet.settings.handlearg("--server", "test_server")
     end
   end
+
+  describe 'basemodulepath' do
+    it 'includes the global and system modules on non-windows', :unless => Puppet::Util::Platform.windows? do
+      expect(
+        Puppet[:basemodulepath]
+      ).to match(%r{.*/code/modules:/opt/puppetlabs/puppet/modules})
+    end
+
+    it 'includes global modules on windows', :if => Puppet::Util::Platform.windows? do
+      expect(
+        Puppet[:basemodulepath]
+      ).to match(%r{.*/code/modules})
+    end
+  end
 end

data/spec/unit/environments_spec.rb

@@ -265,6 +265,46 @@ config_version=relative/script
         end
       end
 
+      it "interprets glob modulepaths from the environment's directory" do
+        Dir.stubs(:glob).with(File.join(envdir, 'env1', 'other', '*', 'modules')).returns([
+          File.join(envdir, 'env1', 'other', 'foo', 'modules'),
+          File.join(envdir, 'env1', 'other', 'bar', 'modules')
+        ])
+        content = <<-EOF
+manifest=relative/manifest
+modulepath=relative/modules#{File::PATH_SEPARATOR}other/*/modules
+config_version=relative/script
+        EOF
+
+        envdir = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
+          FS::MemoryFile.a_directory("env1", [
+            FS::MemoryFile.a_regular_file_containing("environment.conf", content),
+            FS::MemoryFile.a_missing_file("modules"),
+            FS::MemoryFile.a_directory('relative', [
+              FS::MemoryFile.a_directory('modules'),
+            ]),
+            FS::MemoryFile.a_directory('other', [
+              FS::MemoryFile.a_directory('foo', [
+                FS::MemoryFile.a_directory('modules'),
+              ]),
+              FS::MemoryFile.a_directory('bar', [
+                FS::MemoryFile.a_directory('modules'),
+              ]),
+            ]),
+          ]),
+        ])
+
+        loader_from(:filesystem => [envdir],
+                    :directory => envdir) do |loader|
+          expect(loader.get("env1")).to environment(:env1).
+            with_manifest(File.join(envdir, 'env1', 'relative', 'manifest')).
+            with_modulepath([File.join(envdir, 'env1', 'relative', 'modules'),
+                             File.join(envdir, 'env1', 'other', 'foo', 'modules'),
+                             File.join(envdir, 'env1', 'other', 'bar', 'modules')]).
+            with_config_version(File.join(envdir, 'env1', 'relative', 'script'))
+        end
+      end
+
       it "interpolates other setting values correctly" do
         modulepath = [
           File.expand_path('/some/absolute'),

data/spec/unit/face/module/build_spec.rb

@@ -25,7 +25,7 @@ describe "puppet module build" do
     it "if current directory or parents contain no module root, should return exception" do
       Dir.expects(:pwd).returns('/a/b/c')
       Puppet::ModuleTool.expects(:find_module_root).returns(nil)
-      expect { subject.build }.to raise_error RuntimeError, "Unable to find metadata.json in module root /a/b/c or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format."
+      expect { subject.build }.to raise_error RuntimeError, "Unable to find metadata.json in module root /a/b/c or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format."
     end
   end
 
@@ -39,7 +39,7 @@ describe "puppet module build" do
 
     it "if path is not a module root should raise exception" do
       Puppet::ModuleTool.expects(:is_module_root?).with('/a/b/c').returns(false)
-      expect { subject.build('/a/b/c') }.to raise_error RuntimeError, "Unable to find metadata.json in module root /a/b/c or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format."
+      expect { subject.build('/a/b/c') }.to raise_error RuntimeError, "Unable to find metadata.json in module root /a/b/c or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format."
     end
   end
 

data/spec/unit/functions/match_spec.rb

@@ -41,6 +41,15 @@ describe 'the match function' do
     it "matches string and type #{pattern} with captures" do
       expect(func.call({}, 'abc123', type(pattern))).to eql(['abc123', 'abc', '123'])
     end
+
+    it "matches string with an alias type for #{pattern} with captures" do
+      expect(func.call({}, 'abc123', alias_type("MyAlias", type(pattern)))).to eql(['abc123', 'abc', '123'])
+    end
+
+    it "matches string with a  matching variant type for #{pattern} with captures" do
+      expect(func.call({}, 'abc123', variant_type(type(pattern)))).to eql(['abc123', 'abc', '123'])
+    end
+
   end
 
   it 'matches an array of strings and yields a map of the result' do
@@ -51,6 +60,15 @@ describe 'the match function' do
     expect{func.call({}, 'abc123', type('Regexp'))}.to raise_error(ArgumentError, /Given Regexp Type has no regular expression/)
   end
 
+  def variant_type(*t)
+    Puppet::Pops::Types::PVariantType.new(t)
+  end
+
+  def alias_type(name, t)
+    # Create an alias using a nil AST (which is never used because it is given a type as resolution)
+    Puppet::Pops::Types::PTypeAliasType.new(name, nil, t)
+  end
+
   def type(s)
     Puppet::Pops::Types::TypeParser.singleton.parse(s)
   end

data/spec/unit/functions/new_spec.rb

@@ -391,6 +391,7 @@ describe 'the new function' do
       "010" => "Notify[Integer, 8]",
       "0.10" => "Notify[Float, 0.1]",
       "0b10" => "Notify[Integer, 2]",
+      "0"    => "Notify[Integer, 0]",
       false => "Notify[Integer, 0]",
       true => "Notify[Integer, 1]",
     }.each do |input, result|

data/spec/unit/network/http/factory_spec.rb

@@ -78,42 +78,49 @@ describe Puppet::Network::HTTP::Factory do
 
       expect(conn.proxy_port).to eq(proxy_port)
     end
+  end
 
-    context 'socket timeouts' do
-      it 'sets open timeout' do
-        Puppet[:http_connect_timeout] = "10s"
-        conn = create_connection(site)
+  context 'socket timeouts' do
+    it 'sets open timeout' do
+      Puppet[:http_connect_timeout] = "10s"
+      conn = create_connection(site)
 
-        expect(conn.open_timeout).to eq(10)
-      end
+      expect(conn.open_timeout).to eq(10)
+    end
 
-      it 'sets read timeout' do
-        Puppet[:http_read_timeout] = "2m"
-        conn = create_connection(site)
+    it 'sets read timeout' do
+      Puppet[:http_read_timeout] = "2m"
+      conn = create_connection(site)
 
-        expect(conn.read_timeout).to eq(120)
-      end
+      expect(conn.read_timeout).to eq(120)
     end
+  end
 
-    context 'source address' do
-      it 'defaults to system-defined' do
-        skip "Requires Ruby >= 2.0" unless RUBY_VERSION.to_i >= 2
-        conn = create_connection(site)
+  it "disables ruby's http_keepalive_timeout on Ruby 2" do
+    skip "Requires Ruby >= 2.0" unless RUBY_VERSION.to_i >= 2
+    conn = create_connection(site)
 
-        expect(conn.local_host).to be(nil)
-      end
+    expect(conn.keep_alive_timeout).to eq(2147483647)
+  end
+
+  context 'source address' do
+    it 'defaults to system-defined' do
+      skip "Requires Ruby >= 2.0" unless RUBY_VERSION.to_i >= 2
+      conn = create_connection(site)
+
+      expect(conn.local_host).to be(nil)
+    end
+
+    it 'sets the local_host address' do
+      Puppet[:sourceaddress] = "127.0.0.1"
+      if RUBY_VERSION.to_i >= 2
+        conn = create_connection(site)
 
-      it 'sets the local_host address' do
-        Puppet[:sourceaddress] = "127.0.0.1"
-        if RUBY_VERSION.to_i >= 2
-          conn = create_connection(site)
-
-          expect(conn.local_host).to eq('127.0.0.1')
-        else
-          expect {
-            create_connection(site)
-          }.to raise_error(ArgumentError, "Setting 'sourceaddress' is unsupported by this version of Net::HTTP.")
-        end
+        expect(conn.local_host).to eq('127.0.0.1')
+      else
+        expect {
+          create_connection(site)
+        }.to raise_error(ArgumentError, "Setting 'sourceaddress' is unsupported by this version of Net::HTTP.")
       end
     end
   end