chef 11.10.4 → 11.12.0.alpha.1

data/lib/chef/resource.rb

@@ -21,6 +21,7 @@ require 'chef/mixin/params_validate'
 require 'chef/dsl/platform_introspection'
 require 'chef/dsl/data_query'
 require 'chef/dsl/registry_helper'
+require 'chef/dsl/reboot_pending'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/resource/conditional'
 require 'chef/resource/conditional_action_not_nothing'
@@ -125,6 +126,7 @@ F
     include Chef::Mixin::ParamsValidate
     include Chef::DSL::PlatformIntrospection
     include Chef::DSL::RegistryHelper
+    include Chef::DSL::RebootPending
     include Chef::Mixin::ConvertToClassName
     include Chef::Mixin::Deprecation
 

data/lib/chef/resource_reporter.rb

@@ -107,7 +107,6 @@ class Chef
       @pending_update  = nil
       @status = "success"
       @exception = nil
-      @run_id = SecureRandom.uuid
       @rest_client = rest_client
       @error_descriptions = {}
     end
@@ -118,7 +117,7 @@ class Chef
       if reporting_enabled?
         begin
           resource_history_url = "reports/nodes/#{node_name}/runs"
-          server_response = @rest_client.post_rest(resource_history_url, {:action => :start, :run_id => @run_id,
+          server_response = @rest_client.post_rest(resource_history_url, {:action => :start, :run_id => run_id,
                                                                           :start_time => start_time.to_s}, headers)
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
           handle_error_starting_run(e, resource_history_url)
@@ -158,6 +157,10 @@ class Chef
       @reporting_enabled = false
     end
 
+    def run_id
+      @run_status.run_id
+    end
+
     def resource_current_state_loaded(new_resource, action, current_resource)
       unless nested_resource?(new_resource)
         @pending_update = ResourceReport.new_with_current_state(new_resource, action, current_resource)
@@ -214,8 +217,8 @@ class Chef
     def post_reporting_data
       if reporting_enabled?
         run_data = prepare_run_data
-        resource_history_url = "reports/nodes/#{node_name}/runs/#{@run_id}"
-        Chef::Log.info("Sending resource update report (run-id: #{@run_id})")
+        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)
         begin

data/lib/chef/rest.rb

@@ -36,6 +36,7 @@ require 'chef/http/validate_content_length'
 require 'chef/config'
 require 'chef/exceptions'
 require 'chef/platform/query_helpers'
+require 'chef/http/remote_request_id'
 
 class Chef
   # == Chef::REST
@@ -62,6 +63,7 @@ class Chef
 
       @decompressor = Decompressor.new(options)
       @authenticator = Authenticator.new(options)
+      @request_id = RemoteRequestID.new(options)
 
       @middlewares << ValidateContentLength.new(options)
       @middlewares << JSONInput.new(options)
@@ -69,6 +71,8 @@ class Chef
       @middlewares << CookieManager.new(options)
       @middlewares << @decompressor
       @middlewares << @authenticator
+      @middlewares << @request_id
+
     end
 
     def signing_key_filename
@@ -132,7 +136,7 @@ class Chef
     def raw_http_request(method, path, headers, data)
       url = create_url(path)
       method, url, headers, data = @authenticator.handle_request(method, url, headers, data)
-
+      method, url, headers, data = @request_id.handle_request(method, url, headers, data)
       response, rest_request, return_value = send_http_request(method, url, headers, data)
       response.error! unless success_response?(response)
       return_value

data/lib/chef/run_status.rb

@@ -37,6 +37,8 @@ class Chef::RunStatus
 
   attr_writer :exception
 
+  attr_accessor :run_id
+
   def initialize(node, events)
     @node = node
     @events = events
@@ -112,7 +114,8 @@ class Chef::RunStatus
       :all_resources => all_resources,
       :updated_resources => updated_resources,
       :exception => formatted_exception,
-      :backtrace => backtrace}
+      :backtrace => backtrace,
+      :run_id => run_id}
   end
 
   # Returns a string of the format "ExceptionClass: message" or +nil+ if no

data/lib/chef/server_api.rb

@@ -22,6 +22,7 @@ require 'chef/http/cookie_manager'
 require 'chef/http/decompressor'
 require 'chef/http/json_input'
 require 'chef/http/json_output'
+require 'chef/http/remote_request_id'
 
 class Chef
   class ServerAPI < Chef::HTTP
@@ -37,5 +38,6 @@ class Chef
     use Chef::HTTP::CookieManager
     use Chef::HTTP::Decompressor
     use Chef::HTTP::Authenticator
+    use Chef::HTTP::RemoteRequestID
   end
-end
+end

data/lib/chef/version.rb

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

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -0,0 +1,118 @@
+#
+# 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/dsl/reboot_pending"
+require "chef/win32/registry"
+require "spec_helper"
+
+describe Chef::DSL::RebootPending, :windows_only do
+  def run_ohai
+    ohai = Ohai::System.new
+    # Would be nice to limit this to platform/kernel/arch etc for Ohai 7
+    ohai.all_plugins
+    node.consume_external_attrs(ohai.data,{})
+
+    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')
+  end
+
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let!(:ohai) { run_ohai } # Ensure we have necessary node data
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:recipe) { Chef::Recipe.new("a windows cookbook", "the windows recipe", run_context) }
+  let(:registry) { Chef::Win32::Registry.new(run_context) }
+
+  describe "reboot_pending?" do
+
+    context "when there is nothing to indicate a reboot is pending" do
+      it { expect(recipe.reboot_pending?).to be_false }
+    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', 
+            { :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?
+          registry.delete_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' })
+        end
+      end
+    end
+
+    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?
+        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?
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
+        end
+      end
+    end
+
+    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?
+        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?
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
+        end
+      end
+    end
+
+    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?
+        registry.create_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', true)
+        registry.set_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile',
+                    { :name => 'Flags', :type => :dword, :data => 3 })
+
+        expect(recipe.reboot_pending?).to be_true
+      end
+
+      after do
+        if registry_safe?
+          registry.delete_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', { :name => 'Flags' })
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', false)
+        end
+      end
+    end
+  end
+end

data/spec/functional/resource/base.rb

@@ -22,9 +22,7 @@ def ohai
   # provider is platform-dependent, we need platform ohai data:
   @OHAI_SYSTEM ||= begin
     ohai = Ohai::System.new
-    ohai.require_plugin("os")
-    ohai.require_plugin("platform")
-    ohai.require_plugin("passwd")
+    ohai.all_plugins("platform")
     ohai
   end
 end

data/spec/functional/resource/deploy_revision_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
 
   before(:all) do
     @ohai = Ohai::System.new
-    @ohai.require_plugin("os")
+    @ohai.all_plugins("os")
   end
 
   let(:node) do
@@ -78,6 +78,9 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
   # This is the third version
   let(:previous_rev) { "6d19a6dbecc8e37f5b2277345885c0c783eb8fb1" }
 
+  # This is the second version
+  let(:second_rev) { "0827e1b0e5043608ac0a824da5c558e252154ad0" }
+
   # This is the sixth version, it is on the "with-deploy-scripts" branch
   let(:rev_with_in_repo_callbacks) { "2404d015882659754bdb93ad6e4b4d3d02691a82" }
 
@@ -100,6 +103,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
 
   let(:basic_deploy_resource) do
     Chef::Resource::DeployRevision.new(deploy_directory, run_context).tap do |r|
+      r.name "deploy-revision-unit-test"
       r.repo git_bundle_repo
       r.symlink_before_migrate({})
       r.symlinks({})
@@ -127,6 +131,34 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
     end
   end
 
+  let(:deploy_to_previous_rev_again) do
+    basic_deploy_resource.dup.tap do |r|
+      r.revision(previous_rev)
+      r.restart_command shell_restart_command(:deploy_to_previous_rev_again)
+    end
+  end
+
+  let(:deploy_to_second_rev) do
+    basic_deploy_resource.dup.tap do |r|
+      r.revision(second_rev)
+      r.restart_command shell_restart_command(:deploy_to_second_rev)
+    end
+  end
+
+  let(:deploy_to_second_rev_again) do
+    basic_deploy_resource.dup.tap do |r|
+      r.revision(second_rev)
+      r.restart_command shell_restart_command(:deploy_to_second_rev_again)
+    end
+  end
+
+  let(:deploy_to_second_rev_again_again) do
+    basic_deploy_resource.dup.tap do |r|
+      r.revision(second_rev)
+      r.restart_command shell_restart_command(:deploy_to_second_rev_again_again)
+    end
+  end
+
   # Computes the full path for +path+ relative to the deploy directory
   def rel_path(path)
     File.expand_path(path, deploy_directory)
@@ -306,6 +338,165 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
       end
     end
 
+    describe "back to a previously deployed revision where resource rev == latest revision (explicit rollback)" do
+      before do
+        deploy_to_previous_rev.run_action(:deploy)
+        @previous_rev_all_releases = deploy_to_previous_rev.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev.run_action(:deploy)
+        @latest_rev_all_releases = deploy_to_latest_rev.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev_again.run_action(:rollback)
+        @previous_rev_again_all_releases = deploy_to_latest_rev_again.provider_for_action(:deploy).all_releases
+      end
+
+      the_app_is_deployed_at_revision(:previous_rev)
+
+      it "restarts the application after rolling back" do
+        actual_operations_order.should == %w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_latest_rev_again]
+      end
+
+      it "is marked updated" do
+        deploy_to_latest_rev_again.should be_updated_by_last_action
+      end
+
+      it "deploys the right code" do
+        IO.read(rel_path("current/app/app.rb")).should include("this is the third version of the app")
+      end
+
+      it "all_releases after first deploy should have one entry" do
+        @previous_rev_all_releases.length.should == 1
+      end
+
+      it "all_releases after second deploy should have two entries" do
+        @latest_rev_all_releases.length.should == 2
+      end
+
+      it "all_releases after rollback should have one entry" do
+        @previous_rev_again_all_releases.length.should == 1
+      end
+
+      it "all_releases after rollback should be the same as after the first deploy" do
+        @previous_rev_again_all_releases.should == @previous_rev_all_releases
+      end
+
+    end
+
+    describe "back to a previously deployed revision where resource rev == previous revision (explicit rollback)" do
+      before do
+        deploy_to_previous_rev.run_action(:deploy)
+        @previous_rev_all_releases = deploy_to_previous_rev.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev.run_action(:deploy)
+        @latest_rev_all_releases = deploy_to_latest_rev.provider_for_action(:deploy).all_releases
+        deploy_to_previous_rev_again.run_action(:rollback)
+        # FIXME: only difference with previous test is using latest_rev_again insetad of previous_rev_again
+        @previous_rev_again_all_releases = deploy_to_latest_rev_again.provider_for_action(:deploy).all_releases
+      end
+
+      the_app_is_deployed_at_revision(:previous_rev)
+
+      it "restarts the application after rolling back" do
+        actual_operations_order.should == %w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_previous_rev_again]
+      end
+
+      it "is marked updated" do
+        deploy_to_previous_rev_again.should be_updated_by_last_action
+      end
+
+      it "deploys the right code" do
+        IO.read(rel_path("current/app/app.rb")).should include("this is the third version of the app")
+      end
+
+      it "all_releases after first deploy should have one entry" do
+        @previous_rev_all_releases.length.should == 1
+      end
+
+      it "all_releases after second deploy should have two entries" do
+        @latest_rev_all_releases.length.should == 2
+      end
+
+      it "all_releases after rollback should have one entry" do
+        @previous_rev_again_all_releases.length.should == 1
+      end
+
+      it "all_releases after rollback should be the same as after the first deploy" do
+        @previous_rev_again_all_releases.should == @previous_rev_all_releases
+      end
+    end
+
+    describe "back to a previously deployed revision where resource rev == latest revision (explicit rollback)" do
+      before do
+        deploy_to_second_rev.run_action(:deploy)
+        @first_deploy_all_releases = deploy_to_second_rev.provider_for_action(:deploy).all_releases
+        deploy_to_previous_rev.run_action(:deploy)
+        @second_deploy_all_releases = deploy_to_previous_rev.provider_for_action(:deploy).all_releases
+        deploy_to_previous_rev_again.run_action(:rollback)
+        @third_deploy_all_releases = deploy_to_previous_rev_again.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev.run_action(:deploy)
+        @fourth_deploy_all_releases = deploy_to_latest_rev.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev_again.run_action(:rollback)
+        @fifth_deploy_all_releases = deploy_to_latest_rev_again.provider_for_action(:deploy).all_releases
+      end
+
+      the_app_is_deployed_at_revision(:second_rev)
+
+      it "restarts the application after rolling back" do
+        actual_operations_order.should == %w[deploy_to_second_rev deploy_to_previous_rev deploy_to_previous_rev_again deploy_to_latest_rev deploy_to_latest_rev_again]
+      end
+
+      it "is marked updated" do
+        deploy_to_latest_rev_again.should be_updated_by_last_action
+      end
+
+      it "deploys the right code" do
+        IO.read(rel_path("current/app/app.rb")).should include("this is the second version of the app")
+      end
+
+      it "all_releases after rollback should have one entry" do
+        @fifth_deploy_all_releases.length.should == 1
+      end
+
+      it "all_releases after rollback should be the same as after the first deploy" do
+        @fifth_deploy_all_releases.should == @first_deploy_all_releases
+      end
+    end
+
+    describe "back to a previously deployed revision where resource rev == latest revision (explicit rollback)" do
+      before do
+        deploy_to_second_rev.run_action(:deploy)
+        @first_deploy_all_releases = deploy_to_second_rev.provider_for_action(:deploy).all_releases
+        deploy_to_previous_rev.run_action(:deploy)
+        @second_deploy_all_releases = deploy_to_previous_rev.provider_for_action(:deploy).all_releases
+        deploy_to_second_rev_again.run_action(:rollback)
+        @third_deploy_all_releases = deploy_to_second_rev_again.provider_for_action(:deploy).all_releases
+        deploy_to_latest_rev.run_action(:deploy)
+        @fourth_deploy_all_releases = deploy_to_latest_rev.provider_for_action(:deploy).all_releases
+        deploy_to_second_rev_again_again.run_action(:rollback)
+        @fifth_deploy_all_releases = deploy_to_second_rev_again_again.provider_for_action(:deploy).all_releases
+      end
+
+      the_app_is_deployed_at_revision(:second_rev)
+
+      it "restarts the application after rolling back" do
+        actual_operations_order.should == %w[deploy_to_second_rev deploy_to_previous_rev deploy_to_second_rev_again deploy_to_latest_rev deploy_to_second_rev_again_again]
+      end
+
+      it "is marked updated" do
+        deploy_to_second_rev_again_again.should be_updated_by_last_action
+      end
+
+      it "deploys the right code" do
+        IO.read(rel_path("current/app/app.rb")).should include("this is the second version of the app")
+      end
+
+      it "all_releases after rollback should have one entry" do
+        @fifth_deploy_all_releases.length.should == 1
+      end
+
+      it "all_releases after rollback should be the same as after the first deploy" do
+        @fifth_deploy_all_releases.should == @first_deploy_all_releases
+      end
+
+    end
+
     # CHEF-3435
     describe "to a deploy_to path that does not yet exist" do