Skip to content

Commit ba9226a

Browse files
mhallockPctymhallockPcty
authored
Addresses #394, #409, adding SSRS 2022 vNext support to the SQLServer… (#424)
* Addresses #394, #409, adding SSRS 2022 vNext support to the SQLServerVersion enum * Fixing copy-paste mistake, sorry * Change build to run as SQLServer2019 instead of vNext * Remove vNext as per PR review
1 parent 95ab7f0 commit ba9226a

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

‎ReportingServicesTools/Libraries/library.ps1‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,14 @@ namespace Microsoft.ReportingServicesTools
112112
SQLServer2017 = 14,
113113
114114
/// <summary>
115-
/// SQL Server vNext
115+
/// SQL Server 2019
116116
/// </summary>
117-
SQLServervNext = 15
117+
SQLServer2019 = 15,
118+
119+
/// <summary>
120+
/// SQL Server 2022
121+
/// </summary>
122+
SQLServer2022 = 16
118123
}
119124
}
120125
"@

‎Tests/Admin/Set-RsDatabase.Tests.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
function Get-DatabaseName() {
2-
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
2+
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
33
return $wmiObject.DatabaseName
44
}
55

66
function Get-CredentialType() {
7-
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
7+
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
88
switch ($wmiObject.DatabaseLogonType) {
99
0 { return 'Windows' }
1010
1 { return 'SQL' }
@@ -26,7 +26,7 @@ Describe "Set-RsDatabase" {
2626
$databaseServerName = 'localhost'
2727
$databaseName = 'ReportServer' + [System.DateTime]::Now.Ticks
2828
$credentialType = 'ServiceAccount'
29-
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
29+
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
3030

3131
It "Should update database and credentials" {
3232
Get-DatabaseName | Should be $databaseName
@@ -39,7 +39,7 @@ Describe "Set-RsDatabase" {
3939
$databaseName = 'ReportServer' + [System.DateTime]::Now.Ticks
4040
$credentialType = 'SQL'
4141
$credential = Get-SaCredentials
42-
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
42+
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
4343

4444
It "Should update database and credentials" {
4545
Get-DatabaseName | Should be $databaseName
@@ -52,7 +52,7 @@ Describe "Set-RsDatabase" {
5252
$databaseName = 'ReportServer'
5353
$credentialType = 'SQL'
5454
$credential = Get-SaCredentials
55-
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
55+
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
5656

5757
It "Should update database and credentials" {
5858
Get-DatabaseName | Should be $databaseName
@@ -64,7 +64,7 @@ Describe "Set-RsDatabase" {
6464
$databaseServerName = 'localhost'
6565
$databaseName = 'ReportServer'
6666
$credentialType = 'ServiceAccount'
67-
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
67+
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
6868

6969
It "Should update database and credentials" {
7070
Get-DatabaseName | Should be $databaseName

‎Tests/Admin/Set-RsDatabaseCredentials.Tests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function Get-CredentialType() {
2-
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
2+
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
33
switch ($wmiObject.DatabaseLogonType) {
44
0 { return 'Windows' }
55
1 { return 'SQL' }
@@ -20,7 +20,7 @@ Describe "Set-RsDatabaseCredentials" {
2020
Context "Changing database credential type to ServiceAccount credentials" {
2121
$credentialType = 'SQL'
2222
$credential = Get-SaCredentials
23-
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
23+
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
2424

2525
It "Should update credentials" {
2626
Get-CredentialType | Should be $credentialType
@@ -29,7 +29,7 @@ Describe "Set-RsDatabaseCredentials" {
2929

3030
Context "Changing database credential type to SQL credentials" {
3131
$credentialType = 'ServiceAccount'
32-
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
32+
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
3333

3434
It "Should update credentials" {
3535
Get-CredentialType | Should be $credentialType

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ before_test:
6767
6868
Import-Module .\ReportingServicesTools\ReportingServicesTools.psd1
6969
Write-Host "Configuring PBI RS" (Get-Date).DateTime
70-
Set-RsDatabase -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext -DatabaseServerName localhost -DatabaseName ReportServer -DatabaseCredentialType ServiceAccount -Confirm:$false
71-
Set-PbiRsUrlReservation -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
72-
try {Initialize-Rs -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext} catch {}
70+
Set-RsDatabase -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019 -DatabaseServerName localhost -DatabaseName ReportServer -DatabaseCredentialType ServiceAccount -Confirm:$false
71+
Set-PbiRsUrlReservation -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
72+
try {Initialize-Rs -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019} catch {}
7373
Stop-Service PowerBIReportServer
7474
Start-Service PowerBIReportServer
7575
Start-Service SQLSERVERAGENT

0 commit comments

Comments
 (0)