chef 12.18.31 → 13.0.118

data/lib/chef/deprecated.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright:: Copyright 2016 Chef Software, Inc.
+# Copyright:: Copyright 2016-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,36 +66,38 @@ class Chef
       end
     end
 
-    class JsonAutoInflate < Base
+    class InternalApi < Base
       def id
-        1
+        0
       end
 
       def target
-        "json_auto_inflate.html"
+        "internal_api.html"
       end
     end
 
-    class ExitCode < Base
+    class JsonAutoInflate < Base
       def id
-        2
+        1
       end
 
       def target
-        "exit_code.html"
+        "json_auto_inflate.html"
       end
     end
 
-    class ChefGemCompileTime < Base
+    class ExitCode < Base
       def id
-        3
+        2
       end
 
       def target
-        "chef_gem_compile_time.html"
+        "exit_code.html"
       end
     end
 
+    # id 3 has been deleted
+
     class Attributes < Base
       def id
         4
@@ -156,6 +158,36 @@ class Chef
       end
     end
 
+    class DnfPackageAllowDowngrade < Base
+      def id
+        10
+      end
+
+      def target
+        "dnf_package_allow_downgrade.html"
+      end
+    end
+
+    class PropertyNameCollision < Base
+      def id
+        11
+      end
+
+      def target
+        "property_name_collision.html"
+      end
+    end
+
+    class LaunchdHashProperty < Base
+      def id
+        12
+      end
+
+      def target
+        "launchd_hash_property.html"
+      end
+    end
+
     class ChefPlatformMethods < Base
       def id
         13
@@ -176,36 +208,38 @@ class Chef
       end
     end
 
-    class ResourceCloning < Base
+    class PackageMisc < Base
       def id
-        3694
+        15
       end
 
       def target
-        "resource_cloning.html"
+        "package_misc.html"
       end
     end
 
-    class InternalApi < Base
+    class MultiresourceMatch < Base
       def id
-        0
+        16
       end
 
       def target
-        "internal_api.html"
+        "multiresource_match.html"
       end
     end
 
-    class DnfPackageAllowDowngrade < Base
+    class UseInlineResources < Base
       def id
-        10
+        17
       end
 
       def target
-        "dnf_package_allow_downgrade.html"
+        "use_inline_resources.html"
       end
     end
 
+    # id 3694 was deleted
+
     class Generic < Base
       def url
         "https://docs.chef.io/chef_deprecations_client.html"

data/lib/chef/dsl/audit.rb

@@ -38,8 +38,8 @@ class Chef
         cookbook_name = self.cookbook_name
         metadata = {
             cookbook_name: cookbook_name,
-            cookbook_version: self.run_context.cookbook_collection[cookbook_name].version,
-            recipe_name: self.recipe_name,
+            cookbook_version: run_context.cookbook_collection[cookbook_name].version,
+            recipe_name: recipe_name,
             line_number: block.source_location[1],
         }
 

data/lib/chef/dsl/declare_resource.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters
-# 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");
@@ -117,7 +117,7 @@ class Chef
       #     cookbook_name: cookbook_name
       #   end
       #
-      def edit_resource!(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
+      def edit_resource!(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
         resource = find_resource!(type, name, run_context: run_context)
         if resource_attrs_block
           if defined?(new_resource)
@@ -152,10 +152,10 @@ class Chef
       #   end
       #   resource.variables.merge!({ home: "/home/klowns"  })
       #
-      def edit_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
-        edit_resource!(type, name, created_at, run_context: run_context, &resource_attrs_block)
+      def edit_resource(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
+        edit_resource!(type, name, created_at: created_at, run_context: run_context, &resource_attrs_block)
       rescue Chef::Exceptions::ResourceNotFound
-        declare_resource(type, name, created_at, run_context: run_context, &resource_attrs_block)
+        declare_resource(type, name, created_at: created_at, run_context: run_context, &resource_attrs_block)
       end
 
       # Lookup a resource in the resource collection by name.  If the resource is not
@@ -207,7 +207,7 @@ class Chef
         find_resource!(type, name, run_context: run_context)
       rescue Chef::Exceptions::ResourceNotFound
         if resource_attrs_block
-          declare_resource(type, name, created_at, run_context: run_context, &resource_attrs_block)
+          declare_resource(type, name, created_at: created_at, run_context: run_context, &resource_attrs_block)
         end # returns nil otherwise
       end
 
@@ -236,18 +236,12 @@ class Chef
       #     action :delete
       #   end
       #
-      def declare_resource(type, name, created_at = nil, run_context: self.run_context, create_if_missing: false, &resource_attrs_block)
+      def declare_resource(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
         created_at ||= caller[0]
 
-        if create_if_missing
-          Chef::Log.deprecation "build_resource with a create_if_missing flag is deprecated, use edit_resource instead"
-          # midly goofy since we call edit_resource only to re-call ourselves, but that's why its deprecated...
-          return edit_resource(type, name, created_at, run_context: run_context, &resource_attrs_block)
-        end
-
-        resource = build_resource(type, name, created_at, &resource_attrs_block)
+        resource = build_resource(type, name, created_at: created_at, &resource_attrs_block)
 
-        run_context.resource_collection.insert(resource, resource_type: type, instance_name: name)
+        run_context.resource_collection.insert(resource, resource_type: resource.declared_type, instance_name: resource.name)
         resource
       end
 
@@ -272,7 +266,7 @@ class Chef
       #     action :delete
       #   end
       #
-      def build_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
+      def build_resource(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
         created_at ||= caller[0]
 
         # this needs to be lazy in order to avoid circular dependencies since ResourceBuilder
@@ -287,7 +281,7 @@ class Chef
           run_context:         run_context,
           cookbook_name:       cookbook_name,
           recipe_name:         recipe_name,
-          enclosing_provider:  self.is_a?(Chef::Provider) ? self : nil
+          enclosing_provider:  is_a?(Chef::Provider) ? self : nil
         ).build(&resource_attrs_block)
       end
     end

data/lib/chef/dsl/platform_introspection.rb

@@ -68,41 +68,39 @@ class Chef
         private
 
         def match_versions(node)
-          begin
-            platform, version = node[:platform].to_s, node[:platform_version].to_s
-            return nil unless @values.key?(platform)
-            node_version = Chef::Version::Platform.new(version)
-            key_matches = []
-            keys = @values[platform].keys
-            keys.each do |k|
-              begin
-                if Chef::VersionConstraint::Platform.new(k).include?(node_version)
-                  key_matches << k
-                end
-              rescue Chef::Exceptions::InvalidVersionConstraint => e
-                Chef::Log.debug "Caught InvalidVersionConstraint. This means that a key in value_for_platform cannot be interpreted as a Chef::VersionConstraint::Platform."
-                Chef::Log.debug(e)
+          platform, version = node[:platform].to_s, node[:platform_version].to_s
+          return nil unless @values.key?(platform)
+          node_version = Chef::Version::Platform.new(version)
+          key_matches = []
+          keys = @values[platform].keys
+          keys.each do |k|
+            begin
+              if Chef::VersionConstraint::Platform.new(k).include?(node_version)
+                key_matches << k
               end
+            rescue Chef::Exceptions::InvalidVersionConstraint => e
+              Chef::Log.debug "Caught InvalidVersionConstraint. This means that a key in value_for_platform cannot be interpreted as a Chef::VersionConstraint::Platform."
+              Chef::Log.debug(e)
             end
-            return @values[platform][version] if key_matches.include?(version)
-            case key_matches.length
-            when 0
-              return nil
-            when 1
-              return @values[platform][key_matches.first]
-            else
-              raise "Multiple matches detected for #{platform} with values #{@values}. The matches are: #{key_matches}"
-            end
-          rescue Chef::Exceptions::InvalidCookbookVersion => e
-            # Lets not break because someone passes a weird string like 'default' :)
-            Chef::Log.debug(e)
-            Chef::Log.debug "InvalidCookbookVersion exceptions are common and expected here: the generic constraint matcher attempted to match something which is not a constraint. Moving on to next version or constraint"
-            return nil
-          rescue Chef::Exceptions::InvalidPlatformVersion => e
-            Chef::Log.debug "Caught InvalidPlatformVersion, this means that Chef::Version::Platform does not know how to turn #{node_version} into an x.y.z format"
-            Chef::Log.debug(e)
+          end
+          return @values[platform][version] if key_matches.include?(version)
+          case key_matches.length
+          when 0
             return nil
+          when 1
+            return @values[platform][key_matches.first]
+          else
+            raise "Multiple matches detected for #{platform} with values #{@values}. The matches are: #{key_matches}"
           end
+        rescue Chef::Exceptions::InvalidCookbookVersion => e
+          # Lets not break because someone passes a weird string like 'default' :)
+          Chef::Log.debug(e)
+          Chef::Log.debug "InvalidCookbookVersion exceptions are common and expected here: the generic constraint matcher attempted to match something which is not a constraint. Moving on to next version or constraint"
+          return nil
+        rescue Chef::Exceptions::InvalidPlatformVersion => e
+          Chef::Log.debug "Caught InvalidPlatformVersion, this means that Chef::Version::Platform does not know how to turn #{node_version} into an x.y.z format"
+          Chef::Log.debug(e)
+          return nil
         end
 
         def set(platforms, value)

data/lib/chef/dsl/reboot_pending.rb

@@ -30,7 +30,7 @@ class Chef
       # Note that we will silently miss any other platform-specific reboot notices besides Windows+Ubuntu.
       def reboot_pending?
         # don't break when used as a mixin in contexts without #node (e.g. specs).
-        if self.respond_to?(:node, true) && node.run_context.reboot_requested?
+        if respond_to?(:node, true) && node.run_context.reboot_requested?
           true
         elsif platform?("windows")
           # PendingFileRenameOperations contains pairs (REG_MULTI_SZ) of filenames that cannot be updated

data/lib/chef/dsl/recipe.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@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");
@@ -27,7 +27,6 @@ require "chef/dsl/reboot_pending"
 require "chef/dsl/audit"
 require "chef/dsl/powershell"
 require "chef/dsl/core"
-require "chef/dsl/method_missing"
 require "chef/mixin/lazy_module_include"
 
 class Chef
@@ -60,8 +59,6 @@ class Chef
       include Chef::DSL::Powershell
       include Chef::DSL::Resources
       include Chef::DSL::Definitions
-      # method_missing will disappear in Chef 13
-      include Chef::DSL::MethodMissing
       extend Chef::Mixin::LazyModuleInclude
 
       def resource_class_for(snake_case_name)

data/lib/chef/dsl/resources.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser <jkeiser@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");
@@ -33,20 +33,11 @@ class Chef
       include Chef::DSL::ChefProvisioning
 
       def self.add_resource_dsl(dsl_name)
-        begin
-          module_eval(<<-EOM, __FILE__, __LINE__ + 1)
-            def #{dsl_name}(*args, &block)
-              Chef.deprecated(:internal_api, "Cannot create resource #{dsl_name} with more than one argument. All arguments except the name (\#{args[0].inspect}) will be ignored. This will cause an error in Chef 13. Arguments: \#{args}") if args.size > 1
-              declare_resource(#{dsl_name.inspect}, args[0], caller[0], &block)
+        module_eval(<<-EOM, __FILE__, __LINE__ + 1)
+            def #{dsl_name}(args = nil, &block)
+              declare_resource(#{dsl_name.inspect}, args, created_at: caller[0], &block)
             end
           EOM
-        rescue SyntaxError
-          # Handle the case where dsl_name has spaces, etc.
-          define_method(dsl_name.to_sym) do |*args, &block|
-            Chef.deprecated(:internal_api, "Cannot create resource #{dsl_name} with more than one argument. All arguments except the name (#{args[0].inspect}) will be ignored. This will cause an error in Chef 13. Arguments: #{args}") if args.size > 1
-            declare_resource(dsl_name, args[0], caller[0], &block)
-          end
-        end
       end
 
       def self.remove_resource_dsl(dsl_name)

data/lib/chef/encrypted_data_bag_item.rb

@@ -121,8 +121,8 @@ class Chef::EncryptedDataBagItem
   #
   def self.load(data_bag, name, secret = nil)
     raw_hash = Chef::DataBagItem.load(data_bag, name)
-    secret ||= self.load_secret
-    self.new(raw_hash, secret)
+    secret ||= load_secret
+    new(raw_hash, secret)
   end
 
   def self.load_secret(path = nil)

data/lib/chef/environment.rb

@@ -216,11 +216,6 @@ class Chef
       end
     end
 
-    def self.json_create(o)
-      Chef.deprecated(:json_auto_inflate, "Auto inflation of JSON data is deprecated. Please use Chef::Environment#from_hash")
-      from_hash(o)
-    end
-
     def self.from_hash(o)
       environment = new
       environment.name(o["name"])
@@ -247,7 +242,7 @@ class Chef
       if Chef::Config[:solo_legacy_mode]
         load_from_file(name)
       else
-        self.from_hash(chef_server_rest.get("environments/#{name}"))
+        from_hash(chef_server_rest.get("environments/#{name}"))
       end
     end
 
@@ -309,17 +304,15 @@ class Chef
     end
 
     def self.validate_cookbook_version(version)
-      begin
-        if Chef::Config[:solo_legacy_mode]
-          raise Chef::Exceptions::IllegalVersionConstraint,
-                "Environment cookbook version constraints not allowed in chef-solo"
-        else
-          Chef::VersionConstraint.new version
-          true
-        end
-      rescue ArgumentError
-        false
+      if Chef::Config[:solo_legacy_mode]
+        raise Chef::Exceptions::IllegalVersionConstraint,
+              "Environment cookbook version constraints not allowed in chef-solo"
+      else
+        Chef::VersionConstraint.new version
+        true
       end
+    rescue ArgumentError
+      false
     end
 
   end

data/lib/chef/event_dispatch/base.rb

@@ -195,6 +195,22 @@ class Chef
       def lwrp_load_complete
       end
 
+      # Called when an ohai plugin file loading starts
+      def ohai_plugin_load_start(file_count)
+      end
+
+      # Called when an ohai plugin file has been loaded
+      def ohai_plugin_file_loaded(path)
+      end
+
+      # Called when an ohai plugin file has an error on load.
+      def ohai_plugin_file_load_failed(path, exception)
+      end
+
+      # Called when an ohai plugin file loading has finished
+      def ohai_plugin_load_complete
+      end
+
       # Called before attribute files are loaded
       def attribute_load_start(attribute_file_count)
       end

data/lib/chef/event_loggers/windows_eventlog.rb

@@ -38,7 +38,7 @@ class Chef
       SOURCE = "Chef"
 
       def self.available?
-        return Chef::Platform.windows?
+        Chef::Platform.windows?
       end
 
       def initialize

data/lib/chef/exceptions.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# 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");
@@ -47,6 +47,7 @@ class Chef
     class Cron < RuntimeError; end
     class Env < RuntimeError; end
     class Exec < RuntimeError; end
+    class Execute < RuntimeError; end
     class ErlCall < RuntimeError; end
     class FileNotFound < RuntimeError; end
     class Package < RuntimeError; end
@@ -58,14 +59,6 @@ class Chef
     class UnsupportedAction < RuntimeError; end
     class MissingLibrary < RuntimeError; end
 
-    class DeprecatedExitCode < RuntimeError
-      def initalize
-        super "Exiting with a non RFC 062 Exit Code."
-        require "chef/application/exit_code"
-        Chef::Application::ExitCode.notify_deprecated_exit_code
-      end
-    end
-
     class CannotDetermineNodeName < RuntimeError
       def initialize
         super "Unable to determine node name: configure node_name or configure the system's hostname and fqdn"
@@ -315,7 +308,7 @@ class Chef
 
       def raise!
         unless empty?
-          raise self.for_raise
+          raise for_raise
         end
       end
 
@@ -525,5 +518,8 @@ This error is most often caused by network issues (proxies, etc) outside of chef
         super "Found multiple matching resources. #{matches_info.join("\n")}"
       end
     end
+
+    # exception specific to invalid usage of 'dsc_resource' resource
+    class DSCModuleNameMissing < ArgumentError; end
   end
 end

data/lib/chef/file_access_control/unix.rb

@@ -80,19 +80,19 @@ class Chef
         if target_uid.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.debug("Found target_uid == nil, so no owner was specified on resource, not managing owner")
-          return false
+          false
         elsif current_uid.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.debug("Found current_uid == nil, so we are creating a new file, updating owner")
-          return true
+          true
         elsif target_uid != current_uid
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.debug("Found target_uid != current_uid, updating owner")
-          return true
+          true
         else
           Chef::Log.debug("Found target_uid == current_uid, not updating owner")
           # the user has specified a permission, but it matches the file, so behave idempotently
-          return false
+          false
         end
       end
 
@@ -139,19 +139,19 @@ class Chef
         if target_gid.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.debug("Found target_gid == nil, so no group was specified on resource, not managing group")
-          return false
+          false
         elsif current_gid.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.debug("Found current_gid == nil, so we are creating a new file, updating group")
-          return true
+          true
         elsif target_gid != current_gid
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.debug("Found target_gid != current_gid, updating group")
-          return true
+          true
         else
           Chef::Log.debug("Found target_gid == current_gid, not updating group")
           # the user has specified a permission, but it matches the file, so behave idempotently
-          return false
+          false
         end
       end
 
@@ -188,21 +188,21 @@ class Chef
         if target_mode.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.debug("Found target_mode == nil, so no mode was specified on resource, not managing mode")
-          return false
+          false
         elsif current_mode.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.debug("Found current_mode == nil, so we are creating a new file, updating mode")
-          return true
+          true
         elsif target_mode != current_mode
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.debug("Found target_mode != current_mode, updating mode")
-          return true
+          true
         elsif suid_bit_set? && (should_update_group? || should_update_owner?)
-          return true
+          true
         else
           Chef::Log.debug("Found target_mode == current_mode, not updating mode")
           # the user has specified a permission, but it matches the file, so behave idempotently
-          return false
+          false
         end
       end
 
@@ -283,7 +283,7 @@ class Chef
       end
 
       def suid_bit_set?
-        return target_mode & 04000 > 0
+        target_mode & 04000 > 0
       end
     end
   end

data/lib/chef/file_access_control/windows.rb

@@ -100,7 +100,7 @@ class Chef
             new_target_acl << children_ace
           end
         end
-        return actual_acl == new_target_acl
+        actual_acl == new_target_acl
       end
 
       def existing_descriptor

data/lib/chef/formatters/error_description.rb

@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+require "chef/version"
+
 class Chef
   module Formatters
     # == Formatters::ErrorDescription
@@ -45,7 +47,7 @@ class Chef
             display_section(heading, text, out)
           end
         end
-        display_section("Platform:", RUBY_PLATFORM, out)
+        display_section("System Info:", error_context_info, out)
       end
 
       def for_json
@@ -64,6 +66,21 @@ class Chef
         out.puts "\n"
       end
 
+      def error_context_info
+        context_info = { chef_version: Chef::VERSION }
+        if Chef.node
+          context_info[:platform] = Chef.node["platform"]
+          context_info[:platform_version] = Chef.node["platform_version"]
+        end
+        # A string like "ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]"
+        context_info[:ruby] = RUBY_DESCRIPTION
+        # The argv[0] value.
+        context_info[:program_name] = $PROGRAM_NAME
+        # This is kind of wonky but it's the only way to get the entry path script.
+        context_info[:executable] = File.realpath(caller.last[/^(.*):\d+:in /, 1])
+        context_info.map { |k, v| "#{k}=#{v}" }.join("\n")
+      end
+
     end
   end
 end

data/lib/chef/formatters/error_inspectors/api_error_formatting.rb

@@ -172,11 +172,10 @@ E
         # .../lib/ruby/1.9.1/net/http.rb:2709:in `read_body'
         # .../lib/ruby/1.9.1/net/http.rb:2736:in `body'
         # .../lib/chef/formatters/error_inspectors/api_error_formatting.rb:91:in `rescue in format_rest_error'
-        begin
-          exception.response.body
-        rescue Exception
-          "Cannot fetch the contents of the response."
-        end
+
+        exception.response.body
+      rescue Exception
+        "Cannot fetch the contents of the response."
       end
 
     end