knife-ec2 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8743a633399f75cd0972d5961245645e3ae22ec4edafc86bfb5b70737d11dc66
-  data.tar.gz: cdbdf1c53d74247584b6c7a3efdbb0d0a842bf1162e15bfbca253ff4734ecae3
+  metadata.gz: f9b8a13feb4e8b87fefb3a9947b00f0dcff705d782bd954d4e9fdd091c6ee357
+  data.tar.gz: 7b3ba4b910199fcdd9d2e25575ca04b9c6b1d406bfc27b49788701f0b22061a4
 SHA512:
-  metadata.gz: 041be22fe39119c853ae31fca29571d66aa24e484863dd15e3187fe2dd6a2f4c568db99cfa5153af1904d76ea89328555534c33fe403bc633788c4cb53b1b992
-  data.tar.gz: 5680eeb388afe0fd764a28eb29d51340bfe5b9b19740e74596bd6c59c8e9c64f6f8a216159f3a412227bf8aab9ed83babaa4111aee90adf1a2d0f3c80fe8b91d
+  metadata.gz: 1de4480610006aa88fa9cea1843ede6c912d3d783489809622fb04c9542f109ce70ac65b862c0011eb6387ff58f29e4105f00ba069ec4a98775576fefb8b6479
+  data.tar.gz: 27b185b90d50245d812d46c9976c5d80a2535fd25038f2e3b191ebda4775aff23ab2c4df5df2a2ddf9122bd1b9edc3e02345fa5a427e758003b5b66c9e146bcd

data/lib/chef/knife/ec2_ami_list.rb

@@ -115,7 +115,10 @@ class Chef
         params["owners"] = [locate_config_value(:owner).to_s]
 
         filters = []
-        filters << { platform: locate_config_value(:platform) } if locate_config_value(:platform)
+        if locate_config_value(:platform)
+          filters << { name: "platform",
+                       values: [locate_config_value(:platform)] }
+        end
 
         # TODO: Need to find substring to match in the description
         # filters << { description: locate_config_value(:search) } if locate_config_value(:search)

data/lib/chef/knife/ec2_server_create.rb

@@ -586,6 +586,7 @@ class Chef
           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.")
         end
+        create_key_pair unless config_value(:ssh_key_name)
 
         validate_aws_config!(%i{image ssh_key_name aws_access_key_id aws_secret_access_key})
 
@@ -1180,6 +1181,24 @@ class Chef
         end
       end
 
+      def create_key_pair
+        key_name = "#{config[:connection_user]}-#{SecureRandom.hex(10)}"
+        key_pair = ec2_connection.create_key_pair({
+          key_name: key_name,
+        })
+
+        save_keypair_file(key_pair) if key_pair
+      end
+
+      def save_keypair_file(key_pair)
+        file_path = File.join(Config.config_dir, "#{key_pair.key_name}.pem")
+        file = File.open(file_path, "w+") { |f| f << key_pair.key_material }
+
+        Chef::Config[:knife][:ssh_key_name] = key_pair.key_name
+        Chef::Config[:knife][:ssh_identity_file] = file.path
+        puts "\nGenerated keypair file: #{file.path}"
+      end
+
       def associate_address(elastic_ip)
         ec2_connection.associate_address({
           allocation_id: elastic_ip.allocation_id,

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "1.0.14".freeze
+    VERSION = "1.0.16".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.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef