chef 16.4.35 → 16.6.14

data/lib/chef/knife/exec.rb

@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef::Knife::Exec < Chef::Knife
 
@@ -30,7 +30,7 @@ class Chef::Knife::Exec < Chef::Knife
   option :exec,
     short: "-E CODE",
     long: "--exec CODE",
-    description: "A string of #{Chef::Dist::PRODUCT} code to execute."
+    description: "A string of #{ChefUtils::Dist::Infra::PRODUCT} code to execute."
 
   option :script_path,
     short: "-p PATH:PATH",

data/lib/chef/knife/node_policy_set.rb

@@ -45,7 +45,7 @@ class Chef
 
       # Set policy name and group to node
       def set_policy(node)
-        policy_group, policy_name = @name_args[1..-1]
+        policy_group, policy_name = @name_args[1..]
         node.policy_name  = policy_name
         node.policy_group = policy_group
       end
@@ -70,7 +70,7 @@ class Chef
 
       # True if one of policy_name or policy_group was given, but not both
       def incomplete_policyfile_options?
-        policy_group, policy_name = @name_args[1..-1]
+        policy_group, policy_name = @name_args[1..]
         (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2)
       end
 

data/lib/chef/knife/node_run_list_add.rb

@@ -43,7 +43,7 @@ class Chef
         node = Chef::Node.load(@name_args[0])
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/node_run_list_remove.rb

@@ -34,7 +34,7 @@ class Chef
 
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/node_run_list_set.rb

@@ -36,7 +36,7 @@ class Chef
           exit 1
         elsif @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/node_show.rb

@@ -18,7 +18,7 @@
 
 require_relative "../knife"
 require_relative "core/node_presenter"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Knife
@@ -42,7 +42,7 @@ class Chef
       option :environment,
         short: "-E",
         long: "--environment",
-        description: "Show only the #{Chef::Dist::PRODUCT} environment."
+        description: "Show only the #{ChefUtils::Dist::Infra::PRODUCT} environment."
 
       def run
         ui.use_presenter Knife::Core::NodePresenter

data/lib/chef/knife/role_env_run_list_add.rb

@@ -68,7 +68,7 @@ class Chef
 
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[2..-1].map do |entry|
+          entries = @name_args[2..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/role_env_run_list_set.rb

@@ -51,7 +51,7 @@ class Chef
           exit 1
         elsif @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[2..-1].map do |entry|
+          entries = @name_args[2..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/role_run_list_add.rb

@@ -68,7 +68,7 @@ class Chef
 
         if @name_args.size > 1
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/role_run_list_set.rb

@@ -50,7 +50,7 @@ class Chef
           exit 1
         elsif @name_args.size > 1
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else

data/lib/chef/knife/search.rb

@@ -26,7 +26,6 @@ class Chef
       include Knife::Core::MultiAttributeReturnOption
 
       deps do
-        require "addressable/uri" unless defined?(Addressable::URI)
         require_relative "../node"
         require_relative "../environment"
         require_relative "../api_client"

data/lib/chef/knife/serve.rb

@@ -16,7 +16,7 @@
 
 require_relative "../knife"
 require_relative "../local_mode"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Knife
@@ -30,11 +30,11 @@ class Chef
 
       option :chef_repo_path,
         long: "--chef-repo-path PATH",
-        description: "Overrides the location of #{Chef::Dist::PRODUCT} repo. Default is specified by chef_repo_path in the config."
+        description: "Overrides the location of #{ChefUtils::Dist::Infra::PRODUCT} repo. Default is specified by chef_repo_path in the config."
 
       option :chef_zero_host,
         long: "--chef-zero-host IP",
-        description: "Overrides the host upon which #{Chef::Dist::ZERO} listens. Default is 127.0.0.1."
+        description: "Overrides the host upon which #{ChefUtils::Dist::Zero::PRODUCT} listens. Default is 127.0.0.1."
 
       def configure_chef
         super

data/lib/chef/knife/ssh.rb

@@ -358,11 +358,21 @@ class Chef
         subsession ||= session
         command = fixup_sudo(command)
         command.force_encoding("binary") if command.respond_to?(:force_encoding)
+        begin
+          open_session(subsession, command)
+        rescue => e
+          open_session(subsession, command, true)
+        end
+      end
+
+      def open_session(subsession, command, pty = false)
+        stderr = ""
+        exit_status = 0
         subsession.open_channel do |chan|
           if config[:on_error] && exit_status != 0
             chan.close
           else
-            chan.request_pty
+            chan.request_pty if pty
             chan.exec command do |ch, success|
               raise ArgumentError, "Cannot execute #{command}" unless success
 
@@ -373,6 +383,11 @@ class Chef
                   ichannel.send_data("#{get_password}\n")
                 end
               end
+
+              ch.on_extended_data do |_, _type, data|
+                stderr += data
+              end
+
               ch.on_request "exit-status" do |ichannel, data|
                 exit_status = [exit_status, data.read_long].max
               end
@@ -474,7 +489,7 @@ class Chef
 
         new_window_cmds = lambda do
           if session.servers_for.size > 1
-            [""] + session.servers_for[1..-1].map do |server|
+            [""] + session.servers_for[1..].map do |server|
               if config[:tmux_split]
                 "split-window #{ssh_dest.call(server)}; tmux select-layout tiled"
               else
@@ -610,7 +625,7 @@ class Chef
           when "cssh"
             cssh
           else
-            ssh_command(@name_args[1..-1].join(" "))
+            ssh_command(@name_args[1..].join(" "))
           end
 
         session.close

data/lib/chef/knife/ssl_check.rb

@@ -17,7 +17,7 @@
 #
 
 require_relative "../knife"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Knife
@@ -190,7 +190,7 @@ class Chef
           #{ui.color("TO FIX THIS ERROR:", :bold)}
 
           If the server you are connecting to uses a self-signed certificate, you must
-          configure #{Chef::Dist::PRODUCT} to trust that server's certificate.
+          configure #{ChefUtils::Dist::Infra::PRODUCT} to trust that server's certificate.
 
           By default, the certificate is stored in the following location on the host
           where your chef-server runs:
@@ -234,7 +234,7 @@ class Chef
       end
 
       def debug_chef_ssl_config
-        ui.err "#{Chef::Dist::PRODUCT} SSL Configuration:"
+        ui.err "#{ChefUtils::Dist::Infra::PRODUCT} SSL Configuration:"
         ui.err "* ssl_ca_path: #{configuration.ssl_ca_path.inspect}"
         ui.err "* ssl_ca_file: #{configuration.ssl_ca_file.inspect}"
         ui.err "* trusted_certs_dir: #{configuration.trusted_certs_dir.inspect}"

data/lib/chef/knife/status.rb

@@ -19,7 +19,7 @@
 require_relative "../knife"
 require_relative "core/status_presenter"
 require_relative "core/node_presenter"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Knife
@@ -44,7 +44,7 @@ class Chef
 
       option :hide_by_mins,
         long: "--hide-by-mins MINS",
-        description: "Hide nodes that have run #{Chef::Dist::CLIENT} in the last MINS minutes"
+        description: "Hide nodes that have run #{ChefUtils::Dist::Infra::CLIENT} in the last MINS minutes"
 
       def append_to_query(term)
         @query << " AND " unless @query.empty?

data/lib/chef/knife/tag_create.rb

@@ -32,7 +32,7 @@ class Chef
 
       def run
         name = @name_args[0]
-        tags = @name_args[1..-1]
+        tags = @name_args[1..]
 
         if name.nil? || tags.nil? || tags.empty?
           show_usage

data/lib/chef/knife/tag_delete.rb

@@ -32,7 +32,7 @@ class Chef
 
       def run
         name = @name_args[0]
-        tags = @name_args[1..-1]
+        tags = @name_args[1..]
 
         if name.nil? || tags.nil? || tags.empty?
           show_usage

data/lib/chef/knife/user_create.rb

@@ -18,7 +18,7 @@
 #
 
 require_relative "../knife"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Knife
@@ -42,7 +42,7 @@ class Chef
       option :prevent_keygen,
         short: "-k",
         long: "--prevent-keygen",
-        description: "API V1 (#{Chef::Dist::SERVER_PRODUCT} 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
+        description: "API V1 (#{ChefUtils::Dist::Server::PRODUCT} 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
         boolean: true
 
       banner "knife user create USERNAME DISPLAY_NAME FIRST_NAME LAST_NAME EMAIL PASSWORD (options)"

data/lib/chef/knife/yaml_convert.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "yaml" unless defined?(YAML)
+autoload :YAML, "yaml"
 require_relative "../knife"
 class Chef::Knife::YamlConvert < Chef::Knife
 

data/lib/chef/local_mode.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "config"
 require_relative "monkey_patches/webrick-utils" if ChefUtils.windows?
-require_relative "dist"
 
 class Chef
   module LocalMode
@@ -79,7 +79,7 @@ class Chef
 
         local_mode_url = @chef_zero_server.local_mode_url
 
-        Chef::Log.info("Started #{Chef::Dist::ZERO} at #{local_mode_url} with #{@chef_fs.fs_description}")
+        Chef::Log.info("Started #{ChefUtils::Dist::Zero::PRODUCT} at #{local_mode_url} with #{@chef_fs.fs_description}")
         Chef::Config.chef_server_url = local_mode_url
       end
     end

data/lib/chef/log/syslog.rb

@@ -19,7 +19,7 @@
 require "logger"
 require "syslog-logger"
 require_relative "../mixin/unformatter"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Log
@@ -33,7 +33,7 @@ class Chef
 
       attr_accessor :sync, :formatter
 
-      def initialize(program_name = "#{Chef::Dist::CLIENT}", facility = ::Syslog::LOG_DAEMON, logopts = nil)
+      def initialize(program_name = ChefUtils::Dist::Infra::CLIENT, facility = ::Syslog::LOG_DAEMON, logopts = nil)
         super
         return if defined? ::Logger::Syslog::SYSLOG
 

data/lib/chef/log/winevt.rb

@@ -19,7 +19,7 @@
 require_relative "../event_loggers/base"
 require_relative "../platform/query_helpers"
 require_relative "../mixin/unformatter"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Log
@@ -37,7 +37,7 @@ class Chef
       FATAL_EVENT_ID = 10104
 
       # Since we must install the event logger, this is not really configurable
-      SOURCE = Chef::Dist::SHORT.freeze
+      SOURCE = ChefUtils::Dist::Infra::SHORT.freeze
 
       include Chef::Mixin::Unformatter
 

data/lib/chef/mixin/deep_merge.rb

@@ -75,14 +75,7 @@ class Chef
       # @api private
       #
       def deep_merge!(source, dest)
-        # if dest doesn't exist, then simply copy source to it
-        if dest.nil?
-          dest = source; return dest
-        end
-
         case source
-        when nil
-          dest
         when Hash
           if dest.is_a?(Hash)
             source.each do |src_key, src_value|
@@ -147,11 +140,6 @@ class Chef
             end
           end
           merge_onto
-
-        # If merge_with is nil, don't replace merge_onto
-        elsif merge_with.nil?
-          merge_onto
-
         # In all other cases, replace merge_onto with merge_with
         else
           merge_with

data/lib/chef/mixin/openssl_helper.rb

@@ -14,15 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+autoload :OpenSSL, "openssl"
 
 class Chef
   module Mixin
     # various helpers for use with openssl. Currently used by the openssl_* resources
     module OpenSSLHelper
-      def self.included(_base)
-        require "openssl" unless defined?(::OpenSSL)
-      end
-
       # determine the key filename from the cert filename
       # @param [String] cert_filename the path to the certfile
       # @return [String] the path to the keyfile

data/lib/chef/mixin/powershell_exec.rb

@@ -16,11 +16,14 @@
 # limitations under the License.
 
 require_relative "../powershell"
+require_relative "../pwsh"
 
-# The powershell_exec mixin provides in-process access to PowerShell engine via
-# a COM interop (installed by the Chef Client installer).
+# The powershell_exec mixin provides in-process access to the PowerShell engine.
 #
-# powershell_exec returns a Chef::PowerShell object that provides 4 methods:
+# powershell_exec is initialized with a string that should be set to the script
+# to run and also takes an optional interpreter argument which must be either
+# :powershell (Windows PowerShell which is the default) or :pwsh (PowerShell
+# Core). It will return a Chef::PowerShell object that provides 4 methods:
 #
 # .result - returns a hash representing the results returned by executing the
 #           PowerShell script block
@@ -42,6 +45,9 @@ require_relative "../powershell"
 # > powershell_exec("$a = $true; $a").result
 #  => true
 #
+# > powershell_exec("$PSVersionTable", :pwsh).result["PSEdition"]
+#  => "Core"
+#
 # > powershell_exec("not-found").errors
 #  => ["ObjectNotFound: (not-found:String) [], CommandNotFoundException: The
 #  term 'not-found' is not recognized as the name of a cmdlet, function, script
@@ -90,22 +96,28 @@ require_relative "../powershell"
 class Chef
   module Mixin
     module PowershellExec
-      # Run a command under PowerShell via a managed (.NET) COM interop API.
-      # This implementation requires the managed dll to be registered on the
-      # target machine.
+      # Run a command under PowerShell via a managed (.NET) API.
       #
       # Requires: .NET Framework 4.0 or higher on the target machine.
       #
       # @param script [String] script to run
+      # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
       # @return [Chef::PowerShell] output
-      def powershell_exec(script)
-        Chef::PowerShell.new(script)
+      def powershell_exec(script, interpreter = :powershell)
+        case interpreter
+        when :powershell
+          Chef::PowerShell.new(script)
+        when :pwsh
+          Chef::Pwsh.new(script)
+        else
+          raise ArgumentError, "Expected interpreter of :powershell or :pwsh"
+        end
       end
 
       # The same as the #powershell_exec method except this will raise
       # Chef::PowerShell::CommandFailed if the command fails
-      def powershell_exec!(script)
-        cmd = Chef::PowerShell.new(script)
+      def powershell_exec!(script, interpreter = :powershell)
+        cmd = powershell_exec(script, interpreter)
         cmd.error!
         cmd
       end