puppet 4.2.3-x86-mingw32 → 4.3.0-x86-mingw32

data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml

@@ -0,0 +1,24 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://my-server:8140/foo
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: ! 'OK '
+    headers: {}
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 22:44:49 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml

@@ -0,0 +1,24 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://my-server:8140/foo
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: ! 'OK '
+    headers: {}
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 22:44:49 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml

@@ -0,0 +1,24 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://my-server:8140/foo
+    body:
+      encoding: US-ASCII
+      string: ! 'param: value'
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: ! 'OK '
+    headers: {}
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 19 Mar 2015 23:15:40 GMT
+recorded_with: VCR 2.9.3

data/spec/integration/data_binding_spec.rb

@@ -0,0 +1,229 @@
+require 'spec_helper'
+
+require 'puppet_spec/compiler'
+
+describe "Data binding" do
+  include PuppetSpec::Files
+  include PuppetSpec::Compiler
+
+  let(:dir) { tmpdir("puppetdir") }
+  let(:data) {{
+    'global' => {
+      'testing::binding::value' => 'the value',
+      'testing::binding::calling_class' => '%{calling_class}',
+      'testing::binding::calling_class_path' => '%{calling_class_path}'
+    }
+  }}
+  let(:hash_data) {{
+    'global' => {
+      'testing::hash::options' => {
+        'key'  => 'value',
+        'port' => '80',
+        'bind' => 'localhost'
+      }
+    },
+    'agent.example.com' => {
+      'testing::hash::options' => {
+        'key'  => 'new value',
+        'port' => '443'
+      }
+    }
+  }}
+  let(:hash_data_with_lopts) {{
+    'global' => {
+      'testing::hash::options' => {
+        'key'  => 'value',
+        'port' => '80',
+        'bind' => 'localhost'
+      }
+    },
+    'agent.example.com' => {
+      'lookup_options' => {
+        'testing::hash::options' => {
+          'merge' => 'deep'
+        }
+      },
+      'testing::hash::options' => {
+        'key'  => 'new value',
+        'port' => '443'
+      }
+    }
+  }}
+
+  before do
+    # Drop all occurances of cached hiera instances. This will reset @hiera in Puppet::Indirector::Hiera, Testing::DataBinding::Hiera,
+    # and Puppet::DataBinding::Hiera. Different classes are active as indirection depending on configuration
+    ObjectSpace.each_object(Class).select {|klass| klass <= Puppet::Indirector::Hiera }.each { |klass| klass.instance_variable_set(:@hiera, nil) }
+    Puppet[:data_binding_terminus] = 'hiera'
+    Puppet[:modulepath] = dir
+  end
+
+  it "works with the puppet backend configured, although it can't use it for lookup" do
+    configure_hiera_for_puppet
+    create_manifest_in_module("testing", "binding.pp",
+                              <<-MANIFEST)
+    # lookup via the puppet backend to ensure it works
+    class testing::binding($value = hiera('variable')) {}
+    MANIFEST
+
+    create_manifest_in_module("testing", "data.pp",
+                              <<-MANIFEST)
+    class testing::data (
+    $variable = "the value"
+    ) { }
+    MANIFEST
+
+    catalog = compile_to_catalog("include testing::data")
+    resource = catalog.resource('Class[testing::data]')
+
+    expect(resource[:variable]).to eq("the value")
+  end
+
+  context "with testing::binding and global data only" do
+    it "looks up global data from hiera" do
+      configure_hiera_for_one_tier(data)
+
+      create_manifest_in_module("testing", "binding.pp",
+                                <<-MANIFEST)
+      class testing::binding($value,
+                             $calling_class,
+                             $calling_class_path,
+                             $calling_module = $module_name) {}
+      MANIFEST
+
+      catalog = compile_to_catalog("include testing::binding")
+      resource = catalog.resource('Class[testing::binding]')
+
+      expect(resource[:value]).to eq("the value")
+      expect(resource[:calling_class]).to eq("testing::binding")
+      expect(resource[:calling_class_path]).to eq("testing/binding")
+      expect(resource[:calling_module]).to eq("testing")
+    end
+  end
+
+  context "with testing::hash and global data only" do
+    it "looks up global data from hiera" do
+      configure_hiera_for_one_tier(hash_data)
+
+      create_manifest_in_module("testing", "hash.pp",
+                                <<-MANIFEST)
+      class testing::hash($options) {}
+      MANIFEST
+
+      catalog = compile_to_catalog("include testing::hash")
+      resource = catalog.resource('Class[testing::hash]')
+
+      expect(resource[:options]).to eq({
+	'key'  => 'value',
+	'port' => '80',
+	'bind' => 'localhost'
+      })
+    end
+  end
+
+  context "with custom clientcert" do
+    it "merges global data with agent.example.com data from hiera" do
+      configure_hiera_for_two_tier(hash_data)
+
+      create_manifest_in_module("testing", "hash.pp",
+                                <<-MANIFEST)
+      class testing::hash($options) {}
+      MANIFEST
+
+      catalog = compile_to_catalog("include testing::hash")
+      resource = catalog.resource('Class[testing::hash]')
+
+      expect(resource[:options]).to eq({
+            'key'  => 'new value',
+            'port' => '443',
+      })
+    end
+  end
+
+  context "with custom clientcert and with lookup_options" do
+    it "merges global data with agent.example.com data from hiera" do
+      configure_hiera_for_two_tier(hash_data_with_lopts)
+
+      create_manifest_in_module("testing", "hash.pp",
+                                <<-MANIFEST)
+      class testing::hash($options) {}
+      MANIFEST
+
+      catalog = compile_to_catalog("include testing::hash")
+      resource = catalog.resource('Class[testing::hash]')
+
+      expect(resource[:options]).to eq({
+        'key'  => 'new value',
+        'port' => '443',
+	      'bind' => 'localhost',
+      })
+    end
+  end
+
+
+  def configure_hiera_for_one_tier(data)
+    hiera_config_file = tmpfile("hiera.yaml")
+
+    File.open(hiera_config_file, 'w') do |f|
+      f.write("---
+        :yaml:
+          :datadir: #{dir}
+        :hierarchy: ['global']
+        :logger: 'noop'
+        :backends: ['yaml']
+      ")
+    end
+
+    data.each do | file, contents |
+      File.open(File.join(dir, "#{file}.yaml"), 'w') do |f|
+        f.write(YAML.dump(contents))
+      end
+    end
+
+    Puppet[:hiera_config] = hiera_config_file
+  end
+
+  def configure_hiera_for_two_tier(data)
+    hiera_config_file = tmpfile("hiera.yaml")
+
+    File.open(hiera_config_file, 'w') do |f|
+      f.write("---
+        :yaml:
+          :datadir: #{dir}
+        :hierarchy: ['agent.example.com', 'global']
+        :logger: 'noop'
+        :backends: ['yaml']
+      ")
+    end
+
+    data.each do | file, contents |
+      File.open(File.join(dir, "#{file}.yaml"), 'w') do |f|
+        f.write(YAML.dump(contents))
+      end
+    end
+
+    Puppet[:hiera_config] = hiera_config_file
+  end
+
+  def configure_hiera_for_puppet
+    hiera_config_file = tmpfile("hiera.yaml")
+
+    File.open(hiera_config_file, 'w') do |f|
+      f.write("---
+        :logger: 'noop'
+        :backends: ['puppet']
+      ")
+    end
+
+    Puppet[:hiera_config] = hiera_config_file
+  end
+
+  def create_manifest_in_module(module_name, name, manifest)
+    module_dir = File.join(dir, module_name, 'manifests')
+    FileUtils.mkdir_p(module_dir)
+
+    File.open(File.join(module_dir, name), 'w') do |f|
+      f.write(manifest)
+    end
+  end
+end

data/spec/integration/file_bucket/file_spec.rb

@@ -18,7 +18,7 @@ describe Puppet::FileBucket::File do
 
       {
         "md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
-        "https://puppetmaster:8140/production/file_bucket_file/md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
+        "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
       }.each do |key, terminus|
         it "should use the #{terminus} terminus when requesting #{key.inspect}" do
           described_class.indirection.terminus(terminus).class.any_instance.expects(:find)
@@ -31,7 +31,7 @@ describe Puppet::FileBucket::File do
     describe "when running another application" do
       {
         "md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
-        "https://puppetmaster:8140/production/file_bucket_file/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest,
+        "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest,
       }.each do |key, terminus|
         it "should use the #{terminus} terminus when requesting #{key.inspect}" do
           described_class.indirection.terminus(terminus).class.any_instance.expects(:find)

data/spec/integration/parser/compiler_spec.rb

@@ -49,6 +49,10 @@ class CompilerTestResource
   def line
     "42"
   end
+
+  def resource_type
+    self.class
+  end
 end
 
 describe Puppet::Parser::Compiler do
@@ -655,7 +659,7 @@ describe Puppet::Parser::Compiler do
       @node.classes = klass
       klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {'a' => nil, 'b' => nil})
       @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, "Must pass b to Class[Foo]")
+      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: expects a value for parameter 'b'/)
     end
 
     it "should fail if invalid parameters are passed" do
@@ -663,7 +667,7 @@ describe Puppet::Parser::Compiler do
       @node.classes = klass
       klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {})
       @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, "Invalid parameter: '3' on Class[Foo]")
+      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: has no parameter named '3'/)
     end
 
     it "should ensure class is in catalog without params" do
@@ -1452,7 +1456,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x) { }
             foo { 'test': x =>'say friend' }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef for a non-optional type' do
@@ -1461,7 +1465,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x) { }
             foo { 'test': x => undef }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'denies non type compliant default argument' do
@@ -1470,7 +1474,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x = 'pow') { }
             foo { 'test':  }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef as the default for a non-optional type' do
@@ -1479,7 +1483,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x = undef) { }
             foo { 'test':  }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'accepts a Resource as a Type' do
@@ -1500,7 +1504,7 @@ describe Puppet::Parser::Compiler do
             define foo(Struct[{b => Integer, d=>String}] $a) { }
             foo{ bar: a => {b => 5, c => 'stuff'}}
           MANIFEST
-        end.to raise_error(/got Struct\[\{'b'=>Integer, 'c'=>String\}\]/)
+        end.to raise_error(/Foo\[bar\]:\s+parameter 'a' expects a value for key 'd'\s+parameter 'a' has no 'c' key/m)
       end
     end
 
@@ -1538,7 +1542,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x) { }
             class { 'foo': x =>'say friend' }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef for a non-optional type' do
@@ -1547,7 +1551,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x) { }
             class { 'foo': x => undef }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'denies non type compliant default argument' do
@@ -1556,7 +1560,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x = 'pow') { }
             class { 'foo':  }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef as the default for a non-optional type' do
@@ -1565,7 +1569,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x = undef) { }
             class { 'foo':  }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'accepts a Resource as a Type' do
@@ -1632,7 +1636,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1) |String $x| { }
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'x' expects a String value, got Integer/m)
       end
 
       it 'denies non-type-compliant, slurped arguments' do
@@ -1640,7 +1644,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1, "hello") |Integer *$x| { }
           MANIFEST
-        end.to raise_error(/called with mis-matched arguments.*expected.*Integer.*actual.*Integer, String/m)
+        end.to raise_error(/block parameter 'x' expects an Integer value, got String/m)
       end
 
       it 'denies non-type-compliant default argument' do
@@ -1648,7 +1652,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1) |$x, String $defaulted = 1| { notify { "${$x + $defaulted}": }}
           MANIFEST
-        end.to raise_error(/expected.*Any.*String.*actual.*Integer.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'raises an error when a default argument value is an incorrect type and there are no arguments passed' do
@@ -1656,7 +1660,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |String $defaulted = 1| {}
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'raises an error when the default argument for a slurped parameter is an incorrect type' do
@@ -1664,7 +1668,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |String *$defaulted = 1| {}
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'allows using an array as the default slurped value' do
@@ -1696,7 +1700,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |Array[String, 2] *$defaulted = hi| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+        end.to raise_error(/block expects at least 2 arguments, got 1/m)
       end
 
       it 'raises an error when the number of passed values does not match the parameter\'s size specification' do
@@ -1704,7 +1708,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(hi) |Array[String, 2] *$passed| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+        end.to raise_error(/block expects at least 2 arguments, got 1/m)
       end
 
       it 'matches when the number of arguments passed for a slurp parameter match the size specification' do
@@ -1723,7 +1727,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(hi, bye) |Array[String, 1, 1] *$passed| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{1\}.*actual.*arg count \{2\}/m)
+        end.to raise_error(/block expects 1 argument, got 2/m)
       end
 
       it 'allows passing slurped arrays by specifying an array of arrays' do