chef 10.14.4 → 10.16.0.rc.0

data/spec/unit/resource/script_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -52,4 +53,17 @@ describe Chef::Resource::Script do
     @resource.flags.should eql("-f")
   end
 
+  describe "when it has interpreter and flags" do
+    before do 
+      @resource.command("grep")
+      @resource.interpreter("gcc")
+      @resource.flags("-al")
+    end
+
+    it "returns the command as its identity" do
+      @resource.identity.should == "grep"
+    end
+  end
+
+
 end

data/spec/unit/resource/service_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@hjksolutions.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -141,4 +142,24 @@ describe Chef::Resource::Service do
       @resource.supports.should == support_hash
     end
   end
+
+  describe "when it has pattern and supports" do
+    before do 
+      @resource.service_name("superfriend")
+      @resource.enabled(true)
+      @resource.running(false)
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:enabled].should eql(true)
+      state[:running].should eql(false)
+    end
+
+    it "returns the service name as its identity" do
+      @resource.identity.should == "superfriend"
+    end
+  end
+
+  
 end

data/spec/unit/resource/user_spec.rb

@@ -98,4 +98,25 @@ end
       lambda { @resource.send(attrib, { :woot => "i found it" }) }.should raise_error(ArgumentError)
     end
   end
+  
+  describe "when it has uid, gid, and home" do
+    before do
+      @resource = Chef::Resource::User.new("root")
+      @resource.uid(123)
+      @resource.gid(456)
+      @resource.home("/usr/local/root/")
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:uid].should == 123
+      state[:gid].should == 456
+      state[:home].should == "/usr/local/root/"
+    end
+
+    it "returns the username as its identity" do
+      @resource.identity.should == "root"
+    end
+  end
+
 end

data/spec/unit/resource_reporter_spec.rb

@@ -24,16 +24,19 @@ require 'chef/resource_reporter'
 
 describe Chef::ResourceReporter do
   before(:all) do
-    @reporting_toggle_default = Chef::Config[:disable_reporting]
-    Chef::Config[:disable_reporting] = false
+    @reporting_toggle_default = Chef::Config[:enable_reporting]
+    Chef::Config[:enable_reporting] = true
   end
 
   after(:all) do
-    Chef::Config[:disable_reporting] = @reporting_toggle_default
+    Chef::Config[:enable_reporting] = @reporting_toggle_default
   end
 
   before do
+    @node = Chef::Node.new
+    @node.name("spitfire")
     @rest_client = mock("Chef::REST (mock)")
+    @rest_client.stub!(:post_rest).and_return(true)
     @resource_reporter = Chef::ResourceReporter.new(@rest_client)
     @new_resource      = Chef::Resource::File.new("/tmp/a-file.txt")
     @new_resource.cookbook_name = "monkey"
@@ -57,7 +60,7 @@ describe Chef::ResourceReporter do
     end
 
     it "should have no error_descriptions" do
-      @resource_reporter.error_descriptions.should be_nil
+      @resource_reporter.error_descriptions.should eq({})
       # @resource_reporter.error_descriptions.should be_empty
       # @resource_reporter.should have(0).error_descriptions
     end
@@ -65,6 +68,7 @@ describe Chef::ResourceReporter do
   end
 
   context "after the chef run completes" do
+
     before do
     end
 
@@ -74,113 +78,118 @@ describe Chef::ResourceReporter do
     end
   end
 
-  context "when chef fails before converging any resources" do
-    before do
-      @exception = Exception.new
-      @resource_reporter.run_failed(@exception)
-    end
-
-    it "sets the run status to 'failure'" do
-      @resource_reporter.status.should == "failure"
-    end
-
-    it "keeps the exception data" do
-      @resource_reporter.exception.should == @exception
-    end
-
-  end
-
-  context "when a resource fails before loading current state" do
+  context "when chef fails" do
     before do
-      @exception = Exception.new
-      @exception.set_backtrace(caller)
-      @resource_reporter.resource_action_start(@new_resource, :create)
-      @resource_reporter.resource_failed(@new_resource, :create, @exception)
-      @resource_reporter.resource_completed(@new_resource)
-    end
-
-    it "collects the resource as an updated resource" do
-      @resource_reporter.should have(1).updated_resources
-    end
-
-    it "collects the desired state of the resource" do
-      update_record = @resource_reporter.updated_resources.first
-      update_record.new_resource.should == @new_resource
-
-    end
-  end
-
-  # TODO: make sure a resource that is skipped because of `not_if` doesn't
-  # leave us in a bad state.
+      @rest_client.stub!(:create_url).and_return("reports/nodes/spitfire/runs/ABC123");
+      @rest_client.stub!(:raw_http_request).and_return({"result"=>"ok"});
+      @rest_client.stub!(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/ABC123"});
 
-  context "once the a resource's current state is loaded" do
-    before do
-      @resource_reporter.resource_action_start(@new_resource, :create)
-      @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
+      @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
     end
 
-    context "and the resource was not updated" do
+    context "before converging any resources" do
       before do
-        @resource_reporter.resource_up_to_date(@new_resource, :create)
+        @exception = Exception.new
+        @resource_reporter.run_failed(@exception)
       end
-
-      it "has no updated resources" do
-        @resource_reporter.should have(0).updated_resources
+      
+      it "sets the run status to 'failure'" do
+        @resource_reporter.status.should == "failure"
+      end
+      
+      it "keeps the exception data" do
+        @resource_reporter.exception.should == @exception
       end
     end
 
-    context "and the resource was updated" do
+    context "when a resource fails before loading current state" do
       before do
-        @new_resource.content("this is the old content")
-        @current_resource.content("this is the new hotness")
-        @resource_reporter.resource_updated(@new_resource, :create)
+        @exception = Exception.new
+        @exception.set_backtrace(caller)
+        @resource_reporter.resource_action_start(@new_resource, :create)
+        @resource_reporter.resource_failed(@new_resource, :create, @exception)
         @resource_reporter.resource_completed(@new_resource)
       end
 
-      it "collects the updated resource" do
+      it "collects the resource as an updated resource" do
         @resource_reporter.should have(1).updated_resources
       end
 
-      it "collects the old state of the resource" do
+      it "collects the desired state of the resource" do
         update_record = @resource_reporter.updated_resources.first
+        update_record.new_resource.should == @new_resource        
+      end
+    end
 
-        update_record.current_resource.should == @current_resource
+    # TODO: make sure a resource that is skipped because of `not_if` doesn't
+    # leave us in a bad state.
+    
+    context "once the a resource's current state is loaded" do
+      before do
+        @resource_reporter.resource_action_start(@new_resource, :create)
+        @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
       end
 
-      it "collects the new state of the resource" do
-        update_record = @resource_reporter.updated_resources.first
+      context "and the resource was not updated" do
+        before do
+          @resource_reporter.resource_up_to_date(@new_resource, :create)
+        end
 
-        update_record.new_resource.should == @new_resource
+        it "has no updated resources" do
+          @resource_reporter.should have(0).updated_resources
+        end
       end
 
-      context "and a subsequent resource fails before loading current resource" do
+      context "and the resource was updated" do
         before do
-          @next_new_resource = Chef::Resource::Service.new("apache2")
-          @exception = Exception.new
-          @exception.set_backtrace(caller)
-          @resource_reporter.resource_failed(@next_new_resource, :create, @exception)
-          @resource_reporter.resource_completed(@next_new_resource)
+          @new_resource.content("this is the old content")
+          @current_resource.content("this is the new hotness")
+          @resource_reporter.resource_updated(@new_resource, :create)
+          @resource_reporter.resource_completed(@new_resource)
         end
 
-        it "collects the desired state of the failed resource" do
-          failed_resource_update = @resource_reporter.updated_resources.last
-          failed_resource_update.new_resource.should == @next_new_resource
+        it "collects the updated resource" do
+          @resource_reporter.should have(1).updated_resources
+        end
+        
+        it "collects the old state of the resource" do
+          update_record = @resource_reporter.updated_resources.first          
+          update_record.current_resource.should == @current_resource
+        end
+        
+        it "collects the new state of the resource" do
+          update_record = @resource_reporter.updated_resources.first
+          update_record.new_resource.should == @new_resource
         end
 
-        it "does not have the current state of the failed resource" do
-          failed_resource_update = @resource_reporter.updated_resources.last
-          failed_resource_update.current_resource.should be_nil
+        context "and a subsequent resource fails before loading current resource" do
+          before do
+            @next_new_resource = Chef::Resource::Service.new("apache2")
+            @exception = Exception.new
+            @exception.set_backtrace(caller)
+            @resource_reporter.resource_failed(@next_new_resource, :create, @exception)
+            @resource_reporter.resource_completed(@next_new_resource)
+          end
+          
+          it "collects the desired state of the failed resource" do
+            failed_resource_update = @resource_reporter.updated_resources.last
+            failed_resource_update.new_resource.should == @next_new_resource
+          end
+          
+          it "does not have the current state of the failed resource" do
+            failed_resource_update = @resource_reporter.updated_resources.last
+            failed_resource_update.current_resource.should be_nil
+          end
         end
       end
-    end
-
-    # Some providers, such as RemoteDirectory and some LWRPs use other
-    # resources for their implementation. These should be hidden from reporting
-    # since we only care about the top-level resource and not the sub-resources
-    # used for implementation.
-    context "and a nested resource is updated" do
-      before do
-        @implementation_resource = Chef::Resource::CookbookFile.new("/preseed-file.txt")
+    
+      # Some providers, such as RemoteDirectory and some LWRPs use other
+      # resources for their implementation. These should be hidden from reporting
+      # since we only care about the top-level resource and not the sub-resources
+      # used for implementation.
+      context "and a nested resource is updated" do
+        before do
+          @implementation_resource = Chef::Resource::CookbookFile.new("/preseed-file.txt")
         @resource_reporter.resource_action_start(@implementation_resource , :create)
         @resource_reporter.resource_current_state_loaded(@implementation_resource, :create, @implementation_resource)
         @resource_reporter.resource_updated(@implementation_resource, :create)
@@ -189,54 +198,63 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_completed(@new_resource)
       end
 
-      it "does not collect data about the nested resource" do
-        @resource_reporter.should have(1).updated_resources
-      end
-    end
-
-    context "and a nested resource runs but is not updated" do
-      before do
-        @implementation_resource = Chef::Resource::CookbookFile.new("/preseed-file.txt")
-        @resource_reporter.resource_action_start(@implementation_resource , :create)
-        @resource_reporter.resource_current_state_loaded(@implementation_resource, :create, @implementation_resource)
-        @resource_reporter.resource_up_to_date(@implementation_resource, :create)
-        @resource_reporter.resource_completed(@implementation_resource)
-        @resource_reporter.resource_updated(@new_resource, :create)
-        @resource_reporter.resource_completed(@new_resource)
-      end
-
-      it "does not collect data about the nested resource" do
-        @resource_reporter.should have(1).updated_resources
-      end
-    end
-
-    context "and the resource failed to converge" do
-      before do
-        @exception = Exception.new
-        @exception.set_backtrace(caller)
-        @resource_reporter.resource_failed(@new_resource, :create, @exception)
-        @resource_reporter.resource_completed(@new_resource)
+        it "does not collect data about the nested resource" do
+          @resource_reporter.should have(1).updated_resources
+        end
       end
 
-      it "collects the resource as an updated resource" do
-        @resource_reporter.should have(1).updated_resources
+      context "and a nested resource runs but is not updated" do
+        before do
+          @implementation_resource = Chef::Resource::CookbookFile.new("/preseed-file.txt")
+          @resource_reporter.resource_action_start(@implementation_resource , :create)
+          @resource_reporter.resource_current_state_loaded(@implementation_resource, :create, @implementation_resource)
+          @resource_reporter.resource_up_to_date(@implementation_resource, :create)
+          @resource_reporter.resource_completed(@implementation_resource)
+          @resource_reporter.resource_updated(@new_resource, :create)
+          @resource_reporter.resource_completed(@new_resource)
+        end
+        
+        it "does not collect data about the nested resource" do
+          @resource_reporter.should have(1).updated_resources
+        end
       end
 
-      it "collects the desired state of the resource" do
-        update_record = @resource_reporter.updated_resources.first
-        update_record.new_resource.should == @new_resource
+      context "and the resource failed to converge" do
+        before do
+          @exception = Exception.new
+          @exception.set_backtrace(caller)
+          @resource_reporter.resource_failed(@new_resource, :create, @exception)
+          @resource_reporter.resource_completed(@new_resource)
+        end
+        
+        it "collects the resource as an updated resource" do
+          @resource_reporter.should have(1).updated_resources
+        end
+        
+        it "collects the desired state of the resource" do
+          update_record = @resource_reporter.updated_resources.first
+          update_record.new_resource.should == @new_resource
+        end
+        
+        it "collects the current state of the resource" do
+          update_record = @resource_reporter.updated_resources.first
+          update_record.current_resource.should == @current_resource
+        end
       end
 
-      it "collects the current state of the resource" do
-        update_record = @resource_reporter.updated_resources.first
-        update_record.current_resource.should == @current_resource
-      end
     end
-
   end
 
   describe "when generating a report for the server" do
 
+    before do
+      @rest_client.stub!(:create_url).and_return("reports/nodes/spitfire/runs/ABC123");
+      @rest_client.stub!(:raw_http_request).and_return({"result"=>"ok"});
+      @rest_client.stub!(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/ABC123"});
+      
+      @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
+    end
+    
     context "for a successful client run" do
       before do
         # TODO: add inputs to generate expected output.
@@ -269,14 +287,11 @@ describe Chef::ResourceReporter do
         #    "status" : "success"
         #    "data" : ""
         # }
-
-        @node = Chef::Node.new
-        @node.name("spitfire")
         @resource_reporter.resource_action_start(@new_resource, :create)
         @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
         @resource_reporter.resource_completed(@new_resource)
-        @report = @resource_reporter.report(@node)
+        @report = @resource_reporter.prepare_run_data
         @first_update_report = @report["resources"].first
       end
 
@@ -349,22 +364,20 @@ describe Chef::ResourceReporter do
     context "for an unsuccessful run" do
 
       before do
-
-        @backtrace = "foo.rb:1 in `foo!'\nbar.rb:2 in `bar!\n'baz.rb:3 in `baz!'"
+        @backtrace = ["foo.rb:1 in `foo!'","bar.rb:2 in `bar!","'baz.rb:3 in `baz!'"]
         @node = Chef::Node.new
         @node.name("spitfire")
         @exception = mock("ArgumentError")
         @exception.stub!(:inspect).and_return("Net::HTTPServerException")
         @exception.stub!(:message).and_return("Object not found")
         @exception.stub!(:backtrace).and_return(@backtrace)
-        @resource_reporter.run_failed(@exception)
         @resource_reporter.run_list_expand_failed(@node, @exception)
-        @report = @resource_reporter.report(@node)
+        @resource_reporter.run_failed(@exception)
+        @report = @resource_reporter.prepare_run_data
       end
 
       it "includes the exception type in the event data" do
         @report.should have_key("data")
-        @report["data"].should have_key("exception")
         @report["data"]["exception"].should have_key("class")
         @report["data"]["exception"]["class"].should == "Net::HTTPServerException"
       end
@@ -376,7 +389,7 @@ describe Chef::ResourceReporter do
 
       it "includes the exception trace in the event data" do
         @report["data"]["exception"].should have_key("backtrace")
-        @report["data"]["exception"]["backtrace"].should == @backtrace
+        @report["data"]["exception"]["backtrace"].should == @backtrace.to_json
       end
 
       it "includes the error inspector output in the event data" do
@@ -384,15 +397,12 @@ describe Chef::ResourceReporter do
         @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[["Unexpected Error:", "RSpec::Mocks::Mock: Object not found"]]})
       end
 
