right_aws 2.0.0 → 2.1.0

data/lib/acf/right_acf_invalidations.rb

@@ -0,0 +1,144 @@
+#
+# Copyright (c) 2010 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module RightAws
+
+  class AcfInterface
+
+    # List Invalidations
+    # 
+    #  acf.list_invalidations('E3LTBMK4EAQS7D') #=>
+    #    [{:status=>"InProgress", :aws_id=>"I3AW9PPQS0CBKV"},
+    #     {:status=>"InProgress", :aws_id=>"I1HV23N5KD3XH9"}]
+    #
+    def list_invalidations(distribution_aws_id)
+      result = []
+      incrementally_list_invalidations(distribution_aws_id) do |response|
+        result += response[:invalidations]
+        true
+      end
+      result
+    end
+
+    # Incrementally list Invalidations.
+    # Optional params: +:marker+ and +:max_items+.
+    #
+    def incrementally_list_invalidations(distribution_aws_id, params={}, &block)
+      opts = {}
+      opts['MaxItems'] = params[:max_items] if params[:max_items]
+      opts['Marker']   = params[:marker]    if params[:marker]
+      last_response = nil
+      loop do
+        link = generate_request('GET', "distribution/#{distribution_aws_id}/invalidation", opts)
+        last_response = request_info(link,  AcfInvalidationsListParser.new(:logger => @logger))
+        opts['Marker'] = last_response[:next_marker]
+        break unless block && block.call(last_response) && !last_response[:next_marker].right_blank?
+      end
+      last_response
+    end
+
+    #-----------------------------------------------------------------
+    #      Origin Access Identity
+    #-----------------------------------------------------------------
+
+    # Create a new Invalidation batch.
+    #
+    #  acf.create_invalidation('E3LTBMK4EAQS7D', :path => ['/boot.jpg', '/kd/boot.public.1.jpg']) #=>
+    #    {:status=>"InProgress",
+    #     :create_time=>"2010-12-08T14:03:38.449Z",
+    #     :location=> "https://cloudfront.amazonaws.com/2010-11-01/distribution/E3LTBMK4EAQS7D/invalidation/I3AW9PPQS0CBKV",
+    #     :aws_id=>"I3AW9PPQS0CBKV",
+    #     :invalidation_batch=>
+    #      {:caller_reference=>"201012081703372555972012",
+    #       :path=>["/boot.jpg", "/kd/boot.public.1.jpg"]}}
+    #
+    def create_invalidation(distribution_aws_id, invalidation_batch)
+      invalidation_batch[:caller_reference] ||= generate_call_reference
+      link = generate_request('POST', "/distribution/#{distribution_aws_id}/invalidation", {}, invalidation_batch_to_xml(invalidation_batch))
+      merge_headers(request_info(link, AcfInvalidationsListParser.new(:logger => @logger))[:invalidations].first)
+    end
+
+    # Get Invalidation
+    #
+    #  acf.get_invalidation('E3LTBMK4EAQS7D', 'I3AW9PPQS0CBKV') #=>
+    #    {:create_time=>"2010-12-08T14:03:38.449Z",
+    #     :status=>"InProgress",
+    #     :aws_id=>"I3AW9PPQS0CBKV",
+    #     :invalidation_batch=>
+    #      {:caller_reference=>"201012081703372555972012",
+    #       :path=>["/boot.jpg", "/kd/boot.public.1.jpg"]}}
+    #
+    def get_invalidation(distribution_aws_id, aws_id)
+      link = generate_request('GET', "distribution/#{distribution_aws_id}/invalidation/#{aws_id}")
+      merge_headers(request_info(link, AcfInvalidationsListParser.new(:logger => @logger))[:invalidations].first)
+    end
+
+    #-----------------------------------------------------------------
+    #      Batch
+    #-----------------------------------------------------------------
+
+    def invalidation_batch_to_xml(invalidation_batch) # :nodoc:
+      paths = ''
+      Array(invalidation_batch[:path]).each do |path|
+        paths << "  <Path>#{AwsUtils::xml_escape(path)}</Path>\n"
+      end
+      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+      "<InvalidationBatch xmlns=\"http://#{@params[:server]}/doc/#{API_VERSION}/\">\n" +
+      "  <CallerReference>#{invalidation_batch[:caller_reference]}</CallerReference>\n" +
+      paths +
+      "</InvalidationBatch>"
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS:
+    #-----------------------------------------------------------------
+
+    class AcfInvalidationsListParser < RightAWSParser # :nodoc:
+      def reset
+        @result = { :invalidations => [] }
+      end
+      def tagstart(name, attributes)
+        case name
+        when %r{(InvalidationSummary|Invalidation)$} then @item = {}
+        when %r{InvalidationBatch}                   then @item[:invalidation_batch] = {}
+        end
+      end
+      def tagend(name)
+        case name
+        when 'Marker'      then @result[:marker]       = @text
+        when 'NextMarker'  then @result[:next_marker]  = @text
+        when 'MaxItems'    then @result[:max_items]    = @text.to_i
+        when 'IsTruncated' then @result[:is_truncated] = (@text == 'true')
+        when 'Id'              then @item[:aws_id]                                = @text
+        when 'Status'          then @item[:status]                                = @text
+        when 'CreateTime'      then @item[:create_time]                           = @text
+        when 'Path'            then (@item[:invalidation_batch][:path] ||= [])   << @text
+        when 'CallerReference' then @item[:invalidation_batch][:caller_reference] = @text
+        when %r{(InvalidationSummary|Invalidation)$}
+          @item[:invalidation_batch][:path].sort! if @item[:invalidation_batch] && !@item[:invalidation_batch][:path].right_blank?
+          @result[:invalidations] << @item
+        end
+      end
+    end
+
+  end
+end

data/lib/acf/right_acf_origin_access_identities.rb

@@ -85,7 +85,7 @@ module RightAws
         link = generate_request('GET', 'origin-access-identity/cloudfront', opts)
         last_response = request_info(link,  AcfOriginAccesIdentitiesListParser.new(:logger => @logger))
         opts['Marker'] = last_response[:next_marker]
-        break unless block && block.call(last_response) && !last_response[:next_marker].blank?
+        break unless block && block.call(last_response) && !last_response[:next_marker].right_blank?
       end
       last_response
     end
@@ -159,7 +159,7 @@ module RightAws
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
       "<CloudFrontOriginAccessIdentityConfig xmlns=\"http://#{@params[:server]}/doc/#{API_VERSION}/\">\n" +
       "  <CallerReference>#{config[:caller_reference]}</CallerReference>\n" +
-      "  <Comment>#{AcfInterface::escape(config[:comment].to_s)}</Comment>\n" +
+      "  <Comment>#{AwsUtils::xml_escape(config[:comment].to_s)}</Comment>\n" +
       "</CloudFrontOriginAccessIdentityConfig>"
     end
 
@@ -214,8 +214,8 @@ module RightAws
         when 'IsTruncated'       then @result[:is_truncated] = (@text == 'true')
         when 'Id'                then @item[:aws_id]               = @text
         when 'S3CanonicalUserId' then @item[:s3_canonical_user_id] = @text
-        when 'CallerReference'   then @item[:caller_reference] = @text
-        when 'Comment'           then @item[:comment]              = AcfInterface::unescape(@text)
+        when 'CallerReference'   then @item[:caller_reference]     = @text
+        when 'Comment'           then @item[:comment]              = AwsUtils::xml_unescape(@text)
         end
         case full_tag_name
         when %r{CloudFrontOriginAccessIdentitySummary$},

data/lib/acf/right_acf_streaming_interface.rb

@@ -40,7 +40,7 @@ module RightAws
     #      :aws_id=>"E3CWE2Z9USOS6B",
     #      :enabled=>true,
     #      :domain_name=>"s2jz1ourvss1fj.cloudfront.net",
-    #      :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #      :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #      :last_modified_time=>"2010-04-19T08:53:32.574Z",
     #      :comment=>"Woo-Hoo!",
     #      :cnames=>["stream.web.my-awesome-site.net"]},
@@ -49,7 +49,7 @@ module RightAws
     #      :aws_id=>"E3NPQZY4LKAYQ8",
     #      :enabled=>true,
     #      :domain_name=>"sw9nrsq9pudk3.cloudfront.net",
-    #      :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #      :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #      :last_modified_time=>"2010-04-19T08:59:09.600Z",
     #      :comment=>"Woo-Hoo!",
     #      :cnames=>["stream-6.web.my-awesome-site.net"]}]
@@ -78,7 +78,7 @@ module RightAws
     #        :enabled=>true,
     #        :last_modified_time=>"2010-04-19T08:53:32.574Z",
     #        :domain_name=>"s2jz1ourvss1fj.cloudfront.net",
-    #        :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #        :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #        :comment=>"Woo-Hoo!"}],
     #     :max_items=>1,
     #     :is_truncated=>true}
@@ -101,7 +101,7 @@ module RightAws
         link = generate_request('GET', 'streaming-distribution', opts)
         last_response = request_info(link,  AcfDistributionListParser.new(:logger => @logger))
         opts['Marker'] = last_response[:next_marker]
-        break unless block && block.call(last_response) && !last_response[:next_marker].blank?
+        break unless block && block.call(last_response) && !last_response[:next_marker].right_blank?
       end
       last_response
     end
@@ -118,26 +118,18 @@ module RightAws
     #     :e_tag=>"E2588L5QL4BLXH",
     #     :enabled=>true,
     #     :domain_name=>"s1di8imd85wgld.cloudfront.net",
-    #     :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #     :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #     :last_modified_time=>Mon Apr 19 08:54:42 UTC 2010,
     #     :location=>
     #      "https://cloudfront.amazonaws.com/streaming-distribution/E1M5LERJLU636F",
     #     :comment=>"Woo-Hoo!"}
     #
-    def create_streaming_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil)
-      config = { :origin  => origin,
-                 :comment => comment,
-                 :enabled => enabled,
-                 :cnames  => Array(cnames),
-                 :caller_reference => caller_reference }
-      create_streaming_distribution_by_config(config)
-    end
-
-    def create_streaming_distribution_by_config(config)
+    def create_streaming_distribution(config)
       config[:caller_reference] ||= generate_call_reference
       link = generate_request('POST', 'streaming-distribution', {}, streaming_distribution_config_to_xml(config))
       merge_headers(request_info(link, AcfDistributionListParser.new(:logger => @logger))[:distributions].first)
     end
+    alias_method :create_streaming_distribution_by_config, :create_streaming_distribution
 
     # Get a streaming distribution's information.
     # Returns a distribution's information or RightAws::AwsError exception.
@@ -149,7 +141,7 @@ module RightAws
     #     :aws_id=>"E3CWE2Z9USOS6B",
     #     :enabled=>true,
     #     :domain_name=>"s2jz1ourvss1fj.cloudfront.net",
-    #     :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #     :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #     :last_modified_time=>"2010-04-19T08:53:32.574Z",
     #     :comment=>"Woo-Hoo!",
     #     :caller_reference=>"201004191253311625537161"}
@@ -167,10 +159,11 @@ module RightAws
     #     :aws_id=>"E1M5LERJLU636F",
     #     :enabled=>false,
     #     :domain_name=>"s1di8imd85wgld.cloudfront.net",
-    #     :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #     :s3_origin=> {
+    #       :dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #       :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G"},
     #     :last_modified_time=>"2010-04-19T09:14:07.160Z",
     #     :comment=>"Olah-lah!",
-    #     :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G",
     #     :caller_reference=>"201004191254412191173215"}
     #
     def get_streaming_distribution(aws_id)
@@ -186,9 +179,10 @@ module RightAws
     #     :e_tag=>"E2K6XD13RCJQ6E",
     #     :cnames=>["stream-1.web.my-awesome-site.net"],
     #     :enabled=>false,
-    #     :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #     :s3_origin=> {
+    #       :dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #       :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G",},
     #     :comment=>"Olah-lah!",
-    #     :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G",
     #     :caller_reference=>"201004191254412191173215"}
     #
     def get_streaming_distribution_config(aws_id)
@@ -197,21 +191,20 @@ module RightAws
     end
 
     # Set a streaming distribution's configuration
-    # (the :origin and the :caller_reference cannot be changed).
     # Returns +true+ on success or RightAws::AwsError exception.
     #
     #  acf.get_streaming_distribution_config('E1M5LERJLU636F') #=>
     #    {:e_tag=>"E2588L5QL4BLXH",
     #     :cnames=>["stream-1.web.my-awesome-site.net"],
     #     :enabled=>true,
-    #     :origin=>"bucket-for-konstantin-00.s3.amazonaws.com",
+    #     :s3_origin=> {:dns_name=>"bucket-for-konstantin-00.s3.amazonaws.com"},
     #     :comment=>"Woo-Hoo!",
     #     :caller_reference=>"201004191254412191173215"}
     #
-    #  config[:comment]                = 'Olah-lah!'
-    #  config[:enabled]                = false
-    #  config[:origin_access_identity] = "origin-access-identity/cloudfront/E3JPJZ80ZBX24G"
-    #  config[:trusted_signers]        = ['self', '648772220000', '120288270000']
+    #  config[:comment]                            = 'Olah-lah!'
+    #  config[:enabled]                            = false
+    #  config[:s3_origin][:origin_access_identity] = "origin-access-identity/cloudfront/E3JPJZ80ZBX24G"
+    #  config[:trusted_signers]                    = ['self', '648772220000', '120288270000']
     #
     #  acf.set_distribution_config('E2REJM3VUN5RSI', config) #=> true
     #

data/lib/acw/right_acw_interface.rb

@@ -54,7 +54,6 @@ module RightAws
     # * <tt>:server</tt>: ACW service host, default: DEFAULT_HOST
     # * <tt>:port</tt>: ACW 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(default): list_metrics
@@ -145,7 +144,7 @@ module RightAws
       period = (options[:period] && options[:period].to_i) || 60
       # Statistics ('Average' by default)
       statistics = Array(options[:statistics]).flatten
-      statistics = statistics.blank? ? ['Average'] : statistics.map{|statistic| statistic.to_s.capitalize }
+      statistics = statistics.right_blank? ? ['Average'] : statistics.map{|statistic| statistic.to_s.capitalize }
       # Times (5.min.ago up to now by default)
       start_time = options[:start_time] || (Time.now.utc - 5*60)
       start_time = start_time.utc.strftime("%Y-%m-%dT%H:%M:%S+00:00") if start_time.is_a?(Time)

data/lib/as/right_as_interface.rb

@@ -95,7 +95,6 @@ module RightAws
     # * <tt>:server</tt>: AS service host, default: DEFAULT_HOST
     # * <tt>:port</tt>: AS 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(default): describe_auto_scaling_groups
@@ -136,7 +135,7 @@ module RightAws
       auto_scaling_group_names = auto_scaling_group_names.flatten.compact
       request_hash = amazonize_list('AutoScalingGroupNames.member', auto_scaling_group_names)
       link = generate_request("DescribeAutoScalingGroups", request_hash)
-      request_cache_or_info(:describe_auto_scaling_groups, link,  DescribeAutoScalingGroupsParser, @@bench, auto_scaling_group_names.blank?)
+      request_cache_or_info(:describe_auto_scaling_groups, link,  DescribeAutoScalingGroupsParser, @@bench, auto_scaling_group_names.right_blank?)
     end
 
     # Creates a new auto scaling group with the specified name.
@@ -154,7 +153,7 @@ module RightAws
       options[:max_size] ||= 20
       options[:cooldown] ||= 0
       request_hash = amazonize_list('AvailabilityZones.member', availability_zones)
