Skip to content

Re-add ReportServerEdition enum to SqlRSSetup class #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johlju merged 6 commits into from
Aug 30, 2025
Merged

Re-add ReportServerEdition enum to SqlRSSetup class #2126

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a6a9f7
Initial plan
Copilot Aug 3, 2025
2b67c1b
Re-add ReportServerEdition enum to SqlRSSetup class
Copilot Aug 3, 2025
c306e02
Add IgnoreZeroEnumValue parameter to Get-DscProperty call
Copilot Aug 3, 2025
c644ca0
Merge branch 'main' into copilot/fix-1e06bee2-0688-48e7-86aa-dc4676c4…
johlju Aug 30, 2025
11e1086
Add trailing blank line to ReportServerEdition.ps1 per style guidelines
Copilot Aug 30, 2025
489303d
Update CHANGELOG.md with SqlRSSetup ReportServerEdition enum changes
Copilot Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/Classes/020.SqlRSSetup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ class SqlRSSetup : ResourceBase
$EditionUpgrade

[DscProperty()]
[ValidateSet('Developer', 'Evaluation', 'ExpressAdvanced')]
[System.String]
[ReportServerEdition]
$Edition

[DscProperty()]
Expand Down Expand Up @@ -402,8 +401,9 @@ class SqlRSSetup : ResourceBase
hidden [void] Modify([System.Collections.Hashtable] $properties)
{
$getDscPropertyParameters = @{
HasValue = $true
Attribute = @(
HasValue = $true
IgnoreZeroEnumValue = $true
Attribute = @(
'Optional'
'Mandatory'
)
Expand Down
12 changes: 12 additions & 0 deletions source/Enum/001.ReportServerEdition.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<#
.SYNOPSIS
The possible states for the commands and DSC resources that handles
SQL Server Reporting Services or Power BI Report Server and uses the
parameter Edition.
#>
enum ReportServerEdition
{
Developer = 1
Evaluation
ExpressAdvanced
}
6 changes: 4 additions & 2 deletions tests/Unit/Classes/SqlRSSetup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ Describe 'SqlRSSetup\Get()' -Tag 'Get' {
$currentState.MediaPath | Should -BeNullOrEmpty
$currentState.ProductKey | Should -BeNullOrEmpty
$currentState.EditionUpgrade | Should -BeNullOrEmpty
$currentState.Edition | Should -BeNullOrEmpty
# Returns 0, that means no value was set by GetCurrentState() from the enum ReportServerEdition
$currentState.Edition | Should -Be 0
$currentState.LogPath | Should -BeNullOrEmpty
$currentState.InstallFolder | Should -BeNullOrEmpty
$currentState.SuppressRestart | Should -BeFalse
Expand Down Expand Up @@ -187,7 +188,8 @@ Describe 'SqlRSSetup\Get()' -Tag 'Get' {
$currentState.MediaPath | Should -BeNullOrEmpty
$currentState.ProductKey | Should -BeNullOrEmpty
$currentState.EditionUpgrade | Should -BeNullOrEmpty
$currentState.Edition | Should -BeNullOrEmpty
# Returns 0, that means no value was set by GetCurrentState() from the enum ReportServerEdition
$currentState.Edition | Should -Be 0
$currentState.LogPath | Should -BeNullOrEmpty
$currentState.InstallFolder | Should -BeNullOrEmpty
$currentState.SuppressRestart | Should -BeFalse
Expand Down
Loading