kitchen-ec2 3.7.2 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0f97881aef017104ee3af2f9577a1303495d3f29dd46a8cf22c491e179022b
-  data.tar.gz: caf442b23b9b8ed51149f9ca5af1aaa41112d47b21ac6e2b00e3167d21506ad2
+  metadata.gz: 9bf47b3328885d0439de770cf9e683fb9bddbab66b0d0bf40f6ab17190c7cf15
+  data.tar.gz: 0e384572b5d252a367c9dd689f48d64764e4540a3ccba34399402eeca7a80226
 SHA512:
-  metadata.gz: 9e017c01b5a5a9ef3c811c92016bd72c83d108dd08836ed55fc4ee689f63813768f9b9c9a70131be64d29e89c0f1eb1c88951c7ff0c3ae01177f9cd56fb30029
-  data.tar.gz: f020ac63fb41ee6b51b1829ec2a8b5122876ebfb8c0bca669b1872fc9e5a5108f332b02d3de2b008d079c7833bb6fee68957249fbbebfa7b30ab062c6ce50b12
+  metadata.gz: 2dba5e5835f48d9505a967b7d1c64f76cfd70532a6956f8c8bada246814f5affa0ebfc09176354e7f719663347056f3332176489e64b8471f073cb2452f055f6
+  data.tar.gz: 787c72dc701db53331e399c0080d0bcce09d9657e8814bddf3d359186ed30d409391c068b545b09dbce9a527d0fcb793d3a79197058933f5f40d3d2dd21fcbeb

data/lib/kitchen/driver/aws/client.rb

@@ -75,6 +75,13 @@ module Kitchen
           ).to_a[0]
         end
 
+        # check if instance exists, given an id
+        # @param id [String] aws instance id
+        # @return boolean
+        def instance_exists?(id)
+          resource.instance(id).exists?
+        end
+
         def client
           @client ||= ::Aws::EC2::Client.new
         end

data/lib/kitchen/driver/aws/standard_platform/debian.rb

@@ -23,8 +23,8 @@ module Kitchen
         class Debian < StandardPlatform
           StandardPlatform.platforms["debian"] = self
 
-          # 10/11 are listed last since we default to the first item in the hash
-          # and 10/11 are not released yet. When they're released move them up
+          # 11/12 are listed last since we default to the first item in the hash
+          # and 11/12 are not released yet. When they're released move them up
           DEBIAN_CODENAMES = {
             10 => "buster",
             9 => "stretch",

data/lib/kitchen/driver/aws/standard_platform.rb

@@ -210,10 +210,10 @@ module Kitchen
           images = images.sort_by(&:creation_date).reverse
           # P5: We prefer x86_64 over i386 (if available)
           images = prefer(images) { |image| image.architecture == "x86_64" }
-          # P4: We prefer gp2 (SSD) (if available)
+          # P4: We prefer (SSD) (if available)
           images = prefer(images) do |image|
             image.block_device_mappings.any? do |b|
-              b.device_name == image.root_device_name && b.ebs && b.ebs.volume_type == "gp2"
+              b.device_name == image.root_device_name && b.ebs && %w{gp3 gp2}.any? { |t| b.ebs.volume_type == t }
             end
           end
           # P3: We prefer ebs over instance_store (if available)

data/lib/kitchen/driver/ec2.rb

@@ -56,7 +56,8 @@ module Kitchen
       default_config :shared_credentials_profile, ENV["AWS_PROFILE"]
       default_config :availability_zone, nil
       default_config :instance_type, &:default_instance_type
-      default_config :ebs_optimized,      false
+      default_config :ebs_optimized, false
+      default_config :delete_on_termination, true
       default_config :security_group_ids, nil
       default_config :security_group_filter, nil
       default_config :security_group_cidr_ip, "0.0.0.0/0"
@@ -260,13 +261,14 @@ module Kitchen
 
         info("EC2 instance <#{state[:server_id]}> ready (hostname: #{state[:hostname]}).")
         instance.transport.connection(state).wait_until_ready
+        attach_network_interface(state) unless config[:elastic_network_interface_id].nil?
         create_ec2_json(state) if /chef/i.match?(instance.provisioner.name)
         debug("ec2:create '#{state[:hostname]}'")
-      rescue Exception
+      rescue Exception => e
         # Clean up any auto-created security groups or keys on the way out.
         delete_security_group(state)
         delete_key(state)
-        raise
+        raise "#{e.message} in the specified region #{config[:region]}. Please check this AMI is available in this region."
       end
 
       def destroy(state)
@@ -283,7 +285,7 @@ module Kitchen
           # If we are going to clean up an automatic security group, we need
           # to wait for the instance to shut down. This slightly breaks the
           # subsystem encapsulation, sorry not sorry.
-          if state[:auto_security_group_id] && server
+          if state[:auto_security_group_id] && server && ec2.instance_exists?(state[:server_id])
             server.wait_until_terminated do |waiter|
               waiter.max_attempts = config[:retryable_tries]
               waiter.delay = config[:retryable_sleep]
@@ -318,17 +320,14 @@ module Kitchen
       end
 
       def default_instance_type
-        @instance_type ||= begin
-          # We default to the free tier (t2.micro for hvm, t1.micro for paravirtual)
-          if image && image.virtualization_type == "hvm"
-            info("instance_type not specified. Using free tier t2.micro instance ...")
-            "t2.micro"
-          else
-            info("instance_type not specified. Using free tier t1.micro instance since" \
-                 " image is paravirtual (pick an hvm image to use the superior t2.micro!) ...")
-            "t1.micro"
-          end
-        end
+        @instance_type ||= if image && image.virtualization_type == "hvm"
+                             info("instance_type not specified. Using free tier t2.micro instance ...")
+                             "t2.micro"
+                           else
+                             info("instance_type not specified. Using free tier t1.micro instance since" \
+                                  " image is paravirtual (pick an hvm image to use the superior t2.micro!) ...")
+                             "t1.micro"
+                           end
       end
 
       # The actual platform is the platform detected from the image
@@ -459,12 +458,10 @@ module Kitchen
 
         errs = []
         configs.each do |conf|
-          begin
-            @config = conf
-            return submit_spot
-          rescue => e
-            errs.append(e)
-          end
+          @config = conf
+          return submit_spot
+        rescue => e
+          errs.append(e)
         end
         raise ["Could not create a spot instance:", errs].flatten.join("\n")
       end
@@ -473,7 +470,6 @@ module Kitchen
         debug("Creating EC2 Spot Instance..")
         instance_data = instance_generator.ec2_instance_data
 
-        request_duration = config[:spot_wait]
         config_spot_price = config[:spot_price].to_s
         if %w{ondemand on-demand}.include?(config_spot_price)
           spot_price = ""
@@ -481,9 +477,10 @@ module Kitchen
           spot_price = config_spot_price
         end
         spot_options = {
-          spot_instance_type: "persistent", # Cannot use one-time with valid_until
-          valid_until: Time.now + request_duration,
-          instance_interruption_behavior: "stop",
+          # Must use one-time in order to use instance_interruption_behavior=terminate
+          # spot_instance_type: "one-time", # default
+          # Must use instance_interruption_behavior=terminate in order to use block_duration_minutes
+          # instance_interruption_behavior: "terminate", # default
         }
         if config[:block_duration_minutes]
           spot_options[:block_duration_minutes] = config[:block_duration_minutes]
@@ -785,7 +782,9 @@ module Kitchen
               ip_protocol: "tcp",
               from_port: port,
               to_port: port,
-              ip_ranges: [{ cidr_ip: config[:security_group_cidr_ip] }],
+              ip_ranges: Array(config[:security_group_cidr_ip]).map do |cidr_ip|
+                { cidr_ip: cidr_ip }
+              end,
             }
           end
         )
@@ -826,6 +825,31 @@ module Kitchen
         state[:ssh_key] = key_path
       end
 
+      def attach_network_interface(state)
+        info("Attaching Network interface <#{config[:elastic_network_interface_id]}> with the instance <#{state[:server_id]}> .")
+        client = ::Aws::EC2::Client.new(region: config[:region])
+        begin
+          check_eni = client.describe_network_interface_attribute({
+            attribute: "attachment",
+            network_interface_id: config[:elastic_network_interface_id],
+          })
+          if check_eni.attachment.nil?
+            unless state[:server_id].nil?
+              client.attach_network_interface({
+              device_index: 1,
+              instance_id: state[:server_id],
+              network_interface_id: config[:elastic_network_interface_id],
+              })
+              info("Attached Network interface <#{config[:elastic_network_interface_id]}> with the instance <#{state[:server_id]}> .")
+            end
+          else
+            puts "ENI #{config[:elastic_network_interface_id]} already attached."
+          end
+        rescue ::Aws::EC2::Errors::InvalidNetworkInterfaceIDNotFound => e
+          warn("#{e}")
+        end
+      end
+
       # Clean up a temporary security group for this instance.
       #
       # @api private

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "3.7.2".freeze
+    EC2_VERSION = "3.10.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.10.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -19,7 +19,7 @@ dependencies:
         version: 1.4.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.4.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -64,90 +64,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: climate_control
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Test Kitchen Driver for Amazon EC2
 email:
 - fnichol@nichol.ca
@@ -182,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2