(CONT-789) Rubocop Auto Fixes 26-28

- Style/SoleNestedConditional
- Style/TernaryParentheses
- Style/TrailingCommaInHashLiteral

Author: david22swan

.rubocop_todo.yml

@@ -235,13 +235,6 @@ Style/OptionalBooleanParameter:
     - 'lib/puppet/functions/mysql/password.rb'
     - 'lib/puppet/functions/mysql_password.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/puppet/type/mysql_grant.rb'
-
 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
@@ -263,30 +256,3 @@ Style/SymbolProc:
     - 'lib/puppet/provider/mysql_login_path/inifile.rb'
     - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
     - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'spec/spec_helper_acceptance_local.rb'
-
-# Offense count: 43
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_login_path/mysql_login_path.rb'
-    - 'lib/puppet/type/mysql_login_path.rb'
-    - 'spec/classes/graceful_failures_spec.rb'
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/classes/mysql_bindings_spec.rb'
-    - 'spec/classes/mysql_client_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'

lib/puppet/provider/mysql_grant/mysql.rb

@@ -91,7 +91,7 @@ def self.instances
           privileges: sorted_privileges,
           table: table,
           user: "#{user}@#{host}",
-          options: options.uniq,
+          options: options.uniq
         }
       end
     end

lib/puppet/provider/mysql_login_path/mysql_login_path.rb

@@ -48,7 +48,7 @@ def mysql_config_editor_set_cmd(context, uid, password = nil, *args)
       ) % {
         str: command_str,
         exit_status: $CHILD_STATUS.exitstatus,
-        output: e.message,
+        output: e.message
       }
     end
   end

lib/puppet/type/mysql_grant.rb

@@ -38,9 +38,7 @@ def initialize(*args)
     raise(_('mysql_grant: `table` `parameter` is required.')) if self[:ensure] == :present && self[:table].nil?
     raise(_('mysql_grant: `user` `parameter` is required.')) if self[:ensure] == :present && self[:user].nil?
 
-    if self[:user] && self[:table]
-      raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}"
-    end
+    raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:user] && self[:table] && (self[:name] != "#{self[:user]}/#{self[:table]}")
   end
 
   newparam(:name, namevar: true) do

lib/puppet/type/mysql_login_path.rb

@@ -36,48 +36,48 @@
   title_patterns: [
     {
       pattern: %r{^(?<name>.*[^-])-(?<owner>.*)$},
-      desc: 'Where the name of the and the owner are provided with a hyphen seperator',
+      desc: 'Where the name of the and the owner are provided with a hyphen seperator'
     },
     {
       pattern: %r{^(?<name>.*)$},
-      desc: 'Where only the name is provided',
+      desc: 'Where only the name is provided'
     },
   ],
   attributes: {
     ensure: {
       type: 'Enum[present, absent]',
-      desc: 'Whether this resource should be present or absent on the target system.',
+      desc: 'Whether this resource should be present or absent on the target system.'
     },
     name: {
       type: 'String',
       desc: 'Name of the login path you want to manage.',
-      behaviour: :namevar,
+      behaviour: :namevar
     },
     owner: {
       type: 'String',
       desc: 'The user to whom the logon path should belong.',
       behaviour: :namevar,
-      default: 'root',
+      default: 'root'
     },
     host: {
       type: 'Optional[String]',
-      desc: 'Host name to be entered into the login path.',
+      desc: 'Host name to be entered into the login path.'
     },
     user: {
       type: 'Optional[String]',
-      desc: 'Username to be entered into the login path.',
+      desc: 'Username to be entered into the login path.'
     },
     password: {
       type: 'Optional[Sensitive[String[1]]]',
-      desc: 'Password to be entered into login path',
+      desc: 'Password to be entered into login path'
     },
     socket: {
       type: 'Optional[String]',
-      desc: 'Socket path to be entered into login path',
+      desc: 'Socket path to be entered into login path'
     },
     port: {
       type: 'Optional[Integer[0,65535]]',
-      desc: 'Port number to be entered into login path.',
-    },
+      desc: 'Port number to be entered into login path.'
+    }
   },
 )

spec/classes/graceful_failures_spec.rb

@@ -7,7 +7,7 @@
     let(:facts) do
       {
         os: { family: 'UNSUPPORTED',
-              name: 'UNSUPPORTED' },
+              name: 'UNSUPPORTED' }
       }
     end
 

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -76,7 +76,7 @@ class { 'mysql::server': }
         let(:params) do
           {
             'file_per_database' => true,
-            'excludedatabases' => ['information_schema'],
+            'excludedatabases' => ['information_schema']
           }.merge(default_params)
         end
 

spec/classes/mysql_bindings_spec.rb

@@ -21,7 +21,7 @@
           'client_dev' => true,
           'daemon_dev' => true,
           'client_dev_package_name' => 'libmysqlclient-devel',
-          'daemon_dev_package_name' => 'mysql-devel',
+          'daemon_dev_package_name' => 'mysql-devel'
         }
       end
 

spec/classes/mysql_client_spec.rb

@@ -37,7 +37,7 @@
         let(:params) do
           {
             package_provider: 'dpkg',
-            package_source: '/somewhere',
+            package_source: '/somewhere'
           }
         end
 

spec/classes/mysql_server_backup_spec.rb

@@ -109,7 +109,7 @@ class { 'mysql::server': }
       context 'with delete after dump' do
         let(:custom_params) do
           {
-            'delete_before_dump' => false,
+            'delete_before_dump' => false
           }
         end
         let(:params) do
@@ -123,7 +123,7 @@ class { 'mysql::server': }
         let(:custom_params) do
           {
             'delete_before_dump' => false,
-            'backup_success_file_path' => '/opt/mysqlbackup_success',
+            'backup_success_file_path' => '/opt/mysqlbackup_success'
           }
         end
         let(:params) do