knife-windows 1.5.0 → 1.6.0

data/RELEASE_NOTES.md

@@ -6,29 +6,5 @@ Example Note:
 ## Example Heading
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
-# knife-windows 1.1.0 release notes:
-This release of knife-windows includes an important fix for an
-incompatibility issue with Chef Client 12.5 during bootstrap. If you
-are running knife-windows 1.0.0, please upgrade to this version. See
-the following issue for details: https://github.com/chef/knife-windows/pull/302
-
-You can install this version using the `gem` command:
-
-    gem install knife-windows
-
-## Reporting issues and contributing
-`knife-windows` issues like those addressed in this release should be reported in the ticketing system at https://github.com/chef/knife-windows/issues. You can learn more about how to contribute features and bug fixes to `knife-windows` in the [Chef Contributions document](http://docs.chef.io/community_contributions.html).
-
-## New features -- proxy support for WinRM
-The `winrm` and `bootstrap windows winrm` subcommands now honor the
-proxy server configured via the `http_proxy` setting in `knife.rb` for
-WinRM traffic.
-
-## Issues fixed in knife-windows 1.1.0
-See the [knife-windows 1.1.0 CHANGELOG](https://github.com/chef/knife-windows/blob/1.1.0/CHANGELOG.md)
-for the list of issues fixed in this release.
-
-## knife-windows on RubyGems and Github
-https://rubygems.org/gems/knife-windows
-https://github.com/chef/knife-windows
-
+# 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.

data/appveyor.yml

@@ -1,39 +1,39 @@
-version: "master-{build}"
-
-os: Windows Server 2012
-platform:
-  - x64
-
-environment:
-  bundle_gemfile: ci.gemfile
-
-  matrix:
-    - ruby_version: "20"
-      chef_version: "< 12"
-
-    - ruby_version: "21"
-      chef_version: "~> 12.0"
-
-    - ruby_version: "21"
-      chef_version: "master"
-
-clone_folder: c:\projects\knife-windows
-clone_depth: 1
-branches:
-  only:
-    - master
-
-install:
-  - winrm quickconfig -q
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - ruby --version
-  - gem --version
-  - gem install bundler -v 1.11.2 --quiet --no-ri --no-rdoc
-  - bundler --version
-
-build_script:
-  - bundle install || bundle install || bundle install
-
-test_script:
-  - bundle exec rake
+version: "master-{build}"
+
+os: Windows Server 2012
+platform:
+  - x64
+
+environment:
+  bundle_gemfile: ci.gemfile
+
+  matrix:
+    - ruby_version: "20"
+      chef_version: "< 12"
+
+    - ruby_version: "21"
+      chef_version: "~> 12.0"
+
+    - ruby_version: "21"
+      chef_version: "master"
+
+clone_folder: c:\projects\knife-windows
+clone_depth: 1
+branches:
+  only:
+    - master
+
+install:
+  - winrm quickconfig -q
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - echo %PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler -v 1.11.2 --quiet --no-ri --no-rdoc
+  - bundler --version
+
+build_script:
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - bundle exec rake

data/ci.gemfile

@@ -1,16 +1,16 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in knife-windows.gemspec
-gemspec
-
-if ENV['CHEF_VERSION'] == 'master'
-  gem 'chef', github: 'chef/chef'
-else
-  gem 'chef', ENV['CHEF_VERSION']
-end
-
-gem "rspec", '~> 3.0'
-gem "ruby-wmi"
-gem "httpclient"
-gem 'rake'
-gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in knife-windows.gemspec
+gemspec
+
+if ENV['CHEF_VERSION'] == 'master'
+  gem 'chef', github: 'chef/chef'
+else
+  gem 'chef', ENV['CHEF_VERSION']
+end
+
+gem "rspec", '~> 3.0'
+gem "ruby-wmi"
+gem "httpclient"
+gem 'rake'
+gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+

data/knife-windows.gemspec

@@ -1,25 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "knife-windows/version"
-
-Gem::Specification.new do |s|
-  s.name        = "knife-windows"
-  s.version     = Knife::Windows::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Seth Chisamore"]
-  s.email       = ["schisamo@chef.io"]
-  s.license     = "Apache-2.0"
-  s.homepage    = "https://github.com/chef/knife-windows"
-  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
-  s.description = s.summary
-
-  s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "winrm", "~> 1.7"
-
-  s.add_development_dependency 'pry'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "knife-windows/version"
+
+Gem::Specification.new do |s|
+  s.name        = "knife-windows"
+  s.version     = Knife::Windows::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seth Chisamore"]
+  s.email       = ["schisamo@chef.io"]
+  s.license     = "Apache-2.0"
+  s.homepage    = "https://github.com/chef/knife-windows"
+  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
+  s.description = s.summary
+
+  s.required_ruby_version	= ">= 1.9.1"
+  s.add_dependency "winrm-elevated", "~> 1.0"
+
+  s.add_development_dependency 'pry'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/chef/knife/bootstrap/windows-chef-client-msi.erb

@@ -1,233 +1,246 @@
-@rem
-@rem Author:: Seth Chisamore (<schisamo@chef.io>)
-@rem Copyright:: Copyright (c) 2011-2016 Chef Software, 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
-@set MACHINE_ARCH=<%= knife_config[:architecture] %>
-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@chef.io>)
+@rem Copyright:: Copyright (c) 2011-2016 Chef Software, 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
+<% if knife_config[:architecture] %>
+  @set MACHINE_ARCH=<%= knife_config[:architecture] %>
+
+  <% if knife_config[:architecture] == "x86_64" %>
+      IF "%PROCESSOR_ARCHITECTURE%"=="x86" IF not defined PROCESSOR_ARCHITEW6432 (
+      echo You specified bootstrap_architecture as x86_64 but the target machine is i386. A 64 bit program cannot run on a 32 bit machine. > "&2"
+      echo Exiting without bootstrapping. > "&2"
+      exit /b 1
+    )
+  <% end %>
+<% else %>
+  @set MACHINE_ARCH=x86_64
+  IF "%PROCESSOR_ARCHITECTURE%"=="x86" IF not defined PROCESSOR_ARCHITEW6432 @set MACHINE_ARCH=i686
+<% end %>
+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 -InputFormat None -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 %>
+