kitchen-ec2 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765177643e317a19c906f4d74bbeab0df60e3b24f40b56cf96cc1784511a2204
-  data.tar.gz: bdd75366f92fdfda91a3e6e07076cee7fc15eec5a4099bffb1e119d2abbe10c6
+  metadata.gz: a4993e5b97ddbe3fb98f8e58b9877bf90b3e0a165b521dc295d53dc9bcbbe192
+  data.tar.gz: 621bf0ddd53d9f8488ca6b7c351cf12c733cbcc534f23c30a3390b932fdc2e4e
 SHA512:
-  metadata.gz: ae46afd545a7228e429ccfc23dc8e55ec1e1526853ba2977020934a2d394bf1beffe3006f9205f5a39f35704329a3d965c2fc65a828cc1d49e5e2fd89214eadb
-  data.tar.gz: 2ba5bbfb8c4bbc9ac2dfd827f427dfb4ecc42d548aa5e7c6926fbb2bdc1dfa52904b06f0a76cac1f03fb174513e2b604970540020ee7c3b1b684dedf329684b7
+  metadata.gz: f62f3a41a041935cd4371e0cef514ec1a919f40ea8e21dc25bb84cec67dce7d97810469a3e220cc567daff040ba37da5cb026ddcb94aba0bdf86eec5adcffe6c
+  data.tar.gz: 7011bf26dc6e011af1af506b7ce9c42d5c26e1a19ff610896ed407200490d473b467dbf80a1260868e160e8d48da6792a1e0343dc5792eff2dbc09c7cee663fc

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

@@ -0,0 +1,52 @@
+#
+# Copyright:: 2023, Jared Kauppila
+#
+# 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://wiki.almalinux.org/cloud/AWS.html
+        class Alma < StandardPlatform
+          StandardPlatform.platforms["alma"] = self
+          StandardPlatform.platforms["almalinux"] = self
+
+          # default username for this platform's ami
+          # @return [String]
+          def username
+            "ec2-user"
+          end
+
+          def image_search
+            search = {
+              "owner-id" => "764336703387",
+              "name" => version ? "AlmaLinux OS #{version}*" : "AlmaLinux OS *",
+            }
+            search["architecture"] = architecture if architecture
+            search
+          end
+
+          def self.from_image(driver, image)
+            if /AlmaLinux OS/i.match?(image.name)
+              image.name =~ /\b(\d+(\.\d+)?)\b/i
+              new(driver, "alma", (Regexp.last_match || [])[1], image.architecture)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+#
+# Copyright:: 2023, Jared Kauppila
+#
+# 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 Rocky < StandardPlatform
+          StandardPlatform.platforms["rocky"] = self
+          StandardPlatform.platforms["rockylinux"] = self
+
+          # default username for this platform's ami
+          # @return [String]
+          def username
+            "rocky"
+          end
+
+          def image_search
+            search = {
+              "owner-id" => "792107900819",
+              "name" => version ? "Rocky-#{version}-*" : "Rocky-*",
+            }
+            search["architecture"] = architecture if architecture
+            search
+          end
+
+          def self.from_image(driver, image)
+            if /Rocky-/i.match?(image.name)
+              image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
+              new(driver, "rocky", (Regexp.last_match || [])[1], image.architecture)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/driver/ec2.rb

@@ -24,12 +24,14 @@ require_relative "aws/client"
 require_relative "aws/dedicated_hosts"
 require_relative "aws/instance_generator"
 require_relative "aws/standard_platform"
+require_relative "aws/standard_platform/alma"
 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/rocky"
 require_relative "aws/standard_platform/fedora"
 require_relative "aws/standard_platform/freebsd"
 require_relative "aws/standard_platform/macos"

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.16.0".freeze
+    EC2_VERSION = "3.17.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -76,6 +76,7 @@ files:
 - lib/kitchen/driver/aws/dedicated_hosts.rb
 - lib/kitchen/driver/aws/instance_generator.rb
 - lib/kitchen/driver/aws/standard_platform.rb
+- lib/kitchen/driver/aws/standard_platform/alma.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
@@ -85,6 +86,7 @@ files:
 - 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/rocky.rb
 - lib/kitchen/driver/aws/standard_platform/ubuntu.rb
 - lib/kitchen/driver/aws/standard_platform/windows.rb
 - lib/kitchen/driver/ec2.rb
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2