knife-windows 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f48c9743259b4bd34fd32ebef4f7fe16fb9ca456
-  data.tar.gz: d45aaf0d918ca3598670aef5379da514fde6c86b
+  metadata.gz: 19d422ea5fc768b2e59e5896b91e315d5980cff0
+  data.tar.gz: 946ef4f8f1ff5ec0d990125170f969a8752b6481
 SHA512:
-  metadata.gz: ed4f3b5400713d3fc69f8084251ed4b9712dbdb3ca4d8d9694a7c2a79c01bbf8dfa8a3462752244a8f333b164f169266f85a00a6372d12e6238ab2eb8aac7021
-  data.tar.gz: ca669a9d919b392efbf49afdcd42d50999fa8de3caf53f5d9bf57c2c1c2edb7dd39c3b28c181bb2abdf231f20a760e0145b4fa577a53edd70da8bca34d55c74e
+  metadata.gz: 8742831667667dd4238f2c25732d701e67429e8f615f705dbc319fe712dca85389c10a58766ca01f2e9e638e80434e0e1c82f9480b8a631ae820eef74de2af1a
+  data.tar.gz: baead3cf7a7312833882ce75efc8647666177721395d62ece08efd434d7d228e42734c2eeecb197696d82526308712fd351b2ed6b8e36142c66246f8d6bbca01

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+before_install:
+  - gem install bundler
+
 gemfile: ci.gemfile
 
 env:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # knife-windows Change Log
 
+## Release 1.1.2
+* [knife-windows #317](https://github.com/chef/knife-windows/pull/317) Update Vault after client is created
+* [knife-windows #325](https://github.com/chef/knife-windows/pull/325) Fix proxy configuration to work with chef client 12.6.0
+* [knife-windows #326](https://github.com/chef/knife-windows/pull/326) Support new `ssh_identity_file` bootstrap argument
+
 ## Release 1.1.1
 * [knife-windows #307](https://github.com/chef/knife-windows/pull/307) Ensure prompted password is passed to winrm session
 * [knife-windows #311](https://github.com/chef/knife-windows/issues/311) WinRM bootstrap silently fails

data/README.md

@@ -84,10 +84,11 @@ An initial run_list for the node can also be passed to the subcommand. Example u
 ### knife windows cert generate
 
 Generates a certificate(x509) containing a public / private key pair for WinRM 'SSL' communication.
-The certificate will be generated in three different formats *.pfx, *.b64 and *.pem.
-The PKCS12(i.e *.pfx) contains both the public and private keys, usually used on the server. This will be added to WinRM Server's Certificate Store.
-The *.b64 is Base64 PKCS12 key pair. Contains both the public and private keys, for upload to the Cloud REST API. e.g. Azure.
-The *.pem is Base64 encoded public certificate only. Required by the client to connect to the server.
+The certificate will be generated in three different formats:
+* **.pem** - The *.pem is Base64 encoded public certificate only. One can use this file with the `-f` argument on `knife bootstrap windows winrm` and `knife winrm` commands.
+* **.pfx** - The PKCS12(i.e .pfx) contains both the public and private keys, usually used on the server. This can be added to a WinRM Server's Certificate Store using `knife windows cert install` (see command description below). **Note:** Do not use the *.pfx file with the `-f` argument on the `knife bootstrap windows winrm` and `knife winrm` commands. Use the *.pem file instead.
+* **.b64** - The *.b64 is Base64 PKCS12 key pair. Contains both the public and private keys, for upload to the Cloud REST API. e.g. Azure.
+
 This command also displays the thumbprint of the generated certificate.
 
     knife windows cert generate --cert-passphrase "strong_passphrase" --hostname "myserver.myorganization.net" --output-file "~/server_cert.pfx"
@@ -95,12 +96,12 @@ This command also displays the thumbprint of the generated certificate.
 
 ### knife windows cert install
 
-This command only functions on Windows. It adds the specified certificate to its certificate store. This command must include a valid PKCS12(i.e *.pfx) certificate file path.
+This command only functions on Windows and is intended to be run on a chef node. It adds the specified certificate to its certificate store. This command must include a valid PKCS12(i.e *.pfx) certificate file path such as the *.pfx file generated by `knife windows cert generate` described above.
 
     knife windows cert install "~/server_cert.pfx" --cert-passphrase "strong_passphrase"
 
 ### knife windows listener create
-This command only functions on Windows. It creates the winrm listener for SSL communication(i.e HTTPS).
+This command only functions on Windows and is intended to be run on a chef node. It creates the winrm listener for SSL communication(i.e HTTPS).
 This command can also install certificate which is specified using --cert-install option and use the installed certificate thumbprint to create winrm listener.
 --hostname option is optional. Default value for hostname is *.
 

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -29,7 +29,7 @@ class Chef
     module BootstrapWindowsBase
 
       include Chef::Knife::KnifeWindowsBase
-      
+
       # :nodoc:
       # Would prefer to do this in a rational way, but can't be done b/c of
       # Mixlib::CLI's design :(
@@ -109,7 +109,7 @@ class Chef
               name, path = h.split("=")
               Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new
             }
-        
+
           option :first_boot_attributes,
             :short => "-j JSON_ATTRIBS",
             :long => "--json-attributes",
@@ -300,10 +300,10 @@ class Chef
             exit 1
           end
 
-          chef_vault_handler.run(node_name: config[:chef_node_name]) if chef_vault_handler.doing_chef_vault?
-
           client_builder.run
+          chef_vault_handler.run(node_name: config[:chef_node_name]) if chef_vault_handler.doing_chef_vault?
           bootstrap_context.client_pem = client_builder.client_path
+
         else
           ui.info("Doing old-style registration with the validation key at #{Chef::Config[:validation_key]}...")
           ui.info("Delete your validation key in order to use your user credentials instead")

data/lib/chef/knife/bootstrap_windows_ssh.rb

@@ -66,8 +66,12 @@ class Chef
         :boolean => true
 
       option :identity_file,
-        :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
+        :description => "The SSH identity file used for authentication. [DEPRECATED] Use --ssh-identity-file instead."
+
+      option :ssh_identity_file,
+        :short => "-i IDENTITY_FILE",
+        :long => "--ssh-identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
 
       # DEPR: Remove this option for the next release.
@@ -99,6 +103,7 @@ class Chef
         ssh.config[:ssh_port] = locate_config_value(:ssh_port)
         ssh.config[:ssh_gateway] =  locate_config_value(:ssh_gateway)
         ssh.config[:identity_file] = config[:identity_file]
+        ssh.config[:ssh_identity_file] = config[:ssh_identity_file] || config[:identity_file]
         ssh.config[:forward_agent] = config[:forward_agent]
         ssh.config[:manual] = true
         ssh.config[:host_key_verify] = config[:host_key_verify]

data/lib/chef/knife/winrm_base.rb

@@ -66,11 +66,6 @@ class Chef
             :default => '5985',
             :proc => Proc.new { |key| Chef::Config[:knife][:winrm_port] = key }
 
-          option :identity_file,
-            :short => "-i IDENTITY_FILE",
-            :long => "--identity-file IDENTITY_FILE",
-            :description => "The SSH identity file used for authentication"
-
           option :kerberos_keytab_file,
             :short => "-T KEYTAB_FILE",
             :long => "--keytab-file KEYTAB_FILE",

data/lib/chef/knife/winrm_session.rb

@@ -25,7 +25,8 @@ class Chef
       attr_reader :host, :endpoint, :port, :output, :error, :exit_code
 
       def initialize(options)
-        Chef::Application.new.configure_proxy_environment_variables
+        configure_proxy
+        
         @host = options[:host]
         @port = options[:port]
         url = "#{options[:host]}:#{options[:port]}/wsman"
@@ -57,6 +58,8 @@ class Chef
         Chef::Log.debug("#{@host}[#{remote_id}] => :shell_close")
       end
 
+      private
+
       def get_output(remote_id, command_id)
         @winrm_session.get_command_output(remote_id, command_id) do |out,error|
           print_data(@host, out) if out
@@ -73,6 +76,14 @@ class Chef
         end
       end
 
+      def configure_proxy
+        if Chef::Config.respond_to?(:export_proxies)
+          Chef::Config.export_proxies
+        else
+          Chef::Application.new.configure_proxy_environment_variables
+        end
+      end
+
       def self.load_windows_specific_gems
         #checking for windows in case testing on linux
         require 'winrm-s'

data/lib/knife-windows/version.rb

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

data/spec/spec_helper.rb

@@ -63,6 +63,10 @@ def chef_gte_12_5?
   Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.5
 end
 
+def chef_gte_12_6?
+  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.6
+end
+
 def chef_lt_12?
   Chef::VERSION.split('.').first.to_i < 12
 end
@@ -81,6 +85,7 @@ RSpec.configure do |config|
   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?

data/spec/unit/knife/bootstrap_options_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Chef::Knife::Bootstrap, :chef_gte_12_5_only do
+describe Chef::Knife::Bootstrap, :chef_gte_12_6_only do
   before(:all) do
     Chef::Config.reset
   end
@@ -95,6 +95,8 @@ expected: #{expected}
       :use_sudo,
       :use_sudo_password,
       :encrypt, # irrelevant during bootstrap
+      :identity_file,
+      :ssh_identity_file,
     ]}
 
     # win_ignore: Options in windows that aren't relevant to core.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm