chef 16.3.45-universal-mingw32 → 16.5.77-universal-mingw32

data/spec/unit/resource/powershell_script_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Resource::PowershellScript do
 
-  before(:each) do
+  let(:resource) do
     node = Chef::Node.new
 
     node.default["kernel"] = {}
@@ -29,26 +29,25 @@ describe Chef::Resource::PowershellScript do
 
     run_context = Chef::RunContext.new(node, nil, nil)
 
-    @resource = Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
+    Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
   end
 
   it "creates a new Chef::Resource::PowershellScript" do
-    expect(@resource).to be_a_kind_of(Chef::Resource::PowershellScript)
+    expect(resource).to be_a_kind_of(Chef::Resource::PowershellScript)
   end
 
   it "sets convert_boolean_return to false by default" do
-    expect(@resource.convert_boolean_return).to eq(false)
+    expect(resource.convert_boolean_return).to eq(false)
   end
 
   it "returns the value for convert_boolean_return that was set" do
-    @resource.convert_boolean_return true
-    expect(@resource.convert_boolean_return).to eq(true)
-    @resource.convert_boolean_return false
-    expect(@resource.convert_boolean_return).to eq(false)
+    resource.convert_boolean_return true
+    expect(resource.convert_boolean_return).to eq(true)
+    resource.convert_boolean_return false
+    expect(resource.convert_boolean_return).to eq(false)
   end
 
   context "when using guards" do
-    let(:resource) { @resource }
     before(:each) do
       allow(resource).to receive(:run_action)
       allow(resource).to receive(:updated).and_return(true)
@@ -126,28 +125,11 @@ describe Chef::Resource::PowershellScript do
   end
 
   context "as a script running in Windows-based scripting language" do
-    let(:resource_instance) { @resource }
-    let(:resource_instance_name ) { @resource.command }
+    let(:windows_script_resource) { resource }
+    let(:resource_instance_name ) { resource.command }
     let(:resource_name) { :powershell_script }
     let(:interpreter_file_name) { "powershell.exe" }
-    before do
-      allow(@resource).to receive(:default_flags).and_return(nil)
-    end
-    it_behaves_like "a Windows script resource"
-  end
-
-  describe "#flags" do
-    let(:resource) { @resource }
-
-    it "appends user's flags to the defaults" do
-      flags = %q{-Lunch "tacos"}
-      resource.flags = flags
 
-      expect(resource.flags).to eq("#{resource.default_flags} #{flags}")
-    end
-
-    it "uses the defaults when user doesn't provide flags" do
-      expect(resource.flags).to eq(resource.default_flags)
-    end
+    it_behaves_like "a Windows script resource"
   end
 end

data/spec/unit/resource/rhsm_register_spec.rb

@@ -41,23 +41,34 @@ describe Chef::Resource::RhsmRegister do
   end
 
   describe "#katello_cert_rpm_installed?" do
-    let(:cmd) { double("cmd") }
-
-    before do
-      allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
-      allow(cmd).to receive(:run_command)
-    end
-
     context "when the output contains katello-ca-consumer" do
+      let(:with_katello) { double("shell_out", stdout: <<~RPM) }
+        libevent-2.0.21-4.el7.x86_64
+        gettext-libs-0.19.8.1-3.el7.x86_64
+        yum-metadata-parser-1.1.4-10.el7.x86_64
+        pyliblzma-0.5.3-11.el7.x86_64
+        python-IPy-0.75-6.el7.noarch
+        grubby-8.28-26.el7.x86_64
+        fipscheck-lib-1.4.1-6.el7.x86_64
+        centos-logos-70.0.6-3.el7.centos.noarch
+        nss-tools-3.44.0-7.el7_7.x86_64
+        katello-ca-consumer-somehostname-1.0-1.el7.x86_64
+        rpm-4.11.3-43.el7.x86_64
+        gpgme-1.3.2-5.el7.x86_64
+        libnfsidmap-0.25-19.el7.x86_64
+      RPM
+
       it "returns true" do
-        allow(cmd).to receive(:stdout).and_return("katello-ca-consumer-somehostname-1.0-1")
+        allow(provider).to receive(:shell_out).and_return(with_katello)
         expect(provider.katello_cert_rpm_installed?).to eq(true)
       end
     end
 
     context "when the output does not contain katello-ca-consumer" do
+      let(:without_katello) { double("shell_out", stdout: "") }
+
       it "returns false" do
-        allow(cmd).to receive(:stdout).and_return("katello-agent-but-not-the-ca")
+        allow(provider).to receive(:shell_out).and_return(without_katello)
         expect(provider.katello_cert_rpm_installed?).to eq(false)
       end
     end
@@ -89,6 +100,22 @@ describe Chef::Resource::RhsmRegister do
         end
       end
 
+      context "when a system_name is provided" do
+        it "returns a command containing the system name" do
+          allow(resource).to receive(:organization).and_return("myorg")
+          allow(resource).to receive(:system_name).and_return("myname")
+          expect(provider.register_command).to match("--name=myname")
+        end
+      end
+
+      context "when a system_name is not provided" do
+        it "returns a command containing the system name" do
+          allow(resource).to receive(:organization).and_return("myorg")
+          allow(resource).to receive(:system_name).and_return(nil)
+          expect(provider.register_command).not_to match("--name")
+        end
+      end
+
       context "when auto_attach is true" do
         it "does not return a command with --auto-attach since it is not supported with activation keys" do
           allow(resource).to receive(:organization).and_return("myorg")
@@ -124,6 +151,20 @@ describe Chef::Resource::RhsmRegister do
         end
       end
 
+      context "when a system_name is provided" do
+        it "returns a command containing the system name" do
+          allow(resource).to receive(:system_name).and_return("myname")
+          expect(provider.register_command).to match("--name=myname")
+        end
+      end
+
+      context "when a system_name is not provided" do
+        it "returns a command containing the system name" do
+          allow(resource).to receive(:system_name).and_return(nil)
+          expect(provider.register_command).not_to match("--name")
+        end
+      end
+
       context "when auto_attach is nil" do
         it "returns a command that does not contain --auto-attach" do
           allow(resource).to receive(:auto_attach).and_return(nil)
@@ -204,23 +245,20 @@ describe Chef::Resource::RhsmRegister do
   end
 
   describe "#registered_with_rhsm?" do
-    let(:cmd) { double("cmd") }
-
-    before do
-      allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
-      allow(cmd).to receive(:run_command)
-    end
-
     context "when the status is Unknown" do
+      let(:unknown_status) { double("shell_out", stdout: "Overall Status: Unknown") }
+
       it "returns false" do
-        allow(cmd).to receive(:stdout).and_return("Overall Status: Unknown")
+        allow(provider).to receive(:shell_out).and_return(unknown_status)
         expect(provider.registered_with_rhsm?).to eq(false)
       end
     end
 
     context "when the status is anything else" do
+      let(:known_status) { double("shell_out", stdout: "Overall Status: Insufficient") }
+
       it "returns true" do
-        allow(cmd).to receive(:stdout).and_return("Overall Status: Insufficient")
+        allow(provider).to receive(:shell_out).and_return(known_status)
         expect(provider.registered_with_rhsm?).to eq(true)
       end
     end

data/spec/unit/resource/script_spec.rb

@@ -21,9 +21,14 @@ require "spec_helper"
 
 describe Chef::Resource::Script do
   let(:resource_instance_name) { "fakey_fakerton" }
-  let(:script_resource) { Chef::Resource::Script.new(resource_instance_name) }
   let(:resource_name) { :script }
 
+  let(:script_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, nil, nil)
+
+    Chef::Resource::Script.new(resource_instance_name, run_context)
+  end
+
   it "sets the default action as :run" do
     expect(script_resource.action).to eql([:run])
   end

data/spec/unit/resource/timezone_spec.rb

@@ -20,6 +20,31 @@ require "spec_helper"
 describe Chef::Resource::Timezone do
   let(:resource) { Chef::Resource::Timezone.new("fakey_fakerton") }
 
+  let(:shellout_tzutil) do
+    double("shell_out", stdout: "UTC\n", exitstatus: 0, error?: false)
+  end
+
+  # note: This weird indention is correct
+  let(:shellout_timedatectl) do
+    double("shell_out", exitstatus: 0, error?: false, stdout: <<-OUTPUT)
+    Local time: Tue 2020-08-18 20:55:05 UTC
+    Universal time: Tue 2020-08-18 20:55:05 UTC
+          RTC time: Tue 2020-08-18 20:55:05
+         Time zone: Etc/UTC (UTC, +0000)
+System clock synchronized: yes
+systemd-timesyncd.service active: yes
+   RTC in local TZ: no
+    OUTPUT
+  end
+
+  let(:shellout_systemsetup_fail) do
+    double("shell_out!", stdout: "You need administrator access to run this tool... exiting!", exitstatus: 0, error?: false) # yes it's a non-error exit
+  end
+
+  let(:shellout_systemsetup) do
+    double("shell_out!", stdout: "Time Zone: UTC", exitstatus: 0, error?: false)
+  end
+
   it "sets resource name as :timezone" do
     expect(resource.resource_name).to eql(:timezone)
   end
@@ -36,4 +61,42 @@ describe Chef::Resource::Timezone do
     expect { resource.action :set }.not_to raise_error
     expect { resource.action :unset }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
+
+  describe "#current_macos_tz" do
+    context "with admin privs" do
+      it "returns the TZ" do
+        expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup)
+        expect(resource.current_macos_tz).to eql("UTC")
+      end
+    end
+
+    context "without admin privs" do
+      it "returns the TZ" do
+        expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup_fail)
+        expect { resource.current_macos_tz }.to raise_error(RuntimeError, "The timezone resource requires administrative privileges to run on macOS hosts!")
+      end
+    end
+  end
+
+  describe "#current_systemd_tz" do
+    it "returns the TZ" do
+      expect(resource).to receive(:shell_out).and_return(shellout_timedatectl)
+      expect(resource.current_systemd_tz).to eql("Etc/UTC")
+    end
+  end
+
+  describe "#current_windows_tz" do
+    it "returns the TZ" do
+      expect(resource).to receive(:shell_out).and_return(shellout_tzutil)
+      expect(resource.current_windows_tz).to eql("UTC")
+    end
+  end
+
+  describe "#current_rhel_tz" do
+    it "returns the TZ" do
+      allow(File).to receive(:exist?).with("/etc/sysconfig/clock").and_return true
+      expect(File).to receive(:read).with("/etc/sysconfig/clock").and_return 'ZONE="UTC"'
+      expect(resource.current_rhel_tz).to eql("UTC")
+    end
+  end
 end

data/spec/unit/resource/windows_feature_powershell_spec.rb

@@ -22,6 +22,7 @@ describe Chef::Resource::WindowsFeaturePowershell do
   let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:resource) { Chef::Resource::WindowsFeaturePowershell.new(%w{SNMP DHCP}, run_context) }
+  let(:provider) { resource.provider_for_action(:install) }
 
   it "sets resource name as :windows_feature_powershell" do
     expect(resource.resource_name).to eql(:windows_feature_powershell)
@@ -35,10 +36,6 @@ describe Chef::Resource::WindowsFeaturePowershell do
     expect(resource.feature_name).to eql(%w{snmp dhcp})
   end
 
-  it "sets the default action as :install" do
-    expect(resource.action).to eql([:install])
-  end
-
   it "supports :delete, :install, :remove actions" do
     expect { resource.action :delete }.not_to raise_error
     expect { resource.action :install }.not_to raise_error
@@ -54,4 +51,33 @@ describe Chef::Resource::WindowsFeaturePowershell do
     resource.feature_name "SNMP"
     expect(resource.feature_name).to eql(["snmp"])
   end
+
+  it "install a single feature" do
+    resource.feature_name "snmp"
+    expect { resource.action :install }.not_to raise_error
+  end
+
+  it "install multi feature" do
+    resource.feature_name "SNMP, DHCP"
+    expect { resource.action :install }.not_to raise_error
+  end
+
+  it "does not attempt to install features that have been removed" do
+    node.default["powershell_features_cache"] ||= {}
+    node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
+    node.default["powershell_features_cache"]["removed"] = ["snmp"]
+    resource.feature_name "dhcp, snmp"
+
+    expect(provider.features_to_install).to eq(["dhcp"])
+  end
+
+  it "attempts to install features that have been removed when source is set" do
+    node.default["powershell_features_cache"] ||= {}
+    node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
+    node.default["powershell_features_cache"]["removed"] = ["snmp"]
+    resource.feature_name "dhcp, snmp"
+    resource.source 'D:\\sources\\sxs'
+
+    expect(provider.features_to_install).to eq(%w{dhcp snmp})
+  end
 end

data/spec/unit/resource/windows_uac_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Resource::WindowsUac do
     expect { resource.consent_behavior_users :bogus }.to raise_error(ArgumentError)
   end
 
-  it "sets the default action as :create" do
+  it "sets the default action as :configure" do
     expect(resource.action).to eql([:configure])
   end
 end

data/spec/unit/resource/windows_user_privilege_spec.rb

@@ -0,0 +1,55 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::WindowsUserPrivilege do
+  let(:resource) { Chef::Resource::WindowsUserPrivilege.new("fakey_fakerton") }
+
+  it "sets resource name as :windows_user_privilege" do
+    expect(resource.resource_name).to eql(:windows_user_privilege)
+  end
+
+  it "the principal property is the name_property" do
+    expect(resource.principal).to eql("fakey_fakerton")
+  end
+
+  it "the users property coerces to an array" do
+    resource.users "Administrator"
+    expect(resource.users).to eql(["Administrator"])
+  end
+
+  it "the privilege property coerces to an array" do
+    resource.privilege "SeDenyRemoteInteractiveLogonRight"
+    expect(resource.privilege).to eql(["SeDenyRemoteInteractiveLogonRight"])
+  end
+
+  it "the privilege property validates inputs against the allowed list of privs" do
+    expect { resource.privilege "invalidPriv" }.to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "sets the default action as :add" do
+    expect(resource.action).to eql([:add])
+  end
+
+  it "supports :add, :set, :clear, :remove actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :set }.not_to raise_error
+    expect { resource.action :clear }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+end

data/spec/unit/role_spec.rb

@@ -259,7 +259,7 @@ describe Chef::Role do
     it "should return a Chef::Role object from JSON" do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json"])
       file_path = File.join(Chef::Config[:role_path], "memes/lolcat.json")
-      expect(File).to receive(:exists?).with(file_path).exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with(file_path).exactly(1).times.and_return(true)
       expect(IO).to receive(:read).with(file_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
@@ -268,7 +268,7 @@ describe Chef::Role do
     it "should return a Chef::Role object from a Ruby DSL" do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
       rb_path = File.join(Chef::Config[:role_path], "memes/lolcat.rb")
-      expect(File).to receive(:exists?).with(rb_path).exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with(rb_path).exactly(1).times.and_return(true)
       expect(File).to receive(:readable?).with(rb_path).exactly(1).times.and_return(true)
       expect(File).to receive(:file?).with(rb_path).exactly(1).times.and_return(true)
       expect(IO).to receive(:read).with(rb_path).and_return(ROLE_DSL)
@@ -280,8 +280,8 @@ describe Chef::Role do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
       js_path = File.join(Chef::Config[:role_path], "memes/lolcat.json")
       rb_path = File.join(Chef::Config[:role_path], "memes/lolcat.rb")
-      expect(File).to receive(:exists?).with(js_path).exactly(1).times.and_return(true)
-      expect(File).not_to receive(:exists?).with(rb_path)
+      expect(File).to receive(:exist?).with(js_path).exactly(1).times.and_return(true)
+      expect(File).not_to receive(:exist?).with(rb_path)
       expect(IO).to receive(:read).with(js_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
@@ -289,19 +289,19 @@ describe Chef::Role do
 
     it "should raise an exception if the file does not exist" do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/meme.rb"])
-      expect(File).not_to receive(:exists?)
+      expect(File).not_to receive(:exist?)
       expect { @role.class.from_disk("lolcat") }.to raise_error(Chef::Exceptions::RoleNotFound)
     end
 
     it "should raise an exception if two files exist with the same name" do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/lolcat.rb"])
-      expect(File).not_to receive(:exists?)
+      expect(File).not_to receive(:exist?)
       expect { @role.class.from_disk("lolcat") }.to raise_error(Chef::Exceptions::DuplicateRole)
     end
 
     it "should not raise an exception if two files exist with a similar name" do
       expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
-      expect(File).to receive(:exists?).with("#{Chef::Config[:role_path]}/memes/lolcat.rb").and_return(true)
+      expect(File).to receive(:exist?).with("#{Chef::Config[:role_path]}/memes/lolcat.rb").and_return(true)
       allow_any_instance_of(Chef::Role).to receive(:from_file).with("#{Chef::Config[:role_path]}/memes/lolcat.rb")
       expect { @role.class.from_disk("lolcat") }.not_to raise_error
     end
@@ -317,7 +317,7 @@ describe Chef::Role do
 
     it "should return a Chef::Role object from JSON" do
       expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return(["#{root}/lolcat.json"])
-      expect(File).to receive(:exists?).with("#{root}/lolcat.json").exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with("#{root}/lolcat.json").exactly(1).times.and_return(true)
       expect(IO).to receive(:read).with("#{root}/lolcat.json").and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
@@ -326,7 +326,7 @@ describe Chef::Role do
     it "should return a Chef::Role object from JSON when role is in the second path" do
       expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return([])
       expect(Dir).to receive(:glob).with(File.join("#{root}/path2", "**", "**")).exactly(1).times.and_return(["#{root}/path2/lolcat.json"])
-      expect(File).to receive(:exists?).with("#{root}/path2/lolcat.json").exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with("#{root}/path2/lolcat.json").exactly(1).times.and_return(true)
       expect(IO).to receive(:read).with("#{root}/path2/lolcat.json").and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
       expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
@@ -334,7 +334,7 @@ describe Chef::Role do
 
     it "should return a Chef::Role object from a Ruby DSL" do
       expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return(["#{root}/lolcat.rb"])
-      expect(File).to receive(:exists?).with("#{root}/lolcat.rb").exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with("#{root}/lolcat.rb").exactly(1).times.and_return(true)
       expect(File).to receive(:readable?).with("#{root}/lolcat.rb").and_return(true)
       expect(File).to receive(:file?).with("#{root}/lolcat.rb").and_return(true)
       expect(IO).to receive(:read).with("#{root}/lolcat.rb").exactly(1).times.and_return(ROLE_DSL)
@@ -345,7 +345,7 @@ describe Chef::Role do
     it "should return a Chef::Role object from a Ruby DSL when role is in the second path" do
       expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return([])
       expect(Dir).to receive(:glob).with(File.join("#{root}/path2", "**", "**")).exactly(1).times.and_return(["#{root}/path2/lolcat.rb"])
-      expect(File).to receive(:exists?).with("#{root}/path2/lolcat.rb").exactly(1).times.and_return(true)
+      expect(File).to receive(:exist?).with("#{root}/path2/lolcat.rb").exactly(1).times.and_return(true)
       expect(File).to receive(:readable?).with("#{root}/path2/lolcat.rb").and_return(true)
       expect(File).to receive(:file?).with("#{root}/path2/lolcat.rb").and_return(true)
       expect(IO).to receive(:read).with("#{root}/path2/lolcat.rb").exactly(1).times.and_return(ROLE_DSL)