puppet 5.5.0-universal-darwin → 5.5.1-universal-darwin

data/man/man8/puppet-config.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CONFIG" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-config\fR \- Interact with Puppet\'s settings\.

data/man/man8/puppet-describe.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types

data/man/man8/puppet-device.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DEVICE" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-device\fR \- Manage remote network devices

data/man/man8/puppet-doc.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet references

data/man/man8/puppet-epp.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-EPP" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-epp\fR \- Interact directly with the EPP template parser/renderer\.

data/man/man8/puppet-facts.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FACTS" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-facts\fR \- Retrieve and store facts\.

data/man/man8/puppet-filebucket.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket

data/man/man8/puppet-generate.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-GENERATE" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-generate\fR \- Generates Puppet code from Ruby definitions\.

data/man/man8/puppet-help.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-HELP" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-help\fR \- Display Puppet help\.

data/man/man8/puppet-key.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KEY" "8" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-KEY" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-key\fR \- Create, save, and remove certificate keys\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-LOOKUP" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-lookup\fR \- Interactive Hiera lookup

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MAN" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-man\fR \- Display Puppet manual pages\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MASTER" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-master\fR \- The puppet master daemon

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "April 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.

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" "March 2018" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "April 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\.0
+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

data/spec/integration/parser/compiler_spec.rb

@@ -520,6 +520,15 @@ describe Puppet::Parser::Compiler do
           PP
         }.to raise_error(/Could not find resource 'Notify\[tooth_fairy\]' in parameter 'require'/)
       end
+
+      it 'faulty references are reported with source location' do
+        expect { 
+          compile_to_catalog(<<-PP)
+            notify{ x : 
+              require => tooth_fairy }
+          PP
+        }.to raise_error(/"tooth_fairy" is not a valid resource reference.*\(line: 2\)/)
+      end
     end
 
     describe "relationships can be formed" do

data/spec/unit/configurer_spec.rb

@@ -264,6 +264,12 @@ describe Puppet::Configurer do
       expect(@agent.run).to eq(1234)
     end
 
+    it "should return nil if catalog application fails" do
+      @catalog.expects(:apply).raises(Puppet::Error, 'One or more resource dependency cycles detected in graph')
+      report = Puppet::Transaction::Report.new
+      expect(@agent.run(catalog: @catalog, report: report)).to be_nil
+    end
+
     it "should send the transaction report even if the pre-run command fails" do
       report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
@@ -352,11 +358,33 @@ describe Puppet::Configurer do
       expect(@agent.run).to be_nil
     end
 
-    it "should record the time it took to apply the catalog" do
+    it 'includes total time metrics in the report after successfully applying the catalog' do
       report = Puppet::Transaction::Report.new
       @catalog.stubs(:apply).with(:report => report)
-      report.expects(:add_times).with(:catalog_application, kind_of(Numeric))
-      @agent.apply_catalog(@catalog, {:report => report})
+      @agent.run(report: report)
+
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
+    end
+
+    it 'includes total time metrics in the report even if prerun fails' do
+      Puppet.settings[:prerun_command] = "/my/command"
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+
+      report = Puppet::Transaction::Report.new
+      @agent.run(report: report)
+
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
+    end
+
+    it 'includes total time metrics in the report even if catalog retrieval fails' do
+      report = Puppet::Transaction::Report.new
+      @agent.stubs(:prepare_and_retrieve_catalog_from_cache).raises
+      @agent.run(:report => report)
+
+      expect(report.metrics['time']).to be
+      expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
     end
 
     it "should refetch the catalog if the server specifies a new environment in the catalog" do

data/spec/unit/face/config_spec.rb

@@ -13,11 +13,6 @@ describe Puppet::Face[:config, '0.0.1'] do
 
   FS = Puppet::FileSystem
 
-  before :each do
-    subject.stubs(:warn_default_section)
-    subject.stubs(:report_section_and_environment)
-  end
-
   it "prints a single setting without the name" do
     Puppet[:trace] = true
 
@@ -61,27 +56,44 @@ trace = true
     expect(render(:print, result)).to eq("file\n")
   end
 
-  it "prints the section and environment, and not a warning,  when a section is given" do
+  it "prints the section and environment, and not a warning, when a section is given and verbose is set" do
     Puppet.settings.parse_config(<<-CONF)
     [user]
     syslogfacility = file
     CONF
 
-    subject.expects(:warn_default_section).never
-    subject.expects(:report_section_and_environment).once
+    #This has to be after the settings above, which resets the value
+    Puppet[:log_level] = 'info'
 
-    result = subject.print("syslogfacility", :section => "user")
-    expect(render(:print, result)).to eq("file\n")
+    Puppet.expects(:warning).never
+    expect {
+      result = subject.print("syslogfacility", :section => "user")
+      expect(render(:print, result)).to eq("file\n")
+    }.to output("\e[1;33mResolving settings from section 'user' in environment 'production'\e[0m\n").to_stderr
   end
 
-  it "prints a warning and the section and environment when no section is given" do
+  it "prints a warning and the section and environment when no section is given and verbose is set" do
+    Puppet[:log_level] = 'info'
     Puppet[:trace] = true
 
-    subject.expects(:warn_default_section).once
-    subject.expects(:report_section_and_environment).once
+    Puppet.expects(:warning).with("No section specified; defaulting to 'main'.\nSet the config section " +
+      "by using the `--section` flag.\nFor example, `puppet config --section user print foo`.\nFor more " +
+      "information, see https://puppet.com/docs/puppet/latest/configuration.html")
+    expect {
+      result = subject.print("trace")
+      expect(render(:print, result)).to eq("true\n")
+    }.to output("\e[1;33mResolving settings from section 'main' in environment 'production'\e[0m\n").to_stderr
+  end
 
-    result = subject.print("trace")
-    expect(render(:print, result)).to eq("true\n")
+  it "does not print a warning or the section and environment when no section is given and verbose is not set" do
+    Puppet[:log_level] = 'notice'
+    Puppet[:trace] = true
+
+    Puppet.expects(:warning).never
+    expect {
+      result = subject.print("trace")
+      expect(render(:print, result)).to eq("true\n")
+    }.to_not output.to_stderr
   end
 
   it "defaults to all when no arguments are given" do
@@ -124,16 +136,20 @@ trace = true
       Puppet::FileSystem.stubs(:touch)
     end
 
-    it "prints the section and environment when no section is given" do
+    it "prints the section and environment when no section is given and verbose is set" do
+      Puppet[:log_level] = 'info'
       Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
-      subject.expects(:report_section_and_environment).once
-      subject.set('foo', 'bar')
+      expect {
+        subject.set('foo', 'bar')
+      }.to output("\e[1;33mResolving settings from section 'main' in environment 'production'\e[0m\n").to_stderr
     end
 
-    it "prints the section and environment when a section is given" do
+    it "prints the section and environment when a section is given and verbose is set" do
+      Puppet[:log_level] = 'info'
       Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
-      subject.expects(:report_section_and_environment).once
-      subject.set('foo', 'bar', {:section => "baz"})
+      expect {
+        subject.set('foo', 'bar', {:section => "baz"})
+      }.to output("\e[1;33mResolving settings from section 'baz' in environment 'production'\e[0m\n").to_stderr
     end
 
     it "writes to the correct puppet config file" do

data/spec/unit/functions/empty_spec.rb

@@ -67,11 +67,11 @@ describe 'the empty function' do
   end
 
   context 'for undef it' do
-    it 'returns true and issues deprecation warning' do
+    it 'returns true without deprecation warning' do
       Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
         expect(compile_to_catalog("notify { String(empty(undef)): }")).to have_resource('Notify[true]')
       end
-      expect(warnings).to include(/Calling function empty\(\) with Undef value is deprecated/)
+      expect(warnings).to_not include(/Calling function empty\(\) with Undef value is deprecated/)
     end
   end
 end

data/spec/unit/functions/epp_spec.rb

@@ -117,6 +117,9 @@ describe "the epp function" do
     end
   end
 
+  it "preserves CRLF when reading the template" do
+    expect(eval_template("some text that\r\nis static with CRLF")).to eq("some text that\r\nis static with CRLF")
+  end
 
   # although never a problem with epp
   it "is not interfered with by having a variable named 'string' (#14093)" do
@@ -148,7 +151,7 @@ describe "the epp function" do
   def eval_template_with_args(content, args_hash)
     file_path = tmpdir('epp_spec_content')
     filename = File.join(file_path, "template.epp")
-    File.open(filename, "w+") { |f| f.write(content) }
+    File.open(filename, "wb+") { |f| f.write(content) }
 
     Puppet::Parser::Files.stubs(:find_template).returns(filename)
     epp_function.call(scope, 'template', args_hash)
@@ -157,7 +160,7 @@ describe "the epp function" do
   def eval_template(content)
     file_path = tmpdir('epp_spec_content')
     filename = File.join(file_path, "template.epp")
-    File.open(filename, "w+") { |f| f.write(content) }
+    File.open(filename, "wb+") { |f| f.write(content) }
 
     Puppet::Parser::Files.stubs(:find_template).returns(filename)
     epp_function.call(scope, 'template')

data/spec/unit/indirector/rest_spec.rb

@@ -723,6 +723,49 @@ describe Puppet::Indirector::REST do
     end
   end
 
+  describe '#handle_response' do
+    # There are multiple request types to choose from, this may not be the one I want for this situation
+    let(:response) { mock_response(200, 'body') }
+    let(:connection) { stub('mock http connection', :put => response, :verify_callback= => nil) }
+    let(:instance) { model.new('the thing', 'some contents') }
+    let(:request) { save_request(instance.name, instance) }
+
+    before :each do
+      terminus.stubs(:network).returns(connection)
+    end
+
+    it 'adds server_agent_version to the context if not already set' do
+      Puppet.expects(:push_context).with(:server_agent_version => Puppet.version)
+      terminus.handle_response(request, response)
+    end
+
+    it 'does not add server_agent_version to the context if it is already set' do
+      Puppet.override(:server_agent_version => "5.3.4") do
+        Puppet.expects(:push_context).never
+        terminus.handle_response(request, response)
+      end
+    end
+
+    it 'downgrades to pson and emits a warning' do
+      response.stubs(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).returns('4.2.8')
+      Puppet[:preferred_serialization_format] = 'other'
+
+      Puppet.expects(:warning).with('Downgrading to PSON for future requests')
+
+      terminus.handle_response(request, response)
+
+      expect(Puppet[:preferred_serialization_format]).to eq('pson')
+    end
+
+    it 'preserves the set serialization format' do
+      Puppet[:preferred_serialization_format] = 'other'
+
+      expect(Puppet[:preferred_serialization_format]).to eq('other')
+
+      terminus.handle_response(request, response)
+    end
+  end
+
   context 'dealing with SRV settings' do
     [
       :destroy,