puppet 4.4.0 → 4.5.0

data/spec/unit/functions/assert_type_spec.rb

@@ -86,4 +86,12 @@ describe 'the assert_type function' do
     CODE
     expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /expected an UnprivilegedPort = Integer\[1024, 65537\] value, got Integer\[345, 345\]/)
   end
+
+  it 'will use infer_set to report detailed information about complex mismatches' do
+    code = <<-CODE
+      assert_type(Struct[{a=>Integer,b=>Boolean}], {a=>hej,x=>s})
+    CODE
+    expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error,
+      /entry 'a' expected an Integer value, got String.*expected a value for key 'b'.*unrecognized key 'x'/m)
+  end
 end

data/spec/unit/functions/dig_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+require 'puppet_spec/compiler'
+require 'matchers/resource'
+
+describe 'the dig function' do
+  include PuppetSpec::Compiler
+  include Matchers::Resource
+
+  it 'returns a value from an array index via integer index' do
+    expect(compile_to_catalog("notify { [testing].dig(0): }")).to have_resource('Notify[testing]')
+  end
+
+  it 'returns undef if given an undef key' do
+  expect(compile_to_catalog(<<-SOURCE)).to have_resource('Notify[test-Undef-ing]')
+    notify { "test-${type([testing].dig(undef))}-ing": }
+    SOURCE
+  end
+
+  it 'returns undef if starting with undef' do
+  expect(compile_to_catalog(<<-SOURCE)).to have_resource('Notify[test-Undef-ing]')
+    notify { "test-${type(undef.dig(undef))}-ing": }
+    SOURCE
+  end
+
+  it 'returns a value from an hash key via given key' do
+    expect(compile_to_catalog("notify { {key => testing}.dig(key): }")).to have_resource('Notify[testing]')
+  end
+
+  it 'continues digging if result is an array' do
+    expect(compile_to_catalog("notify { [nope, [testing]].dig(1, 0): }")).to have_resource('Notify[testing]')
+  end
+
+  it 'continues digging if result is a hash' do
+    expect(compile_to_catalog("notify { [nope, {yes => testing}].dig(1, yes): }")).to have_resource('Notify[testing]')
+  end
+
+  it 'stops digging when step is undef' do
+    expect(compile_to_catalog(<<-SOURCE)).to have_resource('Notify[testing]')
+    $result = [nope, {yes => testing}].dig(1, no, 2)
+    notify { "test${result}ing": }
+    SOURCE
+  end
+
+  it 'errors if step is neither Array nor Hash' do
+    expect { compile_to_catalog(<<-SOURCE)}.to raise_error(/The given data does not contain a Collection at \[1, "yes"\], got 'String'/)
+    $result = [nope, {yes => testing}].dig(1, yes, 2)
+    notify { "test${result}ing": }
+    SOURCE
+  end
+
+  it 'errors if not given a non Collection as the starting point' do
+    expect { compile_to_catalog(<<-SOURCE)}.to raise_error(/'dig' parameter 'data' expects a Collection value, got String/)
+    "hello".dig(1, yes, 2)
+    SOURCE
+  end
+
+end

data/spec/unit/functions/lest_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require 'puppet_spec/compiler'
+require 'matchers/resource'
+
+describe 'the lest function' do
+  include PuppetSpec::Compiler
+  include Matchers::Resource
+
+  it 'calls a lambda passing no argument' do
+    expect(compile_to_catalog("lest(undef) || { notify { testing: } }")).to have_resource('Notify[testing]')
+  end
+
+  it 'produces what lambda returns if value is undef' do
+    expect(compile_to_catalog("notify{ lest(undef) || { testing }: }")).to have_resource('Notify[testing]')
+  end
+
+  it 'does not call lambda if argument is not undef' do
+    expect(compile_to_catalog('lest(1) || { notify { "failed": } }')).to_not have_resource('Notify[failed]')
+  end
+
+  it 'produces given argument if given not undef' do
+    expect(compile_to_catalog(<<-SOURCE)).to have_resource('Notify[test_yay_ing]')
+    notify{ "test${lest('_yay_') || { '_oh_no_' }}ing": }
+    SOURCE
+  end
+
+  it 'errors when lambda wants too many args' do
+    expect do
+      compile_to_catalog('lest(1) |$x| { }')
+    end.to raise_error(/'lest' block expects no arguments, got 1/m)
+  end
+
+end

data/spec/unit/functions/lookup_spec.rb

@@ -170,7 +170,7 @@ describe "when performing lookup" do
     it 'will not accept a succesful lookup of an undef value when the type rejects it' do
       expect do
         assemble_and_compile('${r}', "'abc::n'", 'String')
-      end.to raise_error(Puppet::ParseError, /Found value has wrong type, expected a String value, got Undef/)
+      end.to raise_error(Puppet::ParseError, /Found value had wrong type, expected a String value, got Undef/)
     end
 
     it 'will raise an exception when value is not found for array key and no default is provided' do
@@ -249,7 +249,7 @@ describe "when performing lookup" do
         expect do
           assemble_and_compile('${r[a]}_${r[b]}', "'abc::x'", 'Hash[String,String]', 'undef', "{'a' => 'dflt_x', 'b' => 32}")
         end.to raise_error(Puppet::ParseError,
-          /Default value has wrong type, expected a Hash\[String, String\] value, got Struct\[\{'a' => String, 'b' => Integer\}\]/)
+          /Default value had wrong type, entry 'b' expected a String value, got Integer/)
       end
     end
 
@@ -283,7 +283,7 @@ describe "when performing lookup" do
         expect do
           assemble_and_compile_with_block('${r[a]}_${r[b]}', "{'a' => 'dflt_x', 'b' => 32}", "'abc::x'", 'Hash[String,String]')
         end.to raise_error(Puppet::ParseError,
-          /Value returned from default block has wrong type, expected a Hash\[String, String\] value, got Struct\[\{'a' => String, 'b' => Integer\}\]/)
+          /Value returned from default block had wrong type, entry 'b' expected a String value, got Integer/)
       end
 
       it 'receives a single name parameter' do
@@ -298,6 +298,38 @@ describe "when performing lookup" do
     end
   end
 
+  context 'when using dotted keys' do
+    it 'can access values in data using dot notation' do
+      source = <<-CODE
+      function environment::data() {
+        { a => { b => { c => 'the data' }}}
+      }
+      notice(lookup('a.b.c'))
+      CODE
+      expect(eval_and_collect_notices(source)).to include('the data')
+    end
+
+    it 'can find data using quoted dot notation' do
+      source = <<-CODE
+      function environment::data() {
+        { 'a.b.c' => 'the data' }
+      }
+      notice(lookup('"a.b.c"'))
+      CODE
+      expect(eval_and_collect_notices(source)).to include('the data')
+    end
+
+    it 'can access values in data using a mix of dot notation and quoted dot notation' do
+      source = <<-CODE
+      function environment::data() {
+        { 'a' => { 'b.c' => 'the data' }}
+      }
+      notice(lookup('a."b.c"'))
+      CODE
+      expect(eval_and_collect_notices(source)).to include('the data')
+    end
+  end
+
   context 'when passing a hash as the only parameter' do
     it 'can pass a single name correctly' do
       resources = assemble_and_compile('${r}', "{name => 'abc::a'}")
@@ -432,6 +464,58 @@ describe "when performing lookup" do
     end
   end
 
+  context 'when accessing nil values' do
+    it 'will find a key with undef value in a yaml file' do
+      Puppet[:code] = 'include empty_key_yaml'
+      compiler.compile do |catalog|
+        lookup_invocation = Puppet::Pops::Lookup::Invocation.new(compiler.topscope, {}, {}, true)
+        begin
+          Puppet::Pops::Lookup.lookup('empty_key_yaml::has_undef_value',nil, nil, false, nil, lookup_invocation)
+        rescue Puppet::Error
+        end
+        expect(lookup_invocation.explainer.to_s).to eq(<<EOS)
+Merge strategy first
+  Data Binding "hiera"
+    No such key: "empty_key_yaml::has_undef_value"
+  Data Provider "FunctionEnvDataProvider"
+    No such key: "empty_key_yaml::has_undef_value"
+  Module "empty_key_yaml" using Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/modules/empty_key_yaml/hiera.yaml"
+    Data Provider "empty_key"
+      Path "#{environmentpath}/production/modules/empty_key_yaml/data/empty_key.yaml"
+        Original path: "empty_key"
+        Found key: "empty_key_yaml::has_undef_value" value: nil
+  Merged result: nil
+EOS
+      end
+    end
+
+    it 'will find a key with undef value in a json file' do
+      Puppet[:code] = 'include empty_key_json'
+      compiler.compile do |catalog|
+        lookup_invocation = Puppet::Pops::Lookup::Invocation.new(compiler.topscope, {}, {}, true)
+        begin
+          Puppet::Pops::Lookup.lookup('empty_key_json::has_undef_value',nil, nil, false, nil, lookup_invocation)
+        rescue Puppet::Error
+        end
+        expect(lookup_invocation.explainer.to_s).to eq(<<EOS)
+Merge strategy first
+  Data Binding "hiera"
+    No such key: "empty_key_json::has_undef_value"
+  Data Provider "FunctionEnvDataProvider"
+    No such key: "empty_key_json::has_undef_value"
+  Module "empty_key_json" using Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/modules/empty_key_json/hiera.yaml"
+    Data Provider "empty_key"
+      Path "#{environmentpath}/production/modules/empty_key_json/data/empty_key.json"
+        Original path: "empty_key"
+        Found key: "empty_key_json::has_undef_value" value: nil
+  Merged result: nil
+EOS
+      end
+    end
+  end
+
   context 'when using explain' do
     it 'will explain that module is not found' do
       assemble_and_compile('${r}', "'abc::a'") do |scope|
@@ -558,6 +642,28 @@ EOS
       end
     end
 
+    it 'will explain value access caused by dot notation in key' do
+      assemble_and_compile('${r}', "'abc::a'") do |scope|
+        lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {}, true)
+        Puppet::Pops::Lookup.lookup('abc::f.k1.s1', Puppet::Pops::Types::TypeParser.new.parse('String'), nil, false, nil, lookup_invocation)
+        expect(lookup_invocation.explainer.to_s).to eq(<<EOS)
+Merge strategy first
+  Data Binding "hiera"
+    No such key: "abc::f.k1.s1"
+  Data Provider "FunctionEnvDataProvider"
+    Sub key: "k1.s1"
+      Found key: "k1" value: {
+        "s1" => "env_f11",
+        "s2" => "env_f12"
+      }
+      Found key: "s1" value: "env_f11"
+    Found key: "abc::f.k1.s1" value: "env_f11"
+  Merged result: "env_f11"
+EOS
+      end
+    end
+
+
     it 'will provide a hash containing all explanation elements' do
       assemble_and_compile('${r}', "'abc::a'") do |scope|
         lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {}, true)