knife-windows 0.8.0.rc.0 → 0.8.0.rc.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODE4MTk3MDE3NGMxZTEyZWNkYjk5ODg1Y2Q2ZDg2YTNkNTQ5M2M1MA==
+    MzZkYmVmZGQwY2Y4ZWRjNDNhYjMwYTI3ZTEzYzMwYmRkYjQ0OWJiZQ==
   data.tar.gz: !binary |-
-    ZjFlZGMzMWZmZDNiZWVkOWQ5MTEzYTM1OTVmMjg0ZmRlZDlhZDgyZg==
+    ZjE5MzMwYWQ1ODNlMDNiMjRhMDMyZGU3YWJmNGZjZjg5MjQ0MDFkMw==
 SHA512:
   metadata.gz: !binary |-
-    ODRlYmEzMmQ2Y2QxZGU5M2I2MTdiNjAwMjg5NmNiZDdlOTY1MjBkNDExYjY0
-    OGRjODhhMmMzNDg1NTRhYjI3YTRmNDkzNTBmMTVlNWZiNTk2MDRkNTNiZjdh
-    Mjg0YTNhZDYwOGUwM2JlMTFjNTYzZDg4NmQ2OGIxNzkzMTgwZjI=
+    ZTdlOWZhZjliYjg0ZGQwZDk5N2NmOWUzMjE3ZTJiNTNjZGRhYTQwZDJiOGE3
+    ZTE4ZGRhZTU0ODJlNWM2YzNkOWZmNmFmMWMwOWJhMjEyYTcyYThjZGY3ZDQw
+    MzI2YzY4ZTNkZWY1OTA1ODQ0M2U1M2QxZTczMzQwZDc3YjRjM2Y=
   data.tar.gz: !binary |-
-    ZDIyNmIxNjk0ZTc0NTg0NmQ2ZGM3ZTY2MGFlY2UzM2VhNWM2NjZhNWM1MzNm
-    MjI3MDE4YWQ5ODYwN2QzYzExNTEzZmJiNmJjNzdhZTc0ZmI1ZTFmOTQ0NDQy
-    NGNjNTVlMjMwOWU4Mzk3NjI3MTIxMjM2MmQ3YjNmYzA3MjNiOTA=
+    NGU0MGRjNTE2YjFiMzMyMzRmOWVlNjM2ZTk3Nzg3NTYwYzhkNWNlMzQ3MWFl
+    Njc2MjdkYTUyNzhmMThkYTM0MjEyZDk2NmI1ODQ2ZWE5MjJkMWJhYmZjYjQ0
+    MGU0NzY0MzMzMWQ1NjhhYmUyOTMyNzljNGU5NDFmMWQ0MTcxNGE=

data/CHANGELOG.md

@@ -4,6 +4,8 @@
 None.
 
 ## Latest release: 0.8.0
+* [knife-windows #98](https://github.com/opscode/knife-windows/issues/96) Get winrm command exit code if it is not expected
+* [knife-windows #96](https://github.com/opscode/knife-windows/issues/96) Fix break from OS patch KB2918614
 * Update winrm-s dependency along with em-winrm and winrm dependencies
 * Return failure codes from knife winrm even when `returns` is not set
 * Support Windows negotiate authentication protocol when running knife on Windows

data/RELEASE_NOTES.md

@@ -11,8 +11,7 @@ This release of knife-windows enables the Windows negotiate protocol to be
 used with the `winrm` and `bootstrap windows winrm` subcommands and also
 contains bug fixes and dependency updates.
 
-A thank you goes to contributor **Josh Mahowald** for contributing a fix for
-[KNIFE-450](https://tickets.opscode.com/browse/KNIFE-450).
+A thank you goes to contributor **Josh Mahowald** for contributing a fix to return nonzero exit codes.
 
 Issues with `knife-windows` should be reported in the ticketing system at
 https://github.com/opscode/knife-windows/issues. Learn more about how you can
@@ -37,18 +36,9 @@ https://rubygems.org/gems/knife-windows
 https://github.com/opscode/knife-windows
 
 ## Issues fixed in knife-windows 0.8.0
-* [KNIFE-386](https://tickets.opscode.com/browse/KNIFE-386) Wait for a valid command response before bootstrapping over WinRM
-* [KNIFE-394](https://tickets.opscode.com/browse/KNIFE-394) Update em-winrm dependency
-* [KNIFE-450](https://tickets.opscode.com/browse/KNIFE-450) Set knife winrm command exit status on exception and command failure
+* [knife-windows #98](https://github.com/opscode/knife-windows/issues/96) Get winrm command exit code if it is not expected
+* [knife-windows #96](https://github.com/opscode/knife-windows/issues/96) Fix break from OS patch KB2918614
+* Update winrm-s dependency along with em-winrm and winrm dependencies
+* Return failure codes from knife winrm even when `returns` is not set
+* Support Windows negotiate authentication protocol when running knife on Windows
 
-## knife-windows breaking changes
-
-### Error status being returned from `winrm` and `bootstrap windows winrm` remote commands
-
-Previously, `knife winrm` would always return an exit status of 0 if it was able to
-execute a command on the remote node, regardless whether the command that it
-invoked on the remote node returned a status of 0. It now returns a non-zero
-exit code if the command's exit code was non-zero. This may cause failures in
-scripts that use the `knife winrm` or `knife bootstrap windows winrm` commands
-and check to see if the exit status of the command is successful (0). Such
-scripts should be altered to ignore the exit status if the failure is truly non-fatal.

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -149,7 +149,9 @@ WGET_PS
         end
 
         def install_chef
-          install_chef = 'msiexec /qn /log "%CHEF_CLIENT_MSI_LOG_PATH%" /i "%LOCAL_DESTINATION_MSI_PATH%"'
+          # The normal install command uses regular double quotes in
+          # the install command, so request such a string from install_command
+          install_chef = install_command('"') + "\n" + fallback_install_task_command
         end
 
         def bootstrap_directory
@@ -171,6 +173,54 @@ WGET_PS
         def escape_and_echo(file_contents)
           file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
         end
+
+        private
+
+        def install_command(executor_quote)
+          "msiexec /qn /log #{executor_quote}%CHEF_CLIENT_MSI_LOG_PATH%#{executor_quote} /i #{executor_quote}%LOCAL_DESTINATION_MSI_PATH%#{executor_quote}"
+        end
+
+        def fallback_install_task_command
+          # This command will be executed by schtasks.exe in the batch
+          # code below. To handle tasks that contain arguments that
+          # need to be double quoted, schtasks allows the use of single
+          # quotes that will later be converted to double quotes
+          command = install_command('\'')
+<<-EOH
+          @set MSIERRORCODE=!ERRORLEVEL!
+          @if ERRORLEVEL 1 (
+              @echo WARNING: Failed to install Chef Client MSI package in remote context with status code !MSIERRORCODE!.
+              @echo WARNING: This may be due to a defect in operating system update KB2918614: http://support.microsoft.com/kb/2918614
+              @set OLDLOGLOCATION="%CHEF_CLIENT_MSI_LOG_PATH%-fail.log"
+              @move "%CHEF_CLIENT_MSI_LOG_PATH%" "!OLDLOGLOCATION!" > NUL
+              @echo WARNING: Saving installation log of failure at !OLDLOGLOCATION!
+              @echo WARNING: Retrying installation with local context...
+              @schtasks /create /f  /sc once /st 00:00:00 /tn chefclientbootstraptask /ru SYSTEM /rl HIGHEST /tr \"cmd /c #{command} & sleep 2 & waitfor /s %computername% /si chefclientinstalldone\"
+
+              @if ERRORLEVEL 1 (
+                  @echo ERROR: Failed to create Chef Client installation scheduled task with status code !ERRORLEVEL! > "&2"
+              ) else (
+                  @echo Successfully created scheduled task to install Chef Client.
+                  @schtasks /run /tn chefclientbootstraptask
+                  @if ERRORLEVEL 1 (
+                      @echo ERROR: Failed to execut Chef Client installation scheduled task with status code !ERRORLEVEL!. > "&2"
+                  ) else (
+                      @echo Successfully started Chef Client installation scheduled task.
+                      @echo Waiting for installation to complete -- this may take a few minutes...
+                      waitfor chefclientinstalldone /t 600
+                      if ERRORLEVEL 1 (
+                          @echo ERROR: Timed out waiting for Chef Client package to install
+                      ) else (
+                          @echo Finished waiting for Chef Client package to install.
+                      )
+                      @schtasks /delete /f /tn chefclientbootstraptask > NUL
+                  )
+              )
+          ) else (
+              @echo Successfully installed Chef Client package.
+          )
+EOH
+        end
       end
     end
   end

data/lib/chef/knife/winrm.rb

@@ -253,8 +253,9 @@ class Chef
       def check_for_errors!(exit_codes)
 
         exit_codes.each do |host, value|
+		  Chef::Log.debug("Exit code found: #{value}")
           unless success_return_codes.include? value.to_i
-            @exit_code = 1
+            @exit_code = value.to_i
             ui.error "Failed to execute command on #{host} return code #{value}"
           end
         end

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "0.8.0.rc.0"
+    VERSION = "0.8.0.rc.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/unit/knife/winrm_spec.rb

@@ -97,6 +97,22 @@ describe Chef::Knife::Winrm do
           expect(exit_code).to be_zero
         end
 
+        it "should exit the process with exact exit status if the command fails and returns config is set to 0" do
+          command_status = 510
+          @winrm.config[:returns] = "0"
+          Chef::Config[:knife][:returns] = [0]
+          allow(@winrm).to receive(:winrm_command).and_return(command_status)
+          session_mock = EventMachine::WinRM::Session.new
+          allow(EventMachine::WinRM::Session).to receive(:new).and_return(session_mock)
+          allow(session_mock).to receive(:exit_codes).and_return({"thishost" => command_status})
+          begin
+            @winrm.run
+            expect(0).to eq(510)
+          rescue Exception => e
+            expect(e.status).to eq(command_status)
+          end
+        end
+
         it "should exit the process with non-zero status if the command fails and returns config is set to 0" do
           command_status = 1
           @winrm.config[:returns] = "0,53"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 0.8.0.rc.0
+  version: 0.8.0.rc.1
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm-s