lint

Author: GrantBirki

.rubocop.yml

@@ -3,8 +3,9 @@ inherit_gem:
     - config/default.yml
 
 AllCops:
+  SuggestExtensions: false
   DisplayCopNames: true
-  TargetRubyVersion: 2.7.5
+  TargetRubyVersion: 3.1
   Exclude:
     - 'bin/*'
     - 'spec/acceptance/fixtures/**/*'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    entitlements-gitrepo-auditor-plugin (0.2.3)
+    entitlements-gitrepo-auditor-plugin (0.3.0)
       contracts (= 0.17)
       entitlements (= 0.2.0)
 

lib/entitlements/auditor/gitrepo.rb

@@ -26,7 +26,7 @@ def setup
         @repo = Entitlements::Util::GitRepo.new(
           repo: config["repo"],
           sshkey: Base64.decode64(config["sshkey"]),
-          logger: logger
+          logger:
         )
         @repo.github = config["github_override"] if config["github_override"]
         @repo.send(operation, checkout_directory)
@@ -59,10 +59,10 @@ def commit(actions:, successful_actions:, provider_exception:)
         %w[update_files delete_files].each do |m|
           send(
             m.to_sym,
-            action_hash: action_hash,
-            successful_actions: successful_actions,
-            sync_changes: sync_changes,
-            valid_changes: valid_changes
+            action_hash:,
+            successful_actions:,
+            sync_changes:,
+            valid_changes:
           )
         end
 

spec/acceptance/tests/spec_helper.rb

@@ -63,7 +63,7 @@ def run(fixture_dir, args = [])
   command_parts = [binary, "--config-file", configfile] + args
   command = command_parts.map { |i| Shellwords.escape(i) }.join(" ")
   stdout, stderr, exitstatus = Open3.capture3(command)
-  OpenStruct.new({ stdout: stdout, stderr: stderr, exitstatus: exitstatus.exitstatus, success?: exitstatus.exitstatus == 0 })
+  OpenStruct.new({ stdout:, stderr:, exitstatus: exitstatus.exitstatus, success?: exitstatus.exitstatus == 0 })
 end
 
 def log(priority, pattern)

spec/unit/entitlements/auditor/gitrepo_spec.rb

@@ -287,10 +287,10 @@
         valid_changes = {}
 
         subject.send(:update_files,
-          action_hash: action_hash,
-          successful_actions: successful_actions,
-          sync_changes: sync_changes,
-          valid_changes: valid_changes
+          action_hash:,
+          successful_actions:,
+          sync_changes:,
+          valid_changes:
         )
 
         expect(sync_changes).to eq({})
@@ -343,10 +343,10 @@
         valid_changes = {}
 
         subject.send(:update_files,
-          action_hash: action_hash,
-          successful_actions: successful_actions,
-          sync_changes: sync_changes,
-          valid_changes: valid_changes
+          action_hash:,
+          successful_actions:,
+          sync_changes:,
+          valid_changes:
         )
 
         expect(sync_changes).to eq(
@@ -420,10 +420,10 @@
           .with("Entitlements::Auditor::GitRepo: Valid change (create dc=net/dc=kittens/ou=Groups/cn=group3) queued")
 
         subject.send(:update_files,
-          action_hash: action_hash,
-          successful_actions: successful_actions,
-          sync_changes: sync_changes,
-          valid_changes: valid_changes
+          action_hash:,
+          successful_actions:,
+          sync_changes:,
+          valid_changes:
         )
 
         expect(sync_changes).to eq(
@@ -561,10 +561,10 @@
           .with("Entitlements::Auditor::GitRepo: Valid change (update dc=net/dc=kittens/ou=Groups/cn=group5) queued")
 
         subject.send(:update_files,
-          action_hash: action_hash,
-          successful_actions: successful_actions,
-          sync_changes: sync_changes,
-          valid_changes: valid_changes
+          action_hash:,
+          successful_actions:,
+          sync_changes:,
+          valid_changes:
         )
 
         expect(sync_changes).to eq(
@@ -695,10 +695,10 @@
           .with("Entitlements::Auditor::GitRepo: Valid change (delete dc=net/dc=kittens/ou=Groups/cn=group5) queued")
 
         subject.send(:update_files,
-          action_hash: action_hash,
-          successful_actions: successful_actions,
-          sync_changes: sync_changes,
-          valid_changes: valid_changes
+          action_hash:,
+          successful_actions:,
+          sync_changes:,
+          valid_changes:
         )
 
         expect(sync_changes).to eq(
@@ -759,10 +759,10 @@
         .with("Entitlements::Auditor::GitRepo: Sync change (delete dc=net/dc=kittens/ou=extra/cn=extragroup) required")
 
       subject.send(:delete_files,
-        action_hash: action_hash,
-        successful_actions: successful_actions,
-        sync_changes: sync_changes,
-        valid_changes: valid_changes
+        action_hash:,
+        successful_actions:,
+        sync_changes:,
+        valid_changes:
       )
 
       expect(sync_changes).to eq(

spec/unit/entitlements/util/gitrepo_spec.rb

@@ -6,7 +6,7 @@
 
   let(:directory) { "/tmp/asdlkfjafdiejwroiwejfalskdfjdsklf" }
   let(:logger) { instance_double(Logger) }
-  let(:subject) { described_class.new(repo: "kittens/fluffy", sshkey: "xyz123", logger: logger) }
+  let(:subject) { described_class.new(repo: "kittens/fluffy", sshkey: "xyz123", logger:) }
 
   describe "#add" do
     it "executes the command" do

spec/unit/entitlements_spec.rb

@@ -259,7 +259,7 @@
       expect(logger).to receive(:debug).with("Audit Auditor 1 completed successfully")
       expect(logger).to receive(:debug).with("Audit Auditor 2 completed successfully")
 
-      expect { described_class.execute(actions: actions) }.not_to raise_error
+      expect { described_class.execute(actions:) }.not_to raise_error
     end
 
     it "returns without error with no auditors configured" do
@@ -278,7 +278,7 @@
 
       expect(logger).not_to receive(:debug)
 
-      expect { described_class.execute(actions: actions) }.not_to raise_error
+      expect { described_class.execute(actions:) }.not_to raise_error
     end
 
     it "raises when setup of an auditor fails" do
@@ -292,7 +292,7 @@
       expect(auditor2).not_to receive(:setup)
       expect(auditor2).not_to receive(:commit)
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
 
     it "raises (but runs other auditors) when an auditor fails" do
@@ -332,7 +332,7 @@
       allow(logger).to receive(:error)
       expect(logger).to receive(:error).with("Audit Auditor 1 failed: RuntimeError Boom")
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
 
     it "raises when a provider fails and there are no auditors" do
@@ -352,7 +352,7 @@
 
       expect(logger).not_to receive(:debug)
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
 
     it "raises (but runs the auditors) when a provider fails" do
@@ -391,7 +391,7 @@
       expect(logger).to receive(:debug).with("Audit Auditor 1 completed successfully")
       expect(logger).to receive(:debug).with("Audit Auditor 2 completed successfully")
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
 
     it "raises the provider's exception when a provider and auditor both fail" do
@@ -431,7 +431,7 @@
       expect(logger).to receive(:debug).with("Audit Auditor 2 completed successfully")
       allow(logger).to receive(:error) # Stack trace
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
 
     it "raises and logs a message when multiple auditors fail" do
@@ -472,7 +472,7 @@
       expect(logger).to receive(:error).with("Audit Auditor 2 failed: RuntimeError Boom Boom")
       allow(logger).to receive(:error) # Stack trace
 
-      expect { described_class.execute(actions: actions) }.to raise_error(exc)
+      expect { described_class.execute(actions:) }.to raise_error(exc)
     end
   end