puppet 4.3.0 → 4.4.0

data/spec/integration/parser/collection_spec.rb

@@ -95,6 +95,14 @@ describe 'collectors' do
       MANIFEST
     end
 
+    it "matches with resource references" do
+      expect_the_message_to_be(["wanted"], <<-MANIFEST)
+        @notify { "foobar": }
+        @notify { "testing": require => Notify["foobar"], message => "wanted" }
+        Notify <| require == Notify["foobar"] |>
+      MANIFEST
+    end
+
     it "allows criteria to be combined with 'and'" do
       expect_the_message_to_be(["the message"], <<-MANIFEST)
         @notify { "testing": message => "the message" }

data/spec/integration/parser/dynamic_scoping_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'puppet/pops'
+require 'puppet/parser/parser_factory'
+require 'puppet_spec/compiler'
+require 'puppet_spec/pops'
+require 'puppet_spec/scope'
+require 'matchers/resource'
+require 'rgen/metamodel_builder'
+
+# These tests are in a separate file since othr compiler related tests have
+# been dramatically changed between 3.x and 4.x and it is a pain to merge
+# them.
+#
+describe "Puppet::Parser::Compiler when dealing with relative naming" do
+  include PuppetSpec::Compiler
+  include Matchers::Resource
+
+  describe "the compiler when using 4.x parser and evaluator" do
+    it "should use absolute references even if references are not anchored" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::thing {
+        notify {"from foo::thing":}
+      }
+
+      class thing {
+        notify {"from ::thing":}
+      }
+
+      class foo {
+      #  include thing
+        class {'thing':}
+      }
+
+      include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from ::thing]")
+    end
+
+    it "should use absolute references when references are absolute" do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::thing {
+        notify {"from foo::thing":}
+      }
+
+      class thing {
+        notify {"from ::thing":}
+      }
+
+      class foo {
+      #  include thing
+        class {'::thing':}
+      }
+
+      include foo
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[from ::thing]")
+    end
+  end
+end

data/spec/integration/parser/parameter_defaults_spec.rb

@@ -0,0 +1,336 @@
+require 'spec_helper'
+require 'puppet_spec/language'
+
+['Function', 'EPP'].each do |call_type|
+  describe "#{call_type} parameter default expressions" do
+    let! (:func_bodies) {
+      [
+        '{}',
+        '{ notice("\$a == ${a}") }',
+        '{ notice("\$a == ${a}") notice("\$b == ${b}") }',
+        '{ notice("\$a == ${a}") notice("\$b == ${b}")  notice("\$c == ${c}") }'
+      ]
+    }
+
+    let! (:epp_bodies) {
+      [
+        '',
+        '<% notice("\$a == ${a}") %>',
+        '<% notice("\$a == ${a}") notice("\$b == ${b}") %>',
+        '<% notice("\$a == ${a}") notice("\$b == ${b}")  notice("\$c == ${c}") %>'
+      ]
+    }
+    let! (:param_names) {  ('a'..'c').to_a }
+
+    let (:call_type) { call_type }
+
+    let (:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new('specification')) }
+
+    def collect_notices(code)
+      logs = []
+      Puppet[:code] = code
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        compiler.compile
+        yield
+      end
+      logs.select { |log| log.level == :notice }.map { |log| log.message }
+    end
+
+    # @param arg_list [String] comma separated parameter declarations. Not enclosed in parenthesis
+    # @param body [String,Integer] verbatim body or index of an entry in func_bodies
+    # @param call_params [Array[#to_s]] array of call parameters
+    # @return [Array] array of notice output entries
+    #
+    def eval_collect_notices(arg_list, body, call_params)
+      call = call_params.is_a?(String) ? call_params : "example(#{call_params.join(',')})"
+      body = func_bodies[body] if body.is_a?(Integer)
+      evaluator = Puppet::Pops::Parser::EvaluatingParser.new()
+      collect_notices("function example(#{arg_list}) #{body}") do
+        evaluator.evaluate_string(compiler.topscope, call)
+      end
+    end
+
+    # @param arg_list [String] comma separated parameter declarations. Not enclosed in parenthesis
+    # @param body [String,Integer] verbatim body or index of an entry in bodies
+    # @param call_params [Array] array of call parameters
+    # @param code [String] code to evaluate
+    # @return [Array] array of notice output entries
+    #
+    def epp_eval_collect_notices(arg_list, body, call_params, code, inline_epp)
+      body = body.is_a?(Integer) ? epp_bodies[body] : body.strip
+      source = "<%| #{arg_list} |%>#{body}"
+      named_params = call_params.reduce({}) {|h, v| h[param_names[h.size]] = v; h }
+      collect_notices(code) do
+        if inline_epp
+          Puppet::Pops::Evaluator::EppEvaluator.inline_epp(compiler.topscope, source, named_params)
+        else
+          file = Tempfile.new(['epp-script', '.epp'])
+          begin
+            file.write(source)
+            file.close
+            Puppet::Pops::Evaluator::EppEvaluator.epp(compiler.topscope, file.path, 'test', named_params)
+          ensure
+            file.unlink
+          end
+        end
+      end
+    end
+
+
+    # evaluates a function or EPP call, collects notice output in a log and compares log to expected result
+    #
+    # @param decl [Array[]] two element array with argument list declaration and body. Body can a verbatim string
+    #   or an integer index of an entry in bodies
+    # @param call_params [Array[#to_s]] array of call parameters
+    # @param code [String] code to evaluate. Only applicable when call_type == 'EPP'
+    # @param inline_epp [Boolean] true for inline_epp, false for file based epp, Only applicable when call_type == 'EPP'
+    # @return [Array] array of notice output entries
+    #
+    def expect_log(decl, call_params, result, code = 'undef', inline_epp = true)
+      if call_type == 'Function'
+        expect(eval_collect_notices(decl[0], decl[1], call_params)).to include(*result)
+      else
+        expect(epp_eval_collect_notices(decl[0], decl[1], call_params, code, inline_epp)).to include(*result)
+      end
+    end
+
+    # evaluates a function or EPP call and expects a failure
+    #
+    # @param decl [Array[]] two element array with argument list declaration and body. Body can a verbatim string
+    #   or an integer index of an entry in bodies
+    # @param call_params [Array[#to_s]] array of call parameters
+    # @param text [String,Regexp] expected error message
+    def expect_fail(decl, call, text, inline_epp = true)
+      if call_type == 'Function'
+        expect{eval_collect_notices(decl[0], decl[1], call) }.to raise_error(StandardError, text)
+      else
+        expect{epp_eval_collect_notices(decl[0], decl[1], call, 'undef', inline_epp) }.to raise_error(StandardError, text)
+      end
+    end
+
+    context 'that references a parameter to the left that has no default' do
+      let!(:params) { [ <<-SOURCE, 2 ]
+      $a,
+      $b = $a
+      SOURCE
+      }
+
+      it 'fails when no value is provided for required first parameter', :if => call_type == 'Function' do
+        expect_fail(params, [], /expects between 1 and 2 arguments, got none/)
+      end
+
+      it 'fails when no value is provided for required first parameter', :if => call_type == 'EPP' do
+        expect_fail(params, [], /default expression for \$b tries to illegally access not yet evaluated \$a/)
+      end
+
+      it "will use the referenced parameter's given value" do
+        expect_log(params, [2], ['$a == 2', '$b == 2'])
+      end
+
+      it 'will not be evaluated when a value is given' do
+        expect_log(params, [2, 5], ['$a == 2', '$b == 5'])
+      end
+    end
+
+    context 'that references a parameter to the left that has a default' do
+      let!(:params) { [ <<-SOURCE, 2 ]
+      $a = 10,
+      $b = $a
+      SOURCE
+      }
+
+      it "will use the referenced parameter's default value when no value is given for the referenced parameter" do
+        expect_log(params, [], ['$a == 10', '$b == 10'])
+      end
+
+      it "will use the referenced parameter's given value" do
+        expect_log(params, [2], ['$a == 2', '$b == 2'])
+      end
+
+      it 'will not be evaluated when a value is given' do
+        expect_log(params, [2, 5], ['$a == 2', '$b == 5'])
+      end
+    end
+
+    context 'that references a variable to the right' do
+      let!(:params) { [ <<-SOURCE, 3 ]
+      $a = 10,
+      $b = $c,
+      $c = 20
+      SOURCE
+      }
+
+      it 'fails when the reference is evaluated' do
+        expect_fail(params, [1], /default expression for \$b tries to illegally access not yet evaluated \$c/)
+      end
+
+      it 'does not fail when a value is given for the culprit parameter' do
+        expect_log(params, [1,2], ['$a == 1', '$b == 2', '$c == 20'])
+      end
+
+      it 'does not fail when all values are given' do
+        expect_log(params, [1,2,3], ['$a == 1', '$b == 2', '$c == 3'])
+      end
+    end
+
+    context 'with regular expressions' do
+      it "evaluates unset match scope parameter's to undef" do
+        expect_log([<<-SOURCE, 2], [], ['$a == ', '$b == '])
+        $a = $0,
+        $b = $1
+        SOURCE
+      end
+
+      it 'does not leak match variables from one expression to the next' do
+        expect_log([<<-SOURCE, 2], [], ['$a == [true, h, ello]', '$b == '])
+        $a = ['hello' =~ /(h)(.*)/, $1, $2],
+        $b = $1
+        SOURCE
+      end
+
+      it 'can evaluate expressions in separate match scopes' do
+        expect_log([<<-SOURCE, 3], [], ['$a == [true, h, ell, o]', '$b == [true, h, i, ]', '$c == '])
+        $a = ['hello' =~ /(h)(.*)(o)/, $1, $2, $3],
+        $b = ['hi' =~ /(h)(.*)/, $1, $2, $3],
+        $c = $1
+        SOURCE
+      end
+
+      it 'can have nested match expressions' do
+        expect_log([<<-SOURCE, 2], [], ['$a == [true, h, oo, h, i]', '$b == '] )
+        $a = ['hi' =~ /(h)(.*)/, $1, if'foo' =~ /f(oo)/ { $1 }, $1, $2],
+        $b = $0
+        SOURCE
+      end
+
+      it 'can not see match scope from calling scope', :if => call_type == 'Function' do
+        expect_log([<<-SOURCE, <<-BODY], <<-CALL, ['$a == '])
+        $a = $0
+        SOURCE
+        {
+          notice("\\$a == ${a}")
+        }
+        function caller() {
+          example()
+        }
+        BODY
+        $tmp = 'foo' =~ /(f)(o)(o)/
+        caller()
+        CALL
+      end
+
+      context 'matches in calling scope', :if => call_type == 'EPP' do
+        it 'are available when using inlined epp' do
+          # Note that CODE is evaluated before the EPP is evaluated
+          #
+          expect_log([<<-SOURCE, <<-BODY], [], ['$ax == true', '$bx == foo'], <<-CODE, true)
+          $a = $tmp,
+          $b = $0
+          SOURCE
+          <% called_from_template($a, $b) %>
+          BODY
+          function called_from_template($ax, $bx) {
+            notice("\\$ax == $ax")
+            notice("\\$bx == $bx")
+          }
+          $tmp = 'foo' =~ /(f)(o)(o)/
+          CODE
+        end
+
+        it 'are not available when using epp file' do
+          # Note that CODE is evaluated before the EPP is evaluated
+          #
+          expect_log([<<-SOURCE, <<-BODY], [], ['$ax == true', '$bx == '], <<-CODE, false)
+          $a = $tmp,
+          $b = $0
+            SOURCE
+          <% called_from_template($a, $b) %>
+            BODY
+          function called_from_template($ax, $bx) {
+            notice("\\$ax == $ax")
+            notice("\\$bx == $bx")
+          }
+          $tmp = 'foo' =~ /(f)(o)(o)/
+          CODE
+        end
+      end
+
+
+      it 'will allow nested lambdas to access enclosing match scope' do
+        expect_log([<<-SOURCE, 1], [], ['$a == [1-ello, 2-ello, 3-ello]'])
+        $a = case "hello" {
+          /(h)(.*)/ : {
+            [1,2,3].map |$x| { "$x-$2" }
+          }
+        }
+        SOURCE
+      end
+
+      it "will not make match scope available to #{call_type} body" do
+        expect_log([<<-SOURCE, call_type == 'Function' ? <<-BODY : <<-EPP_BODY], [], ['Yes'])
+        $a = "hello" =~ /.*/
+        SOURCE
+        {
+          notice("Y${0}es")
+        }
+        BODY
+        <%
+          notice("Y${0}es")
+        %>
+        EPP_BODY
+      end
+
+      it 'can access earlier match results when produced using the match function' do
+        expect_log([<<-SOURCE, 3], [], ['$a == [hello, h, ello]', '$b == hello', '$c == h'])
+        $a = 'hello'.match(/(h)(.*)/),
+        $b = $a[0],
+        $c = $a[1]
+        SOURCE
+      end
+    end
+
+
+    context 'will not permit assignments' do
+      it 'at top level' do
+        expect_fail([<<-SOURCE, 0], [], /Syntax error at '='/)
+        $a = $x = $0
+        SOURCE
+      end
+
+      it 'in arrays' do
+        expect_fail([<<-SOURCE, 0], [], /Assignment not allowed here/)
+        $a = [$x = 3]
+        SOURCE
+      end
+
+      it 'of variable with the same name as a subsequently declared parameter' do
+        expect_fail([<<-SOURCE, 0], [], /Assignment not allowed here/)
+        $a = ($b = 3),
+        $b = 5
+        SOURCE
+      end
+
+      it 'of variable with the same name as a previously declared parameter' do
+        expect_fail([<<-SOURCE, 0], [], /Assignment not allowed here/)
+        $a = 10,
+        $b = ($a = 10)
+        SOURCE
+      end
+    end
+
+    it 'will permit assignments in nested scope' do
+      expect_log([<<-SOURCE, 3], [], ['$a == [1, 2, 3]', '$b == 0', '$c == [6, 12, 18]'])
+      $a = [1,2,3],
+      $b = 0,
+      $c = $a.map |$x| { $b = $x; $b * $a.reduce |$x, $y| {$x + $y} }
+      SOURCE
+    end
+
+    it 'will not permit duplicate parameter names' do
+      expect_fail([<<-SOURCE, 0], [], /The parameter 'a' is declared more than once/ )
+      $a = 2,
+      $a = 5
+      SOURCE
+    end
+  end
+end

data/spec/integration/parser/undef_param_spec.rb

@@ -84,4 +84,12 @@ describe "Parameter passing" do
     MANIFEST
     end
   end
+
+  it "uses a given undef and do not require a default expression" do
+    expect_the_message_to_be(true) do <<-MANIFEST
+        define a(Optional[Integer] $x) { notify { 'something': message => $x == undef}}
+        a {'a': x => undef }
+    MANIFEST
+    end
+  end
 end

data/spec/integration/provider/yumrepo_spec.rb

@@ -87,7 +87,7 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile), '(integration)',
     properties = {"bandwidth"      => "42M",
                   "baseurl"        => "http://er0ck",
                   "cost"           => "42",
-                  "enabled"        => "YeS",
+                  "enabled"        => "Yes",
                   "exclude"        => "er0ckSet2.0",
                   "failovermethod" => "roundrobin",
                   "include"        => "https://er0ck",

data/spec/integration/test/test_helper_spec.rb

@@ -0,0 +1,28 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+describe "Windows UTF8 environment variables", :if => Puppet.features.microsoft_windows? do
+  # The Puppet::Util::Windows::Process class is used to manipulate environment variables as it is known to handle UTF8 characters. Where as the implementation of ENV in ruby does not.
+  # before and end all are used to inject environment variables before the test helper 'before_each_test' function is called
+  # Do not use before and after hooks in these tests as it may have unintended consequences
+
+  before(:all) {
+    @varname = 'test-helper-foo'
+    @rune_utf8 = "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7"
+
+    Puppet::Util::Windows::Process.set_environment_variable(@varname, @rune_utf8)
+  }
+
+  it "#after_each_test should preserve UTF8 environment variables" do
+    envhash = Puppet::Util::Windows::Process.get_environment_strings
+    expect(envhash[@varname]).to eq(@rune_utf8)
+    # Change the value in the test to force test_helper to restore the environment
+    ENV[@varname] = 'bad foo'
+
+    # Prematurely trigger the after_each_test method
+    Puppet::Test::TestHelper.after_each_test
+
+    envhash = Puppet::Util::Windows::Process.get_environment_strings
+    expect(envhash[@varname]).to eq(@rune_utf8)
+  end
+end

data/spec/integration/transaction/report_spec.rb

@@ -21,4 +21,20 @@ describe Puppet::Transaction::Report do
       Puppet::Transaction::Report.indirection.save(report)
     end
   end
+
+  describe "when dumping to YAML" do
+    it "should not contain TagSet objects" do
+      resource = Puppet::Resource.new(:notify, "Hello")
+      ral_resource = resource.to_ral
+      status = Puppet::Resource::Status.new(ral_resource)
+
+      log = Puppet::Util::Log.new(:level => :info, :message => "foo")
+
+      report = Puppet::Transaction::Report.new("apply")
+      report.add_resource_status(status)
+      report << log
+
+      expect(YAML.dump(report)).to_not match('Puppet::Util::TagSet')
+    end
+  end
 end

data/spec/integration/transaction_spec.rb

@@ -319,6 +319,17 @@ describe Puppet::Transaction do
       expect(Puppet::FileSystem.exist?(fname)).to be_falsey
     end
 
+    it "does not trigger skip-tagged resources" do
+      catalog = mk_catalog
+
+      Puppet[:skip_tags] = "skipme"
+      exec.tag("skipme")
+
+      catalog.add_resource(file, exec)
+      catalog.apply
+      expect(Puppet::FileSystem.exist?(fname)).to be_falsey
+    end
+
     it "does not trigger resources with failed dependencies" do
       catalog = mk_catalog
       file[:path] = make_absolute("/foo/bar/baz")