kitchen-ec2 3.9.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac8aebec145ee67e00276453fd2f8a1aaae0466d58bec03ffdc8b368f001118
-  data.tar.gz: f14c9b4f85a0ebd1bf5c6398efc54b93e195e465ef4fc1c944688f96f53f1d39
+  metadata.gz: 8db131041ca62ab75984ff3a397e349838a750a6041bb4e57467e6bd74918b3f
+  data.tar.gz: 171e39a4ff4eafb0bdf80789c517813360c8438e992329c76562815d3cf31719
 SHA512:
-  metadata.gz: d1e8f020cde0872c27abade96517dae1dcafa5d50aa4b08245ec928adfc024e309cc1977e5bdaebb30f3dfcea1f463ee01dabfe62baf4a0640b8bce527aa80b4
-  data.tar.gz: 958a08022889c1bef5e0becc8cd75d53b5a0cd68445043c0c934bdc9a03822afcd9cc6f6dc49f15fe63928933f61f6d383d3b3bd3b7ad278d851f2c4957726a1
+  metadata.gz: ed0a53d4b538412b96dbf872bf7a1dbebd0c64a65ed0620d506164296aade28893d410fb508a7073fa7a9ce7829f0a26afc88ecae1aecd2f972e3cea21bcaff6
+  data.tar.gz: 0de4ad1727d5c286ae3d1fabc39d49b61b186dfbccfd6ba9e0275f85d3db00d9ccbf71ed1cfb10c4dd821b027836d6b3dcf3c2a0d7e75be895b21c9dd216b35d

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,16 +23,17 @@ module Kitchen
         class Debian < StandardPlatform
           StandardPlatform.platforms["debian"] = self
 
-          # 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
+          # 12/13 are listed last since we default to the first item in the hash
+          # and 12/13 are not released yet. When they're released move them up
           DEBIAN_CODENAMES = {
+            11 => "bullseye",
             10 => "buster",
             9 => "stretch",
             8 => "jessie",
             7 => "wheezy",
             6 => "squeeze",
-            11 => "bullseye",
             12 => "bookworm",
+            13 => "trixie",
           }.freeze
 
           # default username for this platform's ami
@@ -51,11 +52,23 @@ module Kitchen
           end
 
           def image_search
-            search = {
-              "owner-id" => "379101102735",
-              "name" => "debian-#{codename}-*",
-            }
+            search = {}
+
+            # The Debian AWS owner ID changed for releases 10 and onwards
+            # See https://wiki.debian.org/Amazon/EC2/HowTo/awscli
+            if version.nil?
+              search["owner-id"] = "136693071363"
+              search["name"] = "debian-#{DEBIAN_CODENAMES.keys.first}-*"
+            elsif version.to_i >= 10
+              search["owner-id"] = "136693071363"
+              search["name"] = "debian-#{version.to_i}-*"
+            else
+              search["owner-id"] = "379101102735"
+              search["name"] = "debian-#{codename}-*"
+            end
+
             search["architecture"] = architecture if architecture
+
             search
           end
 

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

@@ -134,7 +134,7 @@ module Kitchen
 
           def windows_name_filter # rubocop:disable Metrics/MethodLength
             major, revision, service_pack = windows_version_parts
-            if major == 2019 || major == 2016
+            if major == 2022 || major == 2019 || major == 2016
               "Windows_Server-#{major}-English-Full-Base-*"
             elsif major == 1709 || major == 1803
               "Windows_Server-#{major}-English-Core-ContainersLatest-*"

data/lib/kitchen/driver/ec2.rb

@@ -261,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)
@@ -284,14 +285,17 @@ 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
-            server.wait_until_terminated do |waiter|
-              waiter.max_attempts = config[:retryable_tries]
-              waiter.delay = config[:retryable_sleep]
-              waiter.before_attempt do |attempts|
-                info "Waited #{attempts * waiter.delay}/#{waiter.delay * waiter.max_attempts}s for instance <#{server.id}> to terminate."
-              end
+          if state[:auto_security_group_id] && server && ec2.instance_exists?(state[:server_id])
+            wait_log = proc do |attempts|
+              c = attempts * config[:retryable_sleep]
+              t = config[:retryable_tries] * config[:retryable_sleep]
+              info "Waited #{c}/#{t}s for instance <#{server.id}> to terminate."
             end
+            server.wait_until_terminated(
+              max_attempts: config[:retryable_tries],
+              delay: config[:retryable_sleep],
+              before_attempt: wait_log
+            )
           end
           info("EC2 instance <#{state[:server_id]}> destroyed.")
           state.delete(:server_id)
@@ -364,7 +368,7 @@ module Kitchen
         if actual_platform &&
             instance.transport[:username] == instance.transport.class.defaults[:username]
           debug("No SSH username specified: using default username #{actual_platform.username} " \
-                " for image #{config[:image_id]}, which we detected as #{actual_platform}.")
+                "for image #{config[:image_id]}, which we detected as #{actual_platform}.")
           state[:username] = actual_platform.username
         end
       end
@@ -824,6 +828,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.9.0".freeze
+    EC2_VERSION = "3.11.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-11-11 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
@@ -98,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2