chef 11.18.12 → 12.0.0.alpha.0

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
-        Chef::JSONCompat.parse(decrypted_data)["json_wrapper"]
-      rescue Chef::Exceptions::JSON::ParseError
+        FFI_Yajl::Parser.parse(decrypted_data)["json_wrapper"]
+      rescue FFI_Yajl::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)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      to_hash.to_json(*a)
     end
 
     def update_from!(o)

data/lib/chef/exceptions.rb

@@ -83,7 +83,6 @@ class Chef
     class RequestedUIDUnavailable < RuntimeError; end
     class InvalidHomeDirectory < ArgumentError; end
     class DsclCommandFailed < RuntimeError; end
-    class PlistUtilCommandFailed < RuntimeError; end
     class UserIDNotFound < ArgumentError; end
     class GroupIDNotFound < ArgumentError; end
     class ConflictingMembersInGroup < ArgumentError; end
@@ -117,8 +116,6 @@ class Chef
     class ObsoleteDependencySyntax < ArgumentError; end
     class InvalidDataBagPath < ArgumentError; end
 
-    class PowershellCmdletException < RuntimeError; end
-
     # A different version of a cookbook was added to a
     # VersionedRecipeList than the one already there.
     class CookbookVersionConflict < ArgumentError ; end
@@ -134,17 +131,6 @@ 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
 
@@ -189,8 +175,6 @@ class Chef
 
     class ChildConvergeError < RuntimeError; end
 
-    class NoProviderAvailable < RuntimeError; end
-
     class MissingRole < RuntimeError
       NULL = Object.new
 
@@ -278,7 +262,7 @@ class Chef
             "non_existent_cookbooks" => non_existent_cookbooks,
             "cookbooks_with_no_versions" => cookbooks_with_no_matching_versions
           }
-          Chef::JSONCompat.to_json(result, *a)
+          result.to_json(*a)
         end
       end
 
@@ -313,7 +297,7 @@ class Chef
             "non_existent_cookbooks" => non_existent_cookbooks,
             "most_constrained_cookbooks" => most_constrained_cookbooks
           }
-          Chef::JSONCompat.to_json(result, *a)
+          result.to_json(*a)
         end
       end
 
@@ -348,11 +332,5 @@ 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/file_content_management/tempfile.rb

@@ -54,7 +54,14 @@ class Chef
       end
 
       def tempfile_dirname
-        Chef::Config[:file_staging_uses_destdir] ? ::File.dirname(@new_resource.path) : Dir::tmpdir
+        # in why-run mode we need to create a Tempfile to compare against, which we will never
+        # wind up deploying, but our enclosing directory for the destdir may not exist yet, so
+        # instead we can reliably always create a Tempfile to compare against in Dir::tmpdir
+        if Chef::Config[:file_staging_uses_destdir] && !Chef::Config[:why_run]
+          ::File.dirname(@new_resource.path)
+        else
+          Dir::tmpdir
+        end
       end
     end
   end

data/lib/chef/formatters/base.rb

@@ -93,13 +93,6 @@ class Chef
 
       def indent_by(amount)
         @output.indent += amount
-        if @output.indent < 0
-          # This is left commented out for now.  We need to uncomment it and fix at least one bug in
-          # the formatter, and then leave this line uncommented in the future.
-          #Chef::Log.warn "Internal Formatter Error -- Attempt to indent by negative number of spaces"
-          @output.indent = 0
-        end
-        @output.indent
       end
 
       # Input: a Formatters::ErrorDescription object.

data/lib/chef/http.rb

@@ -289,26 +289,11 @@ class Chef
     def retrying_http_errors(url)
       http_attempts = 0
       begin
-        loop do
-          http_attempts += 1
-          response, request, return_value = yield
-          # handle HTTP 50X Error
-          if response.kind_of?(Net::HTTPServerError)
-            if http_retry_count - http_attempts + 1 > 0
-              sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
-              Chef::Log.error("Server returned error #{response.code} for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
-              sleep(sleep_time)
-              redo
-            end
-          end
-          return [response, request, return_value]
-        end
+        http_attempts += 1
+
+        yield
+
       rescue SocketError, Errno::ETIMEDOUT => e
-        if http_retry_count - http_attempts + 1 > 0
-          Chef::Log.error("Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}")
-          sleep(http_retry_delay)
-          retry
-        end
         e.message.replace "Error connecting to #{url} - #{e.message}"
         raise e
       rescue Errno::ECONNREFUSED
@@ -325,6 +310,14 @@ class Chef
           retry
         end
         raise Timeout::Error, "Timeout connecting to #{url}, giving up"
+      rescue Net::HTTPFatalError => e
+        if http_retry_count - http_attempts + 1 > 0
+          sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
+          Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
+          sleep(sleep_time)
+          retry
+        end
+        raise
       end
     end
 

data/lib/chef/http/json_input.rb

@@ -29,7 +29,8 @@ class Chef
       end
 
       def handle_request(method, url, headers={}, data=false)
-        if data
+        if data && should_encode_as_json?(headers)
+          headers.delete_if { |key, _value| key.downcase == 'content-type' }
           headers["Content-Type"] = 'application/json'
           data = Chef::JSONCompat.to_json(data)
           # Force encoding to binary to fix SSL related EOFErrors
@@ -52,6 +53,16 @@ class Chef
         [http_response, rest_request, return_value]
       end
 
+      private
+
+      def should_encode_as_json?(headers)
+        # ruby/Net::HTTP don't enforce capitalized headers (it normalizes them
+        # for you before sending the request), so we have to account for all
+        # the variations we might find
+        requested_content_type = headers.find {|k, v| k.downcase == "content-type" }
+        requested_content_type.nil? || requested_content_type.last.include?("json")
+      end
+
     end
   end
 end

data/lib/chef/json_compat.rb

@@ -18,9 +18,7 @@
 # Wrapper class for interacting with JSON.
 
 require 'ffi_yajl'
-require 'chef/exceptions'
-# We're requiring this to prevent breaking consumers using Hash.to_json
-require 'json'
+require 'ffi_yajl/json_gem'  # XXX: parts of chef require JSON gem's Hash#to_json monkeypatch
 
 class Chef
   class JSONCompat
@@ -42,24 +40,15 @@ 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 = parse(source, opts)
+        obj = ::FFI_Yajl::Parser.parse(source)
 
         # 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 Chef::Exceptions::JSON::ParseError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
+          raise JSON::ParserError, "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
@@ -77,17 +66,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)
-            else
-              mapped_hash
-            end
-          when Array
-            json_obj.map {|e| map_to_rb_obj(e) }
+        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
-            json_obj
+            mapped_hash
+          end
+        when Array
+          json_obj.map {|e| map_to_rb_obj(e) }
+        else
+          json_obj
         end
       end
 
@@ -99,60 +88,52 @@ class Chef
       end
 
       def to_json(obj, opts = nil)
-        begin
-          FFI_Yajl::Encoder.encode(obj, opts)
-        rescue FFI_Yajl::EncodeError => e
-          raise Chef::Exceptions::JSON::EncodeError, e.message
-        end
+        obj.to_json(opts)
       end
 
       def to_json_pretty(obj, opts = nil)
-        opts ||= {}
-        options_map = {}
-        options_map[:pretty] = true
-        options_map[:indent] = opts[:indent] if opts.has_key?(:indent)
-        to_json(obj, options_map).chomp
+        ::JSON.pretty_generate(obj, opts)
       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 Chef::Exceptions::JSON::ParseError, "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 JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end
       end
 
     end
   end
 end
-

data/lib/chef/knife.rb

@@ -25,6 +25,7 @@ require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/path_sanity'
 require 'chef/knife/core/subcommand_loader'
 require 'chef/knife/core/ui'
+require 'chef/local_mode'
 require 'chef/rest'
 require 'pp'
 
@@ -488,11 +489,8 @@ class Chef
         ui.error "You need to add a #run method to your knife command before you can use it"
       end
       enforce_path_sanity
-      Chef::Application.setup_server_connectivity
-      begin
+      Chef::LocalMode.with_server_connectivity do
         run
-      ensure
-        Chef::Application.destroy_server_connectivity
       end
     rescue Exception => e
       raise if raise_exception || Chef::Config[:verbosity] == 2
@@ -625,4 +623,3 @@ class Chef
 
   end
 end
-

data/lib/chef/knife/bootstrap.rb

@@ -126,7 +126,7 @@ class Chef
         :short => "-j JSON_ATTRIBS",
         :long => "--json-attributes",
         :description => "A JSON string to be added to the first run of chef-client",
-        :proc => lambda { |o| Chef::JSONCompat.parse(o) },
+        :proc => lambda { |o| JSON.parse(o) },
         :default => {}
 
       option :host_key_verify,
@@ -141,7 +141,7 @@ class Chef
         :proc => Proc.new { |h|
           Chef::Config[:knife][:hints] ||= Hash.new
           name, path = h.split("=")
-          Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new  }
+          Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new  }
 
       option :secret,
         :short => "-s SECRET",

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -29,7 +29,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -56,7 +56,7 @@ https_proxy        "<%= knife_config[:bootstrap_proxy] %>"
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -46,7 +46,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -56,7 +56,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'