chef 12.16.42 → 12.17.44

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

@@ -20,6 +20,7 @@
 require "chef/chef_fs/file_system/repository/node"
 require "chef/chef_fs/file_system/repository/directory"
 require "chef/chef_fs/file_system/exceptions"
+require "chef/win32/security" if Chef::Platform.windows?
 
 class Chef
   module ChefFS
@@ -30,6 +31,24 @@ class Chef
           def make_child_entry(child_name)
             Node.new(child_name, self)
           end
+
+          def create_child(child_name, file_contents = nil)
+            child = super
+            File.chmod(0600, child.file_path)
+            if Chef::Platform.windows?
+              read_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_READ
+              write_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_WRITE
+              owner = Chef::ReservedNames::Win32::Security::SID.current_user
+              dacl = Chef::ReservedNames::Win32::Security::ACL.create([
+                Chef::ReservedNames::Win32::Security::ACE.access_allowed(owner, read_mask),
+                Chef::ReservedNames::Win32::Security::ACE.access_allowed(owner, write_mask),
+              ])
+              so = Chef::ReservedNames::Win32::Security::SecurableObject.new(child.file_path)
+              so.owner = owner
+              so.set_dacl(dacl, false)
+            end
+            child
+          end
         end
       end
     end

data/lib/chef/client.rb

@@ -22,6 +22,7 @@ require "chef/config"
 require "chef/mixin/params_validate"
 require "chef/mixin/path_sanity"
 require "chef/log"
+require "chef/deprecated"
 require "chef/server_api"
 require "chef/api_client"
 require "chef/api_client/registration"

data/lib/chef/cookbook/metadata.rb

@@ -641,8 +641,8 @@ class Chef
         VERSION_CONSTRAINTS.each do |dependency_type, hash_key|
           if dependency_group = o[hash_key]
             dependency_group.each do |cb_name, constraints|
-              if metadata.respond_to?(method_name)
-                metadata.public_send(method_name, cb_name, *Array(constraints))
+              if metadata.respond_to?(dependency_type)
+                metadata.public_send(dependency_type, cb_name, *Array(constraints))
               end
             end
           end

data/lib/chef/cookbook_version.rb

@@ -54,12 +54,12 @@ class Chef
     attr_accessor :metadata_filenames
 
     def status=(new_status)
-      Chef.log_deprecation("Deprecated method `status' called. This method will be removed.")
+      Chef.deprecated(:internal_api, "Deprecated method `status' called. This method will be removed.")
       @status = new_status
     end
 
     def status
-      Chef.log_deprecation("Deprecated method `status' called. This method will be removed.")
+      Chef.deprecated(:internal_api, "Deprecated method `status' called. This method will be removed.")
       @status
     end
 
@@ -485,7 +485,7 @@ class Chef
     end
 
     def self.json_create(o)
-      Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::CookbookVersion#from_hash")
+      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::CookbookVersion#from_hash")
       from_hash(o)
     end
 
@@ -496,7 +496,7 @@ class Chef
     # @deprecated This method was used by the Ruby Chef Server and is no longer
     #   needed. There is no replacement.
     def generate_manifest_with_urls
-      Chef.log_deprecation("Deprecated method #generate_manifest_with_urls.")
+      Chef.deprecated(:internal_api, "Deprecated method #generate_manifest_with_urls.")
 
       rendered_manifest = manifest.dup
       COOKBOOK_SEGMENTS.each do |segment|

data/lib/chef/data_bag.rb

@@ -80,7 +80,7 @@ class Chef
 
     # Create a Chef::Role from JSON
     def self.json_create(o)
-      Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::DataBag#from_hash")
+      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::DataBag#from_hash")
       from_hash(o)
     end
 

data/lib/chef/data_bag_item.rb

@@ -141,7 +141,7 @@ class Chef
 
     # Create a Chef::DataBagItem from JSON
     def self.json_create(o)
-      Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::DataBagItem#from_hash")
+      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::DataBagItem#from_hash")
       from_hash(o)
     end
 

data/lib/chef/data_collector.rb

@@ -174,12 +174,13 @@ class Chef
       # resource, and we only care about tracking top-level resources.
       def resource_current_state_loaded(new_resource, action, current_resource)
         return if nested_resource?(new_resource)
-        update_current_resource_report(create_resource_report(new_resource, action, current_resource))
+        initialize_resource_report_if_needed(new_resource, action, current_resource)
       end
 
       # see EventDispatch::Base#resource_up_to_date
       # Mark our ResourceReport status accordingly
       def resource_up_to_date(new_resource, action)
+        initialize_resource_report_if_needed(new_resource, action)
         current_resource_report.up_to_date unless nested_resource?(new_resource)
       end
 
@@ -190,15 +191,15 @@ class Chef
       def resource_skipped(new_resource, action, conditional)
         return if nested_resource?(new_resource)
 
