(maint) Revert ruby 2 syntax changes for puppet support

.rubocop.yml

@@ -729,3 +729,5 @@ Style/StringChars:
   Enabled: false
 Style/SwapValues:
   Enabled: false
+Style/HashSyntax:
+  Enabled: false

spec/acceptance/sqlserver_config_spec.rb

@@ -86,7 +86,7 @@ def ensure_sqlserver_instance(inst_name, ensure_val = 'present')
       hostname = Helper.instance.run_shell('hostname').stdout.upcase.strip
       query = "USE #{db_name}; SELECT * from master..sysdatabases WHERE name = '#{db_name}'"
 
-      run_sql_query(query:, server: hostname, instance: inst_name, \
+      run_sql_query(query: query, server: hostname, instance: inst_name, \
                     sql_admin_user: @admin_user, sql_admin_pass: @admin_pass, expected_row_count: 1)
     end
 

spec/acceptance/sqlserver_database_spec.rb

@@ -7,10 +7,10 @@
   # Return options for run_sql_query
   def run_sql_query_opts(query, expected_row_count)
     {
-      query:,
+      query: query,
       sql_admin_user: 'sa',
       sql_admin_pass: 'Pupp3t1@',
-      expected_row_count:
+      expected_row_count: expected_row_count
     }
   end
 

spec/acceptance/sqlserver_instance_spec.rb

@@ -41,12 +41,12 @@ def ensure_sqlserver_instance(features, inst_name, ensure_val = 'present', sysad
   # Return options for run_sql_query
   def run_sql_query_opts(inst_name, query, expected_row_count)
     {
-      query:,
+      query: query,
       instance: inst_name,
       server: '.',
       sql_admin_user: 'sa',
       sql_admin_pass: 'Pupp3t1@',
-      expected_row_count:
+      expected_row_count: expected_row_count
     }
   end
 
@@ -90,7 +90,7 @@ def sql_query_is_user_sysadmin(username)
       host_computer_name = run_shell('CMD /C ECHO %COMPUTERNAME%').stdout.chomp
       ensure_sqlserver_instance(features, inst_name, 'present', ["#{host_computer_name}\\#{@extra_admin_user}"])
 
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).to match(%r{#{Regexp.new(inst_name)}})
       end
     end
@@ -107,7 +107,7 @@ def sql_query_is_user_sysadmin(username)
       ensure_sqlserver_instance(features, inst_name, 'absent')
 
       # Ensure all features for this instance are removed and the defaults are left alone
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).to match(%r{MSSQLSERVER\s+Database Engine Services})
         expect(r.stdout).to match(%r{MSSQLSERVER\s+SQL Server Replication})
         expect(r.stdout).to match(%r{MSSQLSERVER\s+Data Quality Services})
@@ -129,7 +129,7 @@ def sql_query_is_user_sysadmin(username)
     it "create #{inst_name} instance with only one RS feature", unless: version.to_i >= 2017 do
       ensure_sqlserver_instance(features, inst_name)
 
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).to match(%r{#{inst_name}\s+Reporting Services})
       end
     end

spec/acceptance/sqlserver_login_spec.rb

@@ -11,10 +11,10 @@
   # Return options for run_sql_query
   def run_sql_query_opts(user, passwd, query, expected_row_count)
     {
-      query:,
+      query: query,
       sql_admin_user: user,
       sql_admin_pass: passwd,
-      expected_row_count:
+      expected_row_count: expected_row_count
     }
   end
 

spec/acceptance/sqlserver_role_spec.rb

@@ -107,7 +107,7 @@ def ensure_sqlserver_logins_users(db_name)
       ON spe.grantee_principal_id = spr.principal_id
       WHERE spr.name = '#{@role}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 2)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 2)
 
       # validate that the database-specific role '#{@role}' has correct authorization #{LOGIN1}
       query = "USE #{@db_name};
@@ -117,7 +117,7 @@ def ensure_sqlserver_logins_users(db_name)
         ON spr.owning_principal_id = sl.principal_id
       WHERE sl.name = '#{LOGIN1}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
 
     it "Create database-specific role #{@role}" do
@@ -145,7 +145,7 @@ def ensure_sqlserver_logins_users(db_name)
         ON pe.grantee_principal_id = pr.principal_id
       WHERE pr.name = '#{@role}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 6)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 6)
     end
 
     it 'Create a database-specific role with the same name on two databases' do
@@ -183,7 +183,7 @@ def ensure_sqlserver_logins_users(db_name)
         on pr.name = dbpr.name
       WHERE pr.name = '#{@role}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 6)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 6)
     end
 
     it "Create server role #{@role} with optional members and optional members-purge" do
@@ -212,7 +212,7 @@ def ensure_sqlserver_logins_users(db_name)
         ON spe.grantee_principal_id = spr.principal_id
       WHERE spr.name = '#{@role}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 2)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 2)
 
       # validate that the t server role '#{@role}' has correct members (Login1, 2, 3)
       query = "USE #{@db_name};
@@ -225,7 +225,7 @@ def ensure_sqlserver_logins_users(db_name)
         OR spr.name = '#{LOGIN3}'
         OR spr.name = 'LOGIN4';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 3)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 3)
 
       puts "Create server role #{@role} with optional members_purge:"
       pp = <<-MANIFEST
@@ -255,7 +255,7 @@ def ensure_sqlserver_logins_users(db_name)
         OR spr.name = '#{LOGIN2}'
         OR spr.name = '#{LOGIN3}';"
 
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
   end
 end

spec/acceptance/sqlserver_user_spec.rb

@@ -69,7 +69,7 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
               WHERE name = '#{@db_user}'
               AND
               default_schema_name = 'guest';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
 
     it 'Create database user with optional instance' do
@@ -97,7 +97,7 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
               SELECT name AS Database_User_Name
               FROM SYS.DATABASE_PRINCIPALS
               WHERE name = '#{@db_user}';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
 
     it 'Create database user with optional login' do
@@ -127,7 +127,7 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
               FROM SYS.DATABASE_PRINCIPALS d, MASTER.SYS.SQL_LOGINS l
               WHERE d.sid = l.sid
               AND d.name = '#{@db_user}';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
 
     it 'Create database user with optional password' do
@@ -153,8 +153,8 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
       apply_manifest(pp, catch_failures: true)
 
       puts "validate that the database user '#{@db_user}' is successfully created:"
-      query = "USE #{@db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      query = "USE #{db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
     end
 
     it 'Delete database user' do
@@ -176,8 +176,8 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
       apply_manifest(pp, catch_failures: true)
 
       # validate that the database user '#{@db_user}' is successfully created:
-      query = "USE #{@db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 1)
+      query = "USE #{db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
+      run_sql_query(query: query, server: @hostname, expected_row_count: 1)
 
       pp = <<-MANIFEST
       sqlserver::config{'MSSQLSERVER':
@@ -191,8 +191,8 @@ def ensure_sqlserver_database(db_name, _ensure_val = 'present')
       MANIFEST
       apply_manifest(pp, catch_failures: true)
       # validate that the database user '#{@db_user}' should be deleted:
-      query = "USE #{@db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
-      run_sql_query(query:, server: @hostname, expected_row_count: 0)
+      query = "USE #{db_name}; SELECT * FROM SYS.DATABASE_PRINCIPALS WHERE name = '#{@db_user}';"
+      run_sql_query(query: query, server: @hostname, expected_row_count: 0)
     end
   end
 end

spec/acceptance/z_last_sqlserver_features_spec.rb

@@ -127,15 +127,15 @@ def bind_and_apply_failing_manifest(features, ensure_val = 'present')
     it "'BC'", unless: version.to_i >= 2019 do
       ensure_sql_features(features - ['BC'])
 
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).not_to match(%r{Client Tools Backwards Compatibility})
       end
     end
 
     it "'ADV_SSMS'", unless: version.to_i >= 2016 do
       ensure_sql_features(features - ['ADV_SSMS'])
 
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).not_to match(%r{Management Tools - Complete})
 
         # also verify SSMS is still present
@@ -146,7 +146,7 @@ def bind_and_apply_failing_manifest(features, ensure_val = 'present')
     it "'SDK' + 'IS", unless: version.to_i >= 2019 do
       ensure_sql_features(features - ['SDK', 'IS'])
 
-      validate_sql_install(version:) do |r|
+      validate_sql_install(version: version) do |r|
         expect(r.stdout).not_to match(%r{Client Tools SDK})
       end
     end
@@ -199,7 +199,7 @@ def remove_sql_instance
       it 'all possible features' do
         ensure_sql_features(features)
 
-        validate_sql_install(version:) do |r|
+        validate_sql_install(version: version) do |r|
           # SQL Server 2016+ will not install the client tools features.
           expect(r.stdout).not_to match(%r{MSSQLSERVER\s+Database Engine Services})
           expect(r.stdout).not_to match(%r{MSSQLSERVER\s+SQL Server Replication})

spec/defines/login/permissions_spec.rb

@@ -107,14 +107,14 @@
         let(:should_contain_command) { ["#{state.upcase} SELECT TO [loggingUser];", 'USE [master];'] }
 
         describe "lowercase #{state}" do
-          let(:additional_params) { { state: } }
+          let(:additional_params) { { state: state } }
 
           it_behaves_like 'sqlserver_tsql command'
         end
 
         state = state.capitalize
         describe "capitalized #{state}" do
-          let(:additional_params) { { state: } }
+          let(:additional_params) { { state: state } }
 
           it_behaves_like 'sqlserver_tsql command'
         end

spec/defines/role/permissions_spec.rb

@@ -159,7 +159,7 @@
           {
             role: 'myCustomRole',
             permissions: ['INSERT', 'UPDATE', 'DELETE', 'SELECT'],
-            instance:
+            instance: instance
           }
         end
 

spec/defines/user/permissions_spec.rb

@@ -133,14 +133,14 @@
         let(:should_contain_command) { ["#{state.upcase} SELECT TO [loggingUser];", 'USE [loggingDb];'] }
 
         describe "lowercase #{state}" do
-          let(:additional_params) { { state: } }
+          let(:additional_params) { { state: state } }
 
           it_behaves_like 'sqlserver_tsql command'
         end
 
         state = state.capitalize
         describe "capitalized #{state}" do
-          let(:additional_params) { { state: } }
+          let(:additional_params) { { state: state } }
 
           it_behaves_like 'sqlserver_tsql command'
         end

spec/defines/user_spec.rb

@@ -61,7 +61,7 @@
 
   describe 'when a password is specified' do
     password = 'Pupp3t1@'
-    let(:additional_params) { { password: } }
+    let(:additional_params) { { password: password } }
     let(:should_contain_command) do
       [
         'USE [myDatabase];',