chef 12.13.37 → 12.14.60

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -414,6 +414,13 @@ describe Chef::CookbookSynchronizer do
       and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
   end
 
+  describe "#server_api" do
+    it "sets keepalive to true" do
+      expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_url], keepalives: true)
+      synchronizer.server_api
+    end
+  end
+
   describe "when syncing cookbooks with the server" do
     let(:server_api) { double("Chef::ServerAPI (mock)") }
 

data/spec/unit/cookbook_loader_spec.rb

@@ -112,63 +112,63 @@ describe Chef::CookbookLoader do
       end
 
       it "should allow you to override an attribute file via cookbook_path" do
-        expect(cookbook_loader[:openldap].attribute_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].attribute_filenames.detect do |f|
           f =~ /cookbooks\/openldap\/attributes\/default.rb/
-        }).not_to eql(nil)
-        expect(cookbook_loader[:openldap].attribute_filenames.detect { |f|
+        end).not_to eql(nil)
+        expect(cookbook_loader[:openldap].attribute_filenames.detect do |f|
           f =~ /kitchen\/openldap\/attributes\/default.rb/
-        }).to eql(nil)
+        end).to eql(nil)
       end
 
       it "should load different attribute files from deeper paths" do
-        expect(cookbook_loader[:openldap].attribute_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].attribute_filenames.detect do |f|
           f =~ /kitchen\/openldap\/attributes\/robinson.rb/
-        }).not_to eql(nil)
+        end).not_to eql(nil)
       end
 
       it "should allow you to override a definition file via cookbook_path" do
-        expect(cookbook_loader[:openldap].definition_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].definition_filenames.detect do |f|
           f =~ /cookbooks\/openldap\/definitions\/client.rb/
-        }).not_to eql(nil)
-        expect(cookbook_loader[:openldap].definition_filenames.detect { |f|
+        end).not_to eql(nil)
+        expect(cookbook_loader[:openldap].definition_filenames.detect do |f|
           f =~ /kitchen\/openldap\/definitions\/client.rb/
-        }).to eql(nil)
+        end).to eql(nil)
       end
 
       it "should load definition files from deeper paths" do
-        expect(cookbook_loader[:openldap].definition_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].definition_filenames.detect do |f|
           f =~ /kitchen\/openldap\/definitions\/drewbarrymore.rb/
-        }).not_to eql(nil)
+        end).not_to eql(nil)
       end
 
       it "should allow you to override a recipe file via cookbook_path" do
-        expect(cookbook_loader[:openldap].recipe_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].recipe_filenames.detect do |f|
           f =~ /cookbooks\/openldap\/recipes\/gigantor.rb/
-        }).not_to eql(nil)
-        expect(cookbook_loader[:openldap].recipe_filenames.detect { |f|
+        end).not_to eql(nil)
+        expect(cookbook_loader[:openldap].recipe_filenames.detect do |f|
           f =~ /kitchen\/openldap\/recipes\/gigantor.rb/
-        }).to eql(nil)
+        end).to eql(nil)
       end
 
       it "should load recipe files from deeper paths" do
-        expect(cookbook_loader[:openldap].recipe_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].recipe_filenames.detect do |f|
           f =~ /kitchen\/openldap\/recipes\/woot.rb/
-        }).not_to eql(nil)
+        end).not_to eql(nil)
       end
 
       it "should allow you to have an 'ignore' file, which skips loading files in later cookbooks" do
-        expect(cookbook_loader[:openldap].recipe_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].recipe_filenames.detect do |f|
           f =~ /kitchen\/openldap\/recipes\/ignoreme.rb/
-        }).to eql(nil)
+        end).to eql(nil)
       end
 
       it "should find files that start with a ." do
-        expect(cookbook_loader[:openldap].file_filenames.detect { |f|
+        expect(cookbook_loader[:openldap].file_filenames.detect do |f|
           f =~ /\.dotfile$/
-        }).to match(/\.dotfile$/)
-        expect(cookbook_loader[:openldap].file_filenames.detect { |f|
+        end).to match(/\.dotfile$/)
+        expect(cookbook_loader[:openldap].file_filenames.detect do |f|
           f =~ /\.ssh\/id_rsa$/
-        }).to match(/\.ssh\/id_rsa$/)
+        end).to match(/\.ssh\/id_rsa$/)
       end
 
       it "should load the metadata for the cookbook" do

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -304,24 +304,24 @@ describe Chef::CookbookVersion, "file specificity" do
   it "should raise a FileNotFound exception without match" do
     node = Chef::Node.new
 
-    expect {
+    expect do
       @cookbook.preferred_manifest_record(node, :files, "doesn't_exist.rb")
-    }.to raise_error(Chef::Exceptions::FileNotFound)
+    end.to raise_error(Chef::Exceptions::FileNotFound)
   end
   it "should raise a FileNotFound exception consistently without match" do
     node = Chef::Node.new
 
-    expect {
+    expect do
       @cookbook.preferred_manifest_record(node, :files, "doesn't_exist.rb")
-    }.to raise_error(Chef::Exceptions::FileNotFound)
+    end.to raise_error(Chef::Exceptions::FileNotFound)
 
-    expect {
+    expect do
       @cookbook.preferred_manifest_record(node, :files, "doesn't_exist.rb")
-    }.to raise_error(Chef::Exceptions::FileNotFound)
+    end.to raise_error(Chef::Exceptions::FileNotFound)
 
-    expect {
+    expect do
       @cookbook.preferred_manifest_record(node, :files, "doesn't_exist.rb")
-    }.to raise_error(Chef::Exceptions::FileNotFound)
+    end.to raise_error(Chef::Exceptions::FileNotFound)
   end
 
   describe "when fetching the contents of a directory by file specificity" do

data/spec/unit/daemon_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Daemon do
   before do
     if windows?
       mock_struct = #Struct::Passwd.new(nil, nil, 111, 111)
-      mock_struct = OpenStruct.new(:uid => 2342, :gid => 2342)
+        mock_struct = OpenStruct.new(:uid => 2342, :gid => 2342)
       allow(Etc).to receive(:getpwnam).and_return mock_struct
       allow(Etc).to receive(:getgrnam).and_return mock_struct
       # mock unimplemented methods

data/spec/unit/data_bag_item_spec.rb

@@ -91,12 +91,12 @@ describe Chef::DataBagItem do
   end
 
   describe "object_name" do
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.data_bag("dreams")
       data_bag_item.raw_data = { "id" => "the_beatdown" }
       data_bag_item
-    }
+    end
 
     it "should return an object name based on the bag name and the raw_data id" do
       expect(data_bag_item.object_name).to eq("data_bag_item_dreams_the_beatdown")
@@ -110,12 +110,12 @@ describe Chef::DataBagItem do
   end
 
   describe "class method name" do
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.data_bag("dreams")
       data_bag_item.raw_data = { "id" => "the_beatdown", "name" => "Bruce" }
       data_bag_item
-    }
+    end
 
     it "should return the object name" do
       expect(data_bag_item.name).to eq(data_bag_item.object_name)
@@ -128,11 +128,11 @@ describe Chef::DataBagItem do
   end
 
   describe "when used like a Hash" do
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.raw_data = { "id" => "journey", "trials" => "been through" }
       data_bag_item
-    }
+    end
 
     it "responds to keys" do
       expect(data_bag_item.keys).to include("id")
@@ -158,9 +158,9 @@ describe Chef::DataBagItem do
 
   describe "from_hash" do
     context "when hash contains raw_data" do
-      let(:data_bag_item) {
+      let(:data_bag_item) do
         Chef::DataBagItem.from_hash({ "raw_data" => { "id" => "whoa", "name" => "Bruce", "i_know" => "kung_fu" } })
-      }
+      end
 
       it "should have the id key set" do
         expect(data_bag_item["id"]).to eq("whoa")
@@ -172,9 +172,9 @@ describe Chef::DataBagItem do
     end
 
     context "when hash does not contain raw_data" do
-      let(:data_bag_item) {
+      let(:data_bag_item) do
         Chef::DataBagItem.from_hash({ "id" => "whoa", "name" => "Bruce", "i_know" => "kung_fu" })
-      }
+      end
 
       it "should have the id key set" do
         expect(data_bag_item["id"]).to eq("whoa")
@@ -187,12 +187,12 @@ describe Chef::DataBagItem do
   end
 
   describe "to_hash" do
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.data_bag("still_lost")
       data_bag_item.raw_data = { "id" => "whoa", "name" => "Bruce", "i_know" => "kung_fu" }
       data_bag_item
-    }
+    end
 
     let!(:original_data_bag_keys) { data_bag_item.keys }
 
@@ -223,12 +223,12 @@ describe Chef::DataBagItem do
   end
 
   describe "when deserializing from JSON" do
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.data_bag("mars_volta")
       data_bag_item.raw_data = { "id" => "octahedron", "name" => "Bruce", "snooze" => { "finally" => :world_will } }
       data_bag_item
-    }
+    end
 
     let(:deserial) { Chef::DataBagItem.from_hash(Chef::JSONCompat.parse(Chef::JSONCompat.to_json(data_bag_item))) }
 
@@ -275,13 +275,13 @@ describe Chef::DataBagItem do
   describe "save" do
     let(:server) { instance_double(Chef::ServerAPI) }
 
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item["id"] = "heart of darkness"
       data_bag_item.raw_data = { "id" => "heart_of_darkness", "author" => "Conrad" }
       data_bag_item.data_bag("books")
       data_bag_item
-    }
+    end
 
     before do
       expect(Chef::ServerAPI).to receive(:new).and_return(server)
@@ -320,12 +320,12 @@ describe Chef::DataBagItem do
   describe "destroy" do
     let(:server) { instance_double(Chef::ServerAPI) }
 
-    let(:data_bag_item) {
+    let(:data_bag_item) do
       data_bag_item = Chef::DataBagItem.new
       data_bag_item.data_bag("a_baggy_bag")
       data_bag_item.raw_data = { "id" => "some_id" }
       data_bag_item
-    }
+    end
 
     it "should set default parameters" do
       expect(Chef::ServerAPI).to receive(:new).and_return(server)

data/spec/unit/data_bag_spec.rb

@@ -241,9 +241,9 @@ describe Chef::DataBag do
       it "should raise an error if the configured data_bag_path is invalid" do
         file_dir_stub(@paths.first, false)
 
-        expect {
+        expect do
           Chef::DataBag.load("foo")
-        }.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' is invalid"
+        end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' is invalid"
       end
 
     end

data/spec/unit/data_collector/messages/helpers_spec.rb

@@ -25,7 +25,7 @@ class TestMessage
 end
 
 describe Chef::DataCollector::Messages::Helpers do
-  describe '#organization' do
+  describe "#organization" do
     context "when the run is a solo run" do
       it "returns the data collector organization" do
         allow(TestMessage).to receive(:solo_run?).and_return(true)
@@ -43,7 +43,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#data_collector_organization' do
+  describe "#data_collector_organization" do
     context "when the org is specified in the config" do
       it "returns the org from the config" do
         Chef::Config[:data_collector][:organization] = "org1"
@@ -58,7 +58,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#chef_server_organization' do
+  describe "#chef_server_organization" do
     context "when the URL is properly formatted" do
       it "returns the org from the parsed URL" do
         Chef::Config[:chef_server_url] = "http://mycompany.com/organizations/myorg"
@@ -74,7 +74,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#collector_source' do
+  describe "#collector_source" do
     context "when the run is a solo run" do
       it "returns chef_solo" do
         allow(TestMessage).to receive(:solo_run?).and_return(true)
@@ -90,7 +90,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#solo_run?' do
+  describe "#solo_run?" do
     context "when :solo is set in Chef::Config" do
       it "returns true" do
         Chef::Config[:solo] = true
@@ -116,7 +116,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#node_uuid' do
+  describe "#node_uuid" do
     context "when the node UUID can be read" do
       it "returns the read-in node UUID" do
         allow(TestMessage).to receive(:read_node_uuid).and_return("read_uuid")
@@ -133,7 +133,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#generate_node_uuid' do
+  describe "#generate_node_uuid" do
     it "generates a new UUID, stores it, and returns it" do
       expect(SecureRandom).to receive(:uuid).and_return("generated_uuid")
       expect(TestMessage).to receive(:update_metadata).with("node_uuid", "generated_uuid")
@@ -141,7 +141,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#read_node_uuid' do
+  describe "#read_node_uuid" do
     it "reads the node UUID from metadata" do
       expect(TestMessage).to receive(:metadata).and_return({ "node_uuid" => "read_uuid" })
       expect(TestMessage.read_node_uuid).to eq("read_uuid")
@@ -170,7 +170,7 @@ describe Chef::DataCollector::Messages::Helpers do
     end
   end
 
-  describe '#update_metadata' do
+  describe "#update_metadata" do
     it "updates the file" do
       allow(TestMessage).to receive(:metadata_filename).and_return("fake_metadata_file.json")
       allow(TestMessage).to receive(:metadata).and_return({ "key" => "current_value" })

data/spec/unit/data_collector/messages_spec.rb

@@ -22,7 +22,7 @@ require "ffi_yajl"
 require "chef/data_collector/messages/helpers"
 
 describe Chef::DataCollector::Messages do
-  describe '#run_start_message' do
+  describe "#run_start_message" do
     let(:run_status) { Chef::RunStatus.new(Chef::Node.new, Chef::EventDispatch::Dispatcher.new) }
     let(:required_fields) do
       %w{
@@ -61,7 +61,7 @@ describe Chef::DataCollector::Messages do
     end
   end
 
-  describe '#run_end_message' do
+  describe "#run_end_message" do
     let(:node)       { Chef::Node.new }
     let(:run_status) { Chef::RunStatus.new(node, Chef::EventDispatch::Dispatcher.new) }
     let(:report1)  { double("report1", report_data: { "status" => "updated" }) }

data/spec/unit/data_collector_spec.rb

@@ -160,7 +160,7 @@ describe Chef::DataCollector::Reporter do
     Chef::Config[:data_collector][:server_url] = "http://my-data-collector-server.mycompany.com"
   end
 
-  describe '#run_started' do
+  describe "#run_started" do
     before do
       allow(reporter).to receive(:update_run_status)
       allow(reporter).to receive(:send_to_data_collector)
@@ -182,7 +182,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#run_completed' do
+  describe "#run_completed" do
     it "sends the run completion" do
       node = Chef::Node.new
 
@@ -191,35 +191,35 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#run_failed' do
+  describe "#run_failed" do
     it "updates the exception and sends the run completion" do
       expect(reporter).to receive(:send_run_completion).with(status: "failure")
       reporter.run_failed("test_exception")
     end
   end
 
-  describe '#converge_start' do
+  describe "#converge_start" do
     it "stashes the run_context for later use" do
       reporter.converge_start("test_context")
       expect(reporter.run_context).to eq("test_context")
     end
   end
 
-  describe '#converge_complete' do
+  describe "#converge_complete" do
     it "detects and processes any unprocessed resources" do
       expect(reporter).to receive(:detect_unprocessed_resources)
       reporter.converge_complete
     end
   end
 
-  describe '#converge_failed' do
+  describe "#converge_failed" do
     it "detects and processes any unprocessed resources" do
       expect(reporter).to receive(:detect_unprocessed_resources)
       reporter.converge_failed("exception")
     end
   end
 
-  describe '#resource_current_state_loaded' do
+  describe "#resource_current_state_loaded" do
     let(:new_resource)     { double("new_resource") }
     let(:action)           { double("action") }
     let(:current_resource) { double("current_resource") }
@@ -245,7 +245,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#resource_up_to_date' do
+  describe "#resource_up_to_date" do
     let(:new_resource)    { double("new_resource") }
     let(:action)          { double("action") }
     let(:resource_report) { double("resource_report") }
@@ -273,7 +273,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#resource_skipped' do
+  describe "#resource_skipped" do
     let(:new_resource)    { double("new_resource") }
     let(:action)          { double("action") }
     let(:conditional)     { double("conditional") }
@@ -311,7 +311,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#resource_updated' do
+  describe "#resource_updated" do
     let(:resource_report) { double("resource_report") }
 
     before do
@@ -325,7 +325,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#resource_failed' do
+  describe "#resource_failed" do
     let(:new_resource)    { double("new_resource") }
     let(:action)          { double("action") }
     let(:exception)       { double("exception") }
@@ -368,7 +368,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#resource_completed' do
+  describe "#resource_completed" do
     let(:new_resource)    { double("new_resource") }
     let(:resource_report) { double("resource_report") }
 
@@ -418,14 +418,14 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#run_list_expanded' do
+  describe "#run_list_expanded" do
     it "sets the expanded run list" do
       reporter.run_list_expanded("test_run_list")
       expect(reporter.expanded_run_list).to eq("test_run_list")
     end
   end
 
-  describe '#run_list_expand_failed' do
+  describe "#run_list_expand_failed" do
     let(:node)         { double("node") }
     let(:error_mapper) { double("error_mapper") }
     let(:exception)    { double("exception") }
@@ -441,7 +441,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#cookbook_resolution_failed' do
+  describe "#cookbook_resolution_failed" do
     let(:error_mapper)      { double("error_mapper") }
     let(:exception)         { double("exception") }
     let(:expanded_run_list) { double("expanded_run_list") }
@@ -458,7 +458,7 @@ describe Chef::DataCollector::Reporter do
 
   end
 
-  describe '#cookbook_sync_failed' do
+  describe "#cookbook_sync_failed" do
     let(:cookbooks)    { double("cookbooks") }
     let(:error_mapper) { double("error_mapper") }
     let(:exception)    { double("exception") }
@@ -474,7 +474,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#disable_reporter_on_error' do
+  describe "#disable_reporter_on_error" do
     context "when no exception is raise by the block" do
       it "does not disable the reporter" do
         expect(reporter).not_to receive(:disable_data_collector_reporter)
@@ -488,7 +488,7 @@ describe Chef::DataCollector::Reporter do
 
     context "when an unexpected exception is raised by the block" do
       it "re-raises the exception" do
-        expect { reporter.send(:disable_reporter_on_error) { raise RuntimeError, "bummer" } }.to raise_error(RuntimeError)
+        expect { reporter.send(:disable_reporter_on_error) { raise "bummer" } }.to raise_error(RuntimeError)
       end
     end
 
@@ -521,7 +521,7 @@ describe Chef::DataCollector::Reporter do
     end
   end
 
-  describe '#validate_data_collector_server_url!' do
+  describe "#validate_data_collector_server_url!" do
     context "when server_url is empty" do
       it "raises an exception" do
         Chef::Config[:data_collector][:server_url] = ""