amazon-ec2 0.3.6 → 0.3.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.3.8 2009-04-16
+ * Applied patch, with updated tests to fix issue with base64 encoded user data (rsanheim).
+ * Applied patch, fixing an issue with EU Signature version 2 creation (delano).
+
 === 0.3.6 2009-03-02
  * You can now specify any arbitrary SSL tcp port to connect to (kerryb)
  * Added rake target to quickly install the gem without docs

data/Rakefile

@@ -33,3 +33,5 @@ Rake::RDocTask.new do |rd|
   rd.rdoc_dir = 'doc'
   rd.options = spec.rdoc_options
 end
+
+task :default => :test

data/lib/EC2.rb

@@ -182,7 +182,7 @@ module EC2
                           "Version" => API_VERSION,
                           "Timestamp"=>Time.now.getutc.iso8601} )
 
-          sig = get_aws_auth_param(params, @secret_access_key)
+          sig = get_aws_auth_param(params, @secret_access_key, @server)
 
           query = params.sort.collect do |param|
             CGI::escape(param[0]) + "=" + CGI::escape(param[1])
@@ -205,8 +205,8 @@ module EC2
       end
 
       # Set the Authorization header using AWS signed header authentication
-      def get_aws_auth_param(params, secret_access_key)
-        canonical_string =  EC2.canonical_string(params)
+      def get_aws_auth_param(params, secret_access_key, server)
+        canonical_string =  EC2.canonical_string(params, server)
         encoded_canonical = EC2.encode(secret_access_key, canonical_string)
       end
 

data/lib/EC2/instances.rb

@@ -90,18 +90,7 @@ module EC2
       raise ArgumentError, ":instance_type must be 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'" unless options[:instance_type] == "m1.small" || options[:instance_type] == "m1.large" || options[:instance_type] == "m1.xlarge" || options[:instance_type] == "c1.medium" || options[:instance_type] == "c1.xlarge"
       raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless options[:base64_encoded] == true || options[:base64_encoded] == false
 
-      # If :user_data is passed in then URL escape and Base64 encode it
-      # as needed.  Need for URL Escape + Base64 encoding is determined
-      # by :base64_encoded param.
-      if options[:user_data]
-        if options[:base64_encoded]
-          user_data = options[:user_data]
-        else
-          user_data = Base64.encode64(options[:user_data]).gsub(/\n/,"").strip()
-        end
-      else
-        user_data = nil
-      end
+      user_data = extract_user_data(options)
 
       params = {
         "ImageId"  => options[:image_id],
@@ -119,6 +108,20 @@ module EC2
       return response_generator(:action => "RunInstances", :params => params)
 
     end
+    
+    # If :user_data is passed in then URL escape and Base64 encode it
+    # as needed.  Need for URL Escape + Base64 encoding is determined
+    # by :base64_encoded param.
+    def extract_user_data(options)
+      return unless options[:user_data]
+      if options[:user_data]
+        if options[:base64_encoded]
+          Base64.encode64(options[:user_data]).gsub(/\n/,"").strip()
+        else
+          options[:user_data]
+        end
+      end
+    end
 
 
     #Amazon Developer Guide Docs:

data/test/test_EC2_instances.rb

@@ -221,28 +221,40 @@ context "EC2 instances " do
 
 
   specify "should be able specify an availability_zone" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "Zm9v", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
     @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of Hash
   end
 
   specify "should be able to call run_instances with :user_data and :base64_encoded => true (default is false)" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "Zm9v", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
     @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of Hash
   end
 
   specify "should be able specify an kernel_id" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small', 'KernelId' => 'kernfoo').
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "Zm9v", "AddressingType" => 'public', 'InstanceType' => 'm1.small', 'KernelId' => 'kernfoo').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
     @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true, :kernel_id => 'kernfoo' ).should.be.an.instance_of Hash
   end
 
   specify "should be able to call run_instances with :user_data and :base64_encoded => false" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "Zm9v", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
     @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => false ).should.be.an.instance_of Hash
   end
+  
+  specify "should get no user data for when options has no user_data key" do
+    @ec2.extract_user_data({}).should == nil
+  end
+  
+  specify "should get plain string user data when options has user_data and no base64 key" do
+    @ec2.extract_user_data({:user_data => "foo\nbar"}).should == "foo\nbar"
+  end
+  
+  specify "should strip new lines and base64 encode when options has both user_data and base64" do
+    @ec2.extract_user_data({:user_data => "binary\ndata\nhere\n", :base64_encoded => true}).should == "YmluYXJ5CmRhdGEKaGVyZQo="
+  end
 
 
   specify "should be able to be described and return the correct Ruby response class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,7 +9,7 @@ autorequire: EC2
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency