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

data/spec/unit/resource/apt_preference_spec.rb

@@ -36,22 +36,4 @@ describe Chef::Resource::AptPreference do
     expect { resource.action :add }.not_to raise_error
     expect { resource.action :remove }.not_to raise_error
   end
-
-  it "resolves to a Noop class when on non-linux OS" do
-    node.automatic[:os] = "windows"
-    node.automatic[:platform_family] = "windows"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a Noop class when on non-debian linux" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "gentoo"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a AptUpdate class when on a debian platform_family" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "debian"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::AptPreference)
-  end
 end

data/spec/unit/resource/apt_repository_spec.rb

@@ -71,22 +71,4 @@ describe Chef::Resource::AptRepository do
   it "fails if the user provides a repo_name with a forward slash" do
     expect { resource.repo_name "foo/bar" }.to raise_error(ArgumentError)
   end
-
-  it "resolves to a Noop class when on non-linux OS" do
-    node.automatic[:os] = "windows"
-    node.automatic[:platform_family] = "windows"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a Noop class when on non-debian linux" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "gentoo"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a AptUpdate class when on a debian platform_family" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "debian"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::AptRepository)
-  end
 end

data/spec/unit/resource/apt_update_spec.rb

@@ -41,22 +41,4 @@ describe Chef::Resource::AptUpdate do
     resource.frequency(400)
     expect(resource.frequency).to eql(400)
   end
-
-  it "resolves to a Noop class when on non-linux OS" do
-    node.automatic[:os] = "windows"
-    node.automatic[:platform_family] = "windows"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a Noop class when on non-debian linux" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "gentoo"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
-  end
-
-  it "resolves to a AptUpdate class when on a debian platform_family" do
-    node.automatic[:os] = "linux"
-    node.automatic[:platform_family] = "debian"
-    expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::AptUpdate)
-  end
 end

data/spec/unit/resource/chef_client_cron_spec.rb

@@ -0,0 +1,119 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# 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::ChefClientCron do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::ChefClientCron.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:add) }
+
+  it "sets the default action as :add" do
+    expect(resource.action).to eql([:add])
+  end
+
+  it "coerces splay to an Integer" do
+    resource.splay "10"
+    expect(resource.splay).to eql(10)
+  end
+
+  it "raises an error if splay is not a positive number" do
+    expect { resource.splay("-10") }.to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "builds a default value for chef_binary_path dist values" do
+    expect(resource.chef_binary_path).to eql("/opt/chef/bin/chef-client")
+  end
+
+  it "log_directory is /Library/Logs/Chef on macOS systems" do
+    node.automatic_attrs[:platform_family] = "mac_os_x"
+    node.automatic_attrs[:platform] = "mac_os_x"
+    expect(resource.log_directory).to eql("/Library/Logs/Chef")
+  end
+
+  it "log_directory is /var/log/chef on non-macOS systems" do
+    node.automatic_attrs[:platform_family] = "ubuntu"
+    expect(resource.log_directory).to eql("/var/log/chef")
+  end
+
+  it "supports :add and :remove actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+
+  describe "#splay_sleep_time" do
+    it "uses shard_seed attribute if present" do
+      node.automatic_attrs[:shard_seed] = "73399073"
+      expect(provider.splay_sleep_time(300)).to satisfy { |v| v >= 0 && v <= 300 }
+    end
+
+    it "uses a hex conversion of a md5 hash of the splay if present" do
+      node.automatic_attrs[:shard_seed] = nil
+      allow(node).to receive(:name).and_return("test_node")
+      expect(provider.splay_sleep_time(300)).to satisfy { |v| v >= 0 && v <= 300 }
+    end
+  end
+
+  describe "#cron_command" do
+    before do
+      allow(provider).to receive(:splay_sleep_time).and_return("123")
+    end
+
+    it "creates a valid command if using all default properties" do
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/chef/client.rb -L /var/log/chef/client.log")
+    end
+
+    it "uses daemon_options if set" do
+      resource.daemon_options ["--foo 1", "--bar 2"]
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client --foo 1 --bar 2 -c /etc/chef/client.rb -L /var/log/chef/client.log")
+    end
+
+    it "uses custom config dir if set" do
+      resource.config_directory "/etc/some_other_dir"
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb -L /var/log/chef/client.log")
+    end
+
+    it "uses custom log files / paths if set" do
+      resource.log_file_name "my-client.log"
+      resource.log_directory "/var/log/my-chef/"
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/chef/client.rb -L /var/log/my-chef/my-client.log")
+    end
+
+    it "uses mailto if set" do
+      resource.mailto "bob@example.com"
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/chef/client.rb -L /var/log/chef/client.log || echo \"Chef Infra Client execution failed\"")
+    end
+
+    it "uses custom chef-client binary if set" do
+      resource.chef_binary_path "/usr/local/bin/chef-client"
+      expect(provider.cron_command).to eql("/bin/sleep 123; /usr/local/bin/chef-client -c /etc/chef/client.rb -L /var/log/chef/client.log")
+    end
+
+    it "appends to the log file appending if set to false" do
+      resource.append_log_file false
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/chef/client.rb > /var/log/chef/client.log 2>&1")
+    end
+
+    it "sets the license acceptance flag if set" do
+      resource.accept_chef_license true
+      expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/chef/client.rb --chef-license accept -L /var/log/chef/client.log")
+    end
+  end
+end

