right_aws 2.0.0 → 2.1.0

data/lib/awsbase/support.rb

@@ -1,7 +1,3 @@
-# If ActiveSupport is loaded, then great - use it.  But we don't 
-# want a dependency on it, so if it's not present, define the few
-# extensions that we want to use...
-unless defined? ActiveSupport::CoreExtensions
   # These are ActiveSupport-;like extensions to do a few handy things in the gems
   # Derived from ActiveSupport, so the AS copyright notice applies:
   #
@@ -32,84 +28,8 @@ unless defined? ActiveSupport::CoreExtensions
   #
   class String #:nodoc:
 
-    # Constantize tries to find a declared constant with the name specified
-    # in the string. It raises a NameError when the name is not in CamelCase
-    # or is not initialized.
-    #
-    # Examples
-    #   "Module".constantize #=> Module
-    #   "Class".constantize #=> Class
-    def constantize()
-      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ self
-        raise NameError, "#{self.inspect} is not a valid constant name!"
-      end
-
-      Object.module_eval("::#{$1}", __FILE__, __LINE__)
-    end
-
-    def camelize()
-      self.dup.split(/_/).map{ |word| word.capitalize }.join('')
-    end
-
-  end
-
-
-  class Object #:nodoc:
-    # "", "   ", nil, [], and {} are blank
-    def blank?
-      if respond_to?(:empty?) && respond_to?(:strip)
-        empty? or strip.empty?
-      elsif respond_to?(:empty?)
-        empty?
-      else
-        !self
-      end
+    def right_underscore
+      self.gsub(/[A-Z]/){|match| "#{$`=='' ? '' : '_'}#{match.downcase}" }
     end
-  end
-
-  class NilClass #:nodoc:
-    def blank?
-      true
-    end
-  end
-
-  class FalseClass #:nodoc:
-    def blank?
-      true
-    end
-  end
-
-  class TrueClass #:nodoc:
-    def blank?
-      false
-    end
-  end
-
-  class Array #:nodoc:
-    alias_method :blank?, :empty?
-  end
-
-  class Hash #:nodoc:
-    alias_method :blank?, :empty?
     
-    # Return a new hash with all keys converted to symbols.
-    def symbolize_keys
-      inject({}) do |options, (key, value)|
-        options[key.to_sym] = value
-        options
-      end
-    end
-  end
-
-  class String #:nodoc:
-    def blank?
-      empty? || strip.empty?
-    end
-  end
-
-  class Numeric #:nodoc:
-    def blank?
-      false
-    end
   end
-end

data/lib/awsbase/version.rb

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

data/lib/ec2/right_ec2.rb

@@ -68,7 +68,7 @@ module RightAws
     include RightAwsBaseInterface
     
     # Amazon EC2 API version being used
-    API_VERSION       = "2009-11-30"
+    API_VERSION       = "2010-08-31"
     DEFAULT_HOST      = "ec2.amazonaws.com"
     DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
@@ -81,7 +81,9 @@ module RightAws
     # Amazon EC2 Instance Types : http://www.amazon.com/b?ie=UTF8&node=370375011
     # Default EC2 instance type (platform) 
     DEFAULT_INSTANCE_TYPE   =  'm1.small' 
-    INSTANCE_TYPES          = ['m1.small','c1.medium','m1.large','m1.xlarge','c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge']
+    INSTANCE_TYPES          = ['t1.micro','m1.small','c1.medium','m1.large','m1.xlarge',
+                               'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge',
+                               'cc1.4xlarge', 'cg1.4xlarge']
     
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -105,7 +107,6 @@ module RightAws
     # * <tt>:region</tt>: EC2 region (North America by default)
     # * <tt>:port</tt>: EC2 service port, default: DEFAULT_PORT
     # * <tt>:protocol</tt>: 'http' or 'https', default: DEFAULT_PROTOCOL
-    # * <tt>:multi_thread</tt>: true=HTTP connection per thread, false=per process
     # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
     # * <tt>:signature_version</tt>:  The signature version : '0','1' or '2'(default)
     # * <tt>:cache</tt>: true/false: caching for: ec2_describe_images, describe_instances,
@@ -124,9 +125,9 @@ module RightAws
            aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
            params)
       # Eucalyptus supports some yummy features but Amazon does not
-      if @params[:eucalyptus]
-        @params[:port_based_group_ingress] = true unless @params.has_key?(:port_based_group_ingress)
-      end
+      #if @params[:eucalyptus]
+      #  @params[:port_based_group_ingress] = true unless @params.has_key?(:port_based_group_ingress)
+      #end
     end
 
     def generate_request(action, params={}) #:nodoc:
@@ -139,26 +140,60 @@ module RightAws
       request_info_impl(:ec2_connection, @@bench, request, parser)
     end
 
+    def describe_resources_with_list_and_options(remote_function_name, remote_item_name, parser_class, list_and_options, &block) # :nodoc:
+      # 'RemoteFunctionName' -> :remote_funtion_name
+      cache_name = remote_function_name.right_underscore.to_sym
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      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
+      link = generate_request(remote_function_name, request_hash)
+      request_cache_or_info(cache_for, link,  parser_class, @@bench, cache_for, &block)
+    rescue Exception
+      on_exception
+    end
+
   #-----------------------------------------------------------------
   #      Keys
   #-----------------------------------------------------------------
   
-      # Retrieve a list of SSH keys. Returns an array of keys or an exception. Each key is
-      # represented as a two-element hash.
+      # Retrieve a list of SSH keys.
+      #
+      # Accepts a list of ssh keys and/or a set of filters as the last parameter.
+      #
+      # Filters: fingerprint, key-name
+      #
+      # Returns an array of keys or an exception. Each key is represented as a two-element hash.
       #
       #  ec2.describe_key_pairs #=>
       #    [{:aws_fingerprint=> "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03", :aws_key_name=>"key-1"},
       #     {:aws_fingerprint=> "1e:29:30:47:58:6d:7b:8c:9f:08:11:20:3c:44:52:69:74:80:97:08", :aws_key_name=>"key-2"},
       #      ..., {...} ]
       #
-    def describe_key_pairs(*key_pairs)
-      key_pairs = key_pairs.flatten
-      link = generate_request("DescribeKeyPairs", amazonize_list('KeyName', key_pairs))
-      request_cache_or_info :describe_key_pairs, link,  QEc2DescribeKeyPairParser, @@bench, key_pairs.blank?
+      #  ec2.describe_key_pairs(:filters => {'fingerprint' => ["53:0b:73:c9:c8:18:98:6e:bc:98:9e:51:97:04:74:4b:07:f9:00:00",
+      #                                                        "9f:57:a5:bb:4b:e8:a7:f8:3c:fe:d6:db:41:f5:7e:97:b5:b2:00:00"]})
+      #
+      # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html
+      #
+    def describe_key_pairs(*list_and_options)
+      describe_resources_with_list_and_options('DescribeKeyPairs', 'KeyName', QEc2DescribeKeyPairParser, list_and_options)
+    end
+      
+      # Import new SSH key. Returns a hash of the key's data or an exception.
+      #
+      #  ec2.import_key_pair('my_awesome_key', 'C:\keys\myfavoritekeypair_public.ppk') #=>
+      #    {:aws_key_name    => "my_awesome_key",
+      #     :aws_fingerprint => "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03"}
+      #
+    def import_key_pair(name, public_key_material)
+      link = generate_request("ImportKeyPair",
+                              'KeyName' => name.to_s,
+                              'PublicKeyMaterial' => Base64.encode64(public_key_material.to_s))
+      request_info(link, QEc2ImportKeyPairParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
-      
+
       # Create new SSH key. Returns a hash of the key's data or an exception.
       #
       #  ec2.create_key_pair('my_awesome_key') #=>
@@ -167,7 +202,7 @@ module RightAws
       #     :aws_material    => "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAK...Q8MDrCbuQ=\n-----END RSA PRIVATE KEY-----"}
       #
     def create_key_pair(name)
-      link = generate_request("CreateKeyPair", 
+      link = generate_request("CreateKeyPair",
                               'KeyName' => name.to_s)
       request_info(link, QEc2CreateKeyPairParser.new(:logger => @logger))
     rescue Exception
@@ -217,6 +252,11 @@ module RightAws
     end
 
     # List elastic IP addresses assigned to your account.
+    #
+    # Accepts a list of addresses and/or a set of filters as the last parameter.
+    #
+    # Filters: instance-id, public-ip
+    #
     # 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"},
@@ -224,12 +264,12 @@ module RightAws
     #
     #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"}]
     #
-    def describe_addresses(*addresses)
-      addresses = addresses.flatten
-      link = generate_request("DescribeAddresses", amazonize_list('PublicIp', addresses))
-      request_cache_or_info :describe_addresses, link,  QEc2DescribeAddressesParser, @@bench, addresses.blank?
-    rescue Exception
-      on_exception
+    #  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
+    #
+    def describe_addresses(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAddresses', 'PublicIp', QEc2DescribeAddressesParser, list_and_options)
     end
 
     # Disassociate the specified elastic IP address from the instance to which it is assigned.
@@ -263,6 +303,11 @@ module RightAws
   #-----------------------------------------------------------------
     
     # Describes availability zones that are currently available to the account and their states.
+    #
+    # Accepts a list of availability zones and/or a set of filters as the last parameter.
+    #
+    # Filters: message, region-name, state, zone-name
+    #
     # Returns an array of 2 keys (:zone_name and :zone_state) hashes:
     #
     #  ec2.describe_availability_zones  #=> [{:region_name=>"us-east-1",
@@ -273,12 +318,10 @@ module RightAws
     #                                                      :zone_state=>"available",
     #                                                      :zone_name=>"us-east-1c"}]
     #
-    def describe_availability_zones(*availability_zones)
-      availability_zones = availability_zones.flatten
-      link = generate_request("DescribeAvailabilityZones", amazonize_list('ZoneName', availability_zones))
-      request_cache_or_info :describe_availability_zones, link,  QEc2DescribeAvailabilityZonesParser, @@bench, availability_zones.blank?
-    rescue Exception
-      on_exception
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAvailabilityZones.html
+    #
+    def describe_availability_zones(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAvailabilityZones', 'ZoneName', QEc2DescribeAvailabilityZonesParser, list_and_options)
     end
 
   #-----------------------------------------------------------------
@@ -287,14 +330,16 @@ module RightAws
 
     # Describe regions.
     #
+    # Accepts a list of regions and/or a set of filters as the last parameter.
+    #
+    # Filters: endpoint, region-name
+    #
     #  ec2.describe_regions  #=> ["eu-west-1", "us-east-1"]
     #
-    def describe_regions(*regions)
-      regions = regions.flatten
-      link = generate_request("DescribeRegions", amazonize_list('RegionName', regions))
-      request_cache_or_info :describe_regions, link,  QEc2DescribeRegionsParser, @@bench, regions.blank?
-    rescue Exception
-      on_exception
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html
+    #
+    def describe_regions(*list_and_options)
+      describe_resources_with_list_and_options('DescribeRegions', 'RegionName', QEc2DescribeRegionsParser, list_and_options)
     end
 
   #-----------------------------------------------------------------
@@ -330,6 +375,18 @@ module RightAws
       end
     end
 
+    class QEc2ImportKeyPairParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        @result = {} if name == 'ImportKeyPairResponse'
+      end
+      def tagend(name)
+        case name
+          when 'keyName'        then @result[:aws_key_name]    = @text
+          when 'keyFingerprint' then @result[:aws_fingerprint] = @text
+        end
+      end
+    end
+
   #-----------------------------------------------------------------
   #      PARSERS: Elastic IPs
   #-----------------------------------------------------------------
@@ -346,7 +403,7 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'instanceId' then @address[:instance_id] = @text.blank? ? nil : @text 
+        when 'instanceId' then @address[:instance_id] = @text.right_blank? ? nil : @text
         when 'publicIp'   then @address[:public_ip]   = @text
         when 'item'       then @result << @address
         end
@@ -362,14 +419,20 @@ module RightAws
 
     class QEc2DescribeAvailabilityZonesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @zone = {} if name == 'item'
+        case full_tag_name
+        when %r{/availabilityZoneInfo/item$} then @item = {}
+        end
       end
       def tagend(name)
         case name
-        when 'regionName' then @zone[:region_name] = @text
-        when 'zoneName'   then @zone[:zone_name]   = @text
-        when 'zoneState'  then @zone[:zone_state]  = @text
-        when 'item'       then @result << @zone
+        when 'regionName' then @item[:region_name] = @text
+        when 'zoneName'   then @item[:zone_name]   = @text
+        when 'zoneState'  then @item[:zone_state]  = @text
+        else
+          case full_tag_name
+          when %r{/messageSet/item/message$}   then (@item[:messages] ||= []) << @text
+          when %r{/availabilityZoneInfo/item$} then @result << @item
+          end
         end
       end
       def reset

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,
@@ -49,12 +54,12 @@ module RightAws
     #        :aws_id         => "vol-58957031",
     #        :aws_created_at => Wed Jun 18 08:19:21 UTC 2008,}, ... ]
     #
-    def describe_volumes(*volumes)
-      volumes = volumes.flatten
-      link = generate_request("DescribeVolumes", amazonize_list('VolumeId', volumes))
-      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, @@bench, volumes.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.
@@ -72,7 +77,7 @@ module RightAws
       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,9 +143,14 @@ module RightAws
     #      EBS: Snapshots
     #-----------------------------------------------------------------
 
-    # Describe all EBS snapshots.
+    # Describe EBS snapshots.
+    #
+    # Accepts a list of snapshots and/or a set of filters as the last parameter.
+    #
+    # 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 #=>
+    #  ec2.describe_snapshots #=>
     #   [ {:aws_volume_id=>"vol-545fac3d",
     #      :aws_description=>"Wikipedia XML Backups (Linux)",
     #      :aws_progress=>"100%",
@@ -158,12 +168,12 @@ module RightAws
     #      :aws_volume_size=>180,
     #      :aws_status=>"completed"}, ...]
     #
-    def describe_snapshots(*snapshots)
-      snapshots = snapshots.flatten
-      link = generate_request("DescribeSnapshots", amazonize_list('SnapshotId', snapshots))
-      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, @@bench, snapshots.blank?
-    rescue Exception
-      on_exception
+    #  ec2.describe_snapshots(: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.
@@ -300,7 +310,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 +320,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
 
@@ -337,7 +347,7 @@ module RightAws
         when 'status'           then @result[:aws_status]     = @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
@@ -363,35 +373,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]  = @text
-        when 'instanceId'       then @volume[:aws_instance_id] = @text
-        when 'device'           then @volume[:aws_device]      = @text
-        when 'attachTime'       then @volume[:aws_attached_at] = @text
-        when 'snapshotId'       then @volume[:snapshot_id]     = @text.blank? ? nil : @text
-        when 'availabilityZone' then @volume[:zone]            = @text
-        when 'deleteOnTermination' then @volume[:delete_on_termination] = (@text == 'true')
-        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
@@ -406,25 +411,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]  = @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