knife-windows 1.4.0 → 1.4.1

data/README.md

@@ -2,6 +2,7 @@ Knife Windows Plugin
 ====================
 [![Build Status Master](https://travis-ci.org/chef/knife-windows.svg?branch=master)](https://travis-ci.org/chef/knife-windows)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/knife-windows?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/knife-windows/branch/master)
+[![Gem Version](https://badge.fury.io/rb/knife-windows.svg)](https://badge.fury.io/rb/knife-windows)
 
 This plugin adds additional functionality to the Chef Knife CLI tool for
 configuring / interacting with nodes running Microsoft Windows:

data/RELEASE_NOTES.md

@@ -1,34 +1,34 @@
-<!---
-This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
-
-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
-
+<!---
+This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
+
+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
+

data/Rakefile

@@ -1,21 +1,21 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-begin
-  require 'rspec/core/rake_task'
-
-  task :default => [:unit_spec, :functional_spec]
-
-  desc "Run all functional specs in spec directory"
-  RSpec::Core::RakeTask.new(:functional_spec) do |t|
-    t.pattern = 'spec/functional/**/*_spec.rb'
-  end
-
-  desc "Run all unit specs in spec directory"
-  RSpec::Core::RakeTask.new(:unit_spec) do |t|
-    t.pattern = 'spec/unit/**/*_spec.rb'
-  end
-
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+begin
+  require 'rspec/core/rake_task'
+
+  task :default => [:unit_spec, :functional_spec]
+
+  desc "Run all functional specs in spec directory"
+  RSpec::Core::RakeTask.new(:functional_spec) do |t|
+    t.pattern = 'spec/functional/**/*_spec.rb'
+  end
+
+  desc "Run all unit specs in spec directory"
+  RSpec::Core::RakeTask.new(:unit_spec) do |t|
+    t.pattern = 'spec/unit/**/*_spec.rb'
+  end
+
+rescue LoadError
+  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
+end

data/appveyor.yml

@@ -8,16 +8,13 @@ environment:
   bundle_gemfile: ci.gemfile
 
   matrix:
-    - ruby_version: "193"
+    - ruby_version: "20"
       chef_version: "< 12"
 
-    - ruby_version: "200"
-      chef_version: "< 12"
-
-    - ruby_version: "200"
+    - ruby_version: "21"
       chef_version: "~> 12.0"
 
-    - ruby_version: "200"
+    - ruby_version: "21"
       chef_version: "master"
 
 clone_folder: c:\projects\knife-windows
@@ -32,7 +29,7 @@ install:
   - echo %PATH%
   - ruby --version
   - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
+  - gem install bundler -v 1.11.2 --quiet --no-ri --no-rdoc
   - bundler --version
 
 build_script:

data/ci.gemfile

@@ -1,15 +1,15 @@
-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'
+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'

data/features/knife_help.feature

@@ -1,20 +1,20 @@
-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)"
+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 +1,5 @@
-require 'aruba/cucumber'
-
-Before do
-  @aruba_timeout_seconds = 5
-end
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 5
+end

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", "~> 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

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -103,7 +103,7 @@ class Chef
 
           option :hint,
             :long => "--hint HINT_NAME[=HINT_FILE]",
-            :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
+            :description => "Specify Ohai Hint to be set on the bootstrap target. Use multiple --hint options to specify multiple hints.",
             :proc => Proc.new { |h|
               Chef::Config[:knife][:hints] ||= Hash.new
               name, path = h.split("=")
@@ -127,7 +127,7 @@ class Chef
           option :encrypted_data_bag_secret,
             :short => "-s SECRET",
             :long  => "--secret ",
-            :description => "The secret key to use to decrypt data bag item values.  Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config.",
+            :description => "The secret key to use to decrypt data bag item values. Will be rendered on the node at c:/chef/encrypted_data_bag_secret and set in the rendered client config.",
             :default => false
 
           # Mismatch between option 'encrypted_data_bag_secret_file' and it's long value '--secret-file' is by design for compatibility
@@ -280,7 +280,7 @@ class Chef
 
         bootstrap_architecture = Chef::Config[:knife][:bootstrap_architecture]
         if bootstrap_architecture && ![:x86_64, :i386].include?(bootstrap_architecture.to_sym)
-          raise "Valid values for the knife config :bootstrap_architecture are i386 or x86_64.  Supplied value is #{bootstrap_architecture}"
+          raise "Valid values for the knife config :bootstrap_architecture are i386 or x86_64. Supplied value is #{bootstrap_architecture}"
         end
         if Chef::Config[:knife][:architecture]
           raise "Do not set :architecture in your knife config, use :bootstrap_architecture."
@@ -435,7 +435,7 @@ behavior will be removed and any 'encrypted_data_bag_secret' entries in
         if bootstrap_architecture.nil?
           architecture = current_architecture
         elsif bootstrap_architecture == :x86_64 && current_architecture == :i386
-          raise "You specified bootstrap_architecture as x86_64 but the target machine is i386.  A 64 bit program cannot run on a 32 bit machine."
+          raise "You specified bootstrap_architecture as x86_64 but the target machine is i386. A 64 bit program cannot run on a 32 bit machine."
         else
           architecture = bootstrap_architecture
         end

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

@@ -254,8 +254,14 @@ param(
    [String] $localPath
 )
 
+$ProxyUrl = $env:http_proxy;
 $webClient = new-object System.Net.WebClient;
 
+if ($ProxyUrl -ne '') {
+  $WebProxy = New-Object System.Net.WebProxy($ProxyUrl,$true)
+  $WebClient.Proxy = $WebProxy
+}
+
 $webClient.DownloadFile($remoteUrl, $localPath);
 WGET_PS
 

data/lib/chef/knife/winrm_base.rb

@@ -54,7 +54,7 @@ class Chef
           option :winrm_transport,
             :short => "-t TRANSPORT",
             :long => "--winrm-transport TRANSPORT",
-            :description => "The WinRM transport type.  valid choices are [ssl, plaintext]",
+            :description => "The WinRM transport type. Valid choices are [ssl, plaintext]",
             :default => 'plaintext',
             :proc => Proc.new { |transport| Chef::Config[:knife][:winrm_port] = '5986' if transport == 'ssl'
                                 Chef::Config[:knife][:winrm_transport] = transport }

data/lib/chef/knife/winrm_session.rb

@@ -42,6 +42,9 @@ class Chef
         Chef::Log.debug("Transport: #{options[:transport]}")
 
         @winrm_session = WinRM::WinRMWebService.new(@endpoint, options[:transport], opts)
+        transport = @winrm_session.instance_variable_get(:@xfer)
+        http_client = transport.instance_variable_get(:@httpcli)
+        Chef::HTTP::DefaultSSLPolicy.new(http_client.ssl_config).set_custom_certs
         @winrm_session.set_timeout(options[:operation_timeout]) if options[:operation_timeout]
       end
 

data/lib/chef/knife/wsman_test.rb

@@ -62,7 +62,7 @@ class Chef
           unless output_object.error_message.nil?
             ui.warn "Failed to connect to #{item.host} at #{item.endpoint}."
             if err && err.is_a?(OpenSSL::SSL::SSLError)
-              ui.warn "Failure due to an issue with SSL; likely cause would be unsuccesful certificate verification."
+              ui.warn "Failure due to an issue with SSL; likely cause would be unsuccessful certificate verification."
               ui.warn "Either ensure your certificate is valid or use '--winrm-ssl-verify-mode verify_none' to ignore verification failures."
             end
             error_count += 1
@@ -86,6 +86,7 @@ class Chef
         }
 
         client = HTTPClient.new
+        Chef::HTTP::DefaultSSLPolicy.new(client.ssl_config).set_custom_certs
         client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE if resolve_no_ssl_peer_verification
         client.post(endpoint, xml, header)
       end

data/lib/knife-windows/version.rb

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

data/spec/assets/win_template_rendered_with_bootstrap_install_command.txt

@@ -104,8 +104,14 @@ 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^);
  
 ) 
@@ -213,5 +219,5 @@ echo.# Using default node name ^(fqdn^)
 
 @echo Starting chef to bootstrap the node... 
 SET "PATH=%PATH%;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 -E _default
+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

@@ -104,8 +104,14 @@ 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^);
  
 ) 

data/spec/assets/win_template_rendered_without_bootstrap_install_command.txt

@@ -104,8 +104,14 @@ 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^);
  
 ) 
@@ -325,5 +331,5 @@ echo.# Using default node name ^(fqdn^)
 
 @echo Starting chef to bootstrap the node... 
 SET "PATH=%PATH%;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 -E _default
+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

@@ -104,8 +104,14 @@ 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^);
  
 )