Attempt at remediateing rubocop hiera failures

Author: jstack-godaddy

lib/puppet/provider/mysql_database/mysql.rb

@@ -8,11 +8,11 @@
 
   def self.instances(managed_databases = nil)
     db_list = if managed_databases && !managed_databases.empty?
-      managed_databases
-    else
-      mysql_caller('show databases', 'regular').split("\n")
-    end
-    db_list.map do |name|
+                managed_databases
+              else
+                mysql_caller('show databases', 'regular').split("\n")
+              end
+    db_list.map { |name|
       attributes = {}
       begin
         mysql_caller(["show variables like '%_database'", name], 'regular').split("\n").each do |line|
@@ -24,11 +24,11 @@ def self.instances(managed_databases = nil)
 
         next
       end
-      new(name: name,
+      new(name:,
           ensure: :present,
           charset: attributes['character_set_database'],
           collate: attributes['collation_database'])
-    end.compact
+    }.compact
   end
 
   # We iterate over each mysql_database entry in the catalog and compare it against

lib/puppet/provider/mysql_grant/mysql.rb

@@ -8,7 +8,7 @@
 
   def self.instances(managed_users = nil)
     instance_configs = {}
-    user_list = managed_users && !managed_users.empty? ? managed_users : users
+    user_list = (managed_users && !managed_users.empty?) ? managed_users : users
     user_list.map do |user|
       user_string = cmd_user(user)
       query = "SHOW GRANTS FOR #{user_string};"

spec/unit/puppet/provider/mysql_database/mysql_spec.rb

@@ -44,7 +44,9 @@
 
     it 'skips managed databases that no longer exist' do
       allow(provider.class).to receive(:mysql_caller).with(["show variables like '%_database'", 'managed_existing'], 'regular').and_return("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF") # rubocop:disable Layout/LineLength
-      allow(provider.class).to receive(:mysql_caller).with(["show variables like '%_database'", 'managed_missing'], 'regular').and_raise(Puppet::ExecutionFailure, 'ERROR 1049 (42000): Unknown database')
+      allow(provider.class).to receive(:mysql_caller)
+        .with(["show variables like '%_database'", 'managed_missing'], 'regular')
+        .and_raise(Puppet::ExecutionFailure, 'ERROR 1049 (42000): Unknown database')
 
       databases = provider.class.instances(['managed_existing', 'managed_missing']).map(&:name)
       expect(databases).to eq(['managed_existing'])
@@ -77,11 +79,10 @@
         'db_two' => instance_double(Puppet::Type.type(:mysql_database))
       }
 
-      allow(provider.class).to receive(:instances).with(['db_one', 'db_two']).and_return([])
-      resources.values.each { |res| allow(res).to receive(:provider=) }
+      expect(provider.class).to receive(:instances).with(['db_one', 'db_two']).and_return([])
+      resources.each_value { |res| allow(res).to receive(:provider=) }
 
       provider.class.prefetch(resources)
-      expect(provider.class).to have_received(:instances).with(['db_one', 'db_two'])
     end
   end
 

spec/unit/puppet/provider/mysql_grant/mysql_spec.rb

@@ -6,26 +6,22 @@
   describe 'self.instances' do
     it 'loads grants only for the managed users list' do
       allow(described_class).to receive(:newer_than).and_return(false)
-      allow(described_class).to receive(:users).and_return(['unused@localhost'])
-      allow(described_class).to receive(:mysql_caller).with("SHOW GRANTS FOR 'alice'@'localhost';", 'regular').and_return("GRANT SELECT ON `db_one`.* TO 'alice'@'localhost'\n")
-      allow(described_class).to receive(:mysql_caller).with("SHOW GRANTS FOR 'bob'@'localhost';", 'regular').and_return("GRANT INSERT ON `db_two`.* TO 'bob'@'localhost'\n")
+      expect(described_class).not_to receive(:users)
+      expect(described_class).to receive(:mysql_caller).with("SHOW GRANTS FOR 'alice'@'localhost';", 'regular').and_return("GRANT SELECT ON `db_one`.* TO 'alice'@'localhost'\n")
+      expect(described_class).not_to receive(:mysql_caller).with("SHOW GRANTS FOR 'bob'@'localhost';", 'regular')
 
       instances = described_class.instances(['alice@localhost'])
 
-      expect(described_class).not_to have_received(:users)
-      expect(described_class).to have_received(:mysql_caller).with("SHOW GRANTS FOR 'alice'@'localhost';", 'regular')
-      expect(described_class).not_to have_received(:mysql_caller).with("SHOW GRANTS FOR 'bob'@'localhost';", 'regular')
       expect(instances.map(&:name)).to eq(['alice@localhost/db_one.*'])
     end
 
     it 'falls back to full user scan when managed user list is empty' do
       allow(described_class).to receive(:newer_than).and_return(false)
-      allow(described_class).to receive(:users).and_return(['alice@localhost'])
+      expect(described_class).to receive(:users).and_return(['alice@localhost'])
       allow(described_class).to receive(:mysql_caller).with("SHOW GRANTS FOR 'alice'@'localhost';", 'regular').and_return("GRANT SELECT ON `db_one`.* TO 'alice'@'localhost'\n")
 
       instances = described_class.instances([])
 
-      expect(described_class).to have_received(:users)
       expect(instances.map(&:name)).to eq(['alice@localhost/db_one.*'])
     end
   end
@@ -45,17 +41,12 @@
       alice_provider = instance_double(described_class, name: 'alice@localhost/db_one.*')
       bob_provider = instance_double(described_class, name: 'bob@localhost/db_one.*')
 
-      allow(described_class).to receive(:instances).with(['alice@localhost', 'bob@localhost']).and_return([alice_provider, bob_provider])
-      allow(grant_one).to receive(:provider=)
-      allow(grant_two).to receive(:provider=)
-      allow(grant_three).to receive(:provider=)
+      expect(described_class).to receive(:instances).with(['alice@localhost', 'bob@localhost']).and_return([alice_provider, bob_provider])
+      expect(grant_one).to receive(:provider=).with(alice_provider)
+      expect(grant_two).not_to receive(:provider=)
+      expect(grant_three).to receive(:provider=).with(bob_provider)
 
       described_class.prefetch(resources)
-
-      expect(described_class).to have_received(:instances).with(['alice@localhost', 'bob@localhost'])
-      expect(grant_one).to have_received(:provider=).with(alice_provider)
-      expect(grant_two).not_to have_received(:provider=)
-      expect(grant_three).to have_received(:provider=).with(bob_provider)
     end
   end
 end

spec/unit/puppet/provider/mysql_user/mysql_spec.rb

@@ -170,7 +170,7 @@
     end
 
     it 'queries only managed users when user list is provided' do
-      managed_users = ["joe@localhost", "o'reilly@localhost"]
+      managed_users = ['joe@localhost', "o'reilly@localhost"]
       user_query = "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user WHERE HOST IS NOT NULL AND HOST != '' AND CONCAT(User, '@', Host) IN ('joe@localhost', 'o''reilly@localhost')"
 
       allow(provider.class).to receive(:mysql_caller).with(user_query, 'regular').and_return("joe@localhost\no'reilly@localhost")
@@ -221,11 +221,10 @@
         'jane@localhost' => instance_double(Puppet::Type.type(:mysql_user))
       }
 
-      allow(provider.class).to receive(:instances).with(['joe@localhost', 'jane@localhost']).and_return([])
-      resources.values.each { |res| allow(res).to receive(:provider=) }
+      expect(provider.class).to receive(:instances).with(['joe@localhost', 'jane@localhost']).and_return([])
+      resources.each_value { |res| allow(res).to receive(:provider=) }
 
       provider.class.prefetch(resources)
-      expect(provider.class).to have_received(:instances).with(['joe@localhost', 'jane@localhost'])
     end
   end