knife-ec2 1.0.32 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 720ebe531f9c5d63eb98cf8d943d767628fbbbc75733f3cfda461be7c7cc1093
-  data.tar.gz: 42ea760bbc7d85c4684bbd57b9fc7e2d8578cc9bbfbc51cc7e54c22aa78c16b1
+  metadata.gz: 50ee04d6ee29701c1dd9b40b23da36cb22628fb1e29e40a33460581ec2ddff6b
+  data.tar.gz: 849825bbda6123485edaf4c2a9db8253a5c57ab742fbb8253078aec8f86ff39d
 SHA512:
-  metadata.gz: dd203f42f76400d9d07358bde4351f35568c2a74716034ce11eeb565b3e338c6d3173e4d904c4eec1ec15e29b212e13138def1e0e695d64f719fa88c83f0384d
-  data.tar.gz: 20032468b55e145e1e35f5b42818bb0e2099f8a3f5a37383b5919994d205829a57e568515c33066bafed187c05a7e9faf295c6ec2a6c888815fc97fc79e2055c
+  metadata.gz: 5ef3159b6987c5efddbd4ccdf7cb3bb526ea90e9ae9243e319e953b1c9ea0d5d799496e3217c4b485b7987329c1ad0eba85e47e7e673398f36050305f57178f7
+  data.tar.gz: 33e7f8d5854e2cb8cca7c44060adcbeb4b56917bc9489c6b5fa308c7315f7818fbd41ebc71dff4e9939ee3147b3123728f4dbd665f1ecec070a9af8738c4f21c

data/lib/chef/knife/ec2_server_create.rb

@@ -623,7 +623,7 @@ class Chef
         if config[:associate_eip]
           eips = ec2_connection.describe_addresses.addresses.collect { |addr| addr if addr.domain == eip_scope }.compact
 
-          unless eips.detect { |addr| addr.public_ip == config[:associate_eip] && addr.instance_id.nil? }
+          unless eips.detect { |addr| addr.public_ip == config[:associate_eip] && (addr.instance_id.nil? || addr.instance_id.empty?) }
             ui.error("Elastic IP requested is not available.")
             exit 1
           end
@@ -858,7 +858,6 @@ class Chef
         attributes = {
           image_id: config_value(:image),
           instance_type: config_value(:flavor),
-          groups: config[:security_groups],
           key_name: config_value(:ssh_key_name),
           max_count: 1,
           min_count: 1,
@@ -878,6 +877,8 @@ class Chef
           network_attrs[:groups] = config_value(:security_group_ids) if !!config_value(:security_group_ids)
           network_attrs[:private_ip_address] = config_value(:private_ip_address)
           network_attrs[:associate_public_ip_address] = config_value(:associate_public_ip)
+        else
+          attributes[:security_groups] = config[:security_groups]
         end
 
         if network_attrs.length > 0
@@ -1199,10 +1200,17 @@ class Chef
       end
 
       def associate_address(elastic_ip)
-        ec2_connection.associate_address({
-          allocation_id: elastic_ip.allocation_id,
-          instance_id: server.id,
-        })
+        if vpc_mode?
+          ec2_connection.associate_address({
+            allocation_id: elastic_ip.allocation_id,
+            instance_id: server.id,
+          })
+        else
+          ec2_connection.associate_address({
+            public_ip: elastic_ip.public_ip,
+            instance_id: server.id,
+          })
+        end
       end
 
       def validate_nics!

data/lib/chef/knife/helpers/ec2_base.rb

@@ -100,6 +100,10 @@ class Chef
         @ec2_connection ||= Aws::EC2::Client.new(connection_string)
       end
 
+      def vpc_mode?
+        !!config_value(:subnet_id)
+      end
+
       def fetch_ami(image_id)
         return nil unless image_id
 
@@ -147,7 +151,7 @@ class Chef
           server_data[id] = server_obj.instances[0].send(id)
         end
         server_data["availability_zone"] = server_obj.instances[0].placement.availability_zone
-        server_data["groups"] = server_obj.groups.map(&:name)
+        server_data["groups"] = server_obj.groups.map(&:group_name) unless vpc_mode?
         server_data["iam_instance_profile"] = ( server_obj.instances[0].iam_instance_profile.nil? ? nil : server_obj.instances[0].iam_instance_profile.arn[%r{instance-profile/(.*)}] )
         server_data["id"] = server_data["instance_id"]
 
@@ -157,8 +161,8 @@ class Chef
         server_data["security_groups"] = server_obj.instances[0].security_groups.map(&:group_name)
         server_data["security_group_ids"] = server_obj.instances[0].security_groups.map(&:group_id)
         server_data["state"] = server_obj.instances[0].state.name
-        server_data["subnet_id"] = server_obj.instances[0].network_interfaces[0].subnet_id
-        server_data["source_dest_check"] = server_obj.instances[0].network_interfaces[0].source_dest_check
+        server_data["subnet_id"] = server_obj.instances[0].network_interfaces[0].subnet_id if vpc_mode?
+        server_data["source_dest_check"] = server_obj.instances[0].network_interfaces[0].source_dest_check if vpc_mode?
         server_data["tags"] = tags
         server_data["tenancy"] = server_obj.instances[0].placement.tenancy
         server_data["volume_id"] = server_obj.instances[0].block_device_mappings[0]&.ebs&.volume_id

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "1.0.32".freeze
+    VERSION = "1.0.33".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.32
+  version: 1.0.33
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef