RubyGems - knife-windows - Versions diffs - 1.7.1 → 1.8.0 - Mend

knife-windows 1.7.1 → 1.8.0

Files changed (12) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff18aaba317de91bc71008b46144501148d3fac
-  data.tar.gz: 302c01b43541e52fe51cd0a901a72fad2ab1cf67
+  metadata.gz: 8279bbe56fa21988d0b384236c8a1b49251c012a
+  data.tar.gz: 86cbdeec5397452f1390935e5c0b54a6af1d2755
 SHA512:
-  metadata.gz: ef05e49f3b5d76283dcdfc63edae41c2f9f4ecd4db162d07d597e2cd011475ef04dd03621f63a94f8ae8e05b13681d882d1059aabb4b6d0ae2468ae1faaf2530
-  data.tar.gz: 07470424dfd56d6f12c4a4a9e6ff11c4b777cdc0cf1a1ef5c4b781283208c9b0433d2189e73b632514f906f6140cd27e07e0f9119be01b07ec5e8f736de4ab4d
+  metadata.gz: 2da11a8fc34ac1ae4f610d0e1ca6fba2ebe71ab0a028aa0cb1d876eb1364ff46fb7c7c42c4fe1927b8f45b0d4c3083a82be7994bf6f4a9ffc4465b01e53b69c0
+  data.tar.gz: 39fa105069c0f3b16dcd28d666aaf4822e6f62151e505b8e4ece04202a1d8ffade932b1e8a80bfa0bebbccb89c0f91e8753663b215a9b3fc522ff18e10399b1c

data/CHANGELOG.md CHANGED

@@ -1,5 +1,9 @@
 # knife-windows Change Log
+## Release 1.8.0
+* [knife-windows #407](https://github.com/chef/knife-windows/pull/407) Added value for config_log_level and config_log_location
 ## Release 1.7.1
 * [knife-windows #409](https://github.com/chef/knife-windows/pull/409) Fix trusted_cert copy script generation on windows

data/RELEASE_NOTES.md CHANGED

@@ -6,5 +6,12 @@ Example Note:
 ## Example Heading
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
-# knife-windows 1.6.0 release notes:
-This release adds a `--winrm-shell` argument to `knife winrm`. This accepts one of three possible values: `cmd`, `powershell` or `elevated`. The default value is `cmd`. The `elevated` shell is similar to the `powershell` shell but runs the powershell command from a scheduled task.
+# knife-windows 1.8.0 release notes:
+This release allows user to specify `config_log_location` and `config_log_level` options in config.rb/knife.rb. This sets the default `log_location` and `log_level` in the `client.rb` file of the node being bootstrapped.
+This is how you can pass the values in config.rb/knife.rb:
+```
+chef_log_level  :debug
+chef_log_location "C:/chef.log"    #please make sure that the path exists
+```

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

@@ -17,12 +17,10 @@
 #
 require 'chef/knife/core/bootstrap_context'
 # Chef::Util::PathHelper in Chef 11 is a bit juvenile still
 require 'knife-windows/path_helper'
 # require 'chef/util/path_helper'
 class Chef
   class Knife
     module Core
@@ -70,23 +68,26 @@ class Chef
         def config_content
           client_rb = <<-CONFIG
-log_level        :info
-log_location     STDOUT
 chef_server_url  "#{@chef_config[:chef_server_url]}"
 validation_client_name "#{@chef_config[:validation_client_name]}"
 file_cache_path   "c:/chef/cache"
 file_backup_path  "c:/chef/backup"
 cache_options     ({:path => "c:/chef/cache/checksums", :skip_expires => true})
-CONFIG
+          CONFIG
           if @config[:chef_node_name]
             client_rb << %Q{node_name "#{@config[:chef_node_name]}"\n}
           else
             client_rb << "# Using default node name (fqdn)\n"
           end
+          if @chef_config[:config_log_level]
+            client_rb << %Q{log_level :#{@chef_config[:config_log_level]}\n}
+          else
+            client_rb << "log_level        :info\n"
+          end
+          client_rb << "log_location       #{get_log_location}"
           # We configure :verify_api_cert only when it's overridden on the CLI
           # or when specified in the knife config.
           if !@config[:node_verify_api_cert].nil? || knife_config.has_key?(:verify_api_cert)
@@ -149,6 +150,24 @@ CONFIG
           escape_and_echo(client_rb)
         end
+        def get_log_location
+          if @chef_config[:config_log_location].equal?(:win_evt)
+            %Q{:#{@chef_config[:config_log_location]}\n}
+          elsif @chef_config[:config_log_location].equal?(:syslog)
+            raise "syslog is not supported for log_location on Windows OS\n"
+          elsif (@chef_config[:config_log_location].equal?(STDOUT))
+            "STDOUT\n"
+          elsif (@chef_config[:config_log_location].equal?(STDERR))
+            "STDERR\n"
+          elsif @chef_config[:config_log_location].nil? || @chef_config[:config_log_location].empty?
+            "STDOUT\n"
+          elsif @chef_config[:config_log_location]
+            %Q{"#{@chef_config[:config_log_location]}"\n}
+          else
+            "STDOUT\n"
+          end
+        end
         def start_chef
           bootstrap_environment_option = bootstrap_environment.nil? ? '' : " -E #{bootstrap_environment}"
           start_chef = "SET \"PATH=%PATH%;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\"\n"
@@ -375,4 +394,4 @@ EOH
       end
     end
   end
-end
+end

data/lib/knife-windows/version.rb CHANGED

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

data/spec/assets/win_template_rendered_with_bootstrap_install_command.txt CHANGED

@@ -199,17 +199,14 @@ echo Validation key written.
 > C:\chef\client.rb (
- echo.log_level        :info
-echo.log_location     STDOUT
-echo.
-echo.chef_server_url  "https://localhost:443"
+ echo.chef_server_url  "https://localhost:443"
 echo.validation_client_name "chef-validator"
-echo.
 echo.file_cache_path   "c:/chef/cache"
 echo.file_backup_path  "c:/chef/backup"
 echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.
 echo.# Using default node name ^(fqdn^)
+echo.log_level        :info
+echo.log_location       STDOUT
 )

data/spec/assets/win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt CHANGED

@@ -199,17 +199,14 @@ echo Validation key written.
 > C:\chef\client.rb (
- echo.log_level        :info
-echo.log_location     STDOUT
-echo.
-echo.chef_server_url  "https://localhost:443"
+ echo.chef_server_url  "https://localhost:443"
 echo.validation_client_name "chef-validator"
-echo.
 echo.file_cache_path   "c:/chef/cache"
 echo.file_backup_path  "c:/chef/backup"
 echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.
 echo.# Using default node name ^(fqdn^)
+echo.log_level        :info
+echo.log_location       STDOUT
 )

data/spec/assets/win_template_rendered_without_bootstrap_install_command.txt CHANGED

@@ -311,17 +311,14 @@ echo Validation key written.
 > C:\chef\client.rb (
- echo.log_level        :info
-echo.log_location     STDOUT
-echo.
-echo.chef_server_url  "https://localhost:443"
+ echo.chef_server_url  "https://localhost:443"
 echo.validation_client_name "chef-validator"
-echo.
 echo.file_cache_path   "c:/chef/cache"
 echo.file_backup_path  "c:/chef/backup"
 echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.
 echo.# Using default node name ^(fqdn^)
+echo.log_level        :info
+echo.log_location       STDOUT
 )

data/spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt CHANGED

@@ -311,17 +311,14 @@ echo Validation key written.
 > C:\chef\client.rb (
- echo.log_level        :info
-echo.log_location     STDOUT
-echo.
-echo.chef_server_url  "https://localhost:443"
+ echo.chef_server_url  "https://localhost:443"
 echo.validation_client_name "chef-validator"
-echo.
 echo.file_cache_path   "c:/chef/cache"
 echo.file_backup_path  "c:/chef/backup"
 echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.
 echo.# Using default node name ^(fqdn^)
+echo.log_level        :info
+echo.log_location       STDOUT
 )

data/spec/assets/win_template_unrendered.txt CHANGED

@@ -1,246 +1,246 @@
-@rem
-@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
-@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
-@rem License:: Apache License, Version 2.0
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
-@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
-@rem the line is read. See help for the /E switch from cmd.exe /? .
-@setlocal ENABLEDELAYEDEXPANSION
-<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
-@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
-@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
-@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
-    @echo Existing directory not found, creating.
-    @mkdir %BOOTSTRAP_DIRECTORY%
-) else (
-    @echo Existing directory found, skipping creation.
-)
-> <%= bootstrap_directory %>\wget.vbs (
- <%= win_wget %>
-)
-> <%= bootstrap_directory %>\wget.ps1 (
- <%= win_wget_ps %>
-)
-@rem Determine the version and the architecture
-@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
-@set WinMajor=%%D
-@set WinMinor=%%E
-@set WinBuild=%%F
-)
-@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
-@set LATEST_OS_VERSION_MAJOR=6
-@set LATEST_OS_VERSION_MINOR=3
-@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
-@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
-  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
-)
-goto Version%WinMajor%.%WinMinor%
-:VersionUnknown
-@rem If this is an unknown version of windows set the default
-@set MACHINE_OS=2008r2
-@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
-goto architecture_select
-:Version6.0
-@set MACHINE_OS=2008
-goto architecture_select
-:Version5.2
-@set MACHINE_OS=2003r2
-goto architecture_select
-:Version6.1
-@set MACHINE_OS=2008r2
-goto architecture_select
-:Version6.2
-@set MACHINE_OS=2012
-goto architecture_select
-@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
-:Version6.3
-goto Version6.2
-:architecture_select
-goto Architecture%PROCESSOR_ARCHITEW6432%
-:Architecture
-goto Architecture%PROCESSOR_ARCHITECTURE%
-@rem If this is an unknown architecture set the default
-@set MACHINE_ARCH=i686
-goto install
-:Architecturex86
-@set MACHINE_ARCH=i686
-goto install
-:Architectureamd64
-@set MACHINE_ARCH=x86_64
-goto install
-:install
-@rem If user has provided the custom installation command for chef-client then execute it
-<% if @chef_config[:knife][:bootstrap_install_command] %>
-  <%= @chef_config[:knife][:bootstrap_install_command] %>
-<% else %>
-  @rem Install Chef using chef-client MSI installer
-  @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
-  @set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
-  @rem Clear any pre-existing downloads
-  @echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
-  @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-      @echo Found existing downloaded package, deleting.
-      @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-      @if ERRORLEVEL 1 (
-          echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
-      )
-  ) else (
-      echo No existing downloaded packages to delete.
-    )
-  @rem If there is somehow a name collision, remove pre-existing log
-  @if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
-  @echo Attempting to download client package using PowerShell if available...
-  @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%', 'PowerShell') %>"
-  @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%" "%LOCAL_DESTINATION_MSI_PATH%"
-  @echo !powershell_download!
-  @call !powershell_download!
-  @set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
-  @if ERRORLEVEL 1 (
-      @echo Failed PowerShell download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
-      @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
-  ) else (
-      @rem Sometimes the error level is not set even when the download failed,
-      @rem so check for the file to be sure it is there -- if it is not, we will retry
-      @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-          echo Failed download: download completed, but downloaded file not found > "&2"
-          set DOWNLOAD_ERROR_STATUS=2
-      ) else (
-          echo Download via PowerShell succeeded.
-        )
-    )
-  @if NOT %DOWNLOAD_ERROR_STATUS%==0 (
-      @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
-      @echo Warning: Retrying download with cscript ...
-      @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-      @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%') %>"
-      cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
-      @if NOT ERRORLEVEL 1 (
-          @rem Sometimes the error level is not set even when the download failed,
-          @rem so check for the file to be sure it is there.
-          @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-              echo Failed download: download completed, but downloaded file not found > "&2"
-              echo Exiting without bootstrapping due to download failure. > "&2"
-              exit /b 1
-          ) else (
-              echo Download via cscript succeeded.
-            )
-      ) else (
-          echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
-          echo Exiting without bootstrapping due to download failure. > "&2"
-          exit /b 1
-        )
-  )
-  @echo Installing downloaded client package...
-  <%= install_chef %>
-  @if ERRORLEVEL 1 (
-      echo Chef-client package failed to install with status code !ERRORLEVEL!. > "&2"
-      echo See installation log for additional detail: %CHEF_CLIENT_MSI_LOG_PATH%. > "&2"
-  ) else (
-      @echo Installation completed successfully
-      del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
-    )
-<% end %>
-@endlocal
-@echo off
-<% if client_pem -%>
-> <%= bootstrap_directory %>\client.pem (
- <%= escape_and_echo(::File.read(::File.expand_path(client_pem))) %>
-)
-<% end -%>
-echo Writing validation key...
-<% if validation_key -%>
-> <%= bootstrap_directory %>\validation.pem (
- <%= escape_and_echo(validation_key) %>
-)
-<% end -%>
-echo Validation key written.
-@echo on
-<% if @config[:secret] -%>
-> <%= bootstrap_directory %>\encrypted_data_bag_secret (
- <%= secret %>
-)
-<% end -%>
-<% unless trusted_certs_script.empty? -%>
-mkdir <%= bootstrap_directory %>\trusted_certs
-<%= trusted_certs_script %>
-<% end -%>
-<%# Generate Ohai Hints -%>
-<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
-mkdir <%= bootstrap_directory %>\ohai\hints
-<% @chef_config[:knife][:hints].each do |name, hash| -%>
-> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
-  <%= escape_and_echo(hash.to_json) %>
-)
-<% end -%>
-<% end -%>
-> <%= bootstrap_directory %>\client.rb (
- <%= config_content %>
-)
-> <%= bootstrap_directory %>\first-boot.json (
- <%= first_boot %>
-)
-@echo Starting chef to bootstrap the node...
-<%= start_chef %>
+@rem
+@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
+@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+@rem License:: Apache License, Version 2.0
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
+@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
+@rem the line is read. See help for the /E switch from cmd.exe /? .
+@setlocal ENABLEDELAYEDEXPANSION
+<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
+@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
+@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
+@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
+    @echo Existing directory not found, creating.
+    @mkdir %BOOTSTRAP_DIRECTORY%
+) else (
+    @echo Existing directory found, skipping creation.
+)
+> <%= bootstrap_directory %>\wget.vbs (
+ <%= win_wget %>
+)
+> <%= bootstrap_directory %>\wget.ps1 (
+ <%= win_wget_ps %>
+)
+@rem Determine the version and the architecture
+@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
+@set WinMajor=%%D
+@set WinMinor=%%E
+@set WinBuild=%%F
+)
+@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
+@set LATEST_OS_VERSION_MAJOR=6
+@set LATEST_OS_VERSION_MINOR=3
+@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
+@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
+  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
+)
+goto Version%WinMajor%.%WinMinor%
+:VersionUnknown
+@rem If this is an unknown version of windows set the default
+@set MACHINE_OS=2008r2
+@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
+goto architecture_select
+:Version6.0
+@set MACHINE_OS=2008
+goto architecture_select
+:Version5.2
+@set MACHINE_OS=2003r2
+goto architecture_select
+:Version6.1
+@set MACHINE_OS=2008r2
+goto architecture_select
+:Version6.2
+@set MACHINE_OS=2012
+goto architecture_select
+@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
+:Version6.3
+goto Version6.2
+:architecture_select
+goto Architecture%PROCESSOR_ARCHITEW6432%
+:Architecture
+goto Architecture%PROCESSOR_ARCHITECTURE%
+@rem If this is an unknown architecture set the default
+@set MACHINE_ARCH=i686
+goto install
+:Architecturex86
+@set MACHINE_ARCH=i686
+goto install
+:Architectureamd64
+@set MACHINE_ARCH=x86_64
+goto install
+:install
+@rem If user has provided the custom installation command for chef-client then execute it
+<% if @chef_config[:knife][:bootstrap_install_command] %>
+  <%= @chef_config[:knife][:bootstrap_install_command] %>
+<% else %>
+  @rem Install Chef using chef-client MSI installer
+  @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+  @set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
+  @rem Clear any pre-existing downloads
+  @echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
+  @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+      @echo Found existing downloaded package, deleting.
+      @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+      @if ERRORLEVEL 1 (
+          echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
+      )
+  ) else (
+      echo No existing downloaded packages to delete.
+    )
+  @rem If there is somehow a name collision, remove pre-existing log
+  @if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+  @echo Attempting to download client package using PowerShell if available...
+  @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%', 'PowerShell') %>"
+  @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%" "%LOCAL_DESTINATION_MSI_PATH%"
+  @echo !powershell_download!
+  @call !powershell_download!
+  @set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
+  @if ERRORLEVEL 1 (
+      @echo Failed PowerShell download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
+      @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
+  ) else (
+      @rem Sometimes the error level is not set even when the download failed,
+      @rem so check for the file to be sure it is there -- if it is not, we will retry
+      @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+          echo Failed download: download completed, but downloaded file not found > "&2"
+          set DOWNLOAD_ERROR_STATUS=2
+      ) else (
+          echo Download via PowerShell succeeded.
+        )
+    )
+  @if NOT %DOWNLOAD_ERROR_STATUS%==0 (
+      @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
+      @echo Warning: Retrying download with cscript ...
+      @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+      @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%') %>"
+      cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
+      @if NOT ERRORLEVEL 1 (
+          @rem Sometimes the error level is not set even when the download failed,
+          @rem so check for the file to be sure it is there.
+          @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+              echo Failed download: download completed, but downloaded file not found > "&2"
+              echo Exiting without bootstrapping due to download failure. > "&2"
+              exit /b 1
+          ) else (
+              echo Download via cscript succeeded.
+            )
+      ) else (
+          echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
+          echo Exiting without bootstrapping due to download failure. > "&2"
+          exit /b 1
+        )
+  )
+  @echo Installing downloaded client package...
+  <%= install_chef %>
+  @if ERRORLEVEL 1 (
+      echo Chef-client package failed to install with status code !ERRORLEVEL!. > "&2"
+      echo See installation log for additional detail: %CHEF_CLIENT_MSI_LOG_PATH%. > "&2"
+  ) else (
+      @echo Installation completed successfully
+      del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+    )
+<% end %>
+@endlocal
+@echo off
+<% if client_pem -%>
+> <%= bootstrap_directory %>\client.pem (
+ <%= escape_and_echo(::File.read(::File.expand_path(client_pem))) %>
+)
+<% end -%>
+echo Writing validation key...
+<% if validation_key -%>
+> <%= bootstrap_directory %>\validation.pem (
+ <%= escape_and_echo(validation_key) %>
+)
+<% end -%>
+echo Validation key written.
+@echo on
+<% if @config[:secret] -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= secret %>
+)
+<% end -%>
+<% unless trusted_certs_script.empty? -%>
+mkdir <%= bootstrap_directory %>\trusted_certs
+<%= trusted_certs_script %>
+<% end -%>
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir <%= bootstrap_directory %>\ohai\hints
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
+  <%= escape_and_echo(hash.to_json) %>
+)
+<% end -%>
+<% end -%>
+> <%= bootstrap_directory %>\client.rb (
+ <%= config_content %>
+)
+> <%= bootstrap_directory %>\first-boot.json (
+ <%= first_boot %>
+)
+@echo Starting chef to bootstrap the node...
+<%= start_chef %>

data/spec/unit/knife/core/windows_bootstrap_context_spec.rb CHANGED

@@ -17,7 +17,7 @@
 #
 require 'spec_helper'
+require 'chef/knife/core/windows_bootstrap_context'
 describe Chef::Knife::Core::WindowsBootstrapContext do
   let(:mock_bootstrap_context) { Chef::Knife::Core::WindowsBootstrapContext.new({ }, nil, { :knife => {} }) }
@@ -99,6 +99,86 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
     end
   end
+  describe "#get_log_location" do
+    context "when config_log_location value is nil" do
+      it "sets STDOUT in client.rb as default" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => nil))
+        expect(mock_bootstrap_context.get_log_location).to eq("STDOUT\n")
+      end
+    end
+    context "when config_log_location value is empty" do
+      it "sets STDOUT in client.rb as default" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => ""))
+        expect(mock_bootstrap_context.get_log_location).to eq("STDOUT\n")
+      end
+    end
+    context "when config_log_location value is STDOUT" do
+      it "sets STDOUT in client.rb" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => STDOUT))
+        expect(mock_bootstrap_context.get_log_location).to eq("STDOUT\n")
+      end
+    end
+    context "when config_log_location value is STDERR" do
+      it "sets STDERR in client.rb" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => STDERR))
+        expect(mock_bootstrap_context.get_log_location).to eq("STDERR\n")
+      end
+    end
+    context "when config_log_location value is path to a file" do
+      it "sets file path in client.rb" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => "C:\\chef\\chef.log"))
+        expect(mock_bootstrap_context.get_log_location).to eq("\"C:\\chef\\chef.log\"\n")
+      end
+    end
+    context "when config_log_location value is :win_evt" do
+      it "sets :win_evt in client.rb" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => :win_evt))
+        expect(mock_bootstrap_context.get_log_location).to eq(":win_evt\n")
+      end
+    end
+    context "when config_log_location value is :syslog" do
+      it "raise error with message and exit" do
+        mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_location => :syslog))
+        expect { mock_bootstrap_context.get_log_location }.to raise_error("syslog is not supported for log_location on Windows OS\n")
+      end
+    end
+  end
+  describe "#config_content" do
+    before do
+      mock_bootstrap_context.instance_variable_set(:@chef_config, Mash.new(:config_log_level => :info,
+        :config_log_location => STDOUT,
+        :chef_server_url => "http://chef.example.com:4444",
+        :validation_client_name => "chef-validator-testing",
+        :file_cache_path => "c:/chef/cache",
+        :file_backup_path => "c:/chef/backup",
+        :cache_options => ({:path => "c:/chef/cache/checksums", :skip_expires => true})
+        ))
+    end
+    it "generates the config file data" do
+      expected = <<-EXPECTED
+echo.chef_server_url  "http://chef.example.com:4444"
+echo.validation_client_name "chef-validator-testing"
+echo.file_cache_path   "c:/chef/cache"
+echo.file_backup_path  "c:/chef/backup"
+echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
+echo.# Using default node name ^(fqdn^)
+echo.log_level :info
+echo.log_location       STDOUT
+EXPECTED
+    expect(mock_bootstrap_context.config_content).to eq expected
+    end
+  end
   describe "latest_current_windows_chef_version_query" do
     it "returns the major version of the current version of Chef" do
       stub_const("Chef::VERSION", '11.1.2')
@@ -209,5 +289,4 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
       end
     end
   end
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm