right_aws 2.1.0 → 3.0.0

data/lib/awsbase/version.rb

@@ -1,7 +1,7 @@
 module RightAws #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 2  unless defined?(MAJOR)
-    MINOR = 1  unless defined?(MINOR)
+    MAJOR = 3  unless defined?(MAJOR)
+    MINOR = 0  unless defined?(MINOR)
     TINY  = 0  unless defined?(TINY)
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)

data/lib/ec2/right_ec2.rb

@@ -68,7 +68,7 @@ module RightAws
     include RightAwsBaseInterface
     
     # Amazon EC2 API version being used
-    API_VERSION       = "2010-08-31"
+    API_VERSION       = "2011-02-28"
     DEFAULT_HOST      = "ec2.amazonaws.com"
     DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
@@ -130,8 +130,8 @@ module RightAws
       #end
     end
 
-    def generate_request(action, params={}) #:nodoc:
-      generate_request_impl(:get, action, params )
+    def generate_request(action, params={}, custom_options={}) #:nodoc:
+      generate_request_impl(:get, action, params, custom_options)
     end
 
       # Sends request to Amazon and parses the response
@@ -144,9 +144,19 @@ module RightAws
       # 'RemoteFunctionName' -> :remote_funtion_name
       cache_name = remote_function_name.right_underscore.to_sym
       list, options = AwsUtils::split_items_and_params(list_and_options)
+      # Resource IDs to fetch
       request_hash  = amazonize_list(remote_item_name, list)
-      request_hash.merge!(amazonize_list(['Filter.?.Name', 'Filter.?.Value.?'], options[:filters])) unless options[:filters].right_blank?
-      cache_for     = (list.right_blank? && options[:filters].right_blank?) ? cache_name : nil
+      # Other custom options
+      options.each do |key, values|
+        next if values.right_blank?
+        case key
+        when :filters then
+          request_hash.merge!(amazonize_list(['Filter.?.Name', 'Filter.?.Value.?'], values))
+        else
+          request_hash.merge!(amazonize_list(key.to_s.right_camelize, values))
+        end
+      end
+      cache_for = (list.right_blank? && options.right_blank?) ? cache_name : nil
       link = generate_request(remote_function_name, request_hash)
       request_cache_or_info(cache_for, link,  parser_class, @@bench, cache_for, &block)
     rescue Exception
@@ -226,32 +236,49 @@ module RightAws
   #-----------------------------------------------------------------
 
     # Acquire a new elastic IP address for use with your account.
-    # Returns allocated IP address or an exception.
+    # Options: :domain.
+    # Returns allocated IP address or or an exception.
     #
-    #  ec2.allocate_address #=> '75.101.154.140'
+    #  ec2.allocate_address #=>
+    #    { :public_ip => "50.19.214.224",
+    #      :domain    => "standard"}
     #
-    def allocate_address
-      link = generate_request("AllocateAddress")
+    #  ec2.allocate_address(:domain => 'vpc') #=>
+    #    { :allocation_id => "eipalloc-c6abfeaf",
+    #      :domain        => "vpc",
+    #      :public_ip     => "184.72.112.39"}
+    #
+    def allocate_address(options={})
+      request_hash = {}
+      request_hash['Domain'] = options[:domain] unless options[:domain].right_blank?
+      link = generate_request("AllocateAddress", request_hash)
       request_info(link, QEc2AllocateAddressParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
     # Associate an elastic IP address with an instance.
-    # Returns +true+ or an exception.
+    # Options: :public_ip, :allocation_id.
+    # Returns a hash of data or an exception.
     #
-    #  ec2.associate_address('i-d630cbbf', '75.101.154.140') #=> true
+    #  ec2.associate_address('i-d630cbbf', :public_ip => '75.101.154.140') #=>
+    #    { :return => true }
     #
-    def associate_address(instance_id, public_ip)
-      link = generate_request("AssociateAddress", 
-                              "InstanceId" => instance_id.to_s,
-                              "PublicIp"   => public_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    #  ec2.associate_address(inst, :allocation_id => "eipalloc-c6abfeaf") #=>
+    #    { :return         => true,
+    #      :association_id => 'eipassoc-fc5ca095'}
+    #
+    def associate_address(instance_id, options={})
+      request_hash = { "InstanceId" => instance_id.to_s }
+      request_hash['PublicIp']     = options[:public_ip]     unless options[:public_ip].right_blank?
+      request_hash['AllocationId'] = options[:allocation_id] unless options[:allocation_id].right_blank?
+      link = generate_request("AssociateAddress", request_hash)
+      request_info(link, QEc2AssociateAddressParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
-    # List elastic IP addresses assigned to your account.
+    # List elastic IPs by public addresses.
     #
     # Accepts a list of addresses and/or a set of filters as the last parameter.
     #
@@ -259,40 +286,62 @@ module RightAws
     #
     # Returns an array of 2 keys (:instance_id and :public_ip) hashes:
     #
-    #  ec2.describe_addresses  #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"},
-    #                               {:instance_id=>nil, :public_ip=>"75.101.154.141"}]
+    #  ec2.describe_addresses  #=> [{:instance_id=>"i-75ebd41b", :domain=>"standard", :public_ip=>"50.17.211.96"},
+    #                                :domain=>"vpc", :public_ip=>"184.72.112.39",  :allocation_id=>"eipalloc-c6abfeaf"}]
     #
-    #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"}]
+    #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140", :domain=>"standard"}]
     #
     #  ec2.describe_addresses(:filters => { 'public-ip' => "75.101.154.140" })
     #
-    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAddresses.html
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAddresses.html
     #
     def describe_addresses(*list_and_options)
       describe_resources_with_list_and_options('DescribeAddresses', 'PublicIp', QEc2DescribeAddressesParser, list_and_options)
     end
 
+
+    # List elastic IPs by allocation ids.
+    #
+    # Accepts a list of allocations and/or a set of filters as the last parameter.
+    #
+    #  describe_addresses_by_allocation_ids("eipalloc-c6abfeaf") #=>
+    #    [{:domain=>"vpc",
+    #      :public_ip=>"184.72.112.39",
+    #      :allocation_id=>"eipalloc-c6abfeaf"}]
+    #
+    #  P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAddresses.html
+    #
+    def describe_addresses_by_allocation_ids(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAddresses', 'AllocationId', QEc2DescribeAddressesParser, list_and_options)
+    end
+
     # Disassociate the specified elastic IP address from the instance to which it is assigned.
+    # Options: :public_ip, :association_id.
     # Returns +true+ or an exception.
     # 
-    #  ec2.disassociate_address('75.101.154.140') #=> true
+    #  ec2.disassociate_address(:public_ip => '75.101.154.140') #=> true
     #
-    def disassociate_address(public_ip)
-      link = generate_request("DisassociateAddress", 
-                              "PublicIp" => public_ip.to_s)
+    def disassociate_address(options = {})
+      request_hash = {}
+      request_hash['PublicIp']      = options[:public_ip]      unless options[:public_ip].right_blank?
+      request_hash['AssociationId'] = options[:association_id] unless options[:association_id].right_blank?
+      link = generate_request("DisassociateAddress", request_hash)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
     # Release an elastic IP address associated with your account.
+    # Options: :public_ip, :allocation_id.
     # Returns +true+ or an exception.
     #
-    #  ec2.release_address('75.101.154.140') #=> true
+    #  ec2.release_address(:public_ip => '75.101.154.140') #=> true
     #
-    def release_address(public_ip)
-      link = generate_request("ReleaseAddress", 
-                              "PublicIp" => public_ip.to_s)
+    def release_address(options = {})
+      request_hash = {}
+      request_hash['PublicIp']     = options[:public_ip]     unless options[:public_ip].right_blank?
+      request_hash['AllocationId'] = options[:allocation_id] unless options[:allocation_id].right_blank?
+      link = generate_request("ReleaseAddress", request_hash)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
       on_exception
@@ -334,7 +383,12 @@ module RightAws
     #
     # Filters: endpoint, region-name
     #
-    #  ec2.describe_regions  #=> ["eu-west-1", "us-east-1"]
+    #  ec2.describe_regions  #=>
+    #   [{:region_endpoint=>"ec2.eu-west-1.amazonaws.com",      :region_name=>"eu-west-1"},
+    #    {:region_endpoint=>"ec2.us-east-1.amazonaws.com",      :region_name=>"us-east-1"},
+    #    {:region_endpoint=>"ec2.ap-northeast-1.amazonaws.com", :region_name=>"ap-northeast-1"},
+    #    {:region_endpoint=>"ec2.us-west-1.amazonaws.com",      :region_name=>"us-west-1"},
+    #    {:region_endpoint=>"ec2.ap-southeast-1.amazonaws.com", :region_name=>"ap-southeast-1"}]
     #
     # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html
     #
@@ -393,19 +447,41 @@ module RightAws
   
     class QEc2AllocateAddressParser < RightAWSParser #:nodoc:
       def tagend(name)
-        @result = @text if name == 'publicIp'
+        case name
+        when 'publicIp'     then @result[:public_ip]     = @text
+        when 'allocationId' then @result[:allocation_id] = @text
+        when 'domain'       then @result[:domain]        = @text
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
+    class QEc2AssociateAddressParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        case name
+        when 'return'        then @result[:return]         = @text == 'true'
+        when 'associationId' then @result[:association_id] = @text
+        end
+      end
+      def reset
+        @result = {}
       end
     end
-    
+
     class QEc2DescribeAddressesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @address = {} if name == 'item'
+        @item = {} if name == 'item'
       end
       def tagend(name)
         case name
-        when 'instanceId' then @address[:instance_id] = @text.right_blank? ? nil : @text
-        when 'publicIp'   then @address[:public_ip]   = @text
-        when 'item'       then @result << @address
+        when 'instanceId'    then (@item[:instance_id]    = @text unless @text.right_blank?)
+        when 'publicIp'      then @item[:public_ip]       = @text
+        when 'allocationId'  then @item[:allocation_id]   = @text
+        when 'associationId' then @item[:association_id]  = @text
+        when 'domain'        then @item[:domain]          = @text
+        when 'item'          then @result                << @item
         end
       end
       def reset
@@ -445,8 +521,15 @@ module RightAws
   #-----------------------------------------------------------------
 
     class QEc2DescribeRegionsParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        @item = {} if name == 'item'
+      end
       def tagend(name)
-        @result << @text if name == 'regionName'
+        case name
+        when 'regionName'     then @item[:region_name]     = @text
+        when 'regionEndpoint' then @item[:region_endpoint] = @text
+        when 'item'           then @result                << @item
+        end
       end
       def reset
         @result = []

data/lib/ec2/right_ec2_ebs.rb

@@ -145,30 +145,41 @@ module RightAws
 
     # Describe EBS snapshots.
     #
-    # Accepts a list of snapshots and/or a set of filters as the last parameter.
+    # Accepts a list of snapshots and/or options: :restorable_by, :owner and :filters
+    # 
+    # Options: :restorable_by => Array or String, :owner => Array or String, :filters => Hash
     #
     # Filters: description, owner-alias, owner-id, progress, snapshot-id, start-time, status, tag-key,
     # tag-value, tag:key, volume-id, volume-size
     #
     #  ec2.describe_snapshots #=>
-    #   [ {:aws_volume_id=>"vol-545fac3d",
-    #      :aws_description=>"Wikipedia XML Backups (Linux)",
+    #    [{:aws_volume_size=>2,
+    #      :tags=>{},
+    #      :aws_id=>"snap-d010f6b9",
+    #      :owner_alias=>"amazon",
     #      :aws_progress=>"100%",
-    #      :aws_started_at=>"2009-09-28T23:49:50.000Z",
-    #      :aws_owner=>"amazon",
-    #      :aws_id=>"snap-8041f2e9",
-    #      :aws_volume_size=>500,
-    #      :aws_status=>"completed"},
-    #     {:aws_volume_id=>"vol-185fac71",
-    #      :aws_description=>"Sloan Digital Sky Survey DR6 Subset (Linux)",
+    #      :aws_status=>"completed",
+    #      :aws_description=>
+    #       "Windows 2003 R2 Installation Media [Deprecated] - Enterprise Edition 64-bit",
+    #      :aws_owner=>"711940113766",
+    #      :aws_volume_id=>"vol-351efb5c",
+    #      :aws_started_at=>"2008-10-20T18:23:59.000Z"},
+    #     {:aws_volume_size=>2,
+    #      :tags=>{},
+    #      :aws_id=>"snap-a310f6ca",
+    #      :owner_alias=>"amazon",
     #      :aws_progress=>"100%",
-    #      :aws_started_at=>"2009-09-28T23:56:10.000Z",
-    #      :aws_owner=>"amazon",
-    #      :aws_id=>"snap-3740f35e",
-    #      :aws_volume_size=>180,
-    #      :aws_status=>"completed"}, ...]
-    #
-    #  ec2.describe_snapshots(:filters => {'tag:MyTag' => 'MyValue'))
+    #      :aws_status=>"completed",
+    #      :aws_description=>"Windows 2003 R2 Installation Media 64-bit",
+    #      :aws_owner=>"711940113766",
+    #      :aws_volume_id=>"vol-001efb69",
+    #      :aws_started_at=>"2008-10-20T18:25:53.000Z"}, ... ]
+    #  
+    #  ec2.describe_snapshots("snap-e676e28a", "snap-e176e281")
+    #
+    #  ec2.describe_snapshots(:restorable_by => ['123456781234'],
+    #                         :owner         => ['self', 'amazon'],
+    #                         :filters       => {'tag:MyTag' => 'MyValue'})
     #
     # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeSnapshots.html
     #
@@ -176,6 +187,10 @@ module RightAws
       describe_resources_with_list_and_options('DescribeSnapshots', 'SnapshotId', QEc2DescribeSnapshotsParser, list_and_options)
     end
 
+    def describe_snapshots_by_restorable_by(*list_and_options)
+      describe_resources_with_list_and_options('DescribeSnapshots', 'RestorableBy', QEc2DescribeSnapshotsParser, list_and_options)
+    end
+
     # Create a snapshot of specified volume.
     #
     #  ec2.create_snapshot('vol-898a6fe0', 'KD: WooHoo!!') #=>
@@ -270,18 +285,18 @@ module RightAws
 
     # Modify snapshot attribute.
     #
-    #  attribute      : currently, only 'createVolumePermission' is supported.
-    #  operation_type : currently, only 'add' & 'remove' are supported.
-    #  vars:
-    #    :user_group  : currently, only 'all' is supported.
-    #    :user_id     : an array of user ids
-    #
-    def modify_snapshot_attribute(snapshot_id, attribute='createVolumePermission', operation_type='add', vars = {})
-      params =  {'SnapshotId'    => snapshot_id,
-                 'Attribute'     => attribute,
-                 'OperationType' => operation_type}
-      params.update(amazonize_list('UserId',    Array(vars[:user_id])))    if vars[:user_id]
-      params.update(amazonize_list('UserGroup', Array(vars[:user_group]))) if vars[:user_group]
+    #  Attribute can take only 'createVolumePermission' value.
+    #  Value is a Hash {:add_user_ids, :add_groups, :remove_user_ids, :remove_groups }.
+    #
+    def modify_snapshot_attribute(snapshot_id, attribute, value)
+      params = { 'SnapshotId' => snapshot_id }
+      case attribute.to_s
+      when 'createVolumePermission'
+        params.update(amazonize_list('CreateVolumePermission.Add.?.UserId',    value[:add_user_ids]))
+        params.update(amazonize_list('CreateVolumePermission.Add.?.Group',     value[:add_groups]))
+        params.update(amazonize_list('CreateVolumePermission.Remove.?.UserId', value[:remove_user_ids]))
+        params.update(amazonize_list('CreateVolumePermission.Remove.?.Group',  value[:remove_groups]))
+      end
       link = generate_request("ModifySnapshotAttribute", params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -292,36 +307,36 @@ module RightAws
     #
     #  ec2.modify_snapshot_attribute_create_volume_permission_add_users('snap-36fe435f', '000000000000', '000000000001') #=> true
     #
-    def modify_snapshot_attribute_create_volume_permission_add_users(snapshot_id, *user_id)
-      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'add', :user_id => user_id.flatten )
+    def modify_snapshot_attribute_create_volume_permission_add_users(snapshot_id, *user_ids)
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', :add_user_ids => user_ids.flatten )
     end
     
     # Revoke create volume permission for a list of users.
     #
     #  ec2.modify_snapshot_attribute_create_volume_permission_remove_users('snap-36fe435f', '000000000000', '000000000001') #=> true
     #
-    def modify_snapshot_attribute_create_volume_permission_remove_users(snapshot_id, *user_id)
-      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'remove', :user_id => user_id.flatten )
+    def modify_snapshot_attribute_create_volume_permission_remove_users(snapshot_id, *user_ids)
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', :remove_user_ids => user_ids.flatten )
     end
 
     # Grant create volume permission for user groups (currently only 'all' is supported).
     #
     #  ec2.modify_snapshot_attribute_create_volume_permission_add_groups('snap-36fe435f') #=> true
     #
-    def modify_snapshot_attribute_create_volume_permission_add_groups(snapshot_id, *user_group)
-      user_group.flatten!
-      user_group = ['all'] if user_group.right_blank?
-      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'add', :user_group => user_group )
+    def modify_snapshot_attribute_create_volume_permission_add_groups(snapshot_id, *groups)
+      groups.flatten!
+      groups = ['all'] if groups.right_blank?
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', :add_groups => groups )
     end
 
     # Remove create volume permission for user groups (currently only 'all' is supported).
     #
     #  ec2.modify_snapshot_attribute_create_volume_permission_remove_groups('snap-36fe435f') #=> true
     #
-    def modify_snapshot_attribute_create_volume_permission_remove_groups(snapshot_id, *user_group)
-      user_group.flatten!
-      user_group = ['all'] if user_group.right_blank?
-      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'remove', :user_group => user_group )
+    def modify_snapshot_attribute_create_volume_permission_remove_groups(snapshot_id, *groups)
+      groups.flatten!
+      groups = ['all'] if groups.right_blank?
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', :remove_groups => groups )
     end
 
     # Delete the specified snapshot.
@@ -427,6 +442,7 @@ module RightAws
         when 'description' then @item[:aws_description] = @text
         when 'ownerId'     then @item[:aws_owner]       = @text
         when 'volumeSize'  then @item[:aws_volume_size] = @text.to_i
+        when 'ownerAlias'  then @item[:owner_alias]     = @text
         else
           case full_tag_name
           when %r{/tagSet/item/key$}         then @aws_tag[:key]                = @text

data/lib/ec2/right_ec2_images.rb

@@ -180,7 +180,7 @@ module RightAws
       params['KernelId']       = options[:kernel_id]        if options[:kernel_id]
       params['RamdiskId']      = options[:ramdisk_id]       if options[:ramdisk_id]
       params['RootDeviceName'] = options[:root_device_name] if options[:root_device_name]
-      params['VirtualizationType'] = options[:virtualization_type] if options[:virtualization_type] 
+      params['VirtualizationType'] = options[:virtualization_type] if options[:virtualization_type]
 #      params['SnapshotId']     = options[:snapshot_id]      if options[:snapshot_id]
       params.merge!(amazonize_block_device_mappings(options[:block_device_mappings]))
       link = generate_request("RegisterImage", params)
@@ -201,9 +201,19 @@ module RightAws
       on_exception
     end
 
-    # Describe image attributes. Currently 'launchPermission', 'productCodes', 'kernel', 'ramdisk' and 'blockDeviceMapping'  are supported.
-    #
-    #  ec2.describe_image_attribute('ami-e444444d') #=> {:groups=>["all"], :users=>["000000000777"]}
+    # Describe image attributes.
+    # 
+    # Returns: String (or nil) for 'description', 'kernel', 'ramdisk'; Hash for 'launchPermission'; Array for 'productCodes', 'blockDeviceMapping'
+    #
+    #  ec2.describe_image_attribute('ami-00000000', 'description')        #=> 'My cool Image'
+    #  ec2.describe_image_attribute('ami-00000000', 'launchPermission')   #=> {:user_ids=>["443739700000", "115864000000", "309179000000", "857501300000"]}
+    #  ec2.describe_image_attribute('ami-00000000', 'productCodes')       #=> ["8ED10000"]
+    #  ec2.describe_image_attribute('ami-00000000', 'kernel')             #=> "aki-9b00e5f2"
+    #  ec2.describe_image_attribute('ami-00000000', 'ramdisk')            #=> nil
+    #  ec2.describe_image_attribute('ami-00000000', 'blockDeviceMapping') #=> [{:device_name=>"sda2", :virtual_name=>"ephemeral0"},
+    #                                                                          {:device_name=>"sda1", :virtual_name=>"ami"},
+    #                                                                          {:device_name=>"/dev/sda1", :virtual_name=>"root"},
+    #                                                                          {:device_name=>"sda3", :virtual_name=>"swap"}]
     #
     def describe_image_attribute(image_id, attribute='launchPermission')
       link = generate_request("DescribeImageAttribute",
@@ -232,19 +242,23 @@ module RightAws
     # instead of modify_image_attribute because the signature of
     # modify_image_attribute may change with EC2 service changes.
     #
-    #  attribute      : currently, only 'launchPermission' is supported.
-    #  operation_type : currently, only 'add' & 'remove' are supported.
-    #  vars:
-    #    :user_group  : currently, only 'all' is supported.
-    #    :user_id
-    #    :product_code
-    def modify_image_attribute(image_id, attribute, operation_type = nil, vars = {})
-      params =  {'ImageId'   => image_id,
-                 'Attribute' => attribute}
-      params['OperationType'] = operation_type if operation_type
-      params.update(amazonize_list('UserId',      vars[:user_id]))      if vars[:user_id]
-      params.update(amazonize_list('UserGroup',   vars[:user_group]))   if vars[:user_group]
-      params.update(amazonize_list('ProductCode', vars[:product_code])) if vars[:product_code]
+    #  Attribute can take next values: 'launchPermission', 'productCode', 'description'.
+    #  Value is a String for'description'. is a String or an Array for 'productCode' and
+    #  is a Hash {:add_user_ids, :add_groups, :remove_user_ids, :remove_groups } for 'launchPermission'.
+    #
+    def modify_image_attribute(image_id, attribute, value)
+      params = { 'ImageId' => image_id }
+      case attribute.to_s
+      when 'launchPermission'
+        params.update(amazonize_list('LaunchPermission.Add.?.UserId',    value[:add_user_ids]))
+        params.update(amazonize_list('LaunchPermission.Add.?.Group',     value[:add_groups]))
+        params.update(amazonize_list('LaunchPermission.Remove.?.UserId', value[:remove_user_ids]))
+        params.update(amazonize_list('LaunchPermission.Remove.?.Group',  value[:remove_groups]))
+      when 'productCode'
+        params.update(amazonize_list('ProductCode', value))
+      when 'description'
+        params['Description.Value'] = value
+      end
       link = generate_request("ModifyImageAttribute", params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -256,16 +270,16 @@ module RightAws
     # Returns +true+ or an exception.
     #
     #  ec2.modify_image_launch_perm_add_users('ami-e444444d',['000000000777','000000000778']) #=> true
-    def modify_image_launch_perm_add_users(image_id, user_id=[])
-      modify_image_attribute(image_id, 'launchPermission', 'add', :user_id => user_id)
+    def modify_image_launch_perm_add_users(image_id, *user_ids)
+      modify_image_attribute(image_id, 'launchPermission', :add_user_ids => user_ids.flatten)
     end
 
     # Revokes image launch permissions for users. +user_id+ is a list of users AWS accounts ids. Returns +true+ or an exception.
     #
     #  ec2.modify_image_launch_perm_remove_users('ami-e444444d',['000000000777','000000000778']) #=> true
     #
-    def modify_image_launch_perm_remove_users(image_id, user_id=[])
-      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_id => user_id)
+    def modify_image_launch_perm_remove_users(image_id, *user_ids)
+      modify_image_attribute(image_id, 'launchPermission', :remove_user_ids => user_ids.flatten)
     end
 
     # Add image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
@@ -273,24 +287,32 @@ module RightAws
     #
     #  ec2.modify_image_launch_perm_add_groups('ami-e444444d') #=> true
     #
-    def modify_image_launch_perm_add_groups(image_id, user_group=['all'])
-      modify_image_attribute(image_id, 'launchPermission', 'add', :user_group => user_group)
+    def modify_image_launch_perm_add_groups(image_id, *groups)
+      modify_image_attribute(image_id, 'launchPermission', :add_groups => groups.flatten)
     end
 
     # Remove image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
     #
     #  ec2.modify_image_launch_perm_remove_groups('ami-e444444d') #=> true
     #
-    def modify_image_launch_perm_remove_groups(image_id, user_group=['all'])
-      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_group => user_group)
+    def modify_image_launch_perm_remove_groups(image_id, *groups)
+      modify_image_attribute(image_id, 'launchPermission', :remove_groups => groups.flatten)
     end
 
     # Add product code to image
     #
     #  ec2.modify_image_product_code('ami-e444444d','0ABCDEF') #=> true
     #
-    def modify_image_product_code(image_id, product_code=[])
-      modify_image_attribute(image_id, 'productCodes', nil, :product_code => product_code)
+    def modify_image_product_code(image_id, product_codes=[])
+      modify_image_attribute(image_id, 'productCodes',product_codes)
+    end
+
+    # Modify image description
+    #
+    #  ec2.modify_image_product_code('ami-e444444d','My cool image') #=> true
+    #
+    def modify_image_description(image_id, description)
+      modify_image_attribute(image_id, 'description', description)
     end
 
     # Create a new image.
@@ -345,6 +367,7 @@ module RightAws
         when 'rootDeviceName'  then @item[:root_device_name]  = @text
         when 'imageClass'      then @item[:image_class]       = @text
         when 'virtualizationType' then @item[:virtualization_type] = @text
+        when 'hypervisor'      then @item [:hypervisor]       = @text
         else
           case full_tag_name
           when %r{/stateReason/code$}    then @item[:state_reason_code]    = @text.to_i
@@ -382,29 +405,35 @@ module RightAws
 
     class QEc2DescribeImageAttributeParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        case name
-          when 'launchPermission'
-            @result[:groups] = []
-            @result[:users]  = []
-          when 'productCodes'
-            @result[:aws_product_codes] = []
+        case full_tag_name
+        when %r{launchPermission$}        then @result = {}
+        when %r{productCodes$}            then @result = []
+        when %r{blockDeviceMapping$}      then @result = []
+        when %r{blockDeviceMapping/item$} then @block_device_mapping = {}
         end
       end
       def tagend(name)
-          # right now only 'launchPermission' is supported by Amazon.
-          # But nobody know what will they xml later as attribute. That is why we
-          # check for 'group' and 'userId' inside of 'launchPermission/item'
-        case name
-          when 'imageId'            then @result[:aws_id] = @text
-          when 'group'              then @result[:groups] << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
-          when 'userId'             then @result[:users]  << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
-          when 'productCode'        then @result[:aws_product_codes] << @text
-          when 'kernel'             then @result[:aws_kernel]  = @text
-          when 'ramdisk'            then @result[:aws_ramdisk] = @text
+        case full_tag_name
+        when %r{/kernel/value$}                then @result = @text
+        when %r{/ramdisk/value$}               then @result = @text
+        when %r{/description/value$}           then @result = @text
+        when %r{/productCode$}                 then @result << @text
+        when %r{launchPermission/item/group$}  then (@result[:groups]  ||=[])   << @text
+        when %r{launchPermission/item/userId$} then (@result[:user_ids]||=[]) << @text
+        when %r{/blockDeviceMapping/item} # no trailing $
+          case name
+          when 'deviceName'          then @block_device_mapping[:device_name]                = @text
+          when 'virtualName'         then @block_device_mapping[:virtual_name]               = @text
+          when 'noDevice'            then @block_device_mapping[:no_device]                  = @text
+          when 'snapshotId'          then @block_device_mapping[:ebs_snapshot_id]            = @text
+          when 'volumeSize'          then @block_device_mapping[:ebs_volume_size]            = @text
+          when 'deleteOnTermination' then @block_device_mapping[:ebs_delete_on_termination]  = @text == 'true' ? true : false
+          when 'item'                then @result                                           << @block_device_mapping
+          end
         end
       end
       def reset
-        @result = {}
+        @result = nil
       end
     end