right_aws 1.9.0 → 3.1.0

data/test/sns/test_helper.rb

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

data/test/sns/test_right_sns.rb

@@ -0,0 +1,153 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestSns < Test::Unit::TestCase
+
+  # You can change these things to whatever you like
+  @@subscriber_email    = 'foo@bar.baz'
+  @@topic_name          = 'RightTestTopic'
+  @@topic_display_name  = 'right_aws test notification topic'
+  @@queue_name          = "sns_subscribe_queue_#{Time.now.utc.to_i}"
+
+  # These are placeholders for values that get set, and consumed during the course of testing.
+  @@topic_arn           = ''
+  @@subscription_arn    = ''
+  @@queue_url           = ''
+  @@queue_arn           = ''
+
+  @@policy_template     = <<-EOF
+{
+  "Id": "Policy1300753700208",
+  "Statement": [
+    {
+      "Sid": "Stmt1300753696680",
+      "Action": [
+        "SNS:Publish",
+        "SNS:RemovePermission",
+        "SNS:SetTopicAttributes",
+        "SNS:DeleteTopic",
+        "SNS:ListSubscriptionsByTopic",
+        "SNS:GetTopicAttributes",
+        "SNS:Receive",
+        "SNS:AddPermission",
+        "SNS:Subscribe"
+      ],
+      "Effect": "Allow",
+      "Resource": "@@topic_arn@@",
+      "Principal": {
+        "AWS": [
+          "*"
+        ]
+      }
+    }
+  ]
+}
+    EOF
+
+  def policy_text
+    @@policy_template.gsub('@@topic_arn@@', @@topic_arn)
+  end
+
+  def setup
+    @sns = Rightscale::SnsInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @sqs = Rightscale::SqsGen2Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+  end
+
+  def test_01_create_topic
+    response = @sns.create_topic(@@topic_name)
+    assert_not_nil(response)
+    @@topic_arn = response
+  end
+
+  def test_02_set_topic_attributes
+    response = @sns.set_topic_attribute(@@topic_arn, 'Policy', policy_text())
+    assert_not_nil(response)
+
+    response = @sns.set_topic_attribute(@@topic_arn, 'DisplayName', @@topic_display_name)
+    assert_not_nil(response)
+
+    assert_raise ArgumentError do
+      @sns.set_topic_attribute(@@topic_arn, 'Foo', 'val')
+    end
+  end
+
+  def test_03_get_topic_attributes
+    response = @sns.get_topic_attributes(@@topic_arn)
+    assert_not_nil(response)
+    assert(response['DisplayName'] == @@topic_display_name)
+    assert(response['Policy'] =~ /Policy1300753700208/)
+  end
+
+  def test_04_list_topics
+    sleep(1)
+    assert(@sns.list_topics.collect{|topic| topic[:arn] }.include?(@@topic_arn))
+  end
+
+  def test_05_subscribe_email
+    response = @sns.subscribe(@@topic_arn, 'email', @@subscriber_email)
+    assert_not_nil(response)
+    @@subscription_arn = response
+  end
+
+  def test_06_list_subscriptions
+    sleep(1)
+
+    response = @sns.list_subscriptions()
+    assert_not_nil(response)
+    assert(response.count == 1)
+    assert(response[0][:endpoint] == @@subscriber_email)
+    assert(response[0][:protocol] == 'email')
+    assert(response[0][:subscription_arn] == 'PendingConfirmation')
+    assert(response[0][:topic_arn] == @@topic_arn)
+  end
+
+  def test_07_list_subscriptions_by_topic
+    response = @sns.list_subscriptions(@@topic_arn)
+    assert_not_nil(response)
+    assert(response.count == 1)
+    assert(response[0][:endpoint] == @@subscriber_email)
+    assert(response[0][:protocol] == 'email')
+    assert(response[0][:subscription_arn] == 'PendingConfirmation')
+    assert(response[0][:topic_arn] == @@topic_arn)
+  end
+
+  def test_08_unsubscribe
+    @@queue_url = @sqs.create_queue(@@queue_name)
+    @@queue_arn = "arn:aws:sqs:us-east-1:#{TestCredentials.account_number.gsub('-','')}:#{@@queue_name}"
+    sub_response = @sns.subscribe(@@topic_arn, 'sqs', @@queue_arn)
+    assert_not_nil(sub_response)
+    unsub_response = @sns.unsubscribe(sub_response)
+    @sqs.delete_queue(@@queue_url)
+  end
+
+  def test_09_publish
+    response = @sns.publish(@@topic_arn, 'Message to publish', 'Message Subject')
+    assert_not_nil(response)
+  end
+
+  def test_10_add_and_remove_permission
+    acct_num = TestCredentials.account_number.gsub('-','')
+
+    add_response = @sns.add_permission(@@topic_arn, 'PermissionLbl', [
+      {:aws_account_id => acct_num, :action => "GetTopicAttributes"},
+      {:aws_account_id => acct_num, :action => "Publish"}
+    ])
+    assert_not_nil(add_response)
+
+    remove_response = @sns.remove_permission(@@topic_arn, 'PermissionLbl')
+    assert_not_nil(remove_response)
+  end
+
+# TODO: Cannot easily test confirming subscription because it's only valid for http(s) and email subscriptions.
+# Since we don't want to setup an email box or HTTP server to recive the token, we can't really simulate this
+#  def test_10_confirm_subscription
+#    response = @sns.confirm_subscription(@@topic_arn, 'SomeToken')
+#    assert_not_null(response)
+#  end
+
+  def test_30_delete_topic
+    response = @sns.delete_topic(@@topic_arn)
+    assert_not_nil(response)
+    sleep(1)
+    assert(!@sns.list_topics.collect{|topic| topic[:arn] }.include?(@@topic_arn))
+  end
+end

data/test/sqs/test_right_sqs.rb

@@ -273,12 +273,6 @@ class TestSqs < Test::Unit::TestCase
     assert_nil(Rightscale::SqsInterface.amazon_problems)
   end
 
-  def test_28_check_threading_model
-    assert(!@sqs.multi_thread)
-    newsqs = Rightscale::SqsInterface.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

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.right_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