(GH-cat-9) Rubocop fixes

Author: david22swan

lib/facter/mysql_server_id.rb

@@ -15,10 +15,8 @@ def mysql_id_get
 
 Facter.add('mysql_server_id') do
   setcode do
-    begin
-      mysql_id_get
-    rescue
-      nil
-    end
+    mysql_id_get
+  rescue
+    nil
   end
 end

lib/puppet/provider/mysql_grant/mysql.rb

@@ -69,7 +69,7 @@ def self.instances
           sorted_privileges = ['ALL']
 
         # Currently there is an issue with the behaviour of the module which was highlighted by the 'complex test' test case in 'mysql_grant_spec'. The module, upon retrieving all privileges from an
-        # user, does not take into account that the latest version of mysql now includes dynamic privileges which are returned alongside the original static privileges and are set by 'ALL PRIVILEGES' 
+        # user, does not take into account that the latest version of mysql now includes dynamic privileges which are returned alongside the original static privileges and are set by 'ALL PRIVILEGES'
         # (shortened to 'ALL'). This is a workaround to remove the unnecesary privileges from the sorted_privileges list which is used to check for idempotency in test cases.
         elsif sorted_privileges == ['ALL', 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', 'BINLOG_ENCRYPTION_ADMIN',
                                     'CLONE_ADMIN', 'CONNECTION_ADMIN', 'ENCRYPTION_KEY_ADMIN', 'FLUSH_OPTIMIZER_COSTS', 'FLUSH_STATUS', 'FLUSH_TABLES', 'FLUSH_USER_RESOURCES',