(PUP-11767) Fix Lambda violations and remove from todo list

Author: tvpartytonight

.rubocop_todo.yml

@@ -534,23 +534,6 @@ Style/InverseMethods:
     - 'lib/puppet/reference/providers.rb'
     - 'lib/puppet/type/file.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
-  Exclude:
-    - 'lib/puppet/defaults.rb'
-    - 'lib/puppet/functions/unique.rb'
-    - 'lib/puppet/graph/relationship_graph.rb'
-    - 'lib/puppet/http/session.rb'
-    - 'lib/puppet/pops/lookup/interpolation.rb'
-    - 'lib/puppet/pops/parser/lexer2.rb'
-    - 'lib/puppet/provider/aix_object.rb'
-    - 'lib/puppet/provider/service/upstart.rb'
-    - 'lib/puppet/transaction.rb'
-    - 'lib/puppet/util/command_line/puppet_option_parser.rb'
-    - 'lib/puppet/util/symbolic_file_mode.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 Style/LineEndConcatenation:
   Exclude:

lib/puppet/defaults.rb

@@ -467,7 +467,7 @@ def self.initialize_default_settings!(settings)
         EOT
     },
     :diff_args => {
-        :default  => lambda { default_diffargs },
+        :default  => -> { default_diffargs },
         :desc     => "Which arguments to pass to the diff command when printing differences between
           files. The command to use can be chosen with the `diff` setting.",
     },
@@ -818,7 +818,7 @@ def self.initialize_default_settings!(settings)
     # We have to downcase the fqdn, because the current ssl stuff (as opposed to in master) doesn't have good facilities for
     # manipulating naming.
     :certname => {
-      :default => lambda { Puppet::Settings.default_certname.downcase },
+      :default => -> { Puppet::Settings.default_certname.downcase },
       :desc => "The name to use when handling certificates. When a node
         requests a certificate from the CA Puppet Server, it uses the value of the
         `certname` setting as its requested Subject CN.
@@ -1086,15 +1086,15 @@ def self.initialize_default_settings!(settings)
                    Default is `prime256v1`."
     },
     :digest_algorithm => {
-        :default  => lambda { default_digest_algorithm },
+        :default  => -> { default_digest_algorithm },
         :type     => :enum,
         :values   => valid_digest_algorithms,
         :desc     => "Which digest algorithm to use for file resources and the filebucket.
                       Valid values are #{valid_digest_algorithms.join(', ')}. Default is
                       #{default_digest_algorithm}.",
     },
     :supported_checksum_types => {
-      :default => lambda { default_file_checksum_types },
+      :default => -> { default_file_checksum_types },
       :type    => :array,
       :desc    => "Checksum types supported by this agent for use in file resources of a
                    static catalog. Values must be comma-separated. Valid types are
@@ -1129,7 +1129,7 @@ def self.initialize_default_settings!(settings)
       :desc    => "The name to use the Certificate Authority certificate.",
     },
     :cadir => {
-      :default => lambda { default_cadir },
+      :default => -> { default_cadir },
       :type => :directory,
       :desc => "The root directory for the certificate authority.",
     },
@@ -1419,7 +1419,7 @@ def self.initialize_default_settings!(settings)
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => lambda { default_basemodulepath },
+      :default => -> { default_basemodulepath },
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
@@ -1431,7 +1431,7 @@ def self.initialize_default_settings!(settings)
         <https://puppet.com/docs/puppet/latest/environments_about.html>",
     },
     :vendormoduledir => {
-      :default => lambda { default_vendormoduledir },
+      :default => -> { default_vendormoduledir },
       :type => :string,
       :desc => "The directory containing **vendored** modules. These modules will
       be used by _all_ environments like those in the `basemodulepath`. The only
@@ -1666,7 +1666,7 @@ def self.initialize_default_settings!(settings)
       :desc       => "Whether the server will search for SRV records in DNS for the current domain.",
     },
     :srv_domain => {
-      :default    => lambda { Puppet::Settings.domain_fact },
+      :default    => -> { Puppet::Settings.domain_fact },
       :desc       => "The domain which will be queried to find the SRV records of servers to use.",
     },
     :http_extra_headers => {

lib/puppet/functions/unique.rb

@@ -111,7 +111,7 @@ def unique_string(string, &block)
   end
 
   def unique_hash(hash, &block)
-    block = lambda { |v| v } unless block_given?
+    block = ->(v) { v } unless block_given?
     result = Hash.new { |h, k| h[k] = { :keys => [], :values => [] } }
     hash.each_pair do |k, v|
       rc = result[block.call(v)]

lib/puppet/graph/relationship_graph.rb

@@ -99,12 +99,12 @@ def next_resource
   end
 
   def traverse(options = {}, &block)
-    continue_while = options[:while] || lambda { true }
-    pre_process = options[:pre_process] || lambda { |resource| }
-    overly_deferred_resource_handler = options[:overly_deferred_resource_handler] || lambda { |resource| }
-    canceled_resource_handler = options[:canceled_resource_handler] || lambda { |resource| }
-    teardown = options[:teardown] || lambda {}
-    graph_cycle_handler = options[:graph_cycle_handler] || lambda { [] }
+    continue_while = options[:while] || -> { true }
+    pre_process = options[:pre_process] || ->(resource) {}
+    overly_deferred_resource_handler = options[:overly_deferred_resource_handler] || ->(resource) {}
+    canceled_resource_handler = options[:canceled_resource_handler] || ->(resource) {}
+    teardown = options[:teardown] || -> {}
+    graph_cycle_handler = options[:graph_cycle_handler] || -> { [] }
 
     cycles = report_cycles_in_graph
     if cycles

lib/puppet/http/session.rb

@@ -62,7 +62,7 @@ def route_to(name, url: nil, ssl_context: nil)
     return cached if cached
 
     canceled = false
-    canceled_handler = lambda { |cancel| canceled = cancel }
+    canceled_handler = ->(cancel) { canceled = cancel }
 
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")

lib/puppet/pops/lookup/interpolation.rb

@@ -125,7 +125,7 @@ def interpolate_method(method_key)
         :hiera => global_lookup, # this is just an alias for 'lookup'
         :alias => global_lookup, # same as 'lookup' but expression must be entire string and result is not subject to string substitution
         :scope => scope_lookup,
-        :literal => lambda { |key, _, _| key }
+        :literal => ->(key, _, _) { key }
       }.freeze
     end
     interpolate_method = @@interpolate_methods[method_key]

lib/puppet/pops/parser/lexer2.rb

@@ -187,8 +187,8 @@ class Lexer2
 
   def initialize
     @selector = {
-      '.' => lambda { emit(TOKEN_DOT, @scanner.pos) },
-      ',' => lambda { emit(TOKEN_COMMA, @scanner.pos) },
+      '.' => -> { emit(TOKEN_DOT, @scanner.pos) },
+      ',' => -> { emit(TOKEN_COMMA, @scanner.pos) },
       '[' => lambda do
         before = @scanner.pos
         # Must check the preceding character to see if it is whitespace.
@@ -202,7 +202,7 @@ def initialize
           emit(TOKEN_LBRACK, before)
         end
       end,
-      ']' => lambda { emit(TOKEN_RBRACK, @scanner.pos) },
+      ']' => -> { emit(TOKEN_RBRACK, @scanner.pos) },
       '(' => lambda do
         before = @scanner.pos
         # If first on a line, or only whitespace between start of line and '('
@@ -214,10 +214,10 @@ def initialize
           emit(TOKEN_LPAREN, before)
         end
       end,
-      ')' => lambda { emit(TOKEN_RPAREN, @scanner.pos) },
-      ';' => lambda { emit(TOKEN_SEMIC, @scanner.pos) },
-      '?' => lambda { emit(TOKEN_QMARK, @scanner.pos) },
-      '*' => lambda { emit(TOKEN_TIMES, @scanner.pos) },
+      ')' => -> { emit(TOKEN_RPAREN, @scanner.pos) },
+      ';' => -> { emit(TOKEN_SEMIC, @scanner.pos) },
+      '?' => -> { emit(TOKEN_QMARK, @scanner.pos) },
+      '*' => -> { emit(TOKEN_TIMES, @scanner.pos) },
       '%' => lambda do
         scn = @scanner
         before = scn.pos
@@ -345,7 +345,7 @@ def initialize
         emit(la[1] == '>' ? TOKEN_IN_EDGE_SUB : TOKEN_TILDE, scn.pos)
       end,
 
-      '#' => lambda { @scanner.skip(PATTERN_COMMENT); nil },
+      '#' => -> { @scanner.skip(PATTERN_COMMENT); nil },
 
       # TOKENS '/', '/*' and '/ regexp /'
       '/' => lambda do
@@ -491,10 +491,10 @@ def initialize
         ctx[:line_lexical_start] = @scanner.pos
         nil
       end,
-      '' => lambda { nil } # when the peek(1) returns empty
+      '' => -> { nil } # when the peek(1) returns empty
     }
 
-    [' ', "\t", "\r"].each { |c| @selector[c] = lambda { @scanner.skip(PATTERN_WS); nil } }
+    [' ', "\t", "\r"].each { |c| @selector[c] = -> { @scanner.skip(PATTERN_WS); nil } }
 
     ('0'..'9').each do |c|
       @selector[c] = lambda do

lib/puppet/provider/aix_object.rb

@@ -95,7 +95,7 @@ def mappings
     # NOTE: 'Impure' lambdas are useful in case we need to generate more specific error
     # messages or pass-in instance-specific command-line arguments.
     def mapping(info = {})
-      identity_fn = lambda { |x| x }
+      identity_fn = ->(x) { x }
       info[:aix_attribute] ||= info[:puppet_property]
       info[:property_to_attribute] ||= identity_fn
       info[:attribute_to_property] ||= identity_fn

lib/puppet/provider/service/upstart.rb

@@ -30,7 +30,7 @@
   # We only want to use upstart as our provider if the upstart daemon is running.
   # This can be checked by running `initctl version --quiet` on a machine that has
   # upstart installed.
-  confine :true => lambda { has_initctl? }
+  confine :true => -> { has_initctl? }
 
   def self.has_initctl?
     # Puppet::Util::Execution.execute does not currently work on jRuby.

lib/puppet/transaction.rb

@@ -107,7 +107,7 @@ def evaluate(&block)
 
     Puppet.info _("Applying configuration version '%{version}'") % { version: catalog.version } if catalog.version
 
-    continue_while = lambda { !stop_processing? }
+    continue_while = -> { !stop_processing? }
 
     post_evalable_providers = Set.new
     pre_process = lambda do |resource|