chef 15.17.4 → 16.0.257

data/spec/unit/provider_resolver_spec.rb

@@ -560,9 +560,9 @@ describe Chef::ProviderResolver do
         ips_package: [ Chef::Resource::IpsPackage, Chef::Provider::Package::Ips ],
         link: [ Chef::Resource::Link, Chef::Provider::Link ],
         linux_user: [ Chef::Resource::User::LinuxUser, Chef::Provider::User::Linux ],
-        log: [ Chef::Resource::Log, Chef::Provider::Log::ChefLog ],
+        log: [ Chef::Resource::Log ],
         macports_package: [ Chef::Resource::MacportsPackage, Chef::Provider::Package::Macports ],
-        mdadm: [ Chef::Resource::Mdadm, Chef::Provider::Mdadm ],
+        mdadm: [ Chef::Resource::Mdadm ],
         mount: [ Chef::Resource::Mount, Chef::Provider::Mount::Mount ],
         pacman_package: [ Chef::Resource::PacmanPackage, Chef::Provider::Package::Pacman ],
         paludis_package: [ Chef::Resource::PaludisPackage, Chef::Provider::Package::Paludis ],
@@ -593,14 +593,14 @@ describe Chef::ProviderResolver do
           "debian" => {
             ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig::Debian ],
             package: [ Chef::Resource::AptPackage, Chef::Provider::Package::Apt ],
-            #        service: [ Chef::Resource::DebianService, Chef::Provider::Service::Debian ],
+    #        service: [ Chef::Resource::DebianService, Chef::Provider::Service::Debian ],
 
             "debian" => {
               "7.0" => {
               },
               "6.0" => {
                 ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig ],
-                #            service: [ Chef::Resource::InsservService, Chef::Provider::Service::Insserv ],
+    #            service: [ Chef::Resource::InsservService, Chef::Provider::Service::Insserv ],
               },
               "5.0" => {
                 ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig ],
@@ -619,7 +619,7 @@ describe Chef::ProviderResolver do
             "linuxmint" => {
               "3.1.4" => {
                 ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig ],
-                #            service: [ Chef::Resource::UpstartService, Chef::Provider::Service::Upstart ],
+    #            service: [ Chef::Resource::UpstartService, Chef::Provider::Service::Upstart ],
               },
             },
             "raspbian" => {
@@ -667,7 +667,7 @@ describe Chef::ProviderResolver do
             # TODO should be Chef::Resource::PortagePackage
             package: [ Chef::Resource::Package, Chef::Provider::Package::Portage ],
             portage_package: [ Chef::Resource::PortagePackage, Chef::Provider::Package::Portage ],
-            #        service: [ Chef::Resource::GentooService, Chef::Provider::Service::Gentoo ],
+    #        service: [ Chef::Resource::GentooService, Chef::Provider::Service::Gentoo ],
 
             "gentoo" => {
               "3.1.4" => {
@@ -676,14 +676,14 @@ describe Chef::ProviderResolver do
           },
 
           "rhel" => {
-            #        service: [ Chef::Resource::SystemdService, Chef::Provider::Service::Systemd ],
+    #        service: [ Chef::Resource::SystemdService, Chef::Provider::Service::Systemd ],
             package: [ Chef::Resource::DnfPackage, Chef::Provider::Package::Dnf ],
             ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig::Redhat ],
 
             %w{amazon xcp xenserver ibm_powerkvm cloudlinux parallels} => {
               "3.1.4" => {
                 package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ],
-                #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
+    #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
               },
             },
             %w{redhat centos scientific oracle} => {
@@ -692,14 +692,14 @@ describe Chef::ProviderResolver do
               },
               "6.0" => {
                 package: [ Chef::Resource::YumPackage, Chef::Provider::Package::Yum ],
-                #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
+    #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
               },
             },
             "fedora" => {
               "15.0" => {
               },
               "14.0" => {
-                #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
+    #            service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
               },
             },
           },
@@ -761,7 +761,7 @@ describe Chef::ProviderResolver do
           package: [ Chef::Resource::Package, Chef::Provider::Package::Bff ],
           rpm_package: [ Chef::Resource::RpmPackage, Chef::Provider::Package::Rpm ],
           user: [ Chef::Resource::User::AixUser, Chef::Provider::User::Aix ],
-          #      service: [ Chef::Resource::AixService, Chef::Provider::Service::Aix ],
+    #      service: [ Chef::Resource::AixService, Chef::Provider::Service::Aix ],
 
           "aix" => {
             "aix" => {

data/spec/unit/provider_spec.rb

@@ -20,7 +20,6 @@ require "spec_helper"
 
 class NoWhyrunDemonstrator < Chef::Provider
   attr_reader :system_state_altered
-
   def whyrun_supported?
     false
   end

data/spec/unit/recipe_spec.rb

@@ -576,6 +576,74 @@ describe Chef::Recipe do
     end
   end
 
+  describe "from_yaml_file" do
+    it "raises ArgumentError if the YAML file contains multiple documents" do
+      filename = "multiple_docs.yaml"
+      yaml = "---\n- resources:\n  - type: false\n---\n-resources:\n  - type: false\n"
+      allow(File).to receive(:file?).and_call_original
+      allow(File).to receive(:readable?).and_call_original
+      allow(IO).to receive(:read).and_call_original
+      allow(File).to receive(:file?).with(filename).and_return(true)
+      allow(File).to receive(:readable?).with(filename).and_return(true)
+      allow(IO).to receive(:read).with(filename).and_return(yaml)
+      expect { recipe.from_yaml_file(filename) }.to raise_error(ArgumentError, /contains multiple documents/)
+    end
+
+    it "raises IOError if the file does not exist" do
+      filename = "/nonexistent"
+      allow(File).to receive(:file?).and_call_original
+      allow(File).to receive(:file?).with(filename).and_return(false)
+      expect { recipe.from_yaml_file(filename) }.to raise_error(IOError, /Cannot open or read/)
+    end
+  end
+
+  describe "from_yaml" do
+    it "raises ArgumentError if the YAML is not a top-level hash" do
+      yaml = <<~YAML
+        ---
+        - one
+        - resources
+        - three
+      YAML
+      expect { recipe.from_yaml(yaml) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
+    end
+
+    it "raises ArgumentError if the YAML does not contain a resources hash" do
+      yaml = <<~YAML
+        ---
+        - airplanes:
+          - type: "execute"
+            command: "whoami"
+      YAML
+      expect { recipe.from_yaml(yaml) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
+    end
+
+    it "does not raise if the YAML contains a resources hash" do
+      yaml = <<~YAML
+        ---
+        resources:
+        - type: "execute"
+          command: "whoami"
+      YAML
+      expect(recipe).to receive(:from_hash).with({ "resources" => [{ "command" => "whoami", "type" => "execute" }] })
+      recipe.from_yaml(yaml)
+    end
+  end
+
+  describe "from_hash" do
+    it "declares resources from a hash" do
+      resources = { "resources" => [
+        { "name" => "running some commands", "type" => "execute", "command" => "whoami" },
+        { "name" => "preparing the bits", "type" => "service", "action" => "start", "service_name" => "bit_launcher" },
+      ] }
+
+      recipe.from_hash(resources)
+      expect(recipe.resources(execute: "running some commands").command).to eql("whoami")
+      expect(recipe.resources(service: "preparing the bits").service_name).to eql("bit_launcher")
+      expect(recipe.resources(service: "preparing the bits").action).to eql([:start])
+    end
+  end
+
   describe "included DSL" do
     it "should respond to :ps_credential from Chef::DSL::Powershell" do
       expect(recipe.respond_to?(:ps_credential)).to be true

data/spec/unit/resource/alternatives_spec.rb

@@ -0,0 +1,120 @@
+#
+# 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::Alternatives do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::Alternatives.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:install) }
+
+  let(:alternatives_display_exists) do
+    double("shellout", stdout: <<-STDOUT)
+    java - auto mode
+    link best version is /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+    link currently points to /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+    link java is /usr/bin/java
+    slave java.1.gz is /usr/share/man/man1/java.1.gz
+/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - priority 1081
+    slave java.1.gz: /usr/lib/jvm/java-8-openjdk-amd64/jre/man/man1/java.1.gz
+    STDOUT
+  end
+
+  let(:alternatives_display_does_not_exist) do
+    double("shellout", stdout: "update-alternatives: error: no alternatives for fakey_fakerton")
+  end
+
+  it "the link_name property is the name_property" do
+    expect(resource.link_name).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :install" do
+    expect(resource.action).to eql([:install])
+  end
+
+  it "coerces priority value to an Integer" do
+    resource.priority("1")
+    expect(resource.priority).to eql(1)
+  end
+
+  it "builds a default value for link based on link_name value" do
+    expect(resource.link).to eql("/usr/bin/fakey_fakerton")
+  end
+
+  it "supports :install, :auto, :refresh, and :remove actions" do
+    expect { resource.action :install }.not_to raise_error
+    expect { resource.action :auto }.not_to raise_error
+    expect { resource.action :refresh }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+
+  describe "#path_exists?" do
+    it "returns true if the path exists according to alternatives --display" do
+      allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
+      expect(provider.path_exists?).to eql(true)
+    end
+
+    it "returns false if alternatives --display does not find a path" do
+      allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_does_not_exist)
+      expect(provider.path_exists?).to eql(false)
+    end
+  end
+
+  describe "#current_path" do
+    it "extracts the current path by running alternatives --display" do
+      allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
+      expect(provider.current_path).to eql("/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java")
+    end
+  end
+
+  describe "#path_priority" do
+    it "extracts the path priority by running alternatives --display" do
+      allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
+      expect(provider.path_priority).to eql(1081)
+    end
+  end
+
+  describe "#alternatives_cmd" do
+    it "returns alternatives on fedora" do
+      node.automatic_attrs[:platform_family] = "fedora"
+      expect(provider.alternatives_cmd).to eql("alternatives")
+    end
+
+    it "returns alternatives on amazon" do
+      node.automatic_attrs[:platform_family] = "amazon"
+      expect(provider.alternatives_cmd).to eql("alternatives")
+    end
+
+    it "returns alternatives on suse" do
+      node.automatic_attrs[:platform_family] = "suse"
+      expect(provider.alternatives_cmd).to eql("alternatives")
+    end
+
+    it "returns alternatives on redhat" do
+      node.automatic_attrs[:platform_family] = "rhel"
+      expect(provider.alternatives_cmd).to eql("alternatives")
+    end
+
+    it "returns update-alternatives on debian" do
+      node.automatic_attrs[:platform_family] = "debian"
+      expect(provider.alternatives_cmd).to eql("update-alternatives")
+    end
+  end
+end

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/archive_file_spec.rb

@@ -18,11 +18,8 @@
 require "spec_helper"
 
 describe Chef::Resource::ArchiveFile do
-  let(:node) { Chef::Node.new }
-  let(:events) { Chef::EventDispatch::Dispatcher.new }
-  let(:run_context) { Chef::RunContext.new(node, {}, events) }
-  let(:resource) { Chef::Resource::ArchiveFile.new("foo", run_context) }
-  let(:provider) { resource.provider_for_action(:extract) }
+
+  let(:resource) { Chef::Resource::ArchiveFile.new("foo") }
 
   it "has a resource name of :archive_file" do
     expect(resource.resource_name).to eql(:archive_file)
@@ -44,12 +41,6 @@ describe Chef::Resource::ArchiveFile do
     expect(resource.mode).to eql("755")
   end
 
-  it "mode property throws a deprecation warning if Integers are passed" do
-    expect(Chef::Log).to receive(:deprecation)
-    resource.mode 755
-    provider.define_resource_requirements
-  end
-
   it "options property defaults to [:time]" do
     expect(resource.options).to eql([:time])
   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