puppet 6.0.5 → 6.0.7

data/spec/integration/type/file_spec.rb

@@ -1525,15 +1525,6 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
               catalog.apply
             end
 
-            it "should not allow the user to explicitly set the mode to 4 ,and correct to 7" do
-              system_aces = get_aces_for_path_by_sid(path, @sids[:system])
-              expect(system_aces).not_to be_empty
-
-              system_aces.each do |ace|
-                expect(ace.mask).to eq(Puppet::Util::Windows::File::FILE_ALL_ACCESS)
-              end
-            end
-
             it "prepends SYSTEM ace when changing group from system to power users" do
               @file[:group] = @sids[:power_users]
               catalog.apply
@@ -1612,16 +1603,6 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
                 catalog.apply
               end
 
-              it "should not allow the user to explicitly set the mode to 4, and correct to 7" do
-                system_aces = get_aces_for_path_by_sid(dir, @sids[:system])
-                expect(system_aces).not_to be_empty
-
-                system_aces.each do |ace|
-                  # unlike files, Puppet sets execute bit on directories that are readable
-                  expect(ace.mask).to eq(Puppet::Util::Windows::File::FILE_ALL_ACCESS)
-                end
-              end
-
               it "prepends SYSTEM ace when changing group from system to power users" do
                 @directory[:group] = @sids[:power_users]
                 catalog.apply

data/spec/unit/application_spec.rb

@@ -664,10 +664,17 @@ describe Puppet::Application do
     it "should log an exception that is raised" do
       our_exception = Puppet::DevError.new("test exception")
       Puppet::Util::Log.expects(:newdestination).with(test_arg).raises(our_exception)
-      Puppet.expects(:log_exception).with(our_exception)
+      Puppet.expects(:log_and_raise).with(our_exception, anything)
       @app.handle_logdest_arg(test_arg)
     end
 
+    it "should exit when an exception is raised" do
+      our_exception = Puppet::DevError.new("test exception")
+      Puppet::Util::Log.expects(:newdestination).with(test_arg).raises(our_exception)
+      Puppet.expects(:log_and_raise).with(our_exception, anything).raises(our_exception)
+      expect { @app.handle_logdest_arg(test_arg) }.to raise_error(Puppet::DevError)
+    end
+
     it "should set the new log destination" do
       Puppet::Util::Log.expects(:newdestination).with(test_arg)
       @app.handle_logdest_arg(test_arg)

data/spec/unit/configurer_spec.rb

@@ -1034,26 +1034,25 @@ describe Puppet::Configurer do
       Puppet.settings[:server_list] = ["myserver:123"]
       response = Net::HTTPInternalServerError.new(nil, 500, 'Internal Server Error')
       Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(mock('request', get: response))
-      @agent.stubs(:run_internal)
 
       Puppet.expects(:debug).with("Puppet server myserver:123 is unavailable: 500 Internal Server Error")
-      @agent.run
+      expect{ @agent.run }.to raise_error(Puppet::Error, /Could not select a functional puppet master from server_list/)
     end
 
-    it "should fallback to an empty server when failover fails" do
+    it "should error when no servers in 'server_list' are reachable" do
       Puppet.settings[:server_list] = ["myserver:123"]
       error = Net::HTTPError.new(400, 'dummy server communication error')
-      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(error)
-      @agent.stubs(:run_internal)
+      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(mock('request', get: error))
 
       options = {}
-      @agent.run(options)
+      expect{ @agent.run(options) }.to raise_error(Puppet::Error, /Could not select a functional puppet master from server_list/)
       expect(options[:report].master_used).to be_nil
     end
 
     it "should not make multiple node requets when the server is found" do
       Puppet.settings[:server_list] = ["myserver:123"]
-      Puppet::Network::HttpPool.expects(:http_ssl_instance).once
+      response = Net::HTTPOK.new(nil, 200, 'OK')
+      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(mock('request', get: response))
       @agent.stubs(:run_internal)
 
       @agent.run

data/spec/unit/confine/false_spec.rb

@@ -12,6 +12,33 @@ describe Puppet::Confine::False do
     expect { Puppet::Confine.new }.to raise_error(ArgumentError)
   end
 
+  describe "when passing in a lambda as a value for lazy evaluation" do
+    it "should accept it" do
+      confine = Puppet::Confine::False.new(lambda { false })
+      expect(confine.values).to eql([false])
+    end
+
+    describe "when enforcing cache-positive behavior" do
+      def cached_value_of(confine)
+        confine.instance_variable_get(:@cached_value)
+      end
+
+      it "should cache a false value" do
+        confine = Puppet::Confine::False.new(lambda { false })
+        confine.values
+
+        expect(cached_value_of(confine)).to eql([false])
+      end
+
+      it "should not cache a true value" do
+        confine = Puppet::Confine::False.new(lambda { true })
+        confine.values
+
+        expect(cached_value_of(confine)).to be_nil
+      end
+    end
+  end
+
   describe "when testing values" do
     before { @confine = Puppet::Confine::False.new("foo") }
 

data/spec/unit/confine/true_spec.rb

@@ -12,6 +12,33 @@ describe Puppet::Confine::True do
     expect { Puppet::Confine::True.new }.to raise_error(ArgumentError)
   end
 
+  describe "when passing in a lambda as a value for lazy evaluation" do
+    it "should accept it" do
+      confine = Puppet::Confine::True.new(lambda { true })
+      expect(confine.values).to eql([true])
+    end
+
+    describe "when enforcing cache-positive behavior" do
+      def cached_value_of(confine)
+        confine.instance_variable_get(:@cached_value)
+      end
+
+      it "should cache a true value" do
+        confine = Puppet::Confine::True.new(lambda { true })
+        confine.values
+
+        expect(cached_value_of(confine)).to eql([true])
+      end
+
+      it "should not cache a false value" do
+        confine = Puppet::Confine::True.new(lambda { false })
+        confine.values
+
+        expect(cached_value_of(confine)).to be_nil
+      end
+    end
+  end
+
   describe "when testing values" do
     before do
       @confine = Puppet::Confine::True.new("foo")

data/spec/unit/defaults_spec.rb

@@ -110,20 +110,6 @@ describe "Defaults" do
     end
   end
 
