Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
that they always are higher than what we expect.
- `SqlRS`
- Re-enable integration tests.
- `SqlAG`
- Fix SeedingMode existence condition.
- `SqlAGReplica`
- Fix SeedingMode existence condition.

## [17.0.0] - 2024-09-30

Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/DSC_SqlAG/DSC_SqlAG.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ function Test-TargetResource
$parametersToCheck += 'BasicAvailabilityGroup'
$parametersToCheck += 'DatabaseHealthTrigger'
$parametersToCheck += 'DtcSupportEnabled'
if ( $getTargetResourceResult.SeedingMode )
if ( $null -ne $getTargetResourceResult.SeedingMode )
{
$parametersToCheck += 'SeedingMode'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ function Test-TargetResource
'ReadOnlyRoutingConnectionUrl',
'ReadOnlyRoutingList'
)
if ( $getTargetResourceResult.SeedingMode)
if ( $null -ne $getTargetResourceResult.SeedingMode )
{
$parametersToCheck += 'SeedingMode'
}
Expand Down
34 changes: 17 additions & 17 deletions tests/Unit/DSC_SqlAG.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Describe 'SqlAG\Get-TargetResource' {
$mockAvailabilityGroupReplica1.Name = 'Server1'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingConnectionUrl = 'TCP://Server1.domain.com:1433'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica1.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica1.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica2 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica2.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -111,7 +111,7 @@ Describe 'SqlAG\Get-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -123,7 +123,7 @@ Describe 'SqlAG\Get-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down Expand Up @@ -188,7 +188,7 @@ Describe 'SqlAG\Get-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -200,7 +200,7 @@ Describe 'SqlAG\Get-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down Expand Up @@ -369,7 +369,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica1.Name = 'Server1'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingConnectionUrl = 'TCP://Server1.domain.com:1433'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica1.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica1.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica2 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica2.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -381,7 +381,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -393,7 +393,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down Expand Up @@ -446,7 +446,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica1.Name = 'Server1'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingConnectionUrl = 'TCP://Server1.domain.com:1433'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica1.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica1.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica2 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica2.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -458,7 +458,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -470,7 +470,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down Expand Up @@ -693,7 +693,7 @@ Describe 'SqlAG\Set-TargetResource' {
$mockReplicaObject.EndpointUrl = 'TCP://Server1:5022'
$mockReplicaObject.FailoverMode = 'Manual'
$mockReplicaObject.Name = 'Server1'
$mockReplicaObject.SeedingMode = 'Manual'
$mockReplicaObject.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

Mock -CommandName New-SqlAvailabilityReplica -MockWith {
return $mockReplicaObject
Expand Down Expand Up @@ -1215,7 +1215,7 @@ Describe 'SqlAG\Test-TargetResource' {
$mockAvailabilityGroupReplica1.Name = 'Server1'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingConnectionUrl = 'TCP://Server1.domain.com:1433'
$mockAvailabilityGroupReplica1.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica1.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica1.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica2 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica2.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -1227,7 +1227,7 @@ Describe 'SqlAG\Test-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -1239,7 +1239,7 @@ Describe 'SqlAG\Test-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down Expand Up @@ -1303,7 +1303,7 @@ Describe 'SqlAG\Test-TargetResource' {
$mockAvailabilityGroupReplica2.Name = 'Server2'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingConnectionUrl = 'TCP://Server2.domain.com:1433'
$mockAvailabilityGroupReplica2.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica2.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica2.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

$mockAvailabilityGroupReplica3 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityReplica
$mockAvailabilityGroupReplica3.AvailabilityMode = 'AsynchronousCommit'
Expand All @@ -1315,7 +1315,7 @@ Describe 'SqlAG\Test-TargetResource' {
$mockAvailabilityGroupReplica3.Name = 'Server3'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingConnectionUrl = 'TCP://Server3.domain.com:1433'
$mockAvailabilityGroupReplica3.ReadOnlyRoutingList = @('Server1', 'Server2')
$mockAvailabilityGroupReplica3.SeedingMode = 'Manual'
$mockAvailabilityGroupReplica3.SeedingMode = [Microsoft.SqlServer.Management.Smo.AvailabilityReplicaSeedingMode]::Manual

# Mock the availability groups
$mockAvailabilityGroup1 = New-Object -TypeName Microsoft.SqlServer.Management.Smo.AvailabilityGroup
Expand Down
Loading
Loading