knife-ec2 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c34fa2e9535195634d8a10601644c01c708584db8dd67114a583980d6df21c
-  data.tar.gz: 6ddb72f9b0538218edbb5293ee9ed87dfd5fe29eae1766206a9c017c26ba1c8c
+  metadata.gz: fe1ebf8d54dad92978109ce3af6069df518ccd163583dadff486b7492f798cf1
+  data.tar.gz: d8f036bc63ee4d7b30bd3656ebda5a8f4f2425b7e12b004e6603b9b909a23ae7
 SHA512:
-  metadata.gz: 395034c7c53dbce57370882f376444a9a633e1affc953ef030a28c6d9369af8def67e800de10f32404091a480f6fb3051d7340960dedc0e1ea8fe721e5396a4c
-  data.tar.gz: db14778ebc52428e00d1aa4e998edafa7a789e906d8fbeb5c92037178ba76c4e5799abc55cbe50388a415cc602e2980c29c00c66283bfab4f9ea18713349c660
+  metadata.gz: 5e5185a70b989ab3594cf73011e8c01f3cafb3449e22c64bc31012ab38d37cad35e7142e9b5070b80ad761f0fb38a623b374e26d20a25ee4ce9ef40eca7981cd
+  data.tar.gz: a93a5c8a752e0745c7c30dd2f42d20c718b83e21192da44a50920ed363e139d48f0bd2b36e511a17c3e8f33c8e6b7940d5ace38ff1d0426fefce0cd7a9a4369b

data/lib/chef/knife/ec2_server_create.rb

@@ -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
@@ -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

data/lib/knife-ec2/version.rb

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