knife-ec2 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101ad79cef06c0ed4fefa6a7a7268472f8be49c7af9b4db0069769084a24f17e
-  data.tar.gz: 9645491d5482a1058b21d43ee933ab6a4e0a2f50bfded899a03ff530e63e127f
+  metadata.gz: 62b16f2073f8b2ee3ef35518c860b18f0e16a6734aa9f5578ed768e5ef4072af
+  data.tar.gz: 8334d4b0fb87418ddb12a244114067b1ff41c39a2bcf0e95f9c03d3812d6c672
 SHA512:
-  metadata.gz: 14c05f935d5c5c8b706ab43b8628732f4745845a7f064aa257b5d51ecc75c793738d9609cfae45455a5349d040db71ed3a7ea287900abe280e10e93497c08fbb
-  data.tar.gz: 3d6c72dd313f4144d782b91e213fb2fca0e0243c8fdb1742c4590c8142eda6e75f9574ef05d0153a11289fa7c7df469cd02991331aa99ba724a5874eb54dce2b
+  metadata.gz: 73b53887684bd8a895d761a1d89d2777daf7778b731524a13b055757bfbd4d83630052805cc584a40057736eb461f65d40fee6dc45ed434720ce62aa35957f58
+  data.tar.gz: f4de7a408a71457a8fa67ee99e071447331d73e842aed67bf1ccbe07e64bc8164e868b9fda32ae867b7bed885057f68c525b140af51c49c1f553741a1f5dd1c4

data/lib/chef/knife/ec2_server_create.rb

@@ -25,6 +25,10 @@ class Chef
   class Knife
     class Ec2ServerCreate < Chef::Knife::Bootstrap
 
+      GP_VOLUME_TYPES = %w{gp2 gp3}.freeze
+      IOPS_VOLUME_TYPES = %w{io1 io2}.freeze
+      EBS_VOLUME_TYPES = (%w{standard st1 sc1} + GP_VOLUME_TYPES + IOPS_VOLUME_TYPES).freeze
+
       include Knife::Ec2Base
 
       deps do
@@ -161,12 +165,12 @@ class Chef
 
       option :ebs_volume_type,
         long: "--ebs-volume-type TYPE",
-        description: "Possible values are standard (magnetic) | io1 | gp2 | sc1 | st1. Default is gp2",
-        default: "gp2"
+        description: "Possible values are #{EBS_VOLUME_TYPES.join(" | ")}. Default is gp3",
+        default: "gp3"
 
       option :ebs_provisioned_iops,
         long: "--provisioned-iops IOPS",
-        description: "IOPS rate, only used when ebs volume type is 'io1'",
+        description: "IOPS rate, only used when ebs volume type is '#{IOPS_VOLUME_TYPES.join(" or ")}'",
         default: nil
 
       option :validation_key_url,
@@ -495,13 +499,11 @@ class Chef
       end
 
       def validation_key_path
-        @validation_key_path ||= begin
-          if URI(config[:validation_key_url]).scheme == "file"
-            URI(config[:validation_key_url]).path
-          else
-            validation_key_tmpfile.path
-          end
-        end
+        @validation_key_path ||= if URI(config[:validation_key_url]).scheme == "file"
+                                   URI(config[:validation_key_url]).path
+                                 else
+                                   validation_key_tmpfile.path
+                                 end
       end
 
       # @return [Tempfile]
@@ -521,16 +523,14 @@ class Chef
       end
 
       def s3_validation_key
-        @s3_validation_key ||= begin
-          Chef::Knife::S3Source.fetch(config[:validation_key_url])
-        end
+        @s3_validation_key ||= Chef::Knife::S3Source.fetch(config[:validation_key_url], config)
       end
 
       def s3_secret
         @s3_secret ||= begin
           return false unless config[:s3_secret]
 
-          Chef::Knife::S3Source.fetch(config[:s3_secret])
+          Chef::Knife::S3Source.fetch(config[:s3_secret], config)
         end
       end
 
@@ -616,18 +616,18 @@ class Chef
           end
         end
 
-        if config[:ebs_provisioned_iops] && (config[:ebs_volume_type] != "io1")
-          ui.error("--provisioned-iops option is only supported for volume type of 'io1'")
+        if config[:ebs_provisioned_iops] && !IOPS_VOLUME_TYPES.include?(config[:ebs_volume_type])
+          ui.error("--provisioned-iops option is only supported for volume type of '#{IOPS_VOLUME_TYPES.join(" or ")}'")
           exit 1
         end
 
-        if (config[:ebs_volume_type] == "io1") && config[:ebs_provisioned_iops].nil?
-          ui.error("--provisioned-iops option is required when using volume type of 'io1'")
+        if IOPS_VOLUME_TYPES.include?(config[:ebs_volume_type]) && config[:ebs_provisioned_iops].nil?
+          ui.error("--provisioned-iops option is required when using volume type of '#{IOPS_VOLUME_TYPES.join(" or ")}'")
           exit 1
         end
 
-        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'")
+        if config[:ebs_volume_type] && ! EBS_VOLUME_TYPES.include?(config[:ebs_volume_type])
+          ui.error("--ebs-volume-type must be '#{EBS_VOLUME_TYPES.join("' or '")}'")
           msg opt_parser
           exit 1
         end
@@ -682,10 +682,12 @@ class Chef
           # validation for ebs_size and ebs_volume_type and ebs_encrypted
           if !config[:ebs_size]
             errors << "--ebs-encrypted option requires valid --ebs-size to be specified."
-          elsif (config[:ebs_volume_type] == "gp2") && ! config[:ebs_size].to_i.between?(1, 16384)
-            errors << "--ebs-size should be in between 1-16384 for 'gp2' ebs volume type."
+          elsif (GP_VOLUME_TYPES.include?(config[:ebs_volume_type])) && ! config[:ebs_size].to_i.between?(1, 16384)
+            errors << "--ebs-size should be in between 1-16384 for '#{GP_VOLUME_TYPES.join("' or '")}' ebs volume type."
           elsif (config[:ebs_volume_type] == "io1") && ! config[:ebs_size].to_i.between?(4, 16384)
             errors << "--ebs-size should be in between 4-16384 for 'io1' ebs volume type."
+          elsif (config[:ebs_volume_type] == "io2") && ! config[:ebs_size].to_i.between?(4, 65536)
+            errors << "--ebs-size should be in between 4-65536 for 'io2' ebs volume type."
           elsif (config[:ebs_volume_type] == "standard") && ! config[:ebs_size].to_i.between?(1, 1024)
             errors << "--ebs-size should be in between 1-1024 for 'standard' ebs volume type."
           end
@@ -757,8 +759,8 @@ class Chef
         user = connection_user.split("\\")
         if (user[0] == ".") || (user[0] == "") || (user.length == 1)
           user_related_commands = <<~EOH
-            net user /add #{connection_user.delete('.\\')} #{windows_password} #{@allow_long_password};
-            net localgroup Administrators /add #{connection_user.delete('.\\')};
+            net user /add #{connection_user.delete(".\\")} #{windows_password} #{@allow_long_password};
+            net localgroup Administrators /add #{connection_user.delete(".\\")};
           EOH
         end
         <<~EOH
@@ -953,7 +955,7 @@ class Chef
                ebs: {
                   delete_on_termination: delete_term,
                   volume_size: ebs_size,
-                  volume_type: config[:ebs_volume_type], # accepts standard, io1, gp2, sc1, st1
+                  volume_type: config[:ebs_volume_type], # accepts standard, io1, io2, gp2, gp3, sc1, st1
                 },
              }]
           attributes[:block_device_mappings][0][:ebs][:iops] = iops_rate unless iops_rate.nil? || iops_rate.empty?
@@ -1139,15 +1141,13 @@ class Chef
       # 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])
-            "private_ip_address"
-          else
-            server.public_dns_name ? "public_dns_name" : "public_ip_address"
-          end
-        end
+        @connect_attribute ||= if !!config[:server_connect_attribute]
+                                 config[:server_connect_attribute]
+                               elsif vpc_mode? && !(subnet_public_ip_on_launch? || config[:associate_public_ip] || config[:associate_eip])
+                                 "private_ip_address"
+                               else
+                                 server.public_dns_name ? "public_dns_name" : "public_ip_address"
+                               end
       end
 
       def create_tags(hashed_tags)

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

@@ -234,13 +234,11 @@ class Chef
     # if default location exists on disk fallback to that
     # @return [String, nil] location to aws credentials file or nil if none exists
     def aws_cred_file_location
-      @cred_file ||= begin
-        if !config[:aws_credential_file].nil?
-          config[:aws_credential_file]
-        else
-          Chef::Util::PathHelper.home(".aws", "credentials") if ::File.exist?(Chef::Util::PathHelper.home(".aws", "credentials"))
-        end
-      end
+      @cred_file ||= if !config[:aws_credential_file].nil?
+                       config[:aws_credential_file]
+                     else
+                       Chef::Util::PathHelper.home(".aws", "credentials") if ::File.exist?(Chef::Util::PathHelper.home(".aws", "credentials"))
+                     end
     end
 
     # @return [String]

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

@@ -17,11 +17,12 @@
 class Chef
   class Knife
     class S3Source
-      attr_accessor :url
+      attr_accessor :url, :config
 
-      def self.fetch(url)
+      def self.fetch(url, config)
         source = Chef::Knife::S3Source.new
         source.url = url
+        source.config = config
         source.body
       end
 

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "2.1.3".freeze
+    VERSION = "2.1.6".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.11'
+        version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.11'
+        version: '18.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="