Merge pull request #167 from jpogran/ticket/master/MODULES-3355-fix-role-name-collisions

(MODULES-3355) Fix Role Name Collisions

Author: ferventcoder

manifests/role.pp

@@ -62,7 +62,7 @@
     absent  => 'delete',
   }
 
-  sqlserver_tsql{ "role-${role}-${instance}":
+  sqlserver_tsql{ "role-${instance}-${database}-${role}":
     command  => template("sqlserver/${_create_delete}/role.sql.erb"),
     onlyif   => template('sqlserver/query/role_exists.sql.erb'),
     instance => $instance,

spec/defines/role_spec.rb

@@ -3,7 +3,7 @@
 
 RSpec.describe 'sqlserver::role', :type => :define do
   include_context 'manifests' do
-    let(:sqlserver_tsql_title) { 'role-myCustomRole-MSSQLSERVER' }
+    let(:sqlserver_tsql_title) { 'role-MSSQLSERVER-master-myCustomRole' }
     let(:title) { 'myCustomRole' }
   end
 
@@ -54,6 +54,7 @@
     let(:additional_params) { {
       'database' => 'myCrazyDb',
     } }
+    let(:sqlserver_tsql_title) { 'role-MSSQLSERVER-myCrazyDb-myCustomRole' }
     describe 'with server role type' do
       let(:raise_error_check) { 'Can not specify a database other than master when managing SERVER ROLES' }
       it_behaves_like 'validation error'
@@ -74,7 +75,7 @@
     describe 'non default instance' do
       let(:params) { {:instance => 'MYCUSTOM'} }
       it {
-        should contain_sqlserver_tsql('role-myCustomRole-MYCUSTOM').with_instance('MYCUSTOM')
+        should contain_sqlserver_tsql('role-MYCUSTOM-master-myCustomRole').with_instance('MYCUSTOM')
       }
     end
     describe 'empty instance' do