data/spec/unit/resource/chef_client_scheduled_task_spec.rb

@@ -0,0 +1,102 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# 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::ChefClientScheduledTask do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::ChefClientScheduledTask.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:add) }
+
+  it "sets the default action as :add" do
+    expect(resource.action).to eql([:add])
+  end
+
+  it "coerces splay to an Integer" do
+    resource.splay "10"
+    expect(resource.splay).to eql(10)
+  end
+
+  it "raises an error if splay is not a positive number" do
+    expect { resource.splay("-10") }.to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "coerces frequency_modifier to an Integer" do
+    resource.frequency_modifier "10"
+    expect(resource.frequency_modifier).to eql(10)
+  end
+
+  it "validates the start_time property input" do
+    expect { resource.start_time("8:00 am") }.to raise_error(Chef::Exceptions::ValidationFailed)
+    expect { resource.start_time("8:00") }.to raise_error(Chef::Exceptions::ValidationFailed)
+    expect { resource.start_time("08:00") }.not_to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "validates the start_date property input" do
+    expect { resource.start_date("2/1/20") }.to raise_error(Chef::Exceptions::ValidationFailed)
+    expect { resource.start_date("02/01/20") }.to raise_error(Chef::Exceptions::ValidationFailed)
+    expect { resource.start_date("02/01/2020") }.not_to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "raises an error if frequency_modifier is not a positive number" do
+    expect { resource.frequency_modifier("-10") }.to raise_error(Chef::Exceptions::ValidationFailed)
+  end
+
+  it "builds a default value for chef_binary_path dist values" do
+    expect(resource.chef_binary_path).to eql("C:/opscode/chef/bin/chef-client")
+  end
+
+  it "supports :add and :remove actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+
+  describe "#client_cmd" do
+    it "creates a valid command if using all default properties" do
+      expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb")
+    end
+
+    it "uses daemon_options if set" do
+      resource.daemon_options ["--foo 1", "--bar 2"]
+      expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --foo 1 --bar 2")
+    end
+
+    it "uses custom config dir if set" do
+      resource.config_directory "C:/foo/bar"
+      expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L C:/foo/bar/log/client.log -c C:/foo/bar/client.rb")
+    end
+
+    it "uses custom log files / paths if set" do
+      resource.log_file_name "my-client.log"
+      resource.log_directory "C:/foo/bar"
+      expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L C:/foo/bar/my-client.log -c /etc/chef/client.rb")
+    end
+
+    it "uses custom chef-client binary if set" do
+      resource.chef_binary_path "C:/foo/bar/chef-client"
+      expect(provider.client_cmd).to eql("C:/foo/bar/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb")
+    end
+
+    it "sets the license acceptance flag if set" do
+      resource.accept_chef_license true
+      expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --chef-license accept")
+    end
+  end
+end

data/spec/unit/resource/chef_client_systemd_timer_spec.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# 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::ChefClientSystemdTimer do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::ChefClientSystemdTimer.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:add) }
+
+  it "sets the default action as :add" do
+    expect(resource.action).to eql([:add])
+  end
+
+  it "user defaults to root" do
+    expect(resource.user).to eql("root")
+  end
+
+  it "builds a default value for chef_binary_path dist values" do
+    expect(resource.chef_binary_path).to eql("/opt/chef/bin/chef-client")
+  end
+
+  it "supports :add and :remove actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+
+  describe "#chef_client_cmd" do
+    it "creates a valid command if using all default properties" do
+      expect(provider.chef_client_cmd).to eql("/opt/chef/bin/chef-client -c /etc/chef/client.rb")
+    end
+
+    it "uses daemon_options if set" do
+      resource.daemon_options ["--foo 1", "--bar 2"]
+      expect(provider.chef_client_cmd).to eql("/opt/chef/bin/chef-client --foo 1 --bar 2 -c /etc/chef/client.rb")
+    end
+
+    it "uses custom config dir if set" do
+      resource.config_directory "/etc/some_other_dir"
+      expect(provider.chef_client_cmd).to eql("/opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb")
+    end
+
+    it "uses custom chef-client binary if set" do
+      resource.chef_binary_path "/usr/local/bin/chef-client"
+      expect(provider.chef_client_cmd).to eql("/usr/local/bin/chef-client -c /etc/chef/client.rb")
+    end
+
+    it "sets the license acceptance flag if set" do
+      resource.accept_chef_license true
+      expect(provider.chef_client_cmd).to eql("/opt/chef/bin/chef-client --chef-license accept -c /etc/chef/client.rb")
+    end
+  end
+end

data/spec/unit/resource/chef_vault_secret_spec.rb

@@ -0,0 +1,40 @@
+#
+# 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::ChefVaultSecret do
+  let(:resource) { Chef::Resource::ChefVaultSecret.new("foo") }
+
+  it "has a resource name of :chef_vault_secret" do
+    expect(resource.resource_name).to eql(:chef_vault_secret)
+  end
+
+  it "sets the default action as :create" do
+    expect(resource.action).to eql([:create])
+  end
+
+  it "id is the name property" do
+    expect(resource.id).to eql("foo")
+  end
+
+  it "supports :create, :create_if_missing, and :delete actions" do
+    expect { resource.action :create }.not_to raise_error
+    expect { resource.action :create_if_missing }.not_to raise_error
+    expect { resource.action :delete }.not_to raise_error
+  end
+end

data/spec/unit/resource/chocolatey_source_spec.rb

@@ -49,9 +49,10 @@ describe Chef::Resource::ChocolateySource do
   before(:each) do
     disable_provider # vivify before mocking
     enable_provider
+    current_resource
     allow(resource).to receive(:provider_for_action).and_return(disable_provider)
     allow(resource).to receive(:provider_for_action).and_return(enable_provider)
-    allow(resource).to receive(:dup).and_return(current_resource)
+    allow(resource.class).to receive(:new).and_return(current_resource)
     @original_env = ENV.to_hash
     ENV["ALLUSERSPROFILE"] = 'C:\ProgramData'
   end

data/spec/unit/resource/cron_d_spec.rb

@@ -34,57 +34,15 @@ describe Chef::Resource::CronD do
     expect(resource.cron_name).to eql("cronify")
   end
 
-  context "#validate_dow" do
-    it "it accepts a string day" do
-      expect(Chef::Resource::CronD.validate_dow("mon")).to be true
-    end
-
-    it "it accepts an integer day" do
-      expect(Chef::Resource::CronD.validate_dow(0)).to be true
-    end
-
-    it "it accepts the string of *" do
-      expect(Chef::Resource::CronD.validate_dow("*")).to be true
-    end
-
-    it "returns false for an out of range integer" do
-      expect(Chef::Resource::CronD.validate_dow(8)).to be false
-    end
-
-    it "returns false for an invalid string" do
-      expect(Chef::Resource::CronD.validate_dow("monday")).to be false
-    end
+  it "the mode property defaults to '0600'" do
+    expect(resource.mode).to eql("0600")
   end
 
-  context "#validate_month" do
-    it "it accepts a string month" do
-      expect(Chef::Resource::CronD.validate_month("feb")).to be true
-    end
-
-    it "it accepts an integer month" do
-      expect(Chef::Resource::CronD.validate_month(2)).to be true
-    end
-
-    it "it accepts the string of *" do
-      expect(Chef::Resource::CronD.validate_month("*")).to be true
-    end
-
-    it "returns false for an out of range integer" do
-      expect(Chef::Resource::CronD.validate_month(13)).to be false
-    end
-
-    it "returns false for an invalid string" do
-      expect(Chef::Resource::CronD.validate_month("janurary")).to be false
-    end
+  it "the user property defaults to 'root'" do
+    expect(resource.user).to eql("root")
   end
 
-  context "#validate_numeric" do
-    it "returns true if the value is in the allowed range" do
-      expect(Chef::Resource::CronD.validate_numeric(5, 1, 100)).to be true
-    end
-
-    it "returns false if the value is out of the allowed range" do
-      expect(Chef::Resource::CronD.validate_numeric(-1, 1, 100)).to be false
-    end
+  it "the command property is required" do
+    expect { resource.command nil }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 end