(MODULES-10335) - Update exec's title to be unique

manifests/sp_configure.pp

@@ -41,7 +41,7 @@
   }
 
   if $restart {
-    Sqlserver_tsql["sp_configure-${instance}-${config_name}"] ~> Exec["restart-service-${service_name}"]
+    Sqlserver_tsql["sp_configure-${instance}-${config_name}"] ~> Exec["restart-service-${service_name}-${config_name}"]
   }
 
   sqlserver_tsql{ "sp_configure-${instance}-${config_name}":
@@ -51,7 +51,7 @@
     require  => Sqlserver::Config[$instance]
   }
 
-  exec{"restart-service-${service_name}":
+  exec{"restart-service-${service_name}-${config_name}":
     command     => template('sqlserver/restart_service.ps1.erb'),
     provider    => powershell,
     logoutput   => true,

spec/acceptance/sqlserver_database_spec.rb

@@ -36,6 +36,9 @@ def run_sql_query_opts(query, expected_row_count)
         sqlserver::database{'#{@db_name}':
           ensure  => 'absent',
         }
+        sqlserver::database{'#{@db_name}-2':
+          ensure  => 'absent',
+        }
       MANIFEST
       ensure_sqlserver_database(pp)
     end
@@ -310,5 +313,46 @@ def run_sql_query_opts(query, expected_row_count)
       run_sql_query(host, run_sql_query_opts(query, 1))
       # rubocop:enable RSpec/InstanceVariable
     end
+
+    it 'Test Case MODULES-10335: Create two database with seperate sp_configure', tier_low: true do
+      pp = <<-MANIFEST
+        sqlserver::config{'MSSQLSERVER':
+          admin_user   => 'sa',
+          admin_pass   => 'Pupp3t1@',
+        }
+        sqlserver::sp_configure{ 'sp_config4db':
+          config_name   => 'contained database authentication',
+          value         => 1,
+          reconfigure   => true,
+          instance      => 'MSSQLSERVER',
+        }
+        sqlserver::database{ '#{@db_name}':
+          require            => Sqlserver::Sp_configure['sp_config4db']
+        }
+        sqlserver_tsql{'testsqlserver_tsql':
+          instance => 'MSSQLSERVER',
+          database => '#{@db_name}',
+          command => "CREATE TABLE #{@table_name} (id INT, name VARCHAR(20), email VARCHAR(20));",
+          require => Sqlserver::Database['#{@db_name}'],
+        }
+        sqlserver::sp_configure{ 'sp_config5db':
+          config_name   => 'contained database authentication',
+          value         => 1,
+          reconfigure   => true,
+          instance      => 'MSSQLSERVER',
+        }
+        sqlserver::database{ '#{@db_name}-2':
+          require            => Sqlserver::Sp_configure['sp_config5db']
+        }
+        sqlserver_tsql{'testsqlserver_tsql':
+          instance => 'MSSQLSERVER',
+          database => '#{@db_name}-2',
+          command => "CREATE TABLE #{@table_name} (id INT, name VARCHAR(20), email VARCHAR(20));",
+          require => Sqlserver::Database['#{@db_name}-2'],
+        }
+      MANIFEST
+      ensure_sqlserver_database(pp)
+      # rubocop:enable RSpec/InstanceVariable
+    end
   end
 end

spec/defines/sp_configure_spec.rb

@@ -94,7 +94,7 @@
 
   describe 'service' do
     it 'is defined' do
-      is_expected.to contain_exec('restart-service-MSSQLSERVER').with_refreshonly(true)
+      is_expected.to contain_exec('restart-service-MSSQLSERVER-filestream access level').with_refreshonly(true)
     end
   end
 end