SqlDatabasePermission: Fix Credential property

dsccommunity · Dec 6, 2023 · 9d65897 · 9d65897
1 parent 22b25f6
commit 9d65897
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Fix sort to get the latest version
 - `Assert-Feature`
   - Fixed unit tests.
+- SqlDatabasePermission
+  - Now correctly return the username in the property `Credential`.
 
 ### Changed
 

diff --git a/source/Classes/020.SqlDatabasePermission.ps1 b/source/Classes/020.SqlDatabasePermission.ps1
@@ -206,10 +206,22 @@ class SqlDatabasePermission : SqlResourceBase
                 return an empty PSCredential-object. Kept it here so it at least
                 return a Credential object.
             #>
-            $currentStateCredential = [PSCredential]::new(
-                $this.Credential.UserName,
-                [SecureString]::new()
-            )
+            # $currentStateCredential = [PSCredential]::new(
+            #     $this.Credential.UserName,
+            #     [SecureString]::new()
+            # )
+
+            $newCimInstanceParameters = @{
+                ClassName = 'MSFT_Credential'
+                ClientOnly = $true
+                Namespace = 'root/microsoft/windows/desiredstateconfiguration'
+                Property = @{
+                    UserName = [System.String] $this.Credential.UserName
+                    Password = ''#$null
+                }
+            }
+
+            $currentStateCredential = New-CimInstance @newCimInstanceParameters
         }
 
         $currentState = @{

diff --git a/tests/Integration/DSC_SqlDatabasePermission.Integration.Tests.ps1 b/tests/Integration/DSC_SqlDatabasePermission.Integration.Tests.ps1
@@ -115,6 +115,10 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
             $grantState.Permission | Should -Contain 'Connect'
             $grantState.Permission | Should -Contain 'Select'
             $grantState.Permission | Should -Contain 'CreateTable'
+
+            $resourceCurrentState.Credential | Should -BeOfType [PSCredential]
+            $resourceCurrentState.Credential.Username | Should -Be 'SqlAdmin'
+            $resourceCurrentState.Credential.Password | Should -BeNullOrEmpty
         }
 
         It 'Should return $true when Test-DscConfiguration is run' {
@@ -725,6 +729,10 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
                         $resourceCurrentState.Reasons | Should -HaveCount 1
                         $resourceCurrentState.Reasons[0].Code | Should -Be 'SqlDatabasePermission:SqlDatabasePermission:Permission'
                         $resourceCurrentState.Reasons[0].Phrase | Should -Be 'The property Permission should be [{"State":"Grant","Permission":["connect","update","alter"]},{"State":"GrantWithGrant","Permission":[]},{"State":"Deny","Permission":[]}], but was [{"State":"Grant","Permission":["Connect"]},{"State":"GrantWithGrant","Permission":[]},{"State":"Deny","Permission":[]}]'
+
+                        $resourceCurrentState.Credential | Should -BeOfType [PSCredential]
+                        $resourceCurrentState.Credential.Username | Should -Be 'SqlAdmin'
+                        $resourceCurrentState.Credential.Password | Should -BeNullOrEmpty
                     }
 
                     It 'Should run method Test() and return the state as $false' {