kitchen-ec2 3.10.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5acaa7d4d497244e97e35e4d8c44f1b0a8771100dfb0ef01cae937a7904a853
-  data.tar.gz: 92a4bb2ffeb6c84295fc6432e0c0852e63e11f1a4cbea7ae4fad54888ad9869e
+  metadata.gz: f76f759771ac4c8597dacffcf992e7d33fe1784c61be5ae6c84f00c77633b141
+  data.tar.gz: 324f1dd4944162dcd51bd6569dbfbabe9701ec58f6c1f8bf02ff96811bf48c65
 SHA512:
-  metadata.gz: fb7fc3f4d93a893455e274f0744c510526a79c2bd997bf6ef712f9e7774ab13a077b2c038402d7c41eaf8610f7b0bff9abeddddc5633b36c2e1142bfe72c4779
-  data.tar.gz: 44f07e5fb729c8fd106e3df0030a7d267322ebd80220f19f115e2f8addc6148a1ebd5c2da05bb4e5f84867c74b1889a4131881183f8f89ed5f67bde776e7ac7d
+  metadata.gz: 48c946144405da7ec33817582d1115ac68dc76486307d86b8d7519a238d0aa0637d03152a0aad3b96fdfad25955e40eb96c513c862f7794f1ec4aeca3d029558
+  data.tar.gz: 136f94bcf170b07848f8bd7dd56d2918e38482003ece6d0da4029790651e60c1cd25ddd0e13749e6d90efdf6f6cf346f9d6d2eba17c45067db04ac8e4662558d

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/instance_generator.rb

@@ -47,15 +47,19 @@ module Kitchen
           vpc_id = nil
           client = ::Aws::EC2::Client.new(region: config[:region])
           if config[:subnet_id].nil? && config[:subnet_filter]
-            subnets = client.describe_subnets(
-              filters: [
+            filters = [config[:subnet_filter]].flatten
+
+            r = { filters: [] }
+            filters.each do |subnet_filter|
+              r[:filters] <<
                 {
-                  name: "tag:#{config[:subnet_filter][:tag]}",
-                  values: [config[:subnet_filter][:value]],
-                },
-              ]
-            ).subnets
-            raise "The subnet tagged '#{config[:subnet_filter][:tag]}:#{config[:subnet_filter][:value]}' does not exist!" unless subnets.any?
+                  name: "tag:#{subnet_filter[:tag]}",
+                  values: [subnet_filter[:value]],
+                }
+            end
+
+            subnets = client.describe_subnets(r).subnets
+            raise "Subnets with tags '#{filters}' not found during security group creation" if subnets.empty?
 
             # => Select the least-populated subnet if we have multiple matches
             subnet = subnets.max_by { |s| s[:available_ip_address_count] }

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

@@ -265,9 +265,8 @@ module Kitchen
         create_ec2_json(state) if /chef/i.match?(instance.provisioner.name)
         debug("ec2:create '#{state[:hostname]}'")
       rescue Exception => e
-        # Clean up any auto-created security groups or keys on the way out.
-        delete_security_group(state)
-        delete_key(state)
+        # Clean up the instance and any auto-created security groups or keys on the way out.
+        destroy(state)
         raise "#{e.message} in the specified region #{config[:region]}. Please check this AMI is available in this region."
       end
 
@@ -285,14 +284,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)
@@ -365,7 +367,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
@@ -430,15 +432,21 @@ module Kitchen
         else
           # => Enable cascading through matching subnets
           client = ::Aws::EC2::Client.new(region: config[:region])
-          subnets = client.describe_subnets(
-            filters: [
+
+          filters = [config[:subnet_filter]].flatten
+
+          r = { filters: [] }
+          filters.each do |subnet_filter|
+            r[:filters] <<
               {
-                name: "tag:#{config[:subnet_filter][:tag]}",
-                values: [config[:subnet_filter][:value]],
-              },
-            ]
-          ).subnets
-          raise "A subnet matching '#{config[:subnet_filter][:tag]}:#{config[:subnet_filter][:value]}' does not exist!" unless subnets.any?
+                name: "tag:#{subnet_filter[:tag]}",
+                values: [subnet_filter[:value]],
+              }
+          end
+
+          subnets = client.describe_subnets(r).subnets
+
+          raise "Subnets with tags '#{filters}' not found!" if subnets.empty?
 
           configs = subnets.map do |subnet|
             new_config = config.clone
@@ -748,8 +756,19 @@ module Kitchen
 
                    subnets.first.vpc_id
                  elsif config[:subnet_filter]
-                   subnets = ec2.client.describe_subnets(filters: [{ name: "tag:#{config[:subnet_filter][:tag]}", values: [config[:subnet_filter][:value]] }]).subnets
-                   raise "Subnets with tag '#{config[:subnet_filter][:tag]}=#{config[:subnet_filter][:value]}' not found during security group creation" if subnets.empty?
+                   filters = [config[:subnet_filter]].flatten
+
+                   r = { filters: [] }
+                   filters.each do |subnet_filter|
+                     r[:filters] << {
+                       name: "tag:#{subnet_filter[:tag]}",
+                       values: [subnet_filter[:value]],
+                     }
+                   end
+
+                   subnets = ec2.client.describe_subnets(r).subnets
+
+                   raise "Subnets with tags '#{filters}' not found during security group creation" if subnets.empty?
 
                    subnets.first.vpc_id
                  else

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.10.0".freeze
+    EC2_VERSION = "3.12.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -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.32
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2