-      request_hash.merge!( amazonize_list('LoadBalancerNames', options[:load_balancer_names]) )
+      request_hash.merge!( amazonize_list('LoadBalancerNames.member', options[:load_balancer_names]) )
       request_hash.merge!( 'AutoScalingGroupName'    => auto_scaling_group_name,
                            'LaunchConfigurationName' => launch_configuration_name,
                            'MinSize'                 => options[:min_size],
@@ -302,7 +301,7 @@ module RightAws
         link = generate_request("DescribeScalingActivities", request_hash)
         last_response = request_info( link,  DescribeScalingActivitiesParser.new(:logger => @logger))
         request_hash['NextToken'] = last_response[:next_token]
-        break unless block && block.call(last_response) && !last_response[:next_token].blank?
+        break unless block && block.call(last_response) && !last_response[:next_token].right_blank?
       end
       last_response
     end
@@ -355,10 +354,10 @@ module RightAws
       request_hash = { 'LaunchConfigurationName' => launch_configuration_name,
                        'ImageId'                 => image_id,
                        'InstanceType'            => instance_type }
-      request_hash.merge!(amazonize_list('SecurityGroups.member',      options[:security_groups]))       unless options[:security_groups].blank?
+      request_hash.merge!(amazonize_list('SecurityGroups.member',      options[:security_groups]))       unless options[:security_groups].right_blank?
       request_hash.merge!(amazonize_block_device_mappings(options[:block_device_mappings], 'BlockDeviceMappings.member'))
       request_hash['KeyName']   = options[:key_name]   if options[:key_name]
-      request_hash['UserData']  = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].blank? if options[:user_data]
+      request_hash['UserData']  = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].right_blank? if options[:user_data]
       request_hash['KernelId']  = options[:kernel_id]  if options[:kernel_id]
       request_hash['RamdiskId'] = options[:ramdisk_id] if options[:ramdisk_id]
       link = generate_request("CreateLaunchConfiguration", request_hash)
@@ -428,7 +427,7 @@ module RightAws
         link = generate_request("DescribeLaunchConfigurations", request_hash)
         last_response = request_info( link, DescribeLaunchConfigurationsParser.new(:logger => @logger) )
         request_hash['NextToken'] = last_response[:next_token]
-        break unless block && block.call(last_response) && !last_response[:next_token].blank?
+        break unless block && block.call(last_response) && !last_response[:next_token].right_blank?
       end
       last_response
     end

data/lib/awsbase/right_awsbase.rb

@@ -23,7 +23,6 @@
 
 # Test
 module RightAws
-#  require 'md5'
   require 'digest/md5'
   require 'pp'
   
@@ -53,6 +52,14 @@ module RightAws
       end
     end
 
+    def self.xml_escape(text) # :nodoc:
+      REXML::Text::normalize(text)
+    end
+
+    def self.xml_unescape(text) # :nodoc:
+      REXML::Text::unnormalize(text)
+    end
+
     # Set a timestamp and a signature version
     def self.fix_service_params(service_hash, signature)
       service_hash["Timestamp"] ||= utc_iso8601(Time.now) unless service_hash["Expires"]
@@ -136,6 +143,20 @@ module RightAws
       params = items.last.kind_of?(Hash) ? items.pop : {}
       [items, params]
     end
+
+    # Generates a token in format of:
+    #  1. "1dd8d4e4-db6b-11df-b31d-0025b37efad0 (if UUID gem is loaded)
+    #  2. "1287483761-855215-zSv2z-bWGj2-31M5t-ags9m" (if UUID gem is not loaded)
+    TOKEN_GENERATOR_CHARSET = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
+    def self.generate_unique_token
+      time  = Time.now
+      token = "%d-%06d" % [time.to_i, time.usec]
+      4.times do
+        token << "-"
+        5.times { token << TOKEN_GENERATOR_CHARSET[rand(TOKEN_GENERATOR_CHARSET.size)] }
+      end
+      token
+    end
   end
 
   class AwsBenchmarkingBlock #:nodoc:
@@ -181,7 +202,31 @@ module RightAws
     def self.amazon_problems=(problems_list)
       @@amazon_problems = problems_list
     end
-    
+
+    # Raise an exception if a timeout occures while an API call is in progress.
+    # This helps to avoid a duplicate resources creation when Amazon hangs for some time and
+    # RightHttpConnection is forced to use retries to get a response from it.
+    #
+    # If an API call action is in the list then no attempts to retry are performed.
+    #
+    RAISE_ON_TIMEOUT_ON_ACTIONS = %w{ 
+      AllocateAddress
+      CreateSnapshot
+      CreateVolume
+      PurchaseReservedInstancesOffering
+      RequestSpotInstances
+      RunInstances
+    }
+    @@raise_on_timeout_on_actions = RAISE_ON_TIMEOUT_ON_ACTIONS.dup
+
+    def self.raise_on_timeout_on_actions
+      @@raise_on_timeout_on_actions
+    end
+
+    def self.raise_on_timeout_on_actions=(actions_list)
+      @@raise_on_timeout_on_actions = actions_list
+    end
+
   end
 
   module RightAwsBaseInterface
@@ -222,9 +267,9 @@ module RightAws
       @params = params
       # If one defines EC2_URL he may forget to use a single slash as an "empty service" path.
       # Amazon does not like this therefore add this bad boy if he is missing...
-      service_info[:default_service] = '/' if service_info[:default_service].blank?
+      service_info[:default_service] = '/' if service_info[:default_service].right_blank?
       raise AwsError.new("AWS access keys are required to operate on #{service_info[:name]}") \
-        if aws_access_key_id.blank? || aws_secret_access_key.blank?
+        if aws_access_key_id.right_blank? || aws_secret_access_key.right_blank?
       @aws_access_key_id     = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
       # if the endpoint was explicitly defined - then use it
@@ -233,7 +278,7 @@ module RightAws
         @params[:port]     = URI.parse(@params[:endpoint_url]).port
         @params[:service]  = URI.parse(@params[:endpoint_url]).path
         # make sure the 'service' path is not empty
