chef 11.16.4 → 11.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2baecdd27415e458334b145590c6679023dd890
-  data.tar.gz: c0eea714604dad7549a052fa6b5f7f92e2d69719
+  metadata.gz: 5488cfa9cadb8915b16300d713c7e9fa84280a9b
+  data.tar.gz: 2e972fcb90079442701054cc60e32f4702aaa622
 SHA512:
-  metadata.gz: 3e980d795b418fe8f8307b57beee2fe8db0ba6a7ee1b32bf85186c1c38e101479c54b9bba2629a10f3f1575289abad80cde84f85a0c20ad02ee874dc342f1e87
-  data.tar.gz: 40e039ba23e69e2f179defe5c72bbd4478fcc4a0fda5d16b64f0a5338226303af57855075013d720c487fdec73ad0604293efee314067761e58dcfca15b41124
+  metadata.gz: f4b29699fee5b775cb9f6da9dbd0bc431fef26da46da9d3bf3dddd1678039a337da941820992a5821fef270b96eb961ce2ecae726763f5e073c034270c25d6b7
+  data.tar.gz: 09699de226ec45815de423131cff4f006ec7ab8b05ea7abdd8da6b3ad9103bf7de4c0c08c898119152d5afdaf1902907a822dcfc9844ae8a027106383d554631

data/Rakefile

@@ -41,8 +41,8 @@ end
 
 desc "Build it, tag it and ship it"
 task :ship => :gem do
-  sh("git tag #{Chef::VERSION}")
-  sh("git push opscode --tags")
+  #sh("git tag #{Chef::VERSION}")
+  #sh("git push opscode --tags")
   Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse.each do |built_gem|
     sh("gem push #{built_gem}")
   end

data/lib/chef/api_client.rb

@@ -121,7 +121,7 @@ class Chef
     #
     # @return [String] the JSON string.
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def self.json_create(o)

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -23,6 +23,7 @@ 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/memory_root'
+require 'chef/json_compat'
 require 'fileutils'
 
 class Chef
@@ -114,7 +115,7 @@ class Chef
                   end
                 end
               end
-              JSON.pretty_generate(result)
+              Chef::JSONCompat.to_json_pretty(result)
 
             else
               begin
@@ -269,7 +270,7 @@ class Chef
 
         # Create a little Chef::ChefFS memory filesystem with the data
         cookbook_fs = Chef::ChefFS::FileSystem::MemoryRoot.new('uploading')
-        cookbook = JSON.parse(data, :create_additions => false)
+        cookbook = Chef::JSONCompat.parse(data, :create_additions => false)
         cookbook.each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|

data/lib/chef/chef_fs/command_line.rb

@@ -19,6 +19,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/json_compat'
 require 'chef/util/diff'
 
 class Chef
@@ -251,9 +252,9 @@ class Chef
       end
 
       def self.canonicalize_json(json_text)
-        parsed_json = JSON.parse(json_text, :create_additions => false)
+        parsed_json = Chef::JSONCompat.parse(json_text, :create_additions => false)
         sorted_json = sort_keys(parsed_json)
-        JSON.pretty_generate(sorted_json)
+        Chef::JSONCompat.to_json_pretty(sorted_json)
       end
 
       def self.diff_text(old_path, new_path, old_value, new_value)

data/lib/chef/chef_fs/data_handler/group_data_handler.rb

@@ -36,7 +36,11 @@ class Chef
           result
         end
 
-        def preserve_key(key)
+        def normalize_for_post(group, entry)
+          normalize_for_put(group, entry)
+        end
+
+        def preserve_key?(key)
           return key == 'name'
         end
 

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

@@ -20,6 +20,7 @@ require 'chef/chef_fs/file_system/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/json_compat'
 
 class Chef
   module ChefFS
@@ -37,7 +38,7 @@ class Chef
 
         def write(file_contents)
           # ACL writes are fun.
-          acls = data_handler.normalize(JSON.parse(file_contents, :create_additions => false), self)
+          acls = data_handler.normalize(Chef::JSONCompat.parse(file_contents, :create_additions => false), self)
           PERMISSIONS.each do |permission|
             begin
               rest.put("#{api_path}/#{permission}", { permission => acls[permission] })

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

@@ -19,6 +19,7 @@
 
 require 'chef/chef_fs/file_system/file_system_entry'
 require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/json_compat'
 
 class Chef
   module ChefFS
@@ -41,7 +42,7 @@ class Chef
 
         def chef_object
           begin
