chef 12.18.31 → 13.0.118

data/lib/chef/resource_collection/resource_set.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,10 @@ class Chef
 
       # Matches a single resource lookup specification,
       # e.g., "service[nginx]"
-      SINGLE_RESOURCE_MATCH = /^(.+)\[(.+)\]$/
+      SINGLE_RESOURCE_MATCH = /^(.+)\[(.*)\]$/
+
+      # Matches e.g. "apt_update" with no name
+      NAMELESS_RESOURCE_MATCH = /^([^\[\]\s]+)$/
 
       def initialize
         @resources_by_key = Hash.new
@@ -118,7 +121,7 @@ class Chef
         case query_object
           when Chef::Resource
             true
-          when SINGLE_RESOURCE_MATCH, MULTIPLE_RESOURCE_MATCH
+          when SINGLE_RESOURCE_MATCH, MULTIPLE_RESOURCE_MATCH, NAMELESS_RESOURCE_MATCH
             true
           when Hash
             true
@@ -132,6 +135,14 @@ class Chef
         end
       end
 
+      def self.from_hash(o)
+        collection = new()
+        rl = o["instance_vars"]["@resources_by_key"]
+        resources = rl.merge(rl) { |k, r| Chef::Resource.from_hash(r) }
+        collection.instance_variable_set(:@resources_by_key, resources)
+        collection
+      end
+
       private
 
       def create_key(resource_type, instance_name)
@@ -146,27 +157,43 @@ class Chef
             results << lookup(create_key(resource_type, instance_name))
           end
         end
-        return results
+        results
       end
 
       def find_resource_by_string(arg)
-        results = Array.new
-        case arg
-          when MULTIPLE_RESOURCE_MATCH
-            resource_type = $1
-            arg =~ /^.+\[(.+)\]$/
-            resource_list = $1
-            resource_list.split(",").each do |instance_name|
-              results << lookup(create_key(resource_type, instance_name))
-            end
-          when SINGLE_RESOURCE_MATCH
+        begin
+          if arg =~ SINGLE_RESOURCE_MATCH
             resource_type = $1
             name = $2
-            results << lookup(create_key(resource_type, name))
+            return [ lookup(create_key(resource_type, name)) ]
+          end
+        rescue Chef::Exceptions::ResourceNotFound => e
+          if arg =~ MULTIPLE_RESOURCE_MATCH
+            begin
+              results = Array.new
+              resource_type = $1
+              arg =~ /^.+\[(.+)\]$/
+              resource_list = $1
+              resource_list.split(",").each do |instance_name|
+                results << lookup(create_key(resource_type, instance_name))
+              end
+              Chef.deprecated(:multiresource_match, "The resource_collection multi-resource syntax is deprecated")
+              return results
+            rescue  Chef::Exceptions::ResourceNotFound
+              raise e
+            end
           else
-            raise ArgumentError, "Bad string format #{arg}, you must have a string like resource_type[name]!"
+            raise e
+          end
         end
-        return results
+
+        if arg =~ NAMELESS_RESOURCE_MATCH
+          resource_type = $1
+          name = ""
+          return [ lookup(create_key(resource_type, name)) ]
+        end
+
+        raise ArgumentError, "Bad string format #{arg}, you must have a string like resource_type[name]!"
       end
     end
   end

data/lib/chef/resource_collection.rb

@@ -117,6 +117,16 @@ class Chef
       end
     end
 
+    def self.from_hash(o)
+      collection = new()
+      { "@resource_list" => "ResourceList", "@resource_set" => "ResourceSet" }.each_pair do |name, klass|
+        obj = Chef::ResourceCollection.const_get(klass).from_hash(o["instance_vars"].delete(name))
+        collection.instance_variable_set(name.to_sym, obj)
+      end
+      collection.instance_variable_set(:@run_context, o["instance_vars"].delete("@run_context"))
+      collection
+    end
+
     private
 
     def lookup_recursive(rc, key)

data/lib/chef/resource_reporter.rb

@@ -87,7 +87,7 @@ class Chef
       end
 
       def success?
-        !self.exception
+        !exception
       end
     end # End class ResouceReport
 

data/lib/chef/resource_resolver.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,11 +54,6 @@ class Chef
     # @api private
     attr_reader :resource_name
     # @api private
-    def resource
-      Chef.deprecated(:custom_resource, "Chef::ResourceResolver.resource deprecated.  Use resource_name instead.")
-      resource_name
-    end
-    # @api private
     attr_reader :action
     # @api private
     attr_reader :canonical
@@ -161,24 +156,5 @@ class Chef
     def overrode_provides?(handler)
       handler.method(:provides?).owner != Chef::Resource.method(:provides?).owner
     end
-
-    module Deprecated
-      # return a deterministically sorted list of Chef::Resource subclasses
-      def resources
-        Chef::Resource.sorted_descendants
-      end
-
-      def enabled_handlers
-        handlers = super
-        if handlers.empty?
-          handlers = resources.select { |handler| overrode_provides?(handler) && handler.provides?(node, resource_name) }
-          handlers.each do |handler|
-            Chef.deprecated(:custom_resource, "#{handler}.provides? returned true when asked if it provides DSL #{resource_name}, but provides #{resource_name.inspect} was never called! In Chef 13, this will break: you must call provides to mark the names you provide, even if you also override provides? yourself.")
-          end
-        end
-        handlers
-      end
-    end
-    prepend Deprecated
   end
 end

data/lib/chef/resources.rb

@@ -34,7 +34,6 @@ require "chef/resource/dpkg_package"
 require "chef/resource/dnf_package"
 require "chef/resource/dsc_script"
 require "chef/resource/dsc_resource"
-require "chef/resource/easy_install_package"
 require "chef/resource/env"
 require "chef/resource/erl_call"
 require "chef/resource/execute"
@@ -99,3 +98,4 @@ require "chef/resource/zypper_package"
 require "chef/resource/cab_package"
 require "chef/resource/powershell_package"
 require "chef/resource/msu_package"
+require "chef/resource/windows_task"

data/lib/chef/role.rb

@@ -168,12 +168,6 @@ class Chef
       self
     end
 
-    # Create a Chef::Role from JSON
-    def self.json_create(o)
-      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::Role#from_hash")
-      from_hash(o)
-    end
-
     def self.from_hash(o)
       role = new
       role.name(o["name"])

data/lib/chef/run_context/cookbook_compiler.rb

@@ -57,6 +57,7 @@ class Chef
 
       # Run the compile phase of the chef run. Loads files in the following order:
       # * Libraries
+      # * Ohai
       # * Attributes
       # * LWRPs
       # * Resource Definitions
@@ -69,6 +70,7 @@ class Chef
       # #cookbook_order for more information.
       def compile
         compile_libraries
+        compile_ohai_plugins
         compile_attributes
         compile_lwrps
         compile_resource_definitions
@@ -101,11 +103,31 @@ class Chef
         @events.library_load_complete
       end
 
+      # Loads Ohai Plugins from cookbooks, and ensure any old ones are
+      # properly cleaned out
+      def compile_ohai_plugins
+        ohai_plugin_count = count_files_by_segment(:ohai)
+        @events.ohai_plugin_load_start(ohai_plugin_count)
+        FileUtils.rm_rf(Chef::Config[:ohai_segment_plugin_path])
+
+        cookbook_order.each do |cookbook|
+          load_ohai_plugins_from_cookbook(cookbook)
+        end
+
+        # Doing a full ohai system check is costly, so only do so if we've loaded additional plugins
+        if ohai_plugin_count > 0
+          ohai = Ohai::System.new.run_additional_plugins(Chef::Config[:ohai_segment_plugin_path])
+          node.consume_ohai_data(ohai)
+        end
+
+        @events.ohai_plugin_load_complete
+      end
+
       # Loads attributes files from cookbooks. Attributes files are loaded
       # according to #cookbook_order; within a cookbook, +default.rb+ is loaded
       # first, then the remaining attributes files in lexical sort order.
       def compile_attributes
-        @events.attribute_load_start(count_files_by_segment(:attributes))
+        @events.attribute_load_start(count_files_by_segment(:attributes, "attributes.rb"))
         cookbook_order.each do |cookbook|
           load_attributes_from_cookbook(cookbook)
         end
@@ -166,7 +188,16 @@ class Chef
 
       def load_attributes_from_cookbook(cookbook_name)
         list_of_attr_files = files_in_cookbook_by_segment(cookbook_name, :attributes).dup
-        if default_file = list_of_attr_files.find { |path| File.basename(path) == "default.rb" }
+        root_alias = cookbook_collection[cookbook_name].files_for(:root_files).find { |record| record[:name] == "attributes.rb" }
+        default_file = list_of_attr_files.find { |path| File.basename(path) == "default.rb" }
+        if root_alias
+          if default_file
+            Chef::Log.error("Cookbook #{cookbook_name} contains both attributes.rb and and attributes/default.rb, ignoring attributes/default.rb")
+            list_of_attr_files.delete(default_file)
+          end
+          # The actual root_alias path decoding is handled in CookbookVersion#attribute_filenames_by_short_filename
+          load_attribute_file(cookbook_name.to_s, "default")
+        elsif default_file
           list_of_attr_files.delete(default_file)
           load_attribute_file(cookbook_name.to_s, default_file)
         end
@@ -226,6 +257,19 @@ class Chef
         raise
       end
 
+      def load_ohai_plugins_from_cookbook(cookbook_name)
+        target = Chef::Config[:ohai_segment_plugin_path]
+        files_in_cookbook_by_segment(cookbook_name, :ohai).each do |filename|
+          next unless File.extname(filename) == ".rb"
+
+          Chef::Log.debug "Loading Ohai plugin: #{filename} from #{cookbook_name}"
+          target_name = File.join(target, cookbook_name.to_s, File.basename(filename))
+
+          FileUtils.mkdir_p(File.dirname(target_name))
+          FileUtils.cp(filename, target_name)
+        end
+      end
+
       def load_resource_definitions_from_cookbook(cookbook_name)
         files_in_cookbook_by_segment(cookbook_name, :definitions).each do |filename|
           begin
@@ -259,16 +303,16 @@ class Chef
         ordered_cookbooks << cookbook
       end
 
-      def count_files_by_segment(segment)
+      def count_files_by_segment(segment, root_alias = nil)
         cookbook_collection.inject(0) do |count, cookbook_by_name|
-          count + cookbook_by_name[1].segment_filenames(segment).size
+          count + cookbook_by_name[1].segment_filenames(segment).size + (root_alias ? cookbook_by_name[1].files_for(:root_files).select { |record| record[:name] == root_alias }.size : 0)
         end
       end
 
       # Lists the local paths to files in +cookbook+ of type +segment+
       # (attribute, recipe, etc.), sorted lexically.
       def files_in_cookbook_by_segment(cookbook, segment)
-        cookbook_collection[cookbook].segment_filenames(segment).sort
+        cookbook_collection[cookbook].files_for(segment).map { |record| record[:full_path] }.sort
       end
 
       # Yields the name, as a symbol, of each cookbook depended on by

data/lib/chef/run_context.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
 # Author:: Tim Hinderliter (<tim@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -253,7 +253,7 @@ class Chef
     # @return [Array[Notification]]
     #
     def before_notifications(resource)
-      return before_notification_collection[resource.declared_key]
+      before_notification_collection[resource.declared_key]
     end
 
     #
@@ -262,7 +262,7 @@ class Chef
     # @return [Array[Notification]]
     #
     def immediate_notifications(resource)
-      return immediate_notification_collection[resource.declared_key]
+      immediate_notification_collection[resource.declared_key]
     end
 
     #
@@ -272,7 +272,7 @@ class Chef
     # @return [Array[Notification]]
     #
     def delayed_notifications(resource)
-      return delayed_notification_collection[resource.declared_key]
+      delayed_notification_collection[resource.declared_key]
     end
 
     #
@@ -576,27 +576,6 @@ ERROR_MESSAGE
     attr_reader :loaded_attributes_hash
     attr_reader :loaded_recipes_hash
 
-    module Deprecated
-      ###
-      # These need to be settable so deploy can run a resource_collection
-      # independent of any cookbooks via +recipe_eval+
-      def audits=(value)
-        Chef.deprecated(:internal_api, "Setting run_context.audits will be removed in a future Chef.  Use run_context.create_child to create a new RunContext instead.")
-        @audits = value
-      end
-
-      def immediate_notification_collection=(value)
-        Chef.deprecated(:internal_api, "Setting run_context.immediate_notification_collection will be removed in a future Chef.  Use run_context.create_child to create a new RunContext instead.")
-        @immediate_notification_collection = value
-      end
-
-      def delayed_notification_collection=(value)
-        Chef.deprecated(:internal_api, "Setting run_context.delayed_notification_collection will be removed in a future Chef.  Use run_context.create_child to create a new RunContext instead.")
-        @delayed_notification_collection = value
-      end
-    end
-    prepend Deprecated
-
     #
     # A child run context.  Delegates all root context calls to its parent.
     #

data/lib/chef/run_list/run_list_item.rb

@@ -81,7 +81,7 @@ class Chef
 
       def ==(other)
         if other.kind_of?(String)
-          self.to_s == other.to_s
+          to_s == other.to_s
         else
           other.respond_to?(:type) && other.respond_to?(:name) && other.respond_to?(:version) && other.type == @type && other.name == @name && other.version == @version
         end

data/lib/chef/run_list/versioned_recipe_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Stephen Delano (<stephen@chef.io>)
 # Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software, Inc.
+# Copyright:: Copyright 2010-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,17 +36,17 @@ class Chef
           end
         end
         @versions[name] = version if version
-        self << name unless self.include?(name)
+        self << name unless include?(name)
       end
 
       def with_versions
-        self.map { |recipe_name| { :name => recipe_name, :version => @versions[recipe_name] } }
+        map { |recipe_name| { :name => recipe_name, :version => @versions[recipe_name] } }
       end
 
       # Return an Array of Hashes, each of the form:
       #  {:name => RECIPE_NAME, :version_constraint => Chef::VersionConstraint }
       def with_version_constraints
-        self.map do |recipe_name|
+        map do |recipe_name|
           constraint = Chef::VersionConstraint.new(@versions[recipe_name])
           { :name => recipe_name, :version_constraint => constraint }
         end
@@ -55,7 +55,7 @@ class Chef
       # Return an Array of Strings, each of the form:
       #  "NAME@VERSION"
       def with_version_constraints_strings
-        self.map do |recipe_name|
+        map do |recipe_name|
           if @versions[recipe_name]
             "#{recipe_name}@#{@versions[recipe_name]}"
           else
@@ -69,7 +69,7 @@ class Chef
       #
       # @return [Array] Array of strings with fully-qualified recipe names
       def with_fully_qualified_names_and_version_constraints
-        self.map do |recipe_name|
+        map do |recipe_name|
           qualified_recipe = if recipe_name.include?("::")
                                recipe_name
                              else
@@ -83,17 +83,19 @@ class Chef
         end
       end
 
-      # Get an array of strings of both fully-qualified and unexpanded recipe names
-      # in response to chef/chef#3767
-      # Chef-13 will revert to the behaviour of just including the fully-qualified name
+      # For "foo::default" also include "foo", for "foo" also include "foo::default", for
+      # "foo::bar" just return "foo::bar".  This makes it easier for people to search on
+      # default recipe names.
       #
       # @return [Array] Array of strings with fully-qualified and unexpanded recipe names
       def with_duplicate_names
-        self.map do |recipe_name|
-          if recipe_name.include?("::")
+        map do |recipe_name|
+          if recipe_name.end_with?("::default")
+            [ recipe_name.sub(/::default$/, ""), recipe_name ]
+          elsif recipe_name.include?("::")
             recipe_name
           else
-            [recipe_name, "#{recipe_name}::default"]
+            [ recipe_name, "#{recipe_name}::default" ]
           end
         end.flatten
       end

data/lib/chef/search/query.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,28 +39,6 @@ class Chef
         @rest ||= Chef::ServerAPI.new(@url || @config[:chef_server_url])
       end
 
-      # Backwards compatability for cookbooks.
-      # This can be removed in Chef > 12.
-      def partial_search(type, query = "*:*", *args, &block)
-        Chef::Log.warn(<<-WARNDEP)
-DEPRECATED: The 'partial_search' API is deprecated and will be removed in
-future releases. Please use 'search' with a :filter_result argument to get
-partial search data.
-WARNDEP
-
-        if !args.empty? && args.first.is_a?(Hash)
-          # partial_search uses :keys instead of :filter_result for
-          # result filtering.
-          args_h = args.first.dup
-          args_h[:filter_result] = args_h[:keys]
-          args_h.delete(:keys)
-
-          search(type, query, args_h, &block)
-        else
-          search(type, query, *args, &block)
-        end
-      end
-
       #
       # New search input, designed to be backwards compatible with the old method signature
       # 'type' and 'query' are the same as before, args now will accept either a Hash of
@@ -85,6 +63,14 @@ WARNDEP
         validate_type(type)
 
         args_h = hashify_args(*args)
+        if args_h[:fuzz]
+          if type == :node
+            query = fuzzify_node_query(query)
+          end
+          # FIXME: can i haz proper ruby-2.x named parameters someday plz?
+          args_h = args_h.reject { |k, v| k == :fuzz }
+        end
+
         response = call_rest_service(type, query: query, **args_h)
 
         if block
@@ -114,6 +100,14 @@ WARNDEP
 
       private
 
+      def fuzzify_node_query(query)
+        if query !~ /:/
+          "tags:*#{query}* OR roles:*#{query}* OR fqdn:*#{query}* OR addresses:*#{query}* OR policy_name:*#{query}* OR policy_group:*#{query}*"
+        else
+          query
+        end
+      end
+
       def validate_type(t)
         unless t.kind_of?(String) || t.kind_of?(Symbol)
           msg = "Invalid search object type #{t.inspect} (#{t.class}), must be a String or Symbol." +
@@ -128,10 +122,12 @@ WARNDEP
         return args.first if args.first.is_a?(Hash)
 
         args_h = Hash.new
-        args_h[:sort] = args[0] if args[0]
-        args_h[:start] = args[1] if args[1]
-        args_h[:rows] = args[2]
-        args_h[:filter_result] = args[3]
+        # If we have 4 arguments, the first is the now-removed sort option, so
+        # just ignore it.
+        args.pop(0) if args.length == 4
+        args_h[:start] = args[0] if args[0]
+        args_h[:rows] = args[1]
+        args_h[:filter_result] = args[2]
         args_h
       end
 
@@ -141,16 +137,15 @@ WARNDEP
         s && Addressable::URI.encode_component(s.to_s, QUERY_PARAM_VALUE)
       end
 
-      def create_query_string(type, query, rows, start, sort)
+      def create_query_string(type, query, rows, start)
         qstr = "search/#{type}?q=#{escape_value(query)}"
-        qstr += "&sort=#{escape_value(sort)}" if sort
         qstr += "&start=#{escape_value(start)}" if start
         qstr += "&rows=#{escape_value(rows)}" if rows
         qstr
       end
 
-      def call_rest_service(type, query: "*:*", rows: nil, start: 0, sort: "X_CHEF_id_CHEF_X asc", filter_result: nil)
-        query_string = create_query_string(type, query, rows, start, sort)
+      def call_rest_service(type, query: "*:*", rows: nil, start: 0, filter_result: nil)
+        query_string = create_query_string(type, query, rows, start)
 
         if filter_result
           response = rest.post(query_string, filter_result)

data/lib/chef/server_api.rb

@@ -24,6 +24,7 @@ require "chef/http/json_input"
 require "chef/http/json_output"
 require "chef/http/remote_request_id"
 require "chef/http/validate_content_length"
+require "chef/http/api_versions"
 
 class Chef
   class ServerAPI < Chef::HTTP
@@ -42,6 +43,7 @@ class Chef
     use Chef::HTTP::Decompressor
     use Chef::HTTP::Authenticator
     use Chef::HTTP::RemoteRequestID
+    use Chef::HTTP::APIVersions
 
     # ValidateContentLength should come after Decompressor
     # because the order of middlewares is reversed when handling

data/lib/chef/{resource/easy_install_package.rb → server_api_versions.rb}

@@ -1,6 +1,5 @@
-#
-# Author:: Joe Williams (<joe@joetify.com>)
-# Copyright:: Copyright 2009-2016, Joe Williams
+#--
+# Copyright:: Copyright 2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,17 +15,26 @@
 # limitations under the License.
 #
 
-require "chef/resource/package"
+require "singleton"
 
 class Chef
-  class Resource
-    class EasyInstallPackage < Chef::Resource::Package
-      resource_name :easy_install_package
+  class ServerAPIVersions
+    include Singleton
+
+    def set_versions(versions)
+      @versions ||= versions
+    end
 
-      property :easy_install_binary, String, desired_state: false
-      property :python_binary, String, desired_state: false
-      property :module_name, String, desired_state: false
+    def min_server_version
+      !@versions.nil? ? Integer(@versions["min_version"]) : nil
+    end
+
+    def max_server_version
+      !@versions.nil? ? Integer(@versions["max_version"]) : nil
+    end
 
+    def reset!
+      @versions = nil
     end
   end
 end

data/lib/chef/shell/ext.rb

@@ -73,7 +73,7 @@ module Shell
         banner << "| " + "Command".ljust(25) + "| " + "Description"
         banner << "".ljust(80, "=")
 
-        self.all_help_descriptions.each do |help_text|
+        all_help_descriptions.each do |help_text|
           banner << "| " + help_text.cmd.ljust(25) + "| " + help_text.desc
         end
         banner << "".ljust(80, "=")
@@ -84,7 +84,7 @@ module Shell
       end
 
       def explain_command(method_name)
-        help = self.all_help_descriptions.find { |h| h.cmd.to_s == method_name.to_s }
+        help = all_help_descriptions.find { |h| h.cmd.to_s == method_name.to_s }
         if help
           puts ""
           puts "Command: #{method_name}"
@@ -159,7 +159,7 @@ module Shell
 
     module Symbol
       def on_off_to_bool
-        self.to_s.on_off_to_bool
+        to_s.on_off_to_bool
       end
     end