chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/spec/functional/resource/ifconfig_spec.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require "spec_helper"
 require "functional/resource/base"
 require "chef/mixin/shell_out"
 
@@ -53,7 +52,7 @@ describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, :external => in
   end
 
   def fetch_first_interface_name
-    shell_out("ip link list |grep UP|grep -vi loop|head -1|cut -d':' -f 2").stdout.strip
+    shell_out("ifconfig | grep Ethernet | head -1 | cut -d' ' -f1").stdout.strip
   end
 
   # **Caution: any updates to core interfaces can be risky.

data/spec/functional/resource/link_spec.rb

@@ -27,6 +27,7 @@ describe Chef::Resource::Link do
   let(:file_base) { "file_spec" }
 
   let(:expect_updated?) { true }
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
 
   # We create the files in a different directory than tmp to exercise
   # different file deployment strategies more completely.
@@ -163,6 +164,7 @@ describe Chef::Resource::Link do
     cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
     cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(cookbook_repo))
     run_context = Chef::RunContext.new(node, cookbook_collection, events)
+    allow(run_context).to receive(:logger).and_return(logger)
     resource = Chef::Resource::Link.new(target_file, run_context)
     resource.to(to)
     resource
@@ -172,7 +174,7 @@ describe Chef::Resource::Link do
     create_resource
   end
 
-  describe "when supported on platform", :not_supported_on_win2k3 do
+  describe "when supported on platform" do
     shared_examples_for "delete errors out" do
       it "delete errors out" do
         expect { resource.run_action(:delete) }.to raise_error(Chef::Exceptions::Link)
@@ -184,7 +186,7 @@ describe Chef::Resource::Link do
       describe "the :delete action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:delete)
         end
 
@@ -205,7 +207,7 @@ describe Chef::Resource::Link do
       describe "the :delete action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:delete)
         end
 
@@ -226,7 +228,7 @@ describe Chef::Resource::Link do
       describe "the :create action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
 
@@ -248,7 +250,7 @@ describe Chef::Resource::Link do
       describe "the :create action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
 
@@ -270,7 +272,7 @@ describe Chef::Resource::Link do
       describe "the :create action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
         it "preserves the hard link" do
@@ -295,7 +297,7 @@ describe Chef::Resource::Link do
       describe "the :create action" do
         before(:each) do
           @info = []
-          allow(Chef::Log).to receive(:info) { |msg| @info << msg }
+          allow(logger).to receive(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
         it "links to the target file" do
@@ -694,10 +696,4 @@ describe Chef::Resource::Link do
       end
     end
   end
-
-  describe "when not supported on platform", :win2k3_only do
-    it "raises error" do
-      expect { resource }.to raise_error(Chef::Exceptions::Win32APIFunctionNotImplemented)
-    end
-  end
 end

data/spec/functional/resource/powershell_script_spec.rb

@@ -36,8 +36,6 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
   let(:cmdlet_exit_code_success_content) { "get-item ." }
   let(:windows_process_exit_code_success_content) { "#{ENV['SystemRoot']}\\system32\\attrib.exe $env:systemroot" }
   let(:windows_process_exit_code_not_found_content) { "findstr /notavalidswitch" }
-  # Note that process exit codes on 32-bit Win2k3 cannot
-  # exceed maximum value of signed integer
   let(:arbitrary_nonzero_process_exit_code) { 4193 }
   let(:arbitrary_nonzero_process_exit_code_content) { "exit #{arbitrary_nonzero_process_exit_code}" }
   let(:invalid_powershell_interpreter_flag) { "/thisflagisinvalid" }

data/spec/functional/resource/registry_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Prajakta Purohit (<prajakta@chef.io>)
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright 2011-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -244,7 +244,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
       @new_resource.recursive(true)
       @new_resource.run_action(:create)
 
-      @new_resource.values.each do |value|
+      @new_resource.each_value do |value|
         expect(@registry.value_exists?(reg_child, value)).to eq(true)
       end
     end
@@ -430,7 +430,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
       @new_resource.recursive(true)
       @new_resource.run_action(:create_if_missing)
 
-      @new_resource.values.each do |value|
+      @new_resource.each_value do |value|
         expect(@registry.value_exists?(reg_child + '\Adipose', value)).to eq(true)
       end
     end

data/spec/functional/resource/remote_file_spec.rb

@@ -29,8 +29,8 @@ describe Chef::Resource::RemoteFile do
     @old_file_cache = Chef::Config[:file_cache_path]
     Chef::Config[:file_cache_path] = file_cache_path
     Chef::Config[:rest_timeout] = 2
-    Chef::Config[:http_retry_delay] = 1
-    Chef::Config[:http_retry_count] = 2
+    Chef::Config[:http_retry_delay] = 0
+    Chef::Config[:http_retry_count] = 0
   end
 
   after(:each) do
@@ -360,7 +360,7 @@ describe Chef::Resource::RemoteFile do
 
       it "should raise ContentLengthMismatch" do
         expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
-        # File.should_not exist(path) # XXX: CHEF-5081
+        #File.should_not exist(path) # XXX: CHEF-5081
       end
     end
 
@@ -373,7 +373,7 @@ describe Chef::Resource::RemoteFile do
 
       it "should raise ContentLengthMismatch" do
         expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
-        # File.should_not exist(path) # XXX: CHEF-5081
+        #File.should_not exist(path) # XXX: CHEF-5081
       end
     end
 

data/spec/functional/resource/user/windows_spec.rb

@@ -31,6 +31,7 @@ describe Chef::Provider::User::Windows, :windows_only do
   end
 
   let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:logger) { double("Mixlib::Log::Child").as_null_object }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:new_resource) do
     Chef::Resource::User.new(username, run_context).tap do |r|
@@ -45,6 +46,7 @@ describe Chef::Provider::User::Windows, :windows_only do
 
   before do
     delete_user(username)
+    allow(run_context).to receive(:logger).and_return(logger)
   end
 
   describe "action :create" do
@@ -69,7 +71,7 @@ describe Chef::Provider::User::Windows, :windows_only do
 
     context "with a gid specified" do
       it "warns unsupported" do
-        expect(Chef::Log).to receive(:warn).with(/not implemented/)
+        expect(logger).to receive(:warn).with(/not implemented/)
         new_resource.gid("agroup")
         new_resource.run_action(:create)
       end

data/spec/functional/resource/windows_env_spec.rb

@@ -0,0 +1,285 @@
+#
+# Author:: Adam Edwards (<adamed@chef.io>)
+# Copyright:: Copyright 2014-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::WindowsEnv, :windows_only do
+  context "when running on Windows" do
+    let(:chef_env_test_lower_case) { "chefenvtest" }
+    let(:chef_env_test_mixed_case) { "chefENVtest" }
+    let(:chef_env_with_delim) { "chef_env_with_delim" }
+    let(:chef_env_delim) { ";" }
+    let(:chef_env_test_delim) { "#{value1};#{value2}" }
+    let(:env_dne_key) { "env_dne_key" }
+    let(:env_value1) { "value1" }
+    let(:env_value2) { "value2" }
+    let(:delim_value) { "#{env_value1};#{env_value2}" }
+    let(:env_user) { ENV["USERNAME"].upcase }
+    let(:default_env_user) { "<SYSTEM>" }
+
+    let(:env_obj) do
+      wmi = WmiLite::Wmi.new
+      environment_variables = wmi.query("select * from Win32_Environment where name = '#{test_resource.key_name}'")
+      if environment_variables && environment_variables.length > 0
+        environment_variables.each do |env|
+          env_obj = env.wmi_ole_object
+          return env_obj if env_obj.username.split('\\').last.casecmp(test_resource.user) == 0
+        end
+      end
+      nil
+    end
+
+    let(:env_value_expandable) { "%SystemRoot%" }
+    let(:test_run_context) do
+      node = Chef::Node.new
+      node.default["os"] = "windows"
+      node.default["platform"] = "windows"
+      node.default["platform_version"] = "6.1"
+      empty_events = Chef::EventDispatch::Dispatcher.new
+      Chef::RunContext.new(node, {}, empty_events)
+    end
+    let(:test_resource) do
+      Chef::Resource::WindowsEnv.new("unknown", test_run_context)
+    end
+
+    before(:each) do
+      resource_lower = Chef::Resource::WindowsEnv.new(chef_env_test_lower_case, test_run_context)
+      resource_lower.run_action(:delete)
+      resource_lower = Chef::Resource::WindowsEnv.new(chef_env_test_lower_case, test_run_context)
+      resource_lower.user(env_user)
+      resource_lower.run_action(:delete)
+      resource_mixed = Chef::Resource::WindowsEnv.new(chef_env_test_mixed_case, test_run_context)
+      resource_mixed.run_action(:delete)
+      resource_mixed = Chef::Resource::WindowsEnv.new(chef_env_test_mixed_case, test_run_context)
+      resource_lower.user(env_user)
+      resource_mixed.run_action(:delete)
+    end
+
+    context "when the create action is invoked" do
+      it "should create an environment variable for action create" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+      end
+
+      it "should create an environment variable with default user System for action create" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(env_obj.username.upcase).to eq(default_env_user)
+      end
+
+      it "should create an environment variable with user for action create" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.user(env_user)
+        test_resource.run_action(:create)
+        expect(env_obj.username.split('\\').last.upcase).to eq(env_user)
+      end
+
+      context "when env variable exist with same name" do
+        before(:each) do
+          test_resource.key_name(chef_env_test_lower_case)
+          test_resource.value(env_value1)
+          test_resource.run_action(:create)
+        end
+        it "should modify an existing variable's value to a new value" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.value(env_value2)
+          test_resource.run_action(:create)
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+        end
+
+        it "should not modify an existing variable's value to a new value if the users are different" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.value(env_value2)
+          test_resource.user(env_user)
+          test_resource.run_action(:create)
+          test_resource.key_name(chef_env_test_lower_case)
+          test_resource.user(default_env_user)
+          expect(env_obj.variablevalue).to eq(env_value1)
+        end
+
+        it "should modify an existing variable's value to a new value if the variable name case differs from the existing variable" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.key_name(chef_env_test_mixed_case)
+          test_resource.value(env_value2)
+          test_resource.run_action(:create)
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+        end
+      end
+
+      it "should not expand environment variables if the variable is not PATH" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value_expandable)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value_expandable)
+      end
+    end
+
+    context "when the modify action is invoked" do
+      it "should raise an exception for modify if the variable doesn't exist" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        expect { test_resource.run_action(:modify) }.to raise_error(Chef::Exceptions::WindowsEnv)
+      end
+
+      context "when env variable exist with same name" do
+        before(:each) do
+          test_resource.key_name(chef_env_test_lower_case)
+          test_resource.value(env_value1)
+          test_resource.run_action(:create)
+        end
+
+        it "should modify an existing variable's value to a new value" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.value(env_value2)
+          test_resource.run_action(:modify)
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+        end
+
+        # This examlpe covers Chef Issue #1754
+        it "should modify an existing variable's value to a new value if the variable name case differs from the existing variable" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.key_name(chef_env_test_mixed_case)
+          test_resource.value(env_value2)
+          test_resource.run_action(:modify)
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+        end
+
+        it "should not expand environment variables if the variable is not PATH" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.value(env_value_expandable)
+          test_resource.run_action(:modify)
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value_expandable)
+        end
+      end
+
+      context "when using PATH" do
+        let(:random_name) { Time.now.to_i }
+        let(:env_val) { "#{env_value_expandable}_#{random_name}" }
+        let!(:path_before) { test_resource.provider_for_action(test_resource.action).env_value("PATH") || "" }
+        let!(:env_path_before) { ENV["PATH"] }
+
+        it "should expand PATH" do
+          expect(path_before).not_to include(env_val)
+          test_resource.key_name("PATH")
+          test_resource.value("#{path_before};#{env_val}")
+          test_resource.run_action(:create)
+          expect(ENV["PATH"]).not_to include(env_val)
+          expect(ENV["PATH"]).to include("#{random_name}")
+        end
+
+        after(:each) do
+          # cleanup so we don't flood the path
+          test_resource.key_name("PATH")
+          test_resource.value(path_before)
+          test_resource.run_action(:create)
+          ENV["PATH"] = env_path_before
+        end
+      end
+
+    end
+
+    context "when the delete action is invoked" do
+      context "when env variable exist with same name" do
+        before(:each) do
+          test_resource.key_name(chef_env_test_lower_case)
+          test_resource.value(env_value1)
+          test_resource.run_action(:create)
+        end
+
+        it "should delete a System environment variable" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.run_action(:delete)
+          expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        end
+
+        it "should not delete an System environment variable if user are passed" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.user(env_user)
+          test_resource.run_action(:delete)
+          test_resource.user(default_env_user)
+          expect(env_obj).not_to be_nil
+        end
+      end
+
+      context "when env variable exist with same name" do
+        before(:each) do
+          test_resource.key_name(chef_env_test_lower_case)
+          test_resource.value(env_value1)
+          test_resource.user(env_user)
+          test_resource.run_action(:create)
+        end
+
+        it "should delete a user environment variable" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.run_action(:delete)
+          expect(env_obj).to eq(nil)
+        end
+
+        it "should not delete an user environment variable if user is not passed" do
+          expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+          test_resource.user(default_env_user)
+          test_resource.run_action(:delete)
+          test_resource.user(env_user)
+          expect(env_obj).not_to be_nil
+        end
+      end
+
+      context "when env variable exist with same name" do
+        before(:each) do
+          test_resource.key_name(chef_env_with_delim)
+          test_resource.delim(chef_env_delim)
+          test_resource.value(delim_value)
+          test_resource.run_action(:create)
+        end
+
+        it "should not delete variable when a delim present" do
+          expect(ENV[chef_env_with_delim]).to eq(delim_value)
+          test_resource.value(env_value1)
+          test_resource.run_action(:delete)
+          expect(ENV[chef_env_with_delim]).to eq(env_value2)
+        end
+      end
+
+      it "should not raise an exception when a non-existent environment variable is deleted" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        expect { test_resource.run_action(:delete) }.not_to raise_error
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+      end
+
+      it "should delete a value from the current process even if it is not in the registry" do
+        expect(ENV[env_dne_key]).to eq(nil)
+        ENV[env_dne_key] = env_value1
+        test_resource.key_name(env_dne_key)
+        test_resource.run_action(:delete)
+        expect(ENV[env_dne_key]).to eq(nil)
+      end
+
+    end
+  end
+end