aws 1.10.1 → 1.10.2

data/History.txt

@@ -244,3 +244,11 @@ the source key.
   - S3: Fixed overzealous URL-encoding when generating URLs for S3 keys
     (thanks to a bug report on the RubyForge forum)
   
+=== 1.10.1
+
+  Release Notes:
+
+  First fork release.
+
+  - Fixed to_a warnings
+  - Added different connection modes.

data/lib/awsbase/right_awsbase.rb

@@ -223,10 +223,12 @@ module RightAws
         @params[:protocol] ||= service_info[:default_protocol]
       end
       @params[:multi_thread] ||= defined?(AWS_DAEMON)
+      @params[:connection_mode] ||= @params[:multi_thread] ? :per_thread : :default
+      @params[:connection_mode] = :per_request if @params[:connection_mode] == :default
       @logger = @params[:logger]
       @logger = RAILS_DEFAULT_LOGGER if !@logger && defined?(RAILS_DEFAULT_LOGGER)
       @logger = Logger.new(STDOUT)   if !@logger
-      @logger.info "New #{self.class.name} using #{@params[:multi_thread] ? 'multi' : 'single'}-threaded mode"
+      @logger.info "New #{self.class.name} using #{@params[:connection_mode].to_s}-connection mode"
       @error_handler = nil
       @cache = {}
       @signature_version = (params[:signature_version] || DEFAULT_SIGNATURE_VERSION).to_s

data/lib/right_aws.rb

@@ -53,7 +53,7 @@ module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 10
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/sdb/active_sdb.rb

@@ -98,11 +98,7 @@ module RightAws
       def connection
         @connection || raise(ActiveSdbError.new('Connection to SDB is not established'))
       end
-      def close
-        if @connection
-          @connection.fin
-        end
-      end
+
       # Create a new handle to an Sdb account. All handles share the same per process or per thread
       # HTTP connection to Amazon Sdb. Each handle is for a specific account.
       # The +params+ are passed through as-is to RightAws::SdbInterface.new
@@ -112,13 +108,21 @@ module RightAws
       #      :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
       #      :signature_version => '0'             # The signature version : '0' or '1'(default)
       #      DEPRECATED :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
-      #      :connection_mode  => :default               # options are :single, :multi (same as old multi_thread=>true), :pool, :per_request
-      #      :logger       => Logger Object        # Logger instance: logs to STDOUT if omitted 
+      #      :connection_mode  => :default         # options are :default (will use best known option, may change in the future)
+      #                                                  :per_request (opens and closes a connection on every request to SDB)
+      #                                                  :single (same as old multi_thread=>false)
+      #                                                  :per_thread (same as old multi_thread=>true)
+      #                                                  :pool (uses a connection pool with a maximum number of connections - NOT IMPLEMENTED YET)
+      #      :logger       => Logger Object        # Logger instance: logs to STDOUT if omitted
       #      :nil_representation => 'mynil'}       # interpret Ruby nil as this string value; i.e. use this string in SDB to represent Ruby nils (default is the string 'nil')
 
       def establish_connection(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
         @connection = RightAws::SdbInterface.new(aws_access_key_id, aws_secret_access_key, params)
       end
+
+      def close_connection
+        @connection.close_connection unless @connection.nil?
+      end
     end
     
     class ActiveSdbError < RuntimeError ; end

data/lib/sdb/right_sdb_interface.rb

@@ -26,7 +26,7 @@ require "right_aws"
 module RightAws
 
   class SdbInterface < RightAwsBase
-    
+
     include RightAwsBaseInterface
 
     DEFAULT_HOST      = 'sdb.amazonaws.com'
@@ -61,12 +61,12 @@ module RightAws
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       @nil_rep = params[:nil_representation] ? params[:nil_representation] : DEFAULT_NIL_REPRESENTATION
       params.delete(:nil_representation)
-      init({ :name             => 'SDB', 
-             :default_host     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).host   : DEFAULT_HOST, 
-             :default_port     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).port   : DEFAULT_PORT, 
-             :default_protocol => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).scheme : DEFAULT_PROTOCOL }, 
-           aws_access_key_id     || ENV['AWS_ACCESS_KEY_ID'], 
-           aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY'], 
+      init({ :name             => 'SDB',
+             :default_host     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).host   : DEFAULT_HOST,
+             :default_port     => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).port   : DEFAULT_PORT,
+             :default_protocol => ENV['SDB_URL'] ? URI.parse(ENV['SDB_URL']).scheme : DEFAULT_PROTOCOL },
+           aws_access_key_id     || ENV['AWS_ACCESS_KEY_ID'],
+           aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY'],
            params)
     end
 
@@ -99,7 +99,7 @@ module RightAws
         request = Net::HTTP::Get.new("#{service}?#{service_params}")
       end
       # prepare output hash
-      { :request  => request, 
+      { :request  => request,
         :server   => @params[:server],
         :port     => @params[:port],
         :protocol => @params[:protocol] }
@@ -108,14 +108,32 @@ module RightAws
     # Sends request to Amazon and parses the response
     # Raises AwsError if any banana happened
     def request_info(request, parser)  #:nodoc:
-#      thread = @params[:multi_thread] ? Thread.current : Thread.main
-#      thread[:sdb_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-      http_conn = Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-      ret = request_info_impl(http_conn, @@bench, request, parser)
-      http_conn.finish
+      ret = nil
+      conn_mode = @params[:connection_mode]
+      if conn_mode == :per_request
+        http_conn = Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
+        ret = request_info_impl(http_conn, @@bench, request, parser)
+        http_conn.finish
+      elsif conn_mode == :per_thread || conn_mode == :single
+        thread = conn_mode == :per_thread ? Thread.current : Thread.main
+        thread[:sdb_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
+        http_conn =  thread[:sdb_connection]
+        ret = request_info_impl(http_conn, @@bench, request, parser)
+      end
       ret
     end
 
+    def close_connection
+      conn_mode = @params[:connection_mode]
+      if conn_mode == :per_thread || conn_mode == :single
+        thread = conn_mode == :per_thread ? Thread.current : Thread.main
+        if !thread[:sdb_connection].nil?
+          thread[:sdb_connection].finish
+          thread[:sdb_connection] = nil
+        end
+      end
+    end
+
     # Prepare attributes for putting.
     # (used by put_attributes)
     def pack_attributes(attributes, replace = false) #:nodoc:
@@ -142,7 +160,7 @@ module RightAws
       end
       result
     end
-    
+
     # Use this helper to manually escape the fields in the query expressions. 
     # To escape the single quotes and backslashes and to wrap the string into the single quotes.
     # 
@@ -151,13 +169,13 @@ module RightAws
     def escape(value)
       %Q{'#{value.to_s.gsub(/(['\\])/){ "\\#{$1}" }}'} if value
     end
-    
+
     # Convert a Ruby language value to a SDB value by replacing Ruby nil with the user's chosen string representation of nil.
     # Non-nil values are unaffected by this filter.
     def ruby_to_sdb(value)
       value.nil? ? @nil_rep : value
     end
-    
+
     # Convert a SDB value to a Ruby language value by replacing the user's chosen string representation of nil with Ruby nil.
     # Values are unaffected by this filter unless they match the nil representation exactly.
     def sdb_to_ruby(value)
@@ -245,7 +263,7 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
+
     # Create new SDB domain at Amazon.
     # 
     # Returns a hash: { :box_usage, :request_id } on success or an exception on error.
@@ -286,7 +304,7 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
+
     # Add/Replace item attributes.
     # 
     # Params:
@@ -336,7 +354,7 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
+
     # Retrieve SDB item's attribute(s).
     # 
     # Returns a hash:
@@ -398,10 +416,10 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
-    
+
+
     # QUERY:
- 
+
     # Perform a query on SDB.
     # 
     # Returns a hash:
@@ -460,7 +478,7 @@ module RightAws
     rescue Exception
       on_exception
     end
-    
+
     # Perform a query and fetch specified attributes.
     # If attributes are not specified then fetches the whole list of attributes.
     #
@@ -697,5 +715,5 @@ module RightAws
     end
 
   end
-  
+
 end

data/test/acf/test_helper.rb

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

data/test/acf/test_right_acf.rb

@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestAcf < Test::Unit::TestCase
+
+  RIGHT_OBJECT_TEXT     = 'Right test message'
+  
+  STDOUT.sync = true
+
+  def setup
+    @acf= Rightscale::AcfInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @s3 = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @bucket_name   = "right-acf-awesome-test-bucket-0001"
+    @bucket_domain = "#{@bucket_name}.s3.amazonaws.com"
+  end
+
+  def test_01_list_distributions_part1
+    distributions = nil
+    assert_nothing_raised(Rightscale::AwsError) do
+      distributions = @acf.list_distributions
+    end
+    assert distributions.is_a?(Array)
+  end
+
+  def test_02_try_to_create_for_bad_bucket
+    # a bucket does not exist
+    assert_raise(Rightscale::AwsError) do
+      @acf.create_distribution("right-cloudfront-awesome-test-bucket-not-exist", "Mustn't to be born", true)
+    end
+    # a bucket is not a domain naming complied guy
+    bucket_name = 'right_cloudfront_awesome_test_bucket_BAD'
+    @s3.bucket(bucket_name, :create)
+    assert_raise(Rightscale::AwsError) do
+      @acf.create_distribution(bucket_name, "Mustn't to be born", true)
+    end
+  end
+
+  def test_03_create
+    comment = 'WooHoo!!!'
+    # create a test bucket
+    @s3.bucket(@bucket_name, :create)
+    # create a distribution
+    distribution = @acf.create_distribution(@bucket_domain, comment, true)
+    assert_equal comment, distribution[:comment]
+    assert       distribution[:cnames].size == 0
+    assert       distribution[:enabled]
+  end
+
+  def test_04_list_distributions_part2
+    distributions = @acf.list_distributions
+    assert distributions.size > 0
+  end
+
+  def get_test_distribution
+    @acf.list_distributions.select{ |d| d[:origin] == @bucket_domain }.first
+  end
+
+  def test_05_get_distribution
+    old = get_test_distribution
+    assert_nothing_raised do
+      @acf.get_distribution(old[:aws_id])
+    end
+  end
+
+  def test_06_get_and_set_config
+    config = nil
+    old = get_test_distribution
+    assert_nothing_raised do
+      config = @acf.get_distribution_config(old[:aws_id])
+    end
+    # change a config
+    config[:enabled] = false
+    config[:cnames] << 'x1.myawesomesite.com'
+    config[:cnames] << 'x2.myawesomesite.com'
+    # set config
+    set_config_result = nil
+    assert_nothing_raised do
+      set_config_result = @acf.set_distribution_config(old[:aws_id], config)
+    end
+    assert set_config_result
+    # reget the config and check
+    new_config = nil
+    assert_nothing_raised do
+      new_config = @acf.get_distribution_config(old[:aws_id])
+    end
+    assert           !new_config[:enabled]
+    assert_equal     new_config[:cnames].sort, ['x1.myawesomesite.com', 'x2.myawesomesite.com']
+    assert_not_equal config[:e_tag], new_config[:e_tag]
+
+    # try to update the old config again (must fail because ETAG has changed)
+    assert_raise(Rightscale::AwsError) do
+      @acf.set_distribution_config(old[:aws_id], config)
+    end
+  end
+
+  def test_07_caching
+    # enable caching
+    @acf.params[:cache] = true
+    # list distributions
+    @acf.list_distributions
+    # list the distributions again - cache should hit
+    assert_raise(Rightscale::AwsNoChange) do
+      @acf.list_distributions
+    end
+    # disable caching
+    @acf.params[:cache] = true
+  end
+
+  def test_08_delete_distribution
+    # we need ETAG so use get_distribution
+    distribution = @acf.get_distribution(get_test_distribution[:aws_id])
+    # try to delete a distribution
+    # should fail because
+    if distribution[:status] == 'InProgress'
+      # should fail because the distribution is not deployed yet
+      assert_raise(Rightscale::AwsError) do
+        @acf.delete_distribution(distribution[:aws_id], distribution[:e_tag])
+      end
+      # wait for a deployed state
+      print "waiting up to 5 min while the distribution is being deployed: "
+      100.times do
+        print '.'
+        distribution = @acf.get_distribution(distribution[:aws_id])
+        if distribution[:status] == 'Deployed'
+          print ' done'
+          break
+        end
+        sleep 3
+      end
+      puts
+    end
+
+    # only disabled and deployed distribution can be deleted
+    assert_equal 'Deployed', distribution[:status]
+    assert       !distribution[:enabled]
+
+    # delete the distribution
+    assert_nothing_raised do
+      @acf.delete_distribution(distribution[:aws_id], distribution[:e_tag])
+    end  
+  end
+
+  def test_09_drop_bucket
+    assert @s3.bucket(@bucket_name).delete
+  end
+
+end

data/test/ec2/test_helper.rb

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

data/test/ec2/test_right_ec2.rb

@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'pp'
+
+class TestEc2 < Test::Unit::TestCase
+
+    # Some of RightEc2 instance methods concerning instance launching and image registration
+    # are not tested here due to their potentially risk.
+  
+  def setup
+    @ec2   = Rightscale::Ec2.new(TestCredentials.aws_access_key_id,
+                                 TestCredentials.aws_secret_access_key)
+    @key   = 'right_ec2_awesome_test_key'
+    @group = 'right_ec2_awesome_test_security_group'
+  end
+  
+  def test_01_create_describe_key_pairs
+    new_key = @ec2.create_key_pair(@key)
+    assert new_key[:aws_material][/BEGIN RSA PRIVATE KEY/], "New key material is absent"
+    keys = @ec2.describe_key_pairs
+    assert keys.map{|key| key[:aws_key_name] }.include?(@key), "#{@key} must exist"
+  end
+  
+  def test_02_create_security_group
+    assert @ec2.create_security_group(@group,'My awesone test group'), 'Create_security_group fail'
+    group = @ec2.describe_security_groups([@group])[0]
+    assert_equal @group, group[:aws_group_name], 'Group must be created but does not exist'
+  end
+  
+  def test_03_perms_add
+    assert @ec2.authorize_security_group_named_ingress(@group, TestCredentials.account_number, 'default')
+    assert @ec2.authorize_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
+  end
+  
+  def test_04_check_new_perms_exist
+    assert_equal 2, @ec2.describe_security_groups([@group])[0][:aws_perms].size
+  end
+
+  def test_05_perms_remove
+    assert @ec2.revoke_security_group_IP_ingress(@group, 80,80,'udp','192.168.1.0/8')
+    assert @ec2.revoke_security_group_named_ingress(@group,
+                                                    TestCredentials.account_number, 'default')
+  end
+
+  def test_06_describe_images
+    images = @ec2.describe_images
+    assert images.size>0, 'Amazon must have at least some public images'
+      # unknown image
+    assert_raise(Rightscale::AwsError){ @ec2.describe_images(['ami-ABCDEFGH'])}
+  end
+
+  def test_07_describe_instanses
+    assert @ec2.describe_instances
+      # unknown image
+    assert_raise(Rightscale::AwsError){ @ec2.describe_instances(['i-ABCDEFGH'])}
+  end
+
+  def test_08_delete_security_group
+    assert @ec2.delete_security_group(@group), 'Delete_security_group fail'
+  end
+  
+  def test_09_delete_key_pair
+    assert @ec2.delete_key_pair(@key), 'Delete_key_pair fail'
+##  Hmmm... Amazon does not through the exception any more. It now just returns a 'true' if the key does not exist any more...
+##      # key must be deleted already
+##    assert_raise(Rightscale::AwsError) { @ec2.delete_key_pair(@key) }
+  end
+
+  def test_10_signature_version_0
+    ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
+    images = ec2.describe_images
+    assert images.size>0, 'Amazon must have at least some public images'
+    # check that the request has correct signature version
+    assert ec2.last_request.path.include?('SignatureVersion=0')
+  end
+
+  def test_11_regions
+    regions = nil
+    assert_nothing_raised do
+      regions = @ec2.describe_regions
+    end
+    # check we got more that 0 regions
+    assert regions.size > 0
+    # check an access to regions
+    regions.each do |region|
+      regional_ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :region => region)
+      # do we have a correct endpoint server?
+      assert_equal "#{region}.ec2.amazonaws.com", regional_ec2.params[:server]
+      # get a list of images from every region
+      images = nil
+      assert_nothing_raised do
+        images = regional_ec2.describe_regions
+      end
+      # every region must have images
+      assert images.size > 0
+    end
+  end
+  
+  def test_12_endpoint_url
+    ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :endpoint_url => 'a://b.c:0/d/', :region => 'z')
+    # :endpoint_url has a priority hence :region should be ommitted
+    assert_equal 'a',   ec2.params[:protocol]
+    assert_equal 'b.c', ec2.params[:server]
+    assert_equal '/d/', ec2.params[:service]
+    assert_equal 0,     ec2.params[:port]
+    assert_nil          ec2.params[:region]
+  end
+
+end