kitchen-ec2 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab954ba95ae18b5a8af7013f2c2a62ac9437375ea4c4d9fa82c09448335b6ee
-  data.tar.gz: d721117b22321834df518eb5c0a8c14495141148546b48717a337f8953457c20
+  metadata.gz: f3b81a785bd64e6ae13091e71fe8faf3b295755fc9b30d4cee0c84246a107ea1
+  data.tar.gz: c0bfc45018438894ebb3775204d3e712ed5aef754a81b7588cb0cca79369e2ab
 SHA512:
-  metadata.gz: 19cff1d09410833ec15c2407d0e14a454c681f5d3044f50e6bb8713050e3ec7524c56b94d9232b8c09f7e25fe9f05fd7b28bff00bda60ba13de9ac1723520da2
-  data.tar.gz: ece685664f0dfb5e7aacb7af3e97d565f005f653a9be2f9ee7c6fbd7566f57a831aba2e3fc3c38a3b098159f3130a95f821c9021400d14f1d471b16fac7113d4
+  metadata.gz: 0d13f84f11907b1fb657dca1a400173be055420c30a7a5282af7273c7f1ecfd48485abdf24dc1d1fbe1fa67f4642564b080243f1fdae9d1e400052e3119e7f68
+  data.tar.gz: bb606e4db8b58e7ed57951cca247e4c8271fdbe5430ba59102f2524c0de9201ab46ea38fb431101f92ea02ac720ea508f5b59abb383ed4ffab5821f251366a71

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

@@ -31,6 +31,7 @@ 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 +80,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 +855,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.15.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.15.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -82,6 +82,7 @@ files:
 - 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 +92,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
@@ -106,8 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.3.16
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2
 test_files: []