kitchen-ec2 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b191e76f8a9ca14b90f8fbccbdfd1ce3f331b6
-  data.tar.gz: 852a2dc5b108ecb0cef3f27c65162e9716e938c3
+  metadata.gz: 28b62273c1ee5fb17313f193f401ddef8298c801
+  data.tar.gz: fd9d69df55c2f0e669e00cf41b050ac41b2f8492
 SHA512:
-  metadata.gz: 1e9ac692d5b4d8f9b60633f5eb890bc70efb773fe4980e2478e6743b8dfbba2b7ac713f428f0bc5875da292ea8f6efc62dd4108fce061621d212d12b41be7971
-  data.tar.gz: 827a0183547e2c3f24202711edf9a14b4f17663e677a13915230896076cb08b1cc065107c1ee42dbe3bf395b6715aaa9cab6928bdd245ac3201db19cac4c10eb
+  metadata.gz: 6962df92e7ffd49fb287f84d325950484729e777bc54c90380fd8e699caa273631e8003ca597de9cb274020519f187d65c23e916eaa3f2be9a0c8cb34774d7dd
+  data.tar.gz: 47489808c46515f9e0541e7fe060b90bf7f94012398765d49ad20037c9eca1dc2e61b18bed6badf2cbf2434cb0d5a3c036a50e738f90f497dbf175ef3463ffb0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.9.2 / 2015-05-26
+
+### Bug Fixes
+
+* Pull Request [#131][]: Adding back support for a proxy via config `http_proxy` which defaults to `ENV['HTTP_PROXY']`
+* Pull Request [#128][]: 
+    * Fixes [#121][]: Fixing error `Network interfaces and an instance-level security groups may not be specified on the same request` 
+    * Fixes [#127][]: User Data content should be base64 encoded when passed to aws sdk 
+
+### New Features
+
+### Improvements
+
 ## 0.9.1 / 2015-05-21
 
 ### Bug Fixes
@@ -124,8 +137,12 @@
 [#107]: https://github.com/test-kitchen/kitchen-ec2/issues/107
 [#110]: https://github.com/test-kitchen/kitchen-ec2/issues/110
 [#112]: https://github.com/test-kitchen/kitchen-ec2/issues/112
+[#121]: https://github.com/test-kitchen/kitchen-ec2/issues/121
 [#124]: https://github.com/test-kitchen/kitchen-ec2/issues/124
 [#125]: https://github.com/test-kitchen/kitchen-ec2/issues/125
+[#127]: https://github.com/test-kitchen/kitchen-ec2/issues/127
+[#128]: https://github.com/test-kitchen/kitchen-ec2/issues/128
+[#131]: https://github.com/test-kitchen/kitchen-ec2/issues/131
 [@Atalanta]: https://github.com/Atalanta
 [@Igorshp]: https://github.com/Igorshp
 [@JamesAwesome]: https://github.com/JamesAwesome

data/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

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

@@ -32,19 +32,21 @@ module Kitchen
       # @author Tyler Ball <tball@chef.io>
       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
 

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

@@ -17,6 +17,7 @@
 # limitations under the License.
 
 require "kitchen/logging"
+require "base64"
 
 module Kitchen
 
@@ -62,13 +63,21 @@ module Kitchen
             i[:network_interfaces] =
               [{
                 :device_index => 0,
-                :associate_public_ip_address => config[:associate_public_ip]
+                :associate_public_ip_address => config[:associate_public_ip],
+                :delete_on_termination => true
               }]
-            # If specifying `:network_interfaces` in the request, you must specify the
-            # subnet_id in the network_interfaces block and not at the top level
+            # If specifying `:network_interfaces` in the request, you must specify
+            # network specific configs in the network_interfaces block and not at
+            # the top level
             if config[:subnet_id]
               i[:network_interfaces][0][:subnet_id] = i.delete(:subnet_id)
             end
+            if config[:private_ip_address]
+              i[:network_interfaces][0][:private_ip_address] = i.delete(:private_ip_address)
+            end
+            if config[:security_group_ids]
+              i[:network_interfaces][0][:groups] = i.delete(:security_group_ids)
+            end
           end
           i
         end
@@ -134,14 +143,15 @@ module Kitchen
 
         def prepared_user_data
           # If user_data is a file reference, lets read it as such
-          unless @user_data
-            if config[:user_data] && File.file?(config[:user_data])
+          return nil if config[:user_data].nil?
+          @user_data ||= begin
+            if File.file?(config[:user_data])
               @user_data = File.read(config[:user_data])
             else
               @user_data = config[:user_data]
             end
+            @user_data = Base64.encode64(@user_data)
           end
-          @user_data
         end
 
       end

data/lib/kitchen/driver/ec2.rb

@@ -62,6 +62,7 @@ module Kitchen
       default_config :username,            nil
       default_config :associate_public_ip, nil
       default_config :interface,           nil
+      default_config :http_proxy,          ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]
 
       required_config :aws_ssh_key_id
       required_config :image_id
@@ -250,7 +251,8 @@ module Kitchen
           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
 

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "0.9.1"
+    EC2_VERSION = "0.9.2"
   end
 end

data/spec/kitchen/driver/ec2/client_spec.rb

@@ -106,6 +106,27 @@ describe Kitchen::Driver::Aws::Client do
       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

data/spec/kitchen/driver/ec2/instance_generator_spec.rb

@@ -19,6 +19,7 @@
 require "kitchen/driver/aws/instance_generator"
 require "kitchen/driver/aws/client"
 require "tempfile"
+require "base64"
 
 describe Kitchen::Driver::Aws::InstanceGenerator do
 
@@ -70,14 +71,15 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       end
 
       it "reads the file contents" do
-        expect(generator.prepared_user_data).to eq("foo\nbar")
+        expect(Base64.decode64(generator.prepared_user_data)).to eq("foo\nbar")
       end
 
       it "memoizes the file contents" do
-        expect(generator.prepared_user_data).to eq("foo\nbar")
+        decoded = Base64.decode64(generator.prepared_user_data)
+        expect(decoded).to eq("foo\nbar")
         tmp_file.write("other\nvalue")
         tmp_file.rewind
-        expect(generator.prepared_user_data).to eq("foo\nbar")
+        expect(decoded).to eq("foo\nbar")
       end
     end
   end
@@ -280,9 +282,92 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :key_name => nil,
           :subnet_id => nil,
           :private_ip_address => nil,
-          :network_interfaces => [{ :device_index => 0, :associate_public_ip_address => true }]
+          :network_interfaces => [{
+            :device_index => 0,
+            :associate_public_ip_address => true,
+            :delete_on_termination => true
+          }]
         )
       end
+
+      context "and subnet is provided" do
+        let(:config) do
+          {
+            :associate_public_ip => true,
+            :subnet_id => "s-456"
+          }
+        end
+
+        it "adds a network_interfaces block" do
+          expect(generator.ec2_instance_data).to eq(
+            :placement => { :availability_zone => nil },
+            :instance_type => nil,
+            :ebs_optimized => nil,
+            :image_id => nil,
+            :key_name => nil,
+            :private_ip_address => nil,
+            :network_interfaces => [{
+              :device_index => 0,
+              :associate_public_ip_address => true,
+              :delete_on_termination => true,
+              :subnet_id => "s-456"
+            }]
+          )
+        end
+      end
+
+      context "and security_group_ids is provided" do
+        let(:config) do
+          {
+            :associate_public_ip => true,
+            :security_group_ids => ["sg-789"]
+          }
+        end
+
+        it "adds a network_interfaces block" do
+          expect(generator.ec2_instance_data).to eq(
+            :placement => { :availability_zone => nil },
+            :instance_type => nil,
+            :ebs_optimized => nil,
+            :image_id => nil,
+            :key_name => nil,
+            :subnet_id => nil,
+            :private_ip_address => nil,
+            :network_interfaces => [{
+              :device_index => 0,
+              :associate_public_ip_address => true,
+              :delete_on_termination => true,
+              :groups => ["sg-789"]
+            }]
+          )
+        end
+      end
+
+      context "and private_ip_address is provided" do
+        let(:config) do
+          {
+            :associate_public_ip => true,
+            :private_ip_address => "0.0.0.0"
+          }
+        end
+
+        it "adds a network_interfaces block" do
+          expect(generator.ec2_instance_data).to eq(
+            :placement => { :availability_zone => nil },
+            :instance_type => nil,
+            :ebs_optimized => nil,
+            :image_id => nil,
+            :key_name => nil,
+            :subnet_id => nil,
+            :network_interfaces => [{
+              :device_index => 0,
+              :associate_public_ip_address => true,
+              :delete_on_termination => true,
+              :private_ip_address => "0.0.0.0"
+            }]
+          )
+        end
+      end
     end
 
     context "when provided the maximum config" do
@@ -319,7 +404,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :ebs_optimized => true,
           :image_id => "ami-123",
           :key_name => "key",
-          :private_ip_address => "0.0.0.0",
           :block_device_mappings => [
             {
               :ebs => {
@@ -336,10 +420,12 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :network_interfaces => [{
             :device_index => 0,
             :associate_public_ip_address => true,
-            :subnet_id => "s-456"
+            :subnet_id => "s-456",
+            :delete_on_termination => true,
+            :groups => ["sg-789"],
+            :private_ip_address =>  "0.0.0.0"
           }],
-          :security_group_ids => ["sg-789"],
-          :user_data => "foo"
+          :user_data => Base64.encode64("foo")
         )
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2