right_aws 2.1.0 → 3.0.0

data/lib/rds/right_rds_interface.rb

@@ -27,7 +27,7 @@ module RightAws
     
     include RightAwsBaseInterface
 
-    API_VERSION      = "2010-07-28"
+    API_VERSION      = "2011-04-01"
     DEFAULT_HOST     = 'rds.amazonaws.com'
     DEFAULT_PORT     = 443
     DEFAULT_PROTOCOL = 'https'
@@ -35,6 +35,7 @@ module RightAws
 
     DEFAULT_INSTANCE_CLASS   =  'db.m1.small'
     INSTANCE_CLASSES         = ['db.m1.small', 'db.m1.large', 'db.m1.xlarge', 'db.m2.2xlarge', 'db.m2.2xlarge', 'db.m2.4xlarge']
+    LICENSE_MODELS           = ['bring-your-own-license', 'license-included', 'general-public-license']
 
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -161,7 +162,7 @@ module RightAws
     def describe_db_instances(*params, &block)
       item, params = AwsUtils::split_items_and_params(params)
       params = params.dup
-      params['DBInstanceIdentifier'] = item if item
+      params['DBInstanceIdentifier'] = item.first unless item.right_blank?
       result = []
       incrementally_list_items('DescribeDBInstances', DescribeDbInstancesParser, params) do |response|
         result += response[:db_instances]
@@ -175,10 +176,11 @@ module RightAws
     # Mandatory arguments: +aws_id+, +master_username+, +master_user_password+
     # Optional params: +:allocated_storage+ (25 by def), +:instance_class+, +:engine+ ('MySQL' by def),
     # +:endpoint_port+, +:db_name+, +:db_security_groups+, +:db_parameter_group+,  +:availability_zone+, +:preferred_maintenance_window+
-    # +:backup_retention_period+, +:preferred_backup_window+, +:multi_az+, +:engine_version+, +:auto_minor_version_upgrade+
+    # +:backup_retention_period+, +:preferred_backup_window+, +:multi_az+, +:engine_version+, +:auto_minor_version_upgrade+,
+    # +:license_model+
     #
     #   rds.create_db_instance('kd-delete-me-01', 'username', 'password',
-    #                           :db_instance_class => 'db.m1.small',
+    #                           :instance_class    => 'db.m1.small',
     #                           :multi_az          => true,
     #                           :auto_minor_version_upgrade => false ) #=>
     #    {:instance_class=>"db.m1.small",
@@ -219,6 +221,7 @@ module RightAws
       request_hash['DBParameterGroupName']       = params[:db_parameter_group]              unless params[:db_parameter_group].right_blank?
       request_hash['EngineVersion']              = params[:engine_version]                  unless params[:engine_version].right_blank?
       request_hash['AutoMinorVersionUpgrade']    = params[:auto_minor_version_upgrade].to_s unless params[:auto_minor_version_upgrade].nil?
+      request_hash['LicenseModel']               = params[:license_model]                   unless params[:license_model].right_blank?
       request_hash.merge!(amazonize_list('DBSecurityGroups.member',  params[:db_security_groups]))
       link = generate_request('CreateDBInstance', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
@@ -636,6 +639,31 @@ module RightAws
       result
     end
 
+    # Describe a list of orderable DB Instance options for the specified engine.
+    # Optionals: +:instance_class+, +:engine_version+ , +:license_model+
+    #
+    #  rds.describe_orderable_db_instance_options('oracle-ee', :engine_version => '11.2.0.2.v2') #=>
+    #    [{:read_replica_capable=>false,
+    #      :instance_class=>"db.m1.large",
+    #      :availability_zones=>["us-east-1a", "us-east-1b", "us-east-1d"],
+    #      :engine=>"oracle-ee",
+    #      :license_model=>"bring-your-own-license",
+    #      :engine_version=>"11.2.0.2.v2",
+    #      :multi_az_capable=>"false"}, ... ]
+    #
+    def describe_orderable_db_instance_options(engine, params={}, &block)
+      request_hash = { 'Engine' => engine }
+      request_hash['DBInstanceClass'] = params[:instance_class] unless params[:instance_class].right_blank?
+      request_hash['EngineVersion']   = params[:engine_version]    unless params[:engine_version].right_blank?
+      request_hash['LicenseModel']    = params[:license_model]     unless params[:license_model].right_blank?
+      result = []
+      incrementally_list_items('DescribeOrderableDBInstanceOptions', DescribeOrderableDBInstanceOptionsParser, request_hash) do |response|
+        result += response[:items]
+        block ? block.call(response) : true
+      end
+      result
+    end
+    
     # --------------------------------------------
     #  DB Snapshots
     # --------------------------------------------
@@ -717,7 +745,7 @@ module RightAws
     # in the "Available" state. The new RDS instance is created with the Default security group.
     #
     # Optional params: +:instance_class+, +:endpoint_port+, +:availability_zone+, +:multi_az+,
-    # +:auto_minor_version_upgrade+
+    # +:auto_minor_version_upgrade+, +:license_model+, +:db_name+, +:engine+
     #
     #  rds.restore_db_instance_from_db_snapshot('ahahahaha-final-snapshot-20090828081159', 'q1') #=>
     #    {:status=>"creating",
@@ -741,6 +769,9 @@ module RightAws
       request_hash['AvailabilityZone']        = params[:availability_zone]          unless params[:availability_zone].right_blank?
       request_hash['MultiAZ']                 = params[:multi_az]                   unless params[:multi_az].nil?
       request_hash['AutoMinorVersionUpgrade'] = params[:auto_minor_version_upgrade] unless params[:auto_minor_version_upgrade].nil?
+      request_hash['LicenseModel']            = params[:license_model]              unless params[:license_model].right_blank?
+      request_hash['DBName']                  = params[:db_name]                    unless params[:db_name].right_blank?
+      request_hash['Engine']                  = params[:engine]                     unless params[:enginel].right_blank?
       link = generate_request('RestoreDBInstanceFromDBSnapshot', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -751,7 +782,7 @@ module RightAws
     # security group.
     #
     # Optional params: +:instance_class+, +:endpoint_port+, +:availability_zone+, +:multi_az+, +:restore_time+,
-    # +:auto_minor_version_upgrade+, +:use_latest_restorable_time+
+    # +:auto_minor_version_upgrade+, +:use_latest_restorable_time+, +:license_model+, +:db_name+, +:engine+
     #
     def restore_db_instance_to_point_in_time(instance_aws_id, new_instance_aws_id, params={})
       request_hash = { 'SourceDBInstanceIdentifier' => instance_aws_id,
@@ -763,6 +794,9 @@ module RightAws
       request_hash['Port']                    = params[:endpoint_port]              unless params[:endpoint_port].right_blank?
       request_hash['AvailabilityZone']        = params[:availability_zone]          unless params[:availability_zone].right_blank?
       request_hash['AutoMinorVersionUpgrade'] = params[:auto_minor_version_upgrade] unless params[:auto_minor_version_upgrade].nil?
+      request_hash['LicenseModel']            = params[:license_model]              unless params[:license_model].right_blank?
+      request_hash['DBName']                  = params[:db_name]                    unless params[:db_name].right_blank?
+      request_hash['Engine']                  = params[:engine]                     unless params[:enginel].right_blank?
       link = generate_request('RestoreDBInstanceToPointInTime', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -844,15 +878,17 @@ module RightAws
     # Optional params: +:db_parameter_group_family+, +:default_only+, +:engine+, +:engine_version+
     #
     #  rds.describe_db_engine_versions #=>
-    #    [{:engine=>"mysql",
-    #      :db_parameter_group_family=>"mysql5.1",
+    #    [{:db_parameter_group_family=>"mysql5.1",
+    #      :engine=>"mysql",
+    #      :db_engine_description=>"MySQL Community Edition",
+    #      :db_engine_version_description=>"Mysql 5.1.45",
     #      :engine_version=>"5.1.45"},
-    #     {:engine=>"mysql",
-    #      :db_parameter_group_family=>"mysql5.1",
-    #      :engine_version=>"5.1.49"},
-    #     {:engine=>"mysql",
-    #      :db_parameter_group_family=>"mysql5.1",
-    #      :engine_version=>"5.1.50"}]
+    #     {:db_parameter_group_family=>"oracle-se1-11.2",
+    #      :engine=>"oracle-se1",
+    #      :db_engine_description=>"Oracle Database Standard Edition One",
+    #      :db_engine_version_description=>
+    #       "Oracle Standard Edition One - DB Engine Version 11.2.0.2.v2",
+    #      :engine_version=>"11.2.0.2.v2"}]
     #
     def describe_db_engine_versions(params={}, &block)
       params = params.dup
@@ -874,10 +910,10 @@ module RightAws
 
     # Create a DB Instance that acts as a Read Replica of a source DB Instance.
     #
-    # Optional params: +:endpoint_port+, +:availability_zone+, +:db_instance_class+, +:auto_minor_version_upgrade+
+    # Optional params: +:endpoint_port+, +:availability_zone+, +:instance_class+, +:auto_minor_version_upgrade+
     #
     #    rds.create_db_instance_read_replica('kd-delete-me-01-replica-01', 'kd-delete-me-01',
-    #                                        :db_instance_class => 'db.m1.small',
+    #                                        :instance_class => 'db.m1.small',
     #                                        :endpoint_port => '11000',
     #                                        :auto_minor_version_upgrade => false ) #=>
     #      {:auto_minor_version_upgrade=>false,
@@ -903,7 +939,7 @@ module RightAws
                        'SourceDBInstanceIdentifier' => source_db_instance_identifier}
       request_hash['Port']                    = params[:endpoint_port]                   unless params[:endpoint_port].right_blank?
       request_hash['AvailabilityZone']        = params[:availability_zone]               unless params[:availability_zone].right_blank?
-      request_hash['DBInstanceClass']         = params[:db_instance_class]               unless params[:db_instance_class].right_blank?
+      request_hash['DBInstanceClass']         = params[:instance_class]                  unless params[:instance_class].right_blank?
       request_hash['AutoMinorVersionUpgrade'] = params[:auto_minor_version_upgrade].to_s unless params[:auto_minor_version_upgrade].nil?
       link = generate_request('CreateDBInstanceReadReplica', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
@@ -918,26 +954,29 @@ module RightAws
     # Options: :aws_id, :instance_class, :duration, :product_description, :multi_az
     #
     #  rds.describe_reserved_db_instances_offerings #=>
-    #    [{:multi_az=>false,
+    #    [{:usage_price=>0.262,
+    #      :offering_aws_id=>"248e7b75-2451-4381-9025-b5553d421c7b",
+    #      :multi_az=>false,
     #      :duration=>31536000,
-    #      :fixed_price=>1325.0,
-    #      :usage_price=>0.262,
-    #      :aws_id=>"248e7b75-2451-4381-9025-b5553d421c7b",
+    #      :currency_code=>"USD",
     #      :instance_class=>"db.m2.xlarge",
-    #      :product_description=>"mysql"},
-    #     {:multi_az=>true,
+    #      :product_description=>"mysql",
+    #      :fixed_price=>1325.0},
+    #     {:usage_price=>0.092,
+    #      :offering_aws_id=>"248e7b75-49a7-4cd7-9a9b-354f4906a9b1",
+    #      :multi_az=>true,
     #      :duration=>94608000,
-    #      :fixed_price=>700.0,
-    #      :usage_price=>0.092,
-    #      :aws_id=>"248e7b75-49a7-4cd7-9a9b-354f4906a9b1",
+    #      :currency_code=>"USD",
     #      :instance_class=>"db.m1.small",
-    #      :product_description=>"mysql"}, ... ]
+    #      :product_description=>"mysql",
+    #      :fixed_price=>700.0},   ...]
     #
     #  rds.describe_reserved_db_instances_offerings(:aws_id => "248e7b75-49a7-4cd7-9a9b-354f4906a9b1") #=>
     #    [{:duration=>94608000,
     #      :multi_az=>true,
     #      :fixed_price=>700.0,
     #      :usage_price=>0.092,
+    #      :currency_code=>"USD",
     #      :aws_id=>"248e7b75-49a7-4cd7-9a9b-354f4906a9b1",
     #      :instance_class=>"db.m1.small",
     #      :product_description=>"mysql"}]
@@ -1033,6 +1072,8 @@ module RightAws
         when 'MasterUsername'                        then @item[:master_username]        = @text
         when 'AvailabilityZone'                      then @item[:availability_zone]      = @text
         when 'LatestRestorableTime'                  then @item[:latest_restorable_time] = @text
+        when 'LicenseModel'                          then @item[:license_model]          = @text
+        when 'DBName'                                then @item[:db_name]                = @text
         when 'ReadReplicaSourceDBInstanceIdentifier' then @item[:read_replica_source_db_instance_identifier] = @text
         when 'ReadReplicaDBInstanceIdentifier'       then @item[:read_replica_db_instance_identifiers]      << @text
         when 'DBSecurityGroupName'                   then @db_security_group[:name]             = @text
@@ -1069,6 +1110,31 @@ module RightAws
       end
     end
 
+    class DescribeOrderableDBInstanceOptionsParser < RightAWSParser # :nodoc:
+      def reset
+        @result = { :items => [] }
+      end
+      def tagstart(name, attributes)
+        case name
+        when 'OrderableDBInstanceOption' then @item = { :availability_zones => [] }
+        end
+      end
+      def tagend(name)
+        case name
+        when 'Marker'                     then @result[:marker]             = @text
+        when 'MaxRecords'                 then @result[:max_records]        = @text.to_i
+        when 'DBInstanceClass'            then @item[:instance_class]       = @text
+        when 'Engine'                     then @item[:engine]               = @text
+        when 'EngineVersion'              then @item[:engine_version]       = @text
+        when 'LicenseModel'               then @item[:license_model]        = @text
+        when 'MultiAZCapable'             then @item[:multi_az_capable]     = @text
+        when 'ReadReplicaCapable'         then @item[:read_replica_capable] = @text == 'true'
+        when 'Name'                       then @item[:availability_zones]  << @text
+        when 'OrderableDBInstanceOption'  then @result[:items]             << @item
+        end
+      end
+    end
+
     # --------------------------------------------
     #  DB Security Groups
     # --------------------------------------------
@@ -1157,6 +1223,8 @@ module RightAws
         when 'Description'          then @item[:description]    = @text
         when 'IsModifiable'         then @item[:is_modifiable]  = (@text == 'true')
         when 'ApplyType'            then @item[:apply_type]     = @text
+        when 'ApplyMethod'          then @item[:apply_method]   = @text
+        when 'MinimumEngineVersion' then @item[:minimum_engine_version] = @text
         when 'AllowedValues'        then @item[:allowed_values] = @text
         when 'ParameterName'        then @item[:name]           = @text
         when 'ParameterValue'       then @item[:value]          = @text
@@ -1193,6 +1261,7 @@ module RightAws
         when 'SnapshotCreateTime'   then @item[:create_time]          = @text
         when 'DBInstanceIdentifier' then @item[:instance_aws_id]      = @text
         when 'DBSnapshotIdentifier' then @item[:aws_id]               = @text
+        when 'LicenseModel'         then @item[:license_model]        = @text
         when 'DBSnapshot'           then @result[:db_snapshots]      << @item
         end
       end
@@ -1244,6 +1313,8 @@ module RightAws
         when 'DBParameterGroupFamily' then @item[:db_parameter_group_family] = @text
         when 'Engine'                 then @item[:engine]                    = @text
         when 'EngineVersion'          then @item[:engine_version]            = @text
+        when 'DBEngineDescription'    then @item[:db_engine_description]     = @text
+        when 'DBEngineVersionDescription' then @item[:db_engine_version_description] = @text
         when 'DBEngineVersion'        then @result[:db_engine_versions]     << @item
         end
       end
@@ -1266,6 +1337,7 @@ module RightAws
         case name
         when 'Marker'                        then @result[:marker]            = @text
         when 'MaxRecords'                    then @result[:max_records]       = @text.to_i
+        when 'CurrencyCode'                  then @item[:currency_code]       = @text
         when 'DBInstanceClass'               then @item[:instance_class]      = @text
         when 'Duration'                      then @item[:duration]            = @text.to_i
         when 'FixedPrice'                    then @item[:fixed_price]         = @text.to_f
@@ -1292,6 +1364,7 @@ module RightAws
         when 'Marker'                        then @result[:marker]            = @text
         when 'MaxRecords'                    then @result[:max_records]       = @text.to_i
         when 'DBInstanceClass'               then @item[:instance_class]      = @text
+        when 'CurrencyCode'                  then @item[:currency_code]       = @text
         when 'Duration'                      then @item[:duration]            = @text.to_i
         when 'FixedPrice'                    then @item[:fixed_price]         = @text.to_f
         when 'UsagePrice'                    then @item[:usage_price]         = @text.to_f
@@ -1300,6 +1373,8 @@ module RightAws
         when 'ReservedDBInstancesOfferingId' then @item[:offering_aws_id]     = @text
         when 'ReservedDBInstanceId'          then @item[:aws_id]              = @text
         when 'State'                         then @item[:state]               = @text
+        when 'DBInstanceCount'               then @item[:instance_count]      = @text.to_i
+        when 'StartTime'                     then @item[:start_time]          = @text
         when 'ReservedDBInstance'            then @result[:reserved_db_instances] << @item
         end
       end

data/lib/right_aws.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-2008 RightScale Inc
+# Copyright (c) 2007-2011 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -47,11 +47,13 @@ require 'ec2/right_ec2_spot_instances'
 require 'ec2/right_ec2_ebs'
 require 'ec2/right_ec2_reserved_instances'
 require 'ec2/right_ec2_vpc'
+require 'ec2/right_ec2_vpc2'
 require 'ec2/right_ec2_monitoring'
 require 'ec2/right_ec2_placement_groups'
 require 'ec2/right_ec2_windows_mobility'
 require 'ec2/right_ec2_tags'
 require 'elb/right_elb_interface'
+require 'emr/right_emr_interface'
 require 'acw/right_acw_interface'
 require 'as/right_as_interface'
 require 's3/right_s3_interface'
@@ -72,6 +74,7 @@ require 'iam/right_iam_users'
 require 'iam/right_iam_access_keys'
 require 'iam/right_iam_mfa_devices'
 require 'route_53/right_route_53_interface'
+require 'sns/right_sns_interface'
 
 #-
 

data/lib/route_53/right_route_53_interface.rb

@@ -158,7 +158,7 @@ module RightAws
     
     include RightAwsBaseInterface
 
-    API_VERSION       = "2010-10-01"
+    API_VERSION       = "2011-05-05"
     DEFAULT_HOST      = "route53.amazonaws.com"
     DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
@@ -295,11 +295,22 @@ module RightAws
                        "        <Action>#{AwsUtils::xml_escape(change[:action].to_s.upcase)}</Action>\n" +
                        "        <ResourceRecordSet>\n"                                                   +
                        "          <Name>#{AwsUtils::xml_escape(change[:name])}</Name>\n"                 +
-                       "          <Type>#{AwsUtils::xml_escape(change[:type].to_s.upcase)}</Type>\n"     +
+                       "          <Type>#{AwsUtils::xml_escape(change[:type].to_s.upcase)}</Type>\n"
+        if change[:alias_target]
+          alias_target = change[:alias_target]
+          xml_changes +=
+                       "          <AliasTarget>\n"                                                                              +
+                       "            <HostedZoneId>#{AwsUtils::xml_escape(alias_target[:hosted_zone_id].to_s)}</HostedZoneId>\n" +
+                       "            <DNSName>#{AwsUtils::xml_escape(alias_target[:dns_name].to_s)}</DNSName>\n"                 +
+                       "          </AliasTarget>\n"
+        else
+          xml_changes +=
                        "          <TTL>#{AwsUtils::xml_escape(change[:ttl].to_s)}</TTL>\n"               +
                        "          <ResourceRecords>\n"                                                   +
                        xml_resource_records                                                              +
-                       "          </ResourceRecords>\n"                                                  +
+                       "          </ResourceRecords>\n"
+        end
+        xml_changes +=
                        "        </ResourceRecordSet>\n"                                                  +
                        "      </Change>\n"
       end
@@ -416,7 +427,6 @@ module RightAws
     # Options: :type, :name, :max_items
     #
     #  r53.list_resource_record_sets("/hostedzone/ZWEC7PPVACGQ4") #=>
-    #    {:items=>
     #      [{:type=>"NS",
     #        :ttl=>172800,
     #        :name=>"mysite.patch-island.com.",
@@ -433,9 +443,7 @@ module RightAws
     #       {:type=>"NS",
     #        :ttl=>600,
     #        :resource_records=>["xxx.mysite.com"],
-    #        :name=>"m1.mysite.patch-island.com."}],
-    #     :is_truncated=>false,
-    #     :max_items=>100}
+    #        :name=>"m1.mysite.patch-island.com."}]
     #
     # PS: http://docs.amazonwebservices.com/Route53/latest/APIReference/API_ListResourceRecordSets.html
     #
@@ -451,7 +459,7 @@ module RightAws
 
     # Create or delete DNS records.
     #
-    #  resource_record_sets =  { :action => :create,
+    #  resource_record_sets = [{ :action => :create,
     #                            :name => 'm3.mysite.patch-island.com',
     #                            :type => 'NS',
     #                            :ttl => 600,
@@ -460,7 +468,7 @@ module RightAws
     #                            :name => 'm2.mysite.patch-island.com',
     #                            :type => 'A',
     #                            :ttl => 600,
-    #                            :resource_records => ['10.0.0.1'] }
+    #                            :resource_records => ['10.0.0.1'] }]
     #  r53.change_resource_record_sets("/hostedzone/Z1K6NCF0EB26FB", resource_record_sets, 'KD: Comment#1') #=>
     #    {:status=>"PENDING",
     #     :submitted_at=>"2011-01-18T20:21:56.828Z",
@@ -476,14 +484,14 @@ module RightAws
 
     # Create DNS records.
     #
-    #  resource_record_sets =  { :name => 'm3.mysite.patch-island.com',
+    #  resource_record_sets = [{ :name => 'm3.mysite.patch-island.com',
     #                            :type => 'NS',
     #                            :ttl => 600,
     #                            :resource_records => 'xxx.mysite.com' },
     #                          { :name => 'm2.mysite.patch-island.com',
     #                            :type => 'A',
     #                            :ttl => 600,
-    #                            :resource_records => ['10.0.0.1'] }
+    #                            :resource_records => ['10.0.0.1'] }]
     #  r53.create_resource_record_sets("/hostedzone/Z1K6NCF0EB26FB", resource_record_sets, 'KD: Comment#1') #=>
     #    {:status=>"PENDING",
     #     :submitted_at=>"2011-01-18T20:21:56.828Z",
@@ -498,14 +506,14 @@ module RightAws
 
     # Delete DNS records.
     #
-    #  resource_record_sets =  { :name => 'm3.mysite.patch-island.com',
+    #  resource_record_sets = [{ :name => 'm3.mysite.patch-island.com',
     #                            :type => 'NS',
     #                            :ttl => 600,
     #                            :resource_records => 'xxx.mysite.com' },
     #                          { :name => 'm2.mysite.patch-island.com',
     #                            :type => 'A',
     #                            :ttl => 600,
-    #                            :resource_records => ['10.0.0.1'] }
+    #                            :resource_records => ['10.0.0.1'] }]
     #  r53.create_resource_record_sets("/hostedzone/Z1K6NCF0EB26FB", resource_record_sets, 'KD: Comment#1') #=>
     #    {:status=>"PENDING",
     #     :submitted_at=>"2011-01-18T20:21:56.828Z",
@@ -606,7 +614,9 @@ module RightAws
         when 'ResourceRecordSet' then @result[:items] << @item
         else
           case full_tag_name
-          when %r{/ResourceRecord/Value} then (@item[:resource_records] ||= []) << @text
+          when %r{/ResourceRecord/Value}     then (@item[:resource_records] ||= []) << @text
+          when %r{/AliasTarget/DNSName}      then (@item[:alias_target] ||= {})[:dns_name] = @text
+          when %r{/AliasTarget/HostedZoneId} then (@item[:alias_target] ||= {})[:hosted_zone_id] = @text
           end
         end
       end

data/lib/s3/right_s3.rb

@@ -220,18 +220,19 @@ module RightAws
         #
       def keys_and_service(options={}, head=false)
         opt = {}; options.each{ |key, value| opt[key.to_s] = value }
-        thislist = {}
-        list = []
-        @s3.interface.incrementally_list_bucket(@name, opt) do |thislist|
-          thislist[:contents].each do |entry|
+        service = {}
+        keys = []
+        @s3.interface.incrementally_list_bucket(@name, opt) do |_service|
+          service = _service
+          service[:contents].each do |entry|
             owner = Owner.new(entry[:owner_id], entry[:owner_display_name])
             key = Key.new(self, entry[:key], nil, {}, {}, entry[:last_modified], entry[:e_tag], entry[:size], entry[:storage_class], owner)
             key.head if head
-            list << key
+            keys << key
           end
         end
-        thislist.delete(:contents)
-        [list, thislist]
+        service.delete(:contents)
+        [keys, service]
       end
 
         # Retrieve key information from Amazon. 
@@ -272,12 +273,12 @@ module RightAws
         key.put(data, perms, headers)
       end
 
-        # Retrieve object data from Amazon. 
+        # Retrieve data object from Amazon. 
         # The +key+ is a +String+ or Key. 
-        # Returns Key instance. 
+        # Returns String instance. 
         #
-        #  key = bucket.get('logs/today/1.log') #=> 
-        #  puts key.data #=> 'sasfasfasdf'
+        #  data = bucket.get('logs/today/1.log') #=> 
+        #  puts data #=> 'sasfasfasdf'
         #
       def get(key, headers={})
         key = Key.create(self, key.to_s) unless key.is_a?(Key)
@@ -1041,8 +1042,8 @@ module RightAws
         #
         #  bucket.get('logs/today/1.log', 1.hour)
         #
-      def get(key, expires=nil, headers={})
-        @s3.interface.get_link(@name, key.to_s, expires, headers)
+      def get(key, expires=nil, headers={}, response_params={})
+        @s3.interface.get_link(@name, key.to_s, expires, headers, response_params)
       end
        
         # Generate link to delete bucket. 
@@ -1098,8 +1099,8 @@ module RightAws
         #
         #  bucket.get('logs/today/1.log', 1.hour) #=> https://s3.amazonaws.com:443/my_awesome_bucket/logs%2Ftoday%2F1.log?Signature=h...M%3D&Expires=1180820032&AWSAccessKeyId=1...2
         #
-      def get(expires=nil, headers={})
-        @bucket.s3.interface.get_link(@bucket.to_s, @name, expires, headers)
+      def get(expires=nil, headers={}, response_params={})
+        @bucket.s3.interface.get_link(@bucket.to_s, @name, expires, headers, response_params)
       end
        
         # Generate link to delete key.