chef 10.14.2 → 10.14.4.rc.0

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

@@ -55,13 +55,11 @@ class Chef
               relevant_lines = ["# In #{file}\n\n"]
 
 
-              current_line = line - 2
+              current_line = line - 1
+              current_line = 0 if current_line < 0
               nesting = 0
 
-              relevant_lines << format_line(current_line, lines[current_line])
-
               loop do
-                current_line += 1
 
                 # low rent parser. try to gracefully handle nested blocks in resources
                 nesting += 1 if lines[current_line] =~ /[\s]+do[\s]*/
@@ -69,9 +67,11 @@ class Chef
 
                 relevant_lines << format_line(current_line, lines[current_line])
 
-                break if lines[current_line].nil?
+                break if lines[current_line + 1].nil?
                 break if current_line >= (line + 50)
                 break if nesting <= 0
+
+                current_line += 1
               end
               relevant_lines << format_line(current_line + 1, lines[current_line + 1]) if lines[current_line + 1]
               relevant_lines.join("")

data/lib/chef/knife/data_bag_edit.rb

@@ -84,7 +84,7 @@ class Chef
         output = edit_item(item)
         rest.put_rest("data/#{@name_args[0]}/#{@name_args[1]}", output)
         stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
-        output(format_for_display(object.raw_data)) if config[:print_after]
+        ui.output(output) if config[:print_after]
       end
     end
   end

data/lib/chef/knife/ssh.rb

@@ -48,8 +48,8 @@ class Chef
       option :attribute,
         :short => "-a ATTR",
         :long => "--attribute ATTR",
-        :description => "The attribute to use for opening the connection - default is fqdn",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key }
+        :description => "The attribute to use for opening the connection - default depends on the context",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key.strip }
 
       option :manual,
         :short => "-m",
@@ -128,6 +128,8 @@ class Chef
                    # see #configure_attribute for the source of config[:attribute] and config[:override_attribute]
                    if !config[:override_attribute] && item[:cloud] and item[:cloud][:public_hostname]
                      i = item[:cloud][:public_hostname]
+                   elsif config[:override_attribute]
+                     i = format_for_display(item)[config[:override_attribute]]
                    else
                      i = format_for_display(item)[config[:attribute]]
                    end
@@ -135,7 +137,16 @@ class Chef
                  end
                  r
                end
-        (ui.fatal("No nodes returned from search!"); exit 10) if list.length == 0
+        if list.length == 0
+          if @action_nodes.length == 0
+            ui.fatal("No nodes returned from search!")
+          else
+            ui.fatal("#{@action_nodes.length} #{@action_nodes.length > 1 ? "nodes":"node"} found, " +
+                     "but do not have the required attribute to stablish the connection. " +
+                     "Try setting another attribute to open the connection using --attribute.")
+          end
+          exit 10
+        end
         session_from_list(list)
       end
 
@@ -346,7 +357,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]
+        config[:override_attribute] = config[:attribute] || Chef::Config[:knife][:ssh_attribute] 
         config[:attribute] = (Chef::Config[:knife][:ssh_attribute] ||
                               config[:attribute] ||
                               "fqdn").strip

data/lib/chef/platform.rb

@@ -369,7 +369,7 @@ class Chef
         return platform, version
       end
 
-      def provider_for_resource(resource, action)
+      def provider_for_resource(resource, action=:nothing)
         node = resource.run_context && resource.run_context.node
         raise ArgumentError, "Cannot find the provider for a resource with no run context set" unless node
         provider = find_provider_for_node(node, resource).new(resource, resource.run_context)

data/lib/chef/provider/deploy.rb

@@ -149,6 +149,12 @@ class Chef
 
       def deploy
         verify_directories_exist
+        # CHEF-3435: We need to create the directories if they don't exist before calling the
+        # scm_provider because it expects them to be there in its own assertations
+        unless self.converge_actions.empty?
+          Chef::Log.info "#{@new_resource} running collected converge_actions before calling scm_provider"
+          self.converge_actions.converge!
+        end
         update_cached_repo # no converge-by - scm provider will dothis
         enforce_ownership
         copy_cached_repo
@@ -402,11 +408,9 @@ class Chef
       end
 
       def run_callback_from_file(callback_file)
-        if ::File.exist?(callback_file)
-          Dir.chdir(release_path) do
-            Chef::Log.info "#{@new_resource} running deploy hook #{callback_file}"
-            recipe_eval { from_file(callback_file) }
-          end
+        Dir.chdir(release_path) do
+          Chef::Log.info "#{@new_resource} queueing checkdeploy hook #{callback_file}"
+          recipe_eval { from_file(callback_file) if ::File.exist?(callback_file) }
         end
       end
 

data/lib/chef/provider/http_request.rb

