microsoft
/
ReportingServicesTools
зеркало из https://github.com/microsoft/ReportingServicesTools.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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
This commit is contained in:
Michael Hallock 2024-03-31 09:44:12 -05:00 коммит произвёл GitHub
Родитель 95ab7f0c63
Коммит ba9226affe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 19 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
ReportingServicesTools/Libraries/library.ps1
Просмотреть файл

@ -112,9 +112,14 @@ namespace Microsoft.ReportingServicesTools
SQLServer2017 = 14,
/// <summary>
/// SQL Server vNext
/// SQL Server 2019
/// </summary>
SQLServervNext = 15
SQLServer2019 = 15,
/// <summary>
/// SQL Server 2022
/// </summary>
SQLServer2022 = 16
}
}
"@

12
Tests/Admin/Set-RsDatabase.Tests.ps1
Просмотреть файл

@ -1,10 +1,10 @@
function Get-DatabaseName() {
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
return $wmiObject.DatabaseName
}
function Get-CredentialType() {
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
switch ($wmiObject.DatabaseLogonType) {
0 { return 'Windows' }
1 { return 'SQL' }
@ -26,7 +26,7 @@ Describe "Set-RsDatabase" {
$databaseServerName = 'localhost'
$databaseName = 'ReportServer' + [System.DateTime]::Now.Ticks
$credentialType = 'ServiceAccount'
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update database and credentials" {
Get-DatabaseName | Should be $databaseName
@ -39,7 +39,7 @@ Describe "Set-RsDatabase" {
$databaseName = 'ReportServer' + [System.DateTime]::Now.Ticks
$credentialType = 'SQL'
$credential = Get-SaCredentials
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update database and credentials" {
Get-DatabaseName | Should be $databaseName
@ -52,7 +52,7 @@ Describe "Set-RsDatabase" {
$databaseName = 'ReportServer'
$credentialType = 'SQL'
$credential = Get-SaCredentials
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -DatabaseCredential $credential -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update database and credentials" {
Get-DatabaseName | Should be $databaseName
@ -64,7 +64,7 @@ Describe "Set-RsDatabase" {
$databaseServerName = 'localhost'
$databaseName = 'ReportServer'
$credentialType = 'ServiceAccount'
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabase -DatabaseServerName $databaseServerName -DatabaseName $databaseName -DatabaseCredentialType $credentialType -IsExistingDatabase -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update database and credentials" {
Get-DatabaseName | Should be $databaseName

6
Tests/Admin/Set-RsDatabaseCredentials.Tests.ps1
Просмотреть файл

@ -1,5 +1,5 @@
function Get-CredentialType() {
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
$wmiObject = New-RsConfigurationSettingObject -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
switch ($wmiObject.DatabaseLogonType) {
0 { return 'Windows' }
1 { return 'SQL' }
@ -20,7 +20,7 @@ Describe "Set-RsDatabaseCredentials" {
Context "Changing database credential type to ServiceAccount credentials" {
$credentialType = 'SQL'
$credential = Get-SaCredentials
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -DatabaseCredential $credential -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update credentials" {
Get-CredentialType | Should be $credentialType
@ -29,7 +29,7 @@ Describe "Set-RsDatabaseCredentials" {
Context "Changing database credential type to SQL credentials" {
$credentialType = 'ServiceAccount'
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
Set-RsDatabaseCredentials -DatabaseCredentialType $credentialType -Confirm:$false -Verbose -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
It "Should update credentials" {
Get-CredentialType | Should be $credentialType

6
appveyor.yml
Просмотреть файл

@ -67,9 +67,9 @@ before_test:
Import-Module .\ReportingServicesTools\ReportingServicesTools.psd1
Write-Host "Configuring PBI RS" (Get-Date).DateTime
Set-RsDatabase -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext -DatabaseServerName localhost -DatabaseName ReportServer -DatabaseCredentialType ServiceAccount -Confirm:$false
Set-PbiRsUrlReservation -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext
try {Initialize-Rs -ReportServerInstance PBIRS -ReportServerVersion SQLServervNext} catch {}
Set-RsDatabase -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019 -DatabaseServerName localhost -DatabaseName ReportServer -DatabaseCredentialType ServiceAccount -Confirm:$false
Set-PbiRsUrlReservation -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019
try {Initialize-Rs -ReportServerInstance PBIRS -ReportServerVersion SQLServer2019} catch {}
Stop-Service PowerBIReportServer
Start-Service PowerBIReportServer
Start-Service SQLSERVERAGENT