-        @params[:service]  = service_info[:default_service] if @params[:service].blank?
+        @params[:service]  = service_info[:default_service] if @params[:service].right_blank?
         @params[:protocol] = URI.parse(@params[:endpoint_url]).scheme
         @params[:region]   = nil
       else
@@ -243,12 +288,15 @@ module RightAws
         @params[:service]  ||= service_info[:default_service]
         @params[:protocol] ||= service_info[:default_protocol]
       end
-#      @params[:multi_thread] ||= defined?(AWS_DAEMON)
+      # a set of options to be passed to RightHttpConnection object
+      @params[:connection_options] = {} unless @params[:connection_options].is_a?(Hash) 
+      @with_connection_options = {}
       @params[:connections] ||= :shared # || :dedicated
       @params[:max_connections] ||= 10
       @params[:connection_lifetime] ||= 20*60
       @params[:api_version]  ||= service_info[:default_api_version]
       @logger = @params[:logger]
+      @logger = ::Rails.logger       if !@logger && defined?(::Rails) && ::Rails.respond_to?(:logger)
       @logger = RAILS_DEFAULT_LOGGER if !@logger && defined?(RAILS_DEFAULT_LOGGER)
       @logger = Logger.new(STDOUT)   if !@logger
       @logger.info "New #{self.class.name} using #{@params[:connections]} connections mode"
@@ -314,11 +362,57 @@ module RightAws
       raise if $!.is_a?(AwsNoChange)
       AwsError::on_aws_exception(self, options)
     end
-    
-#      # Return +true+ if this instance works in multi_thread mode and +false+ otherwise.
-#    def multi_thread
-#      @params[:multi_thread]
-#    end
+
+    #----------------------------
+    # HTTP Connections handling
+    #----------------------------
+
+    def get_server_url(request) # :nodoc:
+      "#{request[:protocol]}://#{request[:server]}:#{request[:port]}"
+    end
+
+    def get_connections_storage(aws_service) # :nodoc:
+      case @params[:connections].to_s
+      when 'dedicated' then @connections_storage        ||= {}
+      else                  Thread.current[aws_service] ||= {}
+      end
+    end
+
+    def destroy_connection(request, reason) # :nodoc:
+      connections = get_connections_storage(request[:aws_service])
+      server_url  = get_server_url(request)
+      if connections[server_url]
+        connections[server_url][:connection].finish(reason)
+        connections.delete(server_url)
+      end
+    end
+
+    # Expire the connection if it has expired.
+    def get_connection(request) # :nodoc:
+      server_url         = get_server_url(request)
+      connection_storage = get_connections_storage(request[:aws_service])
+      life_time_scratch  = Time.now-@params[:connection_lifetime]
+      # Delete out-of-dated connections
+      connections_in_list = 0
+      connection_storage.to_a.sort{|conn1, conn2| conn2[1][:last_used_at] <=> conn1[1][:last_used_at]}.each do |serv_url, conn_opts|
+        if    @params[:max_connections] <= connections_in_list
+          conn_opts[:connection].finish('out-of-limit')
+          connection_storage.delete(server_url)
+        elsif conn_opts[:last_used_at] < life_time_scratch
+          conn_opts[:connection].finish('out-of-date')
+          connection_storage.delete(server_url)
+        else
+          connections_in_list += 1
+        end
+      end
+      connection = (connection_storage[server_url] ||= {})
+      connection[:last_used_at] = Time.now
+      connection[:connection] ||= Rightscale::HttpConnection.new(:exception => RightAws::AwsError, :logger => @logger)
+    end
+
+    #----------------------------
+    # HTTP Requests handling
+    #----------------------------
 
     # ACF, AMS, EC2, LBS and SDB uses this guy
     # SQS and S3 use their own methods
@@ -354,43 +448,26 @@ module RightAws
         raise "Unsupported HTTP verb #{verb.inspect}!"
       end
       # prepare output hash
-      { :request  => request,
-        :server   => @params[:server],
-        :port     => @params[:port],
-        :protocol => @params[:protocol] }
-    end
-
-    def get_connection(aws_service, request) #:nodoc
-      server_url = "#{request[:protocol]}://#{request[:server]}:#{request[:port]}}"
-      #
-      case @params[:connections].to_s
-      when 'dedicated'
-        @connections_storage ||= {}
-      else # 'dedicated'
-        @connections_storage = (Thread.current[aws_service] ||= {})
-      end
-      #
-      @connections_storage[server_url] ||= {}
-      @connections_storage[server_url][:last_used_at] = Time.now
-      @connections_storage[server_url][:connection] ||= Rightscale::HttpConnection.new(:exception => RightAws::AwsError, :logger => @logger)
-      # keep X most recent connections (but were used not far than Y minutes ago)
-      connections = 0
-      @connections_storage.to_a.sort{|i1, i2| i2[1][:last_used_at] <=> i1[1][:last_used_at]}.to_a.each do |i|
-        if i[0] != server_url && (@params[:max_connections] <= connections  || i[1][:last_used_at] < Time.now - @params[:connection_lifetime])
-          # delete the connection from the list
-          @connections_storage.delete(i[0])
-          # then finish it
-          i[1][:connection].finish((@params[:max_connections] <= connections) ? "out-of-limit" : "out-of-date") rescue nil
-        else
-          connections += 1
-        end
+      request_hash = { :request  => request,
+                       :server   => @params[:server],
+                       :port     => @params[:port],
+                       :protocol => @params[:protocol] }
+      request_hash.merge!(@params[:connection_options])
+      request_hash.merge!(@with_connection_options)
+      
+      # If an action is marked as "non-retryable" and there was no :raise_on_timeout option set
+      # explicitly then do set that option
+      if Array(RightAwsBase::raise_on_timeout_on_actions).include?(action) && !request_hash.has_key?(:raise_on_timeout)
+        request_hash.merge!(:raise_on_timeout => true)
       end
-      @connections_storage[server_url][:connection]
+
+      request_hash
     end
 
     # All services uses this guy.
     def request_info_impl(aws_service, benchblock, request, parser, &block) #:nodoc:
-      @connection    = get_connection(aws_service, request)
+      request[:aws_service] = aws_service
+      @connection    = get_connection(request)
       @last_request  = request[:request]
       @last_response = nil
       response = nil
@@ -405,25 +482,31 @@ module RightAws
         # Exceptions can originate from code directly in the block, or from user
         # code called in the other block which is passed to response.read_body.
         benchblock.service.add! do
-          responsehdr = @connection.request(request) do |response|
-          #########
-            begin
-              @last_response = response
-              if response.is_a?(Net::HTTPSuccess)
-                @error_handler = nil
-                response.read_body(&block)
-              else
-                @error_handler = AWSErrorHandler.new(self, parser, :errors_list => self.class.amazon_problems) unless @error_handler
-                check_result   = @error_handler.check(request)
-                if check_result
+          begin
+            responsehdr = @connection.request(request) do |response|
+            #########
+              begin
+                @last_response = response
+                if response.is_a?(Net::HTTPSuccess)
                   @error_handler = nil
-                  return check_result 
+                  response.read_body(&block)
+                else
+                  @error_handler = AWSErrorHandler.new(self, parser, :errors_list => self.class.amazon_problems) unless @error_handler
+                  check_result   = @error_handler.check(request)
+                  if check_result
+                    @error_handler = nil
+                    return check_result
+                  end
+                  raise AwsError.new(@last_errors, @last_response.code, @last_request_id)
                 end
-                raise AwsError.new(@last_errors, @last_response.code, @last_request_id)
+              rescue Exception => e
+                blockexception = e
               end
-            rescue Exception => e
-              blockexception = e
             end
+          rescue Exception => e
+            # Kill a connection if we run into a low level connection error
+            destroy_connection(request, "error: #{e.message}")
+            raise e
           end
           #########
 
@@ -437,7 +520,15 @@ module RightAws
           return parser.result
         end
       else
-        benchblock.service.add!{ response = @connection.request(request) }
+        benchblock.service.add! do
+          begin
+            response = @connection.request(request)
+          rescue Exception => e
+            # Kill a connection if we run into a low level connection error
+            destroy_connection(request, "error: #{e.message}")
+            raise e
+          end
+        end
           # check response for errors...
         @last_response = response
         if response.is_a?(Net::HTTPSuccess)
@@ -459,7 +550,7 @@ module RightAws
       raise
     end
 
-    def request_cache_or_info(method, link, parser_class, benchblock, use_cache=true) #:nodoc:
+    def request_cache_or_info(method, link, parser_class, benchblock, use_cache=true, &block) #:nodoc:
       # We do not want to break the logic of parsing hence will use a dummy parser to process all the standard
       # steps (errors checking etc). The dummy parser does nothig - just returns back the params it received.
       # If the caching is enabled and hit then throw  AwsNoChange.
@@ -469,7 +560,7 @@ module RightAws
       cache_hits?(method.to_sym, response.body) if use_cache
       parser = parser_class.new(:logger => @logger)
       benchblock.xml.add!{ parser.parse(response, params) }
-      result = block_given? ? yield(parser) : parser.result
+      result = block ? block.call(parser) : parser.result
       # update parsed data
       update_cache(method.to_sym, :parsed => result) if use_cache
       result
@@ -480,7 +571,24 @@ module RightAws
       @last_response && @last_response.body.to_s[%r{<requestId>(.+?)</requestId>}i] && $1
     end
 
+    # Incrementally lists something.
+    def incrementally_list_items(action, parser_class, params={}, &block) # :nodoc:
+      params = params.dup
+      params['MaxItems'] = params.delete(:max_items) if params[:max_items]
+      params['Marker']   = params.delete(:marker)    if params[:marker]
+      last_response = nil
+      loop do
+        last_response    = request_info( generate_request(action, params), parser_class.new(:logger => @logger))
+        params['Marker'] = last_response[:marker]
+        break unless block && block.call(last_response) && !last_response[:marker].right_blank?
+      end
+      last_response
+    end
+
     # Format array of items into Amazons handy hash ('?' is a place holder):
+    # Options:
+    #   :default => "something"   : Set a value to "something" when it is nil
+    #   :default => :skip_nils    : Skip nil values
     #
     #  amazonize_list('Item', ['a', 'b', 'c']) =>
     #    { 'Item.1' => 'a', 'Item.2' => 'b', 'Item.3' => 'c' }
@@ -504,7 +612,7 @@ module RightAws
     #     "Filter.2.Key"=>"B",
     #     "Filter.2.Value.1"=>"ba",
     #     "Filter.2.Value.2"=>"bb"}
-    def amazonize_list(masks, list) #:nodoc:
+    def amazonize_list(masks, list, options={}) #:nodoc:
       groups = {}
       Array(list).each_with_index do |list_item, i|
         Array(masks).each_with_index do |mask, mask_idx|
@@ -512,8 +620,16 @@ module RightAws
           key.sub!('?', (i+1).to_s)
           value = Array(list_item)[mask_idx]
           if value.is_a?(Array)
-            groups.merge!(amazonize_list(key, value))
+            groups.merge!(amazonize_list(key, value, options))
           else
+            if value.nil?
+              next if options[:default] == :skip_nils
+              value = options[:default]
+            end
+            # Hack to avoid having unhandled '?' in keys : do replace them all with '1':
+            #  bad:  ec2.amazonize_list(['Filter.?.Key', 'Filter.?.Value.?'], { a: => :b }) => {"Filter.1.Key"=>:a, "Filter.1.Value.?"=>1}
+            #  good: ec2.amazonize_list(['Filter.?.Key', 'Filter.?.Value.?'], { a: => :b }) => {"Filter.1.Key"=>:a, "Filter.1.Value.1"=>1}
+            key.gsub!('?', '1')
             groups[key] = value
           end
         end
@@ -531,7 +647,7 @@ module RightAws
 
     def amazonize_block_device_mappings(block_device_mappings, key = 'BlockDeviceMapping') # :nodoc:
       result = {}
-      unless block_device_mappings.blank?
+      unless block_device_mappings.right_blank?
         block_device_mappings = [block_device_mappings] unless block_device_mappings.is_a?(Array)
         block_device_mappings.each_with_index do |b, idx|
           BLOCK_DEVICE_KEY_MAPPING.each do |local_name, remote_name|
@@ -546,6 +662,64 @@ module RightAws
       result
     end
 
+    # Execute a block of code with custom set of settings for right_http_connection.
+    # Accepts next options (see Rightscale::HttpConnection for explanation):
+    #  :raise_on_timeout
+    #  :http_connection_retry_count
+    #  :http_connection_open_timeout
+    #  :http_connection_read_timeout
+    #  :http_connection_retry_delay
+    #  :user_agent
+    #  :exception
+    #
+    #  Example #1:
+    #
+    #  # Try to create a snapshot but stop with exception if timeout is received
+    #  # to avoid having a duplicate API calls that create duplicate snapshots.
+    #  ec2 = Rightscale::Ec2::new(aws_access_key_id, aws_secret_access_key)
+    #  ec2.with_connection_options(:raise_on_timeout => true) do
+    #    ec2.create_snapshot('vol-898a6fe0', 'KD: WooHoo!!')
+    #  end
+    #
+    #  Example #2:
+    #
+    #  # Opposite case when the setting is global:
+    #  @ec2 = Rightscale::Ec2::new(aws_access_key_id, aws_secret_access_key,
+    #                           :connection_options => { :raise_on_timeout => true })
+    #  # Create an SSHKey but do tries on timeout
+    #  ec2.with_connection_options(:raise_on_timeout => false) do
+    #    new_key = ec2.create_key_pair('my_test_key')
+    #  end
+    #
+    #  Example #3:
+    #
+    #  # Global settings (HttpConnection level):
+    #  Rightscale::HttpConnection::params[:http_connection_open_timeout] = 5
+    #  Rightscale::HttpConnection::params[:http_connection_read_timeout] = 250
+    #  Rightscale::HttpConnection::params[:http_connection_retry_count]  = 2
+    #
+    #  # Local setings (RightAws level)
+    #  ec2 = Rightscale::Ec2::new(AWS_ID, AWS_KEY,
+    #    :region => 'us-east-1',
+    #    :connection_options => {
+    #      :http_connection_read_timeout => 2,
+    #      :http_connection_retry_count  => 5,
+    #      :user_agent => 'Mozilla 4.0'
+    #    })
+    #
+    #  # Custom settings (API call level)
+    #  ec2.with_connection_options(:raise_on_timeout => true,
+    #                              :http_connection_read_timeout => 10,
+    #                              :user_agent => '') do
+    #    pp ec2.describe_images
+    #  end
+    #
+    def with_connection_options(options, &block)
+      @with_connection_options = options
+      block.call self
+    ensure
+      @with_connection_options = {}
+    end
   end
 
 
@@ -666,7 +840,7 @@ module RightAws
       @reiteration_delay = @@reiteration_start_delay
       @retries       = 0
       # close current HTTP(S) connection on 5xx, errors from list and 4xx errors 
-      @close_on_error           = params[:close_on_error].nil? ? @@close_on_error : params[:close_on_error] 
+      @close_on_error           = params[:close_on_error].nil? ? @@close_on_error : params[:close_on_error]
       @close_on_4xx_probability = params[:close_on_4xx_probability] || @@close_on_4xx_probability       
     end
     
@@ -709,10 +883,17 @@ module RightAws
       # Ok, it is a redirect, find the new destination location
       if redirect_detected
         location = response['location']
+        # As for 301 ( Moved Permanently) Amazon does not return a 'Location' header but
+        # it is possible to extract a new endpoint from the response body
+        if location.right_blank? && response.code=='301' && response.body
+          new_endpoint = response.body[/<Endpoint>(.*?)<\/Endpoint>/] && $1
+          location     = "#{request[:protocol]}://#{new_endpoint}:#{request[:port]}#{request[:request].path}"
+        end
         # ... log information and ...
         @aws.logger.info("##### #{@aws.class.name} redirect requested: #{response.code} #{response.message} #####")
         @aws.logger.info("      Old location: #{request_text_data}")
         @aws.logger.info("      New location: #{location}")
+        @aws.logger.info("      Request Verb: #{request[:request].class.name}")
         # ... fix the connection data
         request[:server]   = URI.parse(location).host
         request[:protocol] = URI.parse(location).scheme
@@ -735,7 +916,7 @@ module RightAws
         # It may have a chance that one server is a semi-down and reconnection 
         # will help us to connect to the other server 
         if !redirect_detected && @close_on_error
-          @aws.connection.finish "#{self.class.name}: error match to pattern '#{error_match}'" 
+          @aws.destroy_connection(request, "#{self.class.name}: error match to pattern '#{error_match}'")
         end 
                  
         if (Time.now < @stop_at)
@@ -764,13 +945,13 @@ module RightAws
         end 
       # aha, this is unhandled error: 
       elsif @close_on_error 
-        # Is this a 5xx error ? 
-        if @aws.last_response.code.to_s[/^5\d\d$/] 
-          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}'" 
+        # On 5xx(Server errors), 403(RequestTimeTooSkewed) and 408(Request Timeout) a conection has to be closed
+        if @aws.last_response.code.to_s[/^(5\d\d|403|408)$/]
+          @aws.destroy_connection(request, "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}'")
         # Is this a 4xx error ? 
         elsif @aws.last_response.code.to_s[/^4\d\d$/] && @close_on_4xx_probability > rand(100) 
-          @aws.connection.finish "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}', " + 
-                                 "probability: #{@close_on_4xx_probability}%"           
+          @aws.destroy_connection(request, "#{self.class.name}: code: #{@aws.last_response.code}: '#{@aws.last_response.message}', " +
+                                           "probability: #{@close_on_4xx_probability}%")
         end
       end
       result
@@ -781,29 +962,41 @@ module RightAws
 
   #-----------------------------------------------------------------
 
-  class RightSaxParserCallback #:nodoc:
-    def self.include_callback 
-      include XML::SaxParser::Callbacks       
-    end 
+  class RightSaxParserCallbackTemplate #:nodoc:
     def initialize(right_aws_parser) 
       @right_aws_parser = right_aws_parser 
     end 
-    def on_start_element(name, attr_hash) 
-      @right_aws_parser.tag_start(name, attr_hash) 
-    end   
     def on_characters(chars) 
       @right_aws_parser.text(chars)
     end 
-    def on_end_element(name) 
-      @right_aws_parser.tag_end(name) 
-    end 
     def on_start_document; end 
     def on_comment(msg); end 
     def on_processing_instruction(target, data); end 
     def on_cdata_block(cdata); end 
     def on_end_document; end 
   end 
- 
+
+  class RightSaxParserCallback < RightSaxParserCallbackTemplate
+    def self.include_callback
+      include XML::SaxParser::Callbacks
+    end
+    def on_start_element(name, attr_hash)
+      @right_aws_parser.tag_start(name, attr_hash)
+    end
+    def on_end_element(name)
+      @right_aws_parser.tag_end(name)
+    end
+  end
+
+  class RightSaxParserCallbackNs < RightSaxParserCallbackTemplate
+    def on_start_element_ns(name, attr_hash, prefix, uri, namespaces)
+      @right_aws_parser.tag_start(name, attr_hash)
+    end
+    def on_end_element_ns(name, prefix, uri)
+      @right_aws_parser.tag_end(name)
+    end
+  end
+
   class RightAWSParser  #:nodoc:
       # default parsing library 
     DEFAULT_XML_LIBRARY = 'rexml' 
@@ -864,32 +1057,35 @@ module RightAws
       if @xml_lib=='libxml' && !defined?(XML::SaxParser)
         begin
           require 'xml/libxml'
-          # is it new ? - Setup SaxParserCallback 
-          if XML::Parser::VERSION >= '0.5.1.0'
-            RightSaxParserCallback.include_callback 
+          # Setup SaxParserCallback 
+          if XML::Parser::VERSION >= '0.5.1' &&
+             XML::Parser::VERSION  < '0.9.7'
+            RightSaxParserCallback.include_callback
           end           
         rescue LoadError => e
-          @@supported_xml_libs.delete(@xml_lib) 
-          @xml_lib = DEFAULT_XML_LIBRARY           
+          @@supported_xml_libs.delete(@xml_lib)
+          @xml_lib = DEFAULT_XML_LIBRARY
           if @logger
             @logger.error e.inspect
             @logger.error e.backtrace
-            @logger.info "Can not load 'libxml' library. '#{DEFAULT_XML_LIBRARY}' is used for parsing." 
+            @logger.info "Can not load 'libxml' library. '#{DEFAULT_XML_LIBRARY}' is used for parsing."
           end
         end
       end
         # Parse the xml text
       case @xml_lib
-      when 'libxml'  
+      when 'libxml'
         if XML::Parser::VERSION >= '0.9.9'
           # avoid warning on every usage
           xml        = XML::SaxParser.string(xml_text)
         else
-          xml        = XML::SaxParser.new 
+          xml        = XML::SaxParser.new
           xml.string = xml_text 
         end
         # check libxml-ruby version 
-        if XML::Parser::VERSION >= '0.5.1.0'
+        if    XML::Parser::VERSION >= '0.9.7'
+          xml.callbacks = RightSaxParserCallbackNs.new(self)
+        elsif XML::Parser::VERSION >= '0.5.1'
           xml.callbacks = RightSaxParserCallback.new(self) 
         else 
           xml.on_start_element{|name, attr_hash| self.tag_start(name, attr_hash)}