kitchen-ec2 3.14.0 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab954ba95ae18b5a8af7013f2c2a62ac9437375ea4c4d9fa82c09448335b6ee
-  data.tar.gz: d721117b22321834df518eb5c0a8c14495141148546b48717a337f8953457c20
+  metadata.gz: 765177643e317a19c906f4d74bbeab0df60e3b24f40b56cf96cc1784511a2204
+  data.tar.gz: bdd75366f92fdfda91a3e6e07076cee7fc15eec5a4099bffb1e119d2abbe10c6
 SHA512:
-  metadata.gz: 19cff1d09410833ec15c2407d0e14a454c681f5d3044f50e6bb8713050e3ec7524c56b94d9232b8c09f7e25fe9f05fd7b28bff00bda60ba13de9ac1723520da2
-  data.tar.gz: ece685664f0dfb5e7aacb7af3e97d565f005f653a9be2f9ee7c6fbd7566f57a831aba2e3fc3c38a3b098159f3130a95f821c9021400d14f1d471b16fac7113d4
+  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/aws/standard_platform/macos.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
+        class MacOS < StandardPlatform
+          StandardPlatform.platforms["macos"] = self
+
+          # default username for this platform's ami
+          # @return [String]
+          def username
+            "ec2-user"
+          end
+
+          def image_search
+            search = {
+              "owner-id" => "100343932686",
+              "name" => version ? "amzn-ec2-macos-#{version}*" : "amzn2-ec2-macos-*",
+            }
+            search["architecture"] = architecture if architecture
+            search["architecture"] = "arm64_mac" if architecture == "arm64"
+            search
+          end
+
+          def self.from_image(driver, image)
+            if /amzn-ec2-macos/i.match?(image.name)
+              image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
+              new(driver, "macos", (Regexp.last_match || [])[1], image.architecture)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,7 @@ module Kitchen
       # rhel
       # fedora
       # freebsd
+      # macos
       # ubuntu
       # windows
       #

data/lib/kitchen/driver/ec2.rb

@@ -26,11 +26,13 @@ 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"
 require_relative "aws/standard_platform/fedora"
 require_relative "aws/standard_platform/freebsd"
+require_relative "aws/standard_platform/macos"
 require_relative "aws/standard_platform/ubuntu"
 require_relative "aws/standard_platform/windows"
 require "aws-sdk-ec2"
@@ -79,6 +81,7 @@ module Kitchen
       default_config :aws_secret_access_key, nil
       default_config :aws_session_token,  nil
       default_config :aws_ssh_key_id,     ENV["AWS_SSH_KEY_ID"]
+      default_config :aws_ssh_key_type,   "rsa"
       default_config :image_id, &:default_ami
       default_config :image_search,       nil
       default_config :username,           nil
@@ -853,7 +856,7 @@ module Kitchen
         # to rapidly exhaust local entropy by creating a lot of keys. So this is
         # probably fine. If you want very high security, probably don't use this
         # feature anyway.
-        resp = ec2.client.create_key_pair(key_name: "kitchen-#{name_parts.join("-")}")
+        resp = ec2.client.create_key_pair(key_name: "kitchen-#{name_parts.join("-")}", key_type: config[:aws_ssh_key_type])
         state[:auto_key_id] = resp.key_name
         info("Created automatic key pair #{state[:auto_key_id]}")
         # Write the key out with safe permissions

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.14.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.14.0
+  version: 3.16.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -78,10 +78,12 @@ 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
 - lib/kitchen/driver/aws/standard_platform/freebsd.rb
+- lib/kitchen/driver/aws/standard_platform/macos.rb
 - lib/kitchen/driver/aws/standard_platform/rhel.rb
 - lib/kitchen/driver/aws/standard_platform/ubuntu.rb
 - lib/kitchen/driver/aws/standard_platform/windows.rb
@@ -91,7 +93,7 @@ homepage: https://github.com/test-kitchen/kitchen-ec2
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,15 +101,15 @@ 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.2.32
-signing_key: 
+rubygems_version: 3.4.3
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2
 test_files: []