chef 14.8.12-universal-mingw32 → 14.9.13-universal-mingw32

data/spec/functional/resource/timezone_spec.rb

@@ -0,0 +1,39 @@
+#
+# Author:: Gary Bright (<digitalgaz@hotmail.com>)
+# Copyright:: Copyright 2011-2016, 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::Timezone, :windows_only do
+  let(:timezone) { "GMT Standard Time" }
+
+  def timezone_resource
+    Chef::Resource::Timezone.new(timezone, run_context)
+  end
+
+  describe "when a timezone is provided on windows" do
+    it "should set a timezone" do
+      timezone_resource.run_action(:set)
+    end
+  end
+
+  describe "when a timezone is not provided on windows" do
+    let(:timezone) { nil }
+    it "raises an exception" do
+      expect { timezone_resource.run_action(:set) }.to raise_error(Chef::Exceptions::ValidationFailed)
+    end
+  end
+end

data/spec/functional/resource/windows_task_spec.rb

@@ -1599,26 +1599,70 @@ describe Chef::Resource::WindowsTask, :windows_only do
     end
 
     context "when start_day is passed with frequency :onstart" do
-      it "not raises error" do
+      it "does not raises error" do
         subject.frequency :onstart
         subject.start_day "09/20/2017"
         expect { subject.after_created }.not_to raise_error
       end
     end
 
-    context "when a non-system user is passed without password" do
+    context "when a non system user is passed without password" do
       it "raises error" do
-        subject.user "Administrator"
+        subject.user "USER"
         subject.frequency :onstart
-        expect { subject.after_created }.to raise_error(%q{Cannot specify a user other than the system users without specifying a password!. Valid passwordless users: 'SYSTEM', 'NT AUTHORITY\SYSTEM', 'LOCAL SERVICE', 'NT AUTHORITY\LOCAL SERVICE', 'NETWORK SERVICE', 'NT AUTHORITY\NETWORK SERVICE', 'ADMINISTRATORS', 'BUILTIN\ADMINISTRATORS', 'USERS', 'BUILTIN\USERS', 'GUESTS', 'BUILTIN\GUESTS'})
+        expect { subject.after_created }.to raise_error(%q{Please provide a password or check if this task needs to be interactive! Valid passwordless users are: 'SYSTEM', 'NT AUTHORITY\SYSTEM', 'LOCAL SERVICE', 'NT AUTHORITY\LOCAL SERVICE', 'NETWORK SERVICE', 'NT AUTHORITY\NETWORK SERVICE', 'ADMINISTRATORS', 'BUILTIN\ADMINISTRATORS', 'USERS', 'BUILTIN\USERS', 'GUESTS', 'BUILTIN\GUESTS'})
+      end
+      it "does not raises error when task is interactive" do
+        subject.user "USER"
+        subject.frequency :onstart
+        subject.interactive_enabled true
+        expect { subject.after_created }.not_to raise_error
       end
     end
 
-    context "when interactive_enabled is passed for a System user without password" do
-      it "raises error" do
+    context "when a system user is passed without password" do
+      it "does not raises error" do
+        subject.user "ADMINISTRATORS"
+        subject.frequency :onstart
+        expect { subject.after_created }.not_to raise_error
+      end
+      it "does not raises error when task is interactive" do
+        subject.user "ADMINISTRATORS"
+        subject.frequency :onstart
+        subject.interactive_enabled true
+        expect { subject.after_created }.not_to raise_error
+      end
+    end
+
+    context "when a non system user is passed with password" do
+      it "does not raises error" do
+        subject.user "USER"
+        subject.password "XXXX"
+        subject.frequency :onstart
+        expect { subject.after_created }.not_to raise_error
+      end
+      it "does not raises error when task is interactive" do
+        subject.user "USER"
+        subject.password "XXXX"
+        subject.frequency :onstart
         subject.interactive_enabled true
+        expect { subject.after_created }.not_to raise_error
+      end
+    end
+
+    context "when a system user is passed with password" do
+      it "raises error" do
+        subject.user "ADMINISTRATORS"
+        subject.password "XXXX"
         subject.frequency :onstart
-        expect { subject.after_created }.to raise_error("Please provide the password when attempting to set interactive/non-interactive.")
+        expect { subject.after_created }.to raise_error("Password is not required for system users.")
+      end
+      it "raises error when task is interactive" do
+        subject.user "ADMINISTRATORS"
+        subject.password "XXXX"
+        subject.frequency :onstart
+        subject.interactive_enabled true
+        expect { subject.after_created }.to raise_error("Password is not required for system users.")
       end
     end
 

data/spec/integration/knife/client_create_spec.rb

@@ -44,7 +44,7 @@ EOM
     it "refuses to add an existing client" do
       pending "Knife client create must not blindly overwrite an existing client"
       knife("client create -k bah").should_succeed stderr: out
-      expect { knife("client create -k bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("client create -k bah") }.to raise_error(Net::HTTPClientException)
     end
 
     it "saves the private key to a file" do

data/spec/integration/knife/client_key_create_spec.rb

@@ -43,7 +43,7 @@ describe "knife client key create", :workstation do
 
     it "refuses to add an already existing key" do
       knife("client key create -k new bah")
-      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPClientException)
     end
 
     it "saves the private key to a file" do

data/spec/integration/knife/cookbook_download_spec.rb

@@ -49,7 +49,7 @@ EOM
     end
 
     it "knife cookbook download with an unknown version raises an error" do
-      expect { knife("cookbook download -d #{tmpdir} x 1.0.0") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook download -d #{tmpdir} x 1.0.0") }.to raise_error(Net::HTTPClientException)
     end
   end
 

data/spec/integration/knife/cookbook_show_spec.rb

@@ -138,11 +138,11 @@ EOM
     end
 
     it "knife cookbook show with a non-existent version displays an error" do
-      expect { knife("cookbook show x 1.0.1") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook show x 1.0.1") }.to raise_error(Net::HTTPClientException)
     end
 
     it "knife cookbook show with a non-existent cookbook displays an error" do
-      expect { knife("cookbook show y") }.to raise_error(Net::HTTPServerException)
+      expect { knife("cookbook show y") }.to raise_error(Net::HTTPClientException)
     end
   end
 end

data/spec/integration/knife/data_bag_create_spec.rb

@@ -49,7 +49,7 @@ describe "knife data bag create", :workstation do
 
     it "fails to add an existing item" do
       knife("data bag create foo bar").should_succeed stdout: out, stderr: err
-      expect { knife("data bag create foo bar") }.to raise_error(Net::HTTPServerException)
+      expect { knife("data bag create foo bar") }.to raise_error(Net::HTTPClientException)
     end
   end
 end

data/spec/integration/knife/environment_create_spec.rb

@@ -33,7 +33,7 @@ describe "knife environment create", :workstation do
     it "refuses to add an existing environment" do
       pending "Knife environment create must not blindly overwrite an existing environment"
       knife("environment create bah").should_succeed out
-      expect { knife("environment create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("environment create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end

data/spec/integration/knife/node_create_spec.rb

@@ -39,7 +39,7 @@ describe "knife node create", :workstation do
     it "refuses to add an existing node" do
       pending "Knife node create must not blindly overwrite an existing node"
       knife("node create bah").should_succeed out
-      expect { knife("node create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("node create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end

data/spec/integration/knife/role_create_spec.rb

@@ -33,7 +33,7 @@ describe "knife role create", :workstation do
     it "refuses to add an existing role" do
       pending "Knife role create must not blindly overwrite an existing role"
       knife("role create bah").should_succeed out
-      expect { knife("role create bah") }.to raise_error(Net::HTTPServerException)
+      expect { knife("role create bah") }.to raise_error(Net::HTTPClientException)
     end
 
   end

data/spec/support/shared/context/client.rb

@@ -142,7 +142,7 @@ shared_context "a client run" do
 
   def stub_for_required_recipe
     response = Net::HTTPNotFound.new("1.1", "404", "Not Found")
-    exception = Net::HTTPServerException.new('404 "Not Found"', response)
+    exception = Net::HTTPClientException.new('404 "Not Found"', response)
     expect(http_node_load).to receive(:get).with("required_recipe").and_raise(exception)
   end
 

data/spec/support/shared/unit/api_error_inspector.rb

@@ -71,7 +71,7 @@ shared_examples_for "an api error inspector" do
       @response_body = "synchronize the clock on your host"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+      @exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
     end
@@ -87,7 +87,7 @@ shared_examples_for "an api error inspector" do
       @response_body = "check your key and node name"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+      @exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
     end
@@ -103,7 +103,7 @@ shared_examples_for "an api error inspector" do
       @response_body = "forbidden"
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
+      @exception = Net::HTTPClientException.new("(exception) forbidden", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
     end
@@ -119,7 +119,7 @@ shared_examples_for "an api error inspector" do
       @response_body = "didn't like your data"
       @response = Net::HTTPBadRequest.new("1.1", "400", "(response) bad request")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) bad request", @response)
+      @exception = Net::HTTPClientException.new("(exception) bad request", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
     end
@@ -135,7 +135,7 @@ shared_examples_for "an api error inspector" do
       @response_body = "probably caused by a redirect to a get"
       @response = Net::HTTPNotFound.new("1.1", "404", "(response) not found")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) not found", @response)
+      @exception = Net::HTTPClientException.new("(exception) not found", @response)
       @inspector = described_class.new(@node_name, @exception, @config)
       @inspector.add_explanation(@description)
     end

data/spec/support/shared/unit/api_versioning.rb

@@ -20,7 +20,7 @@ require "chef/exceptions"
 
 shared_examples_for "version handling" do
   let(:response_406) { OpenStruct.new(code: "406") }
-  let(:exception_406) { Net::HTTPServerException.new("406 Not Acceptable", response_406) }
+  let(:exception_406) { Net::HTTPClientException.new("406 Not Acceptable", response_406) }
 
   before do
     allow(rest_v1).to receive(http_verb).and_raise(exception_406)
@@ -39,7 +39,7 @@ end # version handling
 
 shared_examples_for "user and client reregister" do
   let(:response_406) { OpenStruct.new(code: "406") }
-  let(:exception_406) { Net::HTTPServerException.new("406 Not Acceptable", response_406) }
+  let(:exception_406) { Net::HTTPClientException.new("406 Not Acceptable", response_406) }
   let(:generic_exception) { Exception.new }
   let(:min_version) { "2" }
   let(:max_version) { "5" }

data/spec/unit/api_client/registration_spec.rb

@@ -61,7 +61,7 @@ describe Chef::ApiClient::Registration do
   end
 
   let(:response_409) { Net::HTTPConflict.new("1.1", "409", "Conflict") }
-  let(:exception_409) { Net::HTTPServerException.new("409 conflict", response_409) }
+  let(:exception_409) { Net::HTTPClientException.new("409 conflict", response_409) }
 
   let(:generated_private_key_pem) { IO.read(File.expand_path("ssl/private_key.pem", CHEF_SPEC_DATA)) }
   let(:generated_private_key) { OpenSSL::PKey::RSA.new(generated_private_key_pem) }

data/spec/unit/api_client_spec.rb

@@ -280,13 +280,13 @@ describe Chef::ApiClient do
     context "and the client does not exist on the server" do
       before do
         @a_404_response = Net::HTTPNotFound.new("404 not found and such", nil, nil)
-        @a_404_exception = Net::HTTPServerException.new("404 not found exception", @a_404_response)
+        @a_404_exception = Net::HTTPClientException.new("404 not found exception", @a_404_response)
 
         expect(@http_client).to receive(:get).with("clients/lost-my-key").and_raise(@a_404_exception)
       end
 
       it "raises a 404 error" do
-        expect { Chef::ApiClient.reregister("lost-my-key") }.to raise_error(Net::HTTPServerException)
+        expect { Chef::ApiClient.reregister("lost-my-key") }.to raise_error(Net::HTTPClientException)
       end
     end
 

data/spec/unit/api_client_v1_spec.rb

@@ -312,20 +312,20 @@ describe Chef::ApiClientV1 do
     context "and the client does not exist on the server" do
       before do
         @a_404_response = Net::HTTPNotFound.new("404 not found and such", nil, nil)
-        @a_404_exception = Net::HTTPServerException.new("404 not found exception", @a_404_response)
+        @a_404_exception = Net::HTTPClientException.new("404 not found exception", @a_404_response)
 
         expect(@http_client).to receive(:get).with("clients/lost-my-key").and_raise(@a_404_exception)
       end
 
       it "raises a 404 error" do
-        expect { Chef::ApiClientV1.reregister("lost-my-key") }.to raise_error(Net::HTTPServerException)
+        expect { Chef::ApiClientV1.reregister("lost-my-key") }.to raise_error(Net::HTTPClientException)
       end
     end
   end
 
   describe "Versioned API Interactions" do
     let(:response_406) { OpenStruct.new(code: "406") }
-    let(:exception_406) { Net::HTTPServerException.new("406 Not Acceptable", response_406) }
+    let(:exception_406) { Net::HTTPClientException.new("406 Not Acceptable", response_406) }
     let(:payload) do
       {
         name: "some_name",

data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb

@@ -29,7 +29,7 @@ describe Chef::ChefFS::FileSystem::OperationFailedError do
         response_body = '{"error":["Invalid key test in request body"]}'
         allow(@response).to receive(:code).and_return("400")
         allow(@response).to receive(:body).and_return(response_body)
-        exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+        exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
         expect do
           raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, exception), error_message
         end.to raise_error(Chef::ChefFS::FileSystem::OperationFailedError, "#{error_message} cause: #{response_body}")

data/spec/unit/client_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Client do
     end
 
     it "runs ohai with only the minimum required plugins" do
-      expected_filter = %w{fqdn machinename hostname platform platform_version ohai_time os os_version}
+      expected_filter = %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package}
       expect(ohai_system).to receive(:all_plugins).with(expected_filter)
       client.run_ohai
     end
@@ -441,7 +441,7 @@ EOM
 
     context "when required_recipe returns 404" do
       let(:http_response) { Net::HTTPNotFound.new("1.1", "404", "Not Found") }
-      let(:http_exception) { Net::HTTPServerException.new('404 "Not Found"', http_response) }
+      let(:http_exception) { Net::HTTPClientException.new('404 "Not Found"', http_response) }
 
       before(:each) do
         expect(rest).to receive(:get).with("required_recipe").and_raise(http_exception)

data/spec/unit/data_bag_item_spec.rb

@@ -298,7 +298,7 @@ describe Chef::DataBagItem do
 
     it "should create if the item is not found" do
       exception = double("404 error", code: "404")
-      expect(server).to receive(:put).and_raise(Net::HTTPServerException.new("foo", exception))
+      expect(server).to receive(:put).and_raise(Net::HTTPClientException.new("foo", exception))
       expect(server).to receive(:post).with("data/books", data_bag_item)
       data_bag_item.save
     end

data/spec/unit/data_bag_spec.rb

@@ -89,7 +89,7 @@ describe Chef::DataBag do
 
     it "should silently proceed when the data bag already exists" do
       exception = double("409 error", code: "409")
-      expect(@rest).to receive(:post).and_raise(Net::HTTPServerException.new("foo", exception))
+      expect(@rest).to receive(:post).and_raise(Net::HTTPClientException.new("foo", exception))
       @data_bag.save
     end
 

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
       @response_body = %q({"error": [{"message": "gtfo"}])
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
+      @exception = Net::HTTPClientException.new("(exception) forbidden", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
       @inspector.add_explanation(@description)
@@ -56,7 +56,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
       @response_body = "{\"error\":[\"{\\\"non_existent_cookbooks\\\":[\\\"apache2\\\"],\\\"cookbooks_with_no_versions\\\":[\\\"users\\\"],\\\"message\\\":\\\"Run list contains invalid items: no such cookbook nope.\\\"}\"]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
+      @exception = Net::HTTPClientException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
       @inspector.add_explanation(@description)
@@ -84,7 +84,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
       @response_body = "{\"error\":[{\"non_existent_cookbooks\":[],\"cookbooks_with_no_versions\":[],\"message\":\"unable to solve dependencies in alotted time.\"}]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
+      @exception = Net::HTTPClientException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
       @inspector.add_explanation(@description)
@@ -107,7 +107,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
       @response_body = "{\"error\":[{\"non_existent_cookbooks\":[\"apache2\"],\"cookbooks_with_no_versions\":[\"users\"],\"message\":\"Run list contains invalid items: no such cookbook nope.\"}]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
+      @exception = Net::HTTPClientException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
       @inspector.add_explanation(@description)

data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb

@@ -55,7 +55,7 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
       @response_body = "forbidden"
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
+      @exception = Net::HTTPClientException.new("(exception) forbidden", @response)
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
       allow(@inspector).to receive(:config).and_return(node_name: "unit-test.example.com")
 
@@ -73,7 +73,7 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
       @response_body = "check your key and node name"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
       allow(@response).to receive(:body).and_return(@response_body)
-      @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
+      @exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
       allow(@inspector).to receive(:config).and_return(node_name: "unit-test.example.com",

data/spec/unit/knife/bootstrap/client_builder_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Knife::Bootstrap::ClientBuilder do
 
   context "#sanity_check!" do
     let(:response_404) { OpenStruct.new(code: "404") }
-    let(:exception_404) { Net::HTTPServerException.new("404 not found", response_404) }
+    let(:exception_404) { Net::HTTPClientException.new("404 not found", response_404) }
 
     context "in cases where the prompting fails" do
       before do

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -139,15 +139,15 @@ describe Chef::Knife::CookbookDelete do
     end
 
     it "should raise if an error other than HTTP 404 is returned" do
-      exception = Net::HTTPServerException.new("500 Internal Server Error", "500")
+      exception = Net::HTTPClientException.new("500 Internal Server Error", "500")
       expect(@rest_mock).to receive(:get).and_raise(exception)
-      expect { @knife.available_versions }.to raise_error Net::HTTPServerException
+      expect { @knife.available_versions }.to raise_error Net::HTTPClientException
     end
 
     describe "if the cookbook can't be found" do
       before(:each) do
         expect(@rest_mock).to receive(:get)
-          .and_raise(Net::HTTPServerException.new("404 Not Found", "404"))
+          .and_raise(Net::HTTPClientException.new("404 Not Found", "404"))
       end
 
       it "should print an error" do