From d04f9ddcb54d8302fd4bb885af67c35a701a8c9a Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 9 Apr 2021 17:18:45 -0700 Subject: [PATCH 1/3] Fix typo Signed-off-by: Tim Smith --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0c01b378..d29f00bc 100644 --- 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 From 40f6421aea2d9376f9a7945b59fc1724276c560c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Mar 2021 05:37:13 +0000 Subject: [PATCH 2/3] Update chefstyle requirement from 1.7.2 to 1.7.4 Updates the requirements on [chefstyle](https://github.com/chef/chefstyle) to permit the latest version. - [Release notes](https://github.com/chef/chefstyle/releases) - [Changelog](https://github.com/chef/chefstyle/blob/master/CHANGELOG.md) - [Commits](https://github.com/chef/chefstyle/compare/v1.7.2...v1.7.4) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d29f00bc..167d745e 100644 --- a/Gemfile +++ b/Gemfile @@ -13,5 +13,5 @@ group :debug do end group :chefstyle do - gem "chefstyle", "1.7.2" + gem "chefstyle", "1.7.4" end \ No newline at end of file From cbdc7fe708072097dfabf6a4c1c4d6757ec68777 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 9 Apr 2021 17:19:38 -0700 Subject: [PATCH 3/3] Resolve chefstyle warnings in 1.7.4 Signed-off-by: Tim Smith --- lib/kitchen/driver/ec2.rb | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/kitchen/driver/ec2.rb b/lib/kitchen/driver/ec2.rb index 3f26936e..e6bbca8b 100644 --- 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