Updating for AWS SDK V2

Author: tyler-ball

kitchen-ec2.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "test-kitchen", "= 1.4.0.rc.1"
+  gem.add_dependency "test-kitchen", "~> 1.4"
   gem.add_dependency "excon"
   gem.add_dependency "multi_json"
   gem.add_dependency "aws-sdk-v1", "~> 1.59.0"
-  gem.add_dependency "retryable", "~> 2.0"
+  gem.add_dependency "aws-sdk", "~> 2"
 
   gem.add_development_dependency "rspec",     "~> 3.2"
   gem.add_development_dependency "countloc",  "~> 0.4"

lib/kitchen/driver/client/ec2_client.rb

@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Tyler Ball (<[email protected]>)
+#
+# Copyright (C) 2015, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "aws-sdk"
+
+module Kitchen
+
+  module Driver
+
+    module Client
+
+      # A class for creating and managing the EC2 client connection
+      #
+      # @author Tyler Ball <[email protected]>
+      class Ec2Client
+
+        def initialize(region, profile_name = nil, access_key_id = nil, secret_access_key = nil)
+          Aws.config = {
+            :region => region,
+            :credentials => get_credentials(profile_name, access_key_id, secret_access_key)
+          }
+        end
+
+        # Try and get the credentials from an ordered list of locations
+        def get_credentials(profile_name, access_key_id, secret_access_key)
+          shared_creds = Aws::SharedCredentials.new(:profile_name => profile_name)
+          if access_key_id && secret_access_key
+            Aws::Credentials.new(access_key_id, secret_access_key)
+          elsif ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
+            Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'], ENV['AWS_SESSION_TOKEN'])
+          elsif shared_creds.loadable?
+            shared_creds
+          else
+            Aws::InstanceProfileCredentials.new(:retries => 1)
+          end
+        end
+
+        def create_instance(options)
+          resource.create_instances(options)[0]
+        end
+
+        def get_instance(id)
+          resource.instance(id)
+        end
+
+        def get_instance_from_spot_request(request_id)
+          resource.instances(
+            :filters => [{
+              :name => "spot-instance-request-id",
+              :values => [request_id]
+            }]
+          ).to_a[0]
+        end
+
+        def client
+          @client ||= Aws::EC2::Client.new
+        end
+
+        def resource
+          @resource ||= Aws::EC2::Resource.new
+        end
+
+      end
+
+    end
+
+  end
+
+end