@@ -34,18 +34,21 @@ class Chef
 
       # Send a HEAD request to @new_resource.url, with ?message=@new_resource.message
       def action_head
-        converge_by("#{@new_resource} HEAD to #{@new_resource.url}") do
-          message = check_message(@new_resource.message)
-          modified = @rest.run_request(
-            :HEAD,
-            @rest.create_url("#{@new_resource.url}?message=#{message}"),
-            @new_resource.headers,
-            false,
-            10,
-            false
-          )
-          Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
-          Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
+        message = check_message(@new_resource.message)
+        # returns true from Chef::REST if returns 2XX (Net::HTTPSuccess)
+        modified = @rest.run_request(
+          :HEAD,
+          @rest.create_url("#{@new_resource.url}?message=#{message}"),
+          @new_resource.headers,
+          false,
+          10,
+          false
+        )
+        Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
+        Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
+        # :head is usually used to trigger notifications, which converge_by now does
+        if modified
+          converge_by("#{@new_resource} HEAD to #{@new_resource.url} returned modified, trigger notifications") {}
         end
       end
 

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.14.2'
+  VERSION = '10.14.4.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/data/cookbooks/angrybash/recipes/default.rb

@@ -0,0 +1,8 @@
+bash "go off the rails" do
+  code <<-END
+    for i in localhost 127.0.0.1 #{Socket.gethostname()}
+    do
+      echo "grant all on *.* to root@'$i' identified by 'a_password'; flush privileges;" | mysql -u root -h 127.0.0.1
+    done
+   END
+end

data/spec/support/shared/unit/api_error_inspector.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.
@@ -177,4 +177,16 @@ shared_examples_for "an api error inspector" do
     end
   end
 
+  describe "when explaining an unknown error" do
+    before do
+      @exception = RuntimeError.new("(exception) something went wrong")
+      @inspector = described_class.new(@node_name, @exception, @config)
+      @inspector.add_explanation(@description)
+    end
+
+    it "prints a nice message" do
+      @description.display(@outputter)
+    end
+  end
+
 end

data/spec/unit/config_spec.rb

@@ -24,11 +24,7 @@ describe Chef::Config do
     @original_env = { 'HOME' => ENV['HOME'], 'SYSTEMDRIVE' => ENV['SYSTEMDRIVE'], 'HOMEPATH' => ENV['HOMEPATH'], 'USERPROFILE' => ENV['USERPROFILE'] }
   end
 
-  describe "config attribute writer: chef_server_url" do
-    before do
-      Chef::Config.chef_server_url = "https://junglist.gen.nz"
-    end
-
+  shared_examples_for "server URL" do
     it "should set the registration url" do
       Chef::Config.registration_url.should == "https://junglist.gen.nz"
     end
@@ -50,6 +46,22 @@ describe Chef::Config do
     end
   end
 
+  describe "config attribute writer: chef_server_url" do
+    before do
+      Chef::Config.chef_server_url = "https://junglist.gen.nz"
+    end
+    
+    it_behaves_like "server URL"
+  end
+
+  context "when the url has a leading space" do
+    before do
+      Chef::Config.chef_server_url = " https://junglist.gen.nz"
+    end
+    
+    it_behaves_like "server URL"
+  end
+
   describe "class method: manage_secret_key" do
     before do
       Chef::FileCache.stub!(:load).and_return(true)

data/spec/unit/cookbook_loader_spec.rb

@@ -59,10 +59,11 @@ describe Chef::CookbookLoader do
       @cookbook_loader.each do |cookbook_name, cookbook|
         seen << cookbook_name
       end
-      seen[0].should == "apache2"
-      seen[1].should == "borken"
-      seen[2].should == "java"
-      seen[3].should == "openldap"
+      seen[0].should == "angrybash"
+      seen[1].should == "apache2"
+      seen[2].should == "borken"
+      seen[3].should == "java"
+      seen[4].should == "openldap"
     end
   end
 

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -85,6 +85,10 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
       @inspector.add_explanation(@description)
     end
 
+    it "finds the line number of the error from the stacktrace" do
+      @inspector.culprit_line.should == 14
+    end
+
     it "prints a pretty message" do
       @description.display(@outputter)
     end
@@ -124,10 +128,64 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
       @inspector.add_explanation(@description)
     end
 
+    it "finds the culprit recipe name from the stacktrace" do
+      @inspector.culprit_file.should == "C:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb"
+    end
+
+    it "finds the line number of the error from the stack trace" do
+      @inspector.culprit_line.should == 14
+    end
+
     it "prints a pretty message" do
       @description.display(@outputter)
     end
   end
 
+  describe "when explaining an error on windows, and the backtrace lowercases the drive letter" do
+    before do
+      Chef::Config.stub!(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
+      recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
+      IO.should_receive(:readlines).with("c:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb").and_return(recipe_lines)
+      @trace = [
+        "c:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb:14 in `from_file'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:144:in `rescue in block in load_libraries'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:138:in `block in load_libraries'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:230:in `call'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:230:in `block (2 levels) in foreach_cookbook_load_segment'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:229:in `each'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:229:in `block in foreach_cookbook_load_segment'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:227:in `each'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:227:in `foreach_cookbook_load_segment'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:137:in `load_libraries'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/run_context.rb:62:in `load'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:198:in `setup_run_context'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:418:in `do_run'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/client.rb:176:in `run'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:283:in `block in run_application'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:270:in `loop'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application/client.rb:270:in `run_application'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/lib/chef/application.rb:70:in `run'",
+        "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-10.14.0/bin/chef-client:26:in `<top (required)>'",
+        "c:/opscode/chef/bin/chef-client:19:in `load'",
+        "c:/opscode/chef/bin/chef-client:19:in `<main>'"
+      ]
+      @exception.set_backtrace(@trace)
+      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @inspector = described_class.new(@path, @exception)
+      @inspector.add_explanation(@description)
+    end
+
+    it "finds the culprit recipe name from the stacktrace" do
+      @inspector.culprit_file.should == "c:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb"
+    end
+
+    it "finds the line number of the error from the stack trace" do
+      @inspector.culprit_line.should == 14
+    end
+
+    it "prints a pretty message" do
+      @description.display(@outputter)
+    end
+  end
 
 end

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -28,6 +28,24 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
   end
 
+  describe "when explaining a 403 error" do
+    before do
+
+      @response_body = %Q({"error": [{"message": "gtfo"}])
+      @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
+      @response.stub!(:body).and_return(@response_body)
+      @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
+
+      @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
+      @inspector.add_explanation(@description)
+    end
+
+    it "prints a nice message" do
+      lambda { @description.display(@outputter) }.should_not raise_error
+    end
+
+  end
+
   describe "when explaining a PreconditionFailed (412) error with current error message style" do
     # Chef currently returns error messages with some fields as JSON strings,
     # which must be re-parsed to get the actual data.

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -98,5 +98,35 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         @inspector.recipe_snippet.should match(/^# In \/home\/btm/)
       end
     end
+
+    describe "when examining a resource that confuses the parser" do
+      before do
+        angry_bash_recipe = File.expand_path("cookbooks/angrybash/recipes/default.rb", CHEF_SPEC_DATA)
+        source_line = "#{angry_bash_recipe}:1:in `<main>'"
+
+        # source_line = caller(0)[0]; @resource = bash "go off the rails" do
+        #   code <<-END
+        #     for i in localhost 127.0.0.1 #{Socket.gethostname()}
+        #     do
+        #       echo "grant all on *.* to root@'$i' identified by 'a_password'; flush privileges;" | mysql -u root -h 127.0.0.1
+        #     done
+        #    END
+        # end
+        @resource = eval(IO.read(angry_bash_recipe))
+        @resource.source_line = source_line
+        @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+
+        @exception.set_backtrace(@trace)
+        @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
+      end
+
+      it "does not generate an error" do
+        lambda { @inspector.add_explanation(@description) }.should_not raise_error(TypeError)
+        @description.display(@outputter)
+      end
+    end
+
   end
+
+
 end

data/spec/unit/knife/ssh_spec.rb

@@ -23,11 +23,13 @@ require 'net/ssh/multi'
 describe Chef::Knife::Ssh do
   before(:all) do
     @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
     Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
   end
 
   after(:all) do
     Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
   end
 
   before do
@@ -36,8 +38,10 @@ describe Chef::Knife::Ssh do
     @knife.config[:attribute] = "fqdn"
     @node_foo = Chef::Node.new('foo')
     @node_foo[:fqdn] = "foo.example.org"
-    @node_bar = Chef::Node.new('foo')
+    @node_foo[:ipaddress] = "10.0.0.1"
+    @node_bar = Chef::Node.new('bar')
     @node_bar[:fqdn] = "bar.example.org"
+    @node_bar[:ipaddress] = "10.0.0.2"
   end
 
   describe "#configure_session" do
@@ -47,27 +51,36 @@ describe Chef::Knife::Ssh do
         @query = Chef::Search::Query.new
       end
 
-      def self.should_return_array_of_attributes
-        it "returns an array of the specified attributes if configured" do
+      def configure_query(node_array)
+        @query.stub!(:search).and_return([node_array])
+        Chef::Search::Query.stub!(:new).and_return(@query)
+      end
+
+      def self.should_return_specified_attributes
+        it "returns an array of the attributes specified on the command line OR config file, if only one is set" do
           @knife.config[:attribute] = "ipaddress"
           @knife.config[:override_attribute] = "ipaddress"
-          @node_foo[:ipaddress] = "10.0.0.1"
-          @node_bar[:ipaddress] = "10.0.0.2"
-          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
-          Chef::Search::Query.stub!(:new).and_return(@query)
+          configure_query([@node_foo, @node_bar])
+          @knife.should_receive(:session_from_list).with(['10.0.0.1', '10.0.0.2'])
+          @knife.configure_session
+        end
+        
+        it "returns an array of the attributes specified on the command line even when a config value is set" do
+          @knife.config[:attribute] = "config_file" # this value will be the config file
+          @knife.config[:override_attribute] = "ipaddress" # this is the value of the command line via #configure_attribute
+          configure_query([@node_foo, @node_bar])
           @knife.should_receive(:session_from_list).with(['10.0.0.1', '10.0.0.2'])
           @knife.configure_session
         end
       end
 
       it "searchs for and returns an array of fqdns" do
-        @query.stub!(:search).and_return([[@node_foo, @node_bar]])
-        Chef::Search::Query.stub!(:new).and_return(@query)
+        configure_query([@node_foo, @node_bar])
         @knife.should_receive(:session_from_list).with(['foo.example.org', 'bar.example.org'])
         @knife.configure_session
       end
 
-      should_return_array_of_attributes
+      should_return_specified_attributes
 
       context "when cloud hostnames are available" do
         before do
@@ -78,22 +91,35 @@ describe Chef::Knife::Ssh do
         end
 
         it "returns an array of cloud public hostnames" do
-          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
-          Chef::Search::Query.stub!(:new).and_return(@query)
+          configure_query([@node_foo, @node_bar])
           @knife.should_receive(:session_from_list).with(['ec2-10-0-0-1.compute-1.amazonaws.com', 'ec2-10-0-0-2.compute-1.amazonaws.com'])
           @knife.configure_session
         end
-  
-        should_return_array_of_attributes
+
+        should_return_specified_attributes
       end
 
       it "should raise an error if no host are found" do
-          @query.stub!(:search).and_return([[ ]])
-          Chef::Search::Query.stub!(:new).and_return(@query)
+          configure_query([ ])
           @knife.ui.should_receive(:fatal)
           @knife.should_receive(:exit).with(10)
           @knife.configure_session
       end
+
+      context "when there are some hosts found but they do not have an attribute to connect with" do
+        before do
+          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+          @node_foo[:fqdn] = nil
+          @node_bar[:fqdn] = nil
+          Chef::Search::Query.stub!(:new).and_return(@query)
+        end
+
+        it "should raise a specific error (CHEF-3402)" do
+          @knife.ui.should_receive(:fatal).with(/^2 nodes found/)
+          @knife.should_receive(:exit).with(10)
+          @knife.configure_session
+        end
+      end
     end
 
     context "manual is set to true" do
@@ -121,24 +147,37 @@ describe Chef::Knife::Ssh do
     end
 
     it "should return the value set in the configuration file" do
-      Chef::Config[:knife][:ssh_attribute] = "magic"
+      Chef::Config[:knife][:ssh_attribute] = "config_file"
       @knife.configure_attribute
-      @knife.config[:attribute].should == "magic"
+      @knife.config[:attribute].should == "config_file"
     end
 
     it "should return the value set on the command line" do
-      @knife.config[:attribute] = "penguins"
+      @knife.config[:attribute] = "command_line"
       @knife.configure_attribute
-      @knife.config[:attribute].should == "penguins"
+      @knife.config[:attribute].should == "command_line"
     end
 
-    it "should set override_attribute to the value of attribute" do
-      @knife.config[:attribute] = "penguins"
+    it "should set override_attribute to the value of attribute from the command line" do
+      @knife.config[:attribute] = "command_line"
       @knife.configure_attribute
-      @knife.config[:attribute].should == "penguins"
-      @knife.config[:override_attribute].should == "penguins"
+      @knife.config[:attribute].should == "command_line"
+      @knife.config[:override_attribute].should == "command_line"
     end
 
+    it "should set override_attribute to the value of attribute from the config file" do
+      Chef::Config[:knife][:ssh_attribute] = "config_file"
+      @knife.configure_attribute
+      @knife.config[:attribute].should == "config_file"
+      @knife.config[:override_attribute].should == "config_file"
+    end
+
+    it "should prefer the command line over the config file for the value of override_attribute" do
+      Chef::Config[:knife][:ssh_attribute] = "config_file"
+      @knife.config[:attribute] = "command_line"
+      @knife.configure_attribute
+      @knife.config[:override_attribute].should == "command_line"
+    end
   end
 
 end