knife-ec2 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e09e4b811ac8fbfc3f15456c64b86e3e66507181825b1af08dbc814de3f1e75
-  data.tar.gz: 97ce8aa909d10cf7ffe4e8096176447305bb2559a6a63e05e9801bcad6f17e2b
+  metadata.gz: 8743a633399f75cd0972d5961245645e3ae22ec4edafc86bfb5b70737d11dc66
+  data.tar.gz: cdbdf1c53d74247584b6c7a3efdbb0d0a842bf1162e15bfbca253ff4734ecae3
 SHA512:
-  metadata.gz: 440dbf0295d37492c076fd3efacb0ec0132701d4860565a974757b5f23063579fccac6dc4086c1891863ea89152236cf43473489c98e5bfd3c9e1f4b3034802a
-  data.tar.gz: b331a39d9db68adccabe21217620ebb4d51422b0800b5aac7a80c9f6a94072126f37aa3fc478ac10355a441c7bddd71483b2159729571be5b278d899d19049c2
+  metadata.gz: 041be22fe39119c853ae31fca29571d66aa24e484863dd15e3187fe2dd6a2f4c568db99cfa5153af1904d76ea89328555534c33fe403bc633788c4cb53b1b992
+  data.tar.gz: 5680eeb388afe0fd764a28eb29d51340bfe5b9b19740e74596bd6c59c8e9c64f6f8a216159f3a412227bf8aab9ed83babaa4111aee90adf1a2d0f3c80fe8b91d

data/lib/chef/knife/ec2_base.rb

@@ -158,6 +158,7 @@ class Chef
         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["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/chef/knife/ec2_server_create.rb

@@ -242,6 +242,12 @@ class Chef
         boolean: true,
         default: false
 
+      option :disable_source_dest_check,
+        long: "--disable-source-dest-check",
+        description: "Disables the source destination check if this option is passed. This value must be passed for a NAT instance to perform NAT.",
+        boolean: true,
+        default: false
+
       option :volume_tags,
         long: "--volume-tags Tag=Value[,Tag=Value...]",
         description: "Tag the Root volume",
@@ -326,7 +332,6 @@ class Chef
             exit
           end
         end
-
         msg_pair("Instance ID", server.id)
         msg_pair("Flavor", server.instance_type)
         msg_pair("Image", server.image_id)
@@ -347,6 +352,8 @@ class Chef
         # occasionally 'ready?' isn't, so retry a couple times if needed.
         tries = 6
         begin
+          disable_source_dest_check if vpc_mode? && config_value(:disable_source_dest_check)
+
           create_tags(hashed_tags) unless hashed_tags.empty?
           create_volume_tags(hashed_volume_tags) unless hashed_volume_tags.empty?
           associate_address(elastic_ip) if config[:associate_eip]
@@ -1235,6 +1242,18 @@ class Chef
         })
       end
 
+      # disable_source_dest_check option is used to set value of source_dest_check attribute in ec2.
+      # By default the source destination check is enabled in ec2.
+      # This value must be disable for a NAT instance to perform NAT.
+      def disable_source_dest_check
+        ec2_connection.modify_instance_attribute({
+          source_dest_check: {
+            value: false,
+          },
+          instance_id: server.id,
+        })
+      end
+
       def tcp_test_winrm(ip_addr, port)
         tcp_socket = TCPSocket.new(ip_addr, port)
         yield

data/lib/chef/knife/ec2_server_list.rb

@@ -133,7 +133,7 @@ class Chef
             servers_list << v["public_ip_address"]
             servers_list << v["private_ip_address"]
             servers_list << v["instance_type"]
-            servers_list << v["az"] if config[:az]
+            servers_list << ui.color(v["az"], azcolor(v["az"])) if config[:az]
             servers_list << v["image_id"]
             servers_list << v["key_name"]
             servers_list << v["security_groups"].join(",")
@@ -143,7 +143,7 @@ class Chef
               end
             end
             servers_list << v["iam_instance_profile"].to_s if config[:iamprofile] # may be nil
-            servers_list << v["state"]
+            servers_list << ui.color(v["state"], state_color(v["state"]))
           end
           puts ui.list(servers_list, :uneven_columns_across, output_column_count)
         else
@@ -170,12 +170,12 @@ class Chef
           end
 
           if config[:az]
-            server_data["az"] = ui.color(i.instances[0].placement.availability_zone, azcolor(i.instances[0].placement.availability_zone))
+            server_data["az"] = i.instances[0].placement.availability_zone
           end
 
           server_data["iam_instance_profile"] = ( i.instances[0].iam_instance_profile.nil? ? nil : i.instances[0].iam_instance_profile.arn[%r{instance-profile/(.*)}] )
 
-          server_data["state"] = ui.color(i.instances[0].state.name, state_color(i.instances[0].state.name))
+          server_data["state"] = i.instances[0].state.name
 
           if config[:tags]
             server_data["tags"] = tags

data/lib/knife-ec2/version.rb

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