knife-ec2 1.0.22 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c062c757d30e2a439435f0bfc6fd30e5d0534f107b9e426d9c8cfeea733e383
-  data.tar.gz: 5a8f574c5bd902b4ba8196f85347bcc0f2c0558ef754f1a76f0fcd8eaa3a1d62
+  metadata.gz: '090dfec07d3c033443e219dac5b1429c85f12df444d3fcb94df51d3d4dd43e50'
+  data.tar.gz: 8ba1490ac3c52e5f17044d20105ee4097f3b911c3e211d978f0ad3f77a84e6bf
 SHA512:
-  metadata.gz: 897d4c54e779d65d599448d9262e74d4797d3e54a05aaae4028de4c9add6b38e7acffc68a06eff3179c961707170f91648ffb323fc8cfb90dc5b0042e6abaa85
-  data.tar.gz: 632281b0f3c59d26809032a8c4107eca8ed379ef7efba90689c36ce62d2921f220fc26e014f4efb91cee2c8bc068b0e25b78434ccea9f7e6b983b450db886474
+  metadata.gz: 78232e205b095a2107b679a094ea7e9d2d6dc23c7b2e76379b62ae62592df5f84dd91ef7a4bbecf0cbae9f0ac44d03af2e5aaa304c86294d30ac5908b0a20f59
+  data.tar.gz: 76e4ad596e206ab19a8191bcfe82acfbe83c5af33187ae3ebff826982618b1bfa74bd874028cfbd82110c7dc0666755f3d83296946810ad135c96b0205c949e9

data/lib/chef/knife/ec2_server_create.rb

@@ -31,6 +31,7 @@ class Chef
         require "tempfile"
         require "uri"
         require "net/ssh"
+        require "net/ssh/gateway"
         Chef::Knife::Bootstrap.load_deps
       end
 
@@ -580,7 +581,7 @@ class Chef
       end
 
       def plugin_validate_options!
-        if Chef::Config[:knife].keys.include? :aws_ssh_key_id
+        if Chef::Config[:knife].key?(:aws_ssh_key_id)
           Chef::Config[:knife][:ssh_key_name] = Chef::Config[:knife][:aws_ssh_key_id] unless Chef::Config[:knife][:ssh_key_name]
           Chef::Config[:knife].delete(:aws_ssh_key_id)
           ui.warn("Use of aws_ssh_key_id option in knife.rb/config.rb config is deprecated, use ssh_key_name option instead.")
@@ -1177,7 +1178,7 @@ class Chef
       end
 
       def create_key_pair
-        key_name = "#{config[:connection_user]}-#{SecureRandom.hex(10)}"
+        key_name = "#{config[:connection_user].delete(".\\")}-#{SecureRandom.hex(10)}"
         key_pair = ec2_connection.create_key_pair({
           key_name: key_name,
         })
@@ -1448,7 +1449,7 @@ class Chef
         parse_aws_tags.map { |t| key, val = t.split("="); ht[key] = val } unless parse_aws_tags.nil?
 
         # Always set the Name tag
-        unless ht.keys.include? "Name"
+        unless ht.key?("Name")
           if config_value(:chef_node_name)
             ht["Name"] = evaluate_node_name(config_value(:chef_node_name))
           else

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "1.0.22".freeze
+    VERSION = "1.0.25".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.25
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef