kitchen-ec2 3.10.1 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bf47b3328885d0439de770cf9e683fb9bddbab66b0d0bf40f6ab17190c7cf15
-  data.tar.gz: 0e384572b5d252a367c9dd689f48d64764e4540a3ccba34399402eeca7a80226
+  metadata.gz: 862c1fd03a10f0ad6125f5ea8f5126bf5660e1b7050f9b550001bc7ab9302d91
+  data.tar.gz: f093d5cf16248830e3ab5aa1567354567bf6568e2a9b8d40d5fe5be4711c915f
 SHA512:
-  metadata.gz: 2dba5e5835f48d9505a967b7d1c64f76cfd70532a6956f8c8bada246814f5affa0ebfc09176354e7f719663347056f3332176489e64b8471f073cb2452f055f6
-  data.tar.gz: 787c72dc701db53331e399c0080d0bcce09d9657e8814bddf3d359186ed30d409391c068b545b09dbce9a527d0fcb793d3a79197058933f5f40d3d2dd21fcbeb
+  metadata.gz: 3dbea4d3b992f1aebb989f8e894e040ed281d877694474a62afe67ceb4335e18e49463b3039b0c7996ad868f6fda843ff30a625fa92fb479912a4f552b591d23
+  data.tar.gz: 2367f3182eae5baee7e1b86785961b8f54c0820f9a7bfe35e7e1f8ef3f3731514eb5384166a1229f064df02246208d46950173611537d4868b1ff2883d5577e8

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_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -98,7 +98,7 @@ 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:
   - - ">="