enable additional rubocop rule

CDLUC3 · Jan 17, 2024 · 6ef2da1 · 6ef2da1
1 parent c49debe
commit 6ef2da1
Show file tree

Hide file tree

Showing 22 changed files with 149 additions and 131 deletions.
diff --git a/cognito-lambda-nonvpc/.rubocop.yml b/cognito-lambda-nonvpc/.rubocop.yml
@@ -39,15 +39,14 @@ Style/ConditionalAssignment:
 Style/ClassVars:
   Enabled: false
 
-# Rubocop errors out when the following are added: https://github.com/rubocop/rubocop/issues/12548
-#Layout/FirstArrayElementIndentation:
-#  Enabled: true
-#Layout/FirstArrayElementLineBreak:
-#  Enabled: true
-#Layout/ArrayAlignment:
-#  EnforcedStyle: with_fixed_indentation
-#Layout/MultilineArrayBraceLayout:
-#  EnforcedStyle: new_line
+Layout/FirstArrayElementIndentation:
+  Enabled: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/ArrayAlignment:
+  EnforcedStyle: with_fixed_indentation
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: new_line
 
 Layout/FirstHashElementIndentation:
   Enabled: true

diff --git a/cognito-lambda-nonvpc/Gemfile.lock b/cognito-lambda-nonvpc/Gemfile.lock
@@ -3,11 +3,11 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.876.0)
+    aws-partitions (1.881.0)
     aws-sdk-cognitoidentityprovider (1.85.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.190.1)
+    aws-sdk-core (3.190.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -18,18 +18,18 @@ GEM
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

diff --git a/mysql-ruby-lambda/.rubocop.yml b/mysql-ruby-lambda/.rubocop.yml
@@ -39,15 +39,14 @@ Style/ConditionalAssignment:
 Style/ClassVars:
   Enabled: false
 
-# Rubocop errors out when the following are added: https://github.com/rubocop/rubocop/issues/12548
-#Layout/FirstArrayElementIndentation:
-#  Enabled: true
-#Layout/FirstArrayElementLineBreak:
-#  Enabled: true
-#Layout/ArrayAlignment:
-#  EnforcedStyle: with_fixed_indentation
-#Layout/MultilineArrayBraceLayout:
-#  EnforcedStyle: new_line
+Layout/FirstArrayElementIndentation:
+  Enabled: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/ArrayAlignment:
+  EnforcedStyle: with_fixed_indentation
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: new_line
 
 Layout/FirstHashElementIndentation:
   Enabled: true

diff --git a/mysql-ruby-lambda/Gemfile.lock b/mysql-ruby-lambda/Gemfile.lock
@@ -13,8 +13,8 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.876.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.881.0)
+    aws-sdk-core (3.190.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -30,18 +30,18 @@ GEM
     logger (1.6.0)
     mysql2 (0.5.5)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

diff --git a/simulate-lambda-alb/.rubocop.yml b/simulate-lambda-alb/.rubocop.yml
@@ -39,15 +39,14 @@ Style/ConditionalAssignment:
 Style/ClassVars:
   Enabled: false
 
-# Rubocop errors out when the following are added: https://github.com/rubocop/rubocop/issues/12548
-#Layout/FirstArrayElementIndentation:
-#  Enabled: true
-#Layout/FirstArrayElementLineBreak:
-#  Enabled: true
-#Layout/ArrayAlignment:
-#  EnforcedStyle: with_fixed_indentation
-#Layout/MultilineArrayBraceLayout:
-#  EnforcedStyle: new_line
+Layout/FirstArrayElementIndentation:
+  Enabled: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/ArrayAlignment:
+  EnforcedStyle: with_fixed_indentation
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: new_line
 
 Layout/FirstHashElementIndentation:
   Enabled: true

diff --git a/simulate-lambda-alb/Gemfile.lock b/simulate-lambda-alb/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
@@ -18,13 +18,13 @@ GEM
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rainbow (3.1.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

diff --git a/src-admintool/.rubocop.yml b/src-admintool/.rubocop.yml
@@ -39,15 +39,14 @@ Style/ConditionalAssignment:
 Style/ClassVars:
   Enabled: false
 
-# Rubocop errors out when the following are added: https://github.com/rubocop/rubocop/issues/12548
-#Layout/FirstArrayElementIndentation:
-#  Enabled: true
-#Layout/FirstArrayElementLineBreak:
-#  Enabled: true
-#Layout/ArrayAlignment:
-#  EnforcedStyle: with_fixed_indentation
-#Layout/MultilineArrayBraceLayout:
-#  EnforcedStyle: new_line
+Layout/FirstArrayElementIndentation:
+  Enabled: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/ArrayAlignment:
+  EnforcedStyle: with_fixed_indentation
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: new_line
 
 Layout/FirstHashElementIndentation:
   Enabled: true

diff --git a/src-admintool/Gemfile.lock b/src-admintool/Gemfile.lock
@@ -13,13 +13,13 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.876.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.881.0)
+    aws-sdk-core (3.190.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
+    aws-sdk-kms (1.76.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.142.0)
@@ -37,18 +37,18 @@ GEM
     logger (1.6.0)
     mysql2 (0.5.5)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

diff --git a/src-admintool/queries/admin_objects_query.rb b/src-admintool/queries/admin_objects_query.rb
@@ -66,8 +66,10 @@ def get_sql
   end
 
   def get_headers(_results)
-    ['Obj Id', 'Obj Ark', 'Coll/Own Ark', 'Owner', 'OwnerArk', 'Collections', 'Type', 'Role', 'Aggregate Role', 'Name',
-     'Created', 'Status']
+    [
+      'Obj Id', 'Obj Ark', 'Coll/Own Ark', 'Owner', 'OwnerArk', 'Collections', 'Type', 'Role', 'Aggregate Role', 'Name',
+      'Created', 'Status'
+    ]
   end
 
   def get_types(_results)

diff --git a/src-admintool/queries/nodes_query.rb b/src-admintool/queries/nodes_query.rb
@@ -40,8 +40,10 @@ def get_sql
   end
 
   def get_headers(_results)
-    ['Node Number', 'Description', 'Total Obj', 'Primary Obj', 'Secondary Obj', 'File Count', 'Billable Size',
-     'Allocation', 'Status']
+    [
+      'Node Number', 'Description', 'Total Obj', 'Primary Obj', 'Secondary Obj', 'File Count', 'Billable Size',
+      'Allocation', 'Status'
+    ]
   end
 
   def get_types(_results)

diff --git a/src-admintool/queries/objects_query.rb b/src-admintool/queries/objects_query.rb
@@ -80,8 +80,10 @@ def get_obj_limit_query
   end
 
   def get_headers(_results)
-    ['Object Id', 'Ark', 'Title', 'Author', 'Local Id (erc_where)', 'Version', 'Coll Id', 'Collection', 'File Count',
-     'Billable Size', 'Modified']
+    [
+      'Object Id', 'Ark', 'Title', 'Author', 'Local Id (erc_where)', 'Version', 'Coll Id', 'Collection', 'File Count',
+      'Billable Size', 'Modified'
+    ]
   end
 
   def get_types(_results)

diff --git a/src-admintool/queries/replic_failed_query.rb b/src-admintool/queries/replic_failed_query.rb
@@ -124,8 +124,10 @@ def init_status
   end
 
   def get_headers(_results)
-    ['Category', 'Object Id', 'Ark', 'Version', 'Obj Created', 'Replic Start', 'Bytes', 'Rep Status', 'Fail Nodes',
-     'Status']
+    [
+      'Category', 'Object Id', 'Ark', 'Version', 'Obj Created', 'Replic Start', 'Bytes', 'Rep Status', 'Fail Nodes',
+      'Status'
+    ]
   end
 
   def get_types(_results)

diff --git a/src-admintool/queries/replic_initiated_query.rb b/src-admintool/queries/replic_initiated_query.rb
@@ -117,8 +117,10 @@ def init_status
   end
 
   def get_headers(_results)
-    ['Category', 'Object Id', 'Ark', 'Version', 'Obj Created', 'Replic Start', 'Bytes', 'Sec Count', 'Ver Min',
-     'Ver Max', 'Status']
+    [
+      'Category', 'Object Id', 'Ark', 'Version', 'Obj Created', 'Replic Start', 'Bytes', 'Sec Count', 'Ver Min',
+      'Ver Max', 'Status'
+    ]
   end
 
   def get_types(_results)

diff --git a/src-admintool/queries/ui_test_cases_query.rb b/src-admintool/queries/ui_test_cases_query.rb
@@ -9,8 +9,10 @@ def get_title
   def get_sql
     sample = 3
     sql = ''.dup
-    list = %w[merritt_demo escholarship ucb_lib_cal_cultures ucb_lib_dcpp ucb_lib_metcalf ucb_lib_jar ucb_lib_prechmat
-              ucb_lib_stone_rubbings]
+    list = %w[
+      merritt_demo escholarship ucb_lib_cal_cultures ucb_lib_dcpp ucb_lib_metcalf ucb_lib_jar ucb_lib_prechmat
+      ucb_lib_stone_rubbings
+    ]
     list.each do |coll|
       sql << 'union ' unless sql.empty?
       sql << %{

diff --git a/src-colladmin/.rubocop.yml b/src-colladmin/.rubocop.yml
@@ -39,15 +39,14 @@ Style/ConditionalAssignment:
 Style/ClassVars:
   Enabled: false
 
-# Rubocop errors out when the following are added: https://github.com/rubocop/rubocop/issues/12548
-#Layout/FirstArrayElementIndentation:
-#  Enabled: true
-#Layout/FirstArrayElementLineBreak:
-#  Enabled: true
-#Layout/ArrayAlignment:
-#  EnforcedStyle: with_fixed_indentation
-#Layout/MultilineArrayBraceLayout:
-#  EnforcedStyle: new_line
+Layout/FirstArrayElementIndentation:
+  Enabled: true
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+Layout/ArrayAlignment:
+  EnforcedStyle: with_fixed_indentation
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: new_line
 
 Layout/FirstHashElementIndentation:
   Enabled: true

diff --git a/src-colladmin/actions/ingest_collection_locks_action.rb b/src-colladmin/actions/ingest_collection_locks_action.rb
@@ -50,14 +50,14 @@ def table_rows(_body)
       p = plist[prof]
       hc = @held_counts.fetch(prof, 0)
       arr.append([
-                   prof,
-                   p[:collid],
-                   p[:name],
-                   p[:locked] ? 'Locked' : '',
-                   "#{p[:locked] ? 'unlock' : 'lock'},#{prof}",
-                   hc,
-                   hc.positive? ? prof : ''
-                 ])
+        prof,
+        p[:collid],
+        p[:name],
+        p[:locked] ? 'Locked' : '',
+        "#{p[:locked] ? 'unlock' : 'lock'},#{prof}",
+        hc,
+        hc.positive? ? prof : ''
+      ])
     end
     arr
   end

diff --git a/src-colladmin/actions/opensearch_describe_action.rb b/src-colladmin/actions/opensearch_describe_action.rb
@@ -10,7 +10,7 @@ def initialize(config, action, path, myparams)
     file = 'import/filebeat/fields.json'
     @title = "Merritt OpenSearch Fields (#{File.ctime(file).to_s[0..15]})"
     @fields = JSON.parse(File.read(file))
-    #load_registry
+    # load_registry
   end
 
   def load_registry
@@ -65,6 +65,7 @@ def table_rows(_body)
     @fields.each do |val|
       name = val.fetch('name', '')
       next if name =~ /\.keyword$/
+
       type = val.fetch('type', '')
       rows.append([name, type, 'PASS'])
     end

diff --git a/src-colladmin/lib/merritt_ldap.rb b/src-colladmin/lib/merritt_ldap.rb
@@ -81,8 +81,10 @@ def load
   end
 
   def load_users
-    attr = %i[dn objectclass mail sn tzregion cn arkid givenname userpassword displayname uid
-              ds-pwp-last-login-time]
+    attr = %i[
+      dn objectclass mail sn tzregion cn arkid givenname userpassword displayname uid
+      ds-pwp-last-login-time
+    ]
     @ldap.search(base: user_base, attributes: attr) do |entry|
       user = LdapUser.new(entry)
       next if user.uid.empty?