aws 2.3.13 → 2.3.20

data/lib/ec2/right_ec2.rb

@@ -390,6 +390,26 @@ module Aws
       on_exception
     end
 
+   def describe_availability_zones(options={})
+      link = generate_request("DescribeAvailabilityZones", options={})
+      request_info_xml_simple(:rds_connection, @params, link, @logger,
+                                           :group_tags=>{"DBInstances"=>"DBInstance",
+                                                            "DBParameterGroups"=>"DBParameterGroup",
+                                                            "DBSecurityGroups"=>"DBSecurityGroup",
+                                                            "EC2SecurityGroups"=>"EC2SecurityGroup",
+                                                            "IPRanges"=>"IPRange"},
+                                           :force_array=>["DBInstances",
+                                                          "DBParameterGroups",
+                                                          "DBSecurityGroups",
+                                                          "EC2SecurityGroups",
+                                                          "IPRanges"],
+                                           :pull_out_array=>options[:pull_out_array],
+                                           :pull_out_single=>options[:pull_out_single],
+                                           :wrapper=>options[:wrapper])
+    rescue Exception
+      on_exception
+    end
+
       # Retrieve information about EC2 instances. If +list+ is omitted then returns the
       # list of all instances.
       #
@@ -1467,6 +1487,7 @@ module Aws
           when 'ramdiskId'        then @instance[:aws_ramdisk_id]     = @text
           when 'platform'         then @instance[:aws_platform]       = @text
           when 'availabilityZone' then @instance[:aws_availability_zone] = @text
+          when 'privateIpAddress' then @instance[:aws_private_ip_address] = @text
           when 'state'
             if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet/item/monitoring' || # DescribeInstances property
                @xmlpath == 'RunInstancesResponse/instancesSet/item/monitoring'            # RunInstances property

data/lib/sdb/active_sdb.rb

@@ -1,4 +1,8 @@
-#
+# THIS IS DEPRECATED NOW, PLEASE USE SimpleRecord instead:
+# http://github.com/appoxy/simple_record
+
+
+
 # Copyright (c) 2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining

data/lib/sqs/right_sqs_interface.rb

@@ -128,7 +128,7 @@ module Aws
       #
       service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], service)
       request        = Net::HTTP::Post.new(AwsUtils::URLencode(service))
-      request['Content-Type'] = 'application/x-www-form-urlencoded'
+      request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
       request.body = service_params
         # prepare output hash
       { :request  => request,

data/test/ec2/test_ec2.rb

@@ -6,105 +6,119 @@ 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
-      TestCredentials.get_credentials
-    @ec2   = Aws::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(Aws::AwsError){ @ec2.describe_images(['ami-ABCDEFGH'])}
-  end
-
-  def test_07_describe_instanses
-    assert @ec2.describe_instances
-      # unknown image
-    assert_raise(Aws::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'
+
+    def setup
+        TestCredentials.get_credentials
+        @ec2   = Aws::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_001_describe_availability_zones
+        TestCredentials.get_credentials
+        @ec2   = Aws::Ec2.new(TestCredentials.aws_access_key_id,
+                              TestCredentials.aws_secret_access_key)
+        zones = @ec2.describe_availability_zones
+        puts zones.inspect
+        assert zones.is_a? Array
+        assert zones.size > 3
+        zones.each do |z|
+            puts z[:zone_name]
+        end
+        assert zones[0][:zone_name] == "us-east-1a"
+    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(Aws::AwsError) { @ec2.describe_images(['ami-ABCDEFGH']) }
+    end
+
+    def test_07_describe_instanses
+        assert @ec2.describe_instances
+        # unknown image
+        assert_raise(Aws::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(Aws::AwsError) { @ec2.delete_key_pair(@key) }
-  end
-
-  def test_10_signature_version_0
-    ec2 = Aws::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 = Aws::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
+
+    def test_10_signature_version_0
+        ec2 = Aws::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 = Aws::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 = Aws::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
-  
-  def test_12_endpoint_url
-    ec2 = Aws::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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 43
   prerelease: false
   segments: 
   - 2
   - 3
-  - 13
-  version: 2.3.13
+  - 20
+  version: 2.3.20
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency