knife-windows 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0ea6d3de6e78dd7f1b5932832ff40ccbb52b388
-  data.tar.gz: e28fe266074c3211a176dc514a738793659d3fba
+SHA256:
+  metadata.gz: 52d0760c6f7d545c38caddf396afcc46e6eb139a83c6bc08c4176971234b3a25
+  data.tar.gz: 10864d611e1fbc3f2aff60b25d16557582069bad004a2c7c3885346f6486d642
 SHA512:
-  metadata.gz: 76defbe2bddc13699e5b6533ceefb6e582c93c1212121fd255cdc2e849e23e39d1e09a69fe599f048eb99abd91189e8dd834c6eaae26fe27267da4ffcec611c8
-  data.tar.gz: e32d36a4b61e82e226dc6d002c084fa304f02a26d6cf56aba1c2c54b9c0372e1a83e01cd59cc7b164e8bcd482c10aee486769c8a26726f552a7af745b565aa8b
+  metadata.gz: 953c7ad5d2d9bf66b79385cf6d2dae322704a5fae7dba12f502dca1b71fbfef7648e5a0b8a6558b3ca2507456c16f18b164147f47fcb114c3d7d051109cc1d6b
+  data.tar.gz: e6e50af2ca602f30130701984c19d365531c5aacfa24232ad606300c678fc1a279eafa5987416dda186788ac2a489ff0a666dcc0f59719bb057331283946b6c5

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+cache: bundler
+dist: trusty
+sudo: false
 
 rvm:
-  - 2.1
-  - 2.3
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
 
 before_install:
   - gem install bundler
@@ -11,14 +15,14 @@ gemfile: ci.gemfile
 
 env:
   - CHEF_VERSION="master"
-  - CHEF_VERSION="~> 12.0"
+  - CHEF_VERSION="~> 13.0"
 
 matrix:
   exclude:
-  - rvm: 2.1
+  - rvm: 2.3.4
     env: CHEF_VERSION="master"
-  - rvm: 2.1
-    env: CHEF_VERSION="~> 12.0"
+  allow_failures:
+    - rvm: ruby-head
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # knife-windows Change Log
 
+## Release 1.9.1 (2018-03-07)
+
+* [knife-windows #444](https://github.com/chef/knife-windows/pull/444) Fixes issue when bootstrapping windows systems failing with the message: The input line is too long.
+
 ## Release 1.9.0
 
 * [knife-windows #416](https://github.com/chef/knife-windows/pull/416) Add concurrency support via the `--concurrency` flag

data/appveyor.yml

@@ -8,10 +8,10 @@ environment:
   bundle_gemfile: ci.gemfile
 
   matrix:
-    - ruby_version: "23"
-      chef_version: "~> 12.0"
+    - ruby_version: "24"
+      chef_version: "~> 13.0"
 
-    - ruby_version: "23"
+    - ruby_version: "24"
       chef_version: "master"
 
 clone_folder: c:\projects\knife-windows

data/ci.gemfile

@@ -5,6 +5,7 @@ gemspec
 
 if ENV['CHEF_VERSION'] == 'master'
   gem 'chef', github: 'chef/chef'
+  gem 'ohai', github: 'chef/ohai'
 else
   gem 'chef', ENV['CHEF_VERSION']
 end
@@ -13,4 +14,3 @@ 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

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

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

@@ -170,7 +170,7 @@ CONFIG
 
         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"
+          start_chef = "SET \"PATH=%SystemRoot%\\system32;%SystemRoot%;%SystemRoot%\\System32\\Wbem;%SYSTEMROOT%\\System32\\WindowsPowerShell\\v1.0\\;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\"\n"
           start_chef << "chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json#{bootstrap_environment_option}\n"
         end
 
@@ -394,4 +394,4 @@ EOH
       end
     end
   end
-end
+end

data/lib/knife-windows/version.rb

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

data/spec/assets/win_template_rendered_with_bootstrap_install_command.txt

@@ -215,6 +215,6 @@ echo.log_location       STDOUT
 ) 
 
 @echo Starting chef to bootstrap the node... 
-SET "PATH=%PATH%;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
+SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
 chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json
  

data/spec/assets/win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt

@@ -215,6 +215,6 @@ echo.log_location       STDOUT
 ) 
 
 @echo Starting chef to bootstrap the node... 
-SET "PATH=%PATH%;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
+SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
 chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json
  

data/spec/assets/win_template_rendered_without_bootstrap_install_command.txt

@@ -327,6 +327,6 @@ echo.log_location       STDOUT
 ) 
 
 @echo Starting chef to bootstrap the node... 
-SET "PATH=%PATH%;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
+SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
 chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json
  

data/spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt

@@ -327,6 +327,6 @@ echo.log_location       STDOUT
 ) 
 
 @echo Starting chef to bootstrap the node... 
-SET "PATH=%PATH%;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
+SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
 chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json
  

data/spec/assets/win_template_rendered_without_bootstrap_install_command_on_13_client.txt

@@ -0,0 +1,332 @@
+@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 
+
+ 
+
+@set BOOTSTRAP_DIRECTORY=C:\chef 
+@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. 
+) 
+
+> C:\chef\wget.vbs ( 
+ echo.url = WScript.Arguments.Named^("url"^)
+echo.path = WScript.Arguments.Named^("path"^)
+echo.proxy = null
+echo.'* Vaguely attempt to handle file:// scheme urls by url unescaping and switching all
+echo.'* / into .  Also assume that file:/// is a local absolute path and that file://^<foo^>
+echo.'* is possibly a network file path.
+echo.If InStr^(url, "file://"^) = 1 Then
+echo.url = Unescape^(url^)
+echo.If InStr^(url, "file:///"^) = 1 Then
+echo.sourcePath = Mid^(url, Len^("file:///"^) + 1^)
+echo.Else
+echo.sourcePath = Mid^(url, Len^("file:"^) + 1^)
+echo.End If
+echo.sourcePath = Replace^(sourcePath, "/", "\"^)
+echo.
+echo.Set objFSO = CreateObject^("Scripting.FileSystemObject"^)
+echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
+echo.objFSO.CopyFile sourcePath, path, true
+echo.Set objFSO = Nothing
+echo.
+echo.Else
+echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP"^)
+echo.Set wshShell = CreateObject^( "WScript.Shell" ^)
+echo.Set objUserVariables = wshShell.Environment^("USER"^)
+echo.
+echo.rem http proxy is optional
+echo.rem attempt to read from HTTP_PROXY env var first
+echo.On Error Resume Next
+echo.
+echo.If NOT ^(objUserVariables^("HTTP_PROXY"^) = ""^) Then
+echo.proxy = objUserVariables^("HTTP_PROXY"^)
+echo.
+echo.rem fall back to named arg
+echo.ElseIf NOT ^(WScript.Arguments.Named^("proxy"^) = ""^) Then
+echo.proxy = WScript.Arguments.Named^("proxy"^)
+echo.End If
+echo.
+echo.If NOT isNull^(proxy^) Then
+echo.rem setProxy method is only available on ServerXMLHTTP 6.0+
+echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP.6.0"^)
+echo.objXMLHTTP.setProxy 2, proxy
+echo.End If
+echo.
+echo.On Error Goto 0
+echo.
+echo.objXMLHTTP.open "GET", url, false
+echo.objXMLHTTP.send^(^)
+echo.If objXMLHTTP.Status = 200 Then
+echo.Set objADOStream = CreateObject^("ADODB.Stream"^)
+echo.objADOStream.Open
+echo.objADOStream.Type = 1
+echo.objADOStream.Write objXMLHTTP.ResponseBody
+echo.objADOStream.Position = 0
+echo.Set objFSO = Createobject^("Scripting.FileSystemObject"^)
+echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
+echo.Set objFSO = Nothing
+echo.objADOStream.SaveToFile path
+echo.objADOStream.Close
+echo.Set objADOStream = Nothing
+echo.End If
+echo.Set objXMLHTTP = Nothing
+echo.End If
+ 
+) 
+
+> C:\chef\wget.ps1 ( 
+ echo.param^(
+echo.   [String] $remoteUrl,
+echo.   [String] $localPath
+echo.^)
+echo.
+echo.$ProxyUrl = $env:http_proxy;
+echo.$webClient = new-object System.Net.WebClient;
+echo.
+echo.if ^($ProxyUrl -ne ''^) {
+echo.  $WebProxy = New-Object System.Net.WebProxy^($ProxyUrl,$true^)
+echo.  $WebClient.Proxy = $WebProxy
+echo.}
+echo.
+echo.$webClient.DownloadFile^($remoteUrl, $localPath^);
+ 
+) 
+
+@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 
+  @rem Install Chef using chef-client MSI installer 
+
+  @set "LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi" 
+  @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=https://www.chef.io/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%&DownloadContext=PowerShell&v=13" 
+  @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  C:\chef\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=https://www.chef.io/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%&v=13" 
+      cscript /nologo C:\chef\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... 
+
+  msiexec /qn /log "%CHEF_CLIENT_MSI_LOG_PATH%" /i "%LOCAL_DESTINATION_MSI_PATH%"
+          @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 msiexec /qn /log '%CHEF_CLIENT_MSI_LOG_PATH%' /i '%LOCAL_DESTINATION_MSI_PATH%' & 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.
+          )
+ 
+
+  @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%" 
+    ) 
+
+
+@endlocal 
+
+@echo off 
+
+
+echo Writing validation key... 
+
+
+echo Validation key written. 
+@echo on 
+
+
+
+
+> C:\chef\client.rb ( 
+ echo.chef_server_url  "https://localhost:443"
+echo.validation_client_name "chef-validator"
+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
+ 
+) 
+
+> C:\chef\first-boot.json ( 
+ echo.{"run_list":null} 
+) 
+
+@echo Starting chef to bootstrap the node... 
+SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
+chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json
+ 

data/spec/functional/bootstrap_download_spec.rb

@@ -126,12 +126,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     clean_test_case
 
     winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
-
-    if chef_gte_12?
-      winrm_bootstrapper.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
-    elsif chef_lt_12?
-      allow(File).to receive(:exist?).with(File.expand_path(Chef::Config[:validation_key])).and_return(true)
-    end
+    winrm_bootstrapper.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
 
     allow(WinRM::Connection).to receive(:new).and_return(Dummy::Connection.new)
     allow(winrm_bootstrapper).to receive(:wait_for_remote_response)
@@ -151,7 +146,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
   end
 end
 
-describe "bootstrap_install_command functionality through WinRM protocol", :if_chef_11 => true do
+describe "bootstrap_install_command functionality through WinRM protocol" do
   context "bootstrap_install_command option is not specified" do
     let(:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new([]) }
     before do
@@ -164,13 +159,21 @@ describe "bootstrap_install_command functionality through WinRM protocol", :if_c
         @template_output)
     end
 
-    context "when running chef-client 12.5.0 or greater", :chef_gte_12_5_only => true do
+    context "when running chef-client ~12.5", :chef_gte_12_5_only => true, :chef_lt_13_only => true do
       let(:template_12_5_output) { sample_data('win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt') }
       it "bootstrap_install_command option is not rendered in the windows-chef-client-msi.erb template as its value is nil"  do
         expect(bootstrap.send(:render_template,@template_input)).to eq(
                                                                       template_12_5_output)
       end
     end
+
+    context "when running chef-client 13.0 or greater", :chef_gte_13_only => true, :chef_lt_14_only => true do
+      let(:template_13_output) { sample_data('win_template_rendered_without_bootstrap_install_command_on_13_client.txt') }
+      it "bootstrap_install_command option is not rendered in the windows-chef-client-msi.erb template as its value is nil"  do
+        expect(bootstrap.send(:render_template,@template_input)).to eq(
+                                                                      template_13_output)
+      end
+    end
   end
 
   context "bootstrap_install_command option is specified" do
@@ -186,7 +189,7 @@ describe "bootstrap_install_command functionality through WinRM protocol", :if_c
         @template_output)
     end
 
-    context "when running chef-client 12.5.0 or greater", :chef_gte_12_5_only => true do
+    context "when running chef-client 12.5.0 or greater", :chef_gte_12_5_only => true, :chef_lt_14_only => true  do
       let(:template_12_5_output) { sample_data('win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt') }
       it "bootstrap_install_command option is rendered in the windows-chef-client-msi.erb template" do
         expect(bootstrap.send(:render_template,@template_input)).to eq(
@@ -201,7 +204,7 @@ describe "bootstrap_install_command functionality through WinRM protocol", :if_c
   end
 end
 
-describe "bootstrap_install_command functionality through SSH protocol", :if_chef_11 => true, :chef_lt_12_5_only => true do
+describe "bootstrap_install_command functionality through SSH protocol", :chef_lt_12_5_only => true do
   context "bootstrap_install_command option is not specified" do
     let(:bootstrap) { Chef::Knife::BootstrapWindowsSsh.new([]) }
     before do

data/spec/spec_helper.rb

@@ -55,24 +55,32 @@ def windows2012?
   is_win2k12
 end
 
-def chef_gte_12?
-  Chef::VERSION.split('.').first.to_i >= 12
+def chef_lt_12_5?
+  Gem::Version.new(Chef::VERSION) < Gem::Version.new('12.5')
 end
 
 def chef_gte_12_5?
-  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.5
+  Gem::Version.new(Chef::VERSION) >= Gem::Version.new('12.5')
 end
 
-def chef_gte_12_6?
-  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.6
+def chef_gte_12_7?
+  Gem::Version.new(Chef::VERSION) >= Gem::Version.new('12.7')
 end
 
-def chef_lt_12?
-  Chef::VERSION.split('.').first.to_i < 12
+def chef_gte_13?
+  Gem::Version.new(Chef::VERSION) >= Gem::Version.new('13')
 end
 
-def chef_eq_11?
-  Chef::VERSION.split('.').first.to_i == 11
+def chef_lt_13?
+  Gem::Version.new(Chef::VERSION) < Gem::Version.new('13')
+end
+
+def chef_lt_14?
+  Gem::Version.new(Chef::VERSION) < Gem::Version.new('14')
+end
+
+def chef_gte_14?
+  Gem::Version.new(Chef::VERSION) >= Gem::Version.new('14')
 end
 
 def sample_data(file_name)
@@ -85,10 +93,11 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.filter_run_excluding :windows_only => true unless windows?
   config.filter_run_excluding :windows_2012_only => true unless windows2012?
-  config.filter_run_excluding :chef_gte_12_only => true unless chef_gte_12?
   config.filter_run_excluding :chef_gte_12_5_only => true unless chef_gte_12_5?
-  config.filter_run_excluding :chef_gte_12_6_only => true unless chef_gte_12_6?
-  config.filter_run_excluding :chef_lt_12_5_only => true if chef_gte_12_5?
-  config.filter_run_excluding :chef_lt_12_only => true unless chef_lt_12?
-  config.filter_run_excluding :if_chef_11 => true if chef_eq_11?
+  config.filter_run_excluding :chef_gte_12_7_only => true unless chef_gte_12_7?
+  config.filter_run_excluding :chef_gte_13_only => true unless chef_gte_13?
+  config.filter_run_excluding :chef_lt_12_5_only => true unless chef_lt_12_5?
+  config.filter_run_excluding :chef_lt_13_only => true unless chef_lt_13?
+  config.filter_run_excluding :chef_lt_14_only => true unless chef_lt_14?
+  config.filter_run_excluding :chef_gte_14_only => true unless chef_gte_14?
 end

data/spec/unit/knife/bootstrap_options_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Chef::Knife::Bootstrap, :chef_gte_12_6_only do
+describe Chef::Knife::Bootstrap, :chef_gte_12_7_only do
   before(:all) do
     Chef::Config.reset
   end
@@ -44,7 +44,7 @@ expected: #{expected}
   end
 
   shared_examples 'compare_options' do
-    it 'contains the option flags' do
+    it 'contains the option flags', :chef_lt_14_only do
       opt_map.default_proc = proc { |map, key| key }
       filtered_keys = (win_bootstrap.options.keys - win_ignore).map! { |key| opt_map[key] }
 
@@ -98,7 +98,9 @@ expected: #{expected}
       :encrypt, # irrelevant during bootstrap
       :identity_file,
       :ssh_identity_file,
-      :fips, #until chef 12.7 is released
+      :ssh_gateway_identity,
+      :bootstrap_proxy_user,
+      :bootstrap_proxy_pass,
     ]}
 
     # win_ignore: Options in windows that aren't relevant to core.
@@ -115,7 +117,9 @@ expected: #{expected}
       :ssl_peer_fingerprint,
       :winrm_authentication_protocol,
       :winrm_transport,
-      :fips, #until chef 12.7 is released
+      :winrm_codepage,
+      :concurrency,
+      :winrm_shell,
     ] }
 
     include_examples 'compare_options'
@@ -141,14 +145,15 @@ expected: #{expected}
       :use_sudo,
       :use_sudo_password,
       :encrypt, # irrelevant during bootstrap
-      :fips, #until chef 12.7 is released
+      :ssh_gateway_identity,
+      :bootstrap_proxy_user,
+      :bootstrap_proxy_pass,
     ]}
     # win_ignore: Options in windows that aren't relevant to core.
     let(:win_ignore) { [
       :auth_timeout,
       :install_as_service,
       :host_key_verification,  # Deprecated - remove this when the flag is removed.
-      :fips, #until chef 12.7 is released
     ] }
 
     include_examples 'compare_options'

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -267,41 +267,28 @@ describe Chef::Knife::BootstrapWindowsWinrm do
   end
 
   context "when validation_key is not present" do
-    context "using chef 11", :chef_lt_12_only do
-      before do
-        allow(File).to receive(:exist?).with(File.expand_path(Chef::Config[:validation_key])).and_return(false)
-      end
-
-      it 'raises an exception if validation_key is not present in chef 11' do
-        expect(bootstrap.ui).to receive(:error)
-        expect { bootstrap.bootstrap }.to raise_error(SystemExit)
-      end
+    before do
+      allow(File).to receive(:exist?).with(File.expand_path(Chef::Config[:validation_key])).and_return(false)
+      bootstrap.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
+      Chef::Config[:knife] = {:chef_node_name => 'foo.example.com'}
     end
 
-    context "using chef 12", :chef_gte_12_only do
-      before do
-        allow(File).to receive(:exist?).with(File.expand_path(Chef::Config[:validation_key])).and_return(false)
-        bootstrap.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
-        Chef::Config[:knife] = {:chef_node_name => 'foo.example.com'}
-      end
-
-      it 'raises an exception if winrm_authentication_protocol is basic and transport is plaintext' do
-        Chef::Config[:knife] = {:winrm_authentication_protocol => 'basic', :winrm_transport => 'plaintext', :chef_node_name => 'foo.example.com'}
-        expect(bootstrap.ui).to receive(:error)
-        expect { bootstrap.run }.to raise_error(SystemExit)
-      end
+    it 'raises an exception if winrm_authentication_protocol is basic and transport is plaintext' do
+      Chef::Config[:knife] = {:winrm_authentication_protocol => 'basic', :winrm_transport => 'plaintext', :chef_node_name => 'foo.example.com'}
+      expect(bootstrap.ui).to receive(:error)
+      expect { bootstrap.run }.to raise_error(SystemExit)
+    end
 
-      it 'raises an exception if chef_node_name is not present ' do
-        Chef::Config[:knife] = {:chef_node_name => nil}
-        expect(bootstrap.client_builder).not_to receive(:run)
-        expect(bootstrap.client_builder).not_to receive(:client_path)
-        expect(bootstrap.ui).to receive(:error)
-        expect { bootstrap.bootstrap }.to raise_error(SystemExit)
-      end
+    it 'raises an exception if chef_node_name is not present ' do
+      Chef::Config[:knife] = {:chef_node_name => nil}
+      expect(bootstrap.client_builder).not_to receive(:run)
+      expect(bootstrap.client_builder).not_to receive(:client_path)
+      expect(bootstrap.ui).to receive(:error)
+      expect { bootstrap.bootstrap }.to raise_error(SystemExit)
     end
   end
 
-  context "when doing chef vault", :chef_gte_12_only do
+  context "when doing chef vault" do
     let(:vault_handler) { double('vault_handler', :doing_chef_vault? => true) }
     let(:node_name) { 'foo.example.com' }
     before do

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

@@ -87,7 +87,7 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
     end
   end
 
-  describe "validation_key", :chef_gte_12_only do
+  describe "validation_key" do
     before do
       mock_bootstrap_context.instance_variable_set(:@config, Mash.new(:validation_key => "C:\\chef\\key.pem"))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -72,8 +72,6 @@ files:
 - Rakefile
 - appveyor.yml
 - ci.gemfile
-- features/knife_help.feature
-- features/support/env.rb
 - knife-windows.gemspec
 - lib/chef/knife/bootstrap/windows-chef-client-msi.erb
 - lib/chef/knife/bootstrap_windows_base.rb
@@ -102,6 +100,7 @@ files:
 - spec/assets/win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt
 - spec/assets/win_template_rendered_without_bootstrap_install_command.txt
 - spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
+- spec/assets/win_template_rendered_without_bootstrap_install_command_on_13_client.txt
 - spec/assets/win_template_unrendered.txt
 - spec/dummy_winrm_connection.rb
 - spec/functional/bootstrap_download_spec.rb
@@ -136,14 +135,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
   with nodes running Microsoft Windows
 test_files:
-- features/knife_help.feature
-- features/support/env.rb
 - spec/assets/fake_trusted_certs/excluded.txt
 - spec/assets/fake_trusted_certs/github.pem
 - spec/assets/fake_trusted_certs/google.crt
@@ -152,6 +149,7 @@ test_files:
 - spec/assets/win_template_rendered_with_bootstrap_install_command_on_12_5_client.txt
 - spec/assets/win_template_rendered_without_bootstrap_install_command.txt
 - spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
+- spec/assets/win_template_rendered_without_bootstrap_install_command_on_13_client.txt
 - spec/assets/win_template_unrendered.txt
 - spec/dummy_winrm_connection.rb
 - spec/functional/bootstrap_download_spec.rb

data/features/knife_help.feature

@@ -1,20 +0,0 @@
-Feature: Ensure that the help works as designed
-  In order to test the help via CLI
-  As an Operator
-  I want to run the CLI with different arguments
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows --help`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows help`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the knife command shows available windows command"
-  When I run `knife`
-  And the output should contain "** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"

data/features/support/env.rb

@@ -1,5 +0,0 @@
-require 'aruba/cucumber'
-
-Before do
-  @aruba_timeout_seconds = 5
-end