knife-ec2 2.0.3 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0792e566da930105ef238d8d64cb2fe79501895dcace746aa1a255b3e9d4a7f5'
-  data.tar.gz: 9078a6bb126100a28800abc87cd20d0344b33cbe090303795f414a9523e427d3
+  metadata.gz: 02d8b51f3d7816f686f27c4c29def2a77a68b01fa1b7f355f52bd197260eb39c
+  data.tar.gz: 49d8c7158eb351a7d28b51b65c1b783ed310952ef19184f9d202886db126a2aa
 SHA512:
-  metadata.gz: 4992729a869dd890f29f7d1d52cf957a4faf4d806f295abd62e760e60e0f9cb2916984c5f06e93538e362e39b71db2b9b56e8f2778661b04dafc6949b681e75d
-  data.tar.gz: a9f75d6fd86635c9cd67dcd50fc52ed5aae503d8004e212f53fc9d87f0b7159936a4f274b996e56a829cf28e04758c08b34e555c63096412553646561ca6142f
+  metadata.gz: ddab9d29dc217b890ba188904e1204112b140c9aa21f7e811306d0c92fee3d96ba33a47c25ea9deeedf6ff8bbc993fc83fc7dbe29bd6a0d271e9bdb55dee2e07
+  data.tar.gz: 3b2e99e4c7f2d0d11902f6f284412f9e21591798928dcc6d4242a4d054490bc4af8e0388313aefa2a8f6be41ca184e2e05821c631af7dfd45da6c9ba9aafc80f

data/lib/chef/knife/ec2_server_create.rb

@@ -28,9 +28,9 @@ class Chef
       include Knife::Ec2Base
 
       deps do
-        require "tempfile"
-        require "uri"
-        require "net/ssh"
+        require "tempfile" unless defined?(Tempfile)
+        require "uri" unless defined?(URI)
+        require "net/ssh" unless defined?(Net::SSH)
         require "net/ssh/gateway"
         Chef::Knife::Bootstrap.load_deps
       end
@@ -104,9 +104,11 @@ class Chef
         long: "--ebs-optimized",
         description: "Enabled optimized EBS I/O"
 
-      option :ebs_no_delete_on_term,
-        long: "--ebs-no-delete-on-term",
-        description: "Do not delete EBS volume on instance termination"
+      option :ebs_delete_on_term,
+        long: "--ebs-delete-on-term",
+        description: "Delete EBS volume on instance termination",
+        boolean: true,
+        default: true
 
       option :secret,
         long: "--secret ",
@@ -624,12 +626,18 @@ class Chef
           exit 1
         end
 
-        if config[:ebs_volume_type] && ! %w{gp2 io1 standard}.include?(config[:ebs_volume_type])
-          ui.error("--ebs-volume-type must be 'standard' or 'io1' or 'gp2'")
+        if config[:ebs_volume_type] && ! %w{gp2 io1 standard st1 sc1}.include?(config[:ebs_volume_type])
+          ui.error("--ebs-volume-type must be 'standard' or 'io1' or 'gp2' or 'st1' or 'sc1'")
           msg opt_parser
           exit 1
         end
 
+        # validation for ebs_size
+        if (%w{st1 sc1}.include?(config[:ebs_volume_type])) && ! config[:ebs_size].to_i.between?(500, 16384)
+          ui.error("--ebs-size should be in between 500-16384 for 'st1' or 'sc1' ebs volume type.")
+          exit 1
+        end
+
         if config[:security_groups] && config[:security_groups].class == String
           ui.error("Invalid value type for knife[:security_groups] in knife configuration file (i.e knife.rb/config.rb). Type should be array. e.g - knife[:security_groups] = ['sgroup1']")
           exit 1
@@ -826,7 +834,7 @@ class Chef
 
       # base64-encoded text
       def encode_data(text)
-        require "base64"
+        require "base64" unless defined?(Base64)
         Base64.encode64(text)
       end
 
@@ -907,7 +915,7 @@ class Chef
         attributes[:ebs_optimized] = !!config[:ebs_optimized]
 
         if ami.root_device_type == "ebs"
-          if config[:ebs_encrypted]
+          if config[:ebs_encrypted] || %w{st1 sc1}.include?(config[:ebs_volume_type])
             ami_map = ami.block_device_mappings[1]
           else
             ami_map = ami.block_device_mappings.first
@@ -924,11 +932,9 @@ class Chef
                        msg opt_parser
                        exit 1
                      end
-          delete_term = if config[:ebs_no_delete_on_term]
-                          "false"
-                        else
-                          ami_map.ebs.delete_on_termination if ami_map.ebs.respond_to?(:delete_on_termination)
-                        end
+
+          delete_term = config[:ebs_delete_on_term]
+
           iops_rate = begin
                         if config[:ebs_provisioned_iops]
                           Integer(config[:ebs_provisioned_iops]).to_s
@@ -957,7 +963,7 @@ class Chef
         if config[:ephemeral] && config[:ephemeral].length > 0
           ephemeral_blocks = []
           config[:ephemeral].each_with_index do |device_name, i|
-            ephemeral_blocks << { virtual_name: "ephemeral#{i}", device_name: device_name, ebs: { volume_size: ebs_size } }
+            ephemeral_blocks << { virtual_name: "ephemeral#{i}", device_name: device_name }
           end
           attributes[:block_device_mappings] += ephemeral_blocks
         end
@@ -1321,8 +1327,8 @@ class Chef
       end
 
       def decrypt_admin_password(encoded_password, key)
-        require "base64"
-        require "openssl"
+        require "base64" unless defined?(Base64)
+        require "openssl" unless defined?(OpenSSL)
         private_key = OpenSSL::PKey::RSA.new(key)
         encrypted_password = Base64.decode64(encoded_password)
         private_key.private_decrypt(encrypted_password)
@@ -1398,13 +1404,7 @@ class Chef
       end
 
       def server_name
-        return nil unless server
-
-        if !server.public_dns_name.empty?
-          server.public_dns_name
-        else
-          server.private_ip_address
-        end
+        server ? connection_host : nil
       end
 
       alias host_descriptor server_name

data/lib/chef/knife/ec2_server_delete.rb

@@ -148,7 +148,7 @@ class Chef
             server_data[id] = i.instances[0].send(id)
           end
 
-          server_data["name"] = i.instances[0].tags[0].value
+          server_data["name"] = find_name_tag(i.instances[0].tags)
           server_data["az"] = i.instances[0].placement.availability_zone
           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["security_groups"] = i.instances[0].security_groups.map(&:group_name).join(", ")

data/lib/chef/knife/ec2_server_list.rb

@@ -166,7 +166,7 @@ class Chef
           tags = extract_tags(i.instances[0].tags)
 
           if config[:name]
-            server_data["name"] = tags[0]
+            server_data["name"] = find_name_tag(i.instances[0].tags)
           end
 
           if config[:az]

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

@@ -151,7 +151,7 @@ class Chef
         server_data["id"] = server_data["instance_id"]
 
         tags = server_obj.instances[0].tags.map(&:value)
-        server_data["name"] = tags[0]
+        server_data["name"] = find_name_tag(server_obj.instances[0].tags)
         server_data["placement_group"] = server_obj.instances[0].placement.group_name
         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)
@@ -181,6 +181,13 @@ class Chef
         @ami ||= fetch_ami(config[:image])
       end
 
+      # Name tag value return.
+      # @return [String]
+      def find_name_tag(tags)
+        name_tag = tags.find { |tag| tag[:key] == "Name" }
+        name_tag ? name_tag[:value] : nil
+      end
+
       # Platform value return for Windows AMIs; otherwise, it is blank.
       # @return [Boolean]
       def is_image_windows?

data/lib/knife-ec2/version.rb

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