chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/provider/group.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,6 @@
 
 require 'chef/provider'
 require 'chef/mixin/command'
-require 'chef/resource/group'
 require 'etc'
 
 class Chef
@@ -36,11 +35,11 @@ class Chef
         super
         @group_exists = true
       end
-
+      
       def load_current_resource
         @current_resource = Chef::Resource::Group.new(@new_resource.name)
         @current_resource.group_name(@new_resource.group_name)
-
+        
         group_info = nil
         begin
           group_info = Etc.getgrnam(@new_resource.group_name)
@@ -48,47 +47,37 @@ class Chef
           @group_exists = false
           Chef::Log.debug("#{@new_resource} group does not exist")
         end
-
+        
         if group_info
           @new_resource.gid(group_info.gid) unless @new_resource.gid
           @current_resource.gid(group_info.gid)
           @current_resource.members(group_info.mem)
         end
-
+        
         @current_resource
       end
 
       def define_resource_requirements
-        requirements.assert(:modify) do |a|
-          a.assertion { @group_exists }
+        requirements.assert(:modify) do |a| 
+          a.assertion { @group_exists } 
           a.failure_message(Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!")
           a.whyrun("Group #{@new_resource} does not exist. Unless it would have been created earlier in this run, this attempt to modify it would fail.")
         end
-
-        requirements.assert(:all_actions) do |a|
-          # Make sure that the resource doesn't contain any common
-          # user names in the members and exclude_members properties.
-          if !@new_resource.members.nil? && !@new_resource.excluded_members.nil?
-            common_members = @new_resource.members & @new_resource.excluded_members
-            a.assertion { common_members.empty? }
-            a.failure_message(Chef::Exceptions::ConflictingMembersInGroup, "Attempting to both add and remove users from a group: '#{common_members.join(', ')}'")
-            # No why-run alternative
-          end
-        end
       end
-
-      # Check to see if a group needs any changes. Populate
-      # @change_desc with a description of why a change must occur
+      
+      # Check to see if a group needs any changes. Populate 
+      # @change_desc with a description of why a change must occur 
       #
       # ==== Returns
       # <true>:: If a change is required
       # <false>:: If a change is not required
       def compare_group
-        @change_desc = [ ]
+        @change_desc = nil
         if @new_resource.gid != @current_resource.gid
-          @change_desc << "change gid #{@current_resource.gid} to #{@new_resource.gid}"
+          @change_desc = "change gid #{@current_resource.gid} to #{@new_resource.gid}"
+          return true
         end
-
+        
         if(@new_resource.append)
           missing_members = []
           @new_resource.members.each do |member|
@@ -96,44 +85,35 @@ class Chef
             missing_members << member
           end
           if missing_members.length > 0
-            @change_desc << "add missing member(s): #{missing_members.join(", ")}"
-          end
-
-          members_to_be_removed = []
-          @new_resource.excluded_members.each do |member|
-            if @current_resource.members.include?(member)
-              members_to_be_removed << member
-            end
-          end
-          if members_to_be_removed.length > 0
-            @change_desc << "remove existing member(s): #{members_to_be_removed.join(", ")}"
+            @change_desc = "add missing member(s): #{missing_members.join(", ")}"
+            return true
           end
         else
           if @new_resource.members != @current_resource.members
-            @change_desc << "replace group members with new list of members"
+            @change_desc = "replace group members with new list of members"
+            return true
           end
         end
-
-        !@change_desc.empty?
+        return false
       end
-
+      
       def action_create
         case @group_exists
         when false
-          converge_by("create #{@new_resource}") do
+          converge_by("create #{@new_resource}") do 
             create_group
             Chef::Log.info("#{@new_resource} created")
           end
-        else
+        else 
           if compare_group
-            converge_by(["alter group #{@new_resource}"] + change_desc) do
+            converge_by(["alter group #{@new_resource}", @change_desc ]) do 
               manage_group
               Chef::Log.info("#{@new_resource} altered")
             end
           end
         end
       end
-
+      
       def action_remove
         if @group_exists
           converge_by("remove group #{@new_resource}") do
@@ -142,25 +122,25 @@ class Chef
           end
         end
       end
-
+      
       def action_manage
         if @group_exists && compare_group
-          converge_by(["manage group #{@new_resource}"] + change_desc) do
-            manage_group
+          converge_by(["manage group #{@new_resource}", @change_desc]) do
+            manage_group 
             Chef::Log.info("#{@new_resource} managed")
           end
         end
       end
-
+      
       def action_modify
         if compare_group
-          converge_by(["modify group #{@new_resource}"] + change_desc) do
+          converge_by(["modify group #{@new_resource}", @change_desc]) do
             manage_group
             Chef::Log.info("#{@new_resource} modified")
           end
         end
       end
-
+      
       def create_group
         raise NotImplementedError, "subclasses of Chef::Provider::Group should define #create_group"
       end

data/lib/chef/provider/group/dscl.rb

@@ -39,33 +39,11 @@ class Chef
           return result[2]
         end
         
-        def load_current_resource
-          @current_resource = Chef::Resource::Group.new(@new_resource.name)
-          @current_resource.group_name(@new_resource.name)
-          group_info = nil
-          begin
-            group_info = safe_dscl("read /Groups/#{@new_resource.name}")
-          rescue Chef::Exceptions::Group
-            @group_exists = false
-            Chef::Log.debug("#{@new_resource} group does not exist")
-          end
-
-          if group_info
-            group_info.each_line do |line|
-              key, val = line.split(': ')
-              val.strip! if val
-              case key.downcase
-              when 'primarygroupid'
-                @new_resource.gid(val) unless @new_resource.gid
-                @current_resource.gid(val)
-              when 'groupmembership'
-                @current_resource.members(val.split(' '))
-              end
-            end
-          end
-
-          @current_resource
-        end
+        # This is handled in providers/group.rb by Etc.getgrnam()
+        # def group_exists?(group)
+        #   groups = safe_dscl("list /Groups")
+        #   !! ( groups =~ Regexp.new("\n#{group}\n") )
+        # end
 
         # get a free GID greater than 200
         def get_free_gid(search_limit=1000)
@@ -95,36 +73,14 @@ class Chef
         end
 
         def set_members
-          # First reset the memberships if the append is not set
           unless @new_resource.append
             Chef::Log.debug("#{@new_resource} removing group members #{@current_resource.members.join(' ')}") unless @current_resource.members.empty?
             safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembers ''") # clear guid list
             safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembership ''") # clear user list
-            @current_resource.members([ ])
-          end
-
-          # Add any members that need to be added
-          if @new_resource.members && !@new_resource.members.empty?
-            members_to_be_added = [ ]
-            @new_resource.members.each do |member|
-              members_to_be_added << member if !@current_resource.members.include?(member)
-            end
-            unless members_to_be_added.empty?
-              Chef::Log.debug("#{@new_resource} setting group members #{members_to_be_added.join(', ')}")
-              safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{members_to_be_added.join(' ')}")
-            end
           end
-
-          # Remove any members that need to be removed
-          if @new_resource.excluded_members && !@new_resource.excluded_members.empty?
-            members_to_be_removed = [ ]
-            @new_resource.excluded_members.each do |member|
-              members_to_be_removed << member if @current_resource.members.include?(member)
-            end
-            unless members_to_be_removed.empty?
-              Chef::Log.debug("#{@new_resource} removing group members #{members_to_be_removed.join(', ')}")
-              safe_dscl("delete /Groups/#{@new_resource.group_name} GroupMembership #{members_to_be_removed.join(' ')}")
-            end
+          unless @new_resource.members.empty?
+            Chef::Log.debug("#{@new_resource} setting group members #{@new_resource.members.join(', ')}")
+            safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{@new_resource.members.join(' ')}")
           end
         end
 
@@ -137,6 +93,10 @@ class Chef
           end
         end
 
+        def load_current_resource
+          super
+        end
+        
         def create_group
           dscl_create_group
           set_gid
@@ -150,7 +110,7 @@ class Chef
           if @new_resource.gid && (@current_resource.gid != @new_resource.gid)
             set_gid
           end
-          if @new_resource.members || @new_resource.excluded_members
+          if @new_resource.members && (@current_resource.members != @new_resource.members)
             set_members
           end
         end

data/lib/chef/provider/group/gpasswd.rb

@@ -39,20 +39,25 @@ class Chef
           end
         end
 
-        def set_members(members)
-          unless members.empty?
-            shell_out!("gpasswd -M #{members.join(',')} #{@new_resource.group_name}")
-          else
-            shell_out!("gpasswd -M \"\" #{@new_resource.group_name}")
-          end
-        end
-
-        def add_member(member)
-          shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
-        end
-
-        def remove_member(member)
-          shell_out!("gpasswd -d #{member} #{@new_resource.group_name}")
+        def modify_group_members
+            if(@new_resource.append)
+              unless @new_resource.members.empty?
+                @new_resource.members.each do |member|
+                  Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
+                  shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
+                end
+              else
+                Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add")
+              end
+            else
+              unless @new_resource.members.empty?
+                Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
+                shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+              else
+                Chef::Log.debug("#{@new_resource} setting group members to: none")
+                shell_out!("gpasswd -M \"\" #{@new_resource.group_name}")
+              end
+            end
         end
       end
     end

data/lib/chef/provider/group/groupadd.rb

@@ -65,48 +65,8 @@ class Chef
         end
         
         def modify_group_members
-          if @new_resource.append
-            if @new_resource.members && !@new_resource.members.empty?
-              members_to_be_added = [ ]
-              @new_resource.members.each do |member|
-                members_to_be_added << member if !@current_resource.members.include?(member)
-              end
-              members_to_be_added.each do |member|
-                Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
-                add_member(member)
-              end
-            end
-
-            if @new_resource.excluded_members && !@new_resource.excluded_members.empty?
-              members_to_be_removed = [ ]
-              @new_resource.excluded_members.each do |member|
-                members_to_be_removed << member if @current_resource.members.include?(member)
-              end
-
-              members_to_be_removed.each do |member|
-                Chef::Log.debug("#{@new_resource} removing member #{member} from group #{@new_resource.group_name}")
-                remove_member(member)
-              end
-            end
-          else
-            members_description = @new_resource.members.empty? ? "none" : @new_resource.members.join(", ")
-            Chef::Log.debug("#{@new_resource} setting group members to: #{members_description}")
-            set_members(@new_resource.members)
-          end
-        end
-
-        def add_member(member)
-          raise Chef::Exceptions::Group, "you must override add_member in #{self.to_s}"
-        end
-
-        def remove_member(member)
-          raise Chef::Exceptions::Group, "you must override remove_member in #{self.to_s}"
-        end
-
-        def set_members(members)
-          raise Chef::Exceptions::Group, "you must override set_members in #{self.to_s}"
+          raise Chef::Exceptions::Group, "you must override modify_group_members in #{self.to_s}"
         end
-
         # Little bit of magic as per Adam's useradd provider to pull the assign the command line flags
         #
         # ==== Returns

data/lib/chef/provider/group/groupmod.rb

@@ -44,40 +44,45 @@ class Chef
         # Manage the group when it already exists
         def manage_group
           if @new_resource.append
-            members_to_be_added = [ ]
-            if @new_resource.excluded_members && !@new_resource.excluded_members.empty?
-              # First find out if any member needs to be removed
-              members_to_be_removed = [ ]
-              @new_resource.excluded_members.each do |member|
-                members_to_be_removed << member if @current_resource.members.include?(member)
-              end
-
-              unless members_to_be_removed.empty?
-                # We are using a magic trick to remove the groups.
-                reset_group_membership
-
-                # Capture the members we need to add in
-                # members_to_be_added to be added later on.
-                @current_resource.members.each do |member|
-                  members_to_be_added << member unless members_to_be_removed.include?(member)
-                end
-              end
-            end
-
-            if @new_resource.members && !@new_resource.members.empty?
-              @new_resource.members.each do |member|
-                members_to_be_added << member if !@current_resource.members.include?(member)
-              end
-            end
-
-            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add") if members_to_be_added.empty?
-
-            add_group_members(members_to_be_added)
+            to_add = @new_resource.members.dup
+            to_add.reject! { |user| @current_resource.members.include?(user) }
+
+            to_delete = Array.new
+
+            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add") if to_add.empty?
           else
-            # We are resetting the members of a group so use the same trick
-            reset_group_membership
+            to_add = @new_resource.members.dup
+            to_add.reject! { |user| @current_resource.members.include?(user) }
+
+            to_delete = @current_resource.members.dup
+            to_delete.reject! { |user| @new_resource.members.include?(user) }
+
             Chef::Log.debug("#{@new_resource} setting group members to: none") if @new_resource.members.empty?
+          end
+
+          if to_delete.empty?
+            # If we are only adding new members to this group, then
+            # call add_group_members with only those users
+            add_group_members(to_add)
+          else
+            Chef::Log.debug("#{@new_resource} removing members #{to_delete.join(', ')}")
+
+            # This is tricky, but works: rename the existing group to
+            # "<name>_bak", create a new group with the same GID and
+            # "<name>", then set correct members on that group
+            rename = "group mod -n #{@new_resource.group_name}_bak #{@new_resource.group_name}"
+            shell_out!(rename)
+
+            create = "group add"
+            create << set_options(:overwrite_gid => true)
+            shell_out!(create)
+
+            # Ignore to_add here, since we're replacing the group we
+            # have to add all members who should be in the group.
             add_group_members(@new_resource.members)
+
+            remove = "group del #{@new_resource.group_name}_bak"
+            shell_out!(remove)
           end
         end
 
@@ -94,21 +99,6 @@ class Chef
           end
         end
 
-        # This is tricky, but works: rename the existing group to
-        # "<name>_bak", create a new group with the same GID and
-        # "<name>", then set correct members on that group
-        def reset_group_membership
-          rename = "group mod -n #{@new_resource.group_name}_bak #{@new_resource.group_name}"
-          shell_out!(rename)
-
-          create = "group add"
-          create << set_options(:overwrite_gid => true)
-          shell_out!(create)
-
-          remove = "group del #{@new_resource.group_name}_bak"
-          shell_out!(remove)
-        end
-
         # Little bit of magic as per Adam's useradd provider to pull and assign the command line flags
         #
         # ==== Returns