puppet 6.6.0 → 6.7.0

data/lib/puppet/provider/parsedfile.rb

@@ -46,10 +46,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   def self.filetype=(type)
     if type.is_a?(Class)
       @filetype = type
-    elsif klass = Puppet::Util::FileType.filetype(type)
-      @filetype = klass
     else
-      raise ArgumentError, _("Invalid filetype %{type}") % { type: type }
+      klass = Puppet::Util::FileType.filetype(type)
+      if klass
+        @filetype = klass
+      else
+        raise ArgumentError, _("Invalid filetype %{type}") % { type: type }
+      end
     end
   end
 
@@ -240,7 +243,8 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
       if (resource = resource_for_record(record, resources))
         resource.provider = new(record)
       elsif respond_to?(:match)
-        if resource = match(record, matchers)
+        resource = match(record, matchers)
+        if resource
           matchers.delete(resource.title)
           record[:name] = resource[:name]
           resource.provider = new(record)
@@ -380,7 +384,8 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     # Lastly, check the file from any resource instances
     if resources
       resources.each do |name, resource|
-        if value = resource.should(:target)
+        value = resource.should(:target)
+        if value
           targets << value
         end
       end
@@ -414,7 +419,8 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
   def create
     @resource.class.validproperties.each do |property|
-      if value = @resource.should(property)
+      value = @resource.should(property)
+      if value
         @property_hash[property] = value
       end
     end
@@ -472,7 +478,8 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
   # Mark both the resource and provider target as modified.
   def mark_target_modified
-    if defined?(@resource) and restarget = @resource.should(:target) and restarget != @property_hash[:target]
+    restarget = @resource.should(:target) if defined?(@resource)
+    if restarget && restarget != @property_hash[:target]
       self.class.modified(restarget)
     end
     self.class.modified(@property_hash[:target]) if @property_hash[:target] != :absent and @property_hash[:target]

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

@@ -76,11 +76,14 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       else
         return :stopped
       end
-    elsif pid = getpid
-      self.debug "PID is #{pid}"
-      return :running
     else
-      return :stopped
+      pid = getpid
+      if pid
+        self.debug "PID is #{pid}"
+        return :running
+      else
+        return :stopped
+      end
     end
   end
 

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

@@ -92,7 +92,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # clear out our cache when we're done.
   def self.prefetch(resources)
     instances.each do |prov|
-      if resource = resources[prov.name]
+      resource = resources[prov.name]
+      if resource
         resource.provider = prov
       end
     end
@@ -316,7 +317,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     _, job_plist = plist_from_label(resource[:name])
     job_plist_disabled = job_plist["Disabled"] if job_plist.has_key?("Disabled")
 
-    if FileTest.file?(self.class.launchd_overrides) and overrides = self.class.read_overrides
+    overrides = self.class.read_overrides if FileTest.file?(self.class.launchd_overrides)
+    if overrides
       if overrides.has_key?(resource[:name])
         if self.class.get_os_version < 14
           overrides_disabled = overrides[resource[:name]]["Disabled"] if overrides[resource[:name]].has_key?("Disabled")

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

@@ -31,7 +31,8 @@ Puppet::Type.type(:service).provide :service do
 
   # Use either a specified command or the default for our provider.
   def ucommand(type, fof = true)
-    if c = @resource[type]
+    c = @resource[type]
+    if c
       cmd = [c]
     else
       cmd = [send("#{type}cmd")].flatten

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

@@ -76,14 +76,17 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
         # network-interface (lo) start/running
         # network-interface (eth0) start/running
         # network-interface-security start/running
-        name = \
-          if matcher = line.match(/^(network-interface)\s\(([^\)]+)\)/)
-            "#{matcher[1]} INTERFACE=#{matcher[2]}"
-          elsif matcher = line.match(/^(network-interface-security)\s\(([^\)]+)\)/)
-            "#{matcher[1]} JOB=#{matcher[2]}"
-          else
-            line.split.first
-          end
+        matcher = line.match(/^(network-interface)\s\(([^\)]+)\)/)
+        name = if matcher
+                 "#{matcher[1]} INTERFACE=#{matcher[2]}"
+               else
+                 matcher = line.match(/^(network-interface-security)\s\(([^\)]+)\)/)
+                 if matcher
+                   "#{matcher[1]} JOB=#{matcher[2]}"
+                 else
+                   line.split.first
+                 end
+               end
         instances << new(:name => name)
       }
     }

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

@@ -71,7 +71,8 @@ Puppet::Type.type(:user).provide :directoryservice do
   # takes time and front-loads your Puppet run.
   def self.prefetch(resources)
     instances.each do |prov|
-      if resource = resources[prov.name]
+      resource = resources[prov.name]
+      if resource
         resource.provider = prov
       end
     end

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

@@ -46,7 +46,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   def password
     # Password management routine for trusted and non-trusted systems
     #temp=""
-    while ent = Etc.getpwent() do
+    while ent = Etc.getpwent() do # rubocop:disable Lint/AssignmentInCondition
       if ent.name == resource.name
         temp=ent.name
         break

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

@@ -34,9 +34,11 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
   provider = self
   manager.generates(:uidNumber).with do
     largest = 500
-    if existing = provider.manager.search
+    existing = provider.manager.search
+    if existing
       existing.each do |hash|
-        next unless value = hash[:uid]
+        value = hash[:uid]
+        next unless value
         num = value[0].to_i
         largest = num if num > largest
       end
@@ -56,7 +58,8 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
     # We want to cache the current result, so we know if we
     # have to remove old values.
     unless @property_hash[:groups]
-      unless result = group_manager.search("memberUid=#{name}")
+      result = group_manager.search("memberUid=#{name}")
+      unless result
         return @property_hash[:groups] = :absent
       end
 
@@ -88,7 +91,8 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
     end
 
     modes.each do |group, form|
-      self.fail "Could not find ldap group #{group}" unless ldap_group = group_manager.find(group)
+      ldap_group = group_manager.find(group)
+      self.fail "Could not find ldap group #{group}" unless ldap_group
 
       current = ldap_group[:members]
 

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

@@ -39,7 +39,8 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
   [:expiry, :password, :loginclass].each do |shadow_property|
     define_method(shadow_property) do
       if Puppet.features.libshadow?
-        if ent = Shadow::Passwd.getspnam(@resource.name)
+        ent = Shadow::Passwd.getspnam(@resource.name)
+        if ent
           method = self.class.option(shadow_property, :method)
           # ruby-shadow may not be new enough (< 2.4.1) and therefore lack the
           # sp_loginclass field.

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

@@ -31,7 +31,8 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     cmd = [command(:pw), "useradd", @resource[:name]]
     @resource.class.validproperties.each do |property|
       next if property == :ensure or property == :password
-      if value = @resource.should(property) and value != ""
+      value = @resource.should(property)
+      if value and value != ""
         cmd << flag(property) << munge(property,value)
       end
     end

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

@@ -53,7 +53,8 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
       # 1680 Now you can set the hashed passwords on solaris:lib/puppet/provider/user/user_role_add.rb
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
-      if value = @resource.should(property) and value != ""
+      value = @resource.should(property)
+      if value && value != ""
         if property == :keys
           cmd += build_keys_cmd(value)
         else
@@ -99,7 +100,8 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
       run(transition("normal"), "transition role to")
     else
       run(addcmd, "create")
-      if cmd = passcmd
+      cmd = passcmd
+      if cmd
         run(cmd, "change password policy for")
       end
     end

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

@@ -151,9 +151,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       next if property_manages_password_age?(property)
       next if (property == :groups) && @resource.forcelocal?
       next if (property == :expiry) && @resource.forcelocal?
-      # the value needs to be quoted, mostly because -c might
-      # have spaces in it
-      if (value = @resource.should(property)) && (value != "")
+      
+      value = @resource.should(property)
+      if value && value != ""
+        # the value needs to be quoted, mostly because -c might
+        # have spaces in it
         cmd << flag(property) << munge(property, value)
       end
     end
@@ -228,7 +230,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   [:expiry, :password_min_age, :password_max_age, :password_warn_days, :password].each do |shadow_property|
     define_method(shadow_property) do
       if Puppet.features.libshadow?
-        if ent = Shadow::Passwd.getspnam(@canonical_name)
+        ent = Shadow::Passwd.getspnam(@canonical_name)
+        if ent
           method = self.class.option(shadow_property, :method)
           return unmunge(shadow_property, ent.send(method))
         end

data/lib/puppet/reference/providers.rb

@@ -32,7 +32,6 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
 
     table_data = {}
 
-    functional = false
     notes = []
     default = type.defaultprovider ? type.defaultprovider.name : 'none'
     type.providers.sort { |a,b| a.to_s <=> b.to_s }.each do |pname|
@@ -41,10 +40,10 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
       provider = type.provider(pname)
 
       # Add the suitability note
-      if missing = provider.suitable?(false) and missing.empty?
+      missing = provider.suitable?(false)
+      if missing && missing.empty?
         data << "*X*"
         suit = true
-        functional = true
       else
         data << "[#{count}]_" # A pointer to the appropriate footnote
         suit = false

data/lib/puppet/reference/type.rb

@@ -63,7 +63,8 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     str << scrub(type.doc) + "\n\n"
 
     # Handle the feature docs.
-    if featuredocs = type.featuredocs
+    featuredocs = type.featuredocs
+    if featuredocs
       str << markdown_header("Features", 4)
       str << featuredocs
     end
@@ -79,7 +80,8 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
 
       raise _("Could not retrieve property %{sname} on type %{type_name}") % { sname: sname, type_name: type.name } unless property
 
-      unless doc = property.doc
+      doc = property.doc
+      unless doc
         $stderr.puts _("No docs for %{type}[%{sname}]") % { type: type, sname: sname }
         next
       end

data/lib/puppet/relationship.rb

@@ -19,12 +19,8 @@ class Puppet::Relationship
     target = data['target']
 
     args = {}
-    if event = data["event"]
-      args[:event] = :"#{event}"
-    end
-    if callback = data["callback"]
-      args[:callback] = :"#{callback}"
-    end
+    args[:event] = :"#{data['event']}" if data["event"]
+    args[:callback] = :"#{data['callback']}" if data["callback"]
 
     new(source, target, args)
   end
@@ -40,9 +36,8 @@ class Puppet::Relationship
 
     options = (options || {}).inject({}) { |h,a| h[a[0].to_sym] = a[1]; h }
     [:callback, :event].each do |option|
-      if value = options[option]
-        send(option.to_s + "=", value)
-      end
+      value = options[option]
+      send(option.to_s + "=", value) if value
     end
   end
 

data/lib/puppet/resource.rb

@@ -44,11 +44,14 @@ class Puppet::Resource
   end
 
   def initialize_from_hash(data)
-    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']
+    type = data['type']
+    raise ArgumentError, _('No resource type provided in serialized data') unless type
+    title = data['title']
+    raise ArgumentError, _('No resource title provided in serialized data') unless title
     @type, @title = self.class.type_and_title(type, title)
 
-    if params = data['parameters']
+    params = data['parameters']
+    if params
       params = Puppet::Pops::Serialization::FromDataConverter.convert(params)
       @parameters = {}
       params.each { |param, value| self[param] = value }
@@ -56,13 +59,15 @@ class Puppet::Resource
       @parameters = EMPTY_HASH
     end
 
-    if sensitives = data['sensitive_parameters']
+    sensitives = data['sensitive_parameters']
+    if sensitives
       @sensitive_parameters = sensitives.map(&:to_sym)
     else
       @sensitive_parameters = EMPTY_ARRAY
     end
 
-    if tags = data['tags']
+    tags = data['tags']
+    if tags
       tag(*tags)
     end
 
@@ -554,7 +559,8 @@ class Puppet::Resource
     arg_types = resource_type.argument_types
     # Parameters is a map from name, to parameter, and the parameter again has name and value
     parameters.each do |name, value|
-      next unless t = arg_types[name.to_s]  # untyped, and parameters are symbols here (aargh, strings in the type)
+      t = arg_types[name.to_s] # untyped, and parameters are symbols here (aargh, strings in the type)
+      next unless t
       unless Puppet::Pops::Types::TypeCalculator.instance?(t, value.value)
         inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value.value)
         actual = inferred_type.generalize()
@@ -657,8 +663,9 @@ class Puppet::Resource
     h = {}
     type = resource_type
     if type.respond_to?(:title_patterns) && !type.title_patterns.nil?
-      type.title_patterns.each { |regexp, symbols_and_lambdas|
-        if captures = regexp.match(title.to_s)
+      type.title_patterns.each do |regexp, symbols_and_lambdas|
+        captures = regexp.match(title.to_s)  
+        if captures
           symbols_and_lambdas.zip(captures[1..-1]).each do |symbol_and_lambda,capture|
             symbol, proc = symbol_and_lambda
             # Many types pass "identity" as the proc; we might as well give
@@ -677,7 +684,7 @@ class Puppet::Resource
           end
           return h
         end
-      }
+      end
       # If we've gotten this far, then none of the provided title patterns
       # matched. Since there's no way to determine the title then the
       # resource should fail here.

data/lib/puppet/resource/capability_finder.rb

@@ -38,14 +38,17 @@ module Puppet::Resource::CapabilityFinder
       Puppet.debug "Could not find capability resource #{cap} in PuppetDB"
     elsif resources.size == 1
       resource_hash = resources.first
-    elsif code_id_resource = disambiguate_by_code_id(environment, code_id, cap)
-      resource_hash = code_id_resource
     else
-      #TRANSLATOR PuppetDB is a product name and should not be translated
-      message = _("Unexpected response from PuppetDB when looking up %{capability}:") % { capability: cap }
-      message += "\n" + _("expected exactly one resource but got %{count};") % { count: resources.size }
-      message += "\n" + _("returned data is:\n%{resources}") % { resources: resources.inspect }
-      raise Puppet::DevError, message
+      code_id_resource = disambiguate_by_code_id(environment, code_id, cap)
+      if code_id_resource
+        resource_hash = code_id_resource
+      else
+        #TRANSLATOR PuppetDB is a product name and should not be translated
+        message = _("Unexpected response from PuppetDB when looking up %{capability}:") % { capability: cap }
+        message += "\n" + _("expected exactly one resource but got %{count};") % { count: resources.size }
+        message += "\n" + _("returned data is:\n%{resources}") % { resources: resources.inspect }
+        raise Puppet::DevError, message
+      end
     end
 
     if resource_hash
@@ -138,7 +141,8 @@ module Puppet::Resource::CapabilityFinder
     real_type.parameters.each do |param|
       param = param.to_s
       next if param == 'name'
-      if value = resource_hash['parameters'][param]
+      value = resource_hash['parameters'][param]
+      if value
         resource[param] = value
       else
         Puppet.debug "No capability value for #{resource}->#{param}"

data/lib/puppet/resource/catalog.rb

@@ -197,7 +197,8 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # because sometimes an alias is created before the resource is
     # added to the catalog, so comparing inside the below if block
     # isn't sufficient.
-    if existing = @resource_table[newref]
+    existing = @resource_table[newref]
+    if existing
       return if existing == resource
       resource_declaration = Puppet::Util::Errors.error_location(resource.file, resource.line)
       msg = if resource_declaration.empty?
@@ -286,10 +287,12 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
   # Create a new resource and register it in the catalog.
   def create_resource(type, options)
-    unless klass = Puppet::Type.type(type)
+    klass = Puppet::Type.type(type)
+    unless klass
       raise ArgumentError, _("Unknown resource type %{type}") % { type: type }
     end
-    return unless resource = klass.new(options)
+    resource = klass.new(options)
+    return unless resource
 
     add_resource(resource)
     resource
@@ -342,7 +345,8 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     Puppet::Type.type(:schedule).mkdefaultschedules.each { |res| add_resource(res) unless resource(res.ref) }
 
     # And filebuckets
-    if bucket = Puppet::Type.type(:filebucket).mkdefaultbucket
+    bucket = Puppet::Type.type(:filebucket).mkdefaultbucket
+    if bucket
       add_resource(bucket) unless resource(bucket.ref)
     end
   end
@@ -355,7 +359,8 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       ref = resource.ref
       title_key = title_key_for_ref(ref)
       @resource_table.delete(title_key)
-      if aliases = @aliases[ref]
+      aliases = @aliases[ref]
+      if aliases
         aliases.each { |res_alias| @resource_table.delete(res_alias) }
         @aliases.delete(ref)
       end
@@ -415,45 +420,36 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def self.from_data_hash(data)
     result = new(data['name'], Puppet::Node::Environment::NONE)
 
-    if tags = data['tags']
-      result.tag(*tags)
-    end
-
-    if version = data['version']
-      result.version = version
-    end
-
-    if code_id = data['code_id']
-      result.code_id = code_id
-    end
-
-    if catalog_uuid = data['catalog_uuid']
-      result.catalog_uuid = catalog_uuid
-    end
-
+    result.tag(*data['tags']) if data['tags'] 
+    result.version = data['version'] if data['version']
+    result.code_id = data['code_id'] if data['code_id']
+    result.catalog_uuid = data['catalog_uuid'] if data['catalog_uuid']
     result.catalog_format = data['catalog_format'] || 0
 
-    if environment = data['environment']
+    environment = data['environment']
+    if environment
       result.environment = environment
       result.environment_instance = Puppet::Node::Environment.remote(environment.to_sym)
     end
 
-    if resources = data['resources']
-      result.add_resource(*resources.collect do |res|
+    result.add_resource(
+      *data['resources'].collect do |res|
         Puppet::Resource.from_data_hash(res)
-      end)
-    end
+      end
+    ) if data['resources']
 
-    if edges = data['edges']
-      edges.each do |edge_hash|
+    if data['edges']
+      data['edges'].each do |edge_hash|
         edge = Puppet::Relationship.from_data_hash(edge_hash)
-        unless source = result.resource(edge.source)
+        source = result.resource(edge.source)
+        unless source
           raise ArgumentError, _("Could not intern from data: Could not find relationship source %{source} for %{target}") %
               { source: edge.source.inspect, target: edge.target.to_s }
         end
         edge.source = source
 
-        unless target = result.resource(edge.target)
+        target = result.resource(edge.target)
+        unless target
           raise ArgumentError, _("Could not intern from data: Could not find relationship target %{target} for %{source}") %
               { target: edge.target.inspect, source: edge.source.to_s }
         end
@@ -463,15 +459,12 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       end
     end
 
-    if classes = data['classes']
-      result.add_class(*classes)
-    end
+    result.add_class(*data['classes']) if data['classes']
 
-    if metadata = data['metadata']
-      result.metadata = metadata.inject({}) { |h, (k, v)| h[k] = Puppet::FileServing::Metadata.from_data_hash(v); h }
-    end
+    result.metadata = data['metadata'].inject({}) { |h, (k, v)| h[k] = Puppet::FileServing::Metadata.from_data_hash(v); h } if data['metadata']
 
-    if recursive_metadata = data['recursive_metadata']
+    recursive_metadata = data['recursive_metadata']
+    if recursive_metadata
       result.recursive_metadata = recursive_metadata.inject({}) do |h, (title, source_to_meta_hash)|
         h[title] = source_to_meta_hash.inject({}) do |inner_h, (source, metas)|
           inner_h[source] = metas.map {|meta| Puppet::FileServing::Metadata.from_data_hash(meta)}
@@ -592,7 +585,8 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # Verify that the given resource isn't declared elsewhere.
   def fail_on_duplicate_type_and_title(resource, title_key)
     # Short-circuit the common case,
-    return unless existing_resource = @resource_table[title_key]
+    existing_resource = @resource_table[title_key]
+    return unless existing_resource
 
     # If we've gotten this far, it's a real conflict
     error_location_str = Puppet::Util::Errors.error_location(existing_resource.file, existing_resource.line)
@@ -646,11 +640,13 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       next if virtual_not_exported?(edge.target)
       next if block_given? and yield edge.target
 
-      unless source = map[edge.source.ref]
+      source = map[edge.source.ref]
+      unless source
         raise Puppet::DevError, _("Could not find resource %{resource} when converting %{message} resources") % { resource: edge.source.ref, message: message }
       end
 
-      unless target = map[edge.target.ref]
+      target = map[edge.target.ref]
+      unless target
         raise Puppet::DevError, _("Could not find resource %{resource} when converting %{message} resources") % { resource: edge.target.ref, message: message }
       end