puppet 6.6.0 → 6.7.0

data/lib/puppet/type/file/ctime.rb

@@ -6,7 +6,8 @@ module Puppet
 
     def retrieve
       current_value = :absent
-      if stat = @resource.stat
+      stat = @resource.stat
+      if stat
         current_value = stat.ctime
       end
       current_value

data/lib/puppet/type/file/data_sync.rb

@@ -71,7 +71,8 @@ module Puppet
     end
 
     def retrieve_checksum(resource)
-      return :absent unless stat = resource.stat
+      stat = resource.stat
+      return :absent unless stat
       ftype = stat.ftype
       # Don't even try to manage the content on directories or links
       return nil if ["directory","link"].include?(ftype)

data/lib/puppet/type/file/ensure.rb

@@ -62,9 +62,8 @@ module Puppet
 
     newvalue(:file, :event => :file_created) do
       # Make sure we're not managing the content some other way
-      if property = @resource.property(:content)
-        property.sync
-      elsif property = @resource.property(:checksum_value)
+      property = @resource.property(:content) || @resource.property(:checksum_value)
+      if property
         property.sync
       else
         @resource.write
@@ -99,7 +98,8 @@ module Puppet
 
 
     newvalue(:link, :event => :link_created, :required_features => :manages_symlinks) do
-      fail "Cannot create a symlink without a target" unless property = resource.property(:target)
+      property = resource.property(:target)
+      fail "Cannot create a symlink without a target" unless property
       property.retrieve
       property.mklink
     end
@@ -120,11 +120,13 @@ module Puppet
     def change_to_s(currentvalue, newvalue)
       return super unless [:file, :present].include?(newvalue)
 
-      return super unless property = @resource.property(:content)
+      property = @resource.property(:content)
+      return super unless property
 
       # We know that content is out of sync if we're here, because
       # it's essentially equivalent to 'ensure' in the transaction.
-      if source = @resource.parameter(:source)
+      source = @resource.parameter(:source)
+      if source
         should = source.checksum
       else
         should = property.should
@@ -166,7 +168,8 @@ module Puppet
     end
 
     def retrieve
-      if stat = @resource.stat
+      stat = @resource.stat
+      if stat
         return stat.ftype.intern
       else
         if self.should == :false

data/lib/puppet/type/file/mode.rb

@@ -121,7 +121,8 @@ module Puppet
         return false if munged_mode.nil?
         currentvalue = munged_mode
       end
-      if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow
+      stat = @resource.stat
+      if stat && stat.ftype == "link" && @resource[:links] != :follow
         self.debug _("Not managing symlink mode")
         return true
       else

data/lib/puppet/type/file/mtime.rb

@@ -5,7 +5,8 @@ module Puppet
 
     def retrieve
       current_value = :absent
-      if stat = @resource.stat
+      stat = @resource.stat
+      if stat
         current_value = stat.mtime
       end
       current_value

data/lib/puppet/type/file/selcontext.rb

@@ -42,7 +42,8 @@ module Puppet
         return nil
       end
 
-      unless context = self.get_selinux_default_context(@resource[:path])
+      context = self.get_selinux_default_context(@resource[:path])
+      unless context
         return nil
       end
 

data/lib/puppet/type/file/source.rb

@@ -134,7 +134,8 @@ module Puppet
       return @content if @content
       raise Puppet::DevError, _("No source for content was stored with the metadata") unless metadata.source
 
-      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment_instance, :links => resource[:links])
+      tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment_instance, :links => resource[:links])
+      unless tmp
         self.fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
@@ -183,12 +184,9 @@ module Puppet
     # if we can't find data about this host, and fail if there are any
     # problems in our query.
     def metadata
+      @metadata ||= resource.catalog.metadata[resource.title]
       return @metadata if @metadata
 
-      if @metadata = resource.catalog.metadata[resource.title]
-        return @metadata
-      end
-
       return nil unless value
       value.each do |source|
         begin
@@ -199,7 +197,8 @@ module Puppet
             :source_permissions   => resource[:source_permissions]
           }
 
-          if data = Puppet::FileServing::Metadata.indirection.find(source, options)
+          data = Puppet::FileServing::Metadata.indirection.find(source, options)
+          if data
             @metadata = data
             @metadata.source = source
             break
@@ -286,7 +285,7 @@ module Puppet
 
     def chunk_file_from_disk
       File.open(full_path, "rb") do |src|
-        while chunk = src.read(8192)
+        while chunk = src.read(8192) #rubocop:disable Lint/AssignmentInCondition
           yield chunk
         end
       end

data/lib/puppet/type/file/target.rb

@@ -72,7 +72,8 @@ module Puppet
 
 
     def retrieve
-      if stat = @resource.stat
+      stat = @resource.stat
+      if stat
         if stat.ftype == "link"
           return Puppet::FileSystem.readlink(@resource[:path])
         else

data/lib/puppet/type/file/type.rb

@@ -5,7 +5,8 @@ module Puppet
 
     def retrieve
       current_value = :absent
-      if stat = @resource.stat
+      stat = @resource.stat
+      if stat
         current_value = stat.ftype
       end
       current_value

data/lib/puppet/type/package.rb

@@ -544,12 +544,14 @@ module Puppet
     autorequire(:file) do
       autos = []
       [:responsefile, :adminfile].each { |param|
-        if val = self[param]
+        val = self[param]
+        if val
           autos << val
         end
       }
 
-      if source = self[:source] and absolute_path?(source)
+      source = self[:source]
+      if source && absolute_path?(source)
         autos << source
       end
       autos
@@ -557,7 +559,8 @@ module Puppet
 
     # This only exists for testing.
     def clear
-      if obj = @parameters[:ensure]
+      obj = @parameters[:ensure]
+      if obj
         obj.latest = nil
       end
     end

data/lib/puppet/type/resources.rb

@@ -132,7 +132,8 @@ Puppet::Type.newtype(:resources) do
 
   def resource_type
     unless defined?(@resource_type)
-      unless type = Puppet::Type.type(self[:name])
+      type = Puppet::Type.type(self[:name])
+      unless type
         raise Puppet::DevError, _("Could not find resource type")
       end
       @resource_type = type

data/lib/puppet/type/service.rb

@@ -115,7 +115,8 @@ module Puppet
       def sync
         event = super()
 
-        if property = @resource.property(:enable)
+        property = @resource.property(:enable)
+        if property
           val = property.retrieve
           property.sync unless property.safe_insync?(val)
         end

data/lib/puppet/type/tidy.rb

@@ -118,7 +118,8 @@ Puppet::Type.newtype(:tidy) do
     }
 
     def convert(unit, multi)
-      if num = AgeConvertors[unit]
+      num = AgeConvertors[unit]
+      if num
         return num * multi
       else
         self.fail _("Invalid age unit '%{unit}'") % { unit: unit }
@@ -157,7 +158,8 @@ Puppet::Type.newtype(:tidy) do
       be used."
 
     def convert(unit, multi)
-      if num = { :b => 0, :k => 1, :m => 2, :g => 3, :t => 4 }[unit]
+      num = { :b => 0, :k => 1, :m => 2, :g => 3, :t => 4 }[unit]
+      if num
         result = multi
         num.times do result *= 1024 end
         return result
@@ -236,7 +238,8 @@ Puppet::Type.newtype(:tidy) do
 
   def retrieve
     # Our ensure property knows how to retrieve everything for us.
-    if obj = @parameters[:ensure]
+    obj = @parameters[:ensure]
+    if obj
       return obj.retrieve
     else
       return {}
@@ -282,7 +285,8 @@ Puppet::Type.newtype(:tidy) do
 
     files_by_name.keys.sort { |a,b| b <=> a }.each do |path|
       dir = ::File.dirname(path)
-      next unless resource = files_by_name[dir]
+      resource = files_by_name[dir]
+      next unless resource
       if resource[:require]
         resource[:require] << Puppet::Resource.new(:file, path)
       else
@@ -314,17 +318,20 @@ Puppet::Type.newtype(:tidy) do
     # those files anyway
     return false if catalog.resource(:file, path)
 
-    return false unless stat = self.stat(path)
+    stat = self.stat(path)
+    return false unless stat
 
     return false if stat.ftype == "directory" and ! rmdirs?
 
     # The 'matches' parameter isn't OR'ed with the other tests --
     # it's just used to reduce the list of files we can match.
-    return false if param = parameter(:matches) and ! param.tidy?(path, stat)
+    param = parameter(:matches)
+    return false if param && ! param.tidy?(path, stat)
 
     tested = false
     [:age, :size].each do |name|
-      next unless param = parameter(name)
+      param = parameter(name)
+      next unless param
       tested = true
       return true if param.tidy?(path, stat)
     end

data/lib/puppet/type/user.rb

@@ -147,7 +147,7 @@ module Puppet
         # We know the 'is' is a number, so we need to convert the 'should' to a number,
         # too.
         @should.each do |value|
-          return true if number = Puppet::Util.gid(value) and is == number
+          return true if is == Puppet::Util.gid(value)
         end
 
         false
@@ -156,7 +156,8 @@ module Puppet
       def sync
         found = false
         @should.each do |value|
-          if number = Puppet::Util.gid(value)
+          number = Puppet::Util.gid(value)
+          if number
             provider.gid = number
             found = true
             break
@@ -444,7 +445,10 @@ module Puppet
     autorequire(:group) do
       autos = []
 
-      if obj = @parameters[:gid] and groups = obj.shouldorig
+      # autorequire primary group, if managed
+      obj = @parameters[:gid]
+      groups = obj.shouldorig if obj
+      if groups
         groups = groups.collect { |group|
           if group =~ /^\d+$/
             Integer(group)
@@ -455,7 +459,8 @@ module Puppet
         groups.each { |group|
           case group
           when Integer
-            if resource = catalog.resources.find { |r| r.is_a?(Puppet::Type.type(:group)) and r.should(:gid) == group }
+            resource = catalog.resources.find { |r| r.is_a?(Puppet::Type.type(:group)) && r.should(:gid) == group }
+            if resource
               autos << resource
             end
           else
@@ -464,8 +469,13 @@ module Puppet
         }
       end
 
-      if obj = @parameters[:groups] and groups = obj.should
-        autos += groups.split(",")
+      # autorequire groups, excluding primary group, if managed
+      obj = @parameters[:groups]
+      if obj
+        groups = obj.should
+        if groups
+          autos += groups.split(",")
+        end
       end
 
       autos
@@ -522,7 +532,9 @@ module Puppet
     autorequire(:user) do
       reqs = []
 
-      if roles_property = @parameters[:roles] and roles = roles_property.should
+      roles_property = @parameters[:roles]
+      roles = roles_property.should if roles_property
+      if roles
         reqs += roles.split(',')
       end
 

data/lib/puppet/util.rb

@@ -148,7 +148,8 @@ module Util
 
   # Change the process to a different user
   def self.chuser
-    if group = Puppet[:group]
+    group = Puppet[:group]
+    if group
       begin
         Puppet::Util::SUIDManager.change_group(group, true)
       rescue => detail
@@ -161,7 +162,8 @@ module Util
       end
     end
 
-    if user = Puppet[:user]
+    user = Puppet[:user]
+    if user
       begin
         Puppet::Util::SUIDManager.change_user(user, true)
       rescue => detail
@@ -324,7 +326,8 @@ module Util
     if Puppet::Util::Platform.windows?
       path = path.gsub(/\\/, '/')
 
-      if unc = /^\/\/([^\/]+)(\/.+)/.match(path)
+      unc = /^\/\/([^\/]+)(\/.+)/.match(path)
+      if unc
         params[:host] = unc[1]
         path = unc[2]
       elsif path =~ /^[a-z]:\//i

data/lib/puppet/util/checksums.rb

@@ -344,7 +344,7 @@ module Puppet::Util::Checksums
   def checksum_file(digest, filename, lite = false)
     buffer = lite ? 512 : 4096
     File.open(filename, 'rb') do |file|
-      while content = file.read(buffer)
+      while content = file.read(buffer) #rubocop:disable Lint/AssignmentInCondition
         digest << content
         break if lite
       end

data/lib/puppet/util/classgen.rb

@@ -70,7 +70,8 @@ module Puppet::Util::ClassGen
       retval = true
     end
 
-    if hash = options[:hash] and hash.include? name
+    hash = options[:hash]
+    if hash && hash.include?(name)
       hash.delete(name)
       retval = true
     end
@@ -84,7 +85,8 @@ module Puppet::Util::ClassGen
   # Generates the constant to create or remove.
   # @api private
   def genconst_string(name, options)
-    unless const = options[:constant]
+    const = options[:constant]
+    unless const
       prefix = options[:prefix] || ""
       const = prefix + name2const(name)
     end
@@ -169,7 +171,8 @@ module Puppet::Util::ClassGen
   def initclass(klass, options)
     klass.initvars if klass.respond_to? :initvars
 
-    if attrs = options[:attributes]
+    attrs = options[:attributes]
+    if attrs
       attrs.each do |param, value|
         method = param.to_s + "="
         klass.send(method, value) if klass.respond_to? method
@@ -177,7 +180,8 @@ module Puppet::Util::ClassGen
     end
 
     [:include, :extend].each do |method|
-      if set = options[method]
+      set = options[method]
+      if set
         set = [set] unless set.is_a?(Array)
         set.each do |mod|
           klass.send(method, mod)
@@ -197,7 +201,8 @@ module Puppet::Util::ClassGen
   # Store the class in the appropriate places.
   # @api private
   def storeclass(klass, klassname, options)
-    if hash = options[:hash]
+    hash = options[:hash]
+    if hash
       if hash.include? klassname and ! options[:overwrite]
         raise Puppet::SubclassAlreadyDefined,
           _("Already a generated class named %{klassname}") % { klassname: klassname }
@@ -207,7 +212,8 @@ module Puppet::Util::ClassGen
     end
 
     # If we were told to stick it in a hash, then do so
-    if array = options[:array]
+    array = options[:array]
+    if array
       if (klass.respond_to? :name and
               array.find { |c| c.name == klassname } and
               ! options[:overwrite])

data/lib/puppet/util/command_line.rb

@@ -93,10 +93,13 @@ module Puppet
           end
         elsif Puppet::Application.available_application_names.include?(subcommand_name)
           ApplicationSubcommand.new(subcommand_name, self)
-        elsif path_to_subcommand = external_subcommand
-          ExternalSubcommand.new(path_to_subcommand, self)
         else
-          UnknownSubcommand.new(subcommand_name, self)
+          path_to_subcommand = external_subcommand
+          if path_to_subcommand
+            ExternalSubcommand.new(path_to_subcommand, self)
+          else
+            UnknownSubcommand.new(subcommand_name, self)
+          end
         end
       end
 
@@ -121,7 +124,8 @@ module Puppet
           # If we cannot find the configured environment, which may not exist,
           # we do not attempt to add plugin directories to the load path.
           unless @subcommand_name == 'master' || @subcommand_name == 'agent' || (@subcommand_name == 'device' && (['--apply', '--facts', '--resource'] - @command_line.args).empty?)
-            if configured_environment = Puppet.lookup(:environments).get(Puppet[:environment])
+            configured_environment = Puppet.lookup(:environments).get(Puppet[:environment])
+            if configured_environment
               configured_environment.each_plugin_directory do |dir|
                 $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
               end