puppet 5.5.22-universal-darwin → 6.0.0-universal-darwin

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

@@ -36,7 +36,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age, :manages_shell
 
   def check_valid_shell
-    unless File.exist?(@resource.should(:shell))
+    unless File.exists?(@resource.should(:shell))
       raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
     end
     unless File.executable?(@resource.should(:shell).to_s)
@@ -202,10 +202,6 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     shadow_entry[5].empty? ? -1 : shadow_entry[5]
   end
 
-  def has_sensitive_data?(property = nil)
-    false
-  end
-
   # Read in /etc/shadow, find the line for our used and rewrite it with the
   # new pw.  Smooth like 80 grit sandpaper.
   #

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

@@ -21,11 +21,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :expiry, :method => :sp_expire,
     :munge => proc { |value|
       if value == :absent
-        if Facter.value(:operatingsystem)=='SLES' && Facter.value(:operatingsystemmajrelease) == "11"
-          -1
-        else
-          ''
-        end
+        ''
       else
         case Facter.value(:operatingsystem)
         when 'Solaris'
@@ -59,43 +55,35 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
      get(:uid)
   end
 
-  def comment
-     return localcomment if @resource.forcelocal?
-     get(:comment)
-  end
-
   def finduser(key, value)
     passwd_file = "/etc/passwd"
-    passwd_keys = [:account, :password, :uid, :gid, :gecos, :directory, :shell]
+    passwd_keys = ['account', 'password', 'uid', 'gid', 'gecos', 'directory', 'shell']
     index = passwd_keys.index(key)
-    @passwd_content ||= File.read(passwd_file)
-    @passwd_content.each_line do |line|
-      user = line.split(":")
-      if user[index] == value
-        return Hash[passwd_keys.zip(user)]
+    File.open(passwd_file) do |f|
+      f.each_line do |line|
+         user = line.split(":")
+         if user[index] == value
+             f.close
+             return user
+         end
       end
     end
     false
   end
 
   def local_username
-    finduser(:uid, @resource.uid)
+    finduser('uid', @resource.uid)
   end
 
   def localuid
-    user = finduser(:account, resource[:name])
-    return user[:uid] if user
+    user = finduser('account', resource[:name])
+    return user[2] if user
     false
   end
 
-  def localcomment
-    user = finduser(:account, resource[:name])
-    user[:gecos]
-  end
-
   def shell=(value)
     check_valid_shell
-    set(:shell, value)
+    set("shell", value)
   end
 
   verify :gid, "GID must be an integer" do |value|
@@ -117,18 +105,18 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if (!@resource.allowdupe?) && @resource.forcelocal?
-       if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
-           raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
+    if not @resource.allowdupe? and @resource.forcelocal?
+       if @resource.should(:uid) and finduser('uid', @resource.should(:uid).to_s)
+           raise(Puppet::Error, "UID #{@resource.should(:uid).to_s} already exists, use allowdupe to force user creation")
        end
-    elsif @resource.allowdupe? && (!@resource.forcelocal?)
+    elsif @resource.allowdupe? and not @resource.forcelocal?
        return ["-o"]
     end
     []
   end
 
   def check_valid_shell
-    unless File.exist?(@resource.should(:shell))
+    unless File.exists?(@resource.should(:shell))
       raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
     end
     unless File.executable?(@resource.should(:shell).to_s)
@@ -138,23 +126,25 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def check_manage_home
     cmd = []
-    if @resource.managehome?
-      # libuser does not implement the -m flag
-      cmd << "-m" unless @resource.forcelocal?
-    else
-      osfamily = Facter.value(:osfamily)
-      osversion = Facter.value(:operatingsystemmajrelease).to_i
-      # SLES 11 uses pwdutils instead of shadow, which does not have -M
-      # Solaris and OpenBSD use different useradd flavors
-      unless osfamily =~ /Solaris|OpenBSD/ || osfamily == 'Suse' && osversion <= 11
-        cmd << "-M"
-      end
+    if @resource.managehome? and not @resource.forcelocal?
+      cmd << "-m"
+    elsif not @resource.managehome? and Facter.value(:osfamily) == 'RedHat'
+      cmd << "-M"
+    end
+    cmd
+  end
+
+  def check_manage_expiry
+    cmd = []
+    if @resource[:expiry] and not @resource.forcelocal?
+      cmd << "-e #{@resource[:expiry]}"
     end
+
     cmd
   end
 
   def check_system_users
-    if self.class.system_users? && resource.system?
+    if self.class.system_users? and resource.system?
       ["-r"]
     else
       []
@@ -166,35 +156,19 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # validproperties is a list of properties in undefined order
     # sort them to have a predictable command line in tests
     Puppet::Type.type(:user).validproperties.sort.each do |property|
-      value = get_value_for_property(property)
-      next if value.nil?
+      next if property == :ensure
+      next if property_manages_password_age?(property)
+      next if property == :groups and @resource.forcelocal?
+      next if property == :expiry and @resource.forcelocal?
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
-      cmd << flag(property) << munge(property, value)
+      if value = @resource.should(property) and value != ""
+        cmd << flag(property) << munge(property, value)
+      end
     end
     cmd
   end
 
-  def get_value_for_property(property)
-    return nil if property == :ensure
-    return nil if property_manages_password_age?(property)
-    return nil if property == :groups and @resource.forcelocal?
-    return nil if property == :expiry and @resource.forcelocal?
-    value = @resource.should(property)
-    return nil if !value || value == ""
-
-    value
-  end
-
-  def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
-    properties = property ? [property] : Puppet::Type.type(:user).validproperties
-    properties.any? do |prop|
-      p = @resource.parameter(prop)
-      p && p.respond_to?(:is_sensitive) && p.is_sensitive
-    end
-  end
-
   def addcmd
     if @resource.forcelocal?
       cmd = [command(:localadd)]
@@ -202,7 +176,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:add)]
     end
-    if (!@resource.should(:gid)) && Puppet::Util.gid(@resource[:name])
+    if not @resource.should(:gid) and Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties
@@ -214,8 +188,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def modifycmd(param, value)
     if @resource.forcelocal?
-      case param
-      when :groups, :expiry
+      if param == :groups
         cmd = [command(:modify)]
       else
         cmd = [command(property_manages_password_age?(param) ? :localpassword : :localmodify)]
@@ -238,10 +211,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:delete)]
     end
-    # Solaris `userdel -r` will fail if the homedir does not exist.
-    if @resource.managehome? && (('Solaris' != Facter.value(:operatingsystem)) || Dir.exist?(Dir.home(@resource[:name])))
-      cmd << '-r'
-    end
+    cmd += @resource.managehome? ? ['-r'] : []
     cmd << @resource[:name]
   end
 
@@ -277,10 +247,10 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       check_valid_shell
     end
      super
-     if @resource.forcelocal? && self.groups?
+     if @resource.forcelocal? and self.groups?
        set(:groups, @resource[:groups])
      end
-     if @resource.forcelocal? && @resource[:expiry]
+     if @resource.forcelocal? and @resource[:expiry]
        set(:expiry, @resource[:expiry])
      end
   end

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

@@ -124,13 +124,6 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def password=(value)
-    if user.disabled?
-      info _("The user account '%s' is disabled; The password will still be changed" % @resource[:name])
-    elsif user.locked_out?
-      info _("The user account '%s' is locked out; The password will still be changed" % @resource[:name])
-    elsif user.expired?
-      info _("The user account '%s' is expired; The password will still be changed" % @resource[:name])
-    end
     user.password = value
   end
 

data/lib/puppet/reference/indirection.rb

@@ -5,14 +5,14 @@ require 'puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
   text = ""
-  Puppet::Indirector::Indirection.instances.sort_by(&:to_s).each do |indirection|
+  Puppet::Indirector::Indirection.instances.sort { |a,b| a.to_s <=> b.to_s }.each do |indirection|
     ind = Puppet::Indirector::Indirection.instance(indirection)
     name = indirection.to_s.capitalize
     text << "## " + indirection.to_s + "\n\n"
 
     text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
-    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
+    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class

data/lib/puppet/reference/metaparameter.rb

@@ -19,7 +19,9 @@ etc.), prevent Puppet from making changes (`noop`), and change logging verbosity
       params << param
     }
 
-    params.sort_by(&:to_s).each { |param|
+    params.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.each { |param|
       str << markdown_header(param.to_s, 3)
       str << scrub(Puppet::Type.metaparamdoc(param))
       str << "\n\n"

data/lib/puppet/reference/providers.rb

@@ -35,7 +35,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
     functional = false
     notes = []
     default = type.defaultprovider ? type.defaultprovider.name : 'none'
-    type.providers.sort_by(&:to_s).each do |pname|
+    type.providers.sort { |a,b| a.to_s <=> b.to_s }.each do |pname|
       data = []
       table_data[pname] = data
       provider = type.provider(pname)

data/lib/puppet/reference/type.rb

@@ -49,7 +49,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
 
   }
 
-  types.sort_by(&:to_s).each { |name,type|
+  types.sort { |a,b|
+    a.to_s <=> b.to_s
+  }.each { |name,type|
 
     str << "
 
@@ -67,7 +69,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     end
 
     docs = {}
-    type.validproperties.sort_by(&:to_s).reject { |sname|
+    type.validproperties.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.reject { |sname|
       property = type.propertybyname(sname)
       property.nodoc
     }.each { |sname|
@@ -87,7 +91,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     }
 
     str << markdown_header("Parameters", 4) + "\n"
-    type.parameters.sort_by(&:to_s).each { |type_name, param|
+    type.parameters.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.each { |type_name, param|
       docs[type_name] = scrub(type.paramdoc(type_name))
     }
 

data/lib/puppet/reports.rb

@@ -73,8 +73,8 @@ class Puppet::Reports
     docs = ""
 
     # Use this method so they all get loaded
-    instance_loader(:report).loadall
-    loaded_instances(:report).sort_by(&:to_s).each do |name|
+    instance_loader(:report).loadall(Puppet.lookup(:current_environment))
+    loaded_instances(:report).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
       mod = self.report(name)
       docs << "#{name}\n#{"-" * name.to_s.length}\n"
 
@@ -87,7 +87,7 @@ class Puppet::Reports
   # Lists each of the reports.
   # @api private
   def self.reports
-    instance_loader(:report).loadall
+    instance_loader(:report).loadall(Puppet.lookup(:current_environment))
     loaded_instances(:report)
   end
 end

data/lib/puppet/resource.rb

@@ -12,7 +12,7 @@ class Puppet::Resource
 
   include Enumerable
   attr_accessor :file, :line, :catalog, :exported, :virtual, :strict
-  attr_reader :type, :title, :parameters, :rich_data_enabled
+  attr_reader :type, :title, :parameters
 
   # @!attribute [rw] sensitive_parameters
   #   @api private
@@ -34,7 +34,7 @@ class Puppet::Resource
   TYPE_NODE  = 'Node'.freeze
   TYPE_SITE  = 'Site'.freeze
 
-  PCORE_TYPE_KEY = '__pcore_type__'.freeze
+  PCORE_TYPE_KEY = '__ptype'.freeze
   VALUE_KEY = 'value'.freeze
 
   def self.from_data_hash(data)
@@ -76,6 +76,13 @@ class Puppet::Resource
     "#{@type}[#{@title}]#{to_hash.inspect}"
   end
 
+  # Produces a Data compliant hash of the resource.
+  # The result depends on the --rich_data setting, and the context value
+  # for Puppet.lookup(:stringify_rich), that if it is `true` will use the
+  # ToStringifiedConverter to produce the value per parameter.
+  # (Note that the ToStringifiedConverter output is lossy and should not
+  # be used when producing a catalog serialization).
+  #
   def to_data_hash
     data = {
       'type' => type,
@@ -89,17 +96,27 @@ class Puppet::Resource
 
     data['exported'] ||= false
 
+    # To get stringified parameter values the flag :stringify_rich can be set
+    # in the puppet context.
+    #
+    stringify = Puppet.lookup(:stringify_rich) { false }
+    converter = stringify ? Puppet::Pops::Serialization::ToStringifiedConverter.new : nil
+
     params = {}
     self.to_hash.each_pair do |param, value|
       # Don't duplicate the title as the namevar
       unless param == namevar && value == title
-        params[param.to_s] = Puppet::Resource.value_to_json_data(value)
+        if stringify
+          params[param.to_s] = converter.convert(value)
+        else
+          params[param.to_s] = Puppet::Resource.value_to_json_data(value)
+        end
       end
     end
 
     unless params.empty?
       data['parameters'] = Puppet::Pops::Serialization::ToDataConverter.convert(params, {
-        :rich_data => environment.rich_data?,
+        :rich_data => Puppet.lookup(:rich_data),
         :symbol_as_string => true,
         :local_reference => false,
         :type_by_reference => true,
@@ -192,7 +209,7 @@ class Puppet::Resource
   end
 
   def stage?
-    @is_stage ||= @type.to_s.casecmp("stage").zero?
+    @is_stage ||= @type.to_s.downcase == "stage"
   end
 
   # Construct a resource from data.
@@ -410,8 +427,6 @@ class Puppet::Resource
   end
 
   # Convert our resource to yaml for Hiera purposes.
-  #
-  # @deprecated Use {to_hiera_hash} instead.
   def to_hierayaml
     # Collect list of attributes to align => and move ensure first
     attr = parameters.keys
@@ -431,21 +446,6 @@ class Puppet::Resource
     "  %s:\n%s" % [self.title, attributes]
   end
 
-  # Convert our resource to a hiera hash suitable for serialization.
-  def to_hiera_hash
-    # to_data_hash converts to safe Data types, e.g. no symbols, unicode replacement character
-    h = to_data_hash
-
-    params = h['parameters'] || {}
-    value = params.delete('ensure')
-
-    res = {}
-    res['ensure'] = value if value
-    res.merge!(Hash[params.sort])
-
-    return { h['title'] => res }
-  end
-
   # Convert our resource to Puppet code.
   def to_manifest
     # Collect list of attributes to align => and move ensure first

data/lib/puppet/resource/catalog.rb

@@ -377,8 +377,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     result = @resource_table[title_key]
     if result.nil?
       # an instance has to be created in order to construct the unique key used when
-      # searching for aliases, or when app_management is active and nothing is found in
-      # which case it is needed by the CapabilityFinder.
+      # searching for aliases, or nothing is found as it is needed by the CapabilityFinder.
       res = Puppet::Resource.new(type, title, { :environment => @environment_instance })
 
       # Must check with uniqueness key because of aliases or if resource transforms title in title
@@ -559,7 +558,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     Puppet::FileSystem.open(resourcefile.value, resourcefile.mode.to_i(8), "w:UTF-8") do |f|
       to_print = resources.map do |resource|
         next unless resource.managed?
-        "#{resource.ref.downcase}"
+        if resource.name_var
+          "#{resource.type}[#{resource[resource.name_var]}]"
+        else
+          "#{resource.ref.downcase}"
+        end
       end.compact
       f.puts to_print.join("\n")
     end
@@ -578,16 +581,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   private
 
   def prioritizer
-    @prioritizer ||= case Puppet[:ordering]
-                     when "title-hash"
-                       Puppet::Graph::TitleHashPrioritizer.new
-                     when "manifest"
-                       Puppet::Graph::SequentialPrioritizer.new
-                     when "random"
-                       Puppet::Graph::RandomPrioritizer.new
-                     else
-                       raise Puppet::DevError, _("Unknown ordering type %{ordering}") % { ordering: Puppet[:ordering] }
-                     end
+    @prioritizer = Puppet::Graph::SequentialPrioritizer.new
   end
 
   def create_transaction(options)
@@ -647,7 +641,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       result.add_resource newres
     end
 
-    message = convert.to_s.tr "_", " "
+    message = convert.to_s.gsub "_", " "
     edges.each do |edge|
       # Skip edges between virtual resources.
       next if virtual_not_exported?(edge.source)