icehouse-right_aws 1.11.0 → 2.2.0

data/lib/ec2/right_ec2_ebs.rb

@@ -29,7 +29,12 @@ module RightAws
     #      EBS: Volumes
     #-----------------------------------------------------------------
 
-    # Describe all EBS volumes.
+    # Describe EBS volumes.
+    #
+    # Accepts a list of volumes and/or a set of filters as the last parameter.
+    #
+    # Filters: attachement.attach-time, attachment.delete-on-termination, attachement.device, attachment.instance-id,
+    # attachment.status, availability-zone, create-time, size, snapshot-id, status, tag-key, tag-value, tag:key, volume-id
     #
     #  ec2.describe_volumes #=>
     #      [{:aws_size              => 94,
@@ -37,10 +42,10 @@ module RightAws
     #        :aws_attachment_status => "attached",
     #        :zone                  => "merlot",
     #        :snapshot_id           => nil,
-    #        :aws_attached_at       => Wed Jun 18 08:19:28 UTC 2008,
+    #        :aws_attached_at       => "2008-06-18T08:19:28.000Z",
     #        :aws_status            => "in-use",
     #        :aws_id                => "vol-60957009",
-    #        :aws_created_at        => Wed Jun 18 08:19:20s UTC 2008,
+    #        :aws_created_at        => "2008-06-18T08:19:20.000Z",
     #        :aws_instance_id       => "i-c014c0a9"},
     #       {:aws_size       => 1,
     #        :zone           => "merlot",
@@ -49,12 +54,12 @@ module RightAws
     #        :aws_id         => "vol-58957031",
     #        :aws_created_at => Wed Jun 18 08:19:21 UTC 2008,}, ... ]
     #
-    def describe_volumes(list=[])
-      link = generate_request("DescribeVolumes",
-                              amazonize_list('VolumeId',list.to_a))
-      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
+    #  ec2.describe_volumes(:filters => { 'availability-zone' => 'us-east-1a', 'size' => '10' })
+    #
+    #  P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeVolumes.html
+    #
+    def describe_volumes(*list_and_options)
+      describe_resources_with_list_and_options('DescribeVolumes', 'VolumeId', QEc2DescribeVolumesParser, list_and_options)
     end
 
     # Create new EBS volume based on previously created snapshot.
@@ -65,14 +70,14 @@ module RightAws
     #       :aws_status     => "creating",
     #       :aws_id         => "vol-fc9f7a95",
     #       :zone           => "merlot",
-    #       :aws_created_at => Tue Jun 24 18:13:32 UTC 2008,
+    #       :aws_created_at => "2008-06-24T18:13:32.000Z",
     #       :aws_size       => 94}
     #
     def create_volume(snapshot_id, size, zone)
       hash = { "Size"              => size.to_s,
                "AvailabilityZone"  => zone.to_s }
       # Get rig of empty snapshot: e8s guys do not like it
-      hash["SnapshotId"] = snapshot_id.to_s unless snapshot_id.blank?
+      hash["SnapshotId"] = snapshot_id.to_s unless snapshot_id.right_blank?
       link = generate_request("CreateVolume", hash )
       request_info(link, QEc2CreateVolumeParser.new(:logger => @logger))
     rescue Exception
@@ -123,8 +128,8 @@ module RightAws
     #
     def detach_volume(volume_id, instance_id=nil, device=nil, force=nil)
       hash = { "VolumeId" => volume_id.to_s }
-      hash["InstanceId"] = instance_id.to_s unless instance_id.blank?
-      hash["Device"]     = device.to_s      unless device.blank?
+      hash["InstanceId"] = instance_id.to_s unless instance_id.right_blank?
+      hash["Device"]     = device.to_s      unless device.right_blank?
       hash["Force"]      = 'true'           if     force
       #
       link = generate_request("DetachVolume", hash)
@@ -138,13 +143,20 @@ module RightAws
     #      EBS: Snapshots
     #-----------------------------------------------------------------
 
-    # Describe all EBS snapshots.
+    # Describe EBS snapshots.
     #
-    # ec2.describe_snapshots #=>
+    # 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_progress=>"100%",
-    #      :aws_started_at=>Mon Sep 28 23:49:50 UTC 2009,
+    #      :aws_started_at=>"2009-09-28T23:49:50.000Z",
     #      :aws_owner=>"amazon",
     #      :aws_id=>"snap-8041f2e9",
     #      :aws_volume_size=>500,
@@ -152,25 +164,29 @@ module RightAws
     #     {:aws_volume_id=>"vol-185fac71",
     #      :aws_description=>"Sloan Digital Sky Survey DR6 Subset (Linux)",
     #      :aws_progress=>"100%",
-    #      :aws_started_at=>Mon Sep 28 23:56:10 UTC 2009,
+    #      :aws_started_at=>"2009-09-28T23:56:10.000Z",
     #      :aws_owner=>"amazon",
     #      :aws_id=>"snap-3740f35e",
     #      :aws_volume_size=>180,
     #      :aws_status=>"completed"}, ...]
     #
-    def describe_snapshots(list=[])
-      link = generate_request("DescribeSnapshots",
-                              amazonize_list('SnapshotId',list.to_a))
-      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
+    #  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
+    #
+    def describe_snapshots(*list_and_options)
+      describe_resources_with_list_and_options('DescribeSnapshots', 'SnapshotId', QEc2DescribeSnapshotsParser, list_and_options)
     end
 
     # Create a snapshot of specified volume.
     #
     #  ec2.create_snapshot('vol-898a6fe0', 'KD: WooHoo!!') #=>
     #    {:aws_volume_id=>"vol-e429db8d",
-    #     :aws_started_at=>Thu Oct 01 09:23:38 UTC 2009,
+    #     :aws_started_at=>"2009-10-01T09:23:38.000Z",
     #     :aws_description=>"KD: WooHoo!!",
     #     :aws_owner=>"648770000000",
     #     :aws_progress=>"",
@@ -194,7 +210,7 @@ module RightAws
     #
     #  ec2.try_create_snapshot('vol-898a6fe0', 'KD: WooHoo!!') #=>
     #    {:aws_volume_id=>"vol-e429db8d",
-    #     :aws_started_at=>Thu Oct 01 09:23:38 UTC 2009,
+    #     :aws_started_at=>"2009-10-01T09:23:38.000Z",
     #     :aws_description=>"KD: WooHoo!!",
     #     :aws_owner=>"648770000000",
     #     :aws_progress=>"",
@@ -270,8 +286,8 @@ module RightAws
       params =  {'SnapshotId'    => snapshot_id,
                  'Attribute'     => attribute,
                  'OperationType' => operation_type}
-      params.update(amazonize_list('UserId',    vars[:user_id].to_a))    if vars[:user_id]
-      params.update(amazonize_list('UserGroup', vars[:user_group].to_a)) if vars[:user_group]
+      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]
       link = generate_request("ModifySnapshotAttribute", params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -300,7 +316,7 @@ module RightAws
     #
     def modify_snapshot_attribute_create_volume_permission_add_groups(snapshot_id, *user_group)
       user_group.flatten!
-      user_group = ['all'] if user_group.blank?
+      user_group = ['all'] if user_group.right_blank?
       modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'add', :user_group => user_group )
     end
 
@@ -310,7 +326,7 @@ module RightAws
     #
     def modify_snapshot_attribute_create_volume_permission_remove_groups(snapshot_id, *user_group)
       user_group.flatten!
-      user_group = ['all'] if user_group.blank?
+      user_group = ['all'] if user_group.right_blank?
       modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'remove', :user_group => user_group )
     end
 
@@ -335,9 +351,9 @@ module RightAws
         case name
         when 'volumeId'         then @result[:aws_id]         = @text
         when 'status'           then @result[:aws_status]     = @text
-        when 'createTime'       then @result[:aws_created_at] = Time.parse(@text)
+        when 'createTime'       then @result[:aws_created_at] = @text
         when 'size'             then @result[:aws_size]       = @text.to_i ###
-        when 'snapshotId'       then @result[:snapshot_id]    = @text.blank? ? nil : @text ###
+        when 'snapshotId'       then @result[:snapshot_id]    = @text.right_blank? ? nil : @text ###
         when 'availabilityZone' then @result[:zone]           = @text ###
         end
       end
@@ -353,7 +369,7 @@ module RightAws
         when 'instanceId' then @result[:aws_instance_id]       = @text
         when 'device'     then @result[:aws_device]            = @text
         when 'status'     then @result[:aws_attachment_status] = @text
-        when 'attachTime' then @result[:aws_attached_at]       = Time.parse(@text)
+        when 'attachTime' then @result[:aws_attached_at]       = @text
         end
       end
       def reset
@@ -363,34 +379,30 @@ module RightAws
 
     class QEc2DescribeVolumesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        case name
-        when 'item'
-          case @xmlpath
-          when 'DescribeVolumesResponse/volumeSet' then @volume = {}
-          end
+        case full_tag_name
+        when %r{volumeSet/item$} then @item    = { :tags => {} }
+        when %r{/tagSet/item$}   then @aws_tag = {}
         end
       end
       def tagend(name)
         case name
-        when 'volumeId'
-          case @xmlpath
-          when 'DescribeVolumesResponse/volumeSet/item' then @volume[:aws_id] = @text
-          end
-        when 'status'
-          case @xmlpath
-          when 'DescribeVolumesResponse/volumeSet/item' then @volume[:aws_status] = @text
-          when 'DescribeVolumesResponse/volumeSet/item/attachmentSet/item' then @volume[:aws_attachment_status] = @text
-          end
-        when 'size'             then @volume[:aws_size]        = @text.to_i
-        when 'createTime'       then @volume[:aws_created_at]  = Time.parse(@text)
-        when 'instanceId'       then @volume[:aws_instance_id] = @text
-        when 'device'           then @volume[:aws_device]      = @text
-        when 'attachTime'       then @volume[:aws_attached_at] = Time.parse(@text)
-        when 'snapshotId'       then @volume[:snapshot_id]     = @text.blank? ? nil : @text
-        when 'availabilityZone' then @volume[:zone]            = @text
-        when 'item'
-          case @xmlpath
-          when 'DescribeVolumesResponse/volumeSet' then @result << @volume
+        when 'size'             then @item[:aws_size]        = @text.to_i
+        when 'createTime'       then @item[:aws_created_at]  = @text
+        when 'instanceId'       then @item[:aws_instance_id] = @text
+        when 'device'           then @item[:aws_device]      = @text
+        when 'attachTime'       then @item[:aws_attached_at] = @text
+        when 'snapshotId'       then @item[:snapshot_id]     = @text.right_blank? ? nil : @text
+        when 'availabilityZone' then @item[:zone]            = @text
+        when 'deleteOnTermination' then @item[:delete_on_termination] = (@text == 'true')
+        else
+          case full_tag_name
+          when %r{/volumeSet/item/volumeId$}   then @item[:aws_id]                = @text
+          when %r{/volumeSet/item/status$}     then @item[:aws_status]            = @text
+          when %r{/attachmentSet/item/status$} then @item[:aws_attachment_status] = @text
+          when %r{/tagSet/item/key$}           then @aws_tag[:key]                = @text
+          when %r{/tagSet/item/value$}         then @aws_tag[:value]              = @text
+          when %r{/tagSet/item$}               then @item[:tags][@aws_tag[:key]]  = @aws_tag[:value]
+          when %r{/volumeSet/item$}            then @result << @item
           end
         end
       end
@@ -405,25 +417,33 @@ module RightAws
 
     class QEc2DescribeSnapshotsParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        case name
-        when *@each then @snapshot = {}
+        case full_tag_name
+        when %r{CreateSnapshotResponse$},
+             %r{/snapshotSet/item$}  then @item = { :tags => {} }
+        when %r{/tagSet/item$}       then @aws_tag = {}
         end
       end
       def tagend(name)
         case name
-        when 'volumeId'    then @snapshot[:aws_volume_id]   = @text
-        when 'snapshotId'  then @snapshot[:aws_id]          = @text
-        when 'status'      then @snapshot[:aws_status]      = @text
-        when 'startTime'   then @snapshot[:aws_started_at]  = Time.parse(@text)
-        when 'progress'    then @snapshot[:aws_progress]    = @text
-        when 'description' then @snapshot[:aws_description] = @text
-        when 'ownerId'     then @snapshot[:aws_owner]       = @text
-        when 'volumeSize'  then @snapshot[:aws_volume_size] = @text.to_i
-        when *@each        then @result << @snapshot
+        when 'volumeId'    then @item[:aws_volume_id]   = @text
+        when 'snapshotId'  then @item[:aws_id]          = @text
+        when 'status'      then @item[:aws_status]      = @text
+        when 'startTime'   then @item[:aws_started_at]  = @text
+        when 'progress'    then @item[:aws_progress]    = @text
+        when 'description' then @item[:aws_description] = @text
+        when 'ownerId'     then @item[:aws_owner]       = @text
+        when 'volumeSize'  then @item[:aws_volume_size] = @text.to_i
+        else
+          case full_tag_name
+          when %r{/tagSet/item/key$}         then @aws_tag[:key]                = @text
+          when %r{/tagSet/item/value$}       then @aws_tag[:value]              = @text
+          when %r{/tagSet/item$}             then @item[:tags][@aws_tag[:key]]  = @aws_tag[:value]
+          when %r{CreateSnapshotResponse$},
+               %r{/snapshotSet/item$}        then @result << @item
+          end
         end
       end
       def reset
-        @each = ['item', 'CreateSnapshotResponse']
         @result = []
       end
     end

data/lib/ec2/right_ec2_images.rb

@@ -35,32 +35,28 @@ module RightAws
     #     'Owner'        => ['self', ..., 'userN'],
     #     'ExecutableBy' => ['self', 'all', ..., 'userN']
     #   }
-    def ec2_describe_images(params={}, image_type=nil, cache_for=nil) #:nodoc:
+    def ec2_describe_images(params={}, options={}, cache_for=nil) #:nodoc:
       request_hash = {}
-      params.each do |list_by, list|
-        request_hash.merge! amazonize_list(list_by, list.to_a)
-      end
-      request_hash['ImageType'] = image_type if image_type
+      params.each { |list_by, list| request_hash.merge! amazonize_list(list_by, Array(list)) }
+      request_hash.merge!(amazonize_list(['Filter.?.Name', 'Filter.?.Value.?'], options[:filters])) unless options[:filters].right_blank?
       link = generate_request("DescribeImages", request_hash)
       request_cache_or_info cache_for, link,  QEc2DescribeImagesParser, @@bench, cache_for
     rescue Exception
       on_exception
     end
 
-    # Retrieve a list of images. Returns array of hashes describing the images or an exception:
-    # +image_type+ = 'machine' || 'kernel' || 'ramdisk'
+    # Retrieve a list of images.
+    #
+    # Accepts a list of images and/or a set of filters as the last parameter.
+    # 
+    # Filters: architecture, block-device-mapping.delete-on-termination block-device-mapping.device-name,
+    # block-device-mapping.snapshot-id, block-device-mapping.volume-size, description, image-id, image-type,
+    # is-public, kernel-id, manifest-location, name, owner-alias, owner-id, platform, product-code,
+    # ramdisk-id, root-device-name, root-device-type, state, state-reason-code, state-reason-message,
+    # tag-key, tag-value, tag:key, virtualization-type
     #
     #  ec2.describe_images #=>
-    #    [{:aws_id=>"ami-b0a1f7a6",
-    #      :aws_image_type=>"machine",
-    #      :root_device_name=>"/dev/sda1",
-    #      :image_class=>"static",
-    #      :aws_owner=>"826693181925",
-    #      :aws_location=>"bucket_for_k_dzreyev/image_bundles/kd__CentOS_1_10_2009_10_21_13_30_43_MSD/image.manifest.xml",
-    #      :aws_state=>"available",
-    #      :aws_is_public=>false,
-    #      :aws_architecture=>"i386"},
-    #     {:description=>"EBS backed Fedora core 8 i386",
+    #    [{:description=>"EBS backed Fedora core 8 i386",
     #      :aws_architecture=>"i386",
     #      :aws_id=>"ami-c2a3f5d4",
     #      :aws_image_type=>"machine",
@@ -75,43 +71,79 @@ module RightAws
     #         :device_name=>"/dev/sda1"}],
     #      :name=>"EBS backed FC8 i386",
     #      :aws_is_public=>true}, ... ]
-    #      
-    # If +list+ param is set, then retrieve information about the listed images only:
     #
-    #  ec2.describe_images(['ami-5aa1f74c'])
+    #  ec2.describe_images(:filters => { 'image-type' => 'kernel', 'state' => 'available', 'tag:MyTag' => 'MyValue'})
+    #
+    #  ec2.describe_images("ari-fda54b94", "ami-2ee80247", "aki-00896a69",
+    #                      :filters => { 'image-type' => 'kernel', 'state' => 'available' }) #=>
+    #    [{:root_device_type=>"instance-store",
+    #      :aws_id=>"aki-00896a69",
+    #      :aws_image_type=>"kernel",
+    #      :aws_location=>
+    #       "karmic-kernel-zul/ubuntu-kernel-2.6.31-300-ec2-i386-20091002-test-04.manifest.xml",
+    #      :virtualization_type=>"paravirtual",
+    #      :aws_state=>"available",
+    #      :aws_owner=>"099720109477",
+    #      :tags=>{},
+    #      :aws_is_public=>true,
+    #      :aws_architecture=>"i386"}]
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeImages.html
     #
-    def describe_images(list=[], image_type=nil)
-      list = list.to_a
-      cache_for = list.empty? && !image_type ? :describe_images : nil
-      ec2_describe_images({ 'ImageId' => list }, image_type, cache_for)
+    def describe_images(*list_and_options)
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      cache_for     = (list.right_blank? && options[:filters].right_blank?) ? :describe_images : nil
+      ec2_describe_images( {'ImageId'=>list}, options, cache_for)
     end
 
-    #  Example:
+    # Retrieve a list of images by image owner.
+    #
+    # Accepts a list of images and/or a set of filters as the last parameter.
+    # 
+    # Filters: architecture, block-device-mapping.delete-on-termination block-device-mapping.device-name,
+    # block-device-mapping.snapshot-id, block-device-mapping.volume-size, description, image-id, image-type,
+    # is-public, kernel-id, manifest-location, name, owner-alias, owner-id, platform, product-code,
+    # ramdisk-id, root-device-name, root-device-type, state, state-reason-code, state-reason-message,
+    # tag-key, tag-value, tag:key, virtualization-type
     #
     #   ec2.describe_images_by_owner('522821470517')
-    #   ec2.describe_images_by_owner('self')
+    #   ec2.describe_images_by_owner('self', :filters => { 'block-device-mapping.delete-on-termination' => 'false' })
     #
-    def describe_images_by_owner(list=['self'], image_type=nil)
-      list = list.to_a
-      cache_for = list==['self'] && !image_type ? :describe_images_by_owner : nil
-      ec2_describe_images({ 'Owner' => list }, image_type, cache_for)
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeImages.html
+    #
+    def describe_images_by_owner(*list_and_options)
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      list          = ['self'] if list.right_blank?
+      cache_for     = (list==['self'] && options[:filters].right_blank?) ? :describe_images_by_owner : nil
+      ec2_describe_images( {'Owner'=>list}, options, cache_for)
     end
 
-    #  Example:
+    # Retrieve a list of images by image executable by.
+    # 
+    # Accepts a list of images and/or a set of filters as the last parameter.
+    # 
+    # Filters: architecture, block-device-mapping.delete-on-termination block-device-mapping.device-name,
+    # block-device-mapping.snapshot-id, block-device-mapping.volume-size, description, image-id, image-type,
+    # is-public, kernel-id, manifest-location, name, owner-alias, owner-id, platform, product-code,
+    # ramdisk-id, root-device-name, root-device-type, state, state-reason-code, state-reason-message,
+    # tag-key, tag-value, tag:key, virtualization-type
     #
     #   ec2.describe_images_by_executable_by('522821470517')
     #   ec2.describe_images_by_executable_by('self')
-    #   ec2.describe_images_by_executable_by('all')
+    #   ec2.describe_images_by_executable_by('all', :filters => { 'architecture' => 'i386' })
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeImages.html
     #
-    def describe_images_by_executable_by(list=['self'], image_type=nil)
-      list = list.to_a
-      cache_for = list==['self'] && !image_type ? :describe_images_by_executable_by : nil
-      ec2_describe_images({ 'ExecutableBy' => list }, image_type, cache_for)
+    def describe_images_by_executable_by(*list_and_options)
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      list          = ['self'] if list.right_blank?
+      cache_for     = (list==['self'] && options[:filters].right_blank?) ? :describe_images_by_executable_by : nil
+      ec2_describe_images( {'ExecutableBy'=>list}, options, cache_for)
     end
 
-
     # Register new image at Amazon.
-    # Options: :image_location, :name, :description, :architecture, :kernel_id, :ramdisk_id, :root_device_name, :block_device_mappings.
+    # Options: :image_location, :name, :description, :architecture, :kernel_id, :ramdisk_id,
+    #          :root_device_name, :block_device_mappings, :virtualizationt_type(hvm|paravirtual)
     #
     # Returns new image id.
     #
@@ -148,6 +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['SnapshotId']     = options[:snapshot_id]      if options[:snapshot_id]
       params.merge!(amazonize_block_device_mappings(options[:block_device_mappings]))
       link = generate_request("RegisterImage", params)
@@ -209,9 +242,9 @@ module RightAws
       params =  {'ImageId'   => image_id,
                  'Attribute' => attribute}
       params['OperationType'] = operation_type if operation_type
-      params.update(amazonize_list('UserId',      vars[:user_id].to_a))    if vars[:user_id]
-      params.update(amazonize_list('UserGroup',   vars[:user_group].to_a)) if vars[:user_group]
-      params.update(amazonize_list('ProductCode', vars[:product_code]))    if vars[:product_code]
+      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]
       link = generate_request("ModifyImageAttribute", params)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
@@ -224,7 +257,7 @@ module RightAws
     #
     #  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.to_a)
+      modify_image_attribute(image_id, 'launchPermission', 'add', :user_id => user_id)
     end
 
     # Revokes image launch permissions for users. +user_id+ is a list of users AWS accounts ids. Returns +true+ or an exception.
@@ -232,7 +265,7 @@ module RightAws
     #  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.to_a)
+      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_id => user_id)
     end
 
     # Add image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
@@ -241,7 +274,7 @@ 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.to_a)
+      modify_image_attribute(image_id, 'launchPermission', 'add', :user_group => user_group)
     end
 
     # Remove image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
@@ -249,7 +282,7 @@ module RightAws
     #  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.to_a)
+      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_group => user_group)
     end
 
     # Add product code to image
@@ -257,7 +290,7 @@ module RightAws
     #  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.to_a)
+      modify_image_attribute(image_id, 'productCodes', nil, :product_code => product_code)
     end
 
     # Create a new image.
@@ -269,8 +302,8 @@ module RightAws
     #
     def create_image(instance_aws_id, options={})
       params = { 'InstanceId' => instance_aws_id }
-      params['Name']        = options[:name]            unless options[:name].blank?
-      params['Description'] = options[:description]     unless options[:description].blank?
+      params['Name']        = options[:name]            unless options[:name].right_blank?
+      params['Description'] = options[:description]     unless options[:description].right_blank?
       params['NoReboot']    = options[:no_reboot].to_s  unless options[:no_reboot].nil?
       link = generate_request("CreateImage", params)
       request_info(link, QEc2RegisterImageParser.new(:logger => @logger))
@@ -283,10 +316,13 @@ module RightAws
     class QEc2DescribeImagesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
         case full_tag_name
-        when %r{/imagesSet/item$}          then @item = {}
+        when %r{/imagesSet/item$}
+          @item = { :tags => {} }
         when %r{/blockDeviceMapping/item$}
           @item[:block_device_mappings] ||= []
           @block_device_mapping = {}
+        when %r{/tagSet/item$}
+          @aws_tag = {}
         end
       end
       def tagend(name)
@@ -308,6 +344,7 @@ module RightAws
         when 'rootDeviceType'  then @item[:root_device_type]  = @text
         when 'rootDeviceName'  then @item[:root_device_name]  = @text
         when 'imageClass'      then @item[:image_class]       = @text
+        when 'virtualizationType' then @item[:virtualization_type] = @text
         else
           case full_tag_name
           when %r{/stateReason/code$}    then @item[:state_reason_code]    = @text.to_i
@@ -321,7 +358,10 @@ module RightAws
             when 'deleteOnTermination' then @block_device_mapping[:ebs_delete_on_termination]  = @text == 'true' ? true : false
             when 'item'                then @item[:block_device_mappings]                    << @block_device_mapping
             end
-          when %r{/imagesSet/item$}    then @result << @item
+          when %r{/tagSet/item/key$}   then @aws_tag[:key]               = @text
+          when %r{/tagSet/item/value$} then @aws_tag[:value]             = @text
+          when %r{/tagSet/item$}       then @item[:tags][@aws_tag[:key]] = @aws_tag[:value]
+          when %r{/imagesSet/item$}    then @result                     << @item
           end
         end
       end