SID awareness in group base class to fix regression where resource always updates

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/chef/provider/group/windows.rb b/lib/chef/provider/group/windows.rb
index ebe37fa68d..13ba8f24cb 100644
--- a/lib/chef/provider/group/windows.rb
+++ b/lib/chef/provider/group/windows.rb
@@ -59,8 +59,7 @@ class Chef
           if @new_resource.append
             members_to_be_added = [ ]
             @new_resource.members.each do |member|
-              member_sid = local_group_name_to_sid(member)
-              members_to_be_added << member if !@current_resource.members.include?(member_sid)
+              members_to_be_added << member if ! find_current_group_member(member)
             end
 
             # local_add_members will raise ERROR_MEMBER_IN_ALIAS if a
@@ -70,7 +69,7 @@ class Chef
             members_to_be_removed = [ ]
             @new_resource.excluded_members.each do |member|
               member_sid = local_group_name_to_sid(member)
-              members_to_be_removed << member if @current_resource.members.include?(member_sid)
+              members_to_be_removed << member if find_current_group_member(member)
             end
             @net_group.local_delete_members(members_to_be_removed) unless members_to_be_removed.empty?
           else
@@ -78,6 +77,11 @@ class Chef
           end
         end
 
+        def find_current_group_member(member)
+          member_sid = local_group_name_to_sid(member)
+          @current_resource.members.include?(member_sid)
+        end
+
         def remove_group
           @net_group.local_delete
         end