knife-ec2 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f2a7bca6d0b163b05f66380d1c3d0dfede7e8d4ccd62f16d1b89d4fbdffe199
-  data.tar.gz: ff715b4e93d86c630f5cb6b1efc65ea7fa10207e69b89abb8dd5bca4e18d8db5
+  metadata.gz: 0e09e4b811ac8fbfc3f15456c64b86e3e66507181825b1af08dbc814de3f1e75
+  data.tar.gz: 97ce8aa909d10cf7ffe4e8096176447305bb2559a6a63e05e9801bcad6f17e2b
 SHA512:
-  metadata.gz: dd5e6b6b6fc99b4e3170135e50316951d66eb485063b1dad598a30134409928a852e7df47e0fc1b7a52d6e4d38684f0025385896e1f7f49e7ff46fdae34dbd73
-  data.tar.gz: 05ce9e4a754df26b507693377793969c6ef3b6d7f2fb54177883d7bb9437b0c1635d5da9a11b88610514b729c83137d4c2f024cbd7cf4a734fb0d31fc40c12b3
+  metadata.gz: 440dbf0295d37492c076fd3efacb0ec0132701d4860565a974757b5f23063579fccac6dc4086c1891863ea89152236cf43473489c98e5bfd3c9e1f4b3034802a
+  data.tar.gz: b331a39d9db68adccabe21217620ebb4d51422b0800b5aac7a80c9f6a94072126f37aa3fc478ac10355a441c7bddd71483b2159729571be5b278d899d19049c2

data/lib/chef/knife/ec2_server_create.rb

@@ -361,6 +361,9 @@ class Chef
 
         attach_nics if config[:network_interfaces]
 
+        # Re-fetch the latest server data after assigning vpc or network interfaces
+        @server = fetch_ec2_instance(instance_id) if reload_server_data_required?
+
         if vpc_mode?
           msg_pair("Subnet ID", server.subnet_id)
           msg_pair("Tenancy", server.tenancy)
@@ -856,23 +859,25 @@ class Chef
             availability_zone: config_value(:availability_zone),
           },
         }
+
         network_attrs = {}
-        if primary_eni = config_value(:primary_eni)
-          network_attrs[:network_interface_id] = primary_eni
-          network_attrs[:device_index] = 0
-        else
-          attributes[:security_group_ids] = config_value(:security_group_ids)
-          network_attrs[:subnet_id] = config_value(:subnet_id) if vpc_mode?
+        if !!config_value(:primary_eni)
+          network_attrs[:network_interface_id] = config_value(:primary_eni)
+        elsif vpc_mode?
+          network_attrs[:subnet_id] = config_value(:subnet_id)
         end
 
         if vpc_mode?
-          network_attrs[:groups] = attributes[:security_group_ids]
+          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) if config[:associate_public_ip]
+          network_attrs[:associate_public_ip_address] = config_value(:associate_public_ip)
         end
 
         if network_attrs.length > 0
+          network_attrs[:device_index] = 0
           attributes[:network_interfaces] = [network_attrs]
+        else
+          attributes[:security_group_ids] = config_value(:security_group_ids)
         end
 
         attributes[:placement][:group_name] = config_value(:placement_group)
@@ -1120,23 +1125,30 @@ class Chef
         subnet.map_public_ip_on_launch
       end
 
+      # Assign connection host based on attribute passed
+      # @return [String]
       def connection_host
-        unless @connection_host
-          if config[:server_connect_attribute]
-            connect_attribute = config[:server_connect_attribute]
-            server.send(config[:server_connect_attribute])
+        @connection_host ||= server.send(connect_attribute)
+
+        puts "\nSSH Target Address: #{@connection_host}(#{connect_attribute})"
+        @connection_host
+      end
+
+      # Identify connection attribute if:
+      # Option --server-connect-attribute is set.
+      # For VPC mode check if public IP or elastic IP has been requested.
+      # Otherwise assign public DNS or public IP.
+      # @return [String]
+      def connect_attribute
+        @connect_attribute ||= begin
+          if !!config[:server_connect_attribute]
+            config[:server_connect_attribute]
           elsif vpc_mode? && !(subnet_public_ip_on_launch? || config[:associate_public_ip] || config[:associate_eip])
-            connect_attribute = "private_ip_address"
-            server.private_ip_address
+            "private_ip_address"
           else
-            connect_attribute = server.public_dns_name ? "public_dns_name" : "public_ip_address"
-            server.send(connect_attribute)
+            server.public_dns_name ? "public_dns_name" : "public_ip_address"
           end
-          @connection_host = server.send(connect_attribute)
         end
-
-        puts "\nSSH Target Address: #{@connection_host}(#{connect_attribute})"
-        @connection_host
       end
 
       def create_tags(hashed_tags)
@@ -1165,7 +1177,6 @@ class Chef
         ec2_connection.associate_address({
           allocation_id: elastic_ip.allocation_id,
           instance_id: server.id,
-          public_ip: elastic_ip.public_ip,
         })
       end
 
@@ -1426,6 +1437,10 @@ class Chef
           "Disabled"
         end
       end
+
+      def reload_server_data_required?
+        !!config[:associate_eip] || !!config[:classic_link_vpc_id] || !!config[:network_interfaces]
+      end
     end
   end
 end

data/lib/knife-ec2/version.rb

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