icehouse-right_aws 1.11.0 → 2.2.0

data/test/awsbase/test_right_awsbase.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'pp'
 
 class TestAwsbase < Test::Unit::TestCase
 

data/test/ec2/test_right_ec2.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'pp'
 
 class TestEc2 < Test::Unit::TestCase
 

data/test/elb/test_helper.rb

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

data/test/elb/test_right_elb.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestElb < Test::Unit::TestCase
+
+  STDOUT.sync = true
+  BALANCER_NAME = 'right-aws-test-lb'
+
+  def setup
+    @elb = Rightscale::ElbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :logger => Logger.new('/dev/null'))
+
+    unless @elb.describe_load_balancers.detect { |lb| lb[:load_balancer_name] == BALANCER_NAME }
+      @elb.create_load_balancer(BALANCER_NAME, %w[us-east-1b], [])
+    end
+    @lb = @elb.describe_load_balancers.detect { |lb| lb[:load_balancer_name] == BALANCER_NAME }
+  end
+
+  # At the end of the day when you want to shut down the test balancer:
+  # * Uncomment this method.
+  # * Comment out all test except one.
+  # * Run this test file.
+  #
+  # def teardown
+  #   @elb.delete_load_balancer BALANCER_NAME
+  # end
+
+  def test_00_describe_load_balancers
+    items = @elb.describe_load_balancers
+    assert items.is_a?(Array)
+  end
+
+  def test_description
+    assert_match /^#{BALANCER_NAME}-\d+\.us-east-1\.elb\.amazonaws\.com$/, @lb[:dns_name]
+  end
+
+  def test_description_has_canonical_hosted_zone_name
+    assert_match /^#{BALANCER_NAME}-\d+\.us-east-1\.elb\.amazonaws\.com$/, @lb[:canonical_hosted_zone_name]
+  end
+
+  def test_description_has_canonical_hosted_zone_name_id
+    assert_match /^[A-Z0-9]+$/, @lb[:canonical_hosted_zone_name_id]
+  end
+
+end

data/test/route_53/fixtures/a_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>host.right-aws.example.com.</Name>
+          <Type>A</Type>
+          <TTL>600</TTL>
+          <ResourceRecords>
+            <ResourceRecord><Value>10.0.0.1</Value></ResourceRecord>
+          </ResourceRecords>
+        </ResourceRecordSet>
+      </Change>
+    </Changes>
+  </ChangeBatch>
+</ChangeResourceRecordSetsRequest>

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

@@ -6,8 +6,8 @@ class TestS3 < Test::Unit::TestCase
   
   def setup
     @s3     = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-    @bucket = 'right_s3_awesome_test_bucket_000A1'
-    @bucket2 = 'right_s3_awesome_test_bucket_000A2'
+    @bucket = 'right_s3_awesome_test_bucket_000B1'
+    @bucket2 = 'right_s3_awesome_test_bucket_000B2'
     @key1   = 'test/woohoo1/'
     @key2   = 'test1/key/woohoo2'
     @key3   = 'test2/A%B@C_D&E?F+G=H"I'
@@ -264,7 +264,7 @@ class TestS3 < Test::Unit::TestCase
     # 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)
@@ -403,17 +403,19 @@ class TestS3 < Test::Unit::TestCase
     assert grantee.grant(['READ_ACP', 'WRITE'])
     
     assert bucket.enable_logging(:targetbucket => targetbucket, :targetprefix => "loggylogs/")
+    sleep 10
     
-    assert_equal(bucket.logging_info, {:enabled => true, :targetbucket => @bucket2, :targetprefix => "loggylogs/"})
+    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)
+    assert grantee.drop    
+  end
+
+  def test_40_delete_buckets
+    Rightscale::S3::Bucket.create(@s, @bucket,  false).delete(true)
+    Rightscale::S3::Bucket.create(@s, @bucket2, false).delete(true)
   end
 
 end

data/test/s3/test_right_s3_stubbed.rb

@@ -81,15 +81,17 @@ class TestS3Stubbed < Test::Unit::TestCase
   def test_116_move_key
     # move a key
     Rightscale::HttpConnection.push(413, 'not found') 
-    assert @s3.move(@bucket, @key1, @bucket, @key1_new_name)
-    
+    assert_raise RightAws::AwsError do
+      @s3.move(@bucket, @key1, @bucket, @key1_new_name)
+    end
   end
 
   def test_117_rename_key
     # rename a key
     Rightscale::HttpConnection.push(500, 'not found') 
-    assert @s3.rename(@bucket, @key2, @key2_new_name)
-    
+    assert_raise RightAws::AwsError do
+      @s3.rename(@bucket, @key2, @key2_new_name)
+    end
   end
 
 end

data/test/sdb/test_active_sdb.rb

@@ -1,11 +1,25 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestSdb < Test::Unit::TestCase
-  
-  DOMAIN_NAME = 'right_sdb_awesome_test_domain'
-  
+  DOMAIN_PREFIX = 'right_sdb_awesome_test'
+  CLIENT_DOMAIN = "#{DOMAIN_PREFIX}_client"
+  PERSON_DOMAIN = "#{DOMAIN_PREFIX}_person"
+
   class Client < RightAws::ActiveSdb::Base
-    set_domain_name DOMAIN_NAME
+    set_domain_name CLIENT_DOMAIN
+  end
+
+  class Person < RightAws::ActiveSdb::Base
+    set_domain_name PERSON_DOMAIN
+
+    columns do
+      name
+      email
+      score         :Integer
+      is_active     :Boolean
+      registered_at :DateTime
+      created_at    :DateTime, :default => lambda{ Time.now }
+    end
   end
 
   def setup
@@ -17,6 +31,13 @@ class TestSdb < Test::Unit::TestCase
       { 'name' => 'Mary',     'country' => 'USA',    'gender' => 'female', 'hobby' => ['patchwork', 'bundle jumping'] },
       { 'name' => 'Sandy',    'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] },
       { 'name' => 'Mary',     'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] } ]
+    @people = [
+      { :name => 'Yetta E. Andrews',    :email => 'nulla.facilisis@metus.com', :score => 100, :is_active => true,  :registered_at => Time.local(2000, 1, 1) },
+      { :name => 'Sybill O. Olson',     :email => 'nisi.Aenean.eget@urna.com', :score =>  87, :is_active => true,  :registered_at => Time.local(2008, 7, 6) },
+      { :name => 'Isabelle K. Flynn',   :email => 'velit@amet.com',            :score =>  98, :is_active => false, :registered_at => Time.local(2003, 5, 20) },
+      { :name => 'Juliet H. Witt',      :email => 'egestas@pretiumaliquet.ca', :score =>  72, :is_active => true,  :registered_at => Time.local(2007, 2, 28) },
+      { :name => 'Lucy N. Christensen', :email => 'lacus.v12@stu.edu',         :score =>  94, :is_active => false, :registered_at => Time.local(2005, 10, 26) }
+    ]
     RightAws::ActiveSdb.establish_connection(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
   end
 
@@ -37,24 +58,26 @@ class TestSdb < Test::Unit::TestCase
   #---------------------------
 
   def test_00_delete_domain
-    assert RightAws::ActiveSdb.delete_domain(DOMAIN_NAME)
+    assert RightAws::ActiveSdb.delete_domain(CLIENT_DOMAIN)
+    assert RightAws::ActiveSdb.delete_domain(PERSON_DOMAIN)
     wait SDB_DELAY, 'test 00: after domain deletion'
   end
   
   def test_01_create_domain
     # check that domain does not exist
-    assert !RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+    assert !RightAws::ActiveSdb.domains.include?(CLIENT_DOMAIN)
     # create domain
     assert Client.create_domain
+    assert Person.create_domain
     wait SDB_DELAY, 'test 01: after domain creation'
     # check that we have received new domain from Amazin
-    assert RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+    assert RightAws::ActiveSdb.domains.include?(CLIENT_DOMAIN)
   end
 
   def test_02_create_items
     # check that DB is empty
     clients = Client.find(:all)
-    assert clients.blank?
+    assert clients.right_blank?
     # put some clients there
     @clients.each do |client|
       Client.create client
@@ -287,12 +310,47 @@ class TestSdb < Test::Unit::TestCase
     wait SDB_DELAY, 'test 11: after delete item'
     assert_nil Client.find_by_name('Putin')
   end
-  
-  def test_14_delete_domain
+
+  def test_14_dynamic_attribute_accessors
+    bush = Client.find_by_name('Bush')
+    bush.reload
+    assert_nothing_raised {
+      assert_equal ['male'], bush.gender
+      bush.name = 'George'
+      assert_equal ['George'], bush.name
+    }
+    assert_raise(NoMethodError) { bush.flarble }
+  end
+
+  def test_15_column_emulation
+    @people.each do |person|
+      Person.create person
+    end
+    wait SDB_DELAY, 'test 15: after people creation'
+    person = Person.find_by_email 'nulla.facilisis@metus.com'
+    person.reload
+
+    assert_equal 'Yetta E. Andrews', person.name
+    assert_equal DateTime, person.registered_at.class
+    assert person['registered_at'].is_a?(DateTime)
+    assert person[:registered_at].is_a?(DateTime)
+
+    assert ! person[:created_at].nil?
+    assert_equal DateTime, person.created_at.class
+    assert person['created_at'].is_a?(DateTime)
+    assert person[:created_at].is_a?(DateTime)
+
+    assert person.is_active
+
+    assert_equal 100, person.score
+  end
+
+  def test_999_delete_domain
     assert Client.delete_domain
-    wait SDB_DELAY, 'test 12: after delete domain'
-    assert_raise(Rightscale::AwsError) do 
-      Client.find :all 
+    assert Person.delete_domain
+    wait SDB_DELAY, 'test 999: after delete domain'
+    assert_raise(Rightscale::AwsError) do
+      Client.find :all
     end
   end