CAT-1147 mysql erb to epp rubocop fix

puppetlabs · Aug 2, 2023 · eadd13a · eadd13a
1 parent 8fe879e
commit eadd13a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/lib/puppet/functions/mysql/innobackupex_args.rb b/lib/puppet/functions/mysql/innobackupex_args.rb
@@ -12,11 +12,11 @@
 
   def innobackupex_args(backupuser, backupcompress, backuppassword_unsensitive, backupdatabases, optional_args)
     innobackupex_args = ''
-    innobackupex_args = "--user=\"#{backupuser}\" --password=\"#{backuppassword_unsensitive}\"" if backupuser and backuppassword_unsensitive
+    innobackupex_args = "--user=\"#{backupuser}\" --password=\"#{backuppassword_unsensitive}\"" if backupuser && backuppassword_unsensitive
 
     innobackupex_args = "#{innobackupex_args} --compress" if backupcompress
 
-    innobackupex_args = "#{innobackupex_args} --databases=\"#{backupdatabases.join(' ')}\"" if backupdatabases.is_a?(Array) and !backupdatabases.empty?
+    innobackupex_args = "#{innobackupex_args} --databases=\"#{backupdatabases.join(' ')}\"" if backupdatabases.is_a?(Array) && !backupdatabases.empty?
 
     if optional_args.is_a?(Array)
       optional_args.each do |arg|

diff --git a/spec/functions/mysql_innobackupex_args_spec.rb b/spec/functions/mysql_innobackupex_args_spec.rb
@@ -7,54 +7,48 @@
     expect(subject).not_to be_nil
   end
 
-#   it 'throws error with no arguments' do
-#     expect(subject).to run.with_params().and_raise_error(Puppet::ArgumentError)
-#   end
-
   it 'accepts empty strings as puppet undef' do
     expect(subject).to run.with_params('', true, '', [], [])
   end
 
   it 'returns args with username and password' do
-    expect(subject).to run.with_params('root', false, '12345', [], []).and_return("--user=\"root\" --password=\"12345\"")
+    expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
   end
 
   it 'returns args with database lists' do
-    expect(subject).to run.with_params('root', false, '12345', ['db1','db2'], []).and_return("--user=\"root\" --password=\"12345\" --databases=\"db1 db2\"")
+    expect(subject).to run.with_params('root', false, '12345', ['db1', 'db2'], []).and_return('--user="root" --password="12345" --databases="db1 db2"')
   end
 
   it 'returns args without database list' do
-    expect(subject).to run.with_params('root', false, '12345', [], []).and_return("--user=\"root\" --password=\"12345\"")
+    expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
   end
 
   it 'returns args without backup compress' do
-    expect(subject).to run.with_params('root', false, '12345', [], []).and_return("--user=\"root\" --password=\"12345\"")
+    expect(subject).to run.with_params('root', false, '12345', [], []).and_return('--user="root" --password="12345"')
   end
 
   it 'returns args with backup compress only' do
-    expected_results = "--user=\"root\" --password=\"12345\" --compress"
+    expected_results = '--user="root" --password="12345" --compress'
     expect(subject).to run.with_params('root', true, '12345', [], []).and_return(expected_results)
   end
 
   it 'returns args with backup compress and database list' do
-    expected_results = "--user=\"root\" --password=\"12345\" --compress --databases=\"db1 db2\""
-    expect(subject).to run.with_params('root', true, '12345', ['db1','db2'], []).and_return(expected_results)
+    expected_results = '--user="root" --password="12345" --compress --databases="db1 db2"'
+    expect(subject).to run.with_params('root', true, '12345', ['db1', 'db2'], []).and_return(expected_results)
   end
 
   it 'returns args with backup compress, database list and optional_args' do
-    expected_results = "--user=\"root\" --password=\"12345\" --compress --databases=\"db1 db2\" tst_arg_1 tst_arg_2"
-    expect(subject).to run.with_params('root', true, '12345', ['db1','db2'], ["tst_arg_1", "tst_arg_2"]).and_return(expected_results)
+    expected_results = '--user="root" --password="12345" --compress --databases="db1 db2" tst_arg_1 tst_arg_2'
+    expect(subject).to run.with_params('root', true, '12345', ['db1', 'db2'], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)
   end
 
-  it 'returns args without backup compress, database list and optional_args' do
-    expected_results = "--user=\"root\" --password=\"12345\" --databases=\"db1 db2\" tst_arg_1 tst_arg_2"
-    expect(subject).to run.with_params('root', false, '12345', ['db1','db2'], ["tst_arg_1", "tst_arg_2"]).and_return(expected_results)
+  it 'returns args without backup compress database list and optional_args' do
+    expected_results = '--user="root" --password="12345" --databases="db1 db2" tst_arg_1 tst_arg_2'
+    expect(subject).to run.with_params('root', false, '12345', ['db1', 'db2'], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)
   end
 
-  it 'returns args without backup compress, database list and with optional_args' do
-    expected_results = "--user=\"root\" --password=\"12345\" tst_arg_1 tst_arg_2"
-    expect(subject).to run.with_params('root', false, '12345', [], ["tst_arg_1", "tst_arg_2"]).and_return(expected_results)
+  it 'returns args without backup compress database list and with optional_args' do
+    expected_results = '--user="root" --password="12345" tst_arg_1 tst_arg_2'
+    expect(subject).to run.with_params('root', false, '12345', [], ['tst_arg_1', 'tst_arg_2']).and_return(expected_results)
   end
-
-
 end