Add support for mac1/mac2 instances

lib/kitchen/driver/aws/standard_platform.rb

@@ -27,6 +27,7 @@ class Aws
       # rhel
       # fedora
       # freebsd
+      # macos
       # ubuntu
       # windows
       #

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

lib/kitchen/driver/ec2.rb

@@ -31,6 +31,7 @@
 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"

spec/kitchen/driver/aws/image_selection_spec.rb

@@ -228,6 +228,16 @@ def new_instance(platform_name: "blarghle")
       { name: "architecture", values: %w{x86_64} },
     ],
 
+    "macos-12.5" => [
+      { name: "owner-id", values: %w{100343932686} },
+      { name: "name", values: %w{amzn-ec2-macos-12.5*} },
+    ],
+    "macos-12.6-arm64" => [
+      { name: "owner-id", values: %w{100343932686} },
+      { name: "name", values: %w{amzn-ec2-macos-12.6*} },
+      { name: "architecture", values: %w{arm64_mac} },
+    ],
+
     "ubuntu" => [
       { name: "owner-id", values: %w{099720109477} },
       { name: "name", values: %w{ubuntu/images/*/ubuntu-*-*} },