Layout/FirstArgumentIndentation

mhashizume · mhashizume · commit 9c3a51cd8606 · 2023-12-19T15:21:15.000-08:00
This commit enables the Rubocop Layout/FirstArgumentIndentation cop and
addresses all offenses.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -33,6 +33,11 @@ Layout/ElseAlignment:
   Exclude:
     - 'lib/puppet/provider/package/*.rb'
 
+# Formatting in defaults is unusual
+Layout/FirstArgumentIndentation:
+  Exclude:
+    - 'lib/puppet/defaults.rb'
+
 # puppet uses symbol booleans in types and providers to work around long standing
 # bugs when trying to manage falsey pararameters and properties
 Lint/BooleanSymbol:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -22,12 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Layout/FirstArgumentIndentation:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
@@ -365,8 +365,8 @@ def initialize(command_line = Puppet::Util::CommandLine.new)
   # @api public
   def app_defaults
     Puppet::Settings.app_defaults_for_run_mode(self.class.run_mode).merge(
-        :name => name
-      )
+      :name => name
+    )
   end
 
   # Initialize application defaults. It's usually not necessary to override this method.
diff --git a/lib/puppet/error.rb b/lib/puppet/error.rb
@@ -99,13 +99,13 @@ def self.from_issue_and_stack(issue, args = {})
       filename, line = Puppet::Pops::PuppetStack.top_of_stack
 
       self.new(
-            issue.format(args),
-            filename,
-            line,
-            nil,
-            nil,
-            issue.issue_code,
-            args)
+        issue.format(args),
+        filename,
+        line,
+        nil,
+        nil,
+        issue.issue_code,
+        args)
     end
   end
 
diff --git a/lib/puppet/ffi/windows/constants.rb b/lib/puppet/ffi/windows/constants.rb
@@ -163,48 +163,48 @@ module Constants
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379626(v=vs.85).aspx
     TOKEN_INFORMATION_CLASS = enum(
-        :TokenUser, 1,
-        :TokenGroups,
-        :TokenPrivileges,
-        :TokenOwner,
-        :TokenPrimaryGroup,
-        :TokenDefaultDacl,
-        :TokenSource,
-        :TokenType,
-        :TokenImpersonationLevel,
-        :TokenStatistics,
-        :TokenRestrictedSids,
-        :TokenSessionId,
-        :TokenGroupsAndPrivileges,
-        :TokenSessionReference,
-        :TokenSandBoxInert,
-        :TokenAuditPolicy,
-        :TokenOrigin,
-        :TokenElevationType,
-        :TokenLinkedToken,
-        :TokenElevation,
-        :TokenHasRestrictions,
-        :TokenAccessInformation,
-        :TokenVirtualizationAllowed,
-        :TokenVirtualizationEnabled,
-        :TokenIntegrityLevel,
-        :TokenUIAccess,
-        :TokenMandatoryPolicy,
-        :TokenLogonSid,
-        :TokenIsAppContainer,
-        :TokenCapabilities,
-        :TokenAppContainerSid,
-        :TokenAppContainerNumber,
-        :TokenUserClaimAttributes,
-        :TokenDeviceClaimAttributes,
-        :TokenRestrictedUserClaimAttributes,
-        :TokenRestrictedDeviceClaimAttributes,
-        :TokenDeviceGroups,
-        :TokenRestrictedDeviceGroups,
-        :TokenSecurityAttributes,
-        :TokenIsRestricted,
-        :MaxTokenInfoClass
-      )
+      :TokenUser, 1,
+      :TokenGroups,
+      :TokenPrivileges,
+      :TokenOwner,
+      :TokenPrimaryGroup,
+      :TokenDefaultDacl,
+      :TokenSource,
+      :TokenType,
+      :TokenImpersonationLevel,
+      :TokenStatistics,
+      :TokenRestrictedSids,
+      :TokenSessionId,
+      :TokenGroupsAndPrivileges,
+      :TokenSessionReference,
+      :TokenSandBoxInert,
+      :TokenAuditPolicy,
+      :TokenOrigin,
+      :TokenElevationType,
+      :TokenLinkedToken,
+      :TokenElevation,
+      :TokenHasRestrictions,
+      :TokenAccessInformation,
+      :TokenVirtualizationAllowed,
+      :TokenVirtualizationEnabled,
+      :TokenIntegrityLevel,
+      :TokenUIAccess,
+      :TokenMandatoryPolicy,
+      :TokenLogonSid,
+      :TokenIsAppContainer,
+      :TokenCapabilities,
+      :TokenAppContainerSid,
+      :TokenAppContainerNumber,
+      :TokenUserClaimAttributes,
+      :TokenDeviceClaimAttributes,
+      :TokenRestrictedUserClaimAttributes,
+      :TokenRestrictedDeviceClaimAttributes,
+      :TokenDeviceGroups,
+      :TokenRestrictedDeviceGroups,
+      :TokenSecurityAttributes,
+      :TokenIsRestricted,
+      :MaxTokenInfoClass
+    )
 
     # Service error codes
     # https://docs.microsoft.com/en-us/windows/desktop/debug/system-error-codes--1000-1299-
diff --git a/lib/puppet/functions/dig.rb b/lib/puppet/functions/dig.rb
@@ -44,11 +44,11 @@ def dig(data, *args)
         t = Puppet::Pops::Types::TypeCalculator.infer(d)
         msg = _("The given data does not contain a Collection at %{walked_path}, got '%{type}'") % { walked_path: walked_path, type: t }
         error_data = Puppet::DataTypes::Error.new(
-            msg,
-            'SLICE_ERROR',
-            {'walked_path' => walked_path, 'value_type' => t},
-            'EXPECTED_COLLECTION'
-          )
+          msg,
+          'SLICE_ERROR',
+          {'walked_path' => walked_path, 'value_type' => t},
+          'EXPECTED_COLLECTION'
+        )
         raise Puppet::ErrorWithData.new(error_data, msg)
       end
 
@@ -57,11 +57,11 @@ def dig(data, *args)
         t = Puppet::Pops::Types::TypeCalculator.infer(k)
         msg = _("The given data requires an Integer index at %{walked_path}, got '%{type}'") % { walked_path: walked_path, type: t }
         error_data = Puppet::DataTypes::Error.new(
-            msg,
-            'SLICE_ERROR',
-            {'walked_path' => walked_path, 'index_type' => t},
-            'EXPECTED_INTEGER_INDEX'
-          )
+          msg,
+          'SLICE_ERROR',
+          {'walked_path' => walked_path, 'index_type' => t},
+          'EXPECTED_INTEGER_INDEX'
+        )
         raise Puppet::ErrorWithData.new(error_data, msg)
       end
       d[k]
diff --git a/lib/puppet/module_tool/applications/installer.rb b/lib/puppet/module_tool/applications/installer.rb
@@ -184,10 +184,10 @@ def run
             end
 
             raise NoVersionsSatisfyError, results.merge(
-                    :requested_name => name,
-                    :requested_version => options[:version] || graph.dependencies[name].max.version.to_s,
-                    :unsatisfied => unsatisfied
-                  )
+              :requested_name => name,
+              :requested_version => options[:version] || graph.dependencies[name].max.version.to_s,
+              :unsatisfied => unsatisfied
+            )
           end
 
           unless forced?
diff --git a/lib/puppet/network/http/api/indirected_routes.rb b/lib/puppet/network/http/api/indirected_routes.rb
@@ -207,8 +207,8 @@ def first_response_formatter_for(model, request, key, &block)
     return formatter if formatter
 
     raise Puppet::Network::HTTP::Error::HTTPNotAcceptableError.new(
-            _("No supported formats are acceptable (Accept: %{accepted_formats})") % { accepted_formats: formats.map(&:mime).join(', ') },
-            Puppet::Network::HTTP::Issues::UNSUPPORTED_FORMAT)
+      _("No supported formats are acceptable (Accept: %{accepted_formats})") % { accepted_formats: formats.map(&:mime).join(', ') },
+      Puppet::Network::HTTP::Issues::UNSUPPORTED_FORMAT)
   end
 
   # Return an array of response formatters that the client accepts and
@@ -249,7 +249,7 @@ def indirection_method(http_method, indirection)
       method = METHOD_MAP[http_method][plurality(indirection)]
       unless method
         raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
-        _("No support for plurality %{indirection} for %{http_method} operations") % { indirection: plurality(indirection), http_method: http_method })
+          _("No support for plurality %{indirection} for %{http_method} operations") % { indirection: plurality(indirection), http_method: http_method })
       end
 
     method
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
@@ -111,8 +111,8 @@ def find_route_or_raise(request)
       return route
     else
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
-              _("No route for %{request} %{path}") % { request: request.method, path: request.path },
-              HANDLER_NOT_FOUND)
+        _("No route for %{request} %{path}") % { request: request.method, path: request.path },
+        HANDLER_NOT_FOUND)
     end
   end
 
diff --git a/lib/puppet/network/http/request.rb b/lib/puppet/network/http/request.rb
@@ -37,13 +37,13 @@ def formatter
 
       #TRANSLATORS "mime-type" is a keyword and should not be translated
       raise Puppet::Network::HTTP::Error::HTTPUnsupportedMediaTypeError.new(
-              _("Client sent a mime-type (%{header}) that doesn't correspond to a format we support") % { header: headers['content-type'] },
-              Puppet::Network::HTTP::Issues::UNSUPPORTED_MEDIA_TYPE)
+        _("Client sent a mime-type (%{header}) that doesn't correspond to a format we support") % { header: headers['content-type'] },
+        Puppet::Network::HTTP::Issues::UNSUPPORTED_MEDIA_TYPE)
     end
 
     raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
-            _("No Content-Type header was received, it isn't possible to unserialize the request"),
-            Puppet::Network::HTTP::Issues::MISSING_HEADER_FIELD)
+      _("No Content-Type header was received, it isn't possible to unserialize the request"),
+      Puppet::Network::HTTP::Issues::MISSING_HEADER_FIELD)
   end
 
   def response_formatters_for(supported_formats, default_accepted_formats = nil)
diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb
@@ -42,16 +42,16 @@ def evaluate(scope)
       resource_titles.flatten.map do |resource_title|
         exceptwrap :type => Puppet::ParseError do
           resource = Puppet::Parser::Resource.new(
-          fully_qualified_type, resource_title,
-          :parameters => paramobjects,
-          :file => self.file,
-          :line => self.line,
-          :exported => self.exported,
-          :virtual => virt,
-          :source => scope.source,
-          :scope => scope,
-          :strict => true
-          ) # rubocop:disable Layout/ClosingParenthesisIndentation
+            fully_qualified_type, resource_title,
+            :parameters => paramobjects,
+            :file => self.file,
+            :line => self.line,
+            :exported => self.exported,
+            :virtual => virt,
+            :source => scope.source,
+            :scope => scope,
+            :strict => true
+          )
 
           if resource.resource_type.is_a? Puppet::Resource::Type
             resource.resource_type.instantiate_resource(scope, resource)
diff --git a/lib/puppet/parser/functions/fail.rb b/lib/puppet/parser/functions/fail.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 Puppet::Parser::Functions::newfunction(
-    :fail,
-    :arity => -1,
-    :doc   => <<DOC
+  :fail,
+  :arity => -1,
+  :doc   => <<DOC
 Fail with a parse error. Any parameters will be stringified,
 concatenated, and passed to the exception-handler.
 DOC
-  ) do |vals|
+) do |vals|
     vals = vals.collect { |s| s.to_s }.join(" ") if vals.is_a? Array
     raise Puppet::ParseError, vals.to_s
 end
diff --git a/lib/puppet/parser/functions/regsubst.rb b/lib/puppet/parser/functions/regsubst.rb
@@ -28,7 +28,7 @@
 
 module Puppet::Parser::Functions
   newfunction(
-  :regsubst, :type => :rvalue,
+    :regsubst, :type => :rvalue,
   :arity => -4,
 
   :doc => "
diff --git a/lib/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
@@ -2,7 +2,7 @@
 
 module Puppet::Parser::Functions
   newfunction(
-  :split, :type => :rvalue,
+    :split, :type => :rvalue,
   :arity => 2,
 
     :doc => "\
diff --git a/lib/puppet/pops/loader/puppet_function_instantiator.rb b/lib/puppet/pops/loader/puppet_function_instantiator.rb
@@ -78,8 +78,8 @@ def self.create_function_class(function_definition)
     Puppet::Functions.create_function(function_definition.name, Puppet::Functions::PuppetFunction) do
       # TODO: should not create a new evaluator per function
       init_dispatch(Evaluator::Closure::Named.new(
-        function_definition.name,
-        Evaluator::EvaluatorImpl.new(), function_definition))
+                      function_definition.name,
+                      Evaluator::EvaluatorImpl.new(), function_definition))
     end
   end
 end
diff --git a/lib/puppet/pops/loader/puppet_plan_instantiator.rb b/lib/puppet/pops/loader/puppet_plan_instantiator.rb
@@ -87,8 +87,8 @@ def self.create_function_class(plan_definition)
     Puppet::Functions.create_function(plan_definition.name, Puppet::Functions::PuppetFunction) do
       # TODO: should not create a new evaluator per function
       init_dispatch(Evaluator::Closure::Named.new(
-        plan_definition.name,
-        Evaluator::EvaluatorImpl.new(), plan_definition))
+                      plan_definition.name,
+                      Evaluator::EvaluatorImpl.new(), plan_definition))
     end
   end
 end
diff --git a/lib/puppet/pops/lookup/hiera_config.rb b/lib/puppet/pops/lookup/hiera_config.rb
@@ -495,12 +495,12 @@ def self.config_type
       KEY_VERSION => tf.range(4, 4),
       tf.optional(KEY_DATADIR) => nes_t,
       tf.optional(KEY_HIERARCHY) => tf.array_of(tf.struct(
-        KEY_BACKEND => nes_t,
-        KEY_NAME => nes_t,
-        tf.optional(KEY_DATADIR) => nes_t,
-        tf.optional(KEY_PATH) => nes_t,
-        tf.optional(KEY_PATHS) => tf.array_of(nes_t)
-      ))
+                                                  KEY_BACKEND => nes_t,
+                                                  KEY_NAME => nes_t,
+                                                  tf.optional(KEY_DATADIR) => nes_t,
+                                                  tf.optional(KEY_PATH) => nes_t,
+                                                  tf.optional(KEY_PATHS) => tf.array_of(nes_t)
+                                                ))
     })
   end
 
@@ -578,23 +578,23 @@ def self.config_type
     option_name_t = tf.pattern(/\A[A-Za-z](:?[0-9A-Za-z_-]*[0-9A-Za-z])?\z/)
 
     hierarchy_t = tf.array_of(tf.struct(
-      {
-        KEY_NAME => nes_t,
-        tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
-        tf.optional(KEY_DATA_HASH) => nes_t,
-        tf.optional(KEY_LOOKUP_KEY) => nes_t,
-        tf.optional(KEY_V3_BACKEND) => nes_t,
-        tf.optional(KEY_V4_DATA_HASH) => nes_t,
-        tf.optional(KEY_DATA_DIG) => nes_t,
-        tf.optional(KEY_PATH) => nes_t,
-        tf.optional(KEY_PATHS) => tf.array_of(nes_t, tf.range(1, :default)),
-        tf.optional(KEY_GLOB) => nes_t,
-        tf.optional(KEY_GLOBS) => tf.array_of(nes_t, tf.range(1, :default)),
-        tf.optional(KEY_URI) => uri_t,
-        tf.optional(KEY_URIS) => tf.array_of(uri_t, tf.range(1, :default)),
-        tf.optional(KEY_MAPPED_PATHS) => tf.array_of(nes_t, tf.range(3, 3)),
-        tf.optional(KEY_DATADIR) => nes_t
-      }))
+                                {
+                                  KEY_NAME => nes_t,
+                                  tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
+                                  tf.optional(KEY_DATA_HASH) => nes_t,
+                                  tf.optional(KEY_LOOKUP_KEY) => nes_t,
+                                  tf.optional(KEY_V3_BACKEND) => nes_t,
+                                  tf.optional(KEY_V4_DATA_HASH) => nes_t,
+                                  tf.optional(KEY_DATA_DIG) => nes_t,
+                                  tf.optional(KEY_PATH) => nes_t,
+                                  tf.optional(KEY_PATHS) => tf.array_of(nes_t, tf.range(1, :default)),
+                                  tf.optional(KEY_GLOB) => nes_t,
+                                  tf.optional(KEY_GLOBS) => tf.array_of(nes_t, tf.range(1, :default)),
+                                  tf.optional(KEY_URI) => uri_t,
+                                  tf.optional(KEY_URIS) => tf.array_of(uri_t, tf.range(1, :default)),
+                                  tf.optional(KEY_MAPPED_PATHS) => tf.array_of(nes_t, tf.range(3, 3)),
+                                  tf.optional(KEY_DATADIR) => nes_t
+                                }))
 
     @@CONFIG_TYPE = tf.struct({
       KEY_VERSION => tf.range(5, 5),
diff --git a/lib/puppet/pops/parser/lexer_support.rb b/lib/puppet/pops/parser/lexer_support.rb
diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb
diff --git a/lib/puppet/util/windows/access_control_list.rb b/lib/puppet/util/windows/access_control_list.rb
diff --git a/lib/puppet/util/windows/file.rb b/lib/puppet/util/windows/file.rb
diff --git a/lib/puppet/util/windows/process.rb b/lib/puppet/util/windows/process.rb
diff --git a/lib/puppet/util/windows/security.rb b/lib/puppet/util/windows/security.rb