-            return data_handler.chef_object(JSON.parse(read, :create_additions => false))
+            return data_handler.chef_object(Chef::JSONCompat.parse(read, :create_additions => false))
           rescue
             Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
           end

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

@@ -19,6 +19,7 @@
 require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/rest_list_entry'
 require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/json_compat'
 
 class Chef
   module ChefFS
@@ -61,8 +62,8 @@ class Chef
 
         def create_child(name, file_contents)
           begin
-            object = JSON.parse(file_contents, :create_additions => false)
-          rescue JSON::ParserError => e
+            object = Chef::JSONCompat.parse(file_contents, :create_additions => false)
+          rescue Chef::Exceptions::JSON::ParseError => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Parse error reading JSON creating child '#{name}': #{e}"
           end
 

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

@@ -19,6 +19,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/json_compat'
 require 'chef/role'
 require 'chef/node'
 
@@ -128,8 +129,8 @@ class Chef
           value = minimize_value(value)
           value_json = Chef::JSONCompat.to_json_pretty(value)
           begin
-            other_value = JSON.parse(other_value_json, :create_additions => false)
-          rescue JSON::ParserError => e
+            other_value = Chef::JSONCompat.parse(other_value_json, :create_additions => false)
+          rescue Chef::Exceptions::JSON::ParseError => e
             Chef::Log.warn("Parse error reading #{other.path_for_printing} as JSON: #{e}")
             return [ nil, value_json, other_value_json ]
           end
@@ -145,8 +146,8 @@ class Chef
 
         def write(file_contents)
           begin
-            object = JSON.parse(file_contents, :create_additions => false)
-          rescue JSON::ParserError => e
+            object = Chef::JSONCompat.parse(file_contents, :create_additions => false)
+          rescue Chef::Exceptions::JSON::ParseError => e
             raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e), "Parse error reading JSON: #{e}"
           end
 

data/lib/chef/config_fetcher.rb

@@ -18,7 +18,7 @@ class Chef
       config_data = read_config
       begin
         Chef::JSONCompat.from_json(config_data)
-      rescue FFI_Yajl::ParseError => error
+      rescue Chef::Exceptions::JSON::ParseError => error
         Chef::Application.fatal!("Could not parse the provided JSON file (#{config_location}): " + error.message, 2)
       end
     end

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -170,7 +170,7 @@ class Chef
       def apply_ruby_metadata(file)
         begin
           @metadata.from_file(file)
-        rescue JSON::ParserError
+        rescue Chef::Exceptions::JSON::ParseError
           Chef::Log.error("Error evaluating metadata.rb for #@cookbook_name in " + file)
           raise
         end
@@ -179,7 +179,7 @@ class Chef
       def apply_json_metadata(file)
         begin
           @metadata.from_json(IO.read(file))
-        rescue JSON::ParserError
+        rescue Chef::Exceptions::JSON::ParseError
           Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in " + file)
           raise
         end
@@ -189,7 +189,7 @@ class Chef
         begin
           data = Chef::JSONCompat.from_json(IO.read(file), :create_additions => false)
           @metadata.from_hash(data['metadata'])
-        rescue JSON::ParserError
+        rescue Chef::Exceptions::JSON::ParseError
           Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in " + file)
           raise
         end
@@ -200,7 +200,7 @@ class Chef
           begin
             data = Chef::JSONCompat.from_json(IO.read(uploaded_cookbook_version_file), :create_additions => false)
             @frozen = data['frozen?']
-          rescue JSON::ParserError
+          rescue Chef::Exceptions::JSON::ParseError
             Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in #{uploaded_cookbook_version_file}")
             raise
           end

data/lib/chef/cookbook/metadata.rb

@@ -441,7 +441,7 @@ class Chef
       end
 
       def to_json(*a)
-        self.to_hash.to_json(*a)
+        Chef::JSONCompat.to_json(self.to_hash, *a)
       end
 
       def self.from_hash(o)

data/lib/chef/cookbook_version.rb

@@ -459,7 +459,7 @@ class Chef
     def to_json(*a)
       result = self.to_hash
       result['json_class'] = self.class.name
-      result.to_json(*a)
+      Chef::JSONCompat.to_json(result, *a)
     end
 
     def self.json_create(o)
@@ -469,7 +469,7 @@ class Chef
       cookbook_version.manifest = o
 
       # We don't need the following step when we decide to stop supporting deprecated operators in the metadata (e.g. <<, >>)
-      cookbook_version.manifest["metadata"] = Chef::JSONCompat.from_json(cookbook_version.metadata.to_json)
+      cookbook_version.manifest["metadata"] = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(cookbook_version.metadata))
 
       cookbook_version.freeze_version if o["frozen?"]
       cookbook_version

data/lib/chef/data_bag.rb

@@ -63,7 +63,7 @@ class Chef
 
     # Serialize this object as a hash
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def chef_server_rest

data/lib/chef/data_bag_item.rb

@@ -118,7 +118,7 @@ class Chef
         "data_bag" => self.data_bag,
         "raw_data" => self.raw_data
       }
-      result.to_json(*a)
+      Chef::JSONCompat.to_json(result, *a)
     end
 
     def self.from_hash(h)

data/lib/chef/encrypted_data_bag_item/decryptor.rb

@@ -17,10 +17,10 @@
 #
 
 require 'yaml'
-require 'ffi_yajl'
 require 'openssl'
 require 'base64'
 require 'digest/sha2'
+require 'chef/json_compat'
 require 'chef/encrypted_data_bag_item'
 require 'chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format'
 require 'chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format'
@@ -121,8 +121,8 @@ class Chef::EncryptedDataBagItem
       end
 
       def for_decrypted_item
-        FFI_Yajl::Parser.parse(decrypted_data)["json_wrapper"]
-      rescue FFI_Yajl::ParseError
+        Chef::JSONCompat.parse(decrypted_data)["json_wrapper"]
+      rescue Chef::Exceptions::JSON::ParseError
         # convert to a DecryptionFailure error because the most likely scenario
         # here is that the decryption step was unsuccessful but returned bad
         # data rather than raising an error.

data/lib/chef/environment.rb

@@ -129,7 +129,7 @@ class Chef
     end
 
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def update_from!(o)

data/lib/chef/exceptions.rb

@@ -134,6 +134,17 @@ class Chef
     # Version constraints are not allowed in chef-solo
     class IllegalVersionConstraint < NotImplementedError; end
 
+    class MetadataNotValid < StandardError; end
+    class MetadataNotFound < StandardError
+      attr_reader :install_path
+      attr_reader :cookbook_name
+      def initialize(install_path, cookbook_name)
+        @install_path = install_path
+        @cookbook_name = cookbook_name
+        super "No metadata.rb or metadata.json found for cookbook #{@cookbook_name} in #{@install_path}"
+      end
+    end
+
     # File operation attempted but no permissions to perform it
     class InsufficientPermissions < RuntimeError; end
 
@@ -267,7 +278,7 @@ class Chef
             "non_existent_cookbooks" => non_existent_cookbooks,
             "cookbooks_with_no_versions" => cookbooks_with_no_matching_versions
           }
-          result.to_json(*a)
+          Chef::JSONCompat.to_json(result, *a)
         end
       end
 
@@ -302,7 +313,7 @@ class Chef
             "non_existent_cookbooks" => non_existent_cookbooks,
             "most_constrained_cookbooks" => most_constrained_cookbooks
           }
-          result.to_json(*a)
+          Chef::JSONCompat.to_json(result, *a)
         end
       end
 
@@ -337,5 +348,11 @@ class Chef
     end
 
     class BadProxyURI < RuntimeError; end
+
+    # Raised by Chef::JSONCompat
+    class JSON
+      class EncodeError < RuntimeError; end
+      class ParseError < RuntimeError; end
+    end
   end
 end

data/lib/chef/json_compat.rb

@@ -18,7 +18,9 @@
 # Wrapper class for interacting with JSON.
 
 require 'ffi_yajl'
-require 'ffi_yajl/json_gem'  # XXX: parts of chef require JSON gem's Hash#to_json monkeypatch
+require 'chef/exceptions'
+# We're requiring this to prevent breaking consumers using Hash.to_json
+require 'json'
 
 class Chef
   class JSONCompat
@@ -40,15 +42,24 @@ class Chef
 
     class <<self
 
+      # API to use to avoid create_addtions
+      def parse(source, opts = {})
+        begin
+          FFI_Yajl::Parser.parse(source, opts)
+        rescue FFI_Yajl::ParseError => e
+          raise Chef::Exceptions::JSON::ParseError, e.message
+        end
+      end
+
       # Just call the JSON gem's parse method with a modified :max_nesting field
       def from_json(source, opts = {})
