chef 12.9.38 → 12.9.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3ac4ddf35d84243c1bc31c4f5ec01d99e684b2
-  data.tar.gz: ba7c45fd6ece09421f4c322c9a3273514cc61172
+  metadata.gz: f930659fc8f0413f464d687e747daef788684715
+  data.tar.gz: db7f21240e101ec0b50a37f96c6b5d556c9890de
 SHA512:
-  metadata.gz: 5fb2ad9b1cceb5c41cc4f6325b7c6ccdb2fcc6e6c5a8cfc516fb4c6dc77462ffdca4e9ce66cb60d164b791ecb5b800a5d67d4037df2ac48f02e9bc3a83be9247
-  data.tar.gz: ccdb5799bd2bb26231864adfa72be8c63eb850ba3c61284ea8bd4eb25c32cb0081f76fd40240932a6121351512f8177f71eceb8bda1b9f321f18fad72d5238f9
+  metadata.gz: c92e90df62da0f90ae4262a04a81e12df2d34289942d02152ae67689657eba41456f8a5d8a751683aa8b46af34a88ce57ee728da415152813df92493aebb9329
+  data.tar.gz: eb2c3be9b98d532dbd199abf24c2a5933df23149b7432382f7387b4eeb1e14c30ab5af11e48d5f0548a982169f50280300836f4cd6f43a76109707708a469d43

data/VERSION

@@ -1 +1 @@
-12.9.38
+12.9.41

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -22,7 +22,7 @@ require "chef_zero/data_store/data_already_exists_error"
 require "chef_zero/data_store/data_not_found_error"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/file_system"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/file_system/memory/memory_root"
 require "fileutils"
 

data/lib/chef/chef_fs/command_line.rb

@@ -17,8 +17,7 @@
 #
 
 require "chef/chef_fs/file_system"
-require "chef/chef_fs/file_system/operation_failed_error"
-require "chef/chef_fs/file_system/operation_not_allowed_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/util/diff"
 
 class Chef

data/lib/chef/chef_fs/file_system.rb

@@ -17,9 +17,7 @@
 #
 
 require "chef/chef_fs/path_utils"
-require "chef/chef_fs/file_system/default_environment_cannot_be_modified_error"
-require "chef/chef_fs/file_system/operation_failed_error"
-require "chef/chef_fs/file_system/operation_not_allowed_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/parallelizer"
 
 class Chef

data/lib/chef/chef_fs/file_system/already_exists_error.rb

@@ -16,13 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/operation_failed_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class AlreadyExistsError < OperationFailedError
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/base_fs_object.rb

@@ -17,7 +17,7 @@
 #
 
 require "chef/chef_fs/path_utils"
-require "chef/chef_fs/file_system/operation_not_allowed_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb

@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/acl_entry"
-require "chef/chef_fs/file_system/operation_not_allowed_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb

@@ -17,9 +17,7 @@
 #
 
 require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/operation_not_allowed_error"
-require "chef/chef_fs/file_system/operation_failed_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb

@@ -20,7 +20,7 @@ require "chef/chef_fs/command_line"
 require "chef/chef_fs/file_system/chef_server/rest_list_dir"
 require "chef/chef_fs/file_system/chef_server/cookbook_subdir"
 require "chef/chef_fs/file_system/chef_server/cookbook_file"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/cookbook_version"
 require "chef/cookbook_uploader"
 

data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb

@@ -18,8 +18,7 @@
 
 require "chef/chef_fs/file_system/chef_server/rest_list_dir"
 require "chef/chef_fs/file_system/chef_server/cookbook_dir"
-require "chef/chef_fs/file_system/operation_failed_error"
-require "chef/chef_fs/file_system/cookbook_frozen_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir"
 require "chef/mixin/file_class"
 

data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb

@@ -17,8 +17,7 @@
 #
 
 require "chef/chef_fs/file_system/chef_server/rest_list_dir"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/must_delete_recursively_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/data_handler/data_bag_item_data_handler"
 
 class Chef

data/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb

@@ -18,8 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/default_environment_cannot_be_modified_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb

@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/data_handler/node_data_handler"
 
 class Chef

data/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb

@@ -16,9 +16,7 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/already_exists_error"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/operation_failed_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb

@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/file_system/chef_server/policy_group_entry"
 
 class Chef

data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb

@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb

@@ -17,8 +17,7 @@
 #
 
 require "chef/chef_fs/file_system/base_fs_object"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/operation_failed_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/role"
 require "chef/node"
 require "chef/json_compat"

data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb

@@ -16,13 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/already_exists_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class CookbookFrozenError < AlreadyExistsError
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb

@@ -16,17 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/operation_not_allowed_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class DefaultEnvironmentCannotBeModifiedError < OperationNotAllowedError
-        def reason
-          result = super
-          result + " (default environment cannot be modified)"
-        end
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/exceptions.rb

@@ -0,0 +1,98 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class FileSystemError < StandardError
+        # @param entry The entry which had an issue.
+        # @param cause The wrapped exception (if any).
+        # @param reason A string describing why this exception happened.
+        def initialize(entry, cause = nil, reason = nil)
+          super(reason)
+          @entry = entry
+          @cause = cause
+          @reason = reason
+        end
+
+        # The entry which had an issue.
+        attr_reader :entry
+
+        # The wrapped exception (if any).
+        attr_reader :cause
+
+        # A string describing why this exception happened.
+        attr_reader :reason
+      end
+
+      class MustDeleteRecursivelyError < FileSystemError; end
+
+      class NotFoundError < FileSystemError; end
+
+      class OperationFailedError < FileSystemError
+        def initialize(operation, entry, cause = nil, reason = nil)
+          super(entry, cause, reason)
+          @operation = operation
+        end
+
+        def message
+          if cause && cause.is_a?(Net::HTTPExceptions) && cause.response.code == "400"
+            "#{super} cause: #{cause.response.body}"
+          else
+            super
+          end
+        end
+
+        attr_reader :operation
+      end
+
+      class OperationNotAllowedError < FileSystemError
+        def initialize(operation, entry, cause = nil, reason = nil)
+          reason ||=
+            case operation
+            when :delete
+              "cannot be deleted"
+            when :write
+              "cannot be updated"
+            when :create_child
+              "cannot have a child created under it"
+            when :read
+              "cannot be read"
+            end
+          super(entry, cause, reason)
+          @operation = operation
+        end
+
+        attr_reader :operation
+        attr_reader :entry
+      end
+
+      class AlreadyExistsError < OperationFailedError; end
+
+      class CookbookFrozenError < AlreadyExistsError; end
+
+      class DefaultEnvironmentCannotBeModifiedError < OperationNotAllowedError
+        def reason
+          result = super
+          result + " (default environment cannot be modified)"
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/file_system_error.rb

@@ -16,29 +16,5 @@
 # limitations under the License.
 #
 
-class Chef
-  module ChefFS
-    module FileSystem
-      class FileSystemError < StandardError
-        # @param entry The entry which had an issue.
-        # @param cause The wrapped exception (if any).
-        # @param reason A string describing why this exception happened.
-        def initialize(entry, cause = nil, reason = nil)
-          super(reason)
-          @entry = entry
-          @cause = cause
-          @reason = reason
-        end
-
-        # The entry which had an issue.
-        attr_reader :entry
-
-        # The wrapped exception (if any).
-        attr_reader :cause
-
-        # A string describing why this exception happened.
-        attr_reader :reason
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb

@@ -16,13 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/file_system_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class MustDeleteRecursivelyError < FileSystemError
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb

@@ -17,7 +17,7 @@
 #
 
 require "chef/chef_fs/file_system/base_fs_object"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/not_found_error.rb

@@ -16,13 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/file_system_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class NotFoundError < FileSystemError
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/operation_failed_error.rb

@@ -16,27 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/file_system_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class OperationFailedError < FileSystemError
-        def initialize(operation, entry, cause = nil, reason = nil)
-          super(entry, cause, reason)
-          @operation = operation
-        end
-
-        def message
-          if cause && cause.is_a?(Net::HTTPExceptions) && cause.response.code == "400"
-            "#{super} cause: #{cause.response.body}"
-          else
-            super
-          end
-        end
-
-        attr_reader :operation
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb

@@ -16,31 +16,5 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/file_system_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      class OperationNotAllowedError < FileSystemError
-        def initialize(operation, entry, cause = nil, reason = nil)
-          reason ||=
-            case operation
-            when :delete
-              "cannot be deleted"
-            when :write
-              "cannot be updated"
-            when :create_child
-              "cannot have a child created under it"
-            when :read
-              "cannot be read"
-            end
-          super(entry, cause, reason)
-          @operation = operation
-        end
-
-        attr_reader :operation
-        attr_reader :entry
-      end
-    end
-  end
-end
+require "chef/chef_fs/file_system/exceptions"
+Chef.log_deprecation "Individual ChefFS error files are deprecated. Please require 'chef/chef_fs/file_system/exceptions' rather than 'chef/chef_fs/file_system/#{File.basename(__FILE__, ".rb")}'."

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb

@@ -19,7 +19,7 @@
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry"
 require "chef/chef_fs/file_system/chef_server/cookbook_dir"
 require "chef/chef_fs/file_system/chef_server/versioned_cookbook_dir"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/cookbook/cookbook_version_loader"
 
 class Chef

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb

@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
 require "chef/chef_fs/file_system/repository/cookbooks_dir"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb

@@ -18,7 +18,7 @@
 #
 
 require "chef/chef_fs/file_system/repository/file_system_entry"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/repository/directory.rb

@@ -54,7 +54,7 @@ class Chef
             possible_child.dir? == is_dir && possible_child.name_valid?
           end
 
-          # Public API callied by chef_fs/file_system
+          # Public API called by chef_fs/file_system
           def dir?
             true
           end

data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb

@@ -18,9 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/chef_server/rest_list_dir"
-require "chef/chef_fs/file_system/already_exists_error"
-require "chef/chef_fs/file_system/must_delete_recursively_error"
-require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/exceptions"
 require "chef/chef_fs/path_utils"
 require "fileutils"
 

data/lib/chef/dsl/core.rb

@@ -17,15 +17,16 @@
 # limitations under the License.
 #
 
-require "chef/mixin/shell_out"
-require "chef/mixin/powershell_out"
 require "chef/dsl/declare_resource"
+require "chef/mixin/notifying_block"
+require "chef/mixin/powershell_out"
+require "chef/mixin/shell_out"
 
 class Chef
   module DSL
     # This is the "Core DSL" with various bits of Sugar that are mixed into core providers as well
     # as user LWRPs.  This module deliberately does not mixin the Resources or Defintions DSL bits
-    # so that cookbooks are not injeting random things into the samespace of core providers.
+    # so that cookbooks are not injeting random things into the namespace of core providers.
     #
     # - If you are writing cookbooks:  you have come to the wrong place, please inject things into
     #   Chef::DSL::Recipe instead.
@@ -34,9 +35,10 @@ class Chef
     #   into here.
     #
     module Core
-      include Chef::Mixin::ShellOut
-      include Chef::Mixin::PowershellOut
       include Chef::DSL::DeclareResource
+      include Chef::Mixin::NotifyingBlock
+      include Chef::Mixin::PowershellOut
+      include Chef::Mixin::ShellOut
     end
   end
 end

data/lib/chef/knife/show.rb

@@ -9,7 +9,7 @@ class Chef
 
       deps do
         require "chef/chef_fs/file_system"
-        require "chef/chef_fs/file_system/not_found_error"
+        require "chef/chef_fs/file_system/exceptions"
       end
 
       option :local,

data/lib/chef/mixin/notifying_block.rb

@@ -0,0 +1,53 @@
+#--
+# Author:: Lamont Granquist <lamont@chef.io>
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Chef
+  module Mixin
+    module NotifyingBlock
+
+      def notifying_block(&block)
+        begin
+          subcontext = subcontext_block(&block)
+          Chef::Runner.new(subcontext).converge
+        ensure
+          # recipes don't have a new_resource
+          if respond_to?(:new_resource)
+            if subcontext && subcontext.resource_collection.any?(&:updated?)
+              new_resource.updated_by_last_action(true)
+            end
+          end
+        end
+      end
+
+      def subcontext_block(parent_context = nil, &block)
+        parent_context ||= @run_context
+        sub_run_context = parent_context.create_child
+
+        begin
+          outer_run_context = @run_context
+          @run_context = sub_run_context
+          instance_eval(&block)
+        ensure
+          @run_context = outer_run_context
+        end
+
+        sub_run_context
+      end
+
+    end
+  end
+end

data/lib/chef/provider/group.rb

@@ -94,6 +94,7 @@ class Chef
           missing_members = []
           @new_resource.members.each do |member|
             next if has_current_group_member?(member)
+            validate_member!(member)
             missing_members << member
           end
           if missing_members.length > 0
@@ -122,6 +123,12 @@ class Chef
         @current_resource.members.include?(member)
       end
 
+      def validate_member!(member)
+        # Sub-classes can do any validation if needed
+        # and raise an error if validation fails
+        true
+      end
+
       def action_create
         case @group_exists
         when false

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

@@ -61,7 +61,7 @@ class Chef
           if @new_resource.append
             members_to_be_added = [ ]
             @new_resource.members.each do |member|
-              members_to_be_added << member if ! has_current_group_member?(member)
+              members_to_be_added << member if ! has_current_group_member?(member) && validate_member!(member)
             end
 
             # local_add_members will raise ERROR_MEMBER_IN_ALIAS if a
@@ -70,7 +70,7 @@ class Chef
 
             members_to_be_removed = [ ]
             @new_resource.excluded_members.each do |member|
-              member_sid = local_group_name_to_sid(member)
+              member_sid = lookup_account_name(member)
               members_to_be_removed << member if has_current_group_member?(member)
             end
             @net_group.local_delete_members(members_to_be_removed) unless members_to_be_removed.empty?
@@ -80,7 +80,7 @@ class Chef
         end
 
         def has_current_group_member?(member)
-          member_sid = local_group_name_to_sid(member)
+          member_sid = lookup_account_name(member)
           @current_resource.members.include?(member_sid)
         end
 
@@ -88,10 +88,23 @@ class Chef
           @net_group.local_delete
         end
 
-        def local_group_name_to_sid(group_name)
-          locally_qualified_name = group_name.include?("\\") ? group_name : "#{ENV['COMPUTERNAME']}\\#{group_name}"
-          Chef::ReservedNames::Win32::Security.lookup_account_name(locally_qualified_name)[1].to_s
+        def locally_qualified_name(account_name)
+          account_name.include?("\\") ? account_name : "#{ENV['COMPUTERNAME']}\\#{account_name}"
         end
+
+        def validate_member!(member)
+          Chef::ReservedNames::Win32::Security.lookup_account_name(locally_qualified_name(member))[1].to_s
+        end
+
+        def lookup_account_name(account_name)
+          begin
+            Chef::ReservedNames::Win32::Security.lookup_account_name(locally_qualified_name(account_name))[1].to_s
+          rescue Chef::Exceptions::Win32APIError
+            Chef::Log.warn("SID for '#{locally_qualified_name(account_name)}' could not be found")
+            ""
+          end
+        end
+
       end
     end
   end

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.9.38"
+  VERSION = "12.9.41"
 end
 
 #

data/spec/functional/resource/group_spec.rb

@@ -267,14 +267,14 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte
     end
 
     describe "when removing members" do
-      it "raises an error for a non well-formed domain name" do
+      it "does not raise an error for a non well-formed domain name" do
         group_resource.excluded_members [invalid_domain_user_name]
-        expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError
+        expect { group_resource.run_action(tested_action) }.to_not raise_error Chef::Exceptions::Win32APIError
       end
 
-      it "raises an error for a nonexistent domain" do
+      it "does not raise an error for a nonexistent domain" do
         group_resource.excluded_members [nonexistent_domain_user_name]
-        expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError
+        expect { group_resource.run_action(tested_action) }.to_not raise_error Chef::Exceptions::Win32APIError
       end
     end
   end

data/spec/integration/recipes/notifying_block_spec.rb

@@ -0,0 +1,111 @@
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "support/shared/integration/integration_helper"
+require "chef/mixin/shell_out"
+
+describe "notifying_block" do
+  include IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
+
+  when_the_repository "notifying_block test one" do
+    before do
+      directory "cookbooks/x" do
+        file "recipes/default.rb", <<-EOM
+          notifying_block do
+            log "gamma" do
+              action :nothing
+            end
+            log "alpha" do
+              notifies :write, "log[gamma]", :delayed
+            end
+            log "beta" do
+              notifies :write, "log[gamma]", :delayed
+            end
+          end
+          log "delta"
+        EOM
+      end
+      file "config/client.rb", <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+        log_level :warn
+      EOM
+    end
+
+    # implicitly tests -
+    #  1. notifying block opens up a subcontext
+    #  2. delayed notifications are de-dup'd in the subcontext
+    #  3. delayed notifications (to resources inside the subcontext) are run at the end of the subcontext
+    it "should run alpha, beta, gamma, and delta in that order" do
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", :cwd => chef_dir)
+      expect(result.stdout).to match(/\* log\[alpha\] action write\s+\* log\[beta\] action write\s+\* log\[gamma\] action write\s+Converging 1 resources\s+\* log\[delta\] action write/)
+      result.error!
+    end
+  end
+
+  when_the_repository "notifying_block test two" do
+    before do
+      directory "cookbooks/x" do
+        file "resources/nb_test.rb", <<-EOM
+          default_action :run
+          provides :nb_test
+          resource_name :nb_test
+
+          action :run do
+            notifying_block do
+              log "foo" do
+                notifies :write, 'log[bar]', :delayed
+              end
+            end
+          end
+        EOM
+        file "recipes/default.rb", <<-EOM
+          log "bar" do
+            action :nothing
+          end
+          log "baz" do
+            action :nothing
+          end
+
+          nb_test "testing" do
+            notifies :write, 'log[baz]', :delayed
+          end
+
+          log "quux"
+        EOM
+      end
+      file "config/client.rb", <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+        log_level :warn
+      EOM
+    end
+
+    # implicitly tests -
+    #  1. notifying block will correctly update wrapping new_resource updated_by_last_action status
+    #  2. delayed notifications from a subcontext inside a resource will notify resources in their outer run_context
+    it "should run foo, quux, bar, and baz in that order" do
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", :cwd => chef_dir)
+      expect(result.stdout).to match(/\* log\[foo\] action write\s+\* log\[quux\] action write\s+\* log\[bar\] action write\s+\* log\[baz\] action write/)
+      result.error!
+    end
+  end
+end

data/spec/unit/provider/group/windows_spec.rb

@@ -51,11 +51,13 @@ describe Chef::Provider::Group::Windows do
       @new_resource.members([ "us" ])
       @current_resource = Chef::Resource::Group.new("staff")
       @current_resource.members %w{all your base}
+      @new_resource.excluded_members %w{all}
 
       allow(Chef::Util::Windows::NetGroup).to receive(:new).and_return(@net_group)
       allow(@net_group).to receive(:local_add_members)
       allow(@net_group).to receive(:local_set_members)
-      allow(@provider).to receive(:local_group_name_to_sid)
+      allow(@provider).to receive(:lookup_account_name)
+      allow(@provider).to receive(:validate_member!).and_return(true)
       @provider.current_resource = @current_resource
     end
 
@@ -71,6 +73,12 @@ describe Chef::Provider::Group::Windows do
       @provider.manage_group
     end
 
+    it "should call @net_group.local_delete_members" do
+      allow(@new_resource).to receive(:append).and_return(true)
+      allow(@provider).to receive(:lookup_account_name).with("all").and_return("all")
+      expect(@net_group).to receive(:local_delete_members).with(@new_resource.excluded_members)
+      @provider.manage_group
+    end
   end
 
   describe "remove_group" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.9.38
+  version: 12.9.41
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.9.38
+        version: 12.9.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.9.38
+        version: 12.9.41
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -783,6 +783,7 @@ files:
 - lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb
 - lib/chef/chef_fs/file_system/cookbook_frozen_error.rb
 - lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb
+- lib/chef/chef_fs/file_system/exceptions.rb
 - lib/chef/chef_fs/file_system/file_system_error.rb
 - lib/chef/chef_fs/file_system/memory/memory_dir.rb
 - lib/chef/chef_fs/file_system/memory/memory_file.rb
@@ -1101,6 +1102,7 @@ files:
 - lib/chef/mixin/language_include_attribute.rb
 - lib/chef/mixin/language_include_recipe.rb
 - lib/chef/mixin/lazy_module_include.rb
+- lib/chef/mixin/notifying_block.rb
 - lib/chef/mixin/params_validate.rb
 - lib/chef/mixin/path_sanity.rb
 - lib/chef/mixin/powershell_out.rb
@@ -1872,6 +1874,7 @@ files:
 - spec/integration/recipes/lwrp_spec.rb
 - spec/integration/recipes/noop_resource_spec.rb
 - spec/integration/recipes/notifies_spec.rb
+- spec/integration/recipes/notifying_block_spec.rb
 - spec/integration/recipes/provider_choice.rb
 - spec/integration/recipes/recipe_dsl_spec.rb
 - spec/integration/recipes/remote_directory.rb
@@ -2438,7 +2441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration