icehouse-right_aws 1.11.0 → 2.2.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 = 2  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-10-31"
+    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.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,
@@ -123,6 +124,10 @@ module RightAws
            aws_access_key_id    || ENV['AWS_ACCESS_KEY_ID'] , 
            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
     end
 
     def generate_request(action, params={}) #:nodoc:
@@ -135,172 +140,70 @@ module RightAws
       request_info_impl(:ec2_connection, @@bench, request, parser)
     end
 
-  #-----------------------------------------------------------------
-  #      Security groups
-  #-----------------------------------------------------------------
-
-      # Retrieve Security Group information. If +list+ is omitted the returns the whole list of groups.
-      #
-      #  ec2.describe_security_groups #=>
-      #    [{:aws_group_name  => "default-1",
-      #      :aws_owner       => "000000000888",
-      #      :aws_description => "Default allowing SSH, HTTP, and HTTPS ingress",
-      #      :aws_perms       =>
-      #        [{:owner => "000000000888", :group => "default"},
-      #         {:owner => "000000000888", :group => "default-1"},
-      #         {:to_port => "-1",  :protocol => "icmp", :from_port => "-1",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "22",  :protocol => "tcp",  :from_port => "22",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "80",  :protocol => "tcp",  :from_port => "80",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "443", :protocol => "tcp",  :from_port => "443", :cidr_ips => "0.0.0.0/0"}]},
-      #    ..., {...}]
-      #
-    def describe_security_groups(list=[])
-      link = generate_request("DescribeSecurityGroups", amazonize_list('GroupName',list.to_a))
-      request_cache_or_info( :describe_security_groups, link,  QEc2DescribeSecurityGroupsParser, @@bench, list.blank?) do |parser|
-        result = []     
-        parser.result.each do |item|
-          perms = []
-          item.ipPermissions.each do |perm|
-            perm.groups.each do |ngroup|
-              perms << {:group => ngroup.groupName,
-                        :owner => ngroup.userId}
-            end
-            perm.ipRanges.each do |cidr_ip|
-              perms << {:from_port => perm.fromPort, 
-                        :to_port   => perm.toPort, 
-                        :protocol  => perm.ipProtocol,
-                        :cidr_ips  => cidr_ip}
-            end
-          end
-
-             # delete duplication
-          perms.each_index do |i|
-            (0...i).each do |j|
-              if perms[i] == perms[j] then perms[i] = nil; break; end
-            end
-          end
-          perms.compact!
-
-          result << {:aws_owner       => item.ownerId, 
-                     :aws_group_name  => item.groupName, 
-                     :aws_description => item.groupDescription,
-                     :aws_perms       => perms}
-        
+    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)
+      # Resource IDs to fetch
+      request_hash  = amazonize_list(remote_item_name, list)
+      # 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
-        result
       end
-    rescue Exception
-      on_exception
-    end
-    
-      # Create new Security Group. Returns +true+ or an exception.
-      #
-      #  ec2.create_security_group('default-1',"Default allowing SSH, HTTP, and HTTPS ingress") #=> true
-      #
-    def create_security_group(name, description)
-      # EC2 doesn't like an empty description...
-      description = " " if description.blank?
-      link = generate_request("CreateSecurityGroup", 
-                              'GroupName'        => name.to_s,
-                              'GroupDescription' => description.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+      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
       on_exception
     end
 
-      # Remove Security Group. Returns +true+ or an exception.
-      #
-      #  ec2.delete_security_group('default-1') #=> true
+  #-----------------------------------------------------------------
+  #      Keys
+  #-----------------------------------------------------------------
+  
+      # Retrieve a list of SSH keys.
       #
-    def delete_security_group(name)
-      link = generate_request("DeleteSecurityGroup", 
-                              'GroupName' => name.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Authorize named ingress for security group. Allows instances that are member of someone
-      # else's security group to open connections to instances in my group.
+      # Accepts a list of ssh keys and/or a set of filters as the last parameter.
       #
-      #  ec2.authorize_security_group_named_ingress('my_awesome_group', '7011-0219-8268', 'their_group_name') #=> true
+      # Filters: fingerprint, key-name
       #
-    def authorize_security_group_named_ingress(name, owner, group)
-      link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s,
-                                'SourceSecurityGroupName'    => group.to_s,
-                              'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Revoke named ingress for security group.
+      # Returns an array of keys or an exception. Each key is represented as a two-element hash.
       #
-      #  ec2.revoke_security_group_named_ingress('my_awesome_group', aws_user_id, 'another_group_name') #=> true
+      #  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 revoke_security_group_named_ingress(name, owner, group)
-      link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s,
-                              'SourceSecurityGroupName'    => group.to_s,
-                              'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Add permission to a security group. Returns +true+ or an exception. +protocol+ is one of :'tcp'|'udp'|'icmp'.
+      #  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"]})
       #
-      #  ec2.authorize_security_group_IP_ingress('my_awesome_group', 80, 82, 'udp', '192.168.1.0/8') #=> true
-      #  ec2.authorize_security_group_IP_ingress('my_awesome_group', -1, -1, 'icmp') #=> true
+      # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html
       #
-    def authorize_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
-      link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s,
-                              'IpProtocol' => protocol.to_s,
-                              'FromPort'   => from_port.to_s,
-                              'ToPort'     => to_port.to_s,
-                              'CidrIp'     => cidr_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
+    def describe_key_pairs(*list_and_options)
+      describe_resources_with_list_and_options('DescribeKeyPairs', 'KeyName', QEc2DescribeKeyPairParser, list_and_options)
     end
-    
-      # Remove permission from a security group. Returns +true+ or an exception. +protocol+ is one of :'tcp'|'udp'|'icmp' ('tcp' is default). 
+      
+      # Import new SSH key. Returns a hash of the key's data or an exception.
       #
-      #  ec2.revoke_security_group_IP_ingress('my_awesome_group', 80, 82, 'udp', '192.168.1.0/8') #=> true
+      #  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 revoke_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
-      link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s,
-                              'IpProtocol' => protocol.to_s,
-                              'FromPort'   => from_port.to_s,
-                              'ToPort'     => to_port.to_s,
-                              'CidrIp'     => cidr_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    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
 
-  #-----------------------------------------------------------------
-  #      Keys
-  #-----------------------------------------------------------------
-  
-      # Retrieve a list of SSH keys. 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(list=[])
-      link = generate_request("DescribeKeyPairs", amazonize_list('KeyName',list.to_a))
-      request_cache_or_info :describe_key_pairs, link,  QEc2DescribeKeyPairParser, @@bench, list.blank?
-    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') #=>
@@ -309,7 +212,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
@@ -359,6 +262,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"},
@@ -366,12 +274,12 @@ module RightAws
     #
     #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"}]
     #
-    def describe_addresses(list=[])
-      link = generate_request("DescribeAddresses", 
-                              amazonize_list('PublicIp',list.to_a))
-      request_cache_or_info :describe_addresses, link,  QEc2DescribeAddressesParser, @@bench, list.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.
@@ -405,6 +313,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",
@@ -415,12 +328,10 @@ module RightAws
     #                                                      :zone_state=>"available",
     #                                                      :zone_name=>"us-east-1c"}]
     #
-    def describe_availability_zones(list=[])
-      link = generate_request("DescribeAvailabilityZones", 
-                              amazonize_list('ZoneName',list.to_a))
-      request_cache_or_info :describe_availability_zones, link,  QEc2DescribeAvailabilityZonesParser, @@bench, list.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
 
   #-----------------------------------------------------------------
@@ -429,24 +340,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(list=[])
-      link = generate_request("DescribeRegions",
-                              amazonize_list('RegionName',list.to_a))
-      request_cache_or_info :describe_regions, link,  QEc2DescribeRegionsParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
-    end
-
-  #-----------------------------------------------------------------
-  #      PARSERS: Boolean Response Parser
-  #-----------------------------------------------------------------
-    
-    class RightBoolResponseParser < RightAWSParser #:nodoc:
-      def tagend(name)
-        @result = @text=='true' ? true : false if name == 'return'
-      end
+    # 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
 
   #-----------------------------------------------------------------
@@ -482,74 +385,16 @@ module RightAws
       end
     end
 
-  #-----------------------------------------------------------------
-  #      PARSERS: Security Groups
-  #-----------------------------------------------------------------
-
-    class QEc2UserIdGroupPairType #:nodoc:
-      attr_accessor :userId
-      attr_accessor :groupName
-    end
-
-    class QEc2IpPermissionType #:nodoc:
-      attr_accessor :ipProtocol
-      attr_accessor :fromPort
-      attr_accessor :toPort
-      attr_accessor :groups
-      attr_accessor :ipRanges
-    end
-
-    class QEc2SecurityGroupItemType #:nodoc:
-      attr_accessor :groupName
-      attr_accessor :groupDescription
-      attr_accessor :ownerId
-      attr_accessor :ipPermissions
-    end
-
-    class QEc2DescribeSecurityGroupsParser < RightAWSParser #:nodoc:
+    class QEc2ImportKeyPairParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        case name
-          when 'item' 
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo'
-              @group = QEc2SecurityGroupItemType.new 
-              @group.ipPermissions = []
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions'
-              @perm = QEc2IpPermissionType.new
-              @perm.ipRanges = []
-              @perm.groups   = []
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups'
-              @sgroup = QEc2UserIdGroupPairType.new
-            end
-        end
+        @result = {} if name == 'ImportKeyPairResponse'
       end
       def tagend(name)
         case name
-          when 'ownerId'          then @group.ownerId   = @text
-          when 'groupDescription' then @group.groupDescription = @text
-          when 'groupName'
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item'
-              @group.groupName  = @text 
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups/item'
-              @sgroup.groupName = @text 
-            end
-          when 'ipProtocol'       then @perm.ipProtocol = @text
-          when 'fromPort'         then @perm.fromPort   = @text
-          when 'toPort'           then @perm.toPort     = @text
-          when 'userId'           then @sgroup.userId   = @text
-          when 'cidrIp'           then @perm.ipRanges  << @text
-          when 'item'
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups'
-              @perm.groups << @sgroup
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions'
-              @group.ipPermissions << @perm
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo'
-              @result << @group
-            end
+          when 'keyName'        then @result[:aws_key_name]    = @text
+          when 'keyFingerprint' then @result[:aws_fingerprint] = @text
         end
       end
-      def reset
-        @result = []
-      end
     end
 
   #-----------------------------------------------------------------
@@ -568,7 +413,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
@@ -584,14 +429,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