chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/lib/chef/config.rb

@@ -4,7 +4,7 @@
 # Author:: AJ Christensen (<aj@chef.io>)
 # Author:: Mark Mzyk (<mmzyk@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,7 @@ require "chef-config/logger"
 ChefConfig.logger = Chef::Log
 
 require "chef-config/config"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "platform/query_helpers"
 
 # Ohai::Config defines its own log_level and log_location. When loaded, it will
@@ -55,7 +56,7 @@ class Chef
 
     default :event_loggers do
       evt_loggers = []
-      if ChefConfig.windows? && !Chef::Platform.windows_nano_server?
+      if ChefUtils.windows? && !Chef::Platform.windows_nano_server?
         evt_loggers << :win_evt
       end
       evt_loggers

data/lib/chef/cookbook/chefignore.rb

@@ -24,11 +24,9 @@ class Chef
       attr_reader :ignores
 
       def initialize(ignore_file_or_repo)
-        # Check the 'ignore_file_or_repo' path first and then look in the parent directory
+        # Check the 'ignore_file_or_repo' path first and then look in the parent directories till root
         # to handle both the chef repo cookbook layout and a standalone cookbook
         @ignore_file = find_ignore_file(ignore_file_or_repo)
-        @ignore_file = find_ignore_file(File.dirname(ignore_file_or_repo)) unless readable_file_or_symlink?(@ignore_file)
-
         @ignores = parse_ignore_file
       end
 
@@ -50,27 +48,34 @@ class Chef
 
       def parse_ignore_file
         ignore_globs = []
-        if readable_file_or_symlink?(@ignore_file)
+        if @ignore_file && readable_file_or_symlink?(@ignore_file)
           File.foreach(@ignore_file) do |line|
             ignore_globs << line.strip unless line =~ COMMENTS_AND_WHITESPACE
           end
         else
-          Chef::Log.trace("No chefignore file found at #{@ignore_file} no files will be ignored")
+          Chef::Log.debug("No chefignore file found. No files will be ignored!")
         end
         ignore_globs
       end
 
+      # Lookup of chefignore file till the root dir of the provided path.
+      # If file refer then lookup the parent dir till the root.
+      # eg. path: /var/.chef/cookbook_name
+      # Lookup at '/var/.chef/cookbook_name/chefignore', '/var/.chef/chefignore' '/var/chefignore' and '/chefignore' until exist
       def find_ignore_file(path)
-        if File.basename(path) =~ /chefignore/
-          path
-        else
-          File.join(path, "chefignore")
+        Pathname.new(path).ascend do |dir|
+          next unless dir.directory?
+
+          file = dir.join("chefignore")
+          return file.expand_path.to_s if file.exist?
         end
+
+        nil
       end
 
       def readable_file_or_symlink?(path)
-        File.exist?(@ignore_file) && File.readable?(@ignore_file) &&
-          (File.file?(@ignore_file) || File.symlink?(@ignore_file))
+        File.exist?(path) && File.readable?(path) &&
+          (File.file?(path) || File.symlink?(path))
       end
     end
   end

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -189,7 +189,7 @@ class Chef
       end
 
       def chefignore
-        @chefignore ||= Chefignore.new(File.basename(cookbook_path))
+        @chefignore ||= Chefignore.new(cookbook_path)
       end
 
       # Enumerate all the files in a cookbook and assign the resulting list to

data/lib/chef/cookbook/syntax_check.rb

@@ -84,11 +84,13 @@ class Chef
       # If no +cookbook_path+ is given, +Chef::Config.cookbook_path+ is used.
       def self.for_cookbook(cookbook_name, cookbook_path = nil)
         cookbook_path ||= Chef::Config.cookbook_path
-        unless cookbook_path
-          raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
+
+        Array(cookbook_path).each do |entry|
+          path = File.expand_path(File.join(entry, cookbook_name.to_s))
+          return new(path) if Dir.exist?(path)
         end
 
-        new(File.join(cookbook_path, cookbook_name.to_s))
+        raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
       end
 
       # Create a new SyntaxCheck object

data/lib/chef/cookbook_loader.rb

@@ -49,8 +49,8 @@ class Chef
 
     # @param repo_paths [Array<String>] the array of repo paths containing cookbook dirs
     def initialize(*repo_paths)
-      @repo_paths = repo_paths.flatten.map { |p| File.expand_path(p) }
-      raise ArgumentError, "You must specify at least one cookbook repo path" if repo_paths.empty?
+      @repo_paths = repo_paths.flatten.compact.map { |p| File.expand_path(p) }
+      raise ArgumentError, "You must specify at least one cookbook repo path" if @repo_paths.empty?
     end
 
     # The primary function of this class is to build this Mash mapping cookbook names as a string to
@@ -171,7 +171,7 @@ class Chef
         begin
           mash = Mash.new
           all_directories_in_repo_paths.each do |cookbook_path|
-            loader = Cookbook::CookbookVersionLoader.new(cookbook_path, chefignore(File.dirname(cookbook_path)))
+            loader = Cookbook::CookbookVersionLoader.new(cookbook_path, chefignore(cookbook_path))
             cookbook_name = loader.cookbook_name
             if mash.key?(cookbook_name)
               raise Chef::Exceptions::CookbookMergingError, "Cookbook merging is no longer supported, the cookbook named #{cookbook_name} can only appear once in the cookbook_path"

data/lib/chef/cookbook_uploader.rb

@@ -139,7 +139,7 @@ class Chef
 
     def validate_cookbooks
       cookbooks.each do |cb|
-        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.name)
+        syntax_checker = Chef::Cookbook::SyntaxCheck.new(cb.root_dir)
         Chef::Log.info("Validating ruby files")
         exit(1) unless syntax_checker.validate_ruby_files
         Chef::Log.info("Validating templates")

data/lib/chef/data_collector.rb

@@ -64,8 +64,8 @@ class Chef
       # @param events [Chef::EventDispatch::Dispatcher] the event dispatcher
       def initialize(events)
         @events = events
-        @expanded_run_list       = {}
-        @deprecations            = Set.new
+        @expanded_run_list = {}
+        @deprecations = Set.new
       end
 
       # Hook to grab the run_status.  We also make the decision to run or not run here (our

data/lib/chef/data_collector/run_end_message.rb

@@ -57,6 +57,7 @@ class Chef
             "resources" => all_action_records(action_collection),
             "run_id" => run_status&.run_id,
             "run_list" => node&.run_list&.for_json || [],
+            "cookbooks" => ( node && node["cookbooks"] ) || {},
             "policy_name" => node&.policy_name,
             "policy_group" => node&.policy_group,
             "start_time" => run_status.start_time.utc.iso8601,

data/lib/chef/deprecated.rb

@@ -229,6 +229,10 @@ class Chef
       target 27
     end
 
+    class ChefSugar < Base
+      target 28
+    end
+
     class Generic < Base
       def url
         "https://docs.chef.io/chef_deprecations_client.html"

data/lib/chef/dsl/core.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-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/dsl/platform_introspection.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +16,15 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+
 class Chef
   module DSL
-
     # == Chef::DSL::PlatformIntrospection
     # Provides the DSL for platform-dependent switch logic, such as
     # #value_for_platform.
     module PlatformIntrospection
+      include ChefUtils
 
       # Implementation class for determining platform dependent values
       class PlatformDependentValue
@@ -245,27 +247,16 @@ class Chef
         end
       end
 
-      # Shamelessly stolen from https://github.com/sethvargo/chef-sugar/blob/master/lib/chef/sugar/docker.rb
-      # Given a node object, returns whether the node is a docker container.
-      #
-      # === Parameters
-      # node:: [Chef::Node] The node to check.
-      #
-      # === Returns
-      # true:: if the current node is a docker container
-      # false:: if the current node is not a docker container
-      def docker?(node = run_context.nil? ? nil : run_context.node)
-        # Using "File.exist?('/.dockerinit') || File.exist?('/.dockerenv')" makes Travis sad,
-        # and that makes us sad too.
-        !!(node && node[:virtualization] && node[:virtualization][:systems] &&
-           node[:virtualization][:systems][:docker] && node[:virtualization][:systems][:docker] == "guest")
-      end
-
       # a simple helper to determine if we're on a windows release pre-2012 / 8
       # @return [Boolean] Is the system older than Windows 8 / 2012
       def older_than_win_2012_or_8?(node = run_context.nil? ? nil : run_context.node)
         node["platform_version"].to_f < 6.2
       end
+
+      # ^^^^^^ NOTE: PLEASE DO NOT CONTINUE TO ADD THESE KINDS OF PLATFORM_VERSION APIS WITHOUT ^^^^^^^
+      # ^^^^^^ GOING THROUGH THE DESIGN REVIEW PROCESS AND ADDRESS THE EXISTING CHEF-SUGAR ONES ^^^^^^^
+      # ^^^^^^ DO "THE HARD RIGHT THING" AND ADDRESS THE BROADER PROBLEM AND FIX IT ALL.        ^^^^^^^
+
     end
   end
 end

data/lib/chef/event_loggers/windows_eventlog.rb

@@ -39,7 +39,7 @@ class Chef
       SOURCE = "#{Chef::Dist::PRODUCT}".freeze
 
       def self.available?
-        Chef::Platform.windows?
+        ChefUtils.windows?
       end
 
       def initialize

data/lib/chef/file_content_management/deploy.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 
 require_relative "deploy/cp"
 require_relative "deploy/mv_unix"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require_relative "deploy/mv_windows"
 end
 
@@ -27,7 +27,7 @@ class Chef
     class Deploy
       def self.strategy(atomic_update)
         if atomic_update
-          Chef::Platform.windows? ? MvWindows.new : MvUnix.new
+          ChefUtils.windows? ? MvWindows.new : MvUnix.new
         else
           Cp.new
         end

data/lib/chef/file_content_management/deploy/mv_windows.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@
 #
 
 require_relative "../../platform/query_helpers"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require_relative "../../win32/security"
 end
 

data/lib/chef/file_content_management/tempfile.rb

@@ -67,7 +67,7 @@ class Chef
         basename = ::File.basename(@new_resource.path, tempfile_extension)
         # the leading "[.]chef-" here should be considered a public API and should not be changed
         basename.insert 0, "chef-"
-        basename.insert 0, "." unless Chef::Platform.windows? # dotfile if we're not on windows
+        basename.insert 0, "." unless ChefUtils.windows? # dotfile if we're not on windows
         basename.scrub
       end
 

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

@@ -1,7 +1,7 @@
 #--
 # Author:: Daniel DeLeo (<dan@chef.io>)
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,7 +52,7 @@ class Chef
             error_description.section("Template Context:", "#{exception.source_location}\n#{exception.source_listing}")
           end
 
-          if Chef::Platform.windows?
+          if ChefUtils.windows?
             require_relative "../../win32/security"
 
             unless Chef::ReservedNames::Win32::Security.has_admin_privileges?

data/lib/chef/http.rb

@@ -519,7 +519,7 @@ class Chef
       content_length = response["Content-Length"]
       if tf.nil?
         tf = Tempfile.open("chef-rest")
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           tf.binmode # required for binary files on Windows platforms
         end
       end

data/lib/chef/http/socketless_chef_zero_client.rb

@@ -44,7 +44,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require "chef_zero/server"
-require "chef/dist"
+require_relative "../dist"
 
 class Chef
   class HTTP

data/lib/chef/knife.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright 2009-2018, Chef Software Inc.
+# Copyright:: Copyright 2009-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@
 require "forwardable" unless defined?(Forwardable)
 require_relative "version"
 require "mixlib/cli" unless defined?(Mixlib::CLI)
+require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
 require_relative "workstation_config_loader"
 require_relative "mixin/convert_to_class_name"
 require_relative "mixin/path_sanity"
@@ -39,7 +40,7 @@ class Chef
     Chef::HTTP::HTTPRequest.user_agent = "#{Chef::Dist::PRODUCT} Knife#{Chef::HTTP::HTTPRequest::UA_COMMON}"
 
     include Mixlib::CLI
-    include Chef::Mixin::PathSanity
+    include ChefUtils::DSL::PathSanity
     extend Chef::Mixin::ConvertToClassName
     extend Forwardable
 
@@ -479,7 +480,7 @@ class Chef
       unless respond_to?(:run)
         ui.error "You need to add a #run method to your knife command before you can use it"
       end
-      enforce_path_sanity
+      ENV["PATH"] = sanitized_path if Chef::Config[:enforce_path_sanity]
       maybe_setup_fips
       Chef::LocalMode.with_server_connectivity do
         run

data/lib/chef/knife/config_get.rb

@@ -47,9 +47,10 @@ class Chef
           if wcl.config_location
             loading_from("configuration", wcl.config_location)
           end
+
           if Chef::Config[:config_d_dir]
             wcl.find_dot_d(Chef::Config[:config_d_dir]).each do |path|
-              loading_from(".d/ configuration", wcl.config_location)
+              loading_from(".d/ configuration", path)
             end
           end
         end

data/lib/chef/knife/configure.rb

@@ -120,7 +120,7 @@ class Chef
           @admin_client_key       = config[:admin_client_key] || ask_question("Please enter the location of the existing admin's private key: ", default: "#{Chef::Dist::SERVER_CONF_DIR}/admin.pem")
           @admin_client_key       = File.expand_path(@admin_client_key)
         else
-          @new_client_name        = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", default: Etc.getlogin)
+          @new_client_name = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", default: Etc.getlogin)
         end
 
         @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem")

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -31,6 +31,12 @@ class Chef
       banner "knife cookbook metadata from file FILE (options)"
 
       def run
+        if @name_args.length < 1
+          show_usage
+          ui.fatal("You must specify the FILE.")
+          exit(1)
+        end
+
         file = @name_args[0]
         cookbook = File.basename(File.dirname(file))
 

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

@@ -191,7 +191,7 @@ class Chef
             data =
               if data.is_a?(Array)
                 data[attr.to_i]
-              elsif data.respond_to?(:[], false) && data.key?(attr)
+              elsif data.respond_to?(:[], false) && data.respond_to?(:key?) && data.key?(attr)
                 data[attr]
               elsif data.respond_to?(attr.to_sym, false)
                 # handles -a chef_environment and other things that hang of the node and aren't really attributes

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

@@ -112,7 +112,7 @@ class Chef
 
             if node["ohai_time"]
               hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
-              hours_text   = "#{hours} hour#{hours == 1 ? " " : "s"}"
+              hours_text = "#{hours} hour#{hours == 1 ? " " : "s"}"
               minutes_text = "#{minutes} minute#{minutes == 1 ? " " : "s"}"
               seconds_text = "#{seconds} second#{seconds == 1 ? " " : "s"}"
               if hours > 24

data/lib/chef/knife/ssh.rb

@@ -593,6 +593,12 @@ class Chef
       def run
         @longest = 0
 
+        if @name_args.length < 1
+          show_usage
+          ui.fatal("You must specify the SEARCH QUERY.")
+          exit(1)
+        end
+
         configure_user
         configure_password
         @password = config[:ssh_password] if config[:ssh_password]

data/lib/chef/local_mode.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 require_relative "config"
-require_relative "monkey_patches/webrick-utils" if Chef::Platform.windows?
+require_relative "monkey_patches/webrick-utils" if ChefUtils.windows?
 require_relative "dist"
 
 class Chef