chef 14.0.190 → 14.0.202

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84cefde8e0fd9743c6d069687878edc47c6be506a9f6cca2b11ba6dba76bfa6c
-  data.tar.gz: 1e603e9eac2c65158a60c24251bdc3b250167c48d5d7fa88e594aa27e708747a
+  metadata.gz: f96a2522ddbe56499bea09ea7cdf72cd70c79680e8571338c43a525a7876cc21
+  data.tar.gz: '04293c6cff5d6482d9a0cf5273da9cc7139b550a94f6e2043a38797e2c68c54a'
 SHA512:
-  metadata.gz: bef95125c12dbd408587b8fe0dd80b3534cecf312326f8b26c23afd9ae8416257e56119a305bbe37a34b2e0d863660adf96ce9144b6cddda5989759f07818b84
-  data.tar.gz: 6e792998e90c1a6df25f94f882c8de03167d5d4a7658f504307dd2bef5eb713cec16049026f89255d138490d724d760fb2f881035decad53c705fdb3139ebb56
+  metadata.gz: b78b8cfff242ca896ad7c3ae96d81c7ed9d4221c345a589e53564565ddef77a916e719be557c984afe99e6f0c1fd194e53b5d2468a782b35ee45411221a2261c
+  data.tar.gz: e1857d836b14d29bb7a3b2972a21b4fc4636f4cdb9d944c2ee67e1d78c14fee692657fc295e7c23342aef8e38f70eff19f92399911f34444352ac59a763ee152

data/VERSION

@@ -1 +1 @@
-14.0.190
+14.0.202

data/acceptance/.bundle/config

@@ -0,0 +1 @@
+---

data/bin/chef-resource-inspector

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+#
+# ./chef-resource-inspector - Find information about a resource
+#
+# Copyright:: Copyright (c) 2018, 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.
+
+Encoding.default_external = Encoding::UTF_8
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+
+require "chef/resource_inspector"
+
+ResourceInspector.start

data/chef.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "mixlib-cli", "~> 1.7"
   s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
-  s.add_dependency "mixlib-authentication", "~> 1.4"
+  s.add_dependency "mixlib-authentication", "~> 2.0"
   s.add_dependency "mixlib-shellout", "~> 2.0"
   s.add_dependency "mixlib-archive", "~> 0.4"
   s.add_dependency "ohai", "~> 14.0"
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.add_dependency "bundler", ">= 1.10"
 
   s.bindir       = "bin"
-  s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
+  s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply chef-resource-inspector }
 
   s.require_paths = %w{ lib }
   s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,acceptance,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -307,25 +307,14 @@ class Chef
 
         # GET /cookbooks/NAME/VERSION or /cookbook_artifacts/NAME/IDENTIFIER
         elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 3
-          with_entry([path[0]]) do |entry|
+          with_cookbook_manifest(path) do |manifest, entry|
             cookbook_type = path[0]
-            cookbook_entry = entry.children.select do |child|
-              child.chef_object.full_name == "#{path[1]}-#{path[2]}" ||
-                (child.chef_object.name.to_s == path[1] && child.chef_object.identifier == path[2])
-            end[0]
-            raise ChefZero::DataStore::DataNotFoundError.new(path) if cookbook_entry.nil?
-            result = nil
-            begin
-              result = Chef::CookbookManifest.new(cookbook_entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash
-            rescue Chef::ChefFS::FileSystem::NotFoundError => e
-              raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
-            end
 
-            result.each_pair do |key, value|
+            manifest.each_pair do |key, value|
               if value.is_a?(Array)
                 value.each do |file|
                   if file.is_a?(Hash) && file.has_key?("checksum")
-                    relative = ["file_store", "repo", cookbook_type, cookbook_entry.name ]
+                    relative = ["file_store", "repo", cookbook_type, entry.name ]
                     relative += file[:path].split("/")
                     file["url"] = ChefZero::RestBase.build_uri(request.base_uri, relative)
                   end
@@ -334,8 +323,8 @@ class Chef
             end
 
             if cookbook_type == "cookbook_artifacts"
-              result["metadata"] = result["metadata"].to_hash
-              result["metadata"].delete_if do |key, value|
+              manifest["metadata"] = manifest["metadata"].to_hash
+              manifest["metadata"].delete_if do |key, value|
                 value == [] ||
                   (value == {} && !%w{dependencies attributes recipes}.include?(key)) ||
                   (value == "" && %w{source_url issues_url}.include?(key)) ||
@@ -343,9 +332,8 @@ class Chef
               end
             end
 
-            Chef::JSONCompat.to_json_pretty(result)
+            Chef::JSONCompat.to_json_pretty(manifest)
           end
-
         else
           with_entry(path) do |entry|
             begin
@@ -768,6 +756,26 @@ class Chef
         path.length == 1 && BASE_DIRNAMES.include?(path[0])
       end
 
+      def with_cookbook_manifest(path)
+        cookbook_type = path[0]
+        begin
+          # this is fast and equivalent to with_entry() that also returns the cb manifest
+          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path))
+          yield Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash, entry
+        rescue Chef::ChefFS::FileSystem::NotFoundError, ChefZero::DataStore::DataNotFoundError => e
+          # this is very slow and we walk through all the cookbook versions to find ones that have the correct name in the metadata
+          dir = Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path([path[0]]))
+          entry = dir.children.select do |child|
+            child.chef_object.full_name == "#{path[1]}-#{path[2]}" ||
+              (child.chef_object.name.to_s == path[1] && child.chef_object.identifier == path[2])
+          end[0]
+          raise ChefZero::DataStore::DataNotFoundError.new(path) if entry.nil?
+          yield Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash, entry
+        end
+      rescue Chef::ChefFS::FileSystem::NotFoundError => e
+        raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
+      end
+
       def with_entry(path)
         yield Chef::ChefFS::FileSystem.resolve_path(chef_fs, to_chef_fs_path(path))
       rescue Chef::ChefFS::FileSystem::NotFoundError => e

data/lib/chef/dsl/declare_resource.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -166,6 +166,27 @@ class Chef
         resource
       end
 
+      # Find existing resources by searching the list of existing resources.  Possible
+      # forms are:
+      #
+      #   find(:file => "foobar")
+      #   find(:file => [ "foobar", "baz" ])
+      #   find("file[foobar]", "file[baz]")
+      #   find("file[foobar,baz]")
+      #
+      # Calls `run_context.resource_collection.find(*args)`
+      #
+      # The is backcompat API, the use of find_resource, below, is encouraged.
+      #
+      # @return the matching resource, or an Array of matching resources.
+      #
+      # @raise ArgumentError if you feed it bad lookup information
+      # @raise RuntimeError if it can't find the resources you are looking for.
+      #
+      def resources(*args)
+        run_context.resource_collection.find(*args)
+      end
+
       # Lookup a resource in the resource collection by name.  If the resource is not
       # found this will raise Chef::Exceptions::ResourceNotFound.  This API is identical to the
       # resources() call and while it is a synonym it is not intended to deprecate that call.
@@ -292,6 +313,7 @@ class Chef
           enclosing_provider:  is_a?(Chef::Provider) ? self : nil
         ).build(&resource_attrs_block)
       end
+
     end
   end
 end

data/lib/chef/knife.rb

@@ -370,11 +370,13 @@ class Chef
         Chef::Config[:log_level] = :warn
       when 1
         Chef::Config[:log_level] = :info
-      else
+      when 2
         Chef::Config[:log_level] = :debug
+      else
+        Chef::Config[:log_level] = :trace
       end
 
-      Chef::Config[:log_level] = :debug if ENV["KNIFE_DEBUG"]
+      Chef::Config[:log_level] = :trace if ENV["KNIFE_DEBUG"]
 
       Chef::Config[:node_name]         = config[:node_name]       if config[:node_name]
       Chef::Config[:client_key]        = config[:client_key]      if config[:client_key]
@@ -467,7 +469,7 @@ class Chef
       when NameError, NoMethodError
         ui.error "knife encountered an unexpected error"
         ui.info  "This may be a bug in the '#{self.class.common_name}' knife command or plugin"
-        ui.info  "Please collect the output of this command with the `-VV` option before filing a bug report."
+        ui.info  "Please collect the output of this command with the `-VVV` option before filing a bug report."
         ui.info  "Exception: #{e.class.name}: #{e.message}"
       when Chef::Exceptions::PrivateKeyMissing
         ui.error "Your private key could not be loaded from #{api_key}"

data/lib/chef/knife/core/bootstrap_context.rb

@@ -178,7 +178,11 @@ validation_client_name "#{@chef_config[:validation_client_name]}"
           # If the user doesn't have a client path configure, let bash use the PATH for what it was designed for
           client_path = @chef_config[:chef_client_path] || "chef-client"
           s = "#{client_path} -j /etc/chef/first-boot.json"
-          s << " -l debug" if @config[:verbosity] && @config[:verbosity] >= 2
+          if @config[:verbosity] && @config[:verbosity] >= 3
+            s << " -l trace"
+          elsif @config[:verbosity] && @config[:verbosity] >= 2
+            s << " -l debug"
+          end
           s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
           s << " --no-color" unless @config[:color]
           s

data/lib/chef/knife/ssh.rb

@@ -288,7 +288,7 @@ class Chef
           opts[:forward_agent] = forward_agent unless forward_agent.nil?
           port ||= ssh_config[:port]
           opts[:port] = port unless port.nil?
-          opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
+          opts[:logger] = Chef::Log.with_child(subsystem: "net/ssh") if Chef::Log.level == :trace
           if !config[:host_key_verify]
             opts[:verify_host_key] = false
             opts[:user_known_hosts_file] = "/dev/null"

data/lib/chef/provider.rb

@@ -42,6 +42,7 @@ class Chef
 
     include Chef::Mixin::WhyRun
     extend Chef::Mixin::Provides
+    extend Forwardable
 
     # includes the "core" DSL and not the "recipe" DSL by design
     include Chef::DSL::Core
@@ -77,6 +78,10 @@ class Chef
       # Chef.deprecated(:use_inline_resources, "The use_inline_resources mode is no longer optional and the line enabling it can be removed")
     end
 
+    # delegate to the resource
+    #
+    def_delegators :@new_resource, :property_is_set?
+
     #--
     # TODO: this should be a reader, and the action should be passed in the
     # constructor; however, many/most subclasses override the constructor so

data/lib/chef/provider/package/yum/python_helper.rb

@@ -93,14 +93,14 @@ class Chef
             options.each_with_object({}) do |opt, h|
               if opt =~ /--enablerepo=(.+)/
                 $1.split(",").each do |repo|
-                  h["enablerepos"] ||= []
-                  h["enablerepos"].push(repo)
+                  h["repos"] ||= []
+                  h["repos"].push( { "enable" => repo } )
                 end
               end
               if opt =~ /--disablerepo=(.+)/
                 $1.split(",").each do |repo|
-                  h["disablerepos"] ||= []
-                  h["disablerepos"].push(repo)
+                  h["repos"] ||= []
+                  h["repos"].push( { "disable" => repo } )
                 end
               end
             end

data/lib/chef/provider/package/yum/yum_helper.py

@@ -83,11 +83,13 @@ def query(command):
     enabled_repos = base.repos.listEnabled()
 
     # Handle any repocontrols passed in with our options
-    if 'enablerepos' in command:
-      base.repos.enableRepo(*command['enablerepos'])
 
-    if 'disablerepos' in command:
-      base.repos.disableRepo(*command['disablerepos'])
+    if 'repos' in command:
+      for repo in command['repos']:
+        if 'enable' in repo:
+          base.repos.enableRepo(repo['enable'])
+        if 'disable' in repo:
+          base.repos.disableRepo(repo['disable'])
 
     args = { 'name': command['provides'] }
     do_nevra = False
@@ -148,15 +150,14 @@ def query(command):
         outpipe.flush()
 
     # Reset any repos we were passed in enablerepo/disablerepo to the original state in enabled_repos
-    if 'enablerepos' in command:
-        for repo in command['enablerepos']:
-            if base.repos.getRepo(repo) not in enabled_repos:
-                base.repos.disableRepo(repo)
-
-    if 'disablerepos' in command:
-        for repo in command['disablerepos']:
-            if base.repos.getRepo(repo) in enabled_repos:
-                base.repos.enableRepo(repo)
+    if 'repos' in command:
+      for repo in command['repos']:
+        if 'enable' in repo:
+          if base.repos.getRepo(repo['enable']) not in enabled_repos:
+            base.repos.disableRepo(repo['enable'])
+        if 'disable' in repo:
+          if base.repos.getRepo(repo['disable']) in enabled_repos:
+            base.repos.enableRepo(repo['disable'])
 
 # the design of this helper is that it should try to be 'brittle' and fail hard and exit in order
 # to keep process tables clean.  additional error handling should probably be added to the retry loop
@@ -185,7 +186,13 @@ while 1:
         sys.exit(0)
     setup_exit_handler()
     line = inpipe.readline()
-    command = json.loads(line)
+
+    try:
+        command = json.loads(line)
+    except ValueError, e:
+        base.closeRpmDB()
+        sys.exit(0)
+
     if command['action'] == "whatinstalled":
         query(command)
     elif command['action'] == "whatavailable":

data/lib/chef/provider/route.rb

@@ -174,7 +174,7 @@ class Chef
             conf[dev] = "" if conf[dev].nil?
             case @action
             when :add
-              conf[dev] << config_file_contents(:add, comment: resource.comment, target: resource.target, netmask: resource.netmask, gateway: resource.gateway) if resource.action == [:add]
+              conf[dev] << config_file_contents(:add, comment: resource.comment, target: resource.target, metric: resource.metric, netmask: resource.netmask, gateway: resource.gateway) if resource.action == [:add]
             when :delete
               # need to do this for the case when the last route on an int
               # is removed
@@ -219,6 +219,7 @@ class Chef
           command = [ "ip", "route", "replace", target ]
           command += [ "via", new_resource.gateway ] if new_resource.gateway
           command += [ "dev", new_resource.device ] if new_resource.device
+          command += [ "metric", new_resource.metric ] if new_resource.metric
         when :delete
           command = [ "ip", "route", "delete", target ]
           command += [ "via", new_resource.gateway ] if new_resource.gateway
@@ -235,6 +236,7 @@ class Chef
           content << (options[:target]).to_s
           content << "/#{MASK[options[:netmask].to_s]}" if options[:netmask]
           content << " via #{options[:gateway]}" if options[:gateway]
+          content << " metric #{options[:metric]}" if options[:metric]
           content << "\n"
         end
 

data/lib/chef/recipe.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,12 +66,6 @@ class Chef
       run_context.node
     end
 
-    # Used by the DSL to look up resources when executing in the context of a
-    # recipe.
-    def resources(*args)
-      run_context.resource_collection.find(*args)
-    end
-
     # This was moved to Chef::Node#tag, redirecting here for compatibility
     def tag(*tags)
       run_context.node.tag(*tags)

data/lib/chef/resource.rb

@@ -23,6 +23,7 @@ require "chef/dsl/data_query"
 require "chef/dsl/registry_helper"
 require "chef/dsl/reboot_pending"
 require "chef/dsl/resources"
+require "chef/dsl/declare_resource"
 require "chef/json_compat"
 require "chef/mixin/convert_to_class_name"
 require "chef/guard_interpreter/resource_guard_interpreter"
@@ -51,6 +52,7 @@ class Chef
     # Generic User DSL (not resource-specific)
     #
 
+    include Chef::DSL::DeclareResource
     include Chef::DSL::DataQuery
     include Chef::DSL::RegistryHelper
     include Chef::DSL::RebootPending
@@ -97,26 +99,6 @@ class Chef
       run_context && run_context.node
     end
 
-    #
-    # Find existing resources by searching the list of existing resources.  Possible
-    # forms are:
-    #
-    #   find(:file => "foobar")
-    #   find(:file => [ "foobar", "baz" ])
-    #   find("file[foobar]", "file[baz]")
-    #   find("file[foobar,baz]")
-    #
-    # Calls `run_context.resource_collection.find(*args)`
-    #
-    # @return the matching resource, or an Array of matching resources.
-    #
-    # @raise ArgumentError if you feed it bad lookup information
-    # @raise RuntimeError if it can't find the resources you are looking for.
-    #
-    def resources(*args)
-      run_context.resource_collection.find(*args)
-    end
-
     #
     # Resource User Interface (for users)
     #

data/lib/chef/resource/apt_preference.rb

@@ -23,7 +23,7 @@ class Chef
     # @since 13.3
     class AptPreference < Chef::Resource
       resource_name :apt_preference
-      provides :apt_preference
+      provides(:apt_preference) { true }
 
       description "The apt_preference resource allows for the creation of APT preference"\
                   " files. Preference files are used to control which package versions and"\