puppet 5.2.0 → 5.3.1

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.0.1-294-g802509d\n"
+"Project-Id-Version: Puppet automation framework 5.3.0-6-gf66f9d9\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-08-23 21:04+0000\n"
-"PO-Revision-Date: 2017-08-23 21:04+0000\n"
+"POT-Creation-Date: 2017-09-26 17:02+0000\n"
+"PO-Revision-Date: 2017-09-26 17:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -205,15 +205,15 @@ msgstr ""
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:197
+#: ../lib/puppet/application/device.rb:204
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:199
+#: ../lib/puppet/application/device.rb:206
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:209
+#: ../lib/puppet/application/device.rb:216
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
@@ -3216,20 +3216,38 @@ msgstr ""
 msgid "Unknown content encoding - %{encoding}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:54
+#: ../lib/puppet/network/http/connection.rb:55
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:200
+#: ../lib/puppet/network/http/connection.rb:203
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:227
-msgid "one of %{certnames}"
+#. TRANSLATORS: Used in the phrase:
+#. "Received a response from the remote server."
+#: ../lib/puppet/network/http/connection.rb:234
+msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:228
-msgid "Server hostname '%{host}' did not match server certificate; expected %{msg}"
+#: ../lib/puppet/network/http/connection.rb:238
+msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
+msgstr ""
+
+#: ../lib/puppet/network/http/connection.rb:249
+msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
+msgstr ""
+
+#: ../lib/puppet/network/http/connection.rb:320
+msgid "expected one of %{certnames}"
+msgstr ""
+
+#: ../lib/puppet/network/http/connection.rb:322
+msgid "expected %{certname}"
+msgstr ""
+
+#: ../lib/puppet/network/http/connection.rb:325
+msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
 msgstr ""
 
 #: ../lib/puppet/network/http/error.rb:23
@@ -3511,10 +3529,6 @@ msgstr ""
 msgid "Invalid node mapping in %{app}: Key %{k} is not a Node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:322
-msgid "Node"
-msgstr ""
-
 #: ../lib/puppet/parser/compiler.rb:325
 msgid "Invalid node mapping in %{app}: Value %{res} is not a resource"
 msgstr ""
@@ -4669,10 +4683,6 @@ msgstr ""
 msgid "The code loaded from %{source_ref} does not create the resource type '%{type_name}' - it is empty"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb:44
-msgid "new"
-msgstr ""
-
 #: ../lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb:49
 msgid "The code loaded from %{source_ref} does not create the resource type '%{type_name}' - no call to %{rname}.new found."
 msgstr ""
@@ -4759,10 +4769,6 @@ msgstr ""
 msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:588
-msgid "data"
-msgstr ""
-
 #: ../lib/puppet/pops/lookup/invocation.rb:84
 msgid "Recursive lookup detected in [%{name_stack}]"
 msgstr ""
@@ -4987,6 +4993,10 @@ msgstr ""
 msgid "The type '%{type}' does not represent a valid set of parameters for %{subject}.new()"
 msgstr ""
 
+#: ../lib/puppet/pops/types/p_object_type.rb:604
+msgid "reference to unresolved type '%{name}'"
+msgstr ""
+
 #: ../lib/puppet/pops/types/tree_iterators.rb:38
 msgid "Only Array, Hash, and Object types can be used as container types. Got %{type}"
 msgstr ""
@@ -5923,6 +5933,10 @@ msgstr ""
 msgid "Invalid value '%{value}' for boolean parameter: %{name}"
 msgstr ""
 
+#: ../lib/puppet/settings/certificate_revocation_setting.rb:18
+msgid "Invalid certificate revocation value %{value}: must be one of 'true', 'chain', 'leaf', or 'false'"
+msgstr ""
+
 #: ../lib/puppet/settings/config_file.rb:38
 msgid "Could not match line %{text}"
 msgstr ""
@@ -6197,10 +6211,6 @@ msgstr ""
 msgid "Creating a new certificate revocation list"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_revocation_list.rb:42
-msgid "crl"
-msgstr ""
-
 #: ../lib/puppet/ssl/certificate_revocation_list.rb:49
 msgid "Revoked certificate with serial %{serial}"
 msgstr ""
@@ -6245,22 +6255,26 @@ msgid ""
 "  2. puppet agent -t\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:347 ../lib/puppet/ssl/host.rb:368
+#: ../lib/puppet/ssl/host.rb:333 ../lib/puppet/ssl/host.rb:354
 msgid "Could not request certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:349
+#: ../lib/puppet/ssl/host.rb:335
 msgid "Exiting; failed to retrieve certificate and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:358
+#: ../lib/puppet/ssl/host.rb:344
 msgid "Exiting; no certificate found and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:366
+#: ../lib/puppet/ssl/host.rb:352
 msgid "Did not receive certificate"
 msgstr ""
 
+#: ../lib/puppet/ssl/host.rb:393
+msgid "Certificate revocation checking is enabled but a CRL cannot be found; CRL checking will not be performed."
+msgstr ""
+
 #: ../lib/puppet/ssl/inventory.rb:32
 msgid "Rebuilding inventory file"
 msgstr ""

data/spec/unit/functions/epp_spec.rb

@@ -18,8 +18,13 @@ describe "the epp function" do
     end
 
     it "gets error accessing a variable that is malformed" do
-      expect { eval_template("<%= $kryptonite::USER %>")}.to raise_error(
-        /Illegal variable name, The given name 'kryptonite::USER' does not conform to the naming rule/)
+      expect { eval_template("<%= $kryptonite::bbbbbbbbbbbb::cccccccc::ddd::USER %>")}.to raise_error(
+        /Illegal variable name, The given name 'kryptonite::bbbbbbbbbbbb::cccccccc::ddd::USER' does not conform to the naming rule/)
+    end
+
+    it "gets error accessing a variable that is malformed as reported in PUP-7848" do
+      expect { eval_template("USER='<%= $hg_oais::archivematica::requirements::automation_tools::USER %>'")}.to raise_error(
+        /Illegal variable name, The given name 'hg_oais::archivematica::requirements::automation_tools::USER' does not conform to the naming rule/)
     end
 
     it "get nil accessing a variable that is undef" do

data/spec/unit/functions4_spec.rb

@@ -440,6 +440,7 @@ describe 'the 4x function api' do
       let(:parser) {  Puppet::Pops::Parser::EvaluatingParser.new }
       let(:node) { 'node.example.com' }
       let(:scope) { s = create_test_scope_for_node(node); s }
+      let(:loader) { Puppet::Pops::Loaders.find_loader(nil) }
 
       it 'function with required block can be called' do
         # construct ruby function to call
@@ -455,9 +456,9 @@ describe 'the 4x function api' do
           end
         end
         # add the function to the loader (as if it had been loaded from somewhere)
-        the_loader = loader()
+        the_loader = loader
         f = fc.new({}, the_loader)
-        loader.add_function('testing::test', f)
+        loader.set_entry(Puppet::Pops::Loader::TypedName.new(:function, 'testing::test'), f)
         # evaluate a puppet call
         source = "testing::test(10) |$x| { $x+1 }"
         program = parser.parse_string(source, __FILE__)

data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb

@@ -23,4 +23,12 @@ describe Puppet::SSL::CertificateRevocationList::Rest do
   it "should use the :ca SRV service" do
     expect(Puppet::SSL::CertificateRevocationList::Rest.srv_service).to eq(:ca)
   end
+
+  it "temporarily disables revocation checking when finding a CRL and no CRL is available" do
+    Puppet::FileSystem.expects(:exist?).with(Puppet[:hostcrl]).returns false
+    Puppet.override({:certificate_revocation => :chain}) do
+      Puppet.expects(:override).with({:certificate_revocation => false}, anything)
+      subject.find(nil)
+    end
+  end
 end

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

@@ -137,7 +137,7 @@ describe Puppet::Network::HTTP::Connection do
       expect do
         connection.get('request')
       end.to raise_error(Puppet::Error) do |error|
-        error.message =~ /Server hostname 'my_server' did not match server certificate; expected one of (.+)/
+        error.message =~ /\AServer hostname 'my_server' did not match server certificate; expected one of (.+)/
         expect($1.split(', ')).to match_array(%w[DNS:foo DNS:bar DNS:baz DNS:not_my_server not_my_server])
       end
     end
@@ -261,6 +261,93 @@ describe Puppet::Network::HTTP::Connection do
     end
   end
 
+  context "when response indicates an overloaded server" do
+    let(:http) { stub('http') }
+    let(:site) { Puppet::Network::HTTP::Site.new('http', 'my_server', 8140) }
+    let(:verify) { Puppet::SSL::Validator.no_validator }
+    let(:httpunavailable) { Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable') }
+
+    subject { Puppet::Network::HTTP::Connection.new(site.host, site.port, :use_ssl => false, :verify => verify) }
+
+    context "when parsing Retry-After headers" do
+      # Private method. Create a reference that can be called by tests.
+      let(:header_parser) { subject.method(:parse_retry_after_header) }
+
+      it "returns 0 when parsing a RFC 2822 date that has passed" do
+        test_date = 'Wed, 13 Apr 2005 15:18:05 GMT'
+
+        expect(header_parser.call(test_date)).to eq(0)
+      end
+    end
+
+    it "should return a 503 response if Retry-After is not set" do
+      http.stubs(:request).returns(httpunavailable)
+
+      pool = Puppet.lookup(:http_pool)
+      pool.expects(:with_connection).with(site, anything).yields(http)
+
+      result = subject.get('/foo')
+
+      expect(result.code).to eq(503)
+    end
+
+    it "should return a 503 response if Retry-After is not convertable to an Integer or RFC 2822 Date" do
+      httpunavailable['Retry-After'] = 'foo'
+      http.stubs(:request).returns(httpunavailable)
+
+      pool = Puppet.lookup(:http_pool)
+      pool.expects(:with_connection).with(site, anything).yields(http)
+
+      result = subject.get('/foo')
+
+      expect(result.code).to eq(503)
+    end
+
+    it "should sleep and retry if Retry-After is an Integer" do
+      httpunavailable['Retry-After'] = '42'
+      http.stubs(:request).returns(httpunavailable).then.returns(httpok)
+
+      pool = Puppet.lookup(:http_pool)
+      pool.expects(:with_connection).with(site, anything).twice.yields(http)
+
+      ::Kernel.expects(:sleep).with(42)
+
+      result = subject.get('/foo')
+
+      expect(result.code).to eq(200)
+    end
+
+    it "should sleep and retry if Retry-After is an RFC 2822 Date" do
+      httpunavailable['Retry-After'] = 'Wed, 13 Apr 2005 15:18:05 GMT'
+      http.stubs(:request).returns(httpunavailable).then.returns(httpok)
+
+      now = DateTime.new(2005, 4, 13, 8, 17, 5, '-07:00')
+      DateTime.stubs(:now).returns(now)
+
+      pool = Puppet.lookup(:http_pool)
+      pool.expects(:with_connection).with(site, anything).twice.yields(http)
+
+      ::Kernel.expects(:sleep).with(60)
+
+      result = subject.get('/foo')
+
+      expect(result.code).to eq(200)
+    end
+
+    it "should sleep for no more than the Puppet runinterval" do
+      httpunavailable['Retry-After'] = '60'
+      http.stubs(:request).returns(httpunavailable).then.returns(httpok)
+      Puppet[:runinterval] = 30
+
+      pool = Puppet.lookup(:http_pool)
+      pool.expects(:with_connection).with(site, anything).twice.yields(http)
+
+      ::Kernel.expects(:sleep).with(30)
+
+      result = subject.get('/foo')
+    end
+  end
+
   it "allows setting basic auth on get requests" do
     expect_request_with_basic_auth
 

data/spec/unit/pops/parser/lexer2_spec.rb

@@ -448,6 +448,36 @@ describe 'Lexer2' do
         )
     end
 
+    it 'strips only last newline when using trim option' do
+      code = <<-CODE.unindent
+        @(END)
+        Line 1
+        
+        Line 2
+        -END
+        CODE
+      expect(tokens_scanned_from(code)).to match_tokens2(
+        [:HEREDOC, ''],
+        [:SUBLOCATE, ["Line 1\n", "\n", "Line 2\n"]],
+        [:STRING, "Line 1\n\nLine 2"],
+      )
+    end
+
+    it 'strips only one newline at the end when using trim option' do
+      code = <<-CODE.unindent
+        @(END)
+        Line 1
+        Line 2
+        
+        -END
+      CODE
+      expect(tokens_scanned_from(code)).to match_tokens2(
+        [:HEREDOC, ''],
+        [:SUBLOCATE, ["Line 1\n", "Line 2\n", "\n"]],
+        [:STRING, "Line 1\nLine 2\n"],
+      )
+    end
+
     context 'with bad syntax' do
       def expect_issue(code, issue)
         expect { tokens_scanned_from(code) }.to raise_error(Puppet::ParseErrorWithIssue) { |e|

data/spec/unit/pops/parser/parse_basic_expressions_spec.rb

@@ -207,6 +207,36 @@ describe "egrammar parsing basic expressions" do
     end
   end
 
+  context 'When parsing type aliases' do
+    it 'type A = B' do
+      expect(dump(parse('type A = B'))).to eq('(type-alias A b)')
+    end
+
+    it 'type A = B[]' do
+      expect{parse('type A = B[]')}.to raise_error(/Syntax error at '\]'/)
+    end
+
+    it 'type A = B[,]' do
+      expect{parse('type A = B[,]')}.to raise_error(/Syntax error at ','/)
+    end
+
+    it 'type A = B[C]' do
+      expect(dump(parse('type A = B[C]'))).to eq('(type-alias A (slice b c))')
+    end
+
+    it 'type A = B[C,]' do
+      expect(dump(parse('type A = B[C,]'))).to eq('(type-alias A (slice b c))')
+    end
+
+    it 'type A = B[C,D]' do
+      expect(dump(parse('type A = B[C,D]'))).to eq('(type-alias A (slice b (c d)))')
+    end
+
+    it 'type A = B[C,D,]' do
+      expect(dump(parse('type A = B[C,D,]'))).to eq('(type-alias A (slice b (c d)))')
+    end
+  end
+
   context "When parsing assignments" do
     it "Should allow simple assignment" do
       expect(dump(parse("$a = 10"))).to eq("(= $a 10)")

data/spec/unit/pops/types/p_object_type_spec.rb

@@ -920,6 +920,14 @@ describe 'The Object Type' do
         /attribute MySecondObject\[a\] attempts to override final attribute MyObject\[a\]/)
     end
 
+    it 'a type cannot be created using an unresolved parent' do
+      code = <<-CODE
+      notice(Object[{ name => 'MyObject', parent => Type('NoneSuch'), attributes => { a => String}}].new('hello'))
+      CODE
+      expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error,
+        /reference to unresolved type 'NoneSuch'/)
+    end
+
     context 'type alias using bracket-less (implicit Object) form' do
       let(:logs) { [] }
       let(:notices) { logs.select { |log| log.level == :notice }.map { |log| log.message } }
@@ -970,7 +978,7 @@ describe 'The Object Type' do
         Puppet[:strict] = 'warning'
         compile(<<-CODE)
           type MyObject = { name => 'MyFirstObject', attributes => { a => String }}
-          type MySecondObject = { parent => MyOtherType, attributes => { b => String }}
+          type MySecondObject = { parent => MyObject, attributes => { b => String }}
           notice(MySecondObject =~ Type)
         CODE
         expect(warnings).to be_empty
@@ -981,7 +989,7 @@ describe 'The Object Type' do
         Puppet[:strict] = 'warning'
         compile(<<-CODE)
           type MyObject = { name => 'MyFirstObject', attributes => { a => String }}
-          type MySecondObject = Object { parent => MyOtherType, attributes => { b => String }}
+          type MySecondObject = Object { parent => MyObject, attributes => { b => String }}
           notice(MySecondObject =~ Type)
         CODE
         expect(warnings).to be_empty

data/spec/unit/pops/types/type_calculator_spec.rb

@@ -523,6 +523,19 @@ describe 'The type calculator' do
         end
       end
     end
+
+    it 'infers an instance of an anonymous class to Runtime[ruby]' do
+      cls = Class.new do
+        attr_reader :name
+        def initialize(name)
+          @name = name
+        end
+      end
+      t = calculator.infer(cls.new('test'))
+      expect(t.class).to eql(PRuntimeType)
+      expect(t.runtime).to eql(:ruby)
+      expect(t.name_or_pattern).to eql(nil)
+    end
   end
 
   context 'patterns' do