Commit 22c22faa authored by Takuya Noguchi's avatar Takuya Noguchi 💖
Browse files

Re-enable some Cops from the latest RuboCop 

Signed-off-by: default avatarTakuya Noguchi <takninnovationresearch@gmail.com>
parent 21f2f7d6

.rubocop_todo.yml

+1 −68
Original line number Diff line number Diff line 
# This configuration was generated by

# `rubocop --auto-gen-config`

# on 2021-04-16 00:00:00 UTC using RuboCop version 0.93.1.

# on 2021-04-18 00:00:00 UTC using RuboCop version 0.93.1.

# The point is for the user to remove these configuration records

# one by one as the offenses are removed from the code base.

# Note that changes in the inspected code, or installation of new
@@ -24,13 +24,6 @@ CodeReuse/ActiveRecord: 
    - 'spec/labkit/tracing_spec.rb'

    - 'spec/support/tracing/shared_examples.rb'



# Offense count: 2

# Cop supports --auto-correct.

Cop/LineBreakAroundConditionalBlock:

  Exclude:

    - 'lib/labkit/excon_publisher.rb'

    - 'lib/labkit/tracing/external_http/request_instrumenter.rb'



# Offense count: 1

# Configuration parameters: Include.

# Include: **/*.gemspec
@@ -61,15 +54,6 @@ Lint/ConstantDefinitionInBlock: 
    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'

    - 'spec/labkit/middleware/sidekiq/server_spec.rb'



# Offense count: 4

# Cop supports --auto-correct.

Lint/RedundantCopDisableDirective:

  Exclude:

    - 'lib/labkit/correlation/grpc/client_interceptor.rb'

    - 'lib/labkit/correlation/grpc/server_interceptor.rb'

    - 'lib/labkit/tracing/grpc/client_interceptor.rb'

    - 'lib/labkit/tracing/grpc/server_interceptor.rb'



# Offense count: 1

# Cop supports --auto-correct.

# Configuration parameters: AllowedMethods.
@@ -90,14 +74,6 @@ Performance/MethodObjectAsBlock: 
  Exclude:

    - 'lib/labkit/context.rb'



# Offense count: 6

# Cop supports --auto-correct.

RSpec/BeEql:

  Exclude:

    - 'spec/labkit/excon_publisher_spec.rb'

    - 'spec/labkit/httpclient_publisher_spec.rb'

    - 'spec/labkit/net_http_publisher_spec.rb'



# Offense count: 1

# Configuration parameters: Prefixes.

# Prefixes: when, with, without
@@ -113,13 +89,6 @@ RSpec/DescribedClass: 
  Exclude:

    - 'spec/labkit/tracing_spec.rb'



# Offense count: 4

# Cop supports --auto-correct.

RSpec/EmptyLineAfterLetBlock:

  Exclude:

    - 'spec/labkit/tracing/external_http/request_instrumenter_spec.rb'

    - 'spec/labkit/tracing/rails/active_record/sql_instrumenter_spec.rb'



# Offense count: 2

# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.

RSpec/FilePath:
@@ -189,14 +158,6 @@ Style/CaseLikeIf: 
  Exclude:

    - 'lib/labkit/excon_publisher.rb'



# Offense count: 1

# Cop supports --auto-correct.

# Configuration parameters: EnforcedStyle, AllowInnerBackticks.

# SupportedStyles: backticks, percent_x, mixed

Style/CommandLiteral:

  Exclude:

    - 'tools/update-changelog.rb'



# Offense count: 23

# Cop supports --auto-correct.

Style/ExplicitBlockArgument:
@@ -240,12 +201,6 @@ Style/HashSyntax: 
  Exclude:

    - 'spec/labkit/excon_publisher_spec.rb'



# Offense count: 1

# Cop supports --auto-correct.

Style/IfUnlessModifier:

  Exclude:

    - 'tools/update-changelog.rb'



# Offense count: 16

# Cop supports --auto-correct.

# Configuration parameters: PreferredDelimiters.
@@ -253,12 +208,6 @@ Style/PercentLiteralDelimiters: 
  Exclude:

    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'



# Offense count: 1

# Cop supports --auto-correct.

Style/RedundantAssignment:

  Exclude:

    - 'lib/labkit/logging/sanitizer.rb'



# Offense count: 2

# Cop supports --auto-correct.

Style/RedundantBegin:
@@ -272,14 +221,6 @@ Style/RedundantRegexpEscape: 
  Exclude:

    - 'lib/labkit/logging/sanitizer.rb'



# Offense count: 1

# Cop supports --auto-correct.

# Configuration parameters: EnforcedStyle.

# SupportedStyles: implicit, explicit

Style/RescueStandardError:

  Exclude:

    - 'lib/labkit/excon_publisher.rb'



# Offense count: 1

# Cop supports --auto-correct.

Style/StringConcatenation:
@@ -295,11 +236,3 @@ Style/TrailingCommaInArrayLiteral: 
    - 'spec/labkit/excon_publisher_spec.rb'

    - 'spec/labkit/httpclient_publisher_spec.rb'

    - 'spec/labkit/net_http_publisher_spec.rb'
 


# Offense count: 1

# Cop supports --auto-correct.

# Configuration parameters: WordRegex.

# SupportedStyles: percent, brackets

Style/WordArray:

  EnforcedStyle: percent

  MinSize: 3

lib/labkit/correlation/grpc/client_interceptor.rb

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


# Disable the UnusedMethodArgument linter, since we need to declare the kwargs

# in the methods, but we don't actually use them.

# rubocop:disable Lint/UnusedMethodArgument

require "grpc"

require "singleton"
@@ -48,5 +47,3 @@ module Labkit 
    end

  end

end
 


# rubocop:enable Lint/UnusedMethodArgument

lib/labkit/correlation/grpc/server_interceptor.rb

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


# Disable the UnusedMethodArgument linter, since we need to declare the kwargs

# in the methods, but we don't actually use them.

# rubocop:disable Lint/UnusedMethodArgument



require "grpc"
@@ -51,5 +50,3 @@ module Labkit 
    end

  end

end
 


# rubocop:enable Lint/UnusedMethodArgument

lib/labkit/excon_publisher.rb

+3 −1
Original line number Diff line number Diff line
@@ -99,10 +99,12 @@ module Labkit 
        query: generate_query_string(datum[:query]),

        start_time: ::Labkit::System.monotonic_time,

      }



      unless datum[:proxy].nil?

        payload[:proxy_host] = datum[:proxy][:host]

        payload[:proxy_port] = datum[:proxy][:port]

      end



      payload

    end
@@ -133,7 +135,7 @@ module Labkit 


    def nil_or_int(int)

      int&.to_i

    rescue

    rescue StandardError

      nil

    end

lib/labkit/logging/sanitizer.rb

+1 −3
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ module Labkit 


      def self.sanitize_field(content)

        content = content.gsub(URL_REGEXP) { |url| mask_url(url) }

        content = content.gsub(SCP_URL_REGEXP) { |scp_url| mask_scp_url(scp_url) }



        content

        content.gsub(SCP_URL_REGEXP) { |scp_url| mask_scp_url(scp_url) }

      end



      def self.sanitize_sql(sql)