chef 12.0.0.alpha.2 → 12.0.0.rc.0

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

@@ -0,0 +1,46 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+#
+# 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/json_compat'
+
+class Chef::Util::Powershell
+  class CmdletResult
+    attr_reader :output_format
+
+    def initialize(status, output_format)
+      @status = status
+      @output_format = output_format
+    end
+
+    def stderr
+      @status.stderr
+    end
+
+    def return_value
+      if output_format == :object
+        Chef::JSONCompat.parse(@status.stdout)
+      else
+        @status.stdout
+      end
+    end
+
+    def succeeded?
+      @succeeded = @status.status.exitstatus == 0
+    end
+  end
+end

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '12.0.0.alpha.2'
+  VERSION = '12.0.0.rc.0'
 end
 
 #

data/lib/chef/win32/api/system.rb

@@ -200,6 +200,15 @@ LRESULT WINAPI SendMessageTimeout(
         safe_attach_function :SendMessageTimeoutW, [:HWND, :UINT, :WPARAM, :LPARAM, :UINT, :UINT, :PDWORD_PTR], :LRESULT
         safe_attach_function :SendMessageTimeoutA, [:HWND, :UINT, :WPARAM, :LPARAM, :UINT, :UINT, :PDWORD_PTR], :LRESULT
 
+=begin
+DWORD WINAPI ExpandEnvironmentStrings(
+  _In_       LPCTSTR lpSrc,
+  _Out_opt_  LPTSTR lpDst,
+  _In_       DWORD nSize
+);
+=end
+        safe_attach_function :ExpandEnvironmentStringsW, [:pointer, :pointer, :DWORD], :DWORD
+        safe_attach_function :ExpandEnvironmentStringsA, [:pointer, :pointer, :DWORD], :DWORD
       end
     end
   end

data/lib/chef/win32/version.rb

@@ -48,6 +48,8 @@ class Chef
       public
 
       WIN_VERSIONS = {
+        "Windows 10" => {:major => 6, :minor => 4, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
+        "Windows Server 10" => {:major => 6, :minor => 4, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
         "Windows 8.1" => {:major => 6, :minor => 3, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
         "Windows Server 2012 R2" => {:major => 6, :minor => 3, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
         "Windows 8" => {:major => 6, :minor => 2, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},

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/data/cookbooks/ignorken/files/default/not_me.rb

@@ -0,0 +1,2 @@
+a cat walked on the keyboard one day...
+(*&(*&(*&(*&(*^%$%^%#^^&(*)(*{}}}}}}}}+++++===))))))

data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb

@@ -0,0 +1,2 @@
+a cat walked on the keyboard one day...
+(*&(*&(*&(*&(*^%$%^%#^^&(*)(*{}}}}}}}}+++++===))))))

data/spec/data/cookbooks/openldap/libraries/openldap.rb

@@ -0,0 +1,4 @@
+require_relative './openldap/version.rb'
+
+class OpenLDAP
+end

data/spec/data/cookbooks/openldap/libraries/openldap/version.rb

@@ -0,0 +1,3 @@
+class OpenLDAP
+  VERSION = '8.9.10'
+end

data/spec/data/lwrp/providers/buck_passer.rb

@@ -1,3 +1,10 @@
-action :buck_stops_here do
-  log "This should be overwritten by ../lwrp_override/buck_passer.rb"
+action :pass_buck do
+  lwrp_foo :prepared_thumbs do
+    action :prepare_thumbs
+    provider :lwrp_thumb_twiddler
+  end
+  lwrp_foo :twiddled_thumbs do
+    action :twiddle_thumbs
+    provider :lwrp_thumb_twiddler
+  end
 end

data/spec/data/lwrp/resources/foo.rb

@@ -1,3 +1,4 @@
-actions :never_execute
+actions :prepare_thumbs, :twiddle_thumbs
+default_action :pass_buck
 
-attribute :ever, :kind_of => String
+attribute :monkey, :kind_of => String

data/spec/data/lwrp_override/providers/buck_passer.rb

@@ -1,10 +1,5 @@
-action :pass_buck do
-  lwrp_foo :prepared_thumbs do
-    action :prepare_thumbs
-    provider :lwrp_thumb_twiddler
-  end
-  lwrp_foo :twiddled_thumbs do
-    action :twiddle_thumbs
-    provider :lwrp_thumb_twiddler
-  end
-end
+# Starting with Chef 12 reloading an LWRP shouldn't reload the file anymore
+
+action :buck_stops_here do
+  log "This should be overwritten by ../lwrp_override/buck_passer.rb"
+end

data/spec/data/lwrp_override/resources/foo.rb

@@ -1,4 +1,5 @@
-actions :prepare_thumbs, :twiddle_thumbs
-default_action :pass_buck
+# Starting with Chef 12 reloading an LWRP shouldn't reload the file anymore
 
-attribute :monkey, :kind_of => String
+actions :never_execute
+
+attribute :ever, :kind_of => String

data/spec/functional/assets/chefinittest

@@ -0,0 +1,34 @@
+#!/bin/ksh
+
+function create_chef_txt {
+        touch /tmp/chefinittest.txt
+}
+
+function delete_chef_txt {
+        rm /tmp/chefinittest.txt
+}
+
+function rename_chef_txt {
+        mv /tmp/chefinittest.txt /tmp/$1
+}
+
+case "$1" in
+start )
+        create_chef_txt
+        ;;
+stop )
+        delete_chef_txt
+        ;;
+status )
+        [ -f /tmp/chefinittest.txt ] || [ -f /tmp/chefinittest_reload.txt ] || [ -f /tmp/chefinittest_restart.txt ]
+        ;;
+reload )
+        rename_chef_txt "chefinittest_reload.txt"
+        ;;
+restart )
+        rename_chef_txt "chefinittest_restart.txt"
+        ;;
+* )
+        echo "Usage: $0 (start | stop | restart | reload)"
+        exit 1
+esac

data/spec/functional/assets/testchefsubsys

@@ -0,0 +1,11 @@
+#!/bin/bash
+# trapchild
+
+sleep 120 &
+
+pid="$!"
+
+trap 'echo I am going down, so killing off my processes..; kill $pid; exit' SIGHUP SIGINT
+ SIGQUIT SIGTERM
+
+wait

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -30,11 +30,11 @@ describe Chef::DSL::RebootPending, :windows_only do
     ohai
   end
 
-  def registry_safe?
-    !registry.value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' }) ||
-    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') ||
-    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
-    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile')
+  def registry_unsafe?
+    registry.value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' }) ||
+    registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired')
+    registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
+    registry.key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile')
   end
 
   let(:node) { Chef::Node.new }
@@ -46,21 +46,24 @@ describe Chef::DSL::RebootPending, :windows_only do
 
   describe "reboot_pending?" do
 
-    context "when there is nothing to indicate a reboot is pending" do
-      it { expect(recipe.reboot_pending?).to be_false }
+    describe "when there is nothing to indicate a reboot is pending" do
+      it "should return false" do
+        pending "Found existing registry keys" if registry_unsafe?
+        expect(recipe.reboot_pending?).to be_false
+      end
     end
 
     describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
       it "returns true if the registry value exists" do
-        pending "Found existing registry keys" unless registry_safe?
-        registry.set_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', 
+        pending "Found existing registry keys" if registry_unsafe?
+        registry.set_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager',
             { :name => 'PendingFileRenameOperations', :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
         expect(recipe.reboot_pending?).to be_true
       end
 
       after do
-        if registry_safe?
+        unless registry_unsafe?
           registry.delete_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' })
         end
       end
@@ -68,14 +71,14 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' do
       it "returns true if the registry key exists" do
-        pending "Found existing registry keys" unless registry_safe?
+        pending "Found existing registry keys" if registry_unsafe?
         registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
 
         expect(recipe.reboot_pending?).to be_true
       end
 
       after do
-        if registry_safe?
+        unless registry_unsafe?
           registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
         end
       end
@@ -84,14 +87,14 @@ describe Chef::DSL::RebootPending, :windows_only do
     describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' do
       it "returns true if the registry key exists" do
         pending "Permissions are limited to 'TrustedInstaller' by default"
-        pending "Found existing registry keys" unless registry_safe?
+        pending "Found existing registry keys" if registry_unsafe?
         registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
 
         expect(recipe.reboot_pending?).to be_true
       end
 
       after do
-        if registry_safe?
+        unless registry_unsafe?
           registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
         end
       end
@@ -99,7 +102,7 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe 'HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile\Flags' do
       it "returns true if the registry key exists" do
-        pending "Found existing registry keys" unless registry_safe?
+        pending "Found existing registry keys" if registry_unsafe?
         registry.create_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', true)
         registry.set_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile',
                     { :name => 'Flags', :type => :dword, :data => 3 })
@@ -108,7 +111,7 @@ describe Chef::DSL::RebootPending, :windows_only do
       end
 
       after do
-        if registry_safe?
+        unless registry_unsafe?
           registry.delete_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', { :name => 'Flags' })
           registry.delete_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', false)
         end

data/spec/functional/event_loggers/windows_eventlog_spec.rb

@@ -0,0 +1,82 @@
+#
+# Author:: Jay Mundrawala (<jdm@getchef.com>)
+#
+# Copyright:: 2014, Chef Software, Inc.
+#
+# 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'
+require 'securerandom'
+require 'chef/event_loggers/windows_eventlog'
+if Chef::Platform.windows? and not Chef::Platform::windows_server_2003?
+  require 'win32/eventlog'
+  include Win32
+end
+
+describe Chef::EventLoggers::WindowsEventLogger, :windows_only, :not_supported_on_win2k3 do
+  let(:run_id)       { SecureRandom.uuid }
+  let(:version)      { SecureRandom.uuid }
+  let(:elapsed_time) { SecureRandom.random_number(100) }
+  let(:logger)       { Chef::EventLoggers::WindowsEventLogger.new }
+  let(:flags)        { nil }
+  let(:node)         { nil }
+  let(:run_status)   { double('Run Status', {run_id: run_id, elapsed_time: elapsed_time }) }
+  let(:event_log)    { EventLog.new("Application") }
+  let!(:offset)      { event_log.read_last_event.record_number }
+  let(:mock_exception) { double('Exception', {message: SecureRandom.uuid, backtrace:[SecureRandom.uuid, SecureRandom.uuid]})}
+
+  it 'is available' do
+    Chef::EventLoggers::WindowsEventLogger.available?.should be_true
+  end
+
+  it 'writes run_start event with event_id 10000 and contains version' do
+    logger.run_start(version)
+
+    expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10000 &&
+                                               e.string_inserts[0].include?(version)}).to be_true
+  end
+
+  it 'writes run_started event with event_id 10001 and contains the run_id' do
+    logger.run_started(run_status)
+
+    expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10001 &&
+                                               e.string_inserts[0].include?(run_id)}).to be_true
+  end
+
+  it 'writes run_completed event with event_id 10002 and contains the run_id and elapsed time' do
+    logger.run_started(run_status)
+    logger.run_completed(node)
+
+    expect(event_log.read(flags, offset).any? { |e| e.source == 'Chef' && e.event_id == 10002 &&
+                                                e.string_inserts[0].include?(run_id) &&
+                                                e.string_inserts[1].include?(elapsed_time.to_s)
+    }).to be_true
+  end
+
+  it 'writes run_failed event with event_id 10003 and contains the run_id, elapsed time, and exception info' do
+    logger.run_started(run_status)
+    logger.run_failed(mock_exception)
+
+    expect(event_log.read(flags, offset).any? do |e|
+      e.source == 'Chef' && e.event_id == 10003 &&
+        e.string_inserts[0].include?(run_id) &&
+        e.string_inserts[1].include?(elapsed_time.to_s) &&
+        e.string_inserts[2].include?(mock_exception.class.name) &&
+        e.string_inserts[3].include?(mock_exception.message) &&
+        e.string_inserts[4].include?(mock_exception.backtrace[0]) &&
+        e.string_inserts[4].include?(mock_exception.backtrace[1])
+    end).to be_true
+  end
+
+end

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