puppet 8.5.0-x86-mingw32 → 8.6.0-x86-mingw32

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

@@ -102,7 +102,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     unless @users
       unless Puppet::FileSystem.exist?(passwd_file)
-        raise Puppet::Error.new("Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist"
       end
 
       @users = []
@@ -163,7 +163,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     @groups_of[user] = []
 
     unless Puppet::FileSystem.exist?(group_file)
-      raise Puppet::Error.new("Forcelocal set for user resource '#{user}', but #{group_file} does not exist")
+      raise Puppet::Error, "Forcelocal set for user resource '#{user}', but #{group_file} does not exist"
     end
 
     Puppet::FileSystem.each_line(group_file) do |line|
@@ -225,7 +225,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   has_features :manages_homedir, :allows_duplicates, :manages_expiry
-  has_features :system_users unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value('os.name')
+  has_features :system_users unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
   has_features :manages_shell
@@ -235,11 +235,11 @@ 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.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")
       end
-    elsif @resource.allowdupe? && (!@resource.forcelocal?)
+    elsif @resource.allowdupe? && !@resource.forcelocal?
       return ["-o"]
     end
     []
@@ -324,7 +324,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 !@resource.should(:gid) && Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties
@@ -401,7 +401,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
     super
     if @resource.forcelocal?
-      set(:groups, @resource[:groups]) if self.groups?
+      set(:groups, @resource[:groups]) if groups?
       set(:expiry, @resource[:expiry]) if @resource[:expiry]
     end
     set(:password, @resource[:password]) if @resource[:password]

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

@@ -81,7 +81,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       "#{sid.domain}\\#{account}"
     end
-    return groups.join(',')
+    groups.join(',')
   end
 
   def create

data/lib/puppet/provider.rb

@@ -241,7 +241,7 @@ class Puppet::Provider
     end
 
     def command
-      if not @optional
+      unless @optional
         @confiner.confine :exists => @path, :for_binary => true
       end
 
@@ -290,7 +290,7 @@ class Puppet::Provider
   def self.fact_match(fact, values)
     fact_val = Puppet.runtime[:facter].value(fact).to_s.downcase
     if fact_val.empty?
-      return false
+      false
     else
       values = [values] unless values.is_a?(Array)
       values.any? do |value|
@@ -380,7 +380,7 @@ class Puppet::Provider
   # @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
   # @see prefetch
   def self.instances
-    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: self.name }
+    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: name }
   end
 
   # Creates getter- and setter- methods for each property supported by the resource type.
@@ -415,7 +415,7 @@ class Puppet::Provider
     end
   end
 
-  self.initvars
+  initvars
 
   # This method is used to generate a method for a command.
   # @return [void]
@@ -437,7 +437,7 @@ class Puppet::Provider
   # @return [String] Returns the data source, which is the provider name if no other source has been set.
   # @todo Unclear what "the source" is used for?
   def self.source
-    @source ||= self.name
+    @source ||= name
   end
 
   # Returns true if the given attribute/parameter is supported by the provider.
@@ -536,8 +536,8 @@ class Puppet::Provider
   def name
     n = @property_hash[:name]
     if n
-      return n
-    elsif self.resource
+      n
+    elsif resource
       resource.name
     else
       raise Puppet::DevError, _("No resource and no name in property hash in %{class_name} instance") % { class_name: self.class.name }
@@ -579,7 +579,7 @@ class Puppet::Provider
     return nil unless other.is_a? Puppet::Provider
 
     # Otherwise, order by the providers class name.
-    return self.class.name <=> other.class.name
+    self.class.name <=> other.class.name
   end
 
   # @comment Document prefetch here as it does not exist anywhere else (called from transaction if implemented)

data/lib/puppet/reference/indirection.rb

@@ -15,6 +15,9 @@ reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirect
     text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
     Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
+      # this is an "abstract" terminus, ignore it
+      next if ind.name == :resource && terminus == :validator
+
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class

data/lib/puppet/reference/metaparameter.rb

@@ -14,7 +14,7 @@ etc.), prevent Puppet from making changes (`noop`), and change logging verbosity
 
 ## Available Metaparameters
 
-}
+  }.dup
   begin
     params = []
     Puppet::Type.eachmetaparam { |param|

data/lib/puppet/reference/providers.rb

@@ -13,7 +13,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
   command_line = Puppet::Util::CommandLine.new
   types.reject! { |type| !command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
 
-  ret = "Details about this host:\n\n"
+  ret = "Details about this host:\n\n".dup
 
   # Throw some facts in there, so we know where the report is from.
   ret << option('Ruby Version', Facter.value('ruby.version'))
@@ -30,7 +30,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
     ret << "\n" # add a trailing newline
 
     # Now build up a table of provider suitability.
-    headers = %w{Provider Suitable?} + features.collect { |f| f.to_s }.sort
+    headers = %w[Provider Suitable?] + features.collect(&:to_s).sort
 
     table_data = {}
 
@@ -71,7 +71,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
           when :false
             details << _("  - Got %{values} false tests that should have been true\n") % { values: values }
           when :feature
-            details << _("  - Missing features %{values}\n") % { values: values.collect { |f| f.to_s }.join(",") }
+            details << _("  - Missing features %{values}\n") % { values: values.collect(&:to_s).join(",") }
           end
         end
         notes << details

data/lib/puppet/reference/type.rb

@@ -50,7 +50,7 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
   Resource types define features they can use, and providers can be tested to see
   which features they provide.
 
-  }
+  }.dup
 
   types.sort_by(&:to_s).each { |name, type|
     str << "

data/lib/puppet/relationship.rb

@@ -34,7 +34,8 @@ class Puppet::Relationship
   end
 
   def initialize(source, target, options = {})
-    @source, @target = source, target
+    @source = source
+    @target = target
 
     options = (options || {}).each_with_object({}) { |a, h| h[a[0].to_sym] = a[1]; }
     [:callback, :event].each do |option|
@@ -47,11 +48,9 @@ class Puppet::Relationship
   # of :NONE comes from.
   def match?(event)
     if self.event.nil? or event == :NONE or self.event == :NONE
-      return false
-    elsif self.event == :ALL_EVENTS or event == self.event
-      return true
+      false
     else
-      return false
+      self.event == :ALL_EVENTS or event == self.event
     end
   end
 

data/lib/puppet/reports/http.rb

@@ -36,7 +36,7 @@ Puppet::Reports.register_report(:http) do
     end
 
     client = Puppet.runtime[:http]
-    client.post(url, self.to_yaml, headers: headers, options: options) do |response|
+    client.post(url, to_yaml, headers: headers, options: options) do |response|
       unless response.success?
         Puppet.err _("Unable to submit report to %{url} [%{code}] %{message}") % { url: Puppet[:reporturl].to_s, code: response.code, message: response.reason }
       end

data/lib/puppet/reports/log.rb

@@ -7,8 +7,8 @@ Puppet::Reports.register_report(:log) do
     the log destination is syslog."
 
   def process
-    self.logs.each do |log|
-      log.source = "//#{self.host}/#{log.source}"
+    logs.each do |log|
+      log.source = "//#{host}/#{log.source}"
       Puppet::Util::Log.newmessage(log)
     end
   end

data/lib/puppet/reports/store.rb

@@ -19,14 +19,14 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if !Puppet::FileSystem.exist?(dir)
+    unless Puppet::FileSystem.exist?(dir)
       FileUtils.mkdir_p(dir)
-      FileUtils.chmod_R(0750, dir)
+      FileUtils.chmod_R(0o750, dir)
     end
 
     # Now store the report.
     now = Time.now.gmtime
-    name = %w{year month day hour min}.collect do |method|
+    name = %w[year month day hour min].collect do |method|
       # Make sure we're at least two digits everywhere
       "%02d" % now.send(method).to_s
     end.join("") + ".yaml"
@@ -34,7 +34,7 @@ Puppet::Reports.register_report(:store) do
     file = File.join(dir, name)
 
     begin
-      Puppet::FileSystem.replace_file(file, 0640) do |fh|
+      Puppet::FileSystem.replace_file(file, 0o640) do |fh|
         fh.print to_yaml
       end
     rescue => detail

data/lib/puppet/reports.rb

@@ -77,8 +77,8 @@ class Puppet::Reports
     # Use this method so they all get loaded
     instance_loader(:report).loadall(Puppet.lookup(:current_environment))
     loaded_instances(:report).sort_by(&:to_s).each do |name|
-      mod = self.report(name)
-      docs << "#{name}\n#{"-" * name.to_s.length}\n"
+      mod = report(name)
+      docs << "#{name}\n#{'-' * name.to_s.length}\n"
 
       docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"
     end

data/lib/puppet/resource/catalog.rb

@@ -93,7 +93,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     else
       a = [nil, nil]
     end
-    return a
+    a
   end
 
   def add_resource_before(other, *resources)
@@ -184,7 +184,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def alias(resource, key)
     ref = resource.ref
     ref =~ /^(.+)\[/
-    class_name = $1 || resource.class.name
+    class_name = ::Regexp.last_match(1) || resource.class.name
 
     newref = [class_name, key].flatten
 
@@ -272,7 +272,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def clear(remove_resources = true)
     super()
     # We have to do this so that the resources clean themselves up.
-    @resource_table.values.each { |resource| resource.remove } if remove_resources
+    @resource_table.values.each(&:remove) if remove_resources
     @resource_table.clear
     @resources = []
 
@@ -304,7 +304,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def finalize
     make_default_resources
 
-    @resource_table.values.each { |resource| resource.finish }
+    @resource_table.values.each(&:finish)
 
     write_graph(:resources)
   end
@@ -467,10 +467,10 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def to_data_hash
-    metadata_hash = metadata.transform_values { |v| v.to_data_hash; }
+    metadata_hash = metadata.transform_values(&:to_data_hash)
     recursive_metadata_hash = recursive_metadata.transform_values do |source_to_meta_hash|
       source_to_meta_hash.transform_values do |metas|
-        metas.map { |meta| meta.to_data_hash }
+        metas.map(&:to_data_hash)
       end
     end
 
@@ -483,7 +483,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       'catalog_format' => catalog_format,
       'environment' => environment.to_s,
       'resources' => @resources.map { |v| @resource_table[v].to_data_hash },
-      'edges' => edges.map { |e| e.to_data_hash },
+      'edges' => edges.map(&:to_data_hash),
       'classes' => classes,
     }.merge(metadata_hash.empty? ?
       {} : { 'metadata' => metadata_hash }).merge(recursive_metadata_hash.empty? ?
@@ -539,7 +539,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       to_print = resources.filter_map do |resource|
         next unless resource.managed?
 
-        "#{resource.ref.downcase}"
+        resource.ref.downcase.to_s
       end
       f.puts to_print.join("\n")
     end
@@ -590,14 +590,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # This pretty much just converts all of the resources from one class to another, using
   # a conversion method.
   def to_catalog(convert)
-    result = self.class.new(self.name, self.environment_instance)
+    result = self.class.new(name, environment_instance)
 
-    result.version = self.version
-    result.code_id = self.code_id
-    result.catalog_uuid = self.catalog_uuid
-    result.catalog_format = self.catalog_format
-    result.metadata = self.metadata
-    result.recursive_metadata = self.recursive_metadata
+    result.version = version
+    result.code_id = code_id
+    result.catalog_uuid = catalog_uuid
+    result.catalog_format = catalog_format
+    result.metadata = metadata
+    result.recursive_metadata = recursive_metadata
 
     map = {}
     resources.each do |resource|
@@ -643,7 +643,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     map.clear
 
-    result.add_class(*self.classes)
+    result.add_class(*classes)
     result.merge_tags_from(self)
 
     result

data/lib/puppet/resource/status.rb

@@ -102,7 +102,7 @@ module Puppet
       end
 
       def self.from_data_hash(data)
-        obj = self.allocate
+        obj = allocate
         obj.initialize_from_hash(data)
         obj
       end
@@ -216,13 +216,13 @@ module Puppet
           'tags' => @tags.to_a,
           'time' => @time.iso8601(9),
           'failed' => @failed,
-          'failed_to_restart' => self.failed_to_restart?,
+          'failed_to_restart' => failed_to_restart?,
           'changed' => @changed,
           'out_of_sync' => @out_of_sync,
           'skipped' => @skipped,
           'change_count' => @change_count,
           'out_of_sync_count' => @out_of_sync_count,
-          'events' => @events.map { |event| event.to_data_hash },
+          'events' => @events.map(&:to_data_hash),
           'corrective_change' => @corrective_change,
         }
       end

data/lib/puppet/resource/type.rb

@@ -47,7 +47,7 @@ class Puppet::Resource::Type
   attr_reader :type
 
   RESOURCE_KINDS.each do |t|
-    define_method("#{t}?") { self.type == t }
+    define_method("#{t}?") { type == t }
   end
 
   # Are we a child of the passed class?  Do a recursive search up our
@@ -56,7 +56,7 @@ class Puppet::Resource::Type
     return true if override
     return false unless parent
 
-    return(klass == parent_type ? true : parent_type.child_of?(klass))
+    (klass == parent_type ? true : parent_type.child_of?(klass))
   end
 
   # Now evaluate the code associated with this class or definition.
@@ -140,7 +140,7 @@ class Puppet::Resource::Type
     # This might just be an empty, stub class.
     return unless other.code
 
-    unless self.code
+    unless code
       self.code = other.code
       return
     end
@@ -189,7 +189,7 @@ class Puppet::Resource::Type
       parent_type(scope).ensure_in_catalog(scope)
     end
 
-    if ['Class', 'Node'].include? resource.type
+    if %w[Class Node].include? resource.type
       scope.catalog.merge_tags_from(resource)
     end
   end
@@ -237,7 +237,7 @@ class Puppet::Resource::Type
       scope[TITLE] = resource.title
       scope[NAME] = resource.name
     end
-    scope.class_set(self.name, scope) if hostclass? || node?
+    scope.class_set(name, scope) if hostclass? || node?
 
     param_hash = scope.with_parameter_scope(resource.to_s, arguments.keys) do |param_scope|
       # Assign directly to the parameter scope to avoid scope parameter validation at this point. It
@@ -376,7 +376,7 @@ class Puppet::Resource::Type
     ary = fullname.split(DOUBLE_COLON)
     n = ary.pop || ""
     ns = ary.join(DOUBLE_COLON)
-    return ns, n
+    [ns, n]
   end
 
   def parent_scope(scope, klass)
@@ -401,9 +401,9 @@ class Puppet::Resource::Type
     return unless Puppet::Type.metaparamclass(param)
 
     if default
-      warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name: self.name }
+      warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name: name }
     else
-      raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name: self.name }
+      raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name: name }
     end
   end
 

data/lib/puppet/resource/type_collection.rb

@@ -168,7 +168,7 @@ class Puppet::Resource::TypeCollection
   end
 
   def version
-    if !defined?(@version)
+    unless defined?(@version)
       if environment.config_version.nil? || environment.config_version == ""
         @version = Time.now.to_i
       else