chef 11.16.4 → 11.18.0

data/lib/chef/provider/env.rb

@@ -58,20 +58,22 @@ class Chef
       # ==== Returns
       # <true>:: If a change is required
       # <false>:: If a change is not required
-      def compare_value
+      def requires_modify_or_create?
         if @new_resource.delim
           #e.g. check for existing value within PATH
-          not @current_resource.value.split(@new_resource.delim).any? do |val|
-            val == @new_resource.value
+          not new_values.all? do |val|
+            current_values.include? val
           end
         else
           @new_resource.value != @current_resource.value
         end
       end
 
+      alias_method :compare_value, :requires_modify_or_create?
+
       def action_create
         if @key_exists
-          if compare_value
+          if requires_modify_or_create?
             modify_env
             Chef::Log.info("#{@new_resource} altered")
             @new_resource.updated_by_last_action(true)
@@ -91,13 +93,14 @@ class Chef
       #           after we removed the element.
       def delete_element
         return false unless @new_resource.delim #no delim: delete the key
-        if compare_value
+        needs_delete = new_values.any? { |v| current_values.include?(v) }
+        if !needs_delete
           Chef::Log.debug("#{@new_resource} element '#{@new_resource.value}' does not exist")
           return true #do not delete the key
         else
           new_value =
-            @current_resource.value.split(@new_resource.delim).select { |item|
-            item != @new_resource.value
+            current_values.select { |item|
+              not new_values.include?(item)
           }.join(@new_resource.delim)
 
           if new_value.empty?
@@ -122,7 +125,7 @@ class Chef
 
       def action_modify
         if @key_exists
-          if compare_value
+          if requires_modify_or_create?
             modify_env
             Chef::Log.info("#{@new_resource} modified")
             @new_resource.updated_by_last_action(true)
@@ -142,11 +145,23 @@ class Chef
 
       def modify_env
         if @new_resource.delim
-          #e.g. add to PATH
-          @new_resource.value << @new_resource.delim << @current_resource.value
+          values = new_values.reject do |v|
+            current_values.include?(v)
+          end
+          @new_resource.value((values + [@current_resource.value]).join(@new_resource.delim))
         end
         create_env
       end
+
+      # Returns the current values to split by delimiter
+      def current_values
+        @current_values ||= @current_resource.value.split(@new_resource.delim)
+      end
+
+      # Returns the new values to split by delimiter
+      def new_values
+        @new_values ||= @new_resource.value.split(@new_resource.delim)
+      end
      end
   end
 end

data/lib/chef/provider/remote_file/cache_control_data.rb

@@ -140,7 +140,7 @@ class Chef
 
         def load_data
           Chef::JSONCompat.from_json(load_json_data)
-        rescue Chef::Exceptions::FileNotFound, FFI_Yajl::ParseError, JSON::ParserError
+        rescue Chef::Exceptions::FileNotFound, FFI_Yajl::ParseError, Chef::Exceptions::JSON::ParseError
           false
         end
 

data/lib/chef/resource.rb

@@ -544,7 +544,7 @@ F
     # Serialize this object as a hash
     def to_json(*a)
       results = as_json
-      results.to_json(*a)
+      Chef::JSONCompat.to_json(results, *a)
     end
 
     def to_hash

data/lib/chef/resource/dsc_script.rb

@@ -28,12 +28,8 @@ class Chef
         super
         @allowed_actions.push(:run)
         @action = :run
-        if(run_context && Chef::Platform.supports_dsc?(run_context.node))
-          @provider = Chef::Provider::DscScript
-        else
-          raise Chef::Exceptions::NoProviderAvailable,
-            "#{powershell_info_str(run_context)}\nPowershell 4.0 or higher was not detected on your system and is required to use the dsc_script resource."
-        end
+        @provider = Chef::Provider::DscScript
+        @resource_name = :dsc_script
       end
 
       def code(arg=nil)
@@ -125,16 +121,6 @@ class Chef
           :kind_of => [ Integer ]
         )
       end
-
-      private
-
-      def powershell_info_str(run_context)
-        if run_context && run_context.node[:languages] && run_context.node[:languages][:powershell]
-            install_info = "Powershell #{run_context.node[:languages][:powershell][:version]} was found on the system."
-          else
-            install_info = 'Powershell was not found.'
-          end
-      end
     end
   end
 end

data/lib/chef/resource_collection.rb

@@ -198,7 +198,7 @@ class Chef
         'json_class' => self.class.name,
         'instance_vars' => instance_vars
       }
-      results.to_json(*a)
+      Chef::JSONCompat.to_json(results, *a)
     end
 
     def self.json_create(o)

data/lib/chef/resource_reporter.rb

@@ -230,7 +230,7 @@ class Chef
         resource_history_url = "reports/nodes/#{node_name}/runs/#{run_id}"
         Chef::Log.info("Sending resource update report (run-id: #{run_id})")
         Chef::Log.debug run_data.inspect
-        compressed_data = encode_gzip(run_data.to_json)
+        compressed_data = encode_gzip(Chef::JSONCompat.to_json(run_data))
         Chef::Log.debug("Sending compressed run data...")
         # Since we're posting compressed data we can not directly call post_rest which expects JSON
         reporting_url = @rest_client.create_url(resource_history_url)
@@ -273,7 +273,7 @@ class Chef
         resource_record.for_json
       end
       run_data["status"] = @status
-      run_data["run_list"] = @run_status.node.run_list.to_json
+      run_data["run_list"] = Chef::JSONCompat.to_json(@run_status.node.run_list)
       run_data["total_res_count"] = @total_res_count.to_s
       run_data["data"] = {}
       run_data["start_time"] = start_time.to_s
@@ -283,7 +283,7 @@ class Chef
         exception_data = {}
         exception_data["class"] = exception.inspect
         exception_data["message"] = exception.message
-        exception_data["backtrace"] = exception.backtrace.to_json
+        exception_data["backtrace"] = Chef::JSONCompat.to_json(exception.backtrace)
         exception_data["description"] =  @error_descriptions
         run_data["data"]["exception"] = exception_data
       end

data/lib/chef/role.rb

@@ -143,7 +143,7 @@ class Chef
 
     # Serialize this object as a hash
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def update_from!(o)

data/lib/chef/run_list.rb

@@ -86,7 +86,7 @@ class Chef
     end
 
     def to_json(*args)
-      to_a.map { |item| item.to_s}.to_json(*args)
+      Chef::JSONCompat.to_json(to_a.map { |item| item.to_s}, *args)
     end
 
     def empty?

data/lib/chef/user.rb

@@ -73,7 +73,7 @@ class Chef
     end
 
     def to_json(*a)
-      to_hash.to_json(*a)
+      Chef::JSONCompat.to_json(to_hash, *a)
     end
 
     def destroy

data/lib/chef/util/dsc/local_configuration_manager.rb

@@ -29,7 +29,7 @@ class Chef::Util::DSC
 
     def test_configuration(configuration_document)
       status = run_configuration_cmdlet(configuration_document)
-      handle_what_if_exception!(status.stderr) unless status.succeeded?
+      log_what_if_exception(status.stderr) unless status.succeeded?
       configuration_update_required?(status.return_value)
     end
 
@@ -78,18 +78,22 @@ $ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configu
 EOH
     end
 
-    def handle_what_if_exception!(what_if_exception_output)
-        if what_if_exception_output.gsub(/\s+/, ' ') =~ /A parameter cannot be found that matches parameter name 'Whatif'/i
-          # LCM returns an error if any of the resources do not support the opptional What-If
-          Chef::Log::warn("Received error while testing configuration due to resource not supporting 'WhatIf'")
-        elsif output_has_dsc_module_failure?(what_if_exception_output)
-          Chef::Log::warn("Received error while testing configuration due to a module for an imported resource possibly not being fully installed:\n#{what_if_exception_output.gsub(/\s+/, ' ')}")
-        else
-          raise Chef::Exceptions::PowershellCmdletException, "Powershell Cmdlet failed: #{what_if_exception_output.gsub(/\s+/, ' ')}"
-        end
+    def log_what_if_exception(what_if_exception_output)
+      if whatif_not_supported?(what_if_exception_output)
+        # LCM returns an error if any of the resources do not support the opptional What-If
+        Chef::Log::warn("Received error while testing configuration due to resource not supporting 'WhatIf'")
+      elsif dsc_module_import_failure?(what_if_exception_output)
+        Chef::Log::warn("Received error while testing configuration due to a module for an imported resource possibly not being fully installed:\n#{what_if_exception_output.gsub(/\s+/, ' ')}")
+      else
+        Chef::Log::warn("Received error while testing configuration:\n#{what_if_exception_output.gsub(/\s+/, ' ')}")
+      end
+    end
+
+    def whatif_not_supported?(what_if_exception_output)
+      !! (what_if_exception_output.gsub(/[\r\n]+/, '').gsub(/\s+/, ' ') =~ /A parameter cannot be found that matches parameter name 'Whatif'/i)
     end
 
-    def output_has_dsc_module_failure?(what_if_output)
+    def dsc_module_import_failure?(what_if_output)
       !! (what_if_output =~ /\sCimException/ &&
         what_if_output =~ /ProviderOperationExecutionFailure/ &&
         what_if_output =~ /\smodule\s+is\s+installed/)

data/lib/chef/util/powershell/cmdlet_result.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'json'
+require 'chef/json_compat'
 
 class Chef::Util::Powershell
   class CmdletResult
@@ -33,7 +33,7 @@ class Chef::Util::Powershell
 
     def return_value
       if output_format == :object
-        JSON.parse(@status.stdout)
+        Chef::JSONCompat.parse(@status.stdout)
       else
         @status.stdout
       end

data/lib/chef/version.rb

@@ -1,4 +1,3 @@
-
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -17,7 +16,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.16.4'
+  VERSION = '11.18.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/data/bootstrap/test-hints.erb

@@ -6,7 +6,7 @@ mkdir -p /etc/chef/ohai/hints
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
 cat <<'EOP'
-<%= hash.to_json %>
+<%= Chef::JSONCompat.to_json(hash) %>
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>

data/spec/data/bootstrap/test.erb

@@ -1 +1 @@
-<%= first_boot.to_json %>
+<%= Chef::JSONCompat.to_json(first_boot) %>

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Knife::CookbookDelete do
       Chef::Log.level = :debug
 
       @knife.name_args = %w{no-such-cookbook}
-      @api.get("/cookbooks/no-such-cookbook", 404, {'error'=>'dear Tim, no. -Sent from my iPad'}.to_json)
+      @api.get("/cookbooks/no-such-cookbook", 404, Chef::JSONCompat.to_json({'error'=>'dear Tim, no. -Sent from my iPad'}))
     end
 
     it "logs an error and exits" do
@@ -62,7 +62,7 @@ describe Chef::Knife::CookbookDelete do
     before do
       @knife.name_args = %w{obsolete-cookbook}
       @cookbook_list = {'obsolete-cookbook' => { 'versions' => ['version' => '1.0.0']} }
-      @api.get("/cookbooks/obsolete-cookbook", 200, @cookbook_list.to_json)
+      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
     end
 
     it "asks for confirmation, then deletes the cookbook" do
@@ -105,7 +105,7 @@ describe Chef::Knife::CookbookDelete do
       versions = ['1.0.0', '1.1.0', '1.2.0']
       with_version = lambda { |version| { 'version' => version } }
       @cookbook_list = {'obsolete-cookbook' => { 'versions' => versions.map(&with_version) } }
-      @api.get("/cookbooks/obsolete-cookbook", 200, @cookbook_list.to_json)
+      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
     end
 
     it "deletes all versions of a cookbook when given the '-a' flag" do

data/spec/functional/knife/exec_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Knife::Exec do
     @node = Chef::Node.new
     @node.name("ohai-world")
     response = {"rows" => [@node],"start" => 0,"total" => 1}
-    @api.get(%r{^/search/node}, 200, response.to_json)
+    @api.get(%r{^/search/node}, 200, Chef::JSONCompat.to_json(response))
     code = "$output.puts nodes.all"
     @knife.config[:exec] = code
     @knife.run

data/spec/functional/resource/dsc_script_spec.rb

@@ -81,17 +81,28 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
   let(:test_registry_value) { 'Registration' }
   let(:test_registry_data1) { 'LL927' }
   let(:test_registry_data2) { 'LL928' }
