puppet 4.9.3 → 4.9.4

data/spec/unit/pops/lookup/context_spec.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
+require 'puppet_spec/files'
 require 'puppet_spec/compiler'
 
 module Puppet::Pops
@@ -9,28 +10,28 @@ describe 'Puppet::Pops::Lookup::Context' do
   context 'an instance' do
     include PuppetSpec::Compiler
     it 'can be created' do
-      code = "notice(type(Puppet::LookupContext.new('e', 'm')))"
+      code = "notice(type(Puppet::LookupContext.new('m')))"
       expect(eval_and_collect_notices(code)[0]).to match(/Object\[\{name => 'Puppet::LookupContext'/)
     end
 
     it 'returns its environment_name' do
-      code = "notice(Puppet::LookupContext.new('e', 'm').environment_name)"
-      expect(eval_and_collect_notices(code)[0]).to eql('e')
+      code = "notice(Puppet::LookupContext.new('m').environment_name)"
+      expect(eval_and_collect_notices(code)[0]).to eql('production')
     end
 
     it 'returns its module_name' do
-      code = "notice(Puppet::LookupContext.new('e', 'm').module_name)"
+      code = "notice(Puppet::LookupContext.new('m').module_name)"
       expect(eval_and_collect_notices(code)[0]).to eql('m')
     end
 
     it 'can use an undef module_name' do
-      code = "notice(type(Puppet::LookupContext.new('e', undef).module_name))"
+      code = "notice(type(Puppet::LookupContext.new(undef).module_name))"
       expect(eval_and_collect_notices(code)[0]).to eql('Undef')
     end
 
     it 'can store and retrieve a value using the cache' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache('ze_key', 'ze_value')
         notice($ctx.cached_value('ze_key'))
       PUPPET
@@ -39,7 +40,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'the cache method returns the value that is cached' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         notice($ctx.cache('ze_key', 'ze_value'))
       PUPPET
       expect(eval_and_collect_notices(code)[0]).to eql('ze_value')
@@ -47,7 +48,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can store and retrieve a hash using the cache' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $ctx.cached_entries |$key, $value| { notice($key); notice($value) }
       PUPPET
@@ -56,7 +57,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can use the cache to merge hashes' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $ctx.cache_all({ 'v3' => 'third', 'v4' => 'fourth' })
         $ctx.cached_entries |$key, $value| { notice($key); notice($value) }
@@ -66,7 +67,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can use the cache to merge hashes and individual entries' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $ctx.cache('v3', 'third')
         $ctx.cached_entries |$key, $value| { notice($key); notice($value) }
@@ -76,7 +77,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can iterate the cache using one argument block' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $ctx.cached_entries |$entry| { notice($entry[0]); notice($entry[1]) }
       PUPPET
@@ -85,7 +86,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can replace individual cached entries' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $ctx.cache('v2', 'changed')
         $ctx.cached_entries |$key, $value| { notice($key); notice($value) }
@@ -95,7 +96,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'can replace multiple cached entries' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second', 'v3' => 'third' })
         $ctx.cache_all({ 'v1' => 'one', 'v3' => 'three' })
         $ctx.cached_entries |$key, $value| { notice($key); notice($value) }
@@ -105,7 +106,7 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'cached_entries returns an Iterable when called without a block' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.cache_all({ 'v1' => 'first', 'v2' => 'second' })
         $iter = $ctx.cached_entries
         notice(type($iter, generalized))
@@ -116,12 +117,119 @@ describe 'Puppet::Pops::Lookup::Context' do
 
     it 'will throw :no_such_key when not_found is called' do
       code = <<-PUPPET.unindent
-        $ctx = Puppet::LookupContext.new('e', 'm')
+        $ctx = Puppet::LookupContext.new('m')
         $ctx.not_found
       PUPPET
       expect { eval_and_collect_notices(code) }.to throw_symbol(:no_such_key)
     end
 
+    context 'with cached_file_data' do
+      include PuppetSpec::Files
+
+      let(:code_dir) { Puppet[:environmentpath] }
+      let(:env_name) { 'testing' }
+      let(:env_dir) { File.join(code_dir, env_name) }
+      let(:env) { Puppet::Node::Environment.create(env_name.to_sym, [File.join(populated_env_dir, 'modules')]) }
+      let(:node) { Puppet::Node.new('test', :environment => env) }
+      let(:data_yaml) { 'data.yaml' }
+      let(:data_path) { File.join(populated_env_dir, 'data', data_yaml) }
+      let(:populated_env_dir) do
+        dir_contained_in(code_dir,
+          {
+            env_name => {
+              'data' => {
+                data_yaml => <<-YAML.unindent
+                  a: value a
+                  YAML
+              }
+            }
+          }
+        )
+        PuppetSpec::Files.record_tmp(File.join(env_dir))
+        env_dir
+      end
+
+      it 'can use cached_file_data without a block' do
+        code = <<-PUPPET.unindent
+          $ctx = Puppet::LookupContext.new(nil)
+          $yaml_data = $ctx.cached_file_data('#{data_path}')
+          notice($yaml_data)
+        PUPPET
+        expect(eval_and_collect_notices(code, node)).to eql(["a: value a\n"])
+      end
+
+      it 'can use cached_file_data with a block' do
+        code = <<-PUPPET.unindent
+          $ctx = Puppet::LookupContext.new(nil)
+          $yaml_data = $ctx.cached_file_data('#{data_path}') |$content| {
+            { 'parsed' => $content }
+          }
+          notice($yaml_data)
+        PUPPET
+        expect(eval_and_collect_notices(code, node)).to eql(["{parsed => a: value a\n}"])
+      end
+
+      context 'and multiple compilations' do
+
+        before(:each) { Puppet.settings[:environment_timeout] = 'unlimited' }
+        after(:each) do
+          Puppet.settings[:environment_timeout] = 0
+          Puppet.lookup(:environments).clear_all
+        end
+
+        it 'will reuse cached_file_data and not call block again' do
+
+          code1 = <<-PUPPET.unindent
+            $ctx = Puppet::LookupContext.new(nil)
+            $yaml_data = $ctx.cached_file_data('#{data_path}') |$content| {
+              { 'parsed' => $content }
+            }
+            notice($yaml_data)
+            PUPPET
+
+          code2 = <<-PUPPET.unindent
+            $ctx = Puppet::LookupContext.new(nil)
+            $yaml_data = $ctx.cached_file_data('#{data_path}') |$content| {
+              { 'parsed' => 'should not be called' }
+            }
+            notice($yaml_data)
+            PUPPET
+
+          logs = []
+          Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+            Puppet[:code] = code1
+            Puppet::Parser::Compiler.compile(node)
+            Puppet[:code] = code2
+            Puppet::Parser::Compiler.compile(node)
+          end
+          logs = logs.select { |log| log.level == :notice }.map { |log| log.message }
+          expect(logs.uniq.size).to eql(1)
+        end
+
+        it 'will invalidate cache if file changes' do
+          code = <<-PUPPET.unindent
+            $ctx = Puppet::LookupContext.new(nil)
+            $yaml_data = $ctx.cached_file_data('#{data_path}') |$content| {
+              { 'parsed' => $content }
+            }
+            notice($yaml_data)
+            PUPPET
+
+          logs = []
+          Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+            Puppet[:code] = code
+            Puppet::Parser::Compiler.compile(node)
+
+            # Change contents!
+            File.write(data_path, "b: value b\n")
+            Puppet::Parser::Compiler.compile(node)
+          end
+          logs = logs.select { |log| log.level == :notice }.map { |log| log.message }
+          expect(logs).to eql(["{parsed => a: value a\n}", "{parsed => b: value b\n}"])
+        end
+      end
+    end
+
     context 'when used in an Invocation' do
       let(:node) { Puppet::Node.new('test') }
       let(:compiler) { Puppet::Parser::Compiler.new(node) }
@@ -144,7 +252,7 @@ describe 'Puppet::Pops::Lookup::Context' do
       it 'will not call explain unless explanations are active' do
         invocation.lookup('dummy', nil) do
           code = <<-PUPPET.unindent
-            $ctx = Puppet::LookupContext.new('e', 'm')
+            $ctx = Puppet::LookupContext.new('m')
             $ctx.explain || { notice('stop calling'); 'bad' }
           PUPPET
           expect(compile_and_get_notices(code)).to be_empty
@@ -154,7 +262,7 @@ describe 'Puppet::Pops::Lookup::Context' do
       it 'will call explain when explanations are active' do
         invocation_with_explain.lookup('dummy', nil) do
           code = <<-PUPPET.unindent
-            $ctx = Puppet::LookupContext.new('e', 'm')
+            $ctx = Puppet::LookupContext.new('m')
             $ctx.explain || { notice('called'); 'good' }
           PUPPET
           expect(compile_and_get_notices(code)).to eql(['called'])
@@ -165,7 +273,7 @@ describe 'Puppet::Pops::Lookup::Context' do
       it 'will call interpolate to resolve interpolation' do
         invocation.lookup('dummy', nil) do
           code = <<-PUPPET.unindent
-            $ctx = Puppet::LookupContext.new('e', 'm')
+            $ctx = Puppet::LookupContext.new('m')
             notice($ctx.interpolate('-- %{testing} --'))
           PUPPET
           expect(compile_and_get_notices(code, { 'testing' => 'called' })).to eql(['-- called --'])

data/spec/unit/pops/lookup/lookup_spec.rb

@@ -78,6 +78,40 @@ describe 'The lookup API' do
     Puppet.pop_context
   end
 
+  context 'when doing automatic parameter lookup' do
+
+    let(:mod_content) do
+      {
+        'hiera.yaml' => <<-YAML.unindent,
+          version: 5
+          YAML
+        'data' => {
+          'common.yaml' => <<-YAML.unindent
+            mod::x: mod::x (from module)
+            YAML
+        },
+        'manifests' => {
+           'init.pp' => <<-PUPPET.unindent
+             class mod($x) {
+               notify { $x: }
+             }
+             PUPPET
+        }
+      }
+    end
+    let(:logs) { [] }
+    let(:debugs) { logs.select { |log| log.level == :debug }.map { |log| log.message } }
+
+    it 'includes APL in explain output when debug is enabled' do
+      Puppet[:log_level] = 'debug'
+      Puppet[:code] = 'include mod'
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        compiler.compile
+      end
+      expect(debugs).to include(/Found key: "mod::x" value: "mod::x \(from module\)"/)
+    end
+  end
+
   context 'when doing lookup' do
     it 'finds data in global layer' do
       expect(Lookup.lookup('a', nil, nil, false, nil, invocation)).to eql('a (from global)')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter