right_aws 1.9.0 → 3.1.0

data/test/route_53/fixtures/alias_record.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2011-05-05/">
+  <ChangeBatch>
+    <Changes>
+      <Change>
+        <Action>CREATE</Action>
+        <ResourceRecordSet>
+          <Name>right-aws.example.com.</Name>
+          <Type>A</Type>
+          <AliasTarget>
+            <HostedZoneId>Z1234567890123</HostedZoneId>
+            <DNSName>example-load-balancer-1111111111.us-east-1.elb.amazonaws.com.</DNSName>
+          </AliasTarget>
+        </ResourceRecordSet>
+      </Change>
+    </Changes>
+  </ChangeBatch>
+</ChangeResourceRecordSetsRequest>

data/test/route_53/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/right_aws'

data/test/route_53/test_right_route_53.rb

@@ -0,0 +1,141 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestRoute53 < Test::Unit::TestCase
+
+  STDOUT.sync = true
+  BALANCER_NAME = 'right-aws-test-lb'
+
+  def setup
+    @r53 = Rightscale::Route53Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :logger => Logger.new('/dev/null'))
+    @zone_config = {:name => "right-aws.example.com.", :config => {:comment => 'a comment'}}
+
+    @elb = Rightscale::ElbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :logger => Logger.new('/dev/null'))
+  end
+
+  def teardown
+    @r53.list_hosted_zones.each do |zone|
+      next unless zone[:name] == @zone_config[:name]
+      zone_id = zone[:aws_id]
+      puts zone_id
+      records = @r53.list_resource_record_sets(zone_id)
+      # The NS and SOA records are provided by AWS and must not be deleted
+      records.reject! { |rr| %w[NS SOA].include? rr[:type] }
+      if records.any?
+        response = @r53.delete_resource_record_sets(zone_id, records)
+        puts response.inspect
+      end
+      puts @r53.delete_hosted_zone(zone_id).inspect
+    end
+    # Uncomment to shut down at the end of the day.
+    # @elb.delete_load_balancer BALANCER_NAME
+  end
+
+  def test_00_list_hosted_zones
+    items = @r53.list_hosted_zones
+    assert items.is_a?(Array)
+  end
+
+  def test_create_and_delete_zone
+    response = @r53.create_hosted_zone(@zone_config)
+    assert_equal response[:name], @zone_config[:name]
+    assert response[:aws_id].is_a?(String)
+    assert response[:name_servers].is_a?(Array)
+
+    response2 = @r53.delete_hosted_zone(response[:aws_id])
+    assert_equal response2[:status], 'PENDING'
+  end
+
+  def test_add_and_remove_A_record
+    zone = @r53.create_hosted_zone(@zone_config)
+    zone_id = zone[:aws_id]
+    # add
+    a_record = { :name => 'host.right-aws.example.com.', :type => 'A', :ttl => 600, :resource_records => ['10.0.0.1'] }
+    response = @r53.create_resource_record_sets(zone_id, [a_record.dup]) # .dup since it will get :action => :create
+    assert_equal response[:status], 'PENDING'
+
+    # It should be there now
+    records = @r53.list_resource_record_sets(zone_id)
+    assert records.is_a?(Array)
+    assert records.detect { |rr| rr == a_record }, "Could not find '#{a_record.inspect}' in '#{records.inspect}'"
+
+    # remove
+    response = @r53.delete_resource_record_sets(zone_id, [a_record.dup])
+    assert_equal response[:status], 'PENDING'
+
+    # It should not be there anymore
+    records = @r53.list_resource_record_sets(zone_id)
+    assert records.is_a?(Array)
+    assert ! records.detect { |rr| rr == a_record }, "Record '#{a_record.inspect}' is still in '#{records.inspect}'"
+
+    @r53.delete_hosted_zone(zone_id)
+  end
+
+  def test_add_and_remove_Alias_record
+    lb = find_or_create_load_balancer
+
+    zone = @r53.create_hosted_zone(@zone_config)
+    zone_id = zone[:aws_id]
+
+    # add
+    alias_target = { :hosted_zone_id => lb[:canonical_hosted_zone_name_id], :dns_name => lb[:dns_name] }
+    alias_record = { :name => 'right-aws.example.com', :type => 'A', :alias_target => alias_target }
+    response = @r53.create_resource_record_sets(zone_id, [alias_record.dup]) # .dup since it will get :action => :create
+    assert_equal response[:status], 'PENDING'
+
+    # It should be there now
+    records = @r53.list_resource_record_sets(zone_id)
+    assert records.is_a?(Array)
+    record = records.detect { |rr| rr[:alias_target] }
+    assert record, "Could not find '#{alias_record.inspect}' in '#{records.inspect}'"
+    # AWS adds final dots to names
+    assert_equal "#{alias_record[:name]}.", record[:name]
+    assert_equal "#{alias_target[:dns_name]}.", record[:alias_target][:dns_name]
+
+    # remove
+    response = @r53.delete_resource_record_sets(zone_id, [alias_record.dup])
+    assert_equal response[:status], 'PENDING'
+
+    # It should not be there anymore
+    records = @r53.list_resource_record_sets(zone_id)
+    assert records.is_a?(Array)
+    record = records.detect { |rr| rr[:alias_target] }
+    assert ! record, "Record '#{alias_record.inspect}' is still in '#{records.inspect}'"
+
+    @r53.delete_hosted_zone(zone_id)
+  end
+
+  def find_or_create_load_balancer
+    unless @elb.describe_load_balancers.detect { |lb| lb[:load_balancer_name] == BALANCER_NAME }
+      @elb.create_load_balancer(BALANCER_NAME, %w[us-east-1b], [])
+      puts "WARNING: Started load balancer.  Remember to shut it down (see teardown)."
+      puts "NOTE: Tests might not pass during first few seconds after load balancer is created."
+    end
+    @elb.describe_load_balancers.detect { |lb| lb[:load_balancer_name] == BALANCER_NAME }
+  end
+
+  def test_rr_sets_to_xml
+    a_record = { :name => 'host.right-aws.example.com.', :type => 'A', :ttl => 600, :resource_records => ['10.0.0.1'], :action => :create }
+    expected = load_fixture('a_record.xml')
+    assert_equal expected, @r53.resource_record_sets_to_xml([a_record], '')
+
+    # Note final full stop
+    alias_target = { :hosted_zone_id => 'Z1234567890123', :dns_name => 'example-load-balancer-1111111111.us-east-1.elb.amazonaws.com.' }
+    alias_record = { :name => 'right-aws.example.com.', :type => 'A', :alias_target => alias_target, :action => :create }
+    expected = load_fixture('alias_record.xml')
+    assert_same_lines expected, @r53.resource_record_sets_to_xml([alias_record], '')
+  end
+
+  def load_fixture (name)
+    File.read(File.join(File.dirname(__FILE__), 'fixtures', name))
+  end
+
+  def assert_same_lines (expected, actual)
+    expected = expected.split "\n"
+    actual   = actual.split "\n"
+    previous = []
+    while e = expected.shift and a = actual.shift
+      assert_equal e, a, "After:\n#{previous.join("\n")}"
+      previous << e
+    end
+  end
+end

data/test/s3/test_right_s3.rb

@@ -3,24 +3,28 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestS3 < Test::Unit::TestCase
 
   RIGHT_OBJECT_TEXT     = 'Right test message'
-  
+  INTERFACE = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+  CONNECTION = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+
   def setup
-    @s3     = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-    @bucket = 'right_s3_awesome_test_bucket_00001'
-    @bucket2 = 'right_s3_awesome_test_bucket_00002'
+    @s3     = INTERFACE
+    @bucket = 'right_s3_awesome_test_bucket_000B1_officedrop'
+    @bucket2 = 'right_s3_awesome_test_bucket_000B2_officedrop'
     @key1   = 'test/woohoo1/'
     @key2   = 'test1/key/woohoo2'
     @key3   = 'test2/A%B@C_D&E?F+G=H"I'
+    @key4   = 'test/large_multipart_file_string'
+    @key5   = 'test/large_multipart_file_stream'
     @key1_copy =     'test/woohoo1_2'
     @key1_new_name = 'test/woohoo1_3'
     @key2_new_name = 'test1/key/woohoo2_new'
-    @s      = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @s      = CONNECTION
   end
 
   #---------------------------
   # Rightscale::S3Interface
   #---------------------------
-  
+
   def test_01_create_bucket
     assert @s3.create_bucket(@bucket), 'Create_bucket fail'
   end
