SqlLogin: Attempting to disable and already disabled login throws an …

…error dsccommunity#1952
JoshKingWork · Jul 20, 2023 · ff04c9e · ff04c9e
1 parent 7260dfa
commit ff04c9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1 b/source/Modules/SqlServerDsc.Common/SqlServerDsc.Common.psm1
@@ -621,7 +621,7 @@ function Connect-SQL
             $newObjectParameters = @{
                 TypeName     = 'System.Management.Automation.ErrorRecord'
                 ArgumentList = @(
-                    $invalidOperationException.ToString(),
+                    $invalidOperationException,
                     'CS0001',
                     'InvalidOperation',
                     $databaseEngineInstance
@@ -642,7 +642,7 @@ function Connect-SQL
         $newObjectParameters = @{
             TypeName     = 'System.Management.Automation.ErrorRecord'
             ArgumentList = @(
-                $invalidOperationException.ToString(),
+                $invalidOperationException,
                 'CS0002',
                 'InvalidOperation',
                 $databaseEngineInstance

diff --git a/tests/Unit/SqlServerDsc.Common.Tests.ps1 b/tests/Unit/SqlServerDsc.Common.Tests.ps1
@@ -2663,7 +2663,7 @@ Describe 'SqlServerDsc.Common\Connect-SQL' -Tag 'ConnectSql' {
                 $mockErrorMessage = $mockLocalizedString -f 'localhost'
 
                 { Connect-SQL -ServerName 'localhost' -ErrorAction 'Stop' } |
-                    Should -Throw -ExpectedMessage ('System.InvalidOperationException: {0}*' -f $mockErrorMessage)
+                    Should -Throw -ExpectedMessage $mockErrorMessage
 
                 Should -Invoke -CommandName New-Object -ParameterFilter {
                     $TypeName -eq 'Microsoft.SqlServer.Management.Smo.Server'