[dsccommunity#1163] Addressed CR comments

bozho · Jun 19, 2019 · 3874f91 · 3874f91
1 parent 2c07dff
commit 3874f91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/DSCResources/MSFT_SqlSetup/MSFT_SqlSetup.psm1 b/DSCResources/MSFT_SqlSetup/MSFT_SqlSetup.psm1
@@ -29,6 +29,10 @@ $script:localizedData = Get-LocalizedData -ResourceName 'MSFT_SqlSetup'
     .PARAMETER InstanceName
         Name of the SQL instance to be installed.
 
+    .PARAMETER RSInstallMode
+        Install mode for Reporting Services. The value of this parameter cannot be determined post-install,
+        so the function will simply return the value of this parameter.
+
     .PARAMETER FailoverClusterNetworkName
         Host name to be assigned to the clustered SQL Server instance.
 
@@ -60,6 +64,11 @@ function Get-TargetResource
         [System.String]
         $InstanceName,
 
+        [Parameter()]
+        [ValidateSet('SharePointFilesOnlyMode', 'DefaultNativeMode', 'FilesOnlyMode')]
+        [System.String]
+        $RSInstallMode,
+
         [Parameter()]
         [System.String]
         $FailoverClusterNetworkName,
@@ -551,6 +560,7 @@ function Get-TargetResource
         FTSvcAccountUsername = $fullTextServiceAccountUsername
         RSSvcAccountUsername = $reportingServiceAccountUsername
         RsSvcStartupType = $RsSvcStartupType
+        RSInstallMode = $RSInstallMode
         ASSvcAccountUsername = $analysisServiceAccountUsername
         AsSvcStartupType = $AsSvcStartupType
         ASCollation = $analysisCollation

diff --git a/Tests/Unit/MSFT_SqlSetup.Tests.ps1 b/Tests/Unit/MSFT_SqlSetup.Tests.ps1
@@ -2874,6 +2874,7 @@ try
                             UpdateEnabled = 'True'
                             UpdateSource = 'C:\Updates\' # Regression test for issue #720
                             ASServerMode = 'TABULAR'
+                            RSInstallMode = 'DefaultNativeMode'
                             SqlSvcStartupType = $mockSqlSvcStartupType
                             AgtSvcStartupType = $mockAgtSvcStartupType
                             AsSvcStartupType = $mockAsSvcStartupType
@@ -2907,6 +2908,7 @@ try
                             UpdateEnabled = 'True'
                             UpdateSource = 'C:\Updates' # Regression test for issue #720
                             ASServerMode = 'TABULAR'
+                            RSInstallMode = 'DefaultNativeMode'
                             SqlSvcStartupType = $mockSqlSvcStartupType
                             AgtSvcStartupType = $mockAgtSvcStartupType
                             AsSvcStartupType = $mockAsSvcStartupType