chef 12.22.5 → 13.0.113

data/spec/unit/cookbook_version_spec.rb

@@ -25,38 +25,6 @@ describe Chef::CookbookVersion do
       expect(cookbook_version.name).to eq("tatft")
     end
 
-    it "has no attribute files" do
-      expect(cookbook_version.attribute_filenames).to be_empty
-    end
-
-    it "has no resource definition files" do
-      expect(cookbook_version.definition_filenames).to be_empty
-    end
-
-    it "has no cookbook files" do
-      expect(cookbook_version.file_filenames).to be_empty
-    end
-
-    it "has no recipe files" do
-      expect(cookbook_version.recipe_filenames).to be_empty
-    end
-
-    it "has no library files" do
-      expect(cookbook_version.library_filenames).to be_empty
-    end
-
-    it "has no LWRP resource files" do
-      expect(cookbook_version.resource_filenames).to be_empty
-    end
-
-    it "has no LWRP provider files" do
-      expect(cookbook_version.provider_filenames).to be_empty
-    end
-
-    it "has no metadata files" do
-      expect(cookbook_version.metadata_filenames).to be_empty
-    end
-
     it "has an empty set of all_files" do
       expect(cookbook_version.all_files).to be_empty
     end
@@ -82,17 +50,7 @@ describe Chef::CookbookVersion do
     let(:cookbook_paths_by_type) do
       {
         # Dunno if the paths here are representitive of what is set by CookbookLoader...
-        all_files:  Dir[File.join(cookbook_root, "**", "*.rb")],
-        attribute_filenames:  Dir[File.join(cookbook_root, "attributes", "**", "*.rb")],
-        definition_filenames: Dir[File.join(cookbook_root, "definitions", "**", "*.rb")],
-        file_filenames:       Dir[File.join(cookbook_root, "files", "**", "*.tgz")],
-        recipe_filenames:     Dir[File.join(cookbook_root, "recipes", "**", "*.rb")],
-        template_filenames:   Dir[File.join(cookbook_root, "templates", "**", "*.erb")],
-        library_filenames:    Dir[File.join(cookbook_root, "libraries", "**", "*.rb")],
-        resource_filenames:   Dir[File.join(cookbook_root, "resources", "**", "*.rb")],
-        provider_filenames:   Dir[File.join(cookbook_root, "providers", "**", "*.rb")],
-        root_filenames:       Array(File.join(cookbook_root, "README.rdoc")),
-        metadata_filenames:   Array(File.join(cookbook_root, "metadata.json")),
+        all_files:  Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 
@@ -102,18 +60,9 @@ describe Chef::CookbookVersion do
 
       let(:cookbook_version) do
         Chef::CookbookVersion.new("tatft", cookbook_root).tap do |c|
-        # Currently the cookbook loader finds all the files then tells CookbookVersion
-        # where they are.
-          c.attribute_filenames  = cookbook_paths_by_type[:attribute_filenames]
-          c.definition_filenames = cookbook_paths_by_type[:definition_filenames]
-          c.recipe_filenames     = cookbook_paths_by_type[:recipe_filenames]
-          c.template_filenames   = cookbook_paths_by_type[:template_filenames]
-          c.file_filenames       = cookbook_paths_by_type[:file_filenames]
-          c.library_filenames    = cookbook_paths_by_type[:library_filenames]
-          c.resource_filenames   = cookbook_paths_by_type[:resource_filenames]
-          c.provider_filenames   = cookbook_paths_by_type[:provider_filenames]
-          c.root_filenames       = cookbook_paths_by_type[:root_filenames]
-          c.metadata_filenames   = cookbook_paths_by_type[:metadata_filenames]
+          # Currently the cookbook loader finds all the files then tells CookbookVersion
+          # where they are.
+          c.all_files = cookbook_paths_by_type[:all_files]
         end
       end
 
@@ -168,18 +117,7 @@ describe Chef::CookbookVersion do
 
     let(:cookbook_paths_by_type) do
       {
-        # Dunno if the paths here are representitive of what is set by CookbookLoader...
-        all_files:            Dir[File.join(cookbook_root, "**", "*.rb")],
-        attribute_filenames:  Dir[File.join(cookbook_root, "attributes", "**", "*.rb")],
-        definition_filenames: Dir[File.join(cookbook_root, "definitions", "**", "*.rb")],
-        file_filenames:       Dir[File.join(cookbook_root, "files", "**", "*.*")],
-        recipe_filenames:     Dir[File.join(cookbook_root, "recipes", "**", "*.rb")],
-        template_filenames:   Dir[File.join(cookbook_root, "templates", "**", "*.*")],
-        library_filenames:    Dir[File.join(cookbook_root, "libraries", "**", "*.rb")],
-        resource_filenames:   Dir[File.join(cookbook_root, "resources", "**", "*.rb")],
-        provider_filenames:   Dir[File.join(cookbook_root, "providers", "**", "*.rb")],
-        root_filenames:       Array(File.join(cookbook_root, "README.rdoc")),
-        metadata_filenames:   Array(File.join(cookbook_root, "metadata.json")),
+        all_files:  Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 
@@ -187,16 +125,7 @@ describe Chef::CookbookVersion do
 
     let(:cookbook_version) do
       Chef::CookbookVersion.new("cookbook2", cookbook_root).tap do |c|
-        c.attribute_filenames  = cookbook_paths_by_type[:attribute_filenames]
-        c.definition_filenames = cookbook_paths_by_type[:definition_filenames]
-        c.recipe_filenames     = cookbook_paths_by_type[:recipe_filenames]
-        c.template_filenames   = cookbook_paths_by_type[:template_filenames]
-        c.file_filenames       = cookbook_paths_by_type[:file_filenames]
-        c.library_filenames    = cookbook_paths_by_type[:library_filenames]
-        c.resource_filenames   = cookbook_paths_by_type[:resource_filenames]
-        c.provider_filenames   = cookbook_paths_by_type[:provider_filenames]
-        c.root_filenames       = cookbook_paths_by_type[:root_filenames]
-        c.metadata_filenames   = cookbook_paths_by_type[:metadata_filenames]
+        c.all_files = cookbook_paths_by_type[:all_files]
       end
     end
 
@@ -255,19 +184,19 @@ describe Chef::CookbookVersion do
 
     it "should sort based on the version number" do
       examples = [
-                  # smaller, larger
-                  ["1.0", "2.0"],
-                  ["1.2.3", "1.2.4"],
-                  ["1.2.3", "1.3.0"],
-                  ["1.2.3", "1.3"],
-                  ["1.2.3", "2.1.1"],
-                  ["1.2.3", "2.1"],
-                  ["1.2", "1.2.4"],
-                  ["1.2", "1.3.0"],
-                  ["1.2", "1.3"],
-                  ["1.2", "2.1.1"],
-                  ["1.2", "2.1"],
-                 ]
+        # smaller, larger
+        ["1.0", "2.0"],
+        ["1.2.3", "1.2.4"],
+        ["1.2.3", "1.3.0"],
+        ["1.2.3", "1.3"],
+        ["1.2.3", "2.1.1"],
+        ["1.2.3", "2.1"],
+        ["1.2", "1.2.4"],
+        ["1.2", "1.3.0"],
+        ["1.2", "1.3"],
+        ["1.2", "2.1.1"],
+        ["1.2", "2.1"],
+      ]
       examples.each do |smaller, larger|
         sm = Chef::CookbookVersion.new("foo", "/tmp/blah")
         lg = Chef::CookbookVersion.new("foo", "/tmp/blah")
@@ -318,42 +247,4 @@ describe Chef::CookbookVersion do
 
   end
 
-  describe "when deprecation warnings are errors" do
-
-    subject(:cbv) { Chef::CookbookVersion.new("version validation", "/tmp/blah") }
-
-    it "errors on #status and #status=" do
-      expect { cbv.status = :wat }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-      expect { cbv.status }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-    end
-
-  end
-
-  describe "deprecated features" do
-
-    subject(:cbv) { Chef::CookbookVersion.new("tatft", "/tmp/blah").tap { |c| c.version = "1.2.3" } }
-
-    before do
-      Chef::Config[:treat_deprecation_warnings_as_errors] = false
-    end
-
-    it "gives a save URL for the standard cookbook API" do
-      expect(cbv.save_url).to eq("cookbooks/tatft/1.2.3")
-    end
-
-    it "gives a force save URL for the standard cookbook API" do
-      expect(cbv.force_save_url).to eq("cookbooks/tatft/1.2.3?force=true")
-    end
-
-    it "is \"ready\"" do
-      # WTF is this? what are the valid states? and why aren't they set with encapsulating methods?
-      # [Dan 15-Jul-2010]
-      expect(cbv.status).to eq(:ready)
-    end
-
-    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
-      let(:jsonable) { Chef::CookbookVersion.new("tatft", "/tmp/blah") }
-    end
-
-  end
 end

data/spec/unit/daemon_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,6 @@ require "spec_helper"
 require "ostruct"
 
 describe Chef::Daemon do
-  let(:testuser) { "thisisausernamewhichshouldnotexist" }
-  let(:testgroup) { "thisisagroupnamewhichshouldnotexist" }
-
   before do
     if windows?
       mock_struct = #Struct::Passwd.new(nil, nil, 111, 111)
@@ -76,9 +73,8 @@ describe Chef::Daemon do
   describe ".change_privilege" do
 
     before do
-      allow(Chef::Daemon).to receive(:_change_privilege)
       allow(Chef::Application).to receive(:fatal!).and_return(true)
-      Chef::Config[:user] = testuser
+      Chef::Config[:user] = "aj"
       allow(Dir).to receive(:chdir)
     end
 
@@ -90,28 +86,28 @@ describe Chef::Daemon do
     describe "when the user and group options are supplied" do
 
       before do
-        Chef::Config[:group] = testgroup
+        Chef::Config[:group] = "staff"
       end
 
       it "should log an appropriate info message" do
-        expect(Chef::Log).to receive(:info).with("About to change privilege to #{testuser}:#{testgroup}")
+        expect(Chef::Log).to receive(:info).with("About to change privilege to aj:staff")
         Chef::Daemon.change_privilege
       end
 
       it "should call _change_privilege with the user and group" do
-        expect(Chef::Daemon).to receive(:_change_privilege).with(testuser, testgroup)
+        expect(Chef::Daemon).to receive(:_change_privilege).with("aj", "staff")
         Chef::Daemon.change_privilege
       end
     end
 
     describe "when just the user option is supplied" do
       it "should log an appropriate info message" do
-        expect(Chef::Log).to receive(:info).with("About to change privilege to #{testuser}")
+        expect(Chef::Log).to receive(:info).with("About to change privilege to aj")
         Chef::Daemon.change_privilege
       end
 
       it "should call _change_privilege with just the user" do
-        expect(Chef::Daemon).to receive(:_change_privilege).with(testuser)
+        expect(Chef::Daemon).to receive(:_change_privilege).with("aj")
         Chef::Daemon.change_privilege
       end
     end
@@ -142,18 +138,18 @@ describe Chef::Daemon do
       end
 
       it "should initialize the supplemental group list" do
-        expect(Process).to receive(:initgroups).with(testuser, 20)
-        Chef::Daemon._change_privilege(testuser)
+        expect(Process).to receive(:initgroups).with("aj", 20)
+        Chef::Daemon._change_privilege("aj")
       end
 
       it "should attempt to change the process GID" do
         expect(Process::GID).to receive(:change_privilege).with(20).and_return(20)
-        Chef::Daemon._change_privilege(testuser)
+        Chef::Daemon._change_privilege("aj")
       end
 
       it "should attempt to change the process UID" do
         expect(Process::UID).to receive(:change_privilege).with(501).and_return(501)
-        Chef::Daemon._change_privilege(testuser)
+        Chef::Daemon._change_privilege("aj")
       end
     end
 
@@ -163,11 +159,6 @@ describe Chef::Daemon do
         allow(Process).to receive(:egid).and_return(999)
       end
 
-      after do
-        allow(Process).to receive(:euid).and_call_original
-        allow(Process).to receive(:egid).and_call_original
-      end
-
       it "should log an appropriate error message and fail miserably" do
         allow(Process).to receive(:initgroups).and_raise(Errno::EPERM)
         error = "Operation not permitted"
@@ -175,7 +166,7 @@ describe Chef::Daemon do
           error = "Not owner"
         end
         expect(Chef::Application).to receive(:fatal!).with("Permission denied when trying to change 999:999 to 501:20. #{error}")
-        Chef::Daemon._change_privilege(testuser)
+        Chef::Daemon._change_privilege("aj")
       end
     end
 

data/spec/unit/data_bag_item_spec.rb

@@ -52,6 +52,10 @@ describe Chef::DataBagItem do
       expect { data_bag_item.raw_data = { "id" => "octahedron" } }.not_to raise_error
     end
 
+    it "should let you set the raw_data with a hash containing symbols" do
+      expect { data_bag_item.raw_data = { :id => "octahedron" } }.not_to raise_error
+    end
+
     it "should let you set the raw_data from a mash" do
       expect { data_bag_item.raw_data = Mash.new({ "id" => "octahedron" }) }.not_to raise_error
     end

data/spec/unit/data_collector/messages_spec.rb

@@ -116,6 +116,141 @@ describe Chef::DataCollector::Messages do
           deprecations
         }
       end
+      let(:optional_fields) { %w{error policy_group policy_name} }
+
+      before do
+        allow(run_status).to receive(:exception).and_return(nil)
+      end
+
+      it "is not missing any required fields" do
+        missing_fields = required_fields.select do |key|
+          !Chef::DataCollector::Messages.run_end_message(reporter_data).key?(key)
+        end
+        expect(missing_fields).to eq([])
+      end
+
+      it "does not have any extra fields" do
+        extra_fields = Chef::DataCollector::Messages.run_end_message(reporter_data).keys.select do |key|
+          !required_fields.include?(key) && !optional_fields.include?(key)
+        end
+        expect(extra_fields).to eq([])
+      end
+
+      it "only includes updated resources in its count" do
+        message = Chef::DataCollector::Messages.run_end_message(reporter_data)
+        expect(message["total_resource_count"]).to eq(2)
+        expect(message["updated_resource_count"]).to eq(1)
+      end
+    end
+
+    context "when the run was not successful" do
+      let(:required_fields) do
+        %w{
+          chef_server_fqdn
+          entity_uuid
+          id
+          end_time
+          error
+          expanded_run_list
+          message_type
+          message_version
+          node
+          node_name
+          organization_name
+          resources
+          run_id
+          run_list
+          source
+          start_time
+          status
+          total_resource_count
+          updated_resource_count
+          deprecations
+        }
+      end
+      let(:optional_fields) { %w{policy_group policy_name} }
+
+      before do
+        allow(run_status).to receive(:exception).and_return(RuntimeError.new("an error happened"))
+      end
+
+      it "is not missing any required fields" do
+        missing_fields = required_fields.select do |key|
+          !Chef::DataCollector::Messages.run_end_message(reporter_data).key?(key)
+        end
+        expect(missing_fields).to eq([])
+      end
+
+      it "does not have any extra fields" do
+        extra_fields = Chef::DataCollector::Messages.run_end_message(reporter_data).keys.select do |key|
+          !required_fields.include?(key) && !optional_fields.include?(key)
+        end
+        expect(extra_fields).to eq([])
+      end
+    end
+  end
+
+  describe "#run_end_message in policy mode" 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" }) }
+    let(:report2)  { double("report2", report_data: { "status" => "skipped" }) }
+    let(:reporter_data) do
+      {
+        run_status: run_status,
+        resources: [report1, report2],
+      }
+    end
+
+    before do
+      allow(run_status).to receive(:start_time).and_return(Time.now)
+      allow(run_status).to receive(:end_time).and_return(Time.now)
+      node.policy_group = "test"
+      node.policy_name = "policy-test"
+    end
+
+    it "includes a valid node object in the payload" do
+      message = Chef::DataCollector::Messages.run_end_message(reporter_data)
+      expect(message["node"]).to be_an_instance_of(Chef::Node)
+    end
+
+    it "returns a sane JSON representation of the node object" do
+      node.chef_environment = "my_test_environment"
+      node.run_list.add("recipe[my_test_cookbook::default]")
+      message = FFI_Yajl::Parser.parse(Chef::DataCollector::Messages.run_end_message(reporter_data).to_json)
+
+      expect(message["node"]["chef_environment"]).to eq("my_test_environment")
+      expect(message["node"]["run_list"]).to eq(["recipe[my_test_cookbook::default]"])
+      expect(message["node"]["policy_name"]).to eq("policy-test")
+      expect(message["node"]["policy_group"]).to eq("test")
+    end
+
+    context "when the run was successful" do
+      let(:required_fields) do
+        %w{
+          chef_server_fqdn
+          entity_uuid
+          id
+          end_time
+          expanded_run_list
+          message_type
+          message_version
+          node
+          node_name
+          organization_name
+          resources
+          run_id
+          run_list
+          source
+          start_time
+          status
+          total_resource_count
+          updated_resource_count
+          deprecations
+          policy_name
+          policy_group
+        }
+      end
       let(:optional_fields) { %w{error} }
 
       before do
@@ -166,6 +301,8 @@ describe Chef::DataCollector::Messages do
           total_resource_count
           updated_resource_count
           deprecations
+          policy_name
+          policy_group
         }
       end
       let(:optional_fields) { [] }