-  let(:dsc_code) { <<-EOH
+  let(:reg_key_name_param_name) { 'testregkeyname' }
+  let(:reg_key_value_param_name) { 'testregvaluename' }
+  let(:registry_embedded_parameters) { "$#{reg_key_name_param_name} = '#{test_registry_key}';$#{reg_key_value_param_name} = '#{test_registry_value}'"}
+  let(:dsc_reg_code) { <<-EOH
+  #{registry_embedded_parameters}
   Registry "ChefRegKey"
   {
-     Key = '#{test_registry_key}'
-     ValueName = '#{test_registry_value}'
+     Key = $#{reg_key_name_param_name}
+     ValueName = $#{reg_key_value_param_name}
      ValueData = '#{test_registry_data}'
      Ensure = 'Present'
   }
 EOH
   }
 
+  let(:dsc_code) { dsc_reg_code }
+  let(:dsc_reg_script) { <<-EOH
+  param($testregkeyname, $testregvaluename)
+  #{dsc_reg_code}
+EOH
+      }
+
   let(:dsc_user_prefix) { 'dsc' }
   let(:dsc_user_suffix) { 'chefx' }
   let(:dsc_user) {"#{dsc_user_prefix}_usr_#{dsc_user_suffix}" }
@@ -175,7 +186,7 @@ environment "whatsmydir"
     Ensure = 'Present'
 }
 EOH
-  }
+}
 
   let(:dsc_config_name) {
     dsc_test_resource_base.name
@@ -227,41 +238,79 @@ environment 'removethis'
 EOH
       removal_resource.run_action(:run)
     end
-    let(:dsc_code) { dsc_environment_config }
-    it 'should not raise an exception if the cwd is not etc' do
-      dsc_test_resource.cwd(dsc_environment_no_fail_not_etc_directory)
-      expect {dsc_test_resource.run_action(:run)}.not_to raise_error
-    end
 
-    it 'should raise an exception if the cwd is etc' do
-      dsc_test_resource.cwd(dsc_environment_fail_etc_directory)
-      expect {dsc_test_resource.run_action(:run)}.to raise_error(Chef::Exceptions::PowershellCmdletException)
-      begin
-        dsc_test_resource.run_action(:run)
-      rescue Chef::Exceptions::PowershellCmdletException => e
-        expect(e.message).to match(exception_message_signature)
+    describe 'when the DSC configuration contains code that raises an exception if cwd has a specific value' do
+      let(:dsc_code) { dsc_environment_config }
+      it 'should not raise an exception if the cwd is not etc' do
+        dsc_test_resource.cwd(dsc_environment_no_fail_not_etc_directory)
+        expect {dsc_test_resource.run_action(:run)}.not_to raise_error
+      end
+
+      it 'should raise an exception if the cwd is etc' do
+        dsc_test_resource.cwd(dsc_environment_fail_etc_directory)
+        expect {dsc_test_resource.run_action(:run)}.to raise_error(Chef::Exceptions::PowershellCmdletException)
+        begin
+          dsc_test_resource.run_action(:run)
+        rescue Chef::Exceptions::PowershellCmdletException => e
+          expect(e.message).to match(exception_message_signature)
+        end
       end
     end
   end
 
   shared_examples_for 'a parameterized DSC configuration script' do
-    context 'when specifying environment variables in the environment attribute' do
-      let(:dsc_user_prefix_code) { dsc_user_prefix_env_code }
-      let(:dsc_user_suffix_code) { dsc_user_suffix_env_code }
-      it_behaves_like 'a dsc_script with configuration that uses environment variables'
+    let(:dsc_user_prefix_code) { dsc_user_prefix_env_code }
+    let(:dsc_user_suffix_code) { dsc_user_suffix_env_code }
+    it_behaves_like 'a dsc_script with configuration that uses environment variables'
+  end
+
+  shared_examples_for 'a dsc_script without configuration data that takes parameters' do
+    context 'when configuration data is not specified' do
+
+      before(:each) do
+        test_key_resource = Chef::Resource::RegistryKey.new(test_registry_key, dsc_test_run_context)
+        test_key_resource.recursive(true)
+        test_key_resource.run_action(:delete_key)
+      end
+
+      after(:each) do
+        test_key_resource = Chef::Resource::RegistryKey.new(test_registry_key, dsc_test_run_context)
+        test_key_resource.recursive(true)
+        test_key_resource.run_action(:delete_key)
+      end
+
+      let(:test_registry_data) { test_registry_data1 }
+      let(:dsc_parameterized_env_param_value) { "val" + Random::rand.to_s  }
+
+      it 'should have a default value of nil for the configuration_data attribute' do
+        expect(dsc_test_resource.configuration_data).to eql(nil)
+      end
+
+      it 'should have a default value of nil for the configuration_data_path attribute' do
+        expect(dsc_test_resource.configuration_data_script).to eql(nil)
+      end
+
+      let(:dsc_test_resource) { dsc_resource_from_path }
+      let(:registry_embedded_parameters) { '' }
+      let(:dsc_code) { dsc_reg_script }
+
+      it 'should set a registry key according to parameters passed to the configuration' do
+        dsc_test_resource.configuration_name(config_name_value)
+      dsc_test_resource.flags({:"#{reg_key_name_param_name}" => test_registry_key, :"#{reg_key_value_param_name}" => test_registry_value})
+        expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(false)
+        dsc_test_resource.run_action(:run)
+        expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(true)
+        expect(dsc_test_resource.registry_value_exists?(test_registry_key, {:name => test_registry_value, :type => :string, :data => test_registry_data})).to eq(true)
+      end
     end
   end
 
   shared_examples_for 'a dsc_script with configuration data' do
-    context 'when using the configuration_data attribute' do
-      let(:configuration_data_attribute) { 'configuration_data' }
-      it_behaves_like 'a dsc_script with configuration data set via an attribute'
-    end
+    let(:configuration_data_attribute) { 'configuration_data' }
+    it_behaves_like 'a dsc_script with configuration data set via an attribute'
 
-    context 'when using the configuration_data_script attribute' do
-      let(:configuration_data_attribute) { 'configuration_data_script' }
-      it_behaves_like 'a dsc_script with configuration data set via an attribute'
-    end
+    let(:configuration_data_attribute) { 'configuration_data_script' }
+    it_behaves_like 'a dsc_script with configuration data set via an attribute'
   end
 
   shared_examples_for 'a dsc_script with configuration data set via an attribute' do
@@ -282,33 +331,28 @@ EOH
   end
 
   shared_examples_for 'a dsc_script with configuration data that takes parameters' do
-    context 'when script code takes parameters for configuration' do
-      let(:dsc_user_code) { dsc_user_param_code }
-      let(:config_param_section) { config_params }
-      let(:config_flags) {{:"#{dsc_user_prefix_param_name}" => "#{dsc_user_prefix}", :"#{dsc_user_suffix_param_name}" => "#{dsc_user_suffix}"}}
-      it 'does not directly contain the user name' do
-        configuration_script_content = ::File.open(dsc_test_resource.command) do | file |
-          file.read
-        end
-        expect(configuration_script_content.include?(dsc_user)).to be(false)
+    let(:dsc_user_code) { dsc_user_param_code }
+    let(:config_param_section) { config_params }
+    let(:config_flags) {{:"#{dsc_user_prefix_param_name}" => "#{dsc_user_prefix}", :"#{dsc_user_suffix_param_name}" => "#{dsc_user_suffix}"}}
+    it 'does not directly contain the user name' do
+      configuration_script_content = ::File.open(dsc_test_resource.command) do | file |
+        file.read
       end
-      it_behaves_like 'a dsc_script with configuration data'
+      expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
-
+    it_behaves_like 'a dsc_script with configuration data'
   end
 
   shared_examples_for 'a dsc_script with configuration data that uses environment variables' do
-    context 'when script code uses environment variables' do
-      let(:dsc_user_code) { dsc_user_env_code }
+    let(:dsc_user_code) { dsc_user_env_code }
 
-      it 'does not directly contain the user name' do
-        configuration_script_content = ::File.open(dsc_test_resource.command) do | file |
-          file.read
-        end
-        expect(configuration_script_content.include?(dsc_user)).to be(false)
+    it 'does not directly contain the user name' do
+      configuration_script_content = ::File.open(dsc_test_resource.command) do | file |
+        file.read
       end
-      it_behaves_like 'a dsc_script with configuration data'
+      expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
+    it_behaves_like 'a dsc_script with configuration data'
   end
 
   context 'when supplying configuration through the configuration attribute' do
@@ -333,5 +377,6 @@ EOH
     it_behaves_like 'a dsc_script with configuration data'
     it_behaves_like 'a dsc_script with configuration data that uses environment variables'
     it_behaves_like 'a dsc_script with configuration data that takes parameters'
+    it_behaves_like 'a dsc_script without configuration data that takes parameters'
   end
 end