kerryb-amazon-ec2 0.3.8 → 0.3.9

data/lib/EC2.rb

@@ -25,8 +25,8 @@ module EC2
   #
   if ENV['EC2_URL']
     EC2_URL = ENV['EC2_URL']
-    VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
-    raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
+    # VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
+    # raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
     DEFAULT_HOST = URI.parse(EC2_URL).host
   else
     # default US host
@@ -97,7 +97,7 @@ module EC2
   #
   class Base
 
-    attr_reader :use_ssl, :server, :proxy_server, :port, :base_path
+    attr_reader :use_ssl, :server, :proxy_server, :port, :base_path, :http_method
 
     def initialize( options = {} )
 
@@ -106,13 +106,15 @@ module EC2
                   :use_ssl => true,
                   :server => DEFAULT_HOST,
                   :proxy_server => nil,
-                  :base_path => '/'
+                  :base_path => '/',
+                  :http_method => 'POST'
                   }.merge(options)
 
       @server = options[:server]
       @proxy_server = options[:proxy_server]
       @use_ssl = options[:use_ssl]
       @base_path = options[:base_path]
+      @http_method = options[:http_method]
 
       raise ArgumentError, "No :access_key_id provided" if options[:access_key_id].nil? || options[:access_key_id].empty?
       raise ArgumentError, "No :secret_access_key provided" if options[:secret_access_key].nil? || options[:secret_access_key].empty?
@@ -189,7 +191,8 @@ module EC2
             CGI::escape(param[0]) + "=" + CGI::escape(param[1])
           end.join("&") + "&Signature=" + sig
 
-          req = Net::HTTP::Post.new(@base_path)
+          http_class = (@http_method == 'POST') ? Net::HTTP::Post : Net::HTTP::Get
+          req = http_class.new(@base_path)
           req.content_type = 'application/x-www-form-urlencoded'
           req['User-Agent'] = "github-amazon-ec2-ruby-gem"
 
@@ -207,7 +210,7 @@ module EC2
 
       # Set the Authorization header using AWS signed header authentication
       def get_aws_auth_param(params, secret_access_key)
-        canonical_string =  EC2.canonical_string(params, @server, 'GET', @base_path)
+        canonical_string =  EC2.canonical_string(params, @server, @http_method, @base_path)
         encoded_canonical = EC2.encode(secret_access_key, canonical_string)
       end
 

data/test/test_EC2.rb

@@ -50,8 +50,6 @@ context "The EC2 method " do
   specify "EC2::Base should allow specification of base path" do
     @ec2 = EC2::Base.new( :access_key_id => "not a key",
                           :secret_access_key => "not a secret",
-                          :use_ssl => false,
-                          :server => "foo.example.com",
                           :base_path => '/services/Eucalyptus' )
 
     @ec2.base_path.should.equal '/services/Eucalyptus'
@@ -59,13 +57,26 @@ context "The EC2 method " do
 
   specify "EC2::Base should default base path to /" do
     @ec2 = EC2::Base.new( :access_key_id => "not a key",
-                          :secret_access_key => "not a secret",
-                          :use_ssl => false,
-                          :server => "foo.example.com" )
+                          :secret_access_key => "not a secret" )
 
     @ec2.base_path.should.equal '/'
   end
 
+  specify "EC2::Base should allow specification of http method" do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key",
+                          :secret_access_key => "not a secret",
+                          :http_method => 'GET' )
+
+    @ec2.http_method.should.equal 'GET'
+  end
+
+  specify "EC2::Base should default http method to POST" do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key",
+                          :secret_access_key => "not a secret" )
+
+    @ec2.http_method.should.equal 'POST'
+  end
+
   specify "EC2.canonical_string(path) should conform to Amazon's requirements " do
     path = {"name1" => "value1", "name2" => "value2", "name3" => "value3"}
     if ENV['EC2_URL'].nil? || ENV['EC2_URL'] == 'https://ec2.amazonaws.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kerryb-amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Glenn Rempe