right_aws 2.0.0 → 2.1.0

data/lib/ec2/right_ec2_reserved_instances.rb

@@ -30,7 +30,11 @@ module RightAws
   #-----------------------------------------------------------------
 
     # Retrieve reserved instances list.
-    # Returns a list of Reserved Instances.
+    #
+    # Accepts a list of reserved instances and/or a set of filters as the last parameter.
+    #
+    # Filters: availability-zone, duration, fixed-price, instance-type, product-description,
+    # reserved-instances-id, start, state, tag-key, tag-value, tag:key, usage-price
     #
     # ec2.describe_reserved_instances #=>
     #    [{:aws_id=>"1ba8e2e3-1c40-434c-a741-5ff16a4c542e",
@@ -44,21 +48,19 @@ module RightAws
     #      :aws_start=>"2009-12-18T20:39:39.569Z"
     #      :aws_instance_count=>1}]
     #
-    def describe_reserved_instances(*reserved_instances)
-      reserved_instances = reserved_instances.flatten
-      link = generate_request("DescribeReservedInstances", amazonize_list('ReservedInstancesId', reserved_instances))
-      request_cache_or_info(:describe_reserved_instances, link,  QEc2DescribeReservedInstancesParser, @@bench, reserved_instances.blank?)
-    rescue Exception
-      on_exception
+    #  ec2.describe_reserved_instances(:filters => {'availability-zone' => 'us-east-1a'})
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeReservedInstances.html
+    #
+    def describe_reserved_instances(*list_and_options)
+      describe_resources_with_list_and_options('DescribeReservedInstances', 'ReservedInstancesId', QEc2DescribeReservedInstancesParser, list_and_options)
     end
 
     # Retrieve reserved instances offerings.
-    # Returns a set of available offerings.
+    # 
+    # Accepts a list of reserved instances offerings and/or a set of filters as the last parameter.
     #
-    # Optional params:
-    #  :aws_instance_type       => String
-    #  :aws_availability_zone   => String
-    #  :aws_product_description => String
+    # Filters: availability-zone, duration, fixed-price, instance-type, product-description, reserved-instances-offering-id, usage-price
     #
     #  ec2.describe_reserved_instances_offerings #=>
     #    [{:aws_instance_type=>"c1.medium",
@@ -77,19 +79,12 @@ module RightAws
     #      :aws_usage_price=>0.24,
     #      :aws_fixed_price=>2600.0}]
     #
-    def describe_reserved_instances_offerings(*list_and_params)
-      list, params = AwsUtils::split_items_and_params(list_and_params)
-      # backward compartibility with the old way
-      list ||= Array(params[:aws_ids])
-      rparams = {}
-      rparams.update(amazonize_list('ReservedInstancesOfferingId', list)) unless list.blank?
-      rparams['InstanceType']       = params[:aws_instance_type]       if params[:aws_instance_type]
-      rparams['AvailabilityZone']   = params[:aws_availability_zone]   if params[:aws_availability_zone]
-      rparams['ProductDescription'] = params[:aws_product_description] if params[:aws_product_description]
-      link = generate_request("DescribeReservedInstancesOfferings", rparams)
-      request_cache_or_info(:describe_reserved_instances_offerings, link,  QEc2DescribeReservedInstancesOfferingsParser, @@bench, list.blank?)
-    rescue Exception
-      on_exception
+    #  ec2.describe_reserved_instances_offerings(:filters => {'availability-zone' => 'us-east-1c'})
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeReservedInstancesOfferings.html
+    #
+    def describe_reserved_instances_offerings(*list_and_options)
+      describe_resources_with_list_and_options('DescribeReservedInstancesOfferings', 'ReservedInstancesOfferingId', QEc2DescribeReservedInstancesOfferingsParser, list_and_options)
     end
 
     # Purchase a Reserved Instance.
@@ -111,21 +106,30 @@ module RightAws
 
     class QEc2DescribeReservedInstancesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @item = {} if name == 'item'
+        case full_tag_name
+        when %r{/reservedInstancesSet/item$} then @item    = { :tags => {} }
+        when %r{/tagSet/item$}                        then @aws_tag = {}
+        end
       end
       def tagend(name)
         case name
-          when 'reservedInstancesId' then @item[:aws_id]                  = @text
-          when 'instanceType'        then @item[:aws_instance_type]       = @text
-          when 'availabilityZone'    then @item[:aws_availability_zone]   = @text
-          when 'duration'            then @item[:aws_duration]            = @text.to_i
-          when 'usagePrice'          then @item[:aws_usage_price]         = @text.to_f
-          when 'fixedPrice'          then @item[:aws_fixed_price]         = @text.to_f
-          when 'instanceCount'       then @item[:aws_instance_count]      = @text.to_i
-          when 'productDescription'  then @item[:aws_product_description] = @text
-          when 'state'               then @item[:aws_state]               = @text
-          when 'start'               then @item[:aws_start]               = @text
-          when 'item'                then @result << @item
+        when 'reservedInstancesId' then @item[:aws_id]                  = @text
+        when 'instanceType'        then @item[:aws_instance_type]       = @text
+        when 'availabilityZone'    then @item[:aws_availability_zone]   = @text
+        when 'duration'            then @item[:aws_duration]            = @text.to_i
+        when 'usagePrice'          then @item[:aws_usage_price]         = @text.to_f
+        when 'fixedPrice'          then @item[:aws_fixed_price]         = @text.to_f
+        when 'instanceCount'       then @item[:aws_instance_count]      = @text.to_i
+        when 'productDescription'  then @item[:aws_product_description] = @text
+        when 'state'               then @item[:aws_state]               = @text
+        when 'start'               then @item[:aws_start]               = @text
+        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{/reservedInstancesSet/item$} then @result << @item
+          end
         end
       end
       def reset
@@ -136,19 +140,19 @@ module RightAws
     class QEc2DescribeReservedInstancesOfferingsParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
         @item = {} if name == 'item'
-      end
+        end
       def tagend(name)
         case name
-          when 'reservedInstancesOfferingId' then @item[:aws_id]                  = @text
-          when 'instanceType'                then @item[:aws_instance_type]       = @text
-          when 'availabilityZone'            then @item[:aws_availability_zone]   = @text
-          when 'duration'                    then @item[:aws_duration]            = @text.to_i
-          when 'usagePrice'                  then @item[:aws_usage_price]         = @text.to_f
-          when 'fixedPrice'                  then @item[:aws_fixed_price]         = @text.to_f
-          when 'productDescription'          then @item[:aws_product_description] = @text
+        when 'reservedInstancesOfferingId' then @item[:aws_id]                  = @text
+        when 'instanceType'                then @item[:aws_instance_type]       = @text
+        when 'availabilityZone'            then @item[:aws_availability_zone]   = @text
+        when 'duration'                    then @item[:aws_duration]            = @text.to_i
+        when 'usagePrice'                  then @item[:aws_usage_price]         = @text.to_f
+        when 'fixedPrice'                  then @item[:aws_fixed_price]         = @text.to_f
+        when 'productDescription'          then @item[:aws_product_description] = @text
           when 'item'                        then @result << @item
+          end
         end
-      end
       def reset
         @result = []
       end

data/lib/ec2/right_ec2_security_groups.rb

@@ -29,7 +29,12 @@ module RightAws
     #      Security groups
     #-----------------------------------------------------------------
 
-    # Retrieve Security Groups information. If +list+ is omitted the returns the whole list of groups.
+    # Retrieve Security Groups information.
+    #
+    # Accepts a list of security groups and/or a set of filters as the last parameter.
+    #
+    # Filters: description, group-name, ip-permission.cidr, ip-permission.from-port, ip-permission.group-name,
+    # ip-permission.protocol, ip-permission.to-port, ip-permission.user-id, owner-id
     #
     #  # Amazon cloud:
     #  ec2 = Rightscale::Ec2.new(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
@@ -79,10 +84,12 @@ module RightAws
     #      :aws_description=>"default group",
     #      :aws_owner=>"826693181925"}]
     #
-    def describe_security_groups(list=[])
-      link = generate_request("DescribeSecurityGroups", amazonize_list('GroupName', list))
-
-      request_cache_or_info( :describe_security_groups, link,  QEc2DescribeSecurityGroupsParser, @@bench, list.blank?) do |parser|
+    #  ec2.describe_security_groups(:filters => {'ip-permission.from-port' => '22'})
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html
+    #
+    def describe_security_groups(*list_and_options)
+      describe_resources_with_list_and_options('DescribeSecurityGroups', 'GroupName', QEc2DescribeSecurityGroupsParser, list_and_options) do |parser|
         result = []
         parser.result.each do |item|
           result_item = { :aws_owner       => item[:owner_id],
@@ -97,10 +104,7 @@ module RightAws
             # IP permissions
             Array(permission[:ip_ranges]).each do |ip_range|
               perm = result_perm.dup
-              # Mhhh... For Eucalyptus we somehow get used to use ":cidr_ip" instead of ":cidr_ips"...
-              if @params[:eucalyptus] then  perm[:cidr_ip]  = ip_range
-              else                          perm[:cidr_ips] = ip_range
-              end
+              perm[:cidr_ips] = ip_range
               aws_perms << perm
             end
             # Group permissions
@@ -108,12 +112,6 @@ module RightAws
               perm = result_perm.dup
               perm[:group] = group[:group_name]
               perm[:owner] = group[:user_id]
-              # AWS does not support Port Based Group Permissions but Eucalyptus does
-              unless @params[:port_based_group_ingress]
-                perm.delete(:from_port)
-                perm.delete(:to_port)
-                perm.delete(:protocol)
-              end
               aws_perms << perm
             end
           end
@@ -122,8 +120,6 @@ module RightAws
         end
         result
       end
-    rescue Exception
-      on_exception
     end
 
     # Create new Security Group. Returns +true+ or an exception.
@@ -132,7 +128,7 @@ module RightAws
     #
     def create_security_group(name, description=nil)
       # EC2 doesn't like an empty description...
-      description = "-" if description.blank?
+      description = "-" if description.right_blank?
       link = generate_request("CreateSecurityGroup",
                               'GroupName'        => name.to_s,
                               'GroupDescription' => description.to_s)
@@ -153,13 +149,14 @@ module RightAws
       on_exception
     end
 
-    # Edit group permissions.
+    # Edit AWS/Eucaliptus security group permissions.
     #
-    #    action     - :authorize (or :grant) | :revoke (or :remove)
-    #    group_name - security group name
-    #    params     - a combination of options below:
-    #      :source_group_owner => grantee id
-    #      :source_group       => grantee group name
+    #  Options:
+    #    action      - :authorize (or :grant) | :revoke (or :remove)
+    #    group_name  - security group name
+    #    permissions - a combination of options below:
+    #      :source_group_owner => UserId
+    #      :source_group       => GroupName
     #      :from_port          => from port
     #      :to_port            => to port
     #      :port               => set both :from_port and to_port with the same value
@@ -174,7 +171,8 @@ module RightAws
     #                           :port               => '80',
     #                           :cidr_ip            => '127.0.0.1/32') #=> true
     #
-    # P.S. setting both group based and port based ingresses is not supported by Amazon but by Eucalyptus.
+    # P.S. This method is deprecated for AWS and but still good for Eucaliptus clouds.
+    # Use +modify_security_group_ingress+ method for AWS clouds.
     #
     def edit_security_group(action, group_name, params)
       hash = {}
@@ -184,16 +182,134 @@ module RightAws
       else raise "Unknown action #{action.inspect}!"
       end
       hash['GroupName']                  = group_name
-      hash['SourceSecurityGroupName']    = params[:source_group]                         unless params[:source_group].blank?
-      hash['SourceSecurityGroupOwnerId'] = params[:source_group_owner].to_s.gsub(/-/,'') unless params[:source_group_owner].blank?
-      hash['IpProtocol']                 = params[:protocol]                             unless params[:protocol].blank?
-      unless params[:port].blank?
+      hash['SourceSecurityGroupName']    = params[:source_group]                         unless params[:source_group].right_blank?
+      hash['SourceSecurityGroupOwnerId'] = params[:source_group_owner].to_s.gsub(/-/,'') unless params[:source_group_owner].right_blank?
+      hash['IpProtocol']                 = params[:protocol]                             unless params[:protocol].right_blank?
+      unless params[:port].right_blank?
         hash['FromPort'] = params[:port]
         hash['ToPort']   = params[:port]
       end
-      hash['FromPort']   = params[:from_port] unless params[:from_port].blank?
-      hash['ToPort']     = params[:to_port]   unless params[:to_port].blank?
-      hash['CidrIp']     = params[:cidr_ip]   unless params[:cidr_ip].blank?
+      hash['FromPort']   = params[:from_port] unless params[:from_port].right_blank?
+      hash['ToPort']     = params[:to_port]   unless params[:to_port].right_blank?
+      hash['CidrIp']     = params[:cidr_ip]   unless params[:cidr_ip].right_blank?
+      #
+      link = generate_request(action, hash)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Modify AWS security group permissions.
+    #
+    #  Options:
+    #    action      - :authorize (or :grant) | :revoke (or :remove)
+    #    group_name  - security group name
+    #    permissions - a combination of options below:
+    #      # Ports:
+    #      :from_port          => from port
+    #      :to_port            => to port
+    #      :port               => set both :from_port and to_port with the same value
+    #      # Protocol
+    #      :protocol           => :tcp | :udp | :icmp
+    #      # Group(s)
+    #      :source_group_owner => UserId
+    #      :source_group       => GroupName
+    #      # or
+    #      :source_groups      => { UserId1 => GroupName1, UserName2 => GroupName2 }
+    #      :source_groups      => [ [ UserId1, GroupName1 ], [ UserName2 => GroupName2 ] ]
+    #      # CidrIp(s)
+    #      :cidr_ip            => '0.0.0.0/0'
+    #      :cidr_ips           => ['1.1.1.1/1', '2.2.2.2/2']
+    #
+    #  # CidrIP based permissions:
+    #
+    #  ec2.modify_security_group_ingress(:authorize, 'my_cool_group',
+    #                                    :cidr_ip  =>  "127.0.0.0/31",
+    #                                    :port     => 811,
+    #                                    :protocol => 'tcp' ) #=> true
+    #
+    #  ec2.modify_security_group_ingress(:revoke, 'my_cool_group',
+    #                                    :cidr_ips =>  ["127.0.0.1/32", "127.0.0.2/32"],
+    #                                    :port     => 812,
+    #                                    :protocol => 'tcp' ) #=> true
+    #
+    #  # Group based permissions:
+    #
+    #  ec2.modify_security_group_ingress(:authorize, 'my_cool_group',
+    #                                    :source_group_owner => "586789340000",
+    #                                    :source_group =>  "sketchy-us",
+    #                                    :port         => 800,
+    #                                    :protocol     => 'tcp' ) #=> true
+    #
+    #  ec2.modify_security_group_ingress(:authorize, 'my_cool_group',
+    #                                    :source_groups => { "586789340000" => "sketchy-us",
+    #                                                        "635201710000" => "sketchy" },
+    #                                    :port          => 801,
+    #                                    :protocol      => 'tcp' ) #=> true
+    #
+    #  ec2.modify_security_group_ingress(:revoke, 'my_cool_group',
+    #                                    :source_groups => [[ "586789340000", "sketchy-us" ],
+    #                                                       [ "586789340000", "default" ]],
+    #                                    :port          => 809,
+    #                                    :protocol      => 'tcp' ) #=> true
+    #
+    #  # +Permissions+ can be an array of permission hashes:
+    #
+    #  ec2.modify_security_group_ingress(:authorize, 'my_cool_group',
+    #                                    [{ :source_groups => { "586789340000" => "sketchy-us",
+    #                                                           "635201710000" => "sketchy" },
+    #                                       :port          => 803,
+    #                                       :protocol      => 'tcp'},
+    #                                     { :cidr_ips      =>  ["127.0.0.1/32", "127.0.0.2/32"],
+    #                                       :port          => 812,
+    #                                       :protocol      => 'tcp' }]) #=> true
+    #
+    def modify_security_group_ingress(action, group_name, permissions)
+      hash = {}
+      case action
+      when :authorize, :grant then action = "AuthorizeSecurityGroupIngress"
+      when :revoke, :remove   then action = "RevokeSecurityGroupIngress"
+      else                         raise "Unknown action #{action.inspect}!"
+      end
+      # Group Name
+      hash["GroupName"] = group_name
+      #
+      permissions = [permissions] unless permissions.is_a?(Array)
+      permissions.each_with_index do |permission, idx|
+        pid = idx+1
+        # Protocol
+        hash["IpPermissions.#{pid}.IpProtocol"] = permission[:protocol]
+        # Port
+        unless permission[:port].right_blank?
+          hash["IpPermissions.#{pid}.FromPort"] = permission[:port]
+          hash["IpPermissions.#{pid}.ToPort"]   = permission[:port]
+        else
+          hash["IpPermissions.#{pid}.FromPort"] = permission[:from_port]
+          hash["IpPermissions.#{pid}.ToPort"]   = permission[:to_port]
+        end
+        # Source Group(s)
+        # Old way (if it is used):
+        # :source_group_owner => UserId, :source_group => GroupName 
+        if !permission[:source_group].right_blank? && !permission[:source_group_owner].right_blank?
+          permission[:source_groups] = { permission[:source_group_owner] => permission[:source_group]} 
+        end
+#        # Fix UserId(s): '0000-0000-0000' => '000000000000'
+#        permission[:source_groups] = Array(permission[:source_groups])
+#        permission[:source_groups].each do |item|
+#          item[0] = item[0].to_s.gsub(/-/,'')
+#        end
+        # New way:
+        #  :source_groups => {UserId1 => GroupName1, ... UserIdN => GroupNameN}
+        #  or (this allows using same UserId multiple times )
+        #  :source_groups => [[UserId1, GroupName1], ... [UserIdN, GroupNameN]]  
+        hash.merge!(amazonize_list( ["IpPermissions.#{pid}.Groups.?.UserId",
+                                     "IpPermissions.#{pid}.Groups.?.GroupName"],
+                                      permission[:source_groups] ))
+        # CidrIp(s)
+        cidr_ips   = permission[:cidr_ips] unless permission[:cidr_ips].right_blank?
+        cidr_ips ||= permission[:cidr_ip]  unless permission[:cidr_ip].right_blank?
+        hash.merge!(amazonize_list("IpPermissions.1.IpRanges.?.CidrIp", cidr_ips))
+      end
       #
       link = generate_request(action, hash)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))

data/lib/ec2/right_ec2_spot_instances.rb

@@ -30,7 +30,10 @@ module RightAws
     #-----------------------------------------------------------------
 
     # Describe Spot Price history.
+    #
     # Options: :start_time, :end_time, instance_types, product_description
+    # 
+    # Filters: instance-type, product-description, spot-price, timestamp
     #
     #  ec2.describe_spot_price_history #=>
     #    [{:spot_price=>0.054,
@@ -63,13 +66,21 @@ module RightAws
     #      :spot_price=>0.058,
     #      :instance_type=>"c1.medium"}, ... ]
     #
+    #  ec2.describe_spot_price_history(:filters => {'spot-price' => '0.2' })
+    #
+    #  ec2.describe_spot_price_history(:instance_types => ["c1.medium"], :filters => {'spot-price' => '0.2' })
+    #
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeSpotPriceHistory.html
+    #
     def describe_spot_price_history(options={})
       options = options.dup
       request_hash = {}
-      request_hash['StartTime']          = AwsUtils::utc_iso8601(options[:start_time])     unless options[:start_time].blank?
-      request_hash['EndTime']            = AwsUtils::utc_iso8601(options[:end_time])       unless options[:end_time].blank?
-      request_hash['ProductDescription'] = options[:product_description]                   unless options[:product_description].blank?
-      request_hash.merge!(amazonize_list('InstanceType', Array(options[:instance_types]))) unless options[:instance_types].blank?
+      request_hash.merge!(amazonize_list(['Filter.?.Name', 'Filter.?.Value.?'], options[:filters])) unless options[:filters].right_blank?
+      request_hash['StartTime']          = AwsUtils::utc_iso8601(options[:start_time])      unless options[:start_time].right_blank?
+      request_hash['EndTime']            = AwsUtils::utc_iso8601(options[:end_time])        unless options[:end_time].right_blank?
+      request_hash['ProductDescription'] = options[:product_description]                   unless options[:product_description].right_blank?
+      request_hash.merge!(amazonize_list('InstanceType', Array(options[:instance_types]))) unless options[:instance_types].right_blank?
       link = generate_request("DescribeSpotPriceHistory", request_hash)
       request_info(link, QEc2DescribeSpotPriceHistoryParser.new)
     rescue Exception
@@ -78,6 +89,14 @@ module RightAws
 
     # Describe Spot Instance requests.
     #
+    # Accepts a list of requests and/or a set of filters as the last parameter.
+    #
+    # Filters: availability-zone-group, create-time, fault-code, fault-message, instance-id, launch-group,
+    # launch.block-device-mapping.delete-on-termination, launch.block-device-mapping.device-name,
+    # launch.block-device-mapping.snapshot-id, launch.group-id, launch.image-id, launch.instance-type,
+    # launch.kernel-id, launch.key-name, launch.monitoring-enabled, launch.ramdisk-id, product-description,
+    # spot-instance-request-id, spot-price, state, tag-key, tag-value, tag:key, type, valid-from, valid-until
+    #
     #  ec2.describe_spot_instance_requests #=>
     #    [{:type=>"one-time",
     #      :create_time=>"2010-03-10T10:30:32.000Z",
@@ -113,9 +132,12 @@ module RightAws
     #      :monitoring_enabled=>false,
     #      :key_name=>"tim"}]
     #
-    def describe_spot_instance_requests(*spot_instance_request_ids)
-      link = generate_request("DescribeSpotInstanceRequests", amazonize_list('SpotInstanceRequestId', spot_instance_request_ids.flatten))
-      request_info(link, QEc2DescribeSpotInstanceParser.new(:logger => @logger))
+    #  ec2.describe_spot_instance_requests(:filters => {'type'=>"one-time", 'state'=>"open"})
+    #  
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeSpotInstanceRequests.html
+    #
+    def describe_spot_instance_requests(*list_and_options)
+      describe_resources_with_list_and_options('DescribeSpotInstanceRequests', 'SpotInstanceRequestId', QEc2DescribeSpotInstanceParser, list_and_options)
     end
 
     # Create a Spot Instance request.
@@ -205,25 +227,25 @@ module RightAws
       request_hash = { 'SpotPrice'                        => options[:spot_price],
                        'LaunchSpecification.ImageId'      => options[:image_id],
                        'LaunchSpecification.InstanceType' => options[:instance_type]}
-      request_hash['ValidFrom']                      = AwsUtils::utc_iso8601(options[:valid_from])  unless options[:valid_from].blank?
-      request_hash['ValidUntil']                     = AwsUtils::utc_iso8601(options[:valid_until]) unless options[:valid_until].blank?
-      request_hash['InstanceCount']                      = options[:instance_count]                 unless options[:instance_count].blank?
-      request_hash['Type']                               = options[:type]                           unless options[:type].blank?
-      request_hash['LaunchGroup']                        = options[:launch_group]                   unless options[:launch_group].blank?
-      request_hash['AvailabilityZoneGroup']              = options[:availability_zone_group]        unless options[:availability_zone_group].blank?
-      request_hash['LaunchSpecification.KeyName']        = options[:key_name]                       unless options[:key_name].blank?
-      request_hash['LaunchSpecification.AddressingType'] = options[:addressing_type]                unless options[:addressing_type].blank?
-      request_hash['LaunchSpecification.KernelId']       = options[:kernel_id]                      unless options[:kernel_id].blank?
-      request_hash['LaunchSpecification.RamdiskId']      = options[:ramdisk_id]                     unless options[:ramdisk_id].blank?
-      request_hash['LaunchSpecification.SubnetId']       = options[:subnet_id]                      unless options[:subnet_id].blank?
-      request_hash['LaunchSpecification.Placement.AvailabilityZone'] = options[:availability_zone]  unless options[:availability_zone].blank?
-      request_hash['LaunchSpecification.Monitoring.Enabled']         = options[:monitoring_enabled] unless options[:monitoring_enabled].blank?
-      request_hash.merge!(amazonize_list('LaunchSpecification.SecurityGroup', options[:groups]))    unless options[:groups].blank?
+      request_hash['ValidFrom']                      = AwsUtils::utc_iso8601(options[:valid_from])  unless options[:valid_from].right_blank?
+      request_hash['ValidUntil']                     = AwsUtils::utc_iso8601(options[:valid_until]) unless options[:valid_until].right_blank?
+      request_hash['InstanceCount']                      = options[:instance_count]                 unless options[:instance_count].right_blank?
+      request_hash['Type']                               = options[:type]                           unless options[:type].right_blank?
+      request_hash['LaunchGroup']                        = options[:launch_group]                   unless options[:launch_group].right_blank?
+      request_hash['AvailabilityZoneGroup']              = options[:availability_zone_group]        unless options[:availability_zone_group].right_blank?
+      request_hash['LaunchSpecification.KeyName']        = options[:key_name]                       unless options[:key_name].right_blank?
+      request_hash['LaunchSpecification.AddressingType'] = options[:addressing_type]                unless options[:addressing_type].right_blank?
+      request_hash['LaunchSpecification.KernelId']       = options[:kernel_id]                      unless options[:kernel_id].right_blank?
+      request_hash['LaunchSpecification.RamdiskId']      = options[:ramdisk_id]                     unless options[:ramdisk_id].right_blank?
+      request_hash['LaunchSpecification.SubnetId']       = options[:subnet_id]                      unless options[:subnet_id].right_blank?
+      request_hash['LaunchSpecification.Placement.AvailabilityZone'] = options[:availability_zone]  unless options[:availability_zone].right_blank?
+      request_hash['LaunchSpecification.Monitoring.Enabled']         = options[:monitoring_enabled] unless options[:monitoring_enabled].right_blank?
+      request_hash.merge!(amazonize_list('LaunchSpecification.SecurityGroup', options[:groups]))    unless options[:groups].right_blank?
       request_hash.merge!(amazonize_block_device_mappings(options[:block_device_mappings], 'LaunchSpecification.BlockDeviceMapping'))
-      unless options[:user_data].blank?
+      unless options[:user_data].right_blank?
         # See RightAws::Ec2#run_instances
         options[:user_data].strip!
-        request_hash['LaunchSpecification.UserData'] = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].blank?
+        request_hash['LaunchSpecification.UserData'] = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].right_blank?
       end
       link = generate_request("RequestSpotInstances", request_hash)
       request_info(link, QEc2DescribeSpotInstanceParser.new(:logger => @logger))
@@ -253,7 +275,7 @@ module RightAws
     #
     def create_spot_datafeed_subscription(bucket, prefix=nil)
       request_hash = { 'Bucket' => bucket }
-      request_hash['Prefix'] = prefix unless prefix.blank?
+      request_hash['Prefix'] = prefix unless prefix.right_blank?
       link = generate_request("CreateSpotDatafeedSubscription", request_hash)
       request_info(link, QEc2DescribeSpotDatafeedSubscriptionParser.new(:logger => @logger))
     end
@@ -306,10 +328,12 @@ module RightAws
       def tagstart(name, attributes)
         case full_tag_name
         when %r{spotInstanceRequestSet/item$}
-          @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)
@@ -351,8 +375,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{spotInstanceRequestSet/item$}
-            @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{spotInstanceRequestSet/item$} then @result << @item
           end
         end
       end