From e66d10683e5ac0d6188bc86977bff44620120f09 Mon Sep 17 00:00:00 2001
From: Tim Perkins <tim.perkins@shopify.com>
Date: Fri, 2 Jul 2021 10:18:05 -0400
Subject: [PATCH] Update config

---
 rubocop.yml                   | 24 ++---------------
 test/fixtures/full_config.yml | 50 ++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/rubocop.yml b/rubocop.yml
index 302c20b6..9a4bfe83 100644
--- a/rubocop.yml
+++ b/rubocop.yml
@@ -338,25 +338,10 @@ Naming/HeredocDelimiterNaming:
 
 Naming/InclusiveLanguage:
   Enabled: true
-  CheckIdentifiers: true
-  CheckConstants: true
-  CheckVariables: true
-  # CheckStrings is false in the rubocop defaults
-  CheckStrings: true
-  CheckSymbols: true
-  CheckComments: true
-  CheckFilepaths: true
   FlaggedTerms:
     whitelist:
-      Regex: !ruby/regexp '/white[-_\s]?list/'
-      Suggestions:
-        - allowlist
-        - permit
-    blacklist:
-      Regex: !ruby/regexp '/black[-_\s]?list/'
-      Suggestions:
-        - denylist
-        - block
+      AllowedRegex:
+        - 'web_console.whitelisted_ips'
     master:
       Suggestions:
         - primary
@@ -365,11 +350,6 @@ Naming/InclusiveLanguage:
         - !ruby/regexp '/master[_\s\.]key/' # Rails master key
         - 'blob/master/'
         - 'origin/master'
-    slave:
-      Suggestions:
-        - replica
-        - secondary
-        - follower
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
diff --git a/test/fixtures/full_config.yml b/test/fixtures/full_config.yml
index d030a279..3f01d334 100644
--- a/test/fixtures/full_config.yml
+++ b/test/fixtures/full_config.yml
@@ -595,6 +595,16 @@ Layout/LeadingEmptyLines:
   Enabled: false
   VersionAdded: '0.57'
   VersionChanged: '0.77'
+Layout/LineEndStringConcatenationIndentation:
+  Description: Checks the indentation of the next line after a line that ends with
+    a string literal and a backslash.
+  Enabled: pending
+  VersionAdded: '1.18'
+  EnforcedStyle: aligned
+  SupportedStyles:
+  - aligned
+  - indented
+  IndentationWidth:
 Layout/LineLength:
   Description: Checks that line length does not exceed the configured limit.
   StyleGuide: "#max-line-length"
@@ -1845,6 +1855,43 @@ Naming/HeredocDelimiterNaming:
   VersionAdded: '0.50'
   ForbiddenDelimiters:
   - !ruby/regexp /(^|\s)(EO[A-Z]{1}|END)(\s|$)/
+Naming/InclusiveLanguage:
+  Description: Recommend the use of inclusive language instead of problematic terms.
+  Enabled: true
+  VersionAdded: '1.18'
+  CheckIdentifiers: true
+  CheckConstants: true
+  CheckVariables: true
+  CheckStrings: false
+  CheckSymbols: true
+  CheckComments: true
+  CheckFilepaths: true
+  FlaggedTerms:
+    whitelist:
+      Regex: !ruby/regexp /white[-_\s]?list/
+      Suggestions:
+      - allowlist
+      - permit
+      AllowedRegex:
+      - web_console.whitelisted_ips
+    blacklist:
+      Regex: !ruby/regexp /black[-_\s]?list/
+      Suggestions:
+      - denylist
+      - block
+    slave:
+      Suggestions:
+      - replica
+      - secondary
+      - follower
+    master:
+      Suggestions:
+      - primary
+      - leader
+      AllowedRegex:
+      - !ruby/regexp /master[_\s\.]key/
+      - blob/master/
+      - origin/master
 Naming/MemoizedInstanceVariableName:
   Description: Memoized method name should match memo instance variable name.
   Enabled: false
@@ -3403,7 +3450,8 @@ Style/StringConcatenation:
   Enabled: false
   Safe: false
   VersionAdded: '0.89'
-  VersionChanged: '1.6'
+  VersionChanged: '1.18'
+  Mode: aggressive
 Style/StringHashKeys:
   Description: Prefer symbols instead of strings as hash keys.
   StyleGuide: "#symbols-as-keys"