Merge pull request #538 from test-kitchen/dependabot/bundler/chefstyl…

…e-1.7.4 Update chefstyle requirement from 1.7.2 to 1.7.4
test-kitchen · Apr 10, 2021 · 3d02fc6 · 3d02fc6
2 parents 67dd51d + cbdc7fe
commit 3d02fc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-# Specify your gem"s dependencies in kitchen-ec2.gemspec
+# Specify your gem's dependencies in kitchen-ec2.gemspec
 gemspec
 
 group :test do
@@ -13,5 +13,5 @@ group :debug do
 end
 
 group :chefstyle do
-  gem "chefstyle", "1.7.2"
+  gem "chefstyle", "1.7.4"
 end
diff --git a/lib/kitchen/driver/ec2.rb b/lib/kitchen/driver/ec2.rb
@@ -319,17 +319,14 @@ def image
       end
 
       def default_instance_type
-        @instance_type ||= begin
-          # We default to the free tier (t2.micro for hvm, t1.micro for paravirtual)
-          if image && image.virtualization_type == "hvm"
-            info("instance_type not specified. Using free tier t2.micro instance ...")
-            "t2.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!) ...")
-            "t1.micro"
-          end
-        end
+        @instance_type ||= if image && image.virtualization_type == "hvm"
+                             info("instance_type not specified. Using free tier t2.micro instance ...")
+                             "t2.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!) ...")
+                             "t1.micro"
+                           end
       end
 
       # The actual platform is the platform detected from the image