-        resource_report = create_resource_report(new_resource, action)
-        resource_report.skipped(conditional)
-        update_current_resource_report(resource_report)
+        initialize_resource_report_if_needed(new_resource, action)
+        current_resource_report.skipped(conditional)
       end
 
       # see EventDispatch::Base#resource_updated
       # Flag the current ResourceReport instance as updated (as long as it's
       # a top-level resource).
       def resource_updated(new_resource, action)
+        initialize_resource_report_if_needed(new_resource, action)
         current_resource_report.updated unless nested_resource?(new_resource)
       end
 
@@ -207,6 +208,7 @@ class Chef
       # long as it's a top-level resource, and update the run error text
       # with the proper Formatter.
       def resource_failed(new_resource, action, exception)
+        initialize_resource_report_if_needed(new_resource, action)
         current_resource_report.failed(exception) unless nested_resource?(new_resource)
         update_error_description(
           Formatters::ErrorMapper.resource_failed(
@@ -224,7 +226,7 @@ class Chef
         if current_resource_report && !nested_resource?(new_resource)
           current_resource_report.finish
           add_resource_report(current_resource_report)
-          update_current_resource_report(nil)
+          clear_current_resource_report
         end
       end
 
@@ -274,7 +276,7 @@ class Chef
       # see EventDispatch::Base#deprecation
       # Append a received deprecation to the list of deprecations
       def deprecation(message, location = caller(2..2)[0])
-        add_deprecation(message, location)
+        add_deprecation(message.message, message.url, location)
       end
 
       private
@@ -331,7 +333,7 @@ class Chef
       def send_to_data_collector(message)
         return unless data_collector_accessible?
 
-        Chef::Log.debug("data_collector_reporter: POSTing the following message to #{data_collector_server_url}: #{message}")
+        Chef::Log.debug("data_collector_reporter: POSTing the following message to #{data_collector_server_url}: #{Chef::JSONCompat.to_json(message)}")
         http.post(nil, message, headers)
       end
 
@@ -402,16 +404,17 @@ class Chef
         @run_status = run_status
       end
 
-      def update_current_resource_report(resource_report)
-        @current_resource_report = resource_report
-      end
-
       def update_error_description(discription_hash)
         @error_descriptions = discription_hash
       end
 
-      def add_deprecation(message, location)
-        @deprecations << { message: message, location: location }
+      def add_deprecation(message, url, location)
+        @deprecations << { message: message, url: url, location: location }
+      end
+
+      def initialize_resource_report_if_needed(new_resource, action, current_resource = nil)
+        return unless current_resource_report.nil?
+        @current_resource_report = create_resource_report(new_resource, action, current_resource)
       end
 
       def create_resource_report(new_resource, action, current_resource = nil)
@@ -422,6 +425,10 @@ class Chef
         )
       end
 
+      def clear_current_resource_report
+        @current_resource_report = nil
+      end
+
       def detect_unprocessed_resources
         # create a Set containing all resource+action combinations from
         # the Resource Collection

data/lib/chef/data_collector/messages.rb

@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-require "json"
 require "securerandom"
 require_relative "messages/helpers"
 

data/lib/chef/data_collector/messages/helpers.rb

@@ -142,14 +142,14 @@ class Chef
         # @return [Hash] DataCollector metadata for this node
         #
         def metadata
-          JSON.load(Chef::FileCache.load(metadata_filename))
+          Chef::JSONCompat.parse(Chef::FileCache.load(metadata_filename))
         rescue Chef::Exceptions::FileNotFound
           {}
         end
 
         def update_metadata(key, value)
           updated_metadata = metadata.tap { |x| x[key] = value }
-          Chef::FileCache.store(metadata_filename, updated_metadata.to_json, 0644)
+          Chef::FileCache.store(metadata_filename, Chef::JSONCompat.to_json(updated_metadata), 0644)
         end
 
         def metadata_filename

data/lib/chef/decorator/unchain.rb

@@ -44,10 +44,10 @@ class Chef
         if symbol == :to_ary
           merged_attributes.send(symbol, *args)
         elsif args.empty?
-          Chef.log_deprecation %q{method access to node attributes (node.foo.bar) is deprecated and will be removed in Chef 13, please use bracket syntax (node["foo"]["bar"])}
+          Chef.deprecated :attributes, %q{method access to node attributes (node.foo.bar) is deprecated and will be removed in Chef 13, please use bracket syntax (node["foo"]["bar"])}
           self[symbol]
         elsif symbol.to_s =~ /=$/
-          Chef.log_deprecation %q{method setting of node attributes (node.foo="bar") is deprecated and will be removed in Chef 13, please use bracket syntax (node["foo"]="bar")}
+          Chef.deprecated :attributes, %q{method setting of node attributes (node.foo="bar") is deprecated and will be removed in Chef 13, please use bracket syntax (node["foo"]="bar")}
           key_to_set = symbol.to_s[/^(.+)=$/, 1]
           self[key_to_set] = (args.length == 1 ? args[0] : args)
         else

data/lib/chef/deprecated.rb

@@ -0,0 +1,190 @@
+#--
+# Copyright:: Copyright 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 "chef/mixin/convert_to_class_name"
+
+# Structured deprecations have a unique URL associated with them, which must exist before the deprecation is merged.
+class Chef
+  class Deprecated
+
+    class << self
+      include Chef::Mixin::ConvertToClassName
+
+      def create(type, message = nil, location = nil)
+        Chef::Deprecated.const_get(convert_to_class_name(type.to_s)).send(:new, message, location)
+      end
+    end
+
+    class Base
+      BASE_URL = "https://docs.chef.io/deprecations_"
+
+      attr_accessor :message, :location
+
+      def initialize(msg = nil, location = nil)
+        @message = msg if msg
+        @location = location if location
+      end
+
+      def link
+        "Please see #{url} for further details and information on how to correct this problem."
+      end
+
+      def url
+        "#{BASE_URL}#{target}"
+      end
+
+      # We know that the only time this gets called is by Chef::Log.deprecation,
+      # so special case
+      def <<(location)
+        @location = location
+      end
+
+      def inspect
+        "#{message} (CHEF-#{id})#{location}.\n#{link}"
+      end
+
+      def id
+        raise NotImplementedError, "subclasses of Chef::Deprecated::Base should define #id with a unique number"
+      end
+
+      def target
+        raise NotImplementedError, "subclasses of Chef::Deprecated::Base should define #target"
+      end
+    end
+
+    class JsonAutoInflate < Base
+      def id
+        1
+      end
+
+      def target
+        "json_auto_inflate.html"
+      end
+    end
+
+    class ExitCode < Base
+      def id
+        2
+      end
+
+      def target
+        "exit_code.html"
+      end
+    end
+
+    class ChefGemCompileTime < Base
+      def id
+        3
+      end
+
+      def target
+        "chef_gem_compile_time.html"
+      end
+    end
+
+    class Attributes < Base
+      def id
+        4
+      end
+
+      def target
+        "attributes.html"
+      end
+    end
+
+    class CustomResource < Base
+      def id
+        5
+      end
+
+      def target
+        "custom_resource_cleanups.html"
+      end
+    end
+
+    class EasyInstall < Base
+      def id
+        6
+      end
+
+      def target
+        "easy_install.html"
+      end
+    end
+
+    class VerifyFile < Base
+      def id
+        7
+      end
+
+      def target
+        "verify_file.html"
+      end
+    end
+
+    class SupportsProperty < Base
+      def id
+        8
+      end
+
+      def target
+        "supports_property.html"
+      end
+    end
+
+    class ChefRest < Base
+      def id
+        9
+      end
+
+      def target
+        "chef_rest.html"
+      end
+    end
+
+    class ResourceCloning < Base
+      def id
+        3694
+      end
+
+      def target
+        "resource_cloning.html"
+      end
+    end
+
+    class InternalApi < Base
+      def id
+        0
+      end
+
+      def target
+        "internal_api.html"
+      end
+    end
+
+    class Generic < Base
+      def url
+        "https://docs.chef.io/chef_deprecations_client.html"
+      end
+
+      def inspect
+        "#{message}\nThis is a generic error message and should be updated to have a proper deprecation class. #{location}\nPlease see #{url} for an overview of Chef deprecations."
+      end
+    end
+
+  end
+end

data/lib/chef/deprecation/provider/remote_directory.rb

@@ -22,7 +22,7 @@ class Chef
       module RemoteDirectory
 
         def directory_root_in_cookbook_cache
-          Chef.log_deprecation "the Chef::Provider::RemoteDirectory#directory_root_in_cookbook_cache method is deprecated"
+          Chef.deprecated :internal_api, "the Chef::Provider::RemoteDirectory#directory_root_in_cookbook_cache method is deprecated"
 
           @directory_root_in_cookbook_cache ||=
             begin

data/lib/chef/deprecation/warnings.rb

@@ -23,10 +23,9 @@ class Chef
       def add_deprecation_warnings_for(method_names)
         method_names.each do |name|
           define_method(name) do |*args|
-            message = []
-            message << "Method '#{name}' of '#{self.class}' is deprecated. It will be removed in Chef 13."
-            message << "Please update your cookbooks accordingly."
-            Chef.log_deprecation(message)
+            message = "Method '#{name}' of '#{self.class}' is deprecated. It will be removed in Chef 13."
+            message << " Please update your cookbooks accordingly."
+            Chef.deprecated(:internal_api, message)
             super(*args)
           end
         end