Support multi-instances

dsccommunity · Aug 23, 2018 · 53b725f · 53b725f
1 parent a450e82
commit 53b725f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
   - Corrected reference to "PsDscRunAsAccount" in documentation
     ([issue #1199](https://github.com/PowerShell/SqlServerDsc/issues/1199)).
     [Nick Reilingh (@NReilingh)](https://github.com/NReilingh)
+- Changes to SqlDatabaseOwner
+  - Support multi-instances which is the instance cannot be omitted
+    ([issue #1197](https://github.com/PowerShell/SqlServerDsc/issues/1197)).
 
 ## 11.4.0.0
 

diff --git a/DSCResources/MSFT_SqlDatabaseOwner/MSFT_SqlDatabaseOwner.psm1 b/DSCResources/MSFT_SqlDatabaseOwner/MSFT_SqlDatabaseOwner.psm1
@@ -38,7 +38,7 @@ function Get-TargetResource
         [System.String]
         $ServerName = $env:COMPUTERNAME,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
         [System.String]
         $InstanceName = 'MSSQLSERVER'
@@ -116,7 +116,7 @@ function Set-TargetResource
         [System.String]
         $ServerName = $env:COMPUTERNAME,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
         [System.String]
         $InstanceName = 'MSSQLSERVER'
@@ -191,7 +191,7 @@ function Test-TargetResource
         [System.String]
         $ServerName = $env:COMPUTERNAME,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
         [System.String]
         $InstanceName = 'MSSQLSERVER'

diff --git a/DSCResources/MSFT_SqlDatabaseOwner/MSFT_SqlDatabaseOwner.schema.mof b/DSCResources/MSFT_SqlDatabaseOwner/MSFT_SqlDatabaseOwner.schema.mof
@@ -4,5 +4,5 @@ class MSFT_SqlDatabaseOwner : OMI_BaseResource
     [Key, Description("The name of database to be configured.")] String Database;
     [Required, Description("The name of the login that will become a owner of the desired sql database.")] String Name;
     [Write, Description("The host name of the SQL Server to be configured.")] String ServerName;
-    [Write, Description("The name of the SQL instance to be configured.")] String InstanceName;
+    [Key, Description("The name of the SQL instance to be configured.")] String InstanceName;
 };