kitchen-ec2 2.5.0 → 3.0.0.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b5b61ce04ba14b628c624fe6d1fdcbce3be710b2b2bb9f560309c1f2e49a6b0
-  data.tar.gz: fdf1eefb690ff096a6188c1149f479d626d5b93d1fbd2016876f1f422fa2823e
+  metadata.gz: 2778637095bcb2e87ba702a0c04c496debc70e9b0eb781e6581e079667875edd
+  data.tar.gz: 3215d5359bd928d6446bdce249e34940e1f3b1a86dfeadf06f8bf36c5b21a4de
 SHA512:
-  metadata.gz: 5fc7e6be44b888c3b30def5287e992ff487aede57c450e10e8879c12cd45e66a1d565111844f6cb3f80dcea7462defee9b1d1fc129468b3a75521ccf7f32169e
-  data.tar.gz: be5dfb400e19d6dc433d4f700b318591455a8ba3dfe53fd79585c1efd594c6bcaf974872da5a4c247fb1cc2a7a3f7d48f9da52e971b6e4f611b655b6b2bda082
+  metadata.gz: 308bf0b88efe068274892048e443f5704c646080eaed86c0ae0ad1d75c511e87226f027b4fce86f4b7193459e3baafb26ccc9c884b5ec3961c55d0a1f3b7cf3c
+  data.tar.gz: b2e1c18a028972c97ca062eafe64c57b0f9334d07bb0f098d4c250117e4ea2a8b492ee18fdc5b4b23b64c8803015b85b9b7ba27e2cd13d4ae9cf93375611911f

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

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "aws-sdk"
+require "aws-sdk-ec2"
 require "aws-sdk-core/credentials"
 require "aws-sdk-core/shared_credentials"
 require "aws-sdk-core/instance_profile_credentials"
@@ -41,12 +41,12 @@ module Kitchen
           ssl_verify_peer = true
         )
           ::Aws.config.update(
-            :region => region,
-            :profile => profile_name,
-            :http_proxy => http_proxy,
-            :ssl_verify_peer => ssl_verify_peer
+            region: region,
+            profile: profile_name,
+            http_proxy: http_proxy,
+            ssl_verify_peer: ssl_verify_peer
           )
-          ::Aws.config.update(:retry_limit => retry_limit) unless retry_limit.nil?
+          ::Aws.config.update(retry_limit: retry_limit) unless retry_limit.nil?
         end
 
         def create_instance(options)
@@ -59,9 +59,9 @@ module Kitchen
 
         def get_instance_from_spot_request(request_id)
           resource.instances(
-            :filters => [{
-              :name => "spot-instance-request-id",
-              :values => [request_id],
+            filters: [{
+              name: "spot-instance-request-id",
+              values: [request_id],
             }]
           ).to_a[0]
         end

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

@@ -18,7 +18,7 @@
 # limitations under the License.
 
 require "base64"
-require "aws-sdk"
+require "aws-sdk-ec2"
 
 module Kitchen
 
@@ -45,12 +45,12 @@ module Kitchen
           # Support for looking up security group id and subnet id using tags.
 
           if config[:subnet_id].nil? && config[:subnet_filter]
-            config[:subnet_id] = ::Aws::EC2::Client.
-              new(:region => config[:region]).describe_subnets(
-                :filters => [
+            config[:subnet_id] = ::Aws::EC2::Client
+              .new(region: config[:region]).describe_subnets(
+                filters: [
                   {
-                    :name   => "tag:#{config[:subnet_filter][:tag]}",
-                    :values => [config[:subnet_filter][:value]],
+                    name: "tag:#{config[:subnet_filter][:tag]}",
+                    values: [config[:subnet_filter][:value]],
                   },
                 ]
               )[0][0].subnet_id
@@ -62,12 +62,12 @@ module Kitchen
           end
 
           if config[:security_group_ids].nil? && config[:security_group_filter]
-            security_group = ::Aws::EC2::Client.
-                new(:region => config[:region]).describe_security_groups(
-                :filters => [
+            security_group = ::Aws::EC2::Client
+                .new(region: config[:region]).describe_security_groups(
+                filters: [
                     {
-                        :name => "tag:#{config[:security_group_filter][:tag]}",
-                        :values => [config[:security_group_filter][:value]],
+                        name: "tag:#{config[:security_group_filter][:tag]}",
+                        values: [config[:security_group_filter][:value]],
                     },
                 ]
             )[0][0]
@@ -81,12 +81,12 @@ module Kitchen
           end
 
           i = {
-            :instance_type                => config[:instance_type],
-            :ebs_optimized                => config[:ebs_optimized],
-            :image_id                     => config[:image_id],
-            :key_name                     => config[:aws_ssh_key_id],
-            :subnet_id                    => config[:subnet_id],
-            :private_ip_address           => config[:private_ip_address],
+            instance_type: config[:instance_type],
+            ebs_optimized: config[:ebs_optimized],
+            image_id: config[:image_id],
+            key_name: config[:aws_ssh_key_id],
+            subnet_id: config[:subnet_id],
+            private_ip_address: config[:private_ip_address],
           }
 
           availability_zone = config[:availability_zone]
@@ -94,14 +94,14 @@ module Kitchen
             if availability_zone =~ /^[a-z]$/i
               availability_zone = "#{config[:region]}#{availability_zone}"
             end
-            i[:placement] = { :availability_zone => availability_zone.downcase }
+            i[:placement] = { availability_zone: availability_zone.downcase }
           end
           tenancy = config[:tenancy]
           if tenancy
             if i.key?(:placement)
               i[:placement][:tenancy] = tenancy
             else
-              i[:placement] = { :tenancy => tenancy }
+              i[:placement] = { tenancy: tenancy }
             end
           end
           unless config[:block_device_mappings].nil? || config[:block_device_mappings].empty?
@@ -110,14 +110,14 @@ module Kitchen
           i[:security_group_ids] = Array(config[:security_group_ids]) if config[:security_group_ids]
           i[:user_data] = prepared_user_data if prepared_user_data
           if config[:iam_profile_name]
-            i[:iam_instance_profile] = { :name => config[:iam_profile_name] }
+            i[:iam_instance_profile] = { name: config[:iam_profile_name] }
           end
           if !config.fetch(:associate_public_ip, nil).nil?
             i[:network_interfaces] =
               [{
-                :device_index => 0,
-                :associate_public_ip_address => config[:associate_public_ip],
-                :delete_on_termination => true,
+                device_index: 0,
+                associate_public_ip_address: config[:associate_public_ip],
+                delete_on_termination: true,
               }]
             # If specifying `:network_interfaces` in the request, you must specify
             # network specific configs in the network_interfaces block and not at
@@ -137,14 +137,14 @@ module Kitchen
             if availability_zone =~ /^[a-z]$/i
               availability_zone = "#{config[:region]}#{availability_zone}"
             end
-            i[:placement] = { :availability_zone => availability_zone.downcase }
+            i[:placement] = { availability_zone: availability_zone.downcase }
           end
           tenancy = config[:tenancy]
           if tenancy
             if i.key?(:placement)
               i[:placement][:tenancy] = tenancy
             else
-              i[:placement] = { :tenancy => tenancy }
+              i[:placement] = { tenancy: tenancy }
             end
           end
           unless config[:instance_initiated_shutdown_behavior].nil? ||

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

@@ -88,7 +88,7 @@ module Kitchen
         #
         # The list of supported architectures
         #
-        SUPPORTED_ARCHITECTURES = %w{x86_64 i386 arm64}
+        SUPPORTED_ARCHITECTURES = %w{x86_64 i386 arm64}.freeze
 
         #
         # Find the best matching image for the given image search.
@@ -98,11 +98,11 @@ module Kitchen
           driver.debug("Searching for images matching #{image_search} ...")
           # Convert to ec2 search format (pairs of name+values)
           filters = image_search.map do |key, value|
-            { :name => key.to_s, :values => Array(value).map(&:to_s) }
+            { name: key.to_s, values: Array(value).map(&:to_s) }
           end
 
           # We prefer most recent first
-          images = driver.ec2.resource.images(:filters => filters)
+          images = driver.ec2.resource.images(filters: filters)
           images = sort_images(images)
           show_returned_images(images)
 

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

@@ -43,9 +43,9 @@ module Kitchen
             # 7.1 -> [ img1, img2, img3 ]
             # 6 -> [ img4, img5 ]
             # ...
-            images.group_by { |image| self.class.from_image(driver, image).version }.
-              sort_by { |k, _v| (k && k.include?(".") ? k.to_f : "#{k}.999".to_f) }.
-              reverse.flat_map { |_k, v| v }
+            images.group_by { |image| self.class.from_image(driver, image).version }
+              .sort_by { |k, _v| (k && k.include?(".") ? k.to_f : "#{k}.999".to_f) }
+              .reverse.flat_map { |_k, v| v }
           end
 
           def self.from_image(driver, image)

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

@@ -60,9 +60,9 @@ module Kitchen
             # 2008r2rtm -> [ img1, img2, img3 ]
             # 2012r2sp1 -> [ img4, img5 ]
             # ...
-            images.group_by { |image| self.class.from_image(driver, image).windows_version_parts }.
-              sort_by { |version, _platform_images| version }.
-              reverse.flat_map { |_version, platform_images| platform_images }
+            images.group_by { |image| self.class.from_image(driver, image).windows_version_parts }
+              .sort_by { |version, _platform_images| version }
+              .reverse.flat_map { |_version, platform_images| platform_images }
           end
 
           def self.from_image(driver, image)

data/lib/kitchen/driver/ec2.rb

@@ -33,14 +33,13 @@ require_relative "aws/standard_platform/fedora"
 require_relative "aws/standard_platform/freebsd"
 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"
 
-Aws.eager_autoload!
-
 module Kitchen
 
   module Driver
@@ -55,7 +54,7 @@ module Kitchen
       plugin_version Kitchen::Driver::EC2_VERSION
 
       default_config :region, ENV["AWS_REGION"] || "us-east-1"
-      default_config :shared_credentials_profile, nil
+      default_config :shared_credentials_profile, ENV["AWS_PROFILE"]
       default_config :availability_zone, nil
       default_config :instance_type do |driver|
         driver.default_instance_type
@@ -96,9 +95,6 @@ module Kitchen
 
       def initialize(*args, &block)
         super
-        # AWS Ruby SDK loading isn't thread safe, so as soon as we know we're
-        # going to use EC2, autoload it. Seems to have been fixed in Ruby 2.3+
-        ::Aws.eager_autoload! unless RUBY_VERSION.to_f >= 2.3
       end
 
       def self.validation_warn(driver, old_key, new_key)
@@ -252,15 +248,15 @@ module Kitchen
         # Tagging an instance is possible before volumes are attached. Tagging the volumes after
         # instance creation is consistent.
         Retryable.retryable(
-          :tries => 10,
-          :sleep => lambda { |n| [2**n, 30].min },
-          :on => ::Aws::EC2::Errors::InvalidInstanceIDNotFound
+          tries: 10,
+          sleep: lambda { |n| [2**n, 30].min },
+          on: ::Aws::EC2::Errors::InvalidInstanceIDNotFound
         ) do |r, _|
           info("Attempting to tag the instance, #{r} retries")
           tag_server(server)
 
           # Get information about the AMI (image) used to create the image.
-          image_data = ec2.client.describe_images({ :image_ids => [server.image_id] })[0][0]
+          image_data = ec2.client.describe_images({ image_ids: [server.image_id] })[0][0]
 
           state[:server_id] = server.id
           info("EC2 instance <#{state[:server_id]}> created.")
@@ -303,7 +299,7 @@ module Kitchen
           if state[:spot_request_id]
             debug("Deleting spot request <#{state[:server_id]}>")
             ec2.client.cancel_spot_instance_requests(
-              :spot_instance_request_ids => [state[:spot_request_id]]
+              spot_instance_request_ids: [state[:spot_request_id]]
             )
             state.delete(:spot_request_id)
           end
@@ -433,7 +429,7 @@ module Kitchen
         state[:spot_request_id] = spot_request_id
         ec2.client.wait_until(
           :spot_instance_request_fulfilled,
-          :spot_instance_request_ids => [spot_request_id]
+          spot_instance_request_ids: [spot_request_id]
         ) do |w|
           w.max_attempts = config[:retryable_tries]
           w.delay = config[:retryable_sleep]
@@ -449,9 +445,9 @@ module Kitchen
       def create_spot_request
         request_duration = config[:retryable_tries] * config[:retryable_sleep]
         request_data = {
-          :spot_price => config[:spot_price].to_s,
-          :launch_specification => instance_generator.ec2_instance_data,
-          :valid_until => Time.now + request_duration,
+          spot_price: config[:spot_price].to_s,
+          launch_specification: instance_generator.ec2_instance_data,
+          valid_until: Time.now + request_duration,
         }
         if config[:block_duration_minutes]
           request_data[:block_duration_minutes] = config[:block_duration_minutes]
@@ -467,19 +463,19 @@ module Kitchen
             # we convert the value to a string because
             # nils should be passed as an empty String
             # and Integers need to be represented as Strings
-            { :key => k, :value => v.to_s }
+            { key: k, value: v.to_s }
           end
-          server.create_tags(:tags => tags)
+          server.create_tags(tags: tags)
         end
       end
 
       def tag_volumes(server)
         if config[:tags] && !config[:tags].empty?
           tags = config[:tags].map do |k, v|
-            { :key => k, :value => v.to_s }
+            { key: k, value: v.to_s }
           end
           server.volumes.each do |volume|
-            volume.create_tags(:tags => tags)
+            volume.create_tags(tags: tags)
           end
         end
       end
@@ -493,8 +489,8 @@ module Kitchen
           described_volume_count = 0
           ready_volume_count = 0
           if aws_instance.exists?
-            described_volume_count = ec2.client.describe_volumes(:filters => [
-              { :name => "attachment.instance-id", :values => ["#{state[:server_id]}"] }]
+            described_volume_count = ec2.client.describe_volumes(filters: [
+              { name: "attachment.instance-id", values: ["#{state[:server_id]}"] }]
               ).volumes.length
             aws_instance.volumes.each { ready_volume_count += 1 }
           end
@@ -542,9 +538,9 @@ module Kitchen
         begin
           with_request_limit_backoff(state) do
             server.wait_until(
-              :max_attempts => config[:retryable_tries],
-              :delay => config[:retryable_sleep],
-              :before_attempt => wait_log,
+              max_attempts: config[:retryable_tries],
+              delay: config[:retryable_sleep],
+              before_attempt: wait_log,
               &block
             )
           end
@@ -559,7 +555,7 @@ module Kitchen
       def fetch_windows_admin_password(server, state)
         wait_with_destroy(server, state, "to fetch windows admin password") do |aws_instance|
           enc = server.client.get_password_data(
-            :instance_id => state[:server_id]
+            instance_id: state[:server_id]
           ).password_data
           # Password data is blank until password is available
           !enc.nil? && !enc.empty?
@@ -595,7 +591,7 @@ module Kitchen
           "public" => "public_ip_address",
           "private" => "private_ip_address",
           "private_dns" => "private_dns_name",
-        }
+        }.freeze
 
       #
       # Lookup hostname of provided server. If interface_type is provided use
@@ -668,7 +664,7 @@ module Kitchen
         #Firewall Config
         & netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any  >> $logfile
         Set-ItemProperty -Name LocalAccountTokenFilterPolicy -Path HKLM:\\software\\Microsoft\\Windows\\CurrentVersion\\Policies\\system -Value 1
-	EOH
+        EOH
 
         # Preparing custom static admin user if we defined something other than Administrator
         custom_admin_script = ""
@@ -712,8 +708,8 @@ module Kitchen
       end
 
       def image_info(image)
-        root_device = image.block_device_mappings.
-          find { |b| b.device_name == image.root_device_name }
+        root_device = image.block_device_mappings
+          .find { |b| b.device_name == image.root_device_name }
         volume_type = " #{root_device.ebs.volume_type}" if root_device && root_device.ebs
 
         " Architecture: #{image.architecture}," \

data/lib/kitchen/driver/ec2_version.rb

@@ -22,6 +22,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "2.5.0"
+    EC2_VERSION = "3.0.0.preview".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0.preview
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -59,19 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: