puppet 6.6.0 → 6.7.0

data/lib/puppet/face/module/changes.rb

@@ -22,7 +22,8 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |path, options|
       Puppet::ModuleTool.set_option_defaults options
-      unless root_path = Puppet::ModuleTool.find_module_root(path)
+      root_path = Puppet::ModuleTool.find_module_root(path)
+      unless root_path
         raise ArgumentError, _("Could not find a valid module at %{path}") % { path: path.inspect }
       end
       Puppet::ModuleTool::Applications::Checksummer.run(root_path, options)

data/lib/puppet/file_bucket/dipper.rb

@@ -126,7 +126,8 @@ class Puppet::FileBucket::Dipper
     end
 
     if restore
-      if newcontents = get_bucket_file(sum)
+      newcontents = get_bucket_file(sum)
+      if newcontents
         newsum = newcontents.checksum_data
         changed = nil
         if Puppet::FileSystem.exist?(file_handle) and ! Puppet::FileSystem.writable?(file_handle)

data/lib/puppet/file_serving/configuration.rb

@@ -55,7 +55,8 @@ class Puppet::FileServing::Configuration
     raise(ArgumentError, _("Cannot find file: Invalid mount '%{mount_name}'") % { mount_name: mount_name }) unless mount_name =~ %r{^[-\w]+$}
     raise(ArgumentError, _("Cannot find file: Invalid relative path '%{path}'") % { path: path }) if path and path.split('/').include?('..')
 
-    return nil unless mount = find_mount(mount_name, request.environment)
+    mount = find_mount(mount_name, request.environment)
+    return nil unless mount
     if mount.name == "modules" and mount_name != "modules"
       # yay backward-compatibility
       path = "#{mount_name}/#{path}"

data/lib/puppet/file_serving/fileset.rb

@@ -148,7 +148,7 @@ class Puppet::FileServing::Fileset
 
     result = []
 
-    while entry = current_dirs.shift
+    while entry = current_dirs.shift #rubocop:disable Lint/AssignmentInCondition
       if continue_recursion_at?(entry.depth + 1)
         entry.children.each do |child|
           result << child.path

data/lib/puppet/file_serving/http_metadata.rb

@@ -15,13 +15,15 @@ class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
     # use a default mtime in case there is no usable HTTP header
     @checksums[:mtime] = "{mtime}#{Time.now}"
 
-    if checksum = http_response['content-md5']
+    checksum = http_response['content-md5']
+    if checksum
       # convert base64 digest to hex
       checksum = checksum.unpack("m0").first.unpack("H*").first
       @checksums[:md5] = "{md5}#{checksum}"
     end
 
-    if last_modified = http_response['last-modified']
+    last_modified = http_response['last-modified']
+    if last_modified
       mtime = DateTime.httpdate(last_modified).to_time
       @checksums[:mtime] = "{mtime}#{mtime.utc}"
     end

data/lib/puppet/file_serving/metadata.rb

@@ -127,7 +127,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @owner       = data.delete('owner')
     @group       = data.delete('group')
     @mode        = data.delete('mode')
-    if checksum = data.delete('checksum')
+    checksum = data.delete('checksum')
+    if checksum
       @checksum_type = checksum['type']
       @checksum      = checksum['value']
     end

data/lib/puppet/file_serving/mount/file.rb

@@ -60,7 +60,8 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   end
 
   def search(path, request)
-    return nil unless path = complete_path(path, request.node)
+    path = complete_path(path, request.node)
+    return nil unless path
     [path]
   end
 

data/lib/puppet/file_serving/mount/locales.rb

@@ -6,7 +6,8 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Locales < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    return nil unless mod = request.environment.modules.find { |m|  m.locale(relative_path) }
+    mod = request.environment.modules.find { |m|  m.locale(relative_path) }
+    return nil unless mod
 
     path = mod.locale(relative_path)
 

data/lib/puppet/file_serving/mount/modules.rb

@@ -7,13 +7,15 @@ class Puppet::FileServing::Mount::Modules < Puppet::FileServing::Mount
   def find(path, request)
     raise _("No module specified") if path.to_s.empty?
     module_name, relative_path = path.split("/", 2)
-    return nil unless mod = request.environment.module(module_name)
+    mod = request.environment.module(module_name)
+    return nil unless mod
 
     mod.file(relative_path)
   end
 
   def search(path, request)
-    if result = find(path, request)
+    result = find(path, request)
+    if result
       [result]
     end
   end

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -6,7 +6,8 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    return nil unless mod = request.environment.modules.find { |m|  m.pluginfact(relative_path) }
+    mod = request.environment.modules.find { |m|  m.pluginfact(relative_path) }
+    return nil unless mod
 
     path = mod.pluginfact(relative_path)
 

data/lib/puppet/file_serving/mount/plugins.rb

@@ -6,7 +6,8 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    return nil unless mod = request.environment.modules.find { |m|  m.plugin(relative_path) }
+    mod = request.environment.modules.find { |m|  m.plugin(relative_path) }
+    return nil unless mod
 
     path = mod.plugin(relative_path)
 

data/lib/puppet/file_serving/mount/tasks.rb

@@ -4,13 +4,15 @@ class Puppet::FileServing::Mount::Tasks < Puppet::FileServing::Mount
   def find(path, request)
     raise _("No task specified") if path.to_s.empty?
     module_name, task_path = path.split("/", 2)
-    return nil unless mod = request.environment.module(module_name)
+    mod = request.environment.module(module_name)
+    return nil unless mod
 
     mod.task_file(task_path)
   end
 
   def search(path, request)
-    if result = find(path, request)
+    result = find(path, request)
+    if result
       [result]
     end
   end

data/lib/puppet/file_system/uniquefile.rb

@@ -115,7 +115,8 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def create_tmpname(basename, *rest)
-    if opts = try_convert_to_hash(rest[-1])
+    opts = try_convert_to_hash(rest[-1])
+    if opts
       opts = opts.dup if rest.pop.equal?(opts)
       max_try = opts.delete(:max_try)
       opts = [opts]
@@ -157,7 +158,8 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       @@systmpdir
     else
       for dir in [ Puppet::Util.get_env('TMPDIR'), Puppet::Util.get_env('TMP'), Puppet::Util.get_env('TEMP'), @@systmpdir, '/tmp']
-        if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
+        stat = File.stat(dir) if dir
+        if stat && stat.directory? && stat.writable?
           tmp = dir
           break
         end rescue nil

data/lib/puppet/functions/match.rb

@@ -124,8 +124,7 @@ Puppet::Functions.create_function(:match) do
   private
 
   def do_match(s, regexp)
-    if result = regexp.match(s)
-      result.to_a
-    end
+    result = regexp.match(s)
+    result.to_a if result
   end
 end

data/lib/puppet/generate/type.rb

@@ -195,7 +195,8 @@ module Puppet
           types ||= Puppet::Type.instance_variable_get('@types')
 
           # Assume the type follows the naming convention
-          unless type = types[type_name]
+          type = types[type_name]
+          unless type
             Puppet.err _("Custom type '%{type_name}' was not defined in '%{input}'.") % { type_name: type_name, input: input }
             next
           end

data/lib/puppet/graph/relationship_graph.rb

@@ -104,7 +104,8 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     teardown = options[:teardown] || lambda {}
     graph_cycle_handler = options[:graph_cycle_handler] || lambda { [] }
 
-    if cycles = report_cycles_in_graph
+    cycles = report_cycles_in_graph
+    if cycles
       graph_cycle_handler.call(cycles)
     end
 

data/lib/puppet/graph/simple_graph.rb

@@ -208,7 +208,7 @@ class Puppet::Graph::SimpleGraph
 
     # frame struct is vertex, [path]
     stack = [[cycle.first, []]]
-    while frame = stack.shift do
+    while frame = stack.shift do #rubocop:disable Lint/AssignmentInCondition
       if frame[1].member?(frame[0]) then
         found << frame[1] + [frame[0]]
         break if found.length >= max_paths
@@ -343,7 +343,8 @@ class Puppet::Graph::SimpleGraph
 
   # Find adjacent edges.
   def adjacent(v, options = {})
-    return [] unless ns = (options[:direction] == :in) ? @in_to[v] : @out_from[v]
+    ns = (options[:direction] == :in) ? @in_to[v] : @out_from[v]
+    return [] unless ns
     (options[:type] == :edges) ? ns.values.flatten : ns.keys
   end
 

data/lib/puppet/indirector/catalog/compiler.rb

@@ -18,8 +18,10 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   #   (possibly) containing facts
   # @return [Puppet::Node::Facts] facts object corresponding to facts in request
   def extract_facts_from_request(request)
-    return unless text_facts = request.options[:facts]
-    unless format = request.options[:facts_format]
+    text_facts = request.options[:facts]
+    return unless text_facts
+    format = request.options[:facts_format]
+    unless format
       raise ArgumentError, _("Facts but no fact format provided for %{request}") % { request: request.key }
     end
 
@@ -199,7 +201,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         sources.each do |source|
           source = Puppet::Type.type(:file).attrclass(:source).normalize(source)
 
-          if list_of_data = Puppet::FileServing::Metadata.indirection.search(source, options)
+          list_of_data = Puppet::FileServing::Metadata.indirection.search(source, options)
+          if list_of_data
             basedir_meta = list_of_data.find {|meta| meta.relative_path == '.'}
             devfail "FileServing::Metadata search should always return the root search path" if basedir_meta.nil?
 
@@ -243,7 +246,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         sources.each do |source|
           source = Puppet::Type.type(:file).attrclass(:source).normalize(source)
 
-          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
@@ -362,7 +366,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # Extract the node from the request, or use the request
   # to find the node.
   def node_from_request(facts, request)
-    if node = request.options[:use_node]
+    node = request.options[:use_node]
+    if node
       if request.remote?
         raise Puppet::Error, _("Invalid option use_node for a remote request")
       else
@@ -378,7 +383,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     # node's catalog with only one certificate and a modification to auth.conf
     # If no key is provided we can only compile the currently connected node.
     name = request.key || request.node
-    if node = find_node(name, request.environment, request.options[:transaction_uuid], request.options[:configured_environment], facts)
+    node = find_node(name, request.environment, request.options[:transaction_uuid], request.options[:configured_environment], facts)
+    if node
       return node
     end
 
@@ -397,7 +403,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     {"servername" => "fqdn",
       "serverip" => "ipaddress"
     }.each do |var, fact|
-      if value = Facter.value(fact)
+      value = Facter.value(fact)
+      if value
         @server_facts[var] = value
       else
         Puppet.warning _("Could not retrieve fact %{fact}") % { fact: fact }
@@ -406,7 +413,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
     if @server_facts["servername"].nil?
       host = Facter.value(:hostname)
-      if domain = Facter.value(:domain)
+      domain = Facter.value(:domain)
+      if domain
         @server_facts["servername"] = [host, domain].join(".")
       else
         @server_facts["servername"] = host

data/lib/puppet/indirector/certificate/rest.rb

@@ -9,7 +9,8 @@ class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
   use_srv_service(:ca)
 
   def find(request)
-    return nil unless result = super
+    result = super
+    return nil unless result
     result.name = request.key unless result.name == request.key
     result
   end

data/lib/puppet/indirector/face.rb

@@ -112,8 +112,8 @@ class Puppet::Indirector::Face < Puppet::Face
     EOT
 
     when_invoked do |options|
-      if t = indirection.terminus_class
-        _("Run mode '%{mode}': %{terminus}") % { mode: Puppet.run_mode.name, terminus: t }
+      if indirection.terminus_class
+        _("Run mode '%{mode}': %{terminus}") % { mode: Puppet.run_mode.name, terminus: indirection.terminus_class }
       else
         _("No default terminus class for run mode '%{mode}'") % { mode: Puppet.run_mode.name }
       end

data/lib/puppet/indirector/file_server.rb

@@ -34,7 +34,8 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
 
     # The mount checks to see if the file exists, and returns nil
     # if not.
-    return nil unless path = mount.find(relative_path, request)
+    path = mount.find(relative_path, request)
+    return nil unless path
     path2instance(request, path)
   end
 
@@ -43,7 +44,8 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
   def search(request)
     mount, relative_path = configuration.split_path(request)
 
-    unless mount and paths = mount.search(relative_path, request)
+    paths = mount.search(relative_path, request) if mount
+    unless paths
       Puppet.info _("Could not find filesystem info for file '%{request}' in environment %{env}") % { request: request.key, env: request.environment }
       return nil
     end

data/lib/puppet/indirector/indirection.rb

@@ -29,7 +29,8 @@ class Puppet::Indirector::Indirection
   # Find an indirected model by name.  This is provided so that Terminus classes
   # can specifically hook up with the indirections they are associated with.
   def self.model(name)
-    return nil unless match = @@indirections.find { |i| i.name == name }
+    match = @@indirections.find { |i| i.name == name }
+    return nil unless match
     match.model
   end
 
@@ -125,7 +126,8 @@ class Puppet::Indirector::Indirection
   # Determine the terminus class.
   def terminus_class
     unless @terminus_class
-      if setting = self.terminus_setting
+      setting = self.terminus_setting
+      if setting
         self.terminus_class = Puppet.settings[setting]
       else
         raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name}
@@ -163,7 +165,8 @@ class Puppet::Indirector::Indirection
 
     return nil unless cache? && !request.ignore_cache_save?
 
-    return nil unless instance = cache.find(request(:find, key, nil, options))
+    instance = cache.find(request(:find, key, nil, options))
+    return nil unless instance
 
     Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: self.name, instance: instance.name }
 
@@ -233,7 +236,8 @@ class Puppet::Indirector::Indirection
 
   def find_in_cache(request)
     # See if our instance is in the cache and up to date.
-    return nil unless cache? and ! request.ignore_cache? and cached = cache.find(request)
+    cached = cache.find(request) if cache? && ! request.ignore_cache?
+    return nil unless cached
     if cached.expired?
       Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: self.name, request: request.key, expiration: cached.expiration }
       return nil
@@ -266,7 +270,8 @@ class Puppet::Indirector::Indirection
     request = request(:search, key, nil, options)
     terminus = prepare(request)
 
-    if result = terminus.search(request)
+    result = terminus.search(request)
+    if result
       raise Puppet::DevError, _("Search results from terminus %{terminus_name} are not an array") % { terminus_name: terminus.name } unless result.is_a?(Array)
       result.each do |instance|
         next unless instance.respond_to? :expiration
@@ -332,7 +337,8 @@ class Puppet::Indirector::Indirection
   # Create a new terminus instance.
   def make_terminus(terminus_class)
     # Load our terminus class.
-    unless klass = Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    klass = Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    unless klass
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
     end
     klass.new

data/lib/puppet/indirector/node/exec.rb

@@ -39,7 +39,8 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
   def create_node(name, result, facts = nil)
     node = Puppet::Node.new(name)
     [:parameters, :classes, :environment].each do |param|
-      if value = result[param]
+      value = result[param]
+      if value
         node.send(param.to_s + "=", value)
       end
     end

data/lib/puppet/indirector/report/processor.rb

@@ -49,7 +49,8 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
   def processors(&blk)
     return [] if Puppet[:reports] == "none"
     reports.each do |name|
-      if mod = Puppet::Reports.report(name)
+      mod = Puppet::Reports.report(name)
+      if mod
         yield(mod)
       else
         Puppet.warning _("No report named '%{name}'") % { name: name }

data/lib/puppet/indirector/request.rb

@@ -99,8 +99,9 @@ class Puppet::Indirector::Request
   end
 
   def model
-    raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless i = indirection
-    i.model
+    ind = indirection
+    raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless ind
+    ind.model
   end
 
   # Are we trying to interact with multiple resources, or just one?
@@ -169,7 +170,8 @@ class Puppet::Indirector::Request
     result = options.dup
 
     OPTION_ATTRIBUTES.each do |attribute|
-      if value = send(attribute)
+      value = send(attribute)
+      if value
         result[attribute] = value
       end
     end
@@ -206,7 +208,8 @@ class Puppet::Indirector::Request
       self.server = default_server
     else
       self.server = Puppet.lookup(:server) do
-        if primary_server = Puppet.settings[:server_list][0]
+        primary_server = Puppet.settings[:server_list][0]
+        if primary_server
           #TRANSLATORS 'server_list' is the name of a setting and should not be translated
           debug_once _("Selected server from first entry of the `server_list` setting: %{server}") % {server: primary_server[0]}
           primary_server[0]
@@ -222,7 +225,8 @@ class Puppet::Indirector::Request
       self.port = default_port
     else
       self.port = Puppet.lookup(:serverport) do
-        if primary_server = Puppet.settings[:server_list][0]
+        primary_server = Puppet.settings[:server_list][0]
+        if primary_server
           #TRANSLATORS 'server_list' is the name of a setting and should not be translated
           debug_once _("Selected port from the first entry of the `server_list` setting: %{port}") % {port: primary_server[1]}
           primary_server[1]