knife-ec2 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef05c55a30683b3d13f24ce894e045d99821f9ea7095e42f37e4b86c9afc902d
-  data.tar.gz: 736e4a47597fa1b9658164d7ecffcde6b53d482bf5dec5ea4367d97e1daf21fe
+  metadata.gz: e4f43a6515a88b80445a05b61b03dda664c4ca4ae24e6e592f26afc6c65c6d24
+  data.tar.gz: fa1c4d420f2139ae9e7f737a1f6f063ab1627f6a8fde268d46520e4bd7807f2d
 SHA512:
-  metadata.gz: c7c690c5688b082d89603fbd1462d4eec4031c25478d87bed4980e610cd7d76724509f094bc09fd31f029eb3f44e64d604ea5383b0c034cd32f6a05737caca33
-  data.tar.gz: 268877c15f34cbc1617a35dd093e1a27b57be169f1b843b20fa58e5768c9c6350bb5e5895b3d397efc2bc03ff445458a6febcc00d70b4ba5a9c967d53c9cf960
+  metadata.gz: 8ec76eff0479dd69474094ff0c4cfc1ad216a5bb4eb95a8053b33bf85600fe9bedef43b62eb6447fe4e1c0f0df5b18904df353168ab90f9ccaf44bba767be188
+  data.tar.gz: ca9413bd62b4f62631251dc8ba536553636cee0b8b72f7964b5fd0b12955aeae0bf04128b59f9a6ac2df4a547a287a6660c2d4803fa8d431460240e7d6e1de09

data/lib/chef/knife/ec2_ami_list.rb

@@ -27,7 +27,7 @@ class Chef
     # By default owner is aws-marketplace but you can specify following owner with the help of -o or --owner
     #   * self => Displays the list of AMIs created by the user
     #   * aws-marketplace => Displays all AMIs form trusted vendors like Ubuntu, Microsoft, SAP, Zend as well as many open source offering
-    #   * micosoft => Displays only Microsoft vendor AMIs
+    #   * microsoft => Displays only Microsoft vendor AMIs
     #
     # == Platform
     # By default all platform AMI's will display but you can filter your response

data/lib/chef/knife/ec2_flavor_list.rb

@@ -27,7 +27,7 @@ class Chef
       banner "knife ec2 flavor list (options) [DEPRECATED]"
 
       def run
-        ui.error("knife ec2 flavor list has been deprecated as this functionality is not provided by the AWS API the previous implementatin relied upon hardcoded values that were often incorrect. For an up to date list of instance types see https://www.ec2instances.info/")
+        ui.error("knife ec2 flavor list has been deprecated as this functionality is not provided by the AWS API the previous implementation relied upon hardcoded values that were often incorrect. For an up to date list of instance types see https://www.ec2instances.info/")
         exit 1
       end
     end

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
@@ -708,7 +716,7 @@ class Chef
 
         if winrm?
           reg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,40}$/
-          unless config[:connection_password] =~ reg
+          unless config[:connection_password]&.match?(reg)
             ui.error("Complexity requirements are not met. Password length should be 8-40 characters and include: 1 uppercase, 1 lowercase, 1 digit, and 1 special character")
             exit 1
           end
@@ -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
@@ -1321,12 +1327,11 @@ 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)
-        password = private_key.private_decrypt(encrypted_password)
-        password
+        private_key.private_decrypt(encrypted_password)
       end
 
       def check_windows_password_available(server_id)
@@ -1347,7 +1352,7 @@ class Chef
               data = File.read(config[:ssh_identity_file])
               config[:connection_password] = decrypt_admin_password(response.password_data, data)
             else
-              print "\n#{ui.color("Fetchig instance details: \n", :magenta)}"
+              print "\n#{ui.color("Fetching instance details: \n", :magenta)}"
             end
           else
             ui.error("Cannot find SSH Identity file, required to fetch dynamically generated password")
@@ -1399,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.0".freeze
+    VERSION = "2.1.1".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.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef