kitchen-ec2 3.22.4 → 3.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c45dbb3160767d4ce660a83da145699c8e29f5fbb93b9ccb052ee8c4b8e5eb1
-  data.tar.gz: 8da4c4fdcc43e66e5ae58f722397f8663470b7c34167c3d47ec64219ec99824d
+  metadata.gz: d76b2f770574b013ffc87ef6c3f38bf57c6b7d768027f9a7c6740c547ce21c78
+  data.tar.gz: 44c62f491df393d54a17890c71ae7dce5c13d58268968a67cbbd7b84e8187f7f
 SHA512:
-  metadata.gz: 2b035d3317d7134b04811773347768ba33dfd3713ea3726ab124e2bfbc11afa54a23f3bd18f38fc7d01db9b9dd7b8c7d49cfdc4f1e0835e41281f1c6af9d1b4d
-  data.tar.gz: eb00b8d53f41145b6d2deec25c0a840f45be3d5a605907c8f886d52448f667ebcd6496ad279a0f9e82b56938dd1ffbd9a036eb57161e7c3ebef310f883feab08
+  metadata.gz: 6f0ee93c28b277c5b12dbe96b4b67a07ac31c698cd48932eda5bddf913e26216783bc54bf8931a73d8db6be9fcb8bcdaaa69d678fe12ed677c57d1338741eb5b
+  data.tar.gz: 0cff3dbfad8475ee34b916eec54dd10848dd3bb2e449ae6f142ff5680c3cbc4e52efdc208bd7474c9bd75150ed86a1f134c5f9c21d4fe9d78eee94fd90889ee4

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

@@ -81,7 +81,7 @@ module Kitchen
 
         # Allocate a new dedicated host for the configured instance type.
         #
-        # A `.metal` size occupies a whole host, so it is allocated for that
+        # A bare-metal size occupies a whole host, so it is allocated for that
         # exact type; every other size can share a host, so the whole instance
         # family is allocated and EC2 places instances within it.
         #
@@ -118,8 +118,8 @@ module Kitchen
             ],
           }
 
-          # ".metal" is a 1:1 association, everything else has multi-instance capability
-          if instance_size_from_type(config[:instance_type]) == "metal"
+          # Bare metal is a 1:1 association, everything else has multi-instance capability
+          if metal_instance_type?(config[:instance_type])
             request[:instance_type] = config[:instance_type]
           else
             request[:instance_family] = instance_family_from_type(config[:instance_type])
@@ -161,6 +161,20 @@ module Kitchen
           instance_type.split(".").last
         end
 
+        # Whether an instance type runs on bare metal.
+        #
+        # Older families expose a single bare-metal size named plainly
+        # ".metal". Newer ones expose several on the same family and name them
+        # ".metal-24xl", ".metal-48xl" and so on, so an equality check against
+        # "metal" would take them for virtualized sizes and allocate their host
+        # by family.
+        #
+        # @param instance_type [String] a type in "family.size" form, e.g. "m7i.metal-24xl"
+        # @return [Boolean] true when an instance of this type occupies a whole host
+        def metal_instance_type?(instance_type)
+          instance_size_from_type(instance_type).start_with?("metal")
+        end
+
         # Whether the user has opted in to allocating dedicated hosts.
         #
         # @return [Boolean]

data/lib/kitchen/driver/ec2.rb

@@ -415,17 +415,17 @@ module Kitchen
 
       # The instance type to use when the user did not choose one.
       #
-      # t2 instances require a hardware-virtualized image, so a paravirtual
+      # t3 instances require a hardware-virtualized image, so a paravirtual
       # image falls back to the older t1 family.
       #
       # @return [String] a free-tier instance type
       def default_instance_type
         @instance_type ||= if image && image.virtualization_type == "hvm"
-                             info("instance_type not specified. Using free tier t2.micro instance ...")
-                             "t2.micro"
+                             info("instance_type not specified. Using free tier t3.micro instance ...")
+                             "t3.micro"
                            else
                              info("instance_type not specified. Using free tier t1.micro instance since" \
-                                  " image is paravirtual (pick an hvm image to use the superior t2.micro!) ...")
+                                  " image is paravirtual (pick an hvm image to use the superior t3.micro!) ...")
                              "t1.micro"
                            end
       end

data/lib/kitchen/driver/ec2_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "3.22.4".freeze
+    EC2_VERSION = "3.22.6".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.22.4
+  version: 3.22.6
 platform: ruby
 authors:
 - Test Kitchen Team