chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

data/spec/unit/node/attribute_spec.rb

@@ -382,7 +382,7 @@ describe Chef::Node::Attribute do
       expect(@attributes["command"]["ps"]).to eq("ps -ef")
     end
 
-    it "should return default data if it is not overriden or in attribute data" do
+    it "should return default data if it is not overridden or in attribute data" do
       expect(@attributes["music"]["mastodon"]).to eq("rocks")
     end
 
@@ -1259,12 +1259,12 @@ describe Chef::Node::Attribute do
   describe "frozen immutable strings" do
     it "strings in hashes should be frozen" do
       @attributes.default["foo"]["bar"]["baz"] = "fizz"
-      expect { @attributes["foo"]["bar"]["baz"] << "buzz" }.to raise_error(RuntimeError, "can't modify frozen String")
+      expect { @attributes["foo"]["bar"]["baz"] << "buzz" }.to raise_error(FrozenError, /can't modify frozen String/)
     end
 
     it "strings in arrays should be frozen" do
       @attributes.default["foo"]["bar"] = [ "fizz" ]
-      expect { @attributes["foo"]["bar"][0] << "buzz" }.to raise_error(RuntimeError, "can't modify frozen String")
+      expect { @attributes["foo"]["bar"][0] << "buzz" }.to raise_error(FrozenError, /can't modify frozen String/)
     end
   end
 

data/spec/unit/node_spec.rb

@@ -940,6 +940,23 @@ describe Chef::Node do
       expect(node["one"].to_hash).to eq({ "two" => { "three" => "forty-two" } })
     end
 
+    it "converts the platform_version to a Chef::VersionString" do
+      node.consume_external_attrs(@ohai_data, {})
+      expect(node["platform_version"]).to be_kind_of(Chef::VersionString)
+    end
+  end
+
+  describe "merging ohai data" do
+    before do
+      @ohai_data = { platform: "foo", platform_version: "bar" }
+    end
+
+    it "converts the platform_version to a Chef::VersionString" do
+      node.consume_external_attrs(@ohai_data, {})
+      node.consume_ohai_data({ "platform_version" => "6.3" })
+      expect(node["platform_version"]).to be_kind_of(Chef::VersionString)
+      expect(node["platform_version"] =~ "~> 6.1").to be true
+    end
   end
 
   describe "preparing for a chef client run" do
@@ -966,6 +983,13 @@ describe Chef::Node do
       expect(node.normal_attrs).to eq({ "foo" => "bar", "tags" => [] })
     end
 
+    it "converts the platform_version to a Chef::VersionString" do
+      node.consume_external_attrs(@ohai_data, {})
+      expect(node.automatic_attrs[:platform_version]).to be_a_kind_of(Chef::VersionString)
+      expect(node[:platform_version]).to be_a_kind_of(Chef::VersionString)
+      expect(node[:platform_version] =~ "~> 23.6").to be true
+    end
+
   end
 
   describe "when expanding its run list and merging attributes" do

data/spec/unit/platform/query_helpers_spec.rb

@@ -18,149 +18,6 @@
 
 require "spec_helper"
 
-describe "Chef::Platform#windows_nano_server?" do
-  include_context "Win32"
-
-  let(:key) { "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Server\\ServerLevels" }
-  let(:key_query_value) { 0x0001 }
-  let(:access) { key_query_value | 0x0100 }
-  let(:hive) { double("Win32::Registry::HKEY_LOCAL_MACHINE") }
-  let(:registry) { double("Win32::Registry") }
-
-  before(:all) do
-    Win32::Registry = Class.new
-    Win32::Registry::Error = Class.new(RuntimeError)
-  end
-
-  before do
-    Win32::Registry::HKEY_LOCAL_MACHINE = hive
-    Win32::Registry::KEY_QUERY_VALUE = key_query_value
-  end
-
-  after do
-    Win32::Registry.send(:remove_const, "HKEY_LOCAL_MACHINE") if defined?(Win32::Registry::HKEY_LOCAL_MACHINE)
-    Win32::Registry.send(:remove_const, "KEY_QUERY_VALUE") if defined?(Win32::Registry::KEY_QUERY_VALUE)
-  end
-
-  it "returns false early when not on windows" do
-    allow(ChefUtils).to receive(:windows?).and_return(false)
-    expect(Chef::Platform).to_not receive(:require)
-    expect(Chef::Platform.windows_nano_server?).to be false
-  end
-
-  it "returns true when the registry value is 1" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_yield(registry)
-    expect(registry).to receive(:[]).with("NanoServer").and_return(1)
-    expect(Chef::Platform.windows_nano_server?).to be true
-  end
-
-  it "returns false when the registry value is not 1" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_yield(registry)
-    expect(registry).to receive(:[]).with("NanoServer").and_return(0)
-    expect(Chef::Platform.windows_nano_server?).to be false
-  end
-
-  it "returns false when the registry value does not exist" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_yield(registry)
-    expect(registry).to receive(:[]).with("NanoServer")
-      .and_raise(Win32::Registry::Error, "The system cannot find the file specified.")
-    expect(Chef::Platform.windows_nano_server?).to be false
-  end
-
-  it "returns false when the registry key does not exist" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_raise(Win32::Registry::Error, "The system cannot find the file specified.")
-    expect(Chef::Platform.windows_nano_server?).to be false
-  end
-end
-
-describe "Chef::Platform#supports_msi?" do
-  include_context "Win32" # clear and restore Win32:: namespace
-
-  let(:key) { "System\\CurrentControlSet\\Services\\msiserver" }
-  let(:key_query_value) { 0x0001 }
-  let(:access) { key_query_value }
-  let(:hive) { double("Win32::Registry::HKEY_LOCAL_MACHINE") }
-  let(:registry) { double("Win32::Registry") }
-
-  before(:all) do
-    Win32::Registry = Class.new
-    Win32::Registry::Error = Class.new(RuntimeError)
-  end
-
-  before do
-    Win32::Registry::HKEY_LOCAL_MACHINE = hive
-    Win32::Registry::KEY_QUERY_VALUE = key_query_value
-  end
-
-  after do
-    Win32::Registry.send(:remove_const, "HKEY_LOCAL_MACHINE") if defined?(Win32::Registry::HKEY_LOCAL_MACHINE)
-    Win32::Registry.send(:remove_const, "KEY_QUERY_VALUE") if defined?(Win32::Registry::KEY_QUERY_VALUE)
-  end
-
-  it "returns false early when not on windows" do
-    allow(ChefUtils).to receive(:windows?).and_return(false)
-    expect(Chef::Platform).to_not receive(:require)
-    expect(Chef::Platform.supports_msi?).to be false
-  end
-
-  it "returns true when the registry key exists" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_yield(registry)
-    expect(Chef::Platform.supports_msi?).to be true
-  end
-
-  it "returns false when the registry key does not exist" do
-    allow(ChefUtils).to receive(:windows?).and_return(true)
-    allow(Chef::Platform).to receive(:require).with("win32/registry")
-    expect(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open)
-      .with(key, access)
-      .and_raise(Win32::Registry::Error, "The system cannot find the file specified.")
-    expect(Chef::Platform.supports_msi?).to be false
-  end
-end
-
-describe "Chef::Platform#supports_dsc?" do
-  it "returns false if PowerShell is not present" do
-    node = Chef::Node.new
-    expect(Chef::Platform.supports_dsc?(node)).to be_falsey
-  end
-
-  ["1.0", "2.0", "3.0"].each do |version|
-    it "returns false for PowerShell #{version}" do
-      node = Chef::Node.new
-      node.automatic[:languages][:powershell][:version] = version
-      expect(Chef::Platform.supports_dsc?(node)).to be_falsey
-    end
-  end
-
-  ["4.0", "5.0"].each do |version|
-    it "returns true for PowerShell #{version}" do
-      node = Chef::Node.new
-      node.automatic[:languages][:powershell][:version] = version
-      expect(Chef::Platform.supports_dsc?(node)).to be_truthy
-    end
-  end
-end
-
 describe "Chef::Platform#supports_dsc_invoke_resource?" do
   it "returns false if powershell is not present" do
     node = Chef::Node.new

data/spec/unit/property/state_spec.rb

@@ -285,8 +285,8 @@ describe "Chef::Resource#identity and #state" do
       it "identity when x is not defined returns the value of x" do
         expect(resource.identity).to eq "blah"
       end
-      it "state when x is not defined returns the value of x" do
-        expect(resource.state_for_resource_reporter).to eq(x: "blah")
+      it "the name property is not included in the desired state" do
+        expect(resource.state_for_resource_reporter).to eq({})
       end
     end
   end
@@ -332,12 +332,17 @@ describe "Chef::Resource#identity and #state" do
     end
 
     with_property ":x, name_property: true" do
-      # it "Unset values with name_property are included in state" do
-      #   expect(resource.state_for_resource_reporter).to eq({ x: 'blah' })
-      # end
-      it "Set values with name_property are included in state" do
+      it "Is by default the identity property if no other identity property is included" do
+        expect(resource.identity).to eq("blah")
+      end
+
+      it "Unset values with name_property are not included in state" do
+        expect(resource.state_for_resource_reporter).to eq({})
+      end
+
+      it "Set values with name_property are not included in state" do
         resource.x 1
-        expect(resource.state_for_resource_reporter).to eq(x: 1)
+        expect(resource.state_for_resource_reporter).to eq({})
       end
     end
 

data/spec/unit/property/validation_spec.rb

@@ -45,11 +45,22 @@ describe "Chef::Resource.property validation" do
       def self.blah
         "class#{Namer.next_index}"
       end
+
+      action :doit do
+        # this needs to not reference any properties
+      end
+
+      action :doit2 do
+        # this needs to not reference any properties
+      end
     end
   end
 
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:resource) do
-    resource_class.new("blah")
+    resource_class.new("blah", run_context)
   end
 
   def self.english_join(values)
@@ -576,6 +587,19 @@ describe "Chef::Resource.property validation" do
       it "value nil emits a validation failed error because it must have a value" do
         expect { resource.x nil }.to raise_error Chef::Exceptions::ValidationFailed
       end
+      it "fails if it is not specified, on running the action, even if it is not referenced" do
+        expect { resource.run_action(:doit) }.to raise_error Chef::Exceptions::ValidationFailed
+      end
+    end
+
+    with_property ":x, required: %i{doit}" do
+      it "fails if it is not specified, on running the doit action, even if it is not referenced" do
+        expect { resource.run_action(:doit) }.to raise_error Chef::Exceptions::ValidationFailed
+      end
+
+      it "does not fail if it is not specified, on running the doit2 action" do
+        expect { resource.run_action(:doit2) }.not_to raise_error
+      end
     end
 
     with_property ":x, String, required: true" do

data/spec/unit/property_spec.rb

@@ -542,7 +542,7 @@ describe "Chef::Resource.property" do
           expect(resource.x).to eq ""
         end
         it "x is immutable" do
-          expect { resource.x << "foo" }.to raise_error(RuntimeError, "can't modify frozen String")
+          expect { resource.x << "foo" }.to raise_error(FrozenError, /can't modify frozen String/)
         end
       end
 
@@ -562,7 +562,7 @@ describe "Chef::Resource.property" do
           expect(resource.x).to eq({})
         end
         it "x is immutable" do
-          expect { resource.x["foo"] = "bar" }.to raise_error(RuntimeError, "can't modify frozen Hash")
+          expect { resource.x["foo"] = "bar" }.to raise_error(FrozenError, /can't modify frozen Hash/)
         end
         it "The same exact value is returned multiple times in a row" do
           value = resource.x
@@ -595,13 +595,13 @@ describe "Chef::Resource.property" do
           expect(resource.x).to eq([{ foo: "bar" }])
         end
         it "x is immutable" do
-          expect { resource.x << :other }.to raise_error(RuntimeError, "can't modify frozen Array")
+          expect { resource.x << :other }.to raise_error(FrozenError, /can't modify frozen Array/)
         end
         it "x.first is immutable" do
-          expect { resource.x.first[:foo] = "other" }.to raise_error(RuntimeError, "can't modify frozen Hash")
+          expect { resource.x.first[:foo] = "other" }.to raise_error(FrozenError, /can't modify frozen Hash/)
         end
         it "x.first[:foo] is immutable" do
-          expect { resource.x.first[:foo] << "other" }.to raise_error(RuntimeError, "can't modify frozen String")
+          expect { resource.x.first[:foo] << "other" }.to raise_error(FrozenError, /can't modify frozen String/)
         end
       end
     end
@@ -1022,6 +1022,9 @@ describe "Chef::Resource.property" do
         it "defaults x to resource.name" do
           expect(resource.x).to eq "blah"
         end
+        it "defaults to being part of the identity if there is no other identity" do
+          expect(resource.identity).to eq "blah"
+        end
         it "does not pick up resource.name if set" do
           expect(resource.x 10).to eq 10
           expect(resource.x).to eq 10
@@ -1072,13 +1075,13 @@ describe "Chef::Resource.property" do
 
   it "raises an error if both name_property and name_attribute are specified" do
     expect { resource_class.property :x, name_property: false, name_attribute: 1 }.to raise_error ArgumentError,
-      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
+      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)/
     expect { resource_class.property :x, name_property: false, name_attribute: nil }.to raise_error ArgumentError,
-      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
+      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)/
     expect { resource_class.property :x, name_property: false, name_attribute: false }.to raise_error ArgumentError,
-      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
+      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)/
     expect { resource_class.property :x, name_property: true, name_attribute: true }.to raise_error ArgumentError,
-      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
+      /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)/
   end
 
   context "property_type" do

data/spec/unit/provider/apt_preference_spec.rb

@@ -18,24 +18,28 @@
 #
 
 require "spec_helper"
+require "chef/resource/apt_preference"
 
-describe Chef::Provider::AptPreference do
-  let(:new_resource) { Chef::Resource::AptPreference.new("libmysqlclient16.1*") }
+# FIXME: provider has been moved to a custom resource, should migrate the unit tests
+#
+describe "Chef::Provider::AptPreference" do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:collection) { double("resource collection") }
+  let(:new_resource) { Chef::Resource::AptPreference.new("libmysqlclient16.1*", run_context) }
   let(:pref_dir) { Dir.mktmpdir("apt_pref_d") }
+  let(:provider) { new_resource.provider_for_action(:add) }
 
   before do
-    stub_const("Chef::Provider::AptPreference::APT_PREFERENCE_DIR", pref_dir)
+    node.automatic["platform_family"] = "debian"
+    Chef::Resource::AptPreference.send(:remove_const, :APT_PREFERENCE_DIR)
+    Chef::Resource::AptPreference.const_set(:APT_PREFERENCE_DIR, pref_dir)
+
     new_resource.pin = "1.0.1"
     new_resource.pin_priority 1001
   end
 
-  let(:provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
-    Chef::Provider::AptPreference.new(new_resource, run_context)
-  end
-
   it "responds to load_current_resource" do
     expect(provider).to respond_to(:load_current_resource)
   end

data/spec/unit/provider/apt_repository_spec.rb

@@ -18,41 +18,39 @@
 
 require "spec_helper"
 
-# Now we are using the option --with-colons that works across old os versions
-# as well as the latest (16.10). This for both `apt-key` and `gpg` commands
-#
-# Output of the command:
-# => apt-key adv --list-public-keys --with-fingerprint --with-colons
-APT_KEY_FINGER = <<~EOF.freeze
-  tru:t:1:1488924856:0:3:1:5
-  pub:-:1024:17:40976EAF437D05B5:2004-09-12:::-:Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>::scESC:
-  fpr:::::::::630239CC130E1A7FD81A27B140976EAF437D05B5:
-  sub:-:2048:16:251BEFF479164387:2004-09-12::::::e:
-  pub:-:1024:17:46181433FBB75451:2004-12-30:::-:Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>::scSC:
-  fpr:::::::::C5986B4F1257FFA86632CBA746181433FBB75451:
-  pub:-:4096:1:3B4FE6ACC0B21F32:2012-05-11:::-:Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>::scSC:
-  fpr:::::::::790BC7277767219C42C86F933B4FE6ACC0B21F32:
-  pub:-:4096:1:D94AA3F0EFE21092:2012-05-11:::-:Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>::scSC:
-  fpr:::::::::843938DF228D22F7B3742BC0D94AA3F0EFE21092:
-EOF
-
-# Output of the command:
-# => gpg --with-fingerprint --with-colons [FILE]
-GPG_FINGER = <<~EOF.freeze
-  pub:-:1024:17:327574EE02A818DD:2009-04-22:::-:Cloudera Apt Repository:
-  fpr:::::::::F36A89E33CC1BD0F71079007327574EE02A818DD:
-  sub:-:2048:16:84080586D1CA74A1:2009-04-22::::
-EOF
-
-describe Chef::Provider::AptRepository do
-  let(:new_resource) { Chef::Resource::AptRepository.new("multiverse") }
-
-  let(:provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
-    Chef::Provider::AptRepository.new(new_resource, run_context)
-  end
+describe "Chef::Provider::AptRepository" do
+  # Now we are using the option --with-colons that works across old os versions
+  # as well as the latest (16.10). This for both `apt-key` and `gpg` commands
+  #
+  # Output of the command:
+  # => apt-key adv --list-public-keys --with-fingerprint --with-colons
+  APT_KEY_FINGER = <<~EOF.freeze
+    tru:t:1:1488924856:0:3:1:5
+    pub:-:1024:17:40976EAF437D05B5:2004-09-12:::-:Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>::scESC:
+    fpr:::::::::630239CC130E1A7FD81A27B140976EAF437D05B5:
+    sub:-:2048:16:251BEFF479164387:2004-09-12::::::e:
+    pub:-:1024:17:46181433FBB75451:2004-12-30:::-:Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>::scSC:
+    fpr:::::::::C5986B4F1257FFA86632CBA746181433FBB75451:
+    pub:-:4096:1:3B4FE6ACC0B21F32:2012-05-11:::-:Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>::scSC:
+    fpr:::::::::790BC7277767219C42C86F933B4FE6ACC0B21F32:
+    pub:-:4096:1:D94AA3F0EFE21092:2012-05-11:::-:Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>::scSC:
+    fpr:::::::::843938DF228D22F7B3742BC0D94AA3F0EFE21092:
+  EOF
+
+  # Output of the command:
+  # => gpg --with-fingerprint --with-colons [FILE]
+  APG_GPG_FINGER = <<~EOF.freeze
+    pub:-:1024:17:327574EE02A818DD:2009-04-22:::-:Cloudera Apt Repository:
+    fpr:::::::::F36A89E33CC1BD0F71079007327574EE02A818DD:
+    sub:-:2048:16:84080586D1CA74A1:2009-04-22::::
+  EOF
+
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:collection) { double("resource collection") }
+  let(:new_resource) { Chef::Resource::AptRepository.new("multiverse", run_context) }
+  let(:provider) { new_resource.provider_for_action(:add) }
 
   let(:apt_key_finger_cmd) do
     %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}
@@ -63,7 +61,7 @@ describe Chef::Provider::AptRepository do
   end
 
   let(:gpg_finger) do
-    double("shell_out", stdout: GPG_FINGER, exitstatus: 0, error?: false)
+    double("shell_out", stdout: APG_GPG_FINGER, exitstatus: 0, error?: false)
   end
 
   let(:gpg_shell_out_success) do