Carbon_Group: Use Carbon_Accounts_Identity.FullName for Members

This takes care of missing `.Dispose()`
webmd-health-services · Nov 29, 2024 · fba560a · fba560a
1 parent cbe2f45
commit fba560a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/Carbon.DSC/DscResources/Carbon_Group/Carbon_Group.psm1 b/Carbon.DSC/DscResources/Carbon_Group/Carbon_Group.psm1
@@ -38,8 +38,9 @@ function Get-TargetResource
     if( $group )
     {
         $description = $group.Description
-        $members = $group.Members
+        $members = @($group.Members | Resolve-PrincipalName)
         $ensure = 'Present'
+        $group.Dispose()
     }
 
     @{
@@ -166,7 +167,7 @@ function Set-TargetResource
     {
         $memberNames = $Members | Resolve-MemberName
     }
-    $currentMemberNames = @((Get-TargetResource -Name $Name).Members | Resolve-PrincipalName)
+    $currentMemberNames = (Get-TargetResource -Name $Name).Members
 
     $membershipChanges = Resolve-MembershipChange -EnsureMembers $EnsureMembers `
                                                   -MemberNames $memberNames `
@@ -266,11 +267,10 @@ function Test-TargetResource
     {
         $memberNames = $Members | Resolve-MemberName
     }
-    $currentMemberNames = @($resource.Members | Resolve-PrincipalName)
 
     $membershipChanges = Resolve-MembershipChange -EnsureMembers $EnsureMembers `
                                                   -MemberNames $memberNames `
-                                                  -CurrentMemberNames $currentMemberNames
+                                                  -CurrentMemberNames $resource.Members
 
     if ($membershipChanges.ToAdd)
     {

diff --git a/Tests/Carbon_Group.Tests.ps1 b/Tests/Carbon_Group.Tests.ps1
@@ -57,20 +57,9 @@ Describe 'Carbon_Group' {
         Assert-DscResourcePresent $resource
 
         $resource.Members.Count | Should -Be $admins.Members.Count
+        $resourceMembers = $resource.Members | ForEach-Object { Resolve-CIdentity -Name $_ }
 
-        foreach( $admin in $admins.Members )
-        {
-            $found = $false
-            foreach( $potentialAdmin in $resource.Members )
-            {
-                if( $potentialAdmin.Sid -eq $admin.Sid )
-                {
-                    $found = $true
-                    break
-                }
-            }
-            $found | Should -BeTrue
-        }
+        $resourceMembers.Sid | Should -Be $admins.Members.Sid
     }
 
     It 'get target resource does not exist' {