puppet 4.7.1-universal-darwin → 4.8.0-universal-darwin

data/lib/puppet/property.rb

@@ -488,7 +488,7 @@ class Puppet::Property < Puppet::Parameter
       rescue Puppet::Error
         raise
       rescue => detail
-        error = Puppet::ResourceError.new("Could not set '#{value}' on #{self.class.name}: #{detail}", @resource.line, @resource.file, detail)
+        error = Puppet::ResourceError.new("Could not set '#{value}' on #{self.class.name}: #{detail}", @resource.file, @resource.line, detail)
         error.set_backtrace detail.backtrace
         Puppet.log_exception(detail, error.message)
         raise error

data/lib/puppet/provider.rb

@@ -96,8 +96,7 @@ class Puppet::Provider
   attr_accessor :resource
 
   # Convenience methods - see class method with the same name.
-  # @see execute
-  # @return (see execute)
+  # @return (see self.execute)
   def execute(*args)
     Puppet::Util::Execution.execute(*args)
   end
@@ -108,8 +107,7 @@ class Puppet::Provider
   end
 
   # Convenience methods - see class method with the same name.
-  # @see execpipe
-  # @return (see execpipe)
+  # @return (see self.execpipe)
   def execpipe(*args, &block)
     Puppet::Util::Execution.execpipe(*args, &block)
   end
@@ -120,8 +118,7 @@ class Puppet::Provider
   end
 
   # Convenience methods - see class method with the same name.
-  # @see execfail
-  # @return (see execfail)
+  # @return (see self.execfail)
   def execfail(*args)
     Puppet::Util::Execution.execfail(*args)
   end

data/lib/puppet/provider/mcx/mcxcontent.rb

@@ -36,7 +36,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
 
   def self.instances
     mcx_list = []
-    TypeMap.keys.each do |ds_type|
+    TypeMap.each_key do |ds_type|
       ds_path = "/Local/Default/#{TypeMap[ds_type]}"
       output = dscl 'localhost', '-list', ds_path
       member_list = output.split

data/lib/puppet/provider/mount/parsed.rb

@@ -209,14 +209,20 @@ Puppet::Type.type(:mount).provide(
 
     # Update fstab entries that are mounted
     providers.each do |prov|
-      if mounts.delete({:name => prov.get(:name), :mounted => :yes}) then
-        prov.set(:ensure => :mounted)
+      mounts.delete_if do |mount|
+        if mount[:name] == prov.get(:name) && mount[:mounted] == :yes
+          prov.set(:ensure => :mounted)
+          prov.set(:live_options => mount[:live_options])
+          true
+        else
+          false
+        end
       end
     end
 
     # Add mounts that are not in fstab but mounted
     mounts.each do |mount|
-      providers << new(:ensure => :ghost, :name => mount[:name])
+      providers << new(:ensure => :ghost, :name => mount[:name], :live_options => mount[:live_options])
     end
     providers
   end
@@ -232,6 +238,7 @@ Puppet::Type.type(:mount).provide(
     #   to fstab we need to know if the device was mounted before)
     mountinstances.each do |hash|
       if mount = resources[hash[:name]]
+        mount.provider.set(:live_options => hash[:live_options])
         case mount.provider.get(:ensure)
         when :absent  # Mount not in fstab
           mount.provider.set(:ensure => :ghost)
@@ -254,6 +261,7 @@ Puppet::Type.type(:mount).provide(
       else
         / on (\S*)/
     end
+
     instances = []
     mount_output = mountcmd.split("\n")
     if mount_output.length >= 2 and mount_output[1] =~ /^[- \t]*$/
@@ -264,7 +272,13 @@ Puppet::Type.type(:mount).provide(
     end
     mount_output.each do |line|
       if match = regex.match(line) and name = match.captures.first
-        instances << {:name => name, :mounted => :yes} # Only :name is important here
+        live_options_platforms = ["Linux", "Darwin"]
+        if live_options_platforms.include? Facter.value(:kernel)
+          options = line[/\(.*\)/].tr('()', '')
+          instances << {:name => name, :mounted => :yes, :live_options => options}
+        else
+          instances << {:name => name, :mounted => :yes}
+        end
       else
         raise Puppet::Error, "Could not understand line #{line} from mount output"
       end

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -22,6 +22,12 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   confine :feature         => :cfpropertylist
   defaultfor :operatingsystem => :darwin
 
+  # There is no generalized mechanism for provider cache management, but we can
+  # use post_resource_eval, which will be run for each suitable provider at the
+  # end of each transaction. Use this to clear @all_present after each run.
+  def self.post_resource_eval
+    @all_present = nil
+  end
 
   # JJM 2007-07-25: This map is used to map NameService attributes to their
   #     corresponding DirectoryService attribute names.
@@ -87,13 +93,15 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   end
 
   def self.list_all_present
-    # JJM: List all objects of this Puppet::Type already present on the system.
-    begin
-      dscl_output = execute(get_exec_preamble("-list"))
-    rescue Puppet::ExecutionFailure
-      fail("Could not get #{@resource_type.name} list from DirectoryService")
+    @all_present ||= begin
+      # JJM: List all objects of this Puppet::Type already present on the system.
+      begin
+        dscl_output = execute(get_exec_preamble("-list"))
+      rescue Puppet::ExecutionFailure
+        fail("Could not get #{@resource_type.name} list from DirectoryService")
+      end
+      dscl_output.split("\n")
     end
-    dscl_output.split("\n")
   end
 
   def self.parse_dscl_plist_data(dscl_output)
@@ -102,7 +110,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def self.generate_attribute_hash(input_hash, *type_properties)
     attribute_hash = {}
-    input_hash.keys.each do |key|
+    input_hash.each_key do |key|
       ds_attribute = key.sub("dsAttrTypeStandard:", "")
       next unless (ds_to_ns_attribute_map.keys.include?(ds_attribute) and type_properties.include? ds_to_ns_attribute_map[ds_attribute])
       ds_value = input_hash[key]

data/lib/puppet/provider/package/gem.rb

@@ -92,7 +92,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
 
   def install(useversion = true)
     command = [command(:gemcmd), "install"]
-    command << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
+    if Puppet.features.microsoft_windows?
+      version = resource[:ensure]
+      command << "-v" << %Q["#{version}"] if (! resource[:ensure].is_a? Symbol) and useversion
+    else
+      command << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
+    end
 
     if source = resource[:source]
       begin

data/lib/puppet/provider/package/pip.rb

@@ -2,7 +2,6 @@
 # <http://pip.pypa.io/>
 
 require 'puppet/provider/package'
-require 'xmlrpc/client'
 require 'puppet/util/http_proxy'
 
 Puppet::Type.type(:package).provide :pip,

data/lib/puppet/provider/package/pkg.rb

@@ -203,10 +203,14 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     else
       command = 'update'
     end
+    args = ['--accept']
+    if Puppet::Util::Package.versioncmp(Facter.value(:operatingsystemrelease), '11.2') >= 0
+      args.push('--sync-actuators-timeout', '900')
+    end
     unless should.is_a? Symbol
       name += "@#{should}"
     end
-    r = exec_cmd(command(:pkg), command, '--accept', name)
+    r = exec_cmd(command(:pkg), command, *args, name)
     return r if nofail
     raise Puppet::Error, "Unable to update #{r[:out]}" if r[:exit] != 0
   end

data/lib/puppet/provider/package/pkgng.rb

@@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   def self.prefetch(resources)
     packages = instances
-    resources.keys.each do |name|
+    resources.each_key do |name|
       if provider = packages.find{|p| p.name == name or p.origin == name }
         resources[name].provider = provider
       end

data/lib/puppet/provider/package/yum.rb

@@ -156,6 +156,16 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     operation = :install
 
     case should
+    when :latest
+      current_package = self.query
+      if current_package && !current_package[:ensure].to_s.empty?
+        operation = update_command
+        self.debug "Ensuring latest, so using #{operation}"
+      else
+        self.debug "Ensuring latest, but package is absent, so using #{:install}"
+        operation = :install
+      end
+      should = nil
     when true, false, Symbol
       # pass
       should = nil

data/lib/puppet/provider/service/launchd.rb

@@ -135,6 +135,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     @label_to_path_map = {}
     launchd_paths.each do |path|
       return_globbed_list_of_file_paths(path).each do |filepath|
+        Puppet.debug("Reading launchd plist #{filepath}")
         job = read_plist(filepath)
         next if job.nil?
         if job.has_key?("Label")

data/lib/puppet/provider/user/directoryservice.rb

@@ -100,7 +100,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # supported by the user type.
   def self.generate_attribute_hash(input_hash)
     attribute_hash = {}
-    input_hash.keys.each do |key|
+    input_hash.each_key do |key|
       ds_attribute = key.sub("dsAttrTypeStandard:", "")
       next unless ds_to_ns_attribute_map.keys.include?(ds_attribute)
       ds_value = input_hash[key]
@@ -121,7 +121,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     end
     attribute_hash[:ensure]         = :present
     attribute_hash[:provider]       = :directoryservice
-    attribute_hash[:shadowhashdata] = get_attribute_from_dscl('Users', attribute_hash[:name], 'ShadowHashData')
+    attribute_hash[:shadowhashdata] = input_hash['dsAttrTypeNative:ShadowHashData']
 
     ##############
     # Get Groups #
@@ -145,12 +145,12 @@ Puppet::Type.type(:user).provide :directoryservice do
       attribute_hash[:password] = '*'
     else
       embedded_binary_plist = get_embedded_binary_plist(attribute_hash[:shadowhashdata])
-      if embedded_binary_plist['SALTED-SHA512']
-        attribute_hash[:password] = get_salted_sha512(embedded_binary_plist)
-      else
+      if embedded_binary_plist['SALTED-SHA512-PBKDF2']
         attribute_hash[:password]   = get_salted_sha512_pbkdf2('entropy', embedded_binary_plist)
         attribute_hash[:salt]       = get_salted_sha512_pbkdf2('salt', embedded_binary_plist)
         attribute_hash[:iterations] = get_salted_sha512_pbkdf2('iterations', embedded_binary_plist)
+      elsif embedded_binary_plist['SALTED-SHA512']
+        attribute_hash[:password] = get_salted_sha512(embedded_binary_plist)
       end
     end
 
@@ -178,7 +178,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # plist library doesn't read binary plists, so we need to
   # extract the binary plist, convert it to XML, and return it.
   def self.get_embedded_binary_plist(shadow_hash_data)
-    embedded_binary_plist = Array(shadow_hash_data['dsAttrTypeNative:ShadowHashData'][0].delete(' ')).pack('H*')
+    embedded_binary_plist = Array(shadow_hash_data[0].delete(' ')).pack('H*')
     convert_binary_to_hash(embedded_binary_plist)
   end
 

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -58,7 +58,7 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
   # @return [void]
   def self.prefetch(resources)
     repos = instances
-    resources.keys.each do |name|
+    resources.each_key do |name|
       if provider = repos.find { |repo| repo.name == name }
         resources[name].provider = provider
       end

data/lib/puppet/provider/zpool/zpool.rb

@@ -23,7 +23,7 @@ Puppet::Type.type(:zpool).provide(:zpool) do
     tmp = []
 
     #order matters here :(
-    pool_array.reverse.each do |value|
+    pool_array.reverse_each do |value|
       sym = nil
       case value
       when "spares";

data/lib/puppet/resource.rb

@@ -31,7 +31,7 @@ class Puppet::Resource
   TYPE_NODE  = 'Node'.freeze
   TYPE_SITE  = 'Site'.freeze
 
-  def self.from_data_hash(data)
+  def self.from_data_hash(data, json_deserializer = nil)
     raise ArgumentError, "No resource type provided in serialized data" unless type = data['type']
     raise ArgumentError, "No resource title provided in serialized data" unless title = data['title']
 
@@ -41,6 +41,15 @@ class Puppet::Resource
       params.each { |param, value| resource[param] = value }
     end
 
+    if ext_params = data['ext_parameters']
+      raise Puppet::Error, 'Unable to deserialize non-Data type parameters unless a deserializer is provided' unless json_deserializer
+      reader = json_deserializer.reader
+      ext_params.each do |param, value|
+        reader.re_initialize([value])
+        resource[param] = json_deserializer.read
+      end
+    end
+
     if sensitive_parameters = data['sensitive_parameters']
       resource.sensitive_parameters = sensitive_parameters.map(&:to_sym)
     end
@@ -62,7 +71,7 @@ class Puppet::Resource
     "#{@type}[#{@title}]#{to_hash.inspect}"
   end
 
-  def to_data_hash
+  def to_data_hash(json_serializer = nil)
     data = ([:type, :title, :tags] + ATTRIBUTES).inject({}) do |hash, param|
       next hash unless value = self.send(param)
       hash[param.to_s] = value
@@ -71,23 +80,56 @@ class Puppet::Resource
 
     data["exported"] ||= false
 
-    params = self.to_hash.inject({}) do |hash, ary|
-      param, value = ary
-
+    ext_params = {}
+    params = {}
+    self.to_hash.each_pair do |param, value|
       # Don't duplicate the title as the namevar
-      next hash if param == namevar and value == title
-
-      hash[param] = Puppet::Resource.value_to_pson_data(value)
-      hash
+      unless param == namevar && value == title
+        value = Puppet::Resource.value_to_pson_data(value)
+        if is_json_type?(value)
+          params[param] = value
+        elsif json_serializer.nil?
+          Puppet.warning("Resource '#{to_s}' contains a #{value.class.name} value. It will be converted to the String '#{value}'")
+          params[param] = value
+        else
+          ext_params[param] = value
+        end
+      end
     end
 
-    data["parameters"] = params unless params.empty?
+    data['parameters'] = params unless params.empty?
+    unless ext_params.empty?
+      writer = json_serializer.writer
+      ext_params.each_key do |key|
+        writer.clear_io
+        json_serializer.write(ext_params[key])
+        writer.finish
+        ext_params[key] = writer.to_a[0]
+      end
+      data['ext_parameters'] = ext_params
+    end
 
     data["sensitive_parameters"] = sensitive_parameters unless sensitive_parameters.empty?
 
     data
   end
 
+  # @param [Object] value The value to test
+  # @return [Boolean] `true` if the value can be represented as JSON
+  # @api private
+  def is_json_type?(value)
+    case value
+    when NilClass, TrueClass, FalseClass, Integer, Float, String
+      true
+    when Array
+      value.all? { |elem| is_json_type?(elem) }
+    when Hash
+      value.all? { |key, val| key.is_a?(String) && is_json_type?(val) }
+    else
+      false
+    end
+  end
+
   def self.value_to_pson_data(value)
     if value.is_a? Array
       value.map{|v| value_to_pson_data(v) }
@@ -252,7 +294,7 @@ class Puppet::Resource
       #   * a "classic" 3.x ruby plugin
       #   * a compatible implementation (e.g. loading from pcore metadata)
       #   * a resolved user defined type
-      # 
+      #
       # ...then, modify the parameters to the "old" (agent side compatible) way
       # of describing the type/title with string/symbols.
       #
@@ -319,7 +361,7 @@ class Puppet::Resource
   # A resource is a capability (instance) if its underlying type is a
   # capability type
   def is_capability?
-    resource_type and resource_type.is_capability?
+    !resource_type.nil? && resource_type.is_capability?
   end
 
   # Returns the value of the 'export' metaparam as an Array

data/lib/puppet/resource/capability_finder.rb

@@ -26,7 +26,12 @@ module Puppet::Resource::CapabilityFinder
       raise Puppet::DevError, 'PuppetDB is not available'
     end
 
-    resources = search(environment, nil, cap)
+    resources = search(nil, nil, cap)
+
+    if resources.size > 1
+      Puppet.debug "Found multiple resources when looking up capability #{cap}, filtering by environment #{environment}"
+      resources = resources.select { |r| r['tags'].any? { |t| t == "producer:#{environment}" } }
+    end
 
     if resources.size > 1 && code_id
       Puppet.debug "Found multiple resources when looking up capability #{cap}, filtering by code id #{code_id}"
@@ -41,6 +46,7 @@ module Puppet::Resource::CapabilityFinder
     end
 
     if resource_hash = resources.first
+      resource_hash['type'] = cap.resource_type
       instantiate_resource(resource_hash)
     else
       Puppet.debug "Could not find capability resource #{cap} in PuppetDB"
@@ -53,9 +59,14 @@ module Puppet::Resource::CapabilityFinder
       'and',
       ['=', 'type', cap.type.capitalize],
       ['=', 'title', cap.title.to_s],
-      ['=', 'tag', "producer:#{environment}"]
     ]
 
+    if environment.nil?
+      query_terms << ['~', 'tag', "^producer:"]
+    else
+      query_terms << ['=', 'tag', "producer:#{environment}"]
+    end
+
     unless code_id.nil?
       query_terms << ['in', 'certname',
         ['extract', 'certname',
@@ -101,13 +112,8 @@ module Puppet::Resource::CapabilityFinder
   private
 
   def self.instantiate_resource(resource_hash)
-    resource = Puppet::Resource.new(resource_hash['type'],
-                                    resource_hash['title'])
-    real_type = Puppet::Type.type(resource.type)
-    if real_type.nil?
-      fail Puppet::ParseError,
-        "Could not find resource type #{resource.type} returned from PuppetDB"
-    end
+    real_type = resource_hash['type']
+    resource = Puppet::Resource.new(real_type, resource_hash['title'])
     real_type.parameters.each do |param|
       param = param.to_s
       next if param == 'name'