kitchen-ec2 3.15.0 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b81a785bd64e6ae13091e71fe8faf3b295755fc9b30d4cee0c84246a107ea1
-  data.tar.gz: c0bfc45018438894ebb3775204d3e712ed5aef754a81b7588cb0cca79369e2ab
+  metadata.gz: 765177643e317a19c906f4d74bbeab0df60e3b24f40b56cf96cc1784511a2204
+  data.tar.gz: bdd75366f92fdfda91a3e6e07076cee7fc15eec5a4099bffb1e119d2abbe10c6
 SHA512:
-  metadata.gz: 0d13f84f11907b1fb657dca1a400173be055420c30a7a5282af7273c7f1ecfd48485abdf24dc1d1fbe1fa67f4642564b080243f1fdae9d1e400052e3119e7f68
-  data.tar.gz: bb606e4db8b58e7ed57951cca247e4c8271fdbe5430ba59102f2524c0de9201ab46ea38fb431101f92ea02ac720ea508f5b59abb383ed4ffab5821f251366a71
+  metadata.gz: ae46afd545a7228e429ccfc23dc8e55ec1e1526853ba2977020934a2d394bf1beffe3006f9205f5a39f35704329a3d965c2fc65a828cc1d49e5e2fd89214eadb
+  data.tar.gz: 2ba5bbfb8c4bbc9ac2dfd827f427dfb4ecc42d548aa5e7c6926fbb2bdc1dfa52904b06f0a76cac1f03fb174513e2b604970540020ee7c3b1b684dedf329684b7

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

@@ -0,0 +1,51 @@
+#
+# Copyright:: 2016-2018, Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "../standard_platform"
+
+module Kitchen
+  module Driver
+    class Aws
+      class StandardPlatform
+        # https://docs.aws.amazon.com/linux/al2023/release-notes/relnotes.html
+        class Amazon2023 < StandardPlatform
+          StandardPlatform.platforms["amazon2023"] = self
+
+          # default username for this platform's ami
+          # @return [String]
+          def username
+            "ec2-user"
+          end
+
+          def image_search
+            search = {
+              "owner-id" => "137112412989",
+              "name" => version ? "al2023-ami-2023.0.#{version}*" : "al2023-ami-2023.0.*",
+            }
+            search["architecture"] = architecture if architecture
+            search
+          end
+
+          def self.from_image(driver, image)
+            if /al2023-ami/i.match?(image.name)
+              image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
+              new(driver, "amazon2023", (Regexp.last_match || [])[1], image.architecture)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,20 +24,10 @@ module Kitchen
           StandardPlatform.platforms["centos"] = self
 
           CENTOS_OWNER_ID = "125523088429".freeze
-          PRODUCT_CODES = {
-            "6" => "6x5jmcajty9edm3f211pqjfn2",
-            "7" => "aw0evgkw8e5c1q413zgy5pjce",
-            # It appears that v8 is not published to the
-            # AWS marketplace and hence does not have a product code
-          }.freeze
 
           # default username for this platform's ami
           # @return [String]
           def username
-            # Centos 6.x images use root as the username (but the "centos 6"
-            # updateable image uses "centos")
-            return "root" if version && version.start_with?("6.")
-
             "centos"
           end
 
@@ -45,22 +35,9 @@ module Kitchen
             # Version 8+ are published directly, not to the AWS marketplace. Use OWNER ID.
             search = {
               "owner-id" => CENTOS_OWNER_ID,
-              "name" => ["CentOS #{version}*", "CentOS-#{version}*-GA-*"],
+              "name" => ["CentOS #{version}*", "CentOS-#{version}*-GA-*", "CentOS Linux #{version}*", "CentOS Stream #{version}*"],
             }
 
-            if version && version.split(".").first.to_i < 8
-              # Versions <8 are published to the AWS marketplace and use a different naming convention
-              search = {
-                "owner-alias" => "aws-marketplace",
-                "name" => ["CentOS Linux #{version}*", "CentOS-#{version}*-GA-*"],
-              }
-              # For versions published to aws-marketplace, additionally filter on product code to
-              # avoid non-official AMIs. Can't use CentOS owner ID here, as the owner ID is that of aws marketplace.
-              # https://github.com/test-kitchen/kitchen-ec2/issues/456
-              PRODUCT_CODES.keys.each do |major_version|
-                search["product-code"] = PRODUCT_CODES[major_version] if version.start_with?(major_version)
-              end
-            end
             search["architecture"] = architecture if architecture
             search
           end

data/lib/kitchen/driver/ec2.rb

@@ -26,6 +26,7 @@ require_relative "aws/instance_generator"
 require_relative "aws/standard_platform"
 require_relative "aws/standard_platform/amazon"
 require_relative "aws/standard_platform/amazon2"
+require_relative "aws/standard_platform/amazon2023"
 require_relative "aws/standard_platform/centos"
 require_relative "aws/standard_platform/debian"
 require_relative "aws/standard_platform/rhel"

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.15.0".freeze
+    EC2_VERSION = "3.16.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.16.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -78,6 +78,7 @@ files:
 - lib/kitchen/driver/aws/standard_platform.rb
 - lib/kitchen/driver/aws/standard_platform/amazon.rb
 - lib/kitchen/driver/aws/standard_platform/amazon2.rb
+- lib/kitchen/driver/aws/standard_platform/amazon2023.rb
 - lib/kitchen/driver/aws/standard_platform/centos.rb
 - lib/kitchen/driver/aws/standard_platform/debian.rb
 - lib/kitchen/driver/aws/standard_platform/fedora.rb
@@ -100,14 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2