right_aws 1.10.0 → 2.0.0

data/test/sqs/test_right_sqs_gen2.rb

@@ -7,8 +7,13 @@ class TestSqsGen2 < Test::Unit::TestCase
 
   
   def setup
+    $stdout.sync = true
+    @grantee_aws_id = '100000000001'
     @sqs = Rightscale::SqsGen2Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-    @queue_name = 'right_sqs_test_gen2_queue'
+    @queue_name  = 'right_sqs_test_gen2_queue'
+    @queue2_name = @queue_name + '_2'
+    @queue3_name = @queue_name + '_3'
+    @queue4_name = @queue_name + '_4'
       # for classes
     @s = Rightscale::SqsGen2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
   end
@@ -19,18 +24,24 @@ class TestSqsGen2 < Test::Unit::TestCase
   # the additional faults then wait a bit...
   def wait_for_queue_url(queue_name)
     queue_url = nil
-    until queue_url
+    do_sleep(180) do
       queue_url = @sqs.queue_url_by_name(queue_name)
-      unless queue_url
-        print '-' 
-        STDOUT.flush
-        sleep 1
-      end
     end
+    sleep 30
     queue_url
   end
-  
-  
+
+  def do_sleep(delay, &block)
+    puts "sleeping #{block ? 'up to ' : ''}#{delay} seconds:"
+    wake_up_at = Time.now+delay
+    while Time.now < wake_up_at do
+      sleep 1
+      print '.'
+      break if block && block.call
+    end
+    puts
+  end
+    
   #---------------------------
   # Rightscale::SqsInterface
   #---------------------------
@@ -48,13 +59,51 @@ class TestSqsGen2 < Test::Unit::TestCase
 
   def test_03_set_and_get_queue_attributes
     queue_url = @sqs.queue_url_by_name(@queue_name)
-    assert queue_url[/http.*#{@queue_name}/], "#{@queue_name} must exist!"
+    assert queue_url[/https.*#{@queue_name}/], "#{@queue_name} must exist!"
     assert @sqs.set_queue_attributes(queue_url, 'VisibilityTimeout', 111), 'Set_queue_attributes fail'
-    sleep 20 # Amazon needs some time to change attribute
+    do_sleep 60 # Amazon needs some time to change attribute
     assert_equal '111', @sqs.get_queue_attributes(queue_url)['VisibilityTimeout'], 'New VisibilityTimeout must be equal to 111'
   end
-  
-  def test_06_send_message
+
+  def test_04_get_queue_attributes_forms
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    all = nil
+    assert_nothing_raised do
+      all = @sqs.get_queue_attributes(queue_url, 'All')
+    end
+    assert_nothing_raised do
+      assert all, @sqs.get_queue_attributes(queue_url)
+    end
+    assert_nothing_raised do
+      attributes = @sqs.get_queue_attributes(queue_url, 'ApproximateNumberOfMessages', 'VisibilityTimeout')
+      assert_equal 2, attributes.size
+    end
+    assert_nothing_raised do
+      attributes = @sqs.get_queue_attributes(queue_url, ['ApproximateNumberOfMessages', 'VisibilityTimeout'])
+      assert_equal 2, attributes.size
+    end
+  end
+
+  def test_05_add_permissions
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    assert @sqs.add_permissions(queue_url, 'test01', @grantee_aws_id, 'SendMessage')
+    assert @sqs.add_permissions(queue_url, 'test02', @grantee_aws_id, ['DeleteMessage','ReceiveMessage'])
+    do_sleep 60
+  end
+
+  def test_06_test_permissions
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    permissions = @sqs.get_queue_attributes(queue_url, 'Policy')
+    assert !permissions.blank?
+  end
+
+  def test_07_revoke_permissions
+    queue_url = @sqs.queue_url_by_name(@queue_name)
+    assert @sqs.remove_permissions(queue_url, 'test01')
+    assert @sqs.remove_permissions(queue_url, 'test02')
+  end
+
+  def test_14_send_message
     queue_url = @sqs.queue_url_by_name(@queue_name)
       # send 5 messages for the tests below
     assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
@@ -62,28 +111,29 @@ class TestSqsGen2 < Test::Unit::TestCase
     assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
     assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
     assert @sqs.send_message(queue_url, RIGHT_MESSAGE_TEXT)
+    do_sleep 60
   end
   
-  def test_07_get_queue_length
+  def test_15_get_queue_length
     queue_url = @sqs.queue_url_by_name(@queue_name)
     assert_equal 5, @sqs.get_queue_length(queue_url), 'Queue must have 5 messages'
   end
 
-  def test_08_receive_message
+  def test_16_receive_message
     queue_url = @sqs.queue_url_by_name(@queue_name)
     r_message = @sqs.receive_message(queue_url, 1)[0]
     assert r_message, "Receive returned no message(s), but this is not necessarily incorrect"
     assert_equal RIGHT_MESSAGE_TEXT, r_message['Body'], 'Receive message got wrong message text'
   end
   
-  def test_09_delete_message
+  def test_17_delete_message
     queue_url = @sqs.queue_url_by_name(@queue_name)
     message = @sqs.receive_message(queue_url)[0]
     assert @sqs.delete_message(queue_url, message['ReceiptHandle']), 'Delete_message fail'
     assert @sqs.pop_message(queue_url), 'Pop_message fail'
   end
   
-  def test_10_clear_and_delete_queue
+  def test_18_clear_and_delete_queue
     queue_url = @sqs.queue_url_by_name(@queue_name)
     assert @sqs.delete_queue(queue_url) 
   end
@@ -92,31 +142,36 @@ class TestSqsGen2 < Test::Unit::TestCase
   # Rightscale::Sqs classes
   #---------------------------
 
-  def test_20_sqs_create_delete_queue
+  def test_20_sqs_create_queue
     assert @s, 'Rightscale::SqsGen2 must exist'
       # get queues list
     queues_size = @s.queues.size
       # create new queue
-    queue  = @s.queue("#{@queue_name}_20", true)
+    queue = @s.queue(@queue2_name, true)
       # check that it is created
     assert queue.is_a?(Rightscale::SqsGen2::Queue)
-    wait_for_queue_url(@queue_name)
+    wait_for_queue_url(queue.name)
       # check that amount of queues has increased
     assert_equal queues_size + 1, @s.queues.size
-      # delete queue
+    do_sleep 10
+  end
+
+  def test_21_sqs_delete_queue
+    queue = @s.queue(@queue2_name, false)
     assert queue.delete
   end
   
-  def test_21_queue_create
+  def test_22_queue_create
       # create new queue
-    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_21", true)
+    queue = Rightscale::SqsGen2::Queue.create(@s, @queue3_name, true)
       # check that it is created
     assert queue.is_a?(Rightscale::SqsGen2::Queue)
-    wait_for_queue_url(@queue_name)
+    wait_for_queue_url("#{@queue_name}_21")
+    do_sleep 10
   end
   
-  def test_22_queue_attributes
-    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_21", false)
+  def test_23_queue_attributes
+    queue = Rightscale::SqsGen2::Queue.create(@s, @queue3_name, false)
       # get a list of attrinutes
     attributes = queue.get_attribute
     assert attributes.is_a?(Hash) && attributes.size>0
@@ -125,7 +180,7 @@ class TestSqsGen2 < Test::Unit::TestCase
       # set attribute
     assert queue.set_attribute('VisibilityTimeout', v)
       # wait a bit
-    sleep 20
+    do_sleep 60
       # check that attribute has changed
     assert_equal v, queue.get_attribute('VisibilityTimeout')
       # get queue visibility timeout
@@ -135,25 +190,34 @@ class TestSqsGen2 < Test::Unit::TestCase
       # make sure that it is changed
     assert v.to_i + 10, queue.visibility
   end
+
+  def test_24
+    queue = Rightscale::SqsGen2::Queue.create(@s, @queue3_name, false)
+    assert queue.delete
+  end
   
-  def test_24_send_size
-    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", true)
+  def test_25_send_size
+    queue = Rightscale::SqsGen2::Queue.create(@s, @queue4_name, true)
       # send 5 messages
     assert queue.push('a1')
     assert queue.push('a2')
     assert queue.push('a3')
     assert queue.push('a4')
     assert queue.push('a5')
+      #
+    do_sleep(300){ queue.size == 5 }
       # check queue size
     assert_equal 5, queue.size
       # send one more
     assert queue.push('a6')
+      #
+    do_sleep(300){ queue.size == 6 }
       # check queue size again
     assert_equal 6, queue.size
   end
   
-  def test_25_message_receive_pop_delete
-    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", false)
+  def test_26_message_receive_pop_delete
+    queue = Rightscale::SqsGen2::Queue.create(@s,  @queue4_name, false)
       # get queue size
     size = queue.size
       # get first message
@@ -162,25 +226,31 @@ class TestSqsGen2 < Test::Unit::TestCase
       # pop second message
     m2 = queue.pop
     assert m2.is_a?(Rightscale::SqsGen2::Message)
+      #
+    do_sleep 30
       # make sure that queue size has decreased
     assert_equal size-1, queue.size
       # delete messsage
     assert m1.delete
+      #
+    do_sleep 15
       # make sure that queue size has decreased again
     assert_equal size-2, queue.size
   end
  
-  def test_26
-    queue = Rightscale::SqsGen2::Queue.create(@s, "#{@queue_name}_24", false)
+  def test_27
+    queue = Rightscale::SqsGen2::Queue.create(@s, @queue4_name, false)
       # lock message 
     queue.receive(100)
       # clear queue
     assert queue.clear 
       # queue size is greater than zero
     assert queue.size>0
+      # delete queue
+    assert queue.delete
   end
 
-  def test_27_set_amazon_problems
+  def test_28_set_amazon_problems
     original_problems = Rightscale::SqsGen2Interface.amazon_problems
     assert(original_problems.length > 0)
     Rightscale::SqsGen2Interface.amazon_problems= original_problems << "A New Problem"
@@ -190,20 +260,5 @@ class TestSqsGen2 < Test::Unit::TestCase
     Rightscale::SqsGen2Interface.amazon_problems= nil
     assert_nil(Rightscale::SqsGen2Interface.amazon_problems)
   end
-
-  def test_28_check_threading_model
-    assert(!@sqs.multi_thread)
-    newsqs = Rightscale::SqsGen2Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, {:multi_thread => true})
-    assert(newsqs.multi_thread)
-  end
-
-  def test_29_signature_version_0
-    sqs = Rightscale::SqsInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
-    assert_nothing_raised do
-      sqs.list_queues
-    end
-    # check that the request has correct signature version
-    assert sqs.last_request.path.include?('SignatureVersion=0')
-  end
   
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.10.0
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -9,21 +14,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2010-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_http_connection
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
-    version: 
-description: "== DESCRIPTION:  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.  These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.  The RightScale AWS gems comprise:  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the associated EBS (Elastic Block Store) - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service) - RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01) - RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01) - RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB) - RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service  == FEATURES:"
-email: rubygems@rightscale.com
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
+description: |-
+  == DESCRIPTION:
+  
+  The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront. 
+  These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon. 
+  The RightScale AWS gems comprise:
+  
+  - RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud), VPC (Virtual Private Cloud) and the associated EBS (Elastic Block Store)
+  - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
+  - RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service)
+  - RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service)
+  - RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+  - RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+  - RightAws::AsInterface  -- interface to Amazon Auto Scaling
+  - RightAws::AcwInterface -- interface to Amazon Cloud Watch
+  - RightAws::ElbInterface -- interface to Amazon Elastic Load Balancer
+  - RightAws::RdsInterface -- interface to Amazon RDS instances
+  
+  == FEATURES:
+email: support@rightscale.com
 executables: []
 
 extensions: []
@@ -41,8 +110,19 @@ files:
 - lib/awsbase/right_awsbase.rb
 - lib/awsbase/support.rb
 - lib/ec2/right_ec2.rb
+- lib/ec2/right_ec2_images.rb
+- lib/ec2/right_ec2_instances.rb
+- lib/ec2/right_ec2_security_groups.rb
+- lib/ec2/right_ec2_spot_instances.rb
+- lib/ec2/right_ec2_ebs.rb
+- lib/ec2/right_ec2_reserved_instances.rb
+- lib/ec2/right_ec2_vpc.rb
+- lib/ec2/right_ec2_monitoring.rb
 - lib/right_aws.rb
 - lib/s3/right_s3.rb
+- lib/acw/right_acw_interface.rb
+- lib/elb/right_elb_interface.rb
+- lib/as/right_as_interface.rb
 - lib/s3/right_s3_interface.rb
 - lib/sdb/active_sdb.rb
 - lib/sdb/right_sdb_interface.rb
@@ -51,6 +131,9 @@ files:
 - lib/sqs/right_sqs_gen2_interface.rb
 - lib/sqs/right_sqs_interface.rb
 - lib/acf/right_acf_interface.rb
+- lib/acf/right_acf_streaming_interface.rb
+- lib/acf/right_acf_origin_access_identities.rb
+- lib/rds/right_rds_interface.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_right_ec2.rb
 - test/http_connection.rb
@@ -67,8 +150,12 @@ files:
 - test/ts_right_aws.rb
 - test/acf/test_helper.rb
 - test/acf/test_right_acf.rb
+- test/rds/test_helper.rb
+- test/rds/test_right_rds.rb
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -79,20 +166,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: rightscale
-rubygems_version: 1.3.1
+rubyforge_project: rightaws
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
-summary: Interface classes for the Amazon EC2/EBS, SQS, S3, SDB, and ACF Web Services
+specification_version: 3
+summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
 test_files: 
 - test/ts_right_aws.rb