Merge pull request #3378 from puppetlabs/rubucop-update

danadoherty639 · web-flow · commit b47e2057ea70 · 2025-03-10T11:10:01.000Z
Update rubocop version, this fixes BlockAlignment Error
diff --git a/.github/workflows/apply.yaml b/.github/workflows/apply.yaml
@@ -41,7 +41,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/bolt_server.yaml b/.github/workflows/bolt_server.yaml
@@ -42,7 +42,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/bolt_spec.yaml b/.github/workflows/bolt_spec.yaml
@@ -42,7 +42,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/docker_transport.yaml b/.github/workflows/docker_transport.yaml
@@ -33,7 +33,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -33,7 +33,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/local_transport.yaml b/.github/workflows/local_transport.yaml
@@ -41,7 +41,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/orch_transport.yaml b/.github/workflows/orch_transport.yaml
@@ -41,7 +41,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/ssh_transport.yaml b/.github/workflows/ssh_transport.yaml
@@ -33,7 +33,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -38,7 +38,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -42,7 +42,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
@@ -73,7 +73,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.github/workflows/winrm_transport.yaml b/.github/workflows/winrm_transport.yaml
@@ -40,7 +40,7 @@ jobs:
         run: bundle update
       - name: Cache modules
         id: modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: modules
           key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,6 @@
-require:
-  - rubocop-rake
+inherit_from: .rubocop_todo.yml
+
+plugins: rubocop-rake
 
 AllCops:
   NewCops: enable
diff --git a/Gemfile b/Gemfile
@@ -27,7 +27,7 @@ group(:test) do
   gem "beaker-hostgenerator"
   gem "mocha", '~> 1.4.0'
   gem "rack-test", '~> 1.0'
-  gem "rubocop", '~> 1.9.0', require: false
+  gem "rubocop", '~> 1.72.2', require: false
   gem "rubocop-rake", require: false
 end
 
diff --git a/spec/integration/cli/cli_spec.rb b/spec/integration/cli/cli_spec.rb
@@ -429,7 +429,7 @@
           ['sample::params', 'Task with parameters']
         )
 
-        expect(@log_output.readlines).to include(/unexpected token/)
+        expect(@log_output.readlines).to include(/expected object key/) || include(/ WARN  Puppet : expected object key/) # rubocop:disable Layout/LineLength
       end
     end
   end
diff --git a/spec/integration/inventory_spec.rb b/spec/integration/inventory_spec.rb
@@ -18,29 +18,29 @@
 
   let(:inventory) do
     { targets: [
-      { uri: conn[:host],
-        config: {
-          transport: conn[:protocol],
-          conn[:protocol] => {
-            user: conn[:user],
-            port: conn[:port],
-            'connect-timeout': conn[:'connect-timeout'] || 120
-          }
-        } },
-      { name: 'uriless',
-        config: {
-          transport: conn[:protocol],
-          conn[:protocol] => {
-            host: conn[:host],
-            user: conn[:user],
-            port: conn[:port]
-          }
-        } },
-      { name: 'hostless',
-        config: {
-          transport: conn[:protocol]
-        } }
-    ],
+        { uri: conn[:host],
+          config: {
+            transport: conn[:protocol],
+            conn[:protocol] => {
+              user: conn[:user],
+              port: conn[:port],
+              'connect-timeout': conn[:'connect-timeout'] || 120
+            }
+          } },
+        { name: 'uriless',
+          config: {
+            transport: conn[:protocol],
+            conn[:protocol] => {
+              host: conn[:host],
+              user: conn[:user],
+              port: conn[:port]
+            }
+          } },
+        { name: 'hostless',
+          config: {
+            transport: conn[:protocol]
+          } }
+      ],
       groups: [{
         name: "group1",
         targets: [
diff --git a/spec/integration/jail_spec.rb b/spec/integration/jail_spec.rb
@@ -85,8 +85,7 @@
     let(:default_inv) do
       {
         'config' => {
-          'jail' => {
-          }
+          'jail' => {}
         }
       }
     end
@@ -102,8 +101,7 @@
     let(:run_as_conf) do
       {
         'config' => {
-          'jail' => {
-          }
+          'jail' => {}
         }
       }
     end
diff --git a/spec/integration/puppetdb/client_spec.rb b/spec/integration/puppetdb/client_spec.rb
@@ -126,9 +126,9 @@
 
     def facts_hash
       { 'node1' => {
-        'foo' => 'bar',
-        'name' => 'node1'
-      },
+          'foo' => 'bar',
+          'name' => 'node1'
+        },
         'node2' => {
           'foo' => 'bar',
           '1' => 'the loneliest number',
diff --git a/spec/integration/remote_spec.rb b/spec/integration/remote_spec.rb
@@ -14,28 +14,28 @@
   let(:conn) { conn_info('ssh') }
   let(:inventory) do
     { 'targets' => [
-      { 'uri' => conn[:host],
-        'config' => {
-          'transport' => conn[:protocol],
-          conn[:protocol] => {
-            'user' => conn[:user],
-            'port' => conn[:port],
-            'password' => conn[:password]
-          }
-        } },
-      { 'uri' => 'remote://simple.example.com',
-        'config' => {
-          'remote' => {
-            'run-on' => conn[:host],
-            'token' => 'token_val'
-          }
-        } },
-      { 'uri' => 'https://www.example.com',
-        'config' => {
-          'transport' => 'remote',
-          'remote' => { 'run-on': conn[:host] }
-        } }
-    ],
+        { 'uri' => conn[:host],
+          'config' => {
+            'transport' => conn[:protocol],
+            conn[:protocol] => {
+              'user' => conn[:user],
+              'port' => conn[:port],
+              'password' => conn[:password]
+            }
+          } },
+        { 'uri' => 'remote://simple.example.com',
+          'config' => {
+            'remote' => {
+              'run-on' => conn[:host],
+              'token' => 'token_val'
+            }
+          } },
+        { 'uri' => 'https://www.example.com',
+          'config' => {
+            'transport' => 'remote',
+            'remote' => { 'run-on': conn[:host] }
+          } }
+      ],
       'config' => {
         'ssh' => { 'host-key-check' => false },
         'winrm' => { 'ssl' => false, 'ssl-verify' => false }
diff --git a/spec/lib/bolt_spec/puppetdb.rb b/spec/lib/bolt_spec/puppetdb.rb
@@ -32,20 +32,20 @@ def make_command(command:, version:, payload:, wait: nil)
 
     def replace_facts(certname, facts, wait: nil)
       make_command(command: 'replace facts', version: 5, payload: {
-                     certname: certname,
-                     environment: 'production',
-                     producer_timestamp: Time.now.iso8601(3),
-                     producer: 'bolt',
-                     values: facts
-                   },
+                                                           certname: certname,
+                                                           environment: 'production',
+                                                           producer_timestamp: Time.now.iso8601(3),
+                                                           producer: 'bolt',
+                                                           values: facts
+                                                         },
                    wait: wait)
     end
 
     def deactivate_node(certname, wait: nil)
       make_command(command: 'deactivate node', version: 3, payload: {
-                     certname: certname,
-                     producer_timestamp: Time.now.iso8601(3)
-                   },
+                                                             certname: certname,
+                                                             producer_timestamp: Time.now.iso8601(3)
+                                                           },
                    wait: wait)
     end
 
diff --git a/spec/unit/logger_spec.rb b/spec/unit/logger_spec.rb
@@ -53,8 +53,7 @@ def initialize(*args)
   describe '::configure' do
     let(:appenders) {
       {
-        'file:/bolt.log' => {
-        },
+        'file:/bolt.log' => {},
         'file:/debug.log' => {
           level: :debug,
           append: false