-
     end
 
   end
 
   describe "when updating resource history on the server" do
     before do
-      @node = Chef::Node.new
-      @node.name("spitfire")
     end
 
     context "when the server does not support storing resource history" do
@@ -417,6 +427,52 @@ describe Chef::ResourceReporter do
 
     end
 
+    context "when the server returns a 500 to the client" do
+      before do
+        # 500 getting the run_id
+        @response = Net::HTTPInternalServerError.new("a response body", "500", "Internal Server Error")
+        @error = Net::HTTPServerException.new("500 message", @response)
+        @rest_client.should_receive(:post_rest).
+          with("reports/nodes/spitfire/runs", {:action => :begin}).
+          and_raise(@error)
+        @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
+      end
+
+      it "assumes the feature is not enabled" do
+        @resource_reporter.reporting_enabled?.should be_false
+      end
+
+      it "does not send a resource report to the server" do
+        @rest_client.should_not_receive(:post_rest)
+        @resource_reporter.run_completed(@node)
+      end
+
+    end
+
+    context "when the server returns a 500 to the client and enable_reporting_url_fatals is true" do
+      before do
+        @enable_reporting_url_fatals = Chef::Config[:enable_reporting_url_fatals]
+        Chef::Config[:enable_reporting_url_fatals] = true
+        # 500 getting the run_id
+        @response = Net::HTTPInternalServerError.new("a response body", "500", "Internal Server Error")
+        @error = Net::HTTPServerException.new("500 message", @response)
+        @rest_client.should_receive(:post_rest).
+          with("reports/nodes/spitfire/runs", {:action => :begin}).
+          and_raise(@error)
+      end
+
+      after do
+        Chef::Config[:enable_reporting_url_fatals] = @enable_reporting_url_fatals
+      end
+
+      it "fails the run" do
+        lambda {
+          @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
+        }.should raise_error(Net::HTTPServerException)
+      end
+
+    end
+
     context "after creating the run history document" do
       before do
         response = {"uri"=>"https://example.com/reports/nodes/spitfire/runs/ABC123"}
@@ -437,18 +493,88 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
 
-        @expected_data = @resource_reporter.report(@node)
-        @expected_data["action"] = "end"
+        @expected_data = @resource_reporter.prepare_run_data
 
+        post_url = "https://chef_server/example_url"
         response = {"result"=>"ok"}
 
+        @rest_client.should_receive(:create_url).
+          with("reports/nodes/spitfire/runs/ABC123").
+          ordered.
+          and_return(post_url)
+        @rest_client.should_receive(:raw_http_request).ordered do |method, url, headers, data|
+          method.should eq(:POST)
+          url.should eq(post_url)
+          headers.should eq({'Content-Encoding' => 'gzip'})
+          data_stream = Zlib::GzipReader.new(StringIO.new(data))
+          data = data_stream.read
+          data.should eq(@expected_data.to_json)
+          response
+        end
+
+        @resource_reporter.run_completed(@node)
+      end
+    end
+
+    context "after creating the run history document when summary_only is set to true" do
+      before do
+        response = {"uri"=>"https://example.com/reports/nodes/spitfire/runs/ABC123", "summary_only"=>"true"}
         @rest_client.should_receive(:post_rest).
-          with("reports/nodes/spitfire/runs/ABC123", @expected_data).
+          with("reports/nodes/spitfire/runs", {:action => :begin}).
           and_return(response)
 
+        @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
+      end
+
+      it "enables summary only reporting" do
+        @resource_reporter.summary_only.should == "true"
+      end
+
+      it "updates the run document with resource updates at the end of the run" do
+        # update some resources...
+        @resource_reporter.resource_action_start(@new_resource, :create)
+        @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
+        @resource_reporter.resource_updated(@new_resource, :create)
+
+        post_url = "reports/nodes/spitfire/runs/ABC123"
+        response = {"result"=>"ok"}
+
+        @rest_client.should_receive(:post_rest).ordered do |url, data|
+          url.should eq(post_url)
+          data.should have_key("action")
+          data["action"].should == "end"
+          data.should have_key("status")
+          data.should have_key("resources")
+          data["resources"].should == []
+          data.should have_key("total_res_count")
+          data["total_res_count"].should == "1"
+          data.should have_key("data")
+          data["data"].should == {}
+          data.should have_key("updated_res_count")
+          data["updated_res_count"].should == "0"
+          data.should have_key("post_size")
+          response
+        end
+
         @resource_reporter.run_completed(@node)
       end
     end
+
+    context "after creating the run history document when summary_only is set to false" do
+      before do
+        response = {"uri"=>"https://example.com/reports/nodes/spitfire/runs/ABC123", "summary_only"=>"false"}
+        @rest_client.should_receive(:post_rest).
+          with("reports/nodes/spitfire/runs", {:action => :begin}).
+          and_return(response)
+
+        @resource_reporter.node_load_completed(@node, :expanded_run_list, :config)
+      end
+
+      it "disables summary_only reporting" do
+        @resource_reporter.summary_only.should == "false"
+      end
+     end
+
   end
 
 end