puppet 4.2.0 → 4.3.0

data/lib/puppet/type.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'puppet'
 require 'puppet/util/log'
 require 'puppet/util/metric'
@@ -106,6 +107,24 @@ class Type
     attr_reader :properties
   end
 
+  # Allow declaring that a type is actually a capability
+  class << self
+    attr_accessor :is_capability
+
+    def is_capability?
+      is_capability
+    end
+  end
+
+  # Returns whether this type represents an application instance; since
+  # only defined types, i.e., instances of Puppet::Resource::Type can
+  # represent application instances, this implementation always returns
+  # +false+. Having this method though makes code checking whether a
+  # resource is an application instance simpler
+  def self.application?
+      false
+  end
+
   # Returns all the attribute names of the type in the appropriate order.
   # The {key_attributes} come first, then the {provider}, then the {properties}, and finally
   # the {parameters} and {metaparams},
@@ -639,7 +658,7 @@ class Type
   def []=(name,value)
     name = name.intern
 
-    fail("Invalid parameter #{name}") unless self.class.validattr?(name)
+    fail("no parameter named '#{name}'") unless self.class.validattr?(name)
 
     if name == :name && nv = name_var
       name = nv
@@ -1539,7 +1558,7 @@ class Type
 
   newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :NONE}) do
     desc "One or more resources that this resource depends on, expressed as
-      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_datatypes.html#resource-references).
+      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1553,7 +1572,7 @@ class Type
 
   newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :ALL_EVENTS, :callback => :refresh}) do
     desc "One or more resources that this resource depends on, expressed as
-      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_datatypes.html#resource-references).
+      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1571,7 +1590,7 @@ class Type
 
   newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :NONE}) do
     desc "One or more resources that depend on this resource, expressed as
-      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_datatypes.html#resource-references).
+      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1585,7 +1604,7 @@ class Type
 
   newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do
     desc "One or more resources that depend on this resource, expressed as
-      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_datatypes.html#resource-references).
+      [resource references](http://docs.puppetlabs.com/puppet/latest/reference/lang_data_resource_reference.html).
       Multiple resources can be specified as an array of references. When this
       attribute is present:
 
@@ -1628,6 +1647,57 @@ class Type
     }
   end
 
+  newmetaparam(:export, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :NONE}) do
+          desc <<EOS
+Export a capability resource.
+
+The value of this parameter must be a reference to a capability resource,
+or an array of such references. Each capability resource referenced here
+will be instantiated in the node catalog and exported to consumers of this
+resource. The title of the capability resource will be the title given in
+the reference, and all other attributes of the resource will be filled
+according to the corresponding produces statement.
+
+It is an error if this metaparameter references resources whose type is not
+a capability type, or of there is no produces clause for the type of the
+current resource and the capability resource mentioned in this parameter.
+
+For example:
+
+define web(..) { .. }
+Web produces Http { .. }
+web { server:
+  export => Http[main_server]
+}
+EOS
+  end
+
+  newmetaparam(:consume, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :NONE}) do
+          desc <<EOS
+Consume a capability resource.
+
+The value of this parameter must be a reference to a capability resource,
+or an array of such references. Each capability resource referenced here
+must have been exported by another resource in the same environment.
+
+The referenced capability resource(s) will be looked up, added to the
+current node catalog, and processed following the underlying consumes
+clause.
+
+It is an error if this metaparameter references resources whose type is not
+a capability type, or of there is no consumes clause for the type of the
+current resource and the capability resource mentioned in this parameter.
+
+For example:
+
+define web(..) { .. }
+Web consumes Sql { .. }
+web { server:
+  consume => Sql[my_db]
+}
+EOS
+end
+
   ###############################
   # All of the provider plumbing for the resource types.
   require 'puppet/provider'
@@ -1795,7 +1865,7 @@ class Type
   def self.providify
     return if @paramhash.has_key? :provider
 
-    newparam(:provider) do
+    param = newparam(:provider) do
       # We're using a hacky way to get the name of our type, since there doesn't
       # seem to be a correct way to introspect this at the time this code is run.
       # We expect that the class in which this code is executed will be something
@@ -1855,7 +1925,8 @@ class Type
           provider
         end
       end
-    end.parenttype = self
+    end
+    param.parenttype = self
   end
 
   # @todo this needs a better explanation

data/lib/puppet/util/command_line.rb

@@ -117,6 +117,10 @@ module Puppet
               configured_environment.each_plugin_directory do |dir|
                 $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
               end
+
+              # Puppet requires Facter, which initializes its lookup paths. Reset Facter to
+              # pickup the new $LOAD_PATH.
+              Facter.reset
             end
           end
 

data/lib/puppet/util/execution.rb

@@ -1,3 +1,4 @@
+require 'timeout'
 require 'puppet/file_system/uniquefile'
 
 module Puppet
@@ -192,8 +193,23 @@ module Puppet::Util::Execution
       if execution_stub = Puppet::Util::ExecutionStub.current_value
         return execution_stub.call(*exec_args)
       elsif Puppet.features.posix?
-        child_pid = execute_posix(*exec_args)
-        exit_status = Process.waitpid2(child_pid).last.exitstatus
+        child_pid = nil
+        begin
+          child_pid = execute_posix(*exec_args)
+          exit_status = Process.waitpid2(child_pid).last.exitstatus
+          child_pid = nil
+        rescue Timeout::Error => e
+          # NOTE: For Ruby 2.1+, an explicit Timeout::Error class has to be
+          # passed to Timeout.timeout in order for there to be something for
+          # this block to rescue.
+          unless child_pid.nil?
+            Process.kill(:TERM, child_pid)
+            # Spawn a thread to reap the process if it dies.
+            Thread.new { Process.waitpid(child_pid) }
+          end
+
+          raise e
+        end
       elsif Puppet.features.microsoft_windows?
         process_info = execute_windows(*exec_args)
         begin

data/lib/puppet/util/tagging.rb

@@ -18,8 +18,10 @@ module Puppet::Util::Tagging
       if @tags.add?(name)
         # not seen before, so now we test if it is valid
         if name =~ ValidTagRegex
+          if split_qualified_tags?
           # avoid adding twice by first testing if the string contains '::'
-          @tags.merge(name.split('::')) if name.include?('::')
+            @tags.merge(name.split('::')) if name.include?('::')
+          end
         else
           @tags.delete(name)
           fail(Puppet::ParseError, "Invalid tag '#{name}'")
@@ -106,6 +108,10 @@ module Puppet::Util::Tagging
 
   private
 
+  def split_qualified_tags?
+    true
+  end
+
   def new_tags
     Puppet::Util::TagSet.new
   end

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

@@ -214,8 +214,11 @@ module Puppet::Util::Windows::ADSI
     end
 
     def password=(password)
-      native_user.SetPassword(password)
-      commit
+      if !password.nil?
+        native_user.SetPassword(password)
+        commit
+      end
+
       fADS_UF_DONT_EXPIRE_PASSWD = 0x10000
       add_flag("UserFlags", fADS_UF_DONT_EXPIRE_PASSWD)
     end

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

@@ -352,7 +352,10 @@ module Puppet::Util::Windows::Security
     dacl.allow(well_known_nobody_sid, nobody_allow)
 
     # TODO: system should be first?
-    dacl.allow(well_known_system_sid, system_allow)
+    flags = !isdir ? 0 :
+      Puppet::Util::Windows::AccessControlEntry::CONTAINER_INHERIT_ACE |
+      Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE
+    dacl.allow(well_known_system_sid, system_allow, flags)
 
     # add inherit-only aces for child dirs and files that are created within the dir
     inherit_only = Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE

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

@@ -809,7 +809,7 @@ module Win32
     # Returns whether or not the scheduled task exists.
     def exists?(job_name)
       bool = false
-      Dir.foreach('C:/Windows/Tasks'){ |file|
+      Dir.foreach("#{ENV['SystemRoot']}/Tasks"){ |file|
         if File.basename(file, '.job') == job_name
           bool = true
           break

data/lib/puppet/util.rb

@@ -260,7 +260,15 @@ module Util
       $stdout.reopen(stdout)
       $stderr.reopen(stderr)
 
-      3.upto(256){|fd| IO::new(fd).close rescue nil}
+      begin
+        Dir.foreach('/proc/self/fd') do |f|
+          if f != '.' && f != '..' && f.to_i >= 3
+            IO::new(f.to_i).close rescue nil
+          end
+        end
+      rescue Errno::ENOENT # /proc/self/fd not found
+        3.upto(256){|fd| IO::new(fd).close rescue nil}
+      end
 
       block.call if block
     end

data/lib/puppet/version.rb

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

data/lib/puppet.rb

@@ -223,6 +223,18 @@ module Puppet
     @context.override(bindings, description, &block)
   end
 
+  # @param name The name of a context key to ignore; intended for test usage.
+  # @api private
+  def self.ignore(name)
+    @context.ignore(name)
+  end
+
+  # @param name The name of a previously ignored context key to restore; intended for test usage.
+  # @api private
+  def self.restore(name)
+    @context.restore(name)
+  end
+
   # @api private
   def self.mark_context(name)
     @context.mark(name)

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

@@ -0,0 +1,3 @@
+---
+a: This is A
+b: This is B

data/spec/fixtures/unit/application/environments/production/environment.conf

@@ -0,0 +1 @@
+environment_data_provider = 'hiera'

data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/data/bad.json

@@ -0,0 +1,3 @@
+{
+    "test::param_a": "env data param_a is 10",
+}

data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

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

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

@@ -0,0 +1,5 @@
+class test($param_a) {
+  notify { "$param_a": }
+}
+
+include test

data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/data/bad.yaml

@@ -0,0 +1,3 @@
+---
+ {
+one::test::param_c: env data param_c is 300

data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

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

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

@@ -0,0 +1,5 @@
+class test($param_a) {
+  notify { "$param_a": }
+}
+
+include test

data/spec/fixtures/unit/data_providers/environments/hiera_defaults/data/common.yaml

@@ -0,0 +1,2 @@
+---
+one::test::param_c: env data param_c is 300

data/spec/fixtures/unit/data_providers/environments/hiera_defaults/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

@@ -0,0 +1 @@
+include one::test

data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/data/common.yaml

@@ -0,0 +1,2 @@
+---
+one::test::param_a: module data param_a is 100

data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/manifests/init.pp

@@ -0,0 +1,5 @@
+class one {
+  class test($param_a = "param default is 100", $param_b = "param default is 200", $param_c = "param default is 300") {
+    notify { "$param_a, $param_b, $param_c": }
+  }
+}

data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/metadata.json

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

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

@@ -0,0 +1,3 @@
+{
+    "test::param_a": "env data param_a is 10"
+}

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

@@ -0,0 +1,2 @@
+---
+test::param_b: env data param_b is 20

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

@@ -0,0 +1,3 @@
+{
+    "test::param_c": "env data param_c is 30"
+}

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

@@ -0,0 +1,2 @@
+---
+test::param_d: env data param_d is 40

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data2/single.yaml

@@ -0,0 +1,2 @@
+---
+test::param_e: env data param_e is 50

data/spec/fixtures/unit/data_providers/environments/hiera_env_config/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

@@ -0,0 +1,18 @@
+---
+:version: 4
+:hierarchy:
+  - :name: "name"
+    :backend: yaml
+  - :name: "one path"
+    :backend: yaml
+    :path: "single"
+  - :name: "two paths"
+    :backend: json
+    :paths:
+      - "first"
+      - "second"
+  - :name:  'other datadir'
+    :backend: yaml
+    :datadir: "data2"
+    :path: "single"
+:datadir: "data1"

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

@@ -0,0 +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": }
+}
+
+include test

data/spec/fixtures/unit/data_providers/environments/hiera_misc/data/common.yaml

@@ -0,0 +1,46 @@
+---
+lookup_options:
+  one::lopts_test::hash:
+    merge: deep
+
+one::test::param:
+  key1: env 1
+
+one::array:
+  - second
+  - third
+  - fourth
+
+one::lopts_test::hash:
+  a: A
+  b: B
+  m:
+    ma: MA
+    mb: MB
+
+one::loptsm_test::hash:
+  a: A
+  b: B
+  m:
+    ma: MA
+    mb: MB
+
+ukey1: Some value
+
+target_lookup: with lookup
+target_hiera: with hiera
+target_alias: Value from interpolation with alias
+
+km_default: 'Value from interpolation %{target_default}'
+km_alias: '%{alias("target_alias")}'
+km_lookup: 'Value from interpolation %{lookup("target_lookup")}'
+km_hiera: 'Value from interpolation %{hiera("target_hiera")}'
+km_scope: 'Value from interpolation %{scope("target_scope")}'
+km_literal: 'Value from interpolation %{literal("with literal")}'
+
+km_sqalias: "%{alias('target_alias')}"
+recursive: '%{r1}'
+
+km_qualified: "Value from qualified interpolation OS = %{os.name}"
+
+km_multi: "cluster/%{literal('%')}{::cluster}/%{literal('%')}{role}"

data/spec/fixtures/unit/data_providers/environments/hiera_misc/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

@@ -0,0 +1 @@
+include one::test

data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/data/common.yaml

@@ -0,0 +1,30 @@
+---
+one::test::param:
+  key2: module 2
+
+one::array:
+  - first
+  - second
+  - third
+
+one::lopts_test::hash:
+  a: A
+  c: C
+  m:
+    ma: MA
+    mc: MC
+
+one::loptsm_test::hash:
+  a: A
+  c: C
+  m:
+    ma: MA
+    mc: MC
+
+lookup_options:
+  one::loptsm_test::hash:
+    merge: deep
+
+
+# should not be found since it's not qualified with module name
+ukey2: Some value

data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/manifests/init.pp

@@ -0,0 +1,13 @@
+class one {
+  class test($param = { key1 => 'default 1', key2 => 'default 2' }) {
+    notify { "${param[key1]}, ${param[key2]}": }
+  }
+
+  class lopts_test($hash = { a => 'default A', b => 'default B', c => 'default C', m => {} }) {
+    notify { "${hash[a]}, ${hash[b]}, ${hash[c]}, ${hash[m]['ma']}, ${hash[m]['mb']}, ${hash[m]['mc']}": }
+  }
+
+  class loptsm_test($hash = { a => 'default A', b => 'default B', c => 'default C', m => {} }) {
+    notify { "${hash[a]}, ${hash[b]}, ${hash[c]}, ${hash[m]['ma']}, ${hash[m]['mb']}, ${hash[m]['mc']}": }
+  }
+}

data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/metadata.json

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

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/environment.conf

@@ -0,0 +1,2 @@
+# Use the 'sample' env data provider (in this fixture)
+environment_data_provider=hiera

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

@@ -0,0 +1 @@
+include one::test

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json

@@ -0,0 +1,3 @@
+{
+    "one::test::param_a": "module data param_a is 100"
+}

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml

@@ -0,0 +1 @@
+one::test::param_b: module data param_b is 200

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/second.json

@@ -0,0 +1,3 @@
+{
+    "one::test::param_c": "module data param_c is 300"
+}

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/single.yaml

@@ -0,0 +1,2 @@
+---
+one::test::param_d: module data param_d is 400

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data2/single.yaml

@@ -0,0 +1,2 @@
+---
+one::test::param_e: module data param_e is 500

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml

@@ -0,0 +1,18 @@
+---
+:version: 4
+:hierarchy:
+  - :name: "name"
+    :backend: yaml
+  - :name: "one path"
+    :backend: yaml
+    :path: "single"
+  - :name: "two paths"
+    :backend: json
+    :paths:
+      - "first"
+      - "second"
+  - :name:  'other datadir'
+    :backend: yaml
+    :datadir: "data2"
+    :path: "single"
+:datadir: "data1"

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/manifests/init.pp

@@ -0,0 +1,5 @@
+class one {
+  class test($param_a = "param default is 100", $param_b = "param default is 200", $param_c = "param default is 300", $param_d = "param default is 400", $param_e = "param default is 500") {
+    notify { "$param_a, $param_b, $param_c, $param_d, $param_e": }
+  }
+}

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json

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

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb

@@ -24,6 +24,7 @@ module PuppetX::Helindbe
     end
 
     def lookup(name, scope, merge)
+      throw :no_such_key unless @data.include?(name)
       @data[name]
     end
   end

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb

@@ -25,6 +25,7 @@ module PuppetX::Helindbe
     end
 
     def lookup(name, scope, merge)
+      throw :no_such_key unless @data.include?(name)
       @data[name]
     end
   end

data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/data/first.json

@@ -0,0 +1,3 @@
+{
+    "hieraprovider::test::param_a": "module data param_a is 100"
+}