-        obj = ::FFI_Yajl::Parser.parse(source)
+        obj = parse(source, opts)
 
         # JSON gem requires top level object to be a Hash or Array (otherwise
         # you get the "must contain two octets" error). Yajl doesn't impose the
         # same limitation. For compatibility, we re-impose this condition.
         unless obj.kind_of?(Hash) or obj.kind_of?(Array)
-          raise JSON::ParserError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
+          raise Chef::Exceptions::JSON::ParseError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
         end
 
         # The old default in the json gem (which we are mimicing because we
@@ -66,17 +77,17 @@ class Chef
       # to an instance of Chef classes if desired.
       def map_to_rb_obj(json_obj)
         case json_obj
-        when Hash
-          mapped_hash = map_hash_to_rb_obj(json_obj)
-          if json_obj.has_key?(JSON_CLASS) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLASS]))
-            class_to_inflate.json_create(mapped_hash)
+          when Hash
+            mapped_hash = map_hash_to_rb_obj(json_obj)
+            if json_obj.has_key?(JSON_CLASS) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLASS]))
+              class_to_inflate.json_create(mapped_hash)
+            else
+              mapped_hash
+            end
+          when Array
+            json_obj.map {|e| map_to_rb_obj(e) }
           else
-            mapped_hash
-          end
-        when Array
-          json_obj.map {|e| map_to_rb_obj(e) }
-        else
-          json_obj
+            json_obj
         end
       end
 
@@ -88,52 +99,60 @@ class Chef
       end
 
       def to_json(obj, opts = nil)
-        obj.to_json(opts)
+        begin
+          FFI_Yajl::Encoder.encode(obj, opts)
+        rescue FFI_Yajl::EncodeError => e
+          raise Chef::Exceptions::JSON::EncodeError, e.message
+        end
       end
 
       def to_json_pretty(obj, opts = nil)
-        ::JSON.pretty_generate(obj, opts)
+        opts ||= {}
+        options_map = {}
+        options_map[:pretty] = true
+        options_map[:indent] = opts[:indent] if opts.has_key?(:indent)
+        to_json(obj, options_map).chomp
       end
 
-
       # Map +json_class+ to a Class object. We use a +case+ instead of a Hash
       # assigned to a constant because otherwise this file could not be loaded
       # until all the constants were defined, which means you'd have to load
       # the world to get json, which would make knife very slow.
       def class_for_json_class(json_class)
         case json_class
-        when CHEF_APICLIENT
-          Chef::ApiClient
-        when CHEF_CHECKSUM
-          Chef::Checksum
-        when CHEF_COOKBOOKVERSION
-          Chef::CookbookVersion
-        when CHEF_DATABAG
-          Chef::DataBag
-        when CHEF_DATABAGITEM
-          Chef::DataBagItem
-        when CHEF_ENVIRONMENT
-          Chef::Environment
-        when CHEF_NODE
-          Chef::Node
-        when CHEF_ROLE
-          Chef::Role
-        when CHEF_SANDBOX
-          # a falsey return here will disable object inflation/"create
-          # additions" in the caller. In Chef 11 this is correct, we just have
-          # a dummy Chef::Sandbox class for compat with Chef 10 servers.
-          false
-        when CHEF_RESOURCE
-          Chef::Resource
-        when CHEF_RESOURCECOLLECTION
-          Chef::ResourceCollection
-        when /^Chef::Resource/
-          Chef::Resource.find_subclass_by_name(json_class)
-        else
-          raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
+          when CHEF_APICLIENT
+            Chef::ApiClient
+          when CHEF_CHECKSUM
+            Chef::Checksum
+          when CHEF_COOKBOOKVERSION
+            Chef::CookbookVersion
+          when CHEF_DATABAG
+            Chef::DataBag
+          when CHEF_DATABAGITEM
+            Chef::DataBagItem
+          when CHEF_ENVIRONMENT
+            Chef::Environment
+          when CHEF_NODE
+            Chef::Node
+          when CHEF_ROLE
+            Chef::Role
+          when CHEF_SANDBOX
+            # a falsey return here will disable object inflation/"create
+            # additions" in the caller. In Chef 11 this is correct, we just have
+            # a dummy Chef::Sandbox class for compat with Chef 10 servers.
+            false
+          when CHEF_RESOURCE
+            Chef::Resource
+          when CHEF_RESOURCECOLLECTION
+            Chef::ResourceCollection
+          when /^Chef::Resource/
+            Chef::Resource.find_subclass_by_name(json_class)
+          else
+            raise Chef::Exceptions::JSON::ParseError, "Unsupported `json_class` type '#{json_class}'"
         end
       end
 
     end
   end
 end
+