-  describe 'server vs server_list' do
-    it 'should warn when both settings are set in code' do
-      Puppet.expects(:deprecation_warning).with('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
-      Puppet.settings[:server] = 'test_server'
-      Puppet.settings[:server_list] = ['one', 'two']
-    end
-
-    it 'should warn when both settings are set by command line' do
-      Puppet.expects(:deprecation_warning).with('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
-      Puppet.settings.handlearg("--server_list", "one,two")
-      Puppet.settings.handlearg("--server", "test_server")
-    end
-  end
-
   describe 'manage_internal_file_permissions' do
     describe 'on windows', :if => Puppet::Util::Platform.windows? do
       it 'should default to false' do

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

@@ -86,7 +86,7 @@ describe Puppet::Network::HTTP::Connection do
 
       expect do
         connection.get('request')
-      end.to raise_error(Puppet::Error, "certificate verify failed: [shady looking signature]")
+      end.to raise_error(Puppet::Error, /certificate verify failed: \[shady looking signature\]/)
     end
 
     it "should provide a helpful error message when hostname was not match with server certificate", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do

data/spec/unit/pops/loaders/loaders_spec.rb

@@ -421,9 +421,14 @@ describe 'loaders' do
       expect(function.call(scope, 'passed in scope')).to eql("usee::callee_ws() got 'passed in scope'")
     end
 
+    it 'calls can be made to a non core function via the call() function' do
+      call_function = loader.load_typed(typed_name(:function, 'call')).value
+      expect(call_function.call(scope, 'user::puppetcaller4')).to eql("usee::callee() got 'first' - usee::callee() got 'second'")
+    end
+
   end
 
-  context 'when causing a 3x load followed by a 4x load' do
+  context 'when a 3x load takes place' do
     let(:env) { environment_for(mix_4x_and_3x_functions) }
     let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
     let(:scope) { compiler.topscope }
@@ -436,11 +441,73 @@ describe 'loaders' do
       Puppet.pop_context
     end
 
-    it "a 3x function with code outside body is reported as an error" do
-      expect { loader.load_typed(typed_name(:function, 'bad_func_load')) }.to raise_error(/Illegal legacy function definition/)
+    it "a function with no illegal constructs can be loaded" do
+      function = loader.load_typed(typed_name(:function, 'good_func_load')).value
+      expect(function.call(scope)).to eql(Float("3.14"))
     end
   end
 
+  context 'when a 3x load has illegal method added' do
+    let(:env) { environment_for(mix_4x_and_3x_functions) }
+    let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
+    let(:scope) { compiler.topscope }
+    let(:loader) { compiler.loaders.private_loader_for_module('user') }
+
+    before(:each) do
+      Puppet.push_context(:current_environment => scope.environment, :global_scope => scope, :loaders => compiler.loaders)
+    end
+    after(:each) do
+      Puppet.pop_context
+    end
+
+    it "outside function body is reported as an error" do
+      expect { loader.load_typed(typed_name(:function, 'bad_func_load')) }.to raise_error(/Illegal method definition/)
+    end
+
+    it "to self outside function body is reported as an error" do
+      expect { loader.load_typed(typed_name(:function, 'bad_func_load5')) }.to raise_error(/Illegal method definition.*'bad_func_load5_illegal_method'/)
+    end
+
+    it "outside body is reported as an error even if returning the right func_info" do
+      expect { loader.load_typed(typed_name(:function, 'bad_func_load2'))}.to raise_error(/Illegal method definition/)
+    end
+
+    it "inside function body is reported as an error" do
+      expect {
+        f = loader.load_typed(typed_name(:function, 'bad_func_load3')).value
+        f.call(scope)
+      }.to raise_error(/Illegal method definition.*'bad_func_load3_illegal_method'/)
+    end
+
+    it "to self inside function body is reported as an error" do
+      expect { 
+        f = loader.load_typed(typed_name(:function, 'bad_func_load4')).value
+        f.call(scope)
+      }.to raise_error(/Illegal method definition.*'bad_func_load4_illegal_method'/)
+    end
+  end
+
+context 'when a 3x load has illegal construct and --func3x_check is false' do
+  let(:env) { environment_for(mix_4x_and_3x_functions) }
+  let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
+  let(:scope) { compiler.topscope }
+  let(:loader) { compiler.loaders.private_loader_for_module('user') }
+
+  before(:each) do
+    Puppet.push_context(:current_environment => scope.environment, :global_scope => scope, :loaders => compiler.loaders)
+    Puppet[:func3x_check] = false
+  end
+  after(:each) do
+    Puppet.pop_context
+    Puppet[:func3x_check] = true
+  end
+
+  it "an illegal function is loaded" do
+      f = loader.load_typed(typed_name(:function, 'bad_func_load3')).value
+      expect(f.call(scope)).to eql("some return value")
+  end
+end
+
   context 'when causing a 3x load followed by a 4x load' do
     let(:env) { environment_for(mix_4x_and_3x_functions) }
     let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }

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

@@ -41,4 +41,49 @@ describe Puppet::Pops::Parser::Locator do
     expect(model.body.locator.line_for_offset(2)).to eq(:third_value)
   end
 
+  it 'A heredoc without margin and interpolated expression location has offset and length relative the source' do
+    parser = Puppet::Pops::Parser::Parser.new()
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+        Line four\\
+        Line five ${1 +
+        1}
+    END
+    CODE
+
+    model = parser.parse_string(src).model
+    interpolated_expr = model.body.text_expr.segments[1].expr
+    expect(interpolated_expr.left_expr.offset).to eq(84)
+    expect(interpolated_expr.left_expr.length).to eq(1)
+    expect(interpolated_expr.right_expr.offset).to eq(96)
+    expect(interpolated_expr.right_expr.length).to eq(1)
+    expect(interpolated_expr.offset).to eq(86) # the + sign
+    expect(interpolated_expr.length).to eq(1) # the + sign
+    expect(interpolated_expr.locator.extract_tree_text(interpolated_expr)).to eq("1 +\n        1")
+  end
+
+  it 'A heredoc with margin and interpolated expression location has offset and length relative the source' do
+    parser = Puppet::Pops::Parser::Parser.new()
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+        Line four\\
+        Line five ${1 +
+        1}
+    |- END
+    CODE
+
+    model = parser.parse_string(src).model
+    interpolated_expr = model.body.text_expr.segments[1].expr
+    expect(interpolated_expr.left_expr.offset).to eq(84)
+    expect(interpolated_expr.left_expr.length).to eq(1)
+    expect(interpolated_expr.right_expr.offset).to eq(96)
+    expect(interpolated_expr.right_expr.length).to eq(1)
+    expect(interpolated_expr.offset).to eq(86) # the + sign
+    expect(interpolated_expr.length).to eq(1) # the + sign
+    expect(interpolated_expr.locator.extract_tree_text(interpolated_expr)).to eq("1 +\n        1")
+  end
 end

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

@@ -10,7 +10,7 @@ describe "egrammar parsing heredoc" do
   it "parses plain heredoc" do
     expect(dump(parse("@(END)\nThis is\nheredoc text\nEND\n"))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text\n')",
+      "  'This is\nheredoc text\n'",
       ")"
     ].join("\n"))
   end
@@ -25,7 +25,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text\n')",
+      "  'This is\nheredoc text\n'",
       ")"
     ].join("\n"))
   end
@@ -40,7 +40,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text')",
+      "  'This is\nheredoc text'",
       ")"
     ].join("\n"))
   end
@@ -53,7 +53,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@(syntax)",
-      "  (sublocated 'Tex\tt\\n')",
+      "  'Tex\tt\\n'",
       ")"
     ].join("\n"))
   end
@@ -66,7 +66,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello ' (str $name)))",
+      "  (cat 'Hello ' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -79,7 +79,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name)))",
+      "  (cat 'Hello \\' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -92,7 +92,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name)))",
+      "  (cat 'Hello \\' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -107,7 +107,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'First Line Second Line')",
+      "  'First Line Second Line'",
       ")"
     ].join("\n"))
   end
@@ -122,7 +122,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated ' First Line  Second Line')",
+      "  ' First Line  Second Line'",
       ")"
     ].join("\n"))
   end
@@ -135,12 +135,12 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello ' (str $name) '$%a'))",
+      "  (cat 'Hello ' (str $name) '$%a')",
       ")"
     ].join("\n"))
   end
 
-  it "parses interpolated [] expression by looking at the correct preceding char for space" do
+  it "parses interpolated [] expression by looking at the correct preceding char for space when there is no heredoc margin" do
     # NOTE: Important not to use the left margin feature here
     src = <<-CODE
 $xxxxxxx = @("END")
@@ -150,12 +150,108 @@ END
 CODE
     expect(dump(parse(src))).to eq([
       "(= $xxxxxxx (@()",
-      "  (sublocated (cat (str (slice (slice $facts 'os') 'family')) '",
+      "  (cat (str (slice (slice $facts 'os') 'family')) '",
       "XXXXXXX XXX",
-      "'))",
+      "')",
       "))"].join("\n"))
   end
 
+  it "parses interpolated [] expression by looking at the correct preceding char for space when there is a heredoc margin" do
+    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
+    # an interpolation containing []. 
+    src = <<-CODE
+# comment
+# comment
+$xxxxxxx = @("END")
+    1
+    2
+    3
+    4
+    5
+    YYYYY${facts['fqdn']}
+    XXXXXXX XXX
+    | END
+CODE
+    expect(dump(parse(src))).to eq([
+      "(= $xxxxxxx (@()",
+      "  (cat '1", "2", "3", "4", "5",
+      "YYYYY' (str (slice $facts 'fqdn')) '",
+      "XXXXXXX XXX",
+      "')",
+      "))"].join("\n"))
+  end
+
+  it "correctly reports an error location in a nested heredoc with margin" do
+    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
+    # an interpolation containing []. 
+    src = <<-CODE
+# comment
+# comment
+$xxxxxxx = @("END")
+  1
+  2
+  3
+  4
+  5
+  YYYYY${facts]}
+  XXXXXXX XXX
+  | END
+CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 9, column: 15\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped" do
+    # DO NOT CHANGE INDENTATION OF THIS HEREDOC
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+    First Line\\
+    Second Line ${facts]}
+    |- END
+    CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 5, column: 24\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
+    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+    First Line\\
+    Second Line
+  x Third Line ${facts]}
+    |- END
+    # line 8
+    # line 9
+    CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 6, column: 23\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
+    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
+    src = <<-CODE
+    @(END)
+AAA
+ BBB
+  CCC
+   DDD
+    EEE
+     FFF
+    |- END
+    CODE
+    expect(dump(parse(src))).to eq([
+      "(@()",
+      "  'AAA", # no left space trimmed
+      " BBB",
+      "  CCC",
+      "   DDD",
+      "EEE", # left space trimmed
+      " FFF'", # indented one because it is one in from margin marker
+      ")"].join("\n"))
+  end
+
   it 'parses multiple heredocs on the same line' do
     src = <<-CODE
     notice({ @(foo) => @(bar) })
@@ -168,9 +264,9 @@ CODE
     expect(dump(parse(src))).to eq([
       '(block',
       '  (invoke notice ({} ((@()',
-      '    (sublocated \'    hello\')',
+      '    \'    hello\'',
       '  ) (@()',
-      '    (sublocated \'    world\')',
+      '    \'    world\'',
       '  ))))',
       '  (invoke notice \'!\')',
       ')'