Adding proxy support that was present in Fog back, fixes regression #126

Author: tyler-ball

README.md

@@ -199,6 +199,14 @@ The price you bid in order to submit a spot request. An additional step will be
 
 The default is `nil`.
 
+### http\_proxy
+
+Specify a proxy to send AWS requests through.  Should be of the format `http://<host>:<port>`.
+
+The default is `ENV['HTTP_PROXY']`
+
+**Note** - The AWS command line utility allow you to specify [two proxies](http://docs.aws.amazon.com/cli/latest/userguide/cli-http-proxy.html), one for HTTP and one for HTTPS.  The AWS Ruby SDK only allows you to specify 1 proxy and because all requests are `https://` this proxy needs to support HTTPS.
+
 ## Disk Configuration
 
 ### ebs\_volume\_size

lib/kitchen/driver/aws/client.rb

@@ -32,19 +32,21 @@ class Aws
       # @author Tyler Ball <[email protected]>
       class Client
 
-        def initialize(
+        def initialize( # rubocop:disable Metrics/ParameterLists
           region,
           profile_name = nil,
           access_key_id = nil,
           secret_access_key = nil,
-          session_token = nil
+          session_token = nil,
+          http_proxy = nil
         )
           creds = self.class.get_credentials(
             profile_name, access_key_id, secret_access_key, session_token
           )
           ::Aws.config.update(
             :region => region,
-            :credentials => creds
+            :credentials => creds,
+            :http_proxy => http_proxy
           )
         end
 

lib/kitchen/driver/ec2.rb

@@ -62,6 +62,7 @@ class Ec2 < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
       default_config :username,            nil
       default_config :associate_public_ip, nil
       default_config :interface,           nil
+      default_config :http_proxy,          ENV["HTTP_PROXY"]
 
       required_config :aws_ssh_key_id
       required_config :image_id
@@ -250,7 +251,8 @@ def ec2
           config[:shared_credentials_profile],
           config[:aws_access_key_id],
           config[:aws_secret_access_key],
-          config[:aws_session_token]
+          config[:aws_session_token],
+          config[:http_proxy]
         )
       end
 

spec/kitchen/driver/ec2/client_spec.rb

@@ -106,6 +106,27 @@
       client
       expect(Aws.config[:region]).to eq("us-west-1")
     end
+
+    context "when provided all optional parameters" do
+      let(:client) {
+        Kitchen::Driver::Aws::Client.new(
+          "us-west-1",
+          "profile_name",
+          "access_key_id",
+          "secret_access_key",
+          "session_token",
+          "http_proxy"
+        )
+      }
+      let(:creds) { double("creds") }
+      it "Sets the AWS config" do
+        expect(Kitchen::Driver::Aws::Client).to receive(:get_credentials).and_return(creds)
+        client
+        expect(Aws.config[:region]).to eq("us-west-1")
+        expect(Aws.config[:credentials]).to eq(creds)
+        expect(Aws.config[:http_proxy]).to eq("http_proxy")
+      end
+    end
   end
 
   it "returns a client" do