@@ -32,13 +36,33 @@ class TestS3 < Test::Unit::TestCase
   def test_03_list_empty_bucket
     assert_equal 0, @s3.list_bucket(@bucket).size, "#{@bucket} isn't empty, arrgh!"
   end
-  
+
   def test_04_put
     assert @s3.put(@bucket, @key1, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo1!'), 'Put bucket fail'
     assert @s3.put(@bucket, @key2, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo2!'), 'Put bucket fail'
     assert @s3.put(@bucket, @key3, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo3!'), 'Put bucket fail'
   end
-  
+
+  def test_04_put_multipart_string
+    test_text = ""
+    for i in 1..100000
+      test_text << "Testing test text #{i}\n"
+    end
+    assert @s3.store_object_multipart({:bucket => @bucket, :key => @key4, :data => StringIO.new(test_text)}), 'Put bucket multipart fail'
+  end
+
+  def test_04b_store_object_multipart_stream
+    rd, wr = IO.pipe
+    producer = Thread.new(wr) do |out|
+      for i in 1..100000
+        out.write("Testing stream text #{i}\n")
+      end
+      out.close
+    end
+    assert @s3.store_object_multipart({:bucket => @bucket, :key => @key5, :data => rd , :part_size => (20*1024*1024)}), 'Put bucket multipart fail'
+    rd.close
+  end
+
   def test_05_get_and_get_object
     assert_raise(Rightscale::AwsError) { @s3.get(@bucket, 'undefined/key') }
     data1 = @s3.get(@bucket, @key1)
@@ -47,7 +71,7 @@ class TestS3 < Test::Unit::TestCase
     assert_equal 'Woohoo1!', data1[:headers]['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
     assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key3), "Get_object text must return '#{RIGHT_OBJECT_TEXT}'"
   end
-  
+
   def test_06_head
     assert_equal 'Woohoo1!', @s3.head(@bucket,@key1)['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
   end
@@ -55,7 +79,7 @@ class TestS3 < Test::Unit::TestCase
 
   def test_07_streaming_get
     resp = String.new
-    assert_raise(Rightscale::AwsError) do 
+    assert_raise(Rightscale::AwsError) do
       @s3.get(@bucket, 'undefined/key') do |chunk|
         resp += chunk
       end
@@ -69,15 +93,17 @@ class TestS3 < Test::Unit::TestCase
     assert_equal @s3.get_object(@bucket, @key1), resp, "Streaming iface must return same as non-streaming"
     assert_equal 'Woohoo1!', data1[:headers]['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
   end
-  
+
   def test_08_keys
     keys = @s3.list_bucket(@bucket).map{|b| b[:key]}
-    assert_equal keys.size, 3, "There should be 3 keys"
+    assert_equal keys.size, 5, "There should be 5 keys"
     assert(keys.include?(@key1))
     assert(keys.include?(@key2))
     assert(keys.include?(@key3))
+    assert(keys.include?(@key4))
+    assert(keys.include?(@key5))
   end
-  
+
   def test_09_copy_key
     #--- test COPY
     # copy a key
@@ -130,7 +156,7 @@ class TestS3 < Test::Unit::TestCase
   def test_13_delete_folder
     assert_equal 1, @s3.delete_folder(@bucket, 'test').size, "Only one key(#{@key1}) must be deleted!"
   end
- 
+
   def test_14_delete_bucket
     assert_raise(Rightscale::AwsError) { @s3.delete_bucket(@bucket) }
     assert @s3.clear_bucket(@bucket), 'Clear_bucket fail'
@@ -138,9 +164,10 @@ class TestS3 < Test::Unit::TestCase
     assert @s3.delete_bucket(@bucket)
     assert !@s3.list_all_my_buckets.map{|bucket| bucket[:name]}.include?(@bucket), "#{@bucket} must not exist"
   end
-  
-  
-  
+
+
+
+
 
   #---------------------------
   # Rightscale::S3 classes
@@ -198,7 +225,7 @@ class TestS3 < Test::Unit::TestCase
     assert key2.delete
     assert !key2.exists?
   end
-  
+
   def test_23_rename_key
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
     # -- 1 -- (key based rename)
@@ -218,7 +245,7 @@ class TestS3 < Test::Unit::TestCase
     assert  bucket.key('test/copy/3').exists?, "'test/copy/3' should exist"
     assert !bucket.key('test/copy/2').exists?, "'test/copy/2' should not exist"
   end
-  
+
   def test_24_copy_key
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
     # -- 1 -- (key based copy)
@@ -239,7 +266,7 @@ class TestS3 < Test::Unit::TestCase
     assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/11').get
     assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/12').get
   end
-  
+
   def test_25_move_key
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
     # -- 1 -- (key based copy)
@@ -258,20 +285,20 @@ class TestS3 < Test::Unit::TestCase
     assert bucket.key('test/copy/22').exists?, "'test/copy/22' should exist"
     assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/22').get
   end
-  
+
   def test_26_save_meta
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
     # create a key
     key = bucket.key('test/copy/30')
     key.put(RIGHT_OBJECT_TEXT)
-    assert key.meta_headers.blank?
+    assert key.meta_headers.right_blank?
     # store some meta keys
     meta = {'family' => 'oops','race' => 'troll'}
     assert_equal meta, key.save_meta(meta)
     # reload meta
     assert_equal meta, key.reload_meta
   end
-    
+
   def test_27_clear_delete
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
       # add another key
@@ -280,16 +307,16 @@ class TestS3 < Test::Unit::TestCase
     assert_equal 1, bucket.delete_folder(@key1).size
       # delete
     assert_raise(Rightscale::AwsError) { bucket.delete }
-    bucket.delete(true)
+    bucket.delete(:force => true)
   end
 
     # Grantees
-    
+
   def test_30_create_bucket
     bucket = @s.bucket(@bucket, true, 'public-read')
     assert bucket
   end
-  
+
   def test_31_list_grantees
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
       # get grantees list
@@ -297,10 +324,10 @@ class TestS3 < Test::Unit::TestCase
       # check that the grantees count equal to 2 (root, AllUsers)
     assert_equal 2, grantees.size
   end
-  
+
   def test_32_grant_revoke_drop
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
-      # Take 'AllUsers' grantee 
+      # Take 'AllUsers' grantee
     grantee = Rightscale::S3::Grantee.new(bucket,'http://acs.amazonaws.com/groups/global/AllUsers')
       # Check exists?
     assert grantee.exists?
@@ -331,9 +358,9 @@ class TestS3 < Test::Unit::TestCase
     assert !grantee.exists?
     assert_equal 1, bucket.grantees.size
       # Delete bucket
-    bucket.delete(true)
+    bucket.delete(:force => true)
   end
-  
+
   def test_33_key_grantees
       # Create bucket
     bucket = @s.bucket(@bucket, true)
@@ -350,7 +377,7 @@ class TestS3 < Test::Unit::TestCase
       # Drop grantee
     assert grantee.drop
       # Drop bucket
-    bucket.delete(true)
+    bucket.delete(:force => true)
   end
 
   def test_34_bucket_create_put_with_perms
@@ -393,27 +420,134 @@ class TestS3 < Test::Unit::TestCase
     RightAws::S3Interface.amazon_problems= nil
     assert_nil(RightAws::S3Interface.amazon_problems)
   end
-  
+
   def test_37_access_logging
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
     targetbucket = Rightscale::S3::Bucket.create(@s, @bucket2, true)
-      # Take 'AllUsers' grantee 
+      # Take 'AllUsers' grantee
     grantee = Rightscale::S3::Grantee.new(targetbucket,'http://acs.amazonaws.com/groups/s3/LogDelivery')
- 
+
     assert grantee.grant(['READ_ACP', 'WRITE'])
-    
+
     assert bucket.enable_logging(:targetbucket => targetbucket, :targetprefix => "loggylogs/")
-    
-    assert_equal(bucket.logging_info, {:enabled => true, :targetbucket => @bucket2, :targetprefix => "loggylogs/"})
+    sleep 10
+
+    assert_equal({:enabled => true, :targetbucket => @bucket2, :targetprefix => "loggylogs/"}, bucket.logging_info)
     
     assert bucket.disable_logging
-    
+
       # check 'Drop' method
     assert grantee.drop
-    
-      # Delete bucket
-    bucket.delete(true)
-    targetbucket.delete(true)
+  end
+
+  def test_40_delete_buckets
+    Rightscale::S3::Bucket.create(@s, @bucket,  false).delete(:force => true)
+    Rightscale::S3::Bucket.create(@s, @bucket2, false).delete(:force => true)
+  end
+
+  def test_41_add_cache_control_response_parameter
+    @cache_control = 'max-age=3600'
+    perform_request( 'response-cache-control' => @cache_control ) do |response|
+       assert_equal response['Cache-Control'], @cache_control
+    end
+  end
+
+  def test_42_add_cache_control_and_content_type_and_content_disposition
+    @cache_control = 'max-age=3600'
+    @content_type = 'text/plain'
+    @content_disposition = 'attachment; filename=sample.txt'
+    perform_request(
+        'response-cache-control' => @cache_control,
+        'response-content-type' => @content_type,
+        'response-content-disposition' => @content_disposition
+    ) do |response|
+      assert_equal response['Cache-Control'], @cache_control
+      assert_equal response['Content-Type'], @content_type
+      assert_equal response['Content-Disposition'], @content_disposition
+    end
+  end
+
+  def test_43_add_expires_and_content_type_and_content_disposition
+    @expires = 'Sun, 26 Jun 2011 02:58:26 GMT'
+    @content_type = 'text/plain'
+    @content_disposition = 'attachment; filename=sample.txt'
+    perform_request(
+        'response-expires' => @expires,
+        'response-content-type' => @content_type,
+        'response-content-disposition' => @content_disposition
+    ) do |response|
+      assert_equal response['Expires'], @expires
+      assert_equal response['Content-Type'], @content_type
+      assert_equal response['Content-Disposition'], @content_disposition
+    end
+  end
+
+  def test_44_delete_multiple
+    bucket = RightAws::S3::Bucket.create(@s, @bucket, true)
+
+    key1 = Rightscale::S3::Key.create(bucket, @key1)
+    key2 = Rightscale::S3::Key.create(bucket, @key2)
+    key3 = Rightscale::S3::Key.create(bucket, @key3)
+
+    assert @s3.put(@bucket, @key1, RIGHT_OBJECT_TEXT), 'Put bucket fail'
+    assert @s3.put(@bucket, @key2, RIGHT_OBJECT_TEXT), 'Put bucket fail'
+    assert @s3.put(@bucket, @key3, RIGHT_OBJECT_TEXT), 'Put bucket fail'
+
+    key1.refresh
+    key2.refresh
+    key3.refresh
+
+    assert key1.exists?
+    assert key2.exists?
+    assert key3.exists?
+
+    result = @s3.delete_multiple(@bucket, [@key1, @key2, @key3])
+    assert result.empty?
+
+    key1.refresh
+    key2.refresh
+    key3.refresh
+
+    assert !key1.exists?
+    assert !key2.exists?
+    assert !key3.exists?
+  end
+
+  def test_45_delete_multiple_more_than_1000_objects
+    n = 1200
+    keys = (1..n).map { |i| "key-#{i}"}
+
+    keys.each do |key|
+      assert @s3.put(@bucket, key, RIGHT_OBJECT_TEXT), 'Put bucket fail'
+    end
+
+    result = @s3.delete_multiple(@bucket, keys)
+    assert result.empty?
+
+    keys_after = @s3.list_bucket(@bucket).map { |obj| obj[:key] }
+
+    keys.each do |key|
+      assert !keys_after.include?(key)
+    end
+  end
+
+  private
+
+  def request( uri )
+    url = URI.parse( uri )
+
+    http = Net::HTTP.new(url.host, 80)
+#    http.use_ssl = true
+#    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    http.request(Net::HTTP::Get.new( url.request_uri ))
+  end
+
+  def perform_request( headers, &block )
+    @s3.create_bucket( @bucket )
+    @s3.put( @bucket, @key2, RIGHT_OBJECT_TEXT )
+    response = request( @s3.get_link( @bucket, @key2, nil, {}, headers ) )
+    block.call( response )
+    @s3.force_delete_bucket(@bucket)
   end
 
 end