(PUP-11993) Style/TrailingCommaInArguments

This commit enables the Style/TrailingCommaInArguments cop and fixes
17 autocorrectable offenses.

Author: AriaXLi

.rubocop_todo.yml

@@ -734,23 +734,6 @@ Style/SymbolArray:
 Style/TernaryParentheses:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'lib/puppet/defaults.rb'
-    - 'lib/puppet/ffi/windows/functions.rb'
-    - 'lib/puppet/ffi/windows/structs.rb'
-    - 'lib/puppet/http/service/compiler.rb'
-    - 'lib/puppet/http/service/report.rb'
-    - 'lib/puppet/indirector/file_bucket_file/rest.rb'
-    - 'lib/puppet/indirector/file_content/rest.rb'
-    - 'lib/puppet/indirector/file_metadata/rest.rb'
-    - 'lib/puppet/pops/types/p_uri_type.rb'
-    - 'lib/puppet/util/windows/adsi.rb'
-    - 'lib/puppet/util/windows/service.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma

lib/puppet/defaults.rb

@@ -1298,7 +1298,7 @@ def self.initialize_default_settings!(settings)
       :sourceaddress => {
         :default    => nil,
         :desc       => "The address the agent should use to initiate requests.",
-      },
+      }
     )
 
   settings.define_settings(:environment,

lib/puppet/ffi/windows/functions.rb

@@ -287,7 +287,7 @@ module Functions
     #   LPDWORD        pcbBytesNeeded
     # );
     SC_STATUS_TYPE = enum(
-      :SC_STATUS_PROCESS_INFO, 0,
+      :SC_STATUS_PROCESS_INFO, 0
     )
     ffi_lib :advapi32
     attach_function_private :QueryServiceStatusEx,
@@ -425,7 +425,7 @@ module Functions
     #   LPCWSTR      pszGroupName
     # );
     SC_ENUM_TYPE = enum(
-      :SC_ENUM_PROCESS_INFO, 0,
+      :SC_ENUM_PROCESS_INFO, 0
     )
     ffi_lib :advapi32
     attach_function_private :EnumServicesStatusExW,

lib/puppet/ffi/windows/structs.rb

@@ -198,7 +198,7 @@ class SERVICE_STATUS < FFI::Struct
         :dwWin32ExitCode, :dword,
         :dwServiceSpecificExitCode, :dword,
         :dwCheckPoint, :dword,
-        :dwWaitHint, :dword,
+        :dwWaitHint, :dword
       )
     end
 
@@ -223,7 +223,7 @@ class QUERY_SERVICE_CONFIGW < FFI::Struct
         :dwTagId, :dword,
         :lpDependencies, :pointer,
         :lpServiceStartName, :pointer,
-        :lpDisplayName, :pointer,
+        :lpDisplayName, :pointer
       )
     end
 

lib/puppet/http/service/compiler.rb

@@ -118,7 +118,7 @@ def post_catalog(name, facts:, environment:, configured_environment: nil, check_
       body,
       headers: headers,
       # for legacy reasons we always send environment as a query parameter too
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     if (compiler = response['X-Puppet-Compiler-Name'])
@@ -248,7 +248,7 @@ def put_facts(name, environment:, facts:)
       with_base_url("/facts/#{name}"),
       serialize(formatter, facts),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     process_response(response)

lib/puppet/http/service/report.rb

@@ -47,7 +47,7 @@ def put_report(name, report, environment:)
       with_base_url("/report/#{name}"),
       serialize(formatter, report),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     # override parent's process_response handling

lib/puppet/indirector/file_bucket_file/rest.rb

@@ -13,7 +13,7 @@ def head(request)
       api.head_filebucket_file(
         request.key,
         environment: request.environment.to_s,
-        bucket_path: request.options[:bucket_path],
+        bucket_path: request.options[:bucket_path]
       )
     rescue Puppet::HTTP::ResponseError => e
       return nil if e.response.code == 404
@@ -31,7 +31,7 @@ def find(request)
         diff_with: request.options[:diff_with],
         list_all: request.options[:list_all],
         fromdate: request.options[:fromdate],
-        todate: request.options[:todate],
+        todate: request.options[:todate]
       )
       filebucket_file
     rescue Puppet::HTTP::ResponseError => e
@@ -44,7 +44,7 @@ def save(request)
       api.put_filebucket_file(
         request.key,
         body: request.instance.render,
-        environment: request.environment.to_s,
+        environment: request.environment.to_s
       )
     rescue Puppet::HTTP::ResponseError => e
       raise convert_to_http_error(e.response)

lib/puppet/indirector/file_content/rest.rb

@@ -17,7 +17,7 @@ def find(request)
 
     api.get_file_content(
       path: Puppet::Util.uri_unescape(url.path),
-      environment: request.environment.to_s,
+      environment: request.environment.to_s
     ) do |data|
       content << data
     end

lib/puppet/indirector/file_metadata/rest.rb

@@ -46,7 +46,7 @@ def search(request)
       ignore: request.options[:ignore],
       links: request.options[:links],
       checksum_type: request.options[:checksum_type],
-      source_permissions: request.options[:source_permissions],
+      source_permissions: request.options[:source_permissions]
     )
     file_metadatas
   rescue Puppet::HTTP::ResponseError => e

lib/puppet/pops/types/p_uri_type.rb

@@ -34,7 +34,7 @@ class PURIType < PAnyType
     TypeFactory.optional(PATH) => PStringType::NON_EMPTY,
     TypeFactory.optional(QUERY) => PStringType::NON_EMPTY,
     TypeFactory.optional(FRAGMENT) => PStringType::NON_EMPTY,
-    TypeFactory.optional(OPAQUE) => PStringType::NON_EMPTY,
+    TypeFactory.optional(OPAQUE) => PStringType::NON_EMPTY
   )
 
   TYPE_STRING_PARAM =
@@ -66,7 +66,7 @@ class PURIType < PAnyType
     TypeFactory.optional(PATH) => TYPE_STRING_PARAM,
     TypeFactory.optional(QUERY) => TYPE_STRING_PARAM,
     TypeFactory.optional(FRAGMENT) => TYPE_STRING_PARAM,
-    TypeFactory.optional(OPAQUE) => TYPE_STRING_PARAM,
+    TypeFactory.optional(OPAQUE) => TYPE_STRING_PARAM
   )
 
   TYPE_URI_PARAM_TYPE = PVariantType.new([PStringType::NON_EMPTY, TYPE_URI_PARAM_HASH_TYPE])