chef 11.6.2 → 11.8.0.rc.1

data/lib/chef/knife/data_bag_edit.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -32,13 +32,15 @@ class Chef
       category "data bag"
 
       option :secret,
-      :short => "-s SECRET",
-      :long  => "--secret ",
-      :description => "The secret key to use to encrypt data bag item values"
+        :short => "-s SECRET",
+        :long  => "--secret ",
+        :description => "The secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
-      :description => "A file containing the secret key to use to encrypt data bag item values"
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       def read_secret
         if config[:secret]

data/lib/chef/knife/data_bag_from_file.rb

@@ -35,18 +35,20 @@ class Chef
       category "data bag"
 
       option :secret,
-      :short => "-s SECRET",
-      :long  => "--secret ",
-      :description => "The secret key to use to encrypt data bag item values"
+        :short => "-s SECRET",
+        :long  => "--secret ",
+        :description => "The secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
-      :description => "A file containing the secret key to use to encrypt data bag item values"
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       option :all,
-      :short => "-a",
-      :long  => "--all",
-      :description => "Upload all data bags or all items for specified data bags"
+        :short => "-a",
+        :long  => "--all",
+        :description => "Upload all data bags or all items for specified data bags"
 
       def read_secret
         if config[:secret]

data/lib/chef/knife/data_bag_list.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/knife/data_bag_show.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -32,13 +32,15 @@ class Chef
       category "data bag"
 
       option :secret,
-      :short => "-s SECRET",
-      :long  => "--secret ",
-      :description => "The secret key to use to decrypt data bag item values"
+        :short => "-s SECRET",
+        :long  => "--secret ",
+        :description => "The secret key to use to decrypt data bag item values",
+        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
 
       option :secret_file,
-      :long => "--secret-file SECRET_FILE",
-      :description => "A file containing the secret key to use to decrypt data bag item values"
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to decrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       def read_secret
         if config[:secret]

data/lib/chef/knife/delete.rb

@@ -5,6 +5,8 @@ class Chef
     class Delete < Chef::ChefFS::Knife
       banner "knife delete [PATTERN1 ... PATTERNn]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
       end

data/lib/chef/knife/deps.rb

@@ -5,6 +5,8 @@ class Chef
     class Deps < Chef::ChefFS::Knife
       banner "knife deps PATTERN1 [PATTERNn]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
         require 'chef/run_list'

data/lib/chef/knife/diff.rb

@@ -5,6 +5,8 @@ class Chef
     class Diff < Chef::ChefFS::Knife
       banner "knife diff PATTERNS"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/command_line'
       end
@@ -30,6 +32,10 @@ class Chef
         :description => "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
            there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
 
+      option :cookbook_version,
+        :long => '--cookbook-version VERSION',
+        :description => 'Version of cookbook to download (if there are multiple versions and cookbook_versions is false)'
+
       def run
         if config[:name_only]
           output_mode = :name_only

data/lib/chef/knife/download.rb

@@ -5,6 +5,8 @@ class Chef
     class Download < Chef::ChefFS::Knife
       banner "knife download PATTERNS"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/command_line'
       end
@@ -40,6 +42,10 @@ class Chef
         :default => true,
         :description => 'Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff'
 
+      option :cookbook_version,
+        :long => '--cookbook-version VERSION',
+        :description => 'Version of cookbook to download (if there are multiple versions and cookbook_versions is false)'
+
       def run
         if name_args.length == 0
           show_usage

data/lib/chef/knife/edit.rb

@@ -5,6 +5,8 @@ class Chef
     class Edit < Chef::ChefFS::Knife
       banner "knife edit [PATTERN1 ... PATTERNn]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
         require 'chef/chef_fs/file_system/not_found_error'
@@ -49,10 +51,8 @@ class Chef
 
       def edit_text(text, extension)
         if (!config[:disable_editing])
-          file = Tempfile.new([ 'knife-edit-', extension ])
-          begin
+          Tempfile.open([ 'knife-edit-', extension ]) do |file|
             # Write the text to a temporary file
-            file.open
             file.write(text)
             file.close
 
@@ -61,12 +61,9 @@ class Chef
               raise "Please set EDITOR environment variable"
             end
 
-            file.open
-            result_text = file.read
-            return result_text if result_text != text
+            result_text = IO.read(file.path)
 
-          ensure
-            file.close!
+            return result_text if result_text != text
           end
         end
       end

data/lib/chef/knife/environment_from_file.rb

@@ -62,7 +62,7 @@ class Chef
         ui.info("Updated Environment #{updated.name}")
       end
 
-        
+
       def run
         if config[:all] == true
           load_all_environments
@@ -72,7 +72,7 @@ class Chef
             ui.fatal("You must specify a file to load")
             exit 1
           end
-  
+
           @name_args.each do |arg|
             load_environment(arg)
           end

data/lib/chef/knife/help_topics.rb

@@ -1,4 +1,4 @@
 # Do not edit this file by hand
 # This file is autogenerated by the docs:list rake task from the available manpages
 
-HELP_TOPICS = ["chef-shell", "knife-bootstrap", "knife-client", "knife-configure", "knife-cookbook-site", "knife-cookbook", "knife-data-bag", "knife-environment", "knife-exec", "knife-index", "knife-node", "knife-role", "knife-search", "knife-ssh", "knife-status", "knife-tag", "knife", "shef"]
+HELP_TOPICS = ["chef-shell", "knife-bootstrap", "knife-client", "knife-configure", "knife-cookbook-site", "knife-cookbook", "knife-data-bag", "knife-delete", "knife-deps", "knife-diff", "knife-download", "knife-edit", "knife-environment", "knife-exec", "knife-index-rebuild", "knife-list", "knife-node", "knife-raw", "knife-recipe-list", "knife-role", "knife-search", "knife-show", "knife-ssh", "knife-status", "knife-tag", "knife-upload", "knife-user", "knife-xargs", "knife"]

data/lib/chef/knife/index_rebuild.rb

@@ -40,7 +40,7 @@ class Chef
           nag
           output rest.post_rest("/search/reindex", {})
         end
-        
+
       end
 
       def grab_api_info
@@ -55,7 +55,7 @@ class Chef
         r = exception.response
         parse_api_info(r)
       end
-      
+
       # Only Chef 11+ servers will have version information in their
       # headers, and only those servers will lack an API endpoint for
       # index rebuilding.

data/lib/chef/knife/list.rb

@@ -5,6 +5,8 @@ class Chef
     class List < Chef::ChefFS::Knife
       banner "knife list [-dfR1p] [PATTERN1 ... PATTERNn]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
         require 'highline'

data/lib/chef/knife/raw.rb

@@ -6,10 +6,13 @@ class Chef
       banner "knife raw REQUEST_PATH"
 
       deps do
-        require 'json'
-        require 'chef/rest'
+        require 'chef/json_compat'
         require 'chef/config'
-        require 'chef/chef_fs/raw_request'
+        require 'chef/http'
+        require 'chef/http/authenticator'
+        require 'chef/http/cookie_manager'
+        require 'chef/http/decompressor'
+        require 'chef/http/json_output'
       end
 
       option :method,
@@ -29,6 +32,18 @@ class Chef
         :short => '-i FILE',
         :description => "Name of file to use for PUT or POST"
 
+      class RawInputServerAPI < Chef::HTTP
+        def initialize(options = {})
+          options[:client_name] ||= Chef::Config[:node_name]
+          options[:signing_key_filename] ||= Chef::Config[:client_key]
+          super(Chef::Config[:chef_server_url], options)
+        end
+        use Chef::HTTP::JSONOutput
+        use Chef::HTTP::CookieManager
+        use Chef::HTTP::Decompressor
+        use Chef::HTTP::Authenticator
+      end
+
       def run
         if name_args.length == 0
           show_usage
@@ -45,9 +60,20 @@ class Chef
         if config[:input]
           data = IO.read(config[:input])
         end
-        chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
         begin
-          output Chef::ChefFS::RawRequest.api_request(chef_rest, config[:method].to_sym, chef_rest.create_url(name_args[0]), {}, data)
+          method = config[:method].to_sym
+
+          if config[:pretty]
+            chef_rest = RawInputServerAPI.new
+            result = chef_rest.request(method, name_args[0], {'Content-Type' => 'application/json'}, data)
+            unless result.is_a?(String)
+              result = Chef::JSONCompat.to_json_pretty(result)
+            end
+          else
+            chef_rest = RawInputServerAPI.new(:raw_output => true)
+            result = chef_rest.request(method, name_args[0], {'Content-Type' => 'application/json'}, data)
+          end
+          output result
         rescue Timeout::Error => e
           ui.error "Server timeout"
           exit 1

data/lib/chef/knife/show.rb

@@ -5,6 +5,8 @@ class Chef
     class Show < Chef::ChefFS::Knife
       banner "knife show [PATTERN1 ... PATTERNn]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
         require 'chef/chef_fs/file_system/not_found_error'

data/lib/chef/knife/ssh.rb

@@ -147,7 +147,7 @@ class Chef
                  @action_nodes = q.search(:node, @name_args[0])[0]
                  @action_nodes.each do |item|
                    # we should skip the loop to next iteration if the item returned by the search is nil
-                   next if item.nil? 
+                   next if item.nil?
                    # if a command line attribute was not passed, and we have a cloud public_hostname, use that.
                    # see #configure_attribute for the source of config[:attribute] and config[:override_attribute]
                    if !config[:override_attribute] && item[:cloud] and item[:cloud][:public_hostname]
@@ -211,15 +211,28 @@ class Chef
       end
 
       def print_data(host, data)
-        if data =~ /\n/
-          data.split(/\n/).each { |d| print_data(host, d) }
+        @buffers ||= {}
+        if leftover = @buffers[host]
+          @buffers[host] = nil
+          print_data(host, leftover + data)
         else
-          padding = @longest - host.length
-          str = ui.color(host, :cyan) + (" " * (padding + 1)) + data
-          ui.msg(str)
+          if newline_index = data.index("\n")
+            line = data.slice!(0...newline_index)
+            data.slice!(0)
+            print_line(host, line)
+            print_data(host, data)
+          else
+            @buffers[host] = data
+          end
         end
       end
 
+      def print_line(host, data)
+        padding = @longest - host.length
+        str = ui.color(host, :cyan) + (" " * (padding + 1)) + data
+        ui.msg(str)
+      end
+
       def ssh_command(command, subsession=nil)
         exit_status = 0
         subsession ||= session
@@ -232,6 +245,7 @@ class Chef
             ch.on_data do |ichannel, data|
               print_data(ichannel[:host], data)
               if data =~ /^knife sudo password: /
+                print_data(ichannel[:host], "\n")
                 ichannel.send_data("#{get_password}\n")
               end
             end
@@ -383,7 +397,7 @@ class Chef
         # Thus we can differentiate between a config file value and a command line override at this point by checking config[:attribute]
         # We can tell here if fqdn was passed from the command line, rather than being the default, by checking config[:attribute]
         # However, after here, we cannot tell these things, so we must preserve config[:attribute]
-        config[:override_attribute] = config[:attribute] || Chef::Config[:knife][:ssh_attribute] 
+        config[:override_attribute] = config[:attribute] || Chef::Config[:knife][:ssh_attribute]
         config[:attribute] = (Chef::Config[:knife][:ssh_attribute] ||
                               config[:attribute] ||
                               "fqdn").strip

data/lib/chef/knife/status.rb

@@ -72,7 +72,7 @@ class Chef
           hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
           hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
           minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
-          run_list = ", #{node.run_list}." if config[:run_list]
+          run_list = "#{node.run_list}" if config[:run_list]
           if hours > 24
             color = :red
             text = hours_text

data/lib/chef/knife/upload.rb

@@ -5,6 +5,8 @@ class Chef
     class Upload < Chef::ChefFS::Knife
       banner "knife upload PATTERNS"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/command_line'
       end

data/lib/chef/knife/xargs.rb

@@ -5,6 +5,8 @@ class Chef
     class Xargs < Chef::ChefFS::Knife
       banner "knife xargs [COMMAND]"
 
+      category "path-based"
+
       deps do
         require 'chef/chef_fs/file_system'
         require 'chef/chef_fs/file_system/not_found_error'

data/lib/chef/mixin/checksum.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/mixin/command.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -24,6 +24,26 @@ require 'etc'
 
 class Chef
   module Mixin
+
+    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    # NOTE:
+    # The popen4 method upon which all the code here is based has a race
+    # condition where it may fail to read all of the data written to stdout and
+    # stderr after the child process exits. The tests for the code here
+    # occasionally fail because of this race condition, so they have been
+    # tagged "volatile".
+    #
+    # This code is considered deprecated, so it should not need to be modified
+    # frequently, if at all. HOWEVER, if you do modify the code here, you must
+    # explicitly enable volatile tests:
+    #
+    #   bundle exec rspec spec/unit/mixin/command_spec.rb -t volatile
+    #
+    # In addition, you should make a note that tests need to be run with
+    # volatile tests enabled on any pull request or bug report you submit with
+    # your patch.
+    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
     module Command
       extend self
 
@@ -41,23 +61,32 @@ class Chef
 
       # === Parameters
       # args<Hash>: A number of required and optional arguments
-      #   command<String>, <Array>: A complete command with options to execute or a command and options as an Array 
+      #   command<String>, <Array>: A complete command with options to execute or a command and options as an Array
       #   creates<String>: The absolute path to a file that prevents the command from running if it exists
       #   cwd<String>: Working directory to execute command in, defaults to Dir.tmpdir
       #   timeout<String>: How many seconds to wait for the command to execute before timing out
       #   returns<String>: The single exit value command is expected to return, otherwise causes an exception
       #   ignore_failure<Boolean>: Whether to raise an exception on failure, or just return the status
       #   output_on_failure<Boolean>: Return output in raised exception regardless of Log.level
-      # 
+      #
       #   user<String>: The UID or user name of the user to execute the command as
       #   group<String>: The GID or group name of the group to execute the command as
       #   environment<Hash>: Pairs of environment variable names and their values to set before execution
       #
       # === Returns
       # Returns the exit status of args[:command]
-      def run_command(args={})         
+      def run_command(args={})
+        status, stdout, stderr = run_command_and_return_stdout_stderr(args)
+
+        status
+      end
+
+      # works same as above, except that it returns stdout and stderr
+      # requirement => platforms like solaris 9,10 has wierd issues where
+      # even in command failure the exit code is zero, so we need to lookup stderr.
+      def run_command_and_return_stdout_stderr(args={})
         command_output = ""
-        
+
         args[:ignore_failure] ||= false
         args[:output_on_failure] ||= false
 
@@ -68,28 +97,28 @@ class Chef
             return false
           end
         end
-        
+
         status, stdout, stderr = output_of_command(args[:command], args)
         command_output << "STDOUT: #{stdout}"
         command_output << "STDERR: #{stderr}"
         handle_command_failures(status, command_output, args)
-        
-        status
+
+        return status, stdout, stderr
       end
-      
+
       def output_of_command(command, args)
         Chef::Log.debug("Executing #{command}")
         stderr_string, stdout_string, status = "", "", nil
-        
+
         exec_processing_block = lambda do |pid, stdin, stdout, stderr|
           stdout_string, stderr_string = stdout.string.chomp, stderr.string.chomp
         end
-        
+
         args[:cwd] ||= Dir.tmpdir
         unless ::File.directory?(args[:cwd])
           raise Chef::Exceptions::Exec, "#{args[:cwd]} does not exist or is not a directory"
         end
-        
+
         Dir.chdir(args[:cwd]) do
           if args[:timeout]
             begin
@@ -103,17 +132,17 @@ class Chef
           else
             status = popen4(command, args, &exec_processing_block)
           end
-          
+
           Chef::Log.debug("---- Begin output of #{command} ----")
           Chef::Log.debug("STDOUT: #{stdout_string}")
           Chef::Log.debug("STDERR: #{stderr_string}")
           Chef::Log.debug("---- End output of #{command} ----")
           Chef::Log.debug("Ran #{command} returned #{status.exitstatus}")
         end
-        
+
         return status, stdout_string, stderr_string
       end
-      
+
       def handle_command_failures(status, command_output, opts={})
         unless opts[:ignore_failure]
           opts[:returns] ||= 0
@@ -129,7 +158,7 @@ class Chef
           end
         end
       end
-      
+
       # Call #run_command but set LC_ALL to the system's current environment so it doesn't get changed to C.
       #
       # === Parameters