Adding NULL handling for target folders (#320)

* Adding NULL handling for target folders Adding NULL handling for Dataset, Datasource, & ReportPart folders. * Improved Pester test for Get-RsDeploymentConfig Added new deployment config to SQL Server Performance Dashboard.rptproj file. Improved Pester test for Get-RsDeploymentConfig to use new DebugNull deployment config.
microsoft · Feb 17, 2021 · cbed521 · cbed521
1 parent 261128e
commit cbed521
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 10 deletions.
diff --git a/ReportingServicesTools/Functions/CatalogItems/Get-RsDeploymentConfig.ps1 b/ReportingServicesTools/Functions/CatalogItems/Get-RsDeploymentConfig.ps1
@@ -71,9 +71,9 @@ function Get-RsDeploymentConfig {
                 OverwriteDatasets      = $Deployment.OverwriteDatasets
                 OverwriteDataSources   = $Deployment.OverwriteDataSources
                 TargetReportFolder     = ($Deployment.TargetReportFolder).Trimend("/")
-                TargetDatasetFolder    = ($Deployment.TargetDatasetFolder).Trimend("/")
-                TargetDatasourceFolder = ($Deployment.TargetDatasourceFolder).Trimend("/")
-                TargetReportPartFolder = ($Deployment.TargetReportPartFolder).Trimend("/")
+                TargetDatasetFolder    = if ($null -eq $Deployment.TargetDatasetFolder) { $null } else { ($Deployment.TargetDatasetFolder).Trimend("/") }
+                TargetDatasourceFolder = if ($null -eq $Deployment.TargetDatasourceFolder) { $null } else { ($Deployment.TargetDatasourceFolder).Trimend("/") }
+                TargetReportPartFolder = if ($null -eq $Deployment.TargetReportPartFolder) { $null } else { ($Deployment.TargetReportPartFolder).Trimend("/") }
                 TargetServerURL        = $Deployment.TargetServerURL
                 RsProjectFolder        = Split-Path -Path $RsProjectFile
             }
@@ -89,9 +89,9 @@ function Get-RsDeploymentConfig {
                 OverwriteDatasets      = $Deployment.OverwriteDatasets
                 OverwriteDataSources   = $Deployment.OverwriteDataSources
                 TargetReportFolder     = ($Deployment.TargetReportFolder).Trimend("/")
-                TargetDatasetFolder    = ($Deployment.TargetDatasetFolder).Trimend("/")
-                TargetDatasourceFolder = ($Deployment.TargetDatasourceFolder).Trimend("/")
-                TargetReportPartFolder = ($Deployment.TargetReportPartFolder).Trimend("/")
+                TargetDatasetFolder    = if ($null -eq $Deployment.TargetDatasetFolder) { $null } else { ($Deployment.TargetDatasetFolder).Trimend("/") }
+                TargetDatasourceFolder = if ($null -eq $Deployment.TargetDatasourceFolder) { $null } else { ($Deployment.TargetDatasourceFolder).Trimend("/") }
+                TargetReportPartFolder = if ($null -eq $Deployment.TargetReportPartFolder) { $null } else { ($Deployment.TargetReportPartFolder).Trimend("/") }
                 TargetServerURL        = $Deployment.TargetServerURL
                 RsProjectFolder        = Split-Path -Path $RsProjectFile
             }

diff --git a/Tests/CatalogItems/Get-RsDeploymentConfig.Tests.ps1 b/Tests/CatalogItems/Get-RsDeploymentConfig.Tests.ps1
@@ -4,18 +4,57 @@ Describe "Get-RsDeploymentConfig" {
 
     Write-Verbose "$RSConfig.TargetServerURL"
     Write-Verbose "$RSConfig.RsProjectFolder"
+    Write-Verbose "$RSConfig.TargetDatasetFolder"
+    Write-Verbose "$RSConfig.TargetDatasourceFolder"
+    Write-Verbose "$RSConfig.TargetReportPartFolder"
 
-    Context "Get the DeploymentConfig of a ReportServer project file using ConfigurationToUse parameter"{
-        # Create a folder
-        # Test if the config was found
+    Context "Get the Release DeploymentConfig of a ReportServer project file using ConfigurationToUse parameter"{
         It "Should verify TargetServerURL matches" {
             $RSConfig.TargetServerURL | Should Be 'http://localhost/reportserver'
         }
 
-        # Test if the folder can be found
         It "Should verify a config was retrieved" {
             @($RSConfig).Count | Should Be 1
         }
+
+        It "Should verify the Dataset, Datasource, and ReportPart folders are NULL" {
+            #$RSConfig = Get-RsDeploymentConfig -RsProjectFile "$($PSScriptRoot)\TestProjects\SQLServerPerformanceDashboardReportingSolution\SQL Server Performance Dashboard\SQL Server Performance Dashboard.rptproj" -ConfigurationToUse Release
+
+            Write-Verbose "$RSConfig.TargetDatasetFolder"
+            Write-Verbose "$RSConfig.TargetDatasourceFolder"
+            Write-Verbose "$RSConfig.TargetReportPartFolder"
+
+            $RSConfig.TargetDatasetFolder | Should Be '/Datasets'
+            $RSConfig.TargetDatasourceFolder | Should Be '/Data Sources'
+            $RSConfig.TargetReportPartFolder | Should Be 'Report Parts'
+        }
+
+    }
+
+    Context "Get the DebugNull DeploymentConfig of a ReportServer project file using ConfigurationToUse parameter"{
+        It "Should verify TargetServerURL matches" {
+            $RSConfig = Get-RsDeploymentConfig -RsProjectFile "$($PSScriptRoot)\TestProjects\SQLServerPerformanceDashboardReportingSolution\SQL Server Performance Dashboard\SQL Server Performance Dashboard.rptproj" -ConfigurationToUse DebugNull
+
+            Write-Verbose "$RSConfig.TargetServerURL"
+            Write-Verbose "$RSConfig.RsProjectFolder"
+            Write-Verbose "$RSConfig.TargetDatasetFolder"
+            Write-Verbose "$RSConfig.TargetDatasourceFolder"
+            Write-Verbose "$RSConfig.TargetReportPartFolder"
+
+            $RSConfig.TargetServerURL | Should Be 'http://localhost/reportserver'
+        }
+
+        It "Should verify a config was retrieved" {
+            @($RSConfig).Count | Should Be 1
+        }
+
+        It "Should verify config was successfully retrieved even though Dataset, Datasource, and ReportPart folders are NULL" {
+            $RSConfig = Get-RsDeploymentConfig -RsProjectFile "$($PSScriptRoot)\TestProjects\SQLServerPerformanceDashboardReportingSolution\SQL Server Performance Dashboard\SQL Server Performance Dashboard.rptproj" -ConfigurationToUse DebugNull
+
+            $RSConfig.TargetDatasetFolder | Should BeNullOrEmpty
+            $RSConfig.TargetDatasourceFolder | Should BeNullOrEmpty
+            $RSConfig.TargetReportPartFolder | Should BeNullOrEmpty
+        }
 
     }
 }    
diff --git a/...portingSolution/SQL Server Performance Dashboard/SQL Server Performance Dashboard.rptproj b/...portingSolution/SQL Server Performance Dashboard/SQL Server Performance Dashboard.rptproj
@@ -27,6 +27,20 @@
     <TargetDatasourceFolder>Data Sources</TargetDatasourceFolder>
     <TargetReportPartFolder>Report Parts</TargetReportPartFolder>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'DebugNull' ">
+    <FullPath>DebugNull</FullPath>
+    <OutputPath>bin\DebugLocal</OutputPath>
+    <ErrorLevel>2</ErrorLevel>
+    <OverwriteDatasets>False</OverwriteDatasets>
+    <OverwriteDataSources>False</OverwriteDataSources>
+    <TargetServerVersion>SSRS2008R2</TargetServerVersion>
+    <Platform>Win32</Platform>
+    <TargetReportFolder>SQL Server Performance Dashboard</TargetReportFolder>
+    <TargetDatasetFolder></TargetDatasetFolder>
+    <TargetDatasourceFolder></TargetDatasourceFolder>
+    <TargetReportPartFolder></TargetReportPartFolder>
+    <TargetServerURL>http://localhost/reportserver</TargetServerURL>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <FullPath>Release</FullPath>
     <OutputPath>bin\Release</OutputPath>