chef 11.14.6-x86-mingw32 → 11.16.0-x86-mingw32

data/spec/unit/util/dsc/lcm_output_parser_spec.rb

@@ -0,0 +1,169 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 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 'chef/util/dsc/lcm_output_parser'
+
+describe Chef::Util::DSC::LocalConfigurationManager::Parser do
+  context 'empty input parameter' do
+    it 'returns an empty array for a 0 length string' do
+      Chef::Util::DSC::LocalConfigurationManager::Parser::parse('').should be_empty
+    end
+
+    it 'returns an empty array for a nil input' do
+      Chef::Util::DSC::LocalConfigurationManager::Parser::parse('').should be_empty
+    end
+  end
+
+  context 'correctly formatted output from lcm' do
+    it 'returns an empty array for a log with no resources' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str).should be_empty
+    end
+
+    it 'returns a single resource when only 1 logged with the correct name' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources.length.should eq(1)
+      resources[0].name.should eq('[name]')
+    end
+
+    it 'identifies when a resource changes the state of the system' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ Start  Set      ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].changes_state?.should be_true
+    end
+
+    it 'preserves the log provided for how the system changed the state' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ Start  Set      ] [name]
+logtype: [machinename]:                           [message]
+logtype: [machinename]: LCM:  [ End    Set      ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].change_log.should match_array(["[name]","[message]","[name]"])
+    end
+
+    it 'should return false for changes_state?' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ Skip   Set      ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].changes_state?.should be_false
+    end
+
+    it 'should return an empty array for change_log if changes_state? is false' do
+      str = <<EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ Skip   Set      ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].change_log.should be_empty
+    end
+  end
+
+  context 'Incorrectly formatted output from LCM' do
+    it 'should allow missing a [End Resource] when its the last one and still find all the resource' do
+      str = <<-EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Skip   Set      ]
+logtype: [machinename]: LCM:  [ End    Resource ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name2]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].changes_state?.should be_false
+      resources[1].changes_state?.should be_true
+    end
+
+    it 'should allow missing a [End Resource] when its the first one and still find all the resource' do
+      str = <<-EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Skip   Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name2]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+logtype: [machinename]: LCM:  [ End    Resource ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].changes_state?.should be_false
+      resources[1].changes_state?.should be_true
+    end
+
+    it 'should allow missing set and end resource and assume an unconverged resource in this case' do
+      str = <<-EOF
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Start  Resource ]  [name2]
+logtype: [machinename]: LCM:  [ Start  Test     ]
+logtype: [machinename]: LCM:  [ End    Test     ]
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+logtype: [machinename]: LCM:  [ End    Resource ]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOF
+      resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
+      resources[0].changes_state?.should be_true
+      resources[0].name.should eql('[name]')
+      resources[1].changes_state?.should be_true
+      resources[1].name.should eql('[name2]')
+    end
+  end
+end

data/spec/unit/util/dsc/local_configuration_manager_spec.rb

@@ -0,0 +1,134 @@
+#
+# Author:: Adam Edwards <adamed@getchef.com>
+# Copyright:: Copyright (c) 2014 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 'chef'
+require 'chef/util/dsc/local_configuration_manager'
+
+describe Chef::Util::DSC::LocalConfigurationManager do
+
+  let(:lcm) { Chef::Util::DSC::LocalConfigurationManager.new(nil, 'tmp') }
+
+  let(:normal_lcm_output) { <<-EOH
+logtype: [machinename]: LCM:  [ Start  Set      ]
+logtype: [machinename]: LCM:  [ Start  Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Resource ] [name]
+logtype: [machinename]: LCM:  [ End    Set      ]
+EOH
+  }
+
+  let(:no_whatif_lcm_output) { <<-EOH
+Start-DscConfiguration : A parameter cannot be found that matches parameter name 'whatif'.
+At line:1 char:123
++ run-somecommand -whatif
++                        ~~~~~~~~
+    + CategoryInfo          : InvalidArgument: (:) [Start-DscConfiguration], ParameterBindingException
+    + FullyQualifiedErrorId : NamedParameterNotFound,SomeCompany.SomeAssembly.Commands.RunSomeCommand
+EOH
+  }
+
+  let(:dsc_resource_import_failure_output) { <<-EOH
+PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . The SendConfigurationApply function did not succeed. + CategoryInfo : NotSpecified: (root/Microsoft/...gurationManager:String) [], CimException + FullyQualifiedErrorId : MI RESULT 1 + PSComputerName : .
+EOH
+  }
+
+  let(:lcm_status) {
+    double("LCM cmdlet status", :stderr => lcm_standard_error, :return_value => lcm_standard_output, :succeeded? => lcm_cmdlet_success)
+  }
+
+  describe 'test_configuration method invocation' do
+    context 'when interacting with the LCM using a PowerShell cmdlet' do
+      before(:each) do
+        allow(lcm).to receive(:run_configuration_cmdlet).and_return(lcm_status)
+      end
+      context 'that returns successfully' do
+        before(:each) do
+          allow(lcm).to receive(:run_configuration_cmdlet).and_return(lcm_status)
+        end
+
+        let(:lcm_standard_output) { normal_lcm_output }
+        let(:lcm_standard_error) { nil }
+        let(:lcm_cmdlet_success) { true }
+
+        it 'should successfully return resource information for normally formatted output when cmdlet the cmdlet succeeds' do
+          test_configuration_result = lcm.test_configuration('config')
+          expect(test_configuration_result.class).to be(Array)
+          expect(test_configuration_result.length).to be > 0
+          expect(Chef::Log).not_to receive(:warn)
+        end
+      end
+
+      context 'that fails due to missing what-if switch in DSC resource cmdlet implementation' do
+        let(:lcm_standard_output) { '' }
+        let(:lcm_standard_error) { no_whatif_lcm_output }
+        let(:lcm_cmdlet_success) { false }
+
+        it 'should should return a (possibly empty) array of ResourceInfo instances' do
+          expect(Chef::Log).to receive(:warn)
+          test_configuration_result = nil
+          expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
+          expect(test_configuration_result.class).to be(Array)
+        end
+      end
+
+      context 'that fails due to a DSC resource not being imported before StartDSCConfiguration -whatif is executed' do
+        let(:lcm_standard_output) { '' }
+        let(:lcm_standard_error) { dsc_resource_import_failure_output }
+        let(:lcm_cmdlet_success) { false }
+
+        it 'should log a warning if the message is formatted as expected when a resource import failure occurs' do
+          expect(Chef::Log).to receive(:warn)
+          expect(lcm).to receive(:output_has_dsc_module_failure?).and_call_original
+          test_configuration_result = nil
+          expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
+        end
+
+        it 'should return a (possibly empty) array of ResourceInfo instances' do
+          expect(Chef::Log).to receive(:warn)
+          test_configuration_result = nil
+          expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
+          expect(test_configuration_result.class).to be(Array)
+        end
+      end
+
+      context 'that fails due to an PowerShell cmdlet error that cannot be handled' do
+        let(:lcm_standard_output) { 'some output' }
+        let(:lcm_standard_error) { 'Abort, Retry, Fail?' }
+        let(:lcm_cmdlet_success) { false }
+
+        it 'should raise a Chef::Exceptions::PowershellCmdletException' do
+          expect(Chef::Log).not_to receive(:warn)
+          expect(lcm).to receive(:output_has_dsc_module_failure?).and_call_original
+          expect {lcm.test_configuration('config')}.to raise_error(Chef::Exceptions::PowershellCmdletException)
+        end
+      end
+    end
+
+    it 'should identify a correctly formatted error message as a resource import failure' do
+      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output)).to be(true)
+    end
+
+    it 'should not identify an incorrectly formatted error message as a resource import failure' do
+      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output.gsub('module', 'gibberish'))).to be(false)
+    end
+
+    it 'should not identify a message without a CimException reference as a resource import failure' do
+      expect(lcm.send(:output_has_dsc_module_failure?, dsc_resource_import_failure_output.gsub('CimException', 'ArgumentException'))).to be(false)
+    end
+  end
+end
+

data/spec/unit/util/powershell/cmdlet_spec.rb

@@ -0,0 +1,106 @@
+#
+# Author:: Jay Mundrawala <jdm@getchef.com>
+# Copyright:: Copyright (c) 2014 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 'chef'
+require 'chef/util/powershell/cmdlet'
+
+describe Chef::Util::Powershell::Cmdlet do
+  before (:all) do
+    @node = Chef::Node.new
+    @cmdlet = Chef::Util::Powershell::Cmdlet.new(@node, 'Some-Commandlet')
+  end
+
+  describe '#validate_switch_name!' do
+    it 'should not raise an error if a name contains all upper case letters' do
+      @cmdlet.send(:validate_switch_name!, "HELLO")
+    end
+
+    it 'should not raise an error if the name contains all lower case letters' do
+      @cmdlet.send(:validate_switch_name!, "hello")
+    end
+
+    it 'should not raise an error if no special characters are used except _' do
+      @cmdlet.send(:validate_switch_name!, "hello_world")
+    end
+
+    %w{! @ # $ % ^ & * & * ( ) - = + \{ \} . ? < > \\ /}.each do |sym|
+      it "raises an Argument error if it configuration name contains #{sym}" do
+        expect {
+          @cmdlet.send(:validate_switch_name!, "Hello#{sym}")
+        }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  describe '#escape_parameter_value' do
+    # Is this list really complete?
+    %w{` " # '}.each do |c|
+      it "escapse #{c}" do
+        @cmdlet.send(:escape_parameter_value, "stuff #{c}").should eql("stuff `#{c}")
+      end
+    end
+
+    it 'does not do anything to a string without special characters' do
+      @cmdlet.send(:escape_parameter_value, 'stuff').should eql('stuff')
+    end
+  end
+
+  describe '#escape_string_parameter_value' do
+    it "surrounds a string with ''" do
+      @cmdlet.send(:escape_string_parameter_value, 'stuff').should eql("'stuff'")
+    end
+  end
+
+  describe '#command_switches_string' do
+    it 'raises an ArgumentError if the key is not a symbol' do
+      expect {
+        @cmdlet.send(:command_switches_string, {'foo' => 'bar'})
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'does not allow invalid switch names' do
+      expect {
+        @cmdlet.send(:command_switches_string, {:foo! => 'bar'})
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'ignores switches with a false value' do
+      @cmdlet.send(:command_switches_string, {:foo => false}).should eql('')
+    end
+
+    it 'should correctly handle a value type of string' do
+      @cmdlet.send(:command_switches_string, {:foo => 'bar'}).should eql("-foo 'bar'")
+    end
+
+    it 'should correctly handle a value type of string even when it is 0 length' do
+      @cmdlet.send(:command_switches_string, {:foo => ''}).should eql("-foo ''")
+    end
+
+    it 'should not quote integers' do
+      @cmdlet.send(:command_switches_string, {:foo => 1}).should eql("-foo 1")
+    end
+
+    it 'should not quote floats' do
+      @cmdlet.send(:command_switches_string, {:foo => 1.0}).should eql("-foo 1.0")
+    end
+
+    it 'has just the switch when the value is true' do
+      @cmdlet.send(:command_switches_string, {:foo => true}).should eql("-foo")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.14.6
+  version: 11.16.0
 platform: x86-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -1077,6 +1077,7 @@ files:
 - lib/chef/provider/deploy/revision.rb
 - lib/chef/provider/deploy/timestamped.rb
 - lib/chef/provider/directory.rb
+- lib/chef/provider/dsc_script.rb
 - lib/chef/provider/env.rb
 - lib/chef/provider/env/windows.rb
 - lib/chef/provider/erl_call.rb
@@ -1193,6 +1194,7 @@ files:
 - lib/chef/resource/deploy_revision.rb
 - lib/chef/resource/directory.rb
 - lib/chef/resource/dpkg_package.rb
+- lib/chef/resource/dsc_script.rb
 - lib/chef/resource/easy_install_package.rb
 - lib/chef/resource/env.rb
 - lib/chef/resource/erl_call.rb
@@ -1273,9 +1275,15 @@ files:
 - lib/chef/user.rb
 - lib/chef/util/backup.rb
 - lib/chef/util/diff.rb
+- lib/chef/util/dsc/configuration_generator.rb
+- lib/chef/util/dsc/lcm_output_parser.rb
+- lib/chef/util/dsc/local_configuration_manager.rb
+- lib/chef/util/dsc/resource_info.rb
 - lib/chef/util/editor.rb
 - lib/chef/util/file_edit.rb
 - lib/chef/util/path_helper.rb
+- lib/chef/util/powershell/cmdlet.rb
+- lib/chef/util/powershell/cmdlet_result.rb
 - lib/chef/util/selinux.rb
 - lib/chef/util/threaded_job_queue.rb
 - lib/chef/util/windows.rb
@@ -1595,6 +1603,7 @@ files:
 - spec/functional/resource/cron_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
+- spec/functional/resource/dsc_script_spec.rb
 - spec/functional/resource/env_spec.rb
 - spec/functional/resource/file_spec.rb
 - spec/functional/resource/git_spec.rb
@@ -1616,6 +1625,7 @@ files:
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
 - spec/functional/tiny_server_spec.rb
+- spec/functional/util/powershell/cmdlet_spec.rb
 - spec/functional/version_spec.rb
 - spec/functional/win32/registry_helper_spec.rb
 - spec/functional/win32/security_spec.rb
@@ -1859,6 +1869,7 @@ files:
 - spec/unit/provider/deploy/timestamped_spec.rb
 - spec/unit/provider/deploy_spec.rb
 - spec/unit/provider/directory_spec.rb
+- spec/unit/provider/dsc_script_spec.rb
 - spec/unit/provider/env/windows_spec.rb
 - spec/unit/provider/env_spec.rb
 - spec/unit/provider/erl_call_spec.rb
@@ -1965,6 +1976,7 @@ files:
 - spec/unit/resource/deploy_spec.rb
 - spec/unit/resource/directory_spec.rb
 - spec/unit/resource/dpkg_package_spec.rb
+- spec/unit/resource/dsc_script_spec.rb
 - spec/unit/resource/easy_install_package_spec.rb
 - spec/unit/resource/env_spec.rb
 - spec/unit/resource/erl_call_spec.rb
@@ -2035,9 +2047,13 @@ files:
 - spec/unit/user_spec.rb
 - spec/unit/util/backup_spec.rb
 - spec/unit/util/diff_spec.rb
+- spec/unit/util/dsc/configuration_generator_spec.rb
+- spec/unit/util/dsc/lcm_output_parser_spec.rb
+- spec/unit/util/dsc/local_configuration_manager_spec.rb
 - spec/unit/util/editor_spec.rb
 - spec/unit/util/file_edit_spec.rb
 - spec/unit/util/path_helper_spec.rb
+- spec/unit/util/powershell/cmdlet_spec.rb
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/threaded_job_queue_spec.rb
 - spec/unit/version/platform_spec.rb