chef 14.5.33-universal-mingw32 → 14.6.47-universal-mingw32

data/spec/spec_helper.rb

@@ -171,6 +171,7 @@ RSpec.configure do |config|
   config.filter_run_excluding unix_only: true unless unix?
   config.filter_run_excluding linux_only: true unless linux?
   config.filter_run_excluding aix_only: true unless aix?
+  config.filter_run_excluding suse_only: true unless suse?
   config.filter_run_excluding debian_family_only: true unless debian_family?
   config.filter_run_excluding supports_cloexec: true unless supports_cloexec?
   config.filter_run_excluding selinux_only: true unless selinux_enabled?

data/spec/unit/audit/audit_reporter_spec.rb

@@ -53,7 +53,7 @@ describe Chef::Audit::AuditReporter do
   describe "#run_completed" do
 
     let(:audit_data) { Chef::Audit::AuditData.new(node.name, run_id) }
-    let(:run_data) { audit_data.to_hash }
+    let(:run_data) { audit_data.to_h }
 
     before do
       allow(reporter).to receive(:auditing_enabled?).and_return(true)
@@ -61,7 +61,7 @@ describe Chef::Audit::AuditReporter do
       allow(rest).to receive(:post).and_return(true)
       allow(reporter).to receive(:audit_data).and_return(audit_data)
       allow(reporter).to receive(:run_status).and_return(run_status)
-      allow(audit_data).to receive(:to_hash).and_return(run_data)
+      allow(audit_data).to receive(:to_h).and_return(run_data)
     end
 
     describe "a successful run with auditing enabled" do
@@ -233,7 +233,7 @@ EOM
   describe "#run_failed" do
 
     let(:audit_data) { Chef::Audit::AuditData.new(node.name, run_id) }
-    let(:run_data) { audit_data.to_hash }
+    let(:run_data) { audit_data.to_h }
 
     let(:audit_error) do
       double("AuditError", class: "Chef::Exceptions::AuditError",
@@ -249,7 +249,7 @@ EOM
       allow(reporter).to receive(:auditing_enabled?).and_return(true)
       allow(reporter).to receive(:run_status).and_return(run_status)
       allow(reporter).to receive(:audit_data).and_return(audit_data)
-      allow(audit_data).to receive(:to_hash).and_return(run_data)
+      allow(audit_data).to receive(:to_h).and_return(run_data)
     end
 
     context "when no prior exception is stored" do

data/spec/unit/audit/control_group_data_spec.rb

@@ -2,7 +2,7 @@
 # Author:: Tyler Ball (<tball@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)
 #
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,9 +57,9 @@ describe Chef::Audit::AuditData do
     end
   end
 
-  describe "#to_hash" do
+  describe "#to_h" do
 
-    let(:audit_data_hash) { audit_data.to_hash }
+    let(:audit_data_hash) { audit_data.to_h }
 
     it "returns a hash" do
       expect(audit_data_hash).to be_a(Hash)
@@ -90,7 +90,7 @@ describe Chef::Audit::AuditData do
         end
 
         it "is a one-element list containing the control group hash" do
-          expect(control_group_1).to receive(:to_hash).once.and_return(control_hash_1)
+          expect(control_group_1).to receive(:to_h).once.and_return(control_hash_1)
           expect(control_groups.size).to eq 1
           expect(control_groups).to include(control_hash_1)
         end
@@ -103,8 +103,8 @@ describe Chef::Audit::AuditData do
         end
 
         it "is a list of control group hashes" do
-          expect(control_group_1).to receive(:to_hash).and_return(control_hash_1)
-          expect(control_group_2).to receive(:to_hash).and_return(control_hash_2)
+          expect(control_group_1).to receive(:to_h).and_return(control_hash_1)
+          expect(control_group_2).to receive(:to_h).and_return(control_hash_2)
           expect(control_groups.size).to eq 2
           expect(control_groups).to include(control_hash_1)
           expect(control_groups).to include(control_hash_2)
@@ -127,9 +127,9 @@ describe Chef::Audit::ControlData do
                         resource_type: resource_type, resource_name: resource_name,
                         context: context, line_number: line_number) end
 
-  describe "#to_hash" do
+  describe "#to_h" do
 
-    let(:control_data_hash) { control_data.to_hash }
+    let(:control_data_hash) { control_data.to_h }
 
     it "returns a hash" do
       expect(control_data_hash).to be_a(Hash)
@@ -385,9 +385,9 @@ describe Chef::Audit::ControlGroupData do
     end
   end
 
-  describe "#to_hash" do
+  describe "#to_h" do
 
-    let(:control_group_data_hash) { control_group_data.to_hash }
+    let(:control_group_data_hash) { control_group_data.to_h }
 
     it "returns a hash" do
       expect(control_group_data_hash).to be_a(Hash)
@@ -413,11 +413,11 @@ describe Chef::Audit::ControlGroupData do
         include_context "control"
 
         let(:control_list) { [control_data] }
-        let(:control_hash) { control.to_hash }
+        let(:control_hash) { control.to_h }
 
         before do
           expect(control_group_data).to receive(:controls).twice.and_return(control_list)
-          expect(control_data).to receive(:to_hash).and_return(control_hash)
+          expect(control_data).to receive(:to_h).and_return(control_hash)
         end
 
         it "is a one-element list containing the control hash" do
@@ -426,7 +426,7 @@ describe Chef::Audit::ControlGroupData do
         end
 
         it "adds a sequence number to the control" do
-          control_group_data.to_hash
+          control_group_data.to_h
           expect(control_hash).to have_key(:sequence_number)
         end
 
@@ -441,15 +441,15 @@ describe Chef::Audit::ControlGroupData do
         let(:control_1) do
           double("control 1",
           line_number: control_hash_1[:line_number],
-          to_hash: control_hash_1) end
+          to_h: control_hash_1) end
         let(:control_2) do
           double("control 2",
           line_number: control_hash_2[:line_number],
-          to_hash: control_hash_2) end
+          to_h: control_hash_2) end
         let(:control_3) do
           double("control 3",
           line_number: control_hash_3[:line_number],
-          to_hash: control_hash_3) end
+          to_h: control_hash_3) end
 
         let(:control_list) { [control_1, control_2, control_3] }
         let(:ordered_control_hashes) { [control_hash_2, control_hash_1, control_hash_3] }
@@ -470,7 +470,7 @@ describe Chef::Audit::ControlGroupData do
         end
 
         it "assigns sequence numbers in order" do
-          control_group_data.to_hash
+          control_group_data.to_h
           ordered_control_hashes.each_with_index do |control_hash, idx|
             expect(control_hash[:sequence_number]).to eq idx + 1
           end

data/spec/unit/environment_spec.rb

@@ -317,7 +317,7 @@ describe Chef::Environment do
 
     it "validates the name given in the params" do
       expect(@environment.update_from_params(name: "@$%^&*()")).to be_falsey
-      expect(@environment.invalid_fields[:name]).to eq(%q{Option name's value @$%^&*() does not match regular expression /^[\-[:alnum:]_]+$/})
+      expect(@environment.invalid_fields[:name]).to eq(%q{Property name's value @$%^&*() does not match regular expression /^[\-[:alnum:]_]+$/})
     end
 
     it "updates the description from parameters[:description]" do

data/spec/unit/file_content_management/deploy/mv_unix_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -98,4 +98,16 @@ describe Chef::FileContentManagement::Deploy::MvUnix do
     end
 
   end
+
+  describe "when testing against real files", unix_only: true do
+    it "preserves sticky bits" do
+      staging_file = Tempfile.new("staging_file")
+      target_file = Tempfile.new("target_file")
+      File.chmod(04755, target_file.path)
+      content_deployer.deploy(staging_file.path, target_file.path)
+      expect(::File.stat(target_file.path).mode & 07777).to eql(04755)
+      staging_file.unlink
+      target_file.unlink
+    end
+  end
 end

data/spec/unit/node_spec.rb

@@ -1818,4 +1818,37 @@ describe Chef::Node do
       expect(node["a"]["key"]).to eql(1)
     end
   end
+
+  describe "when abusing the deep merge cache" do
+    # https://github.com/chef/chef/issues/7738
+    it "do not corrupt VividMashes that are part of the merge set and not the merge_onto set" do
+      # need to have a merge two-deep (not at the top-level) between at least two default (or two override)
+      # levels where the lowest priority one is the one that is going to be corrupted
+      node.default["foo"]["bar"]["baz"] = "fizz"
+      node.env_default["foo"]["bar"]["quux"] = "buzz"
+      node.default["foo"]["bar"].tap do |bar|
+        bar["test"] = "wrong"
+        # this triggers a deep merge
+        node["foo"]["bar"]["test"]
+        # this should correctly write and dirty the cache so the next read does another deep merge on the correct __root__
+        bar["test"] = "right"
+      end
+      expect(node["foo"]["bar"]["test"]).to eql("right")
+    end
+
+    it "do not corrupt VividMashes that are part of the merge set and not the merge_onto set (when priorities are reversed)" do
+      # need to have a merge two-deep (not at the top-level) between at least two default (or two override)
+      # levels where the *HIGHEST* priority one is the one that is going to be corrupted
+      node.env_default["foo"]["bar"]["baz"] = "fizz"
+      node.default["foo"]["bar"]["quux"] = "buzz"
+      node.env_default["foo"]["bar"].tap do |bar|
+        bar["test"] = "wrong"
+        # this triggers a deep merge
+        node["foo"]["bar"]["test"]
+        # this should correctly write and dirty the cache so the next read does another deep merge on the correct __root__
+        bar["test"] = "right"
+      end
+      expect(node["foo"]["bar"]["test"]).to eql("right")
+    end
+  end
 end

data/spec/unit/provider/package/rpm_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Joshua Timberman (<joshua@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@ describe Chef::Provider::Package::Rpm do
   let(:package_name) { "ImageMagick-c++" }
 
   let(:new_resource) do
-    Chef::Resource::Package.new(package_name).tap do |resource|
+    Chef::Resource::RpmPackage.new(package_name).tap do |resource|
       resource.source(package_source)
     end
   end
@@ -51,7 +51,7 @@ describe Chef::Provider::Package::Rpm do
   describe "when the package source is not valid" do
 
     context "when source is not defiend" do
-      let(:new_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+      let(:new_resource) { Chef::Resource::RpmPackage.new("ImageMagick-c++") }
 
       it "should raise an exception when attempting any action" do
         expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
@@ -405,10 +405,10 @@ describe Chef::Provider::Package::Rpm do
       # let() bindings and such, we have to set the stub here and not in a
       # before block.
       allow(::File).to receive(:exist?).with(package_source).and_return(true)
-      Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+      Chef::Resource::RpmPackage.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
     end
 
-    let(:current_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+    let(:current_resource) { Chef::Resource::RpmPackage.new("ImageMagick-c++") }
 
     it "should install from a path when the package is a path and the source is nil" do
       expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")

data/spec/unit/provider/package/zypper_spec.rb

@@ -163,6 +163,22 @@ describe Chef::Provider::Package::Zypper do
       )
       provider.install_package(["emacs"], ["1.0"])
     end
+
+    it "should add user provided global options" do
+      new_resource.global_options "--user-provided"
+      shell_out_expectation!(
+        "zypper", "--user-provided", "--non-interactive", "install", "--auto-agree-with-licenses", "emacs=1.0"
+      )
+      provider.install_package(["emacs"], ["1.0"])
+    end
+
+    it "should add multiple user provided global options" do
+      new_resource.global_options "--user-provided1 --user-provided2"
+      shell_out_expectation!(
+        "zypper", "--user-provided1", "--user-provided2", "--non-interactive", "install", "--auto-agree-with-licenses", "emacs=1.0"
+      )
+      provider.install_package(["emacs"], ["1.0"])
+    end
   end
 
   describe "upgrade_package" do
@@ -193,6 +209,13 @@ describe Chef::Provider::Package::Zypper do
       )
       provider.upgrade_package(["emacs"], ["1.0"])
     end
+    it "should add user provided global options" do
+      new_resource.global_options "--user-provided"
+      shell_out_expectation!(
+        "zypper", "--user-provided", "--non-interactive", "install", "--auto-agree-with-licenses", "emacs=1.0"
+      )
+      provider.upgrade_package(["emacs"], ["1.0"])
+    end
   end
 
   describe "remove_package" do
@@ -234,6 +257,13 @@ describe Chef::Provider::Package::Zypper do
         )
         provider.remove_package(["emacs"], ["1.0"])
       end
+      it "should add user provided global options" do
+        new_resource.global_options "--user-provided"
+        shell_out_expectation!(
+          "zypper", "--user-provided", "--non-interactive", "remove", "emacs=1.0"
+        )
+        provider.remove_package(["emacs"], ["1.0"])
+      end
     end
   end
 
@@ -265,6 +295,13 @@ describe Chef::Provider::Package::Zypper do
       )
       provider.purge_package(["emacs"], ["1.0"])
     end
+    it "should add user provided global options" do
+      new_resource.global_options "--user-provided"
+      shell_out_expectation!(
+        "zypper", "--user-provided", "--non-interactive", "remove", "--clean-deps", "emacs=1.0"
+      )
+      provider.purge_package(["emacs"], ["1.0"])
+    end
   end
 
   describe "action_lock" do
@@ -320,6 +357,13 @@ describe Chef::Provider::Package::Zypper do
       )
       provider.lock_package(["emacs"], [nil])
     end
+    it "should add user provided global options" do
+      new_resource.global_options "--user-provided"
+      shell_out_expectation!(
+        "zypper", "--user-provided", "--non-interactive", "addlock", "emacs"
+      )
+      provider.lock_package(["emacs"], [nil])
+    end
   end
 
   describe "action_unlock" do
@@ -374,6 +418,13 @@ describe Chef::Provider::Package::Zypper do
       )
       provider.unlock_package(["emacs"], [nil])
     end
+    it "should add user provided global options" do
+      new_resource.global_options "--user-provided"
+      shell_out_expectation!(
+        "zypper", "--user-provided", "--non-interactive", "removelock", "emacs"
+      )
+      provider.unlock_package(["emacs"], [nil])
+    end
   end
 
   describe "on an older zypper" do

data/spec/unit/provider/package_spec.rb

@@ -171,7 +171,7 @@ describe Chef::Provider::Package do
 
     it "should print the word 'uninstalled' if there was no original version" do
       allow(current_resource).to receive(:version).and_return(nil)
-      expect(logger).to receive(:info).with("package[install emacs] upgraded emacs to 1.0")
+      expect(logger).to receive(:info).with("package[install emacs] upgraded(allow_downgrade) emacs to 1.0")
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -714,7 +714,15 @@ describe "Chef::Provider::Package - Multi" do
       expect(new_resource).not_to be_updated_by_last_action
     end
 
-    it "does not install older version" do
+    it "does install an older version by default" do
+      current_resource.version(["1.1", "6.2"])
+      new_resource.version(["1.0", "6.1"])
+      provider.run_action(:install)
+      expect(new_resource).to be_updated_by_last_action
+    end
+
+    it "does not install an older version if the resource subclass has allow_downgrade set to false" do
+      allow(new_resource).to receive(:allow_downgrade).and_return(false)
       current_resource.version(["1.1", "6.2"])
       new_resource.version(["1.0", "6.1"])
       provider.run_action(:install)
@@ -980,4 +988,26 @@ describe "Chef::Provider::Package - Multi" do
       end
     end
   end
+
+  describe "version_compare" do
+    it "tests equality" do
+      expect(provider.version_compare("1.3", "1.3")).to eql(0)
+    end
+
+    it "tests less than" do
+      expect(provider.version_compare("1.2", "1.3")).to eql(-1)
+    end
+
+    it "tests greater than" do
+      expect(provider.version_compare("1.5", "1.3")).to eql(1)
+    end
+
+    it "x.10 is greater than x.2 (so does not do floating point comparisons)" do
+      expect(provider.version_compare("1.10", "1.2")).to eql(1)
+    end
+
+    it "sanitizes inputs" do
+      expect(provider.version_compare("1.3_3", "1.3")).to eql(0)
+    end
+  end
 end

data/spec/unit/provider/registry_key_spec.rb

@@ -309,6 +309,80 @@ describe Chef::Provider::RegistryKey do
         @provider.action_create
       end
     end
+
+    context "when sensitive is true" do
+      before(:each) do
+        @new_resource.sensitive(true)
+      end
+
+      context "and key exists" do
+        let(:keyname) { 'hklm\\software\\opscode\\testing\\sensitive\exists' }
+        before(:each) do
+          expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
+          expect(@double_registry).to receive(:get_values).with(keyname).and_return(
+            [
+              { name: "one", type: :string, data: "initial value" },
+              { name: "two", type: :dword, data: 9001 }
+            ]
+          )
+        end
+
+        context "and type is a string" do
+          let(:testval1) { { name: "one", type: :string, data: "first_value" } }
+
+          it "sets the unscrubbed value" do
+            expect(@double_registry).to receive(:set_value).with(keyname, testval1)
+            @provider.load_current_resource
+            @provider.action_create
+          end
+        end
+
+        context "and type is a dword" do
+          let(:testval1) { { name: "two", type: :dword, data: 12345 } }
+
+          it "sets the unscrubbed value" do
+            expect(@double_registry).to receive(:set_value).with(keyname, testval1)
+            @provider.load_current_resource
+            @provider.action_create
+          end
+        end
+      end
+
+      context "and key does not exist" do
+        let(:keyname) { 'hklm\\software\\opscode\\testing\\sensitive\missing' }
+        let(:testval1) { { name: "one", type: :string, data: "first_value" } }
+
+        before(:each) do
+          expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(false)
+          expect(@double_registry).to receive(:create_key).with(keyname, false)
+        end
+
+        it "sets the unscrubbed value" do
+          expect(@double_registry).to receive(:set_value).with(keyname, testval1)
+          @provider.load_current_resource
+          @provider.action_create
+        end
+      end
+    end
+  end
+
+  describe "action_create_if_missing" do
+    context "when sensitive is true" do
+      let(:keyname) { 'hklm\\software\\opscode\\testing\\create_if_missing\\sensitive' }
+      let(:testval1) { { name: "one", type: :string, data: "first_value" } }
+
+      before(:each) do
+        expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return([])
+        @new_resource.sensitive(true)
+      end
+
+      it "sets the unscrubbed value" do
+        expect(@double_registry).to receive(:set_value).with(keyname, testval1)
+        @provider.load_current_resource
+        @provider.action_create_if_missing
+      end
+    end
   end
 end