puppet 4.4.0 → 4.5.0

data/lib/puppet/util/windows/file.rb

@@ -89,12 +89,45 @@ module Puppet::Util::Windows::File
   end
   module_function :symlink
 
+
+  def exist?(path)
+    path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
+    path = path.to_s # support String and Pathname
+
+    seen_paths = []
+    # follow up to 64 symlinks before giving up
+    0.upto(64) do |depth|
+      # return false if this path has been seen before.  This is protection against circular symlinks
+      return false if seen_paths.include?(path.downcase)
+
+      result = get_attributes(path,false)
+
+      # return false for path not found
+      return false if result == INVALID_FILE_ATTRIBUTES
+
+      # return true if path exists and it's not a symlink
+      # Other file attributes are ignored. https://msdn.microsoft.com/en-us/library/windows/desktop/gg258117(v=vs.85).aspx
+      return true if (result & FILE_ATTRIBUTE_REPARSE_POINT) != FILE_ATTRIBUTE_REPARSE_POINT
+
+      # walk the symlink and try again...
+      seen_paths << path.downcase
+      path = readlink(path)
+    end
+
+    false
+  end
+  module_function :exist?
+
+
   INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF #define INVALID_FILE_ATTRIBUTES (DWORD (-1))
 
-  def get_attributes(file_name)
+  def get_attributes(file_name, raise_on_invalid = true)
     result = GetFileAttributesW(wide_string(file_name.to_s))
-    return result unless result == INVALID_FILE_ATTRIBUTES
-    raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+    if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
+      raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+    end
+
+    result
   end
   module_function :get_attributes
 
@@ -179,13 +212,10 @@ module Puppet::Util::Windows::File
 
   FILE_ATTRIBUTE_REPARSE_POINT = 0x400
   def symlink?(file_name)
-    begin
-      attributes = get_attributes(file_name)
-      (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
-    rescue
-      # raised INVALID_FILE_ATTRIBUTES is equivalent to file not found
-      false
-    end
+    attributes = get_attributes(file_name, false)
+
+    return false if (attributes == INVALID_FILE_ATTRIBUTES)
+    (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
   end
   module_function :symlink?
 

data/lib/puppet/util/windows.rb

@@ -4,6 +4,7 @@ module Puppet::Util::Windows
     class UserProfile; end
     class Group; end
   end
+  module File; end
   module Registry
   end
   module SID

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.4.0'
+  PUPPETVERSION = '4.5.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/application/environments/production/data/common.yaml

@@ -3,5 +3,18 @@ a: This is A
 b: This is B
 c: "This is%{cx}"
 
+d:
+  one:
+    two:
+      three: the value
+
+e.one.two.three: the value
+
+f.one:
+  two.three:
+    - first value
+    - second value
+    - third value
+
 lookup_options:
   a: first

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/third_utf8.json

@@ -0,0 +1,3 @@
+{
+    "test::param_json_utf8": "env data param_json_utf8 is ᚠᛇᚻ"
+}

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/utf8.yaml

@@ -0,0 +1,3 @@
+---
+test::param_yaml_utf8: env data param_yaml_utf8 is ᛫ᛒᛦ
+

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/hiera.yaml

@@ -6,11 +6,15 @@
   - :name: "one path"
     :backend: yaml
     :path: "single"
-  - :name: "two paths"
+  - :name: "utf8"
+    :backend: yaml
+    :path: "utf8"
+  - :name: "three paths"
     :backend: json
     :paths:
       - "first"
       - "second"
+      - "third_utf8"
   - :name:  'other datadir'
     :backend: yaml
     :datadir: "data2"

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/manifests/site.pp

@@ -1,5 +1,5 @@
-class test($param_a = 1, $param_b = 2, $param_c = 3, $param_d = 4, $param_e = 5) {
-  notify { "$param_a, $param_b, $param_c, $param_d, $param_e": }
+class test($param_a = 1, $param_b = 2, $param_c = 3, $param_d = 4, $param_e = 5, $param_yaml_utf8 = 'hi', $param_json_utf8 = 'hi') {
+  notify { "$param_a, $param_b, $param_c, $param_d, $param_e, $param_yaml_utf8, $param_json_utf8": }
 }
 
 include test

data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb

@@ -2,7 +2,8 @@ Puppet::Functions.create_function(:'abc::data') do
   def data()
     { 'abc::def::test1' => 'module_test1',
       'abc::def::test2' => 'module_test2',
-      'abc::def::test3' => 'module_test3'
+      'abc::def::test3' => 'module_test3',
+      'abc::def::ipl' => '%{lookup("abc::def::test2")}-ipl'
     }
   end
 end

data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp

@@ -2,8 +2,9 @@ class abc {
   include 'abc::def'
 }
 
-class abc::def ($test1, $test2, $test3) {
+class abc::def ($test1, $test2, $test3, $ipl ) {
   notify { $test1: }
   notify { $test2: }
   notify { $test3: }
+  notify { $ipl: }
 }

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/data/empty_key.json

@@ -0,0 +1 @@
+{ "empty_key_json::has_undef_value": null }

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/hiera.yaml

@@ -0,0 +1,5 @@
+---
+:version: 4
+:hierarchy:
+  - :name: empty_key
+    :backend: json

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/manifests/init.pp

@@ -0,0 +1,2 @@
+class empty_key_json {
+}

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/metadata.json

@@ -0,0 +1,9 @@
+{
+    "name": "example/empty_key_json",
+    "version": "0.0.2",
+    "source": "git@github.com/example/example-empty_key_json.git",
+    "dependencies": [],
+    "author": "Bob the Builder",
+    "license": "Apache-2.0",
+    "data_provider": "hiera"
+}

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/data/empty_key.yaml

@@ -0,0 +1 @@
+empty_key_yaml::has_undef_value: ~

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/hiera.yaml

@@ -0,0 +1,5 @@
+---
+:version: 4
+:hierarchy:
+  - :name: empty_key
+    :backend: yaml

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/manifests/init.pp

@@ -0,0 +1,2 @@
+class empty_key_yaml {
+}

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/metadata.json

@@ -0,0 +1,9 @@
+{
+    "name": "example/empty_key_yaml",
+    "version": "0.0.2",
+    "source": "git@github.com/example/example-empty_key_yaml.git",
+    "dependencies": [],
+    "author": "Bob the Builder",
+    "license": "Apache-2.0",
+    "data_provider": "hiera"
+}

data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/data/empty.yaml

@@ -1 +1,2 @@
 ---
+empty_key: ~

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/type/usee_type.rb

@@ -0,0 +1,5 @@
+Puppet::Type.newtype(:usee_type) do
+  newparam(:name, :namevar => true) do
+    desc 'An arbitrary name used as the identity of the resource.'
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp

@@ -11,6 +11,12 @@ function puppet_init_calling_ruby() {
 }
 
 class user {
+  # Dummy resource. Added just to assert that a ruby type in another module is loaded correctly
+  # by the auto loader
+  Usee_type {
+    name => 'pelle'
+  }
+
   case $::case_number {
     1: {
       # Call a puppet function that resides in usee/functions directly from init.pp

data/spec/fixtures/unit/provider/service/smf/svcs.out

@@ -1,3 +1,4 @@
-legacy_run     16:19:12 lrc:/etc/rcS_d/S50sk98sol
-online         16:19:08 svc:/system/svc/restarter:default
-maintenance    16:19:13 svc:/network/cswrsyncd:default
+legacy_run    lrc:/etc/rcS_d/S50sk98sol
+online        svc:/system/svc/restarter:default
+maintenance   svc:/network/cswrsyncd:default
+degraded      svc:/network/dns/client:default

data/spec/integration/data_binding_spec.rb

@@ -58,27 +58,6 @@ describe "Data binding" do
     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)
@@ -205,19 +184,6 @@ describe "Data binding" do
     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)

data/spec/integration/module_tool/tar/mini_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
-require 'puppet/module_tool'
-require 'puppet_spec/files'
-
-describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? && Puppet.features.zlib?) do
-  let(:minitar)    { described_class.new }
-
-  describe "Extracts tars with long and short pathnames" do
-    let (:sourcetar) { File.expand_path('../../../../fixtures/module.tar.gz', __FILE__) }
-
-    let (:longfilepath)  { "puppetlabs-dsc-1.0.0/lib/puppet_x/dsc_resources/xWebAdministration/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.schema.mof" }
-    let (:shortfilepath) { "puppetlabs-dsc-1.0.0/README.md" }
-
-    it "unpacks a tar with a short path length" do
-      extractdir = PuppetSpec::Files.tmpdir('minitar')
-
-      minitar.unpack(sourcetar,extractdir,'module')
-      expect(File).to exist(File.expand_path("#{extractdir}/#{shortfilepath}"))
-    end
-
-    it "unpacks a tar with a long path length" do
-      extractdir = PuppetSpec::Files.tmpdir('minitar')
-
-      minitar.unpack(sourcetar,extractdir,'module')
-      expect(File).to exist(File.expand_path("#{extractdir}/#{longfilepath}"))
-    end
-  end
+require 'spec_helper'
+require 'puppet/module_tool'
+require 'puppet_spec/files'
+
+describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? && Puppet.features.zlib?) do
+  let(:minitar)    { described_class.new }
+
+  describe "Extracts tars with long and short pathnames" do
+    let (:sourcetar) { File.expand_path('../../../../fixtures/module.tar.gz', __FILE__) }
+
+    let (:longfilepath)  { "puppetlabs-dsc-1.0.0/lib/puppet_x/dsc_resources/xWebAdministration/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.schema.mof" }
+    let (:shortfilepath) { "puppetlabs-dsc-1.0.0/README.md" }
+
+    it "unpacks a tar with a short path length" do
+      extractdir = PuppetSpec::Files.tmpdir('minitar')
+
+      minitar.unpack(sourcetar,extractdir,'module')
+      expect(File).to exist(File.expand_path("#{extractdir}/#{shortfilepath}"))
+    end
+
+    it "unpacks a tar with a long path length" do
+      extractdir = PuppetSpec::Files.tmpdir('minitar')
+
+      minitar.unpack(sourcetar,extractdir,'module')
+      expect(File).to exist(File.expand_path("#{extractdir}/#{longfilepath}"))
+    end
+  end
 end

data/spec/integration/parser/catalog_spec.rb

@@ -7,6 +7,18 @@ describe "A catalog" do
   include PuppetSpec::Compiler
 
   context "when compiled" do
+    let(:env) { Puppet::Node::Environment.create(:testing, []) }
+    let(:node) { Puppet::Node.new('test', :environment => env) }
+    let(:loaders) { Puppet::Pops::Loaders.new(env) }
+
+    around :each do |example|
+      Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
+      Puppet.override(:loaders => loaders, :current_environment => env) do
+        example.run
+        Puppet::Pops::Loaders.clear
+      end
+    end
+
     context "when transmitted to the agent" do
 
       it "preserves the order in which the resources are added to the catalog" do
@@ -78,12 +90,12 @@ describe "A catalog" do
   end
 
   def master_catalog_for(manifest)
-    master_catalog = Puppet::Resource::Catalog::Compiler.new.filter(compile_to_catalog(manifest))
+    master_catalog = Puppet::Resource::Catalog::Compiler.new.filter(compile_to_catalog(manifest, node))
   end
 
   def master_and_agent_catalogs_for(manifest)
     compiler = Puppet::Resource::Catalog::Compiler.new
-    master_catalog = compiler.filter(compile_to_catalog(manifest))
+    master_catalog = compiler.filter(compile_to_catalog(manifest, node))
     agent_catalog = Puppet::Resource::Catalog.convert_from(:pson, master_catalog.render(:pson))
     [master_catalog, agent_catalog]
   end

data/spec/integration/parser/compiler_spec.rb

@@ -1048,6 +1048,37 @@ describe Puppet::Parser::Compiler do
       end
     end
 
+    it 'assigns multiple variables from a class' do
+      node = Puppet::Node.new("testnodex")
+      catalog = compile_to_catalog(<<-PP, node)
+      class foo::bar::example($x = 100)  {
+        $a = 10
+        $c = undef
+      }
+      include foo::bar::example
+
+      [$a, $x, $c] = Class['foo::bar::example']
+      notify{'check_me': message => "$a, $x, -${c}-" }
+      PP
+      expect(catalog).to have_resource("Notify[check_me]").with_parameter(:message, "10, 100, --")
+    end
+
+    it 'errors on attempt to assigns multiple variables from a class when variable does not exist' do
+      node = Puppet::Node.new("testnodex")
+      expect do
+        compile_to_catalog(<<-PP, node)
+        class foo::bar::example($x = 100)  {
+          $ah = 10
+          $c = undef
+        }
+        include foo::bar::example
+
+        [$a, $x, $c] = Class['foo::bar::example']
+        notify{'check_me': message => "$a, $x, -${c}-" }
+        PP
+      end.to raise_error(/No value for required variable '\$foo::bar::example::a'/)
+    end
+
     it "should not create duplicate resources when a class is referenced both directly and indirectly by the node classifier (4792)" do
       node = Puppet::Node.new("testnodex")
       node.classes = ['foo', 'bar']
@@ -1243,6 +1274,66 @@ describe Puppet::Parser::Compiler do
       end
     end
 
+    describe "relationships to non existing resources when strict == :error" do
+      before(:each) do
+        Puppet[:strict] = :error
+      end
+
+      [ 'before',
+        'subscribe',
+        'notify',
+        'require'].each do |meta_param|
+        it "are reported as an error when formed via meta parameter #{meta_param}" do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notify{ x : #{meta_param} => Notify[tooth_fairy] }
+            PP
+          }.to raise_error(/Could not find resource 'Notify\[tooth_fairy\]' in parameter '#{meta_param}'/)
+        end
+      end
+    end
+
+    describe "relationships to non existing resources when strict == :warning" do
+      before(:each) do
+        Puppet[:strict] = :warning
+      end
+
+      [ 'before',
+        'subscribe',
+        'notify',
+        'require'].each do |meta_param|
+        it "are reported as a warning when formed via meta parameter #{meta_param}" do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notify{ x : #{meta_param} => Notify[tooth_fairy] }
+            PP
+            expect(@logs).to have_matching_log(/Could not find resource 'Notify\[tooth_fairy\]' in parameter '#{meta_param}'/)
+
+          }.to_not raise_error()
+        end
+      end
+    end
+
+    describe "relationships to non existing resources when strict == :off" do
+      before(:each) do
+        Puppet[:strict] = :off
+      end
+
+      [ 'before',
+        'subscribe',
+        'notify',
+        'require'].each do |meta_param|
+        it "does not log an error for meta parameter #{meta_param}" do
+          expect { 
+            compile_to_catalog(<<-PP)
+              notify{ x : #{meta_param} => Notify[tooth_fairy] }
+            PP
+            expect(@logs).to_not have_matching_log(/Could not find resource 'Notify\[tooth_fairy\]' in parameter '#{meta_param}'/)
+          }.to_not raise_error()
+        end
+      end
+    end
+
     describe "relationships can be formed" do
       def extract_name(ref)
         ref.sub(/File\[(\w+)\]/, '\1')
@@ -1488,10 +1579,10 @@ describe Puppet::Parser::Compiler do
 
       it 'accepts a Resource as a Type' do
         catalog = compile_to_catalog(<<-MANIFEST)
+          define bar($text) { }
           define foo(Type[Bar] $x) {
             notify { 'test': message => $x[text] }
           }
-          define bar($text) { }
           bar { 'joke': text => 'knock knock' }
           foo { 'test': x => Bar[joke] }
         MANIFEST
@@ -1504,7 +1595,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(/Foo\[bar\]:\s+parameter 'a' expects a value for key 'd'\s+parameter 'a' has no 'c' key/m)
+        end.to raise_error(/Foo\[bar\]:\s+parameter 'a' expects a value for key 'd'\s+parameter 'a' unrecognized key 'c'/m)
       end
     end
 
@@ -1574,10 +1665,10 @@ describe Puppet::Parser::Compiler do
 
       it 'accepts a Resource as a Type' do
         catalog = compile_to_catalog(<<-MANIFEST)
+          define bar($text) { }
           class foo(Type[Bar] $x) {
             notify { 'test': message => $x[text] }
           }
-          define bar($text) { }
           bar { 'joke': text => 'knock knock' }
           class { 'foo': x => Bar[joke] }
         MANIFEST

data/spec/integration/parser/parameter_defaults_spec.rb

@@ -42,7 +42,7 @@ require 'puppet_spec/language'
     # @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(',')})"
+      call = call_params.is_a?(String) ? call_params : "example(#{call_params.map {|p| p.nil? ? 'undef' : (p.is_a?(String) ? "'#{p}'" : p )}.join(',')})"
       body = func_bodies[body] if body.is_a?(Integer)
       evaluator = Puppet::Pops::Parser::EvaluatingParser.new()
       collect_notices("function example(#{arg_list}) #{body}") do
@@ -332,5 +332,23 @@ require 'puppet_spec/language'
       $a = 5
       SOURCE
     end
+
+    it 'will permit undef for optional parameters' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == '])
+      Optional[Integer] $a
+      SOURCE
+    end
+
+    it 'undef will override parameter default', :if => call_type == 'Function' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == '])
+      Optional[Integer] $a = 4
+      SOURCE
+    end
+
+    it 'undef will not override parameter default', :unless => call_type == 'Function' do
+      expect_log([<<-SOURCE, 1], [nil], ['$a == 4'])
+      Optional[Integer] $a = 4
+      SOURCE
+    end
   end
 end

data/spec/integration/parser/resource_expressions_spec.rb

@@ -114,7 +114,7 @@ describe "Puppet resource expressions" do
 
     fails( "define a::b { notify { testing: } } 'a::b' { title: }" => /Illegal Resource Type expression.*got String/)
 
-    fails( "Does::Not::Exist { title: }" => /Invalid resource type does::not::exist/)
+    fails( "Does::Not::Exist { title: }" => /Resource type not found: Does::Not::Exist/)
   end
 
   context "local defaults" do