kitchen-ec2 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effb6d0cc14377657291cd970e2a6d50680d91df937b6799f0a942a2fba59994
-  data.tar.gz: a2a0b678c22cf3da32be2ee90cb542cc2c2dff015fb3563ea7783b85ddd57649
+  metadata.gz: 0f0f97881aef017104ee3af2f9577a1303495d3f29dd46a8cf22c491e179022b
+  data.tar.gz: caf442b23b9b8ed51149f9ca5af1aaa41112d47b21ac6e2b00e3167d21506ad2
 SHA512:
-  metadata.gz: 2761f62c4647000ee4b12ac11a0080f49bb5492c296e08a22c598d1bfb0a0ea993b7d0409c04003d7819d7f287dd9fd65b611f2135c8edf69a5e36421549ea2c
-  data.tar.gz: 96b9d6c0062d85baafa9febca4fe0567f2659dc505c3e89da85caa3b6f82590f5a981d8df2907ee1f15709374e1e31f833f4cbb940a87b83283086e11084adab
+  metadata.gz: 9e017c01b5a5a9ef3c811c92016bd72c83d108dd08836ed55fc4ee689f63813768f9b9c9a70131be64d29e89c0f1eb1c88951c7ff0c3ae01177f9cd56fb30029
+  data.tar.gz: f020ac63fb41ee6b51b1829ec2a8b5122876ebfb8c0bca669b1872fc9e5a5108f332b02d3de2b008d079c7833bb6fee68957249fbbebfa7b30ab062c6ce50b12

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

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #

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

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
@@ -17,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "base64"
+require "base64" unless defined?(Base64)
 require "aws-sdk-ec2"
 
 module Kitchen
@@ -59,7 +58,7 @@ module Kitchen
             raise "The subnet tagged '#{config[:subnet_filter][:tag]}:#{config[:subnet_filter][:value]}' does not exist!" unless subnets.any?
 
             # => Select the least-populated subnet if we have multiple matches
-            subnet = subnets.sort_by { |s| s[:available_ip_address_count] }.last
+            subnet = subnets.max_by { |s| s[:available_ip_address_count] }
             vpc_id = subnet.vpc_id
             config[:subnet_id] = subnet.subnet_id
           end
@@ -133,7 +132,7 @@ module Kitchen
 
           availability_zone = config[:availability_zone]
           if availability_zone
-            if availability_zone =~ /^[a-z]$/i
+            if /^[a-z]$/i.match?(availability_zone)
               availability_zone = "#{config[:region]}#{availability_zone}"
             end
             i[:placement] = { availability_zone: availability_zone.downcase }
@@ -176,7 +175,7 @@ module Kitchen
           end
           availability_zone = config[:availability_zone]
           if availability_zone
-            if availability_zone =~ /^[a-z]$/i
+            if /^[a-z]$/i.match?(availability_zone)
               availability_zone = "#{config[:region]}#{availability_zone}"
             end
             i[:placement] = { availability_zone: availability_zone.downcase }

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

@@ -39,7 +39,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /amzn-ami/i
+            if /amzn-ami/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
               new(driver, "amazon", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -39,7 +39,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /amzn2-ami/i
+            if /amzn2-ami/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
               new(driver, "amazon2", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -75,7 +75,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /centos/i
+            if /centos/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+)?)\b/i
               new(driver, "centos", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -60,7 +60,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /debian/i
+            if /debian/i.match?(image.name)
               image.name =~ /\b(\d+|#{DEBIAN_CODENAMES.values.join("|")})\b/i
               version = (Regexp.last_match || [])[1]
               if version && version.to_i == 0

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

@@ -39,7 +39,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /fedora/i
+            if /fedora/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+)?)\b/i
               new(driver, "fedora", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -41,7 +41,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /freebsd/i
+            if /freebsd/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+)?)\b/i
               new(driver, "freebsd", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -45,11 +45,18 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /rhel/i
+            if /rhel/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+)?)/i
               new(driver, "rhel", (Regexp.last_match || [])[1], image.architecture)
             end
           end
+
+          def sort_by_version(images)
+            # First do a normal version sort
+            super(images)
+            # Now sort again, shunning Beta releases.
+            prefer(images) { |image| !image.name.match(/_Beta-/i) }
+          end
         end
       end
     end

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

@@ -39,7 +39,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /ubuntu/i
+            if /ubuntu/i.match?(image.name)
               image.name =~ /\b(\d+(\.\d+)?)\b/i
               new(driver, "ubuntu", (Regexp.last_match || [])[1], image.architecture)
             end

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

@@ -70,7 +70,7 @@ module Kitchen
           end
 
           def self.from_image(driver, image)
-            if image.name =~ /Windows/i
+            if /Windows/i.match?(image.name)
               # 2008 R2 SP2
               if image.name =~ /(\b\d+)\W*(r\d+)?/i
                 major, revision = (Regexp.last_match || [])[1], (Regexp.last_match || [])[2]

data/lib/kitchen/driver/ec2.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -17,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "benchmark"
-require "json"
+require "benchmark" unless defined?(Benchmark)
+require "json" unless defined?(JSON)
 require "kitchen"
 require_relative "ec2_version"
 require_relative "aws/client"
@@ -35,10 +34,10 @@ require_relative "aws/standard_platform/ubuntu"
 require_relative "aws/standard_platform/windows"
 require "aws-sdk-ec2"
 require "aws-sdk-core/waiters/errors"
-require "retryable"
-require "time"
-require "etc"
-require "socket"
+require "retryable" unless defined?(Retryable)
+require "time" unless defined?(Time)
+require "etc" unless defined?(Etc)
+require "socket" unless defined?(Socket)
 
 module Kitchen
 
@@ -261,7 +260,7 @@ module Kitchen
 
         info("EC2 instance <#{state[:server_id]}> ready (hostname: #{state[:hostname]}).")
         instance.transport.connection(state).wait_until_ready
-        create_ec2_json(state) if instance.provisioner.name =~ /chef/i
+        create_ec2_json(state) if /chef/i.match?(instance.provisioner.name)
         debug("ec2:create '#{state[:hostname]}'")
       rescue Exception
         # Clean up any auto-created security groups or keys on the way out.

data/lib/kitchen/driver/ec2_version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -22,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "3.7.1".freeze
+    EC2_VERSION = "3.7.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ homepage: https://github.com/test-kitchen/kitchen-ec2
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2
 test_files: []