right_aws 1.10.0 → 2.0.0

data/History.txt

@@ -223,24 +223,62 @@ the source key.
 === 1.10.0
 
   Release Notes:
-
-  The big new features are SDB's SQL-like query and query_with_attributes
-  support as well as signature v2 support for all services.  There are also
-  numerous bug fixes, many of them reported and patched by users and
-  customers.
-
   - AwsBase: signature v2 support added
-  - AwsBase: fix the regex matching for xmlpath which didn't work in Ruby
-    1.8.7 (thanks to a customer report)
   - Ec2: describe_availability_zones improved to support regions
-  - Ec2: Disabled retries when EC2 returns "ServiceUnavailable: Request limit
-    exceeded"
-  - Ec2: Use POST for large queries; this avoids truncation of large user data
-    when launching instances (thanks to Bob for the report)
   - CloudFront: docs fixes
   - SDB: added: SQL-like query, select and query_with_attributes support
   - SDB: fixed no method error when searching for id that doesn't exist
-    (thanks to multiple users for reporting this)
-  - S3: Fixed overzealous URL-encoding when generating URLs for S3 keys
-    (thanks to a bug report on the RubyForge forum)
   
+=== 1.11.0
+
+  Release Notes:
+  - Full Amazon RDS instances support added with RightAws::RdsInterface
+  - Boot from EBS support added
+  - VPC support added
+  - Latest EC2 API 2009-10-31 support added
+  - Some of bugs fixed
+
+=== 2.0.0
+
+  Release Notes:
+  - Added:
+    - Ruby 1.9 support
+    - Ec2:
+      - SpotInstances support
+      - m2.xlarge instances
+      - GetPasswordData API call (see get_password_data_v2)
+      - SecurityGroups support for Eucalyptus clouds
+    - EBS:
+      - :delete_on_termination field for volumes
+    - SimpleDB:
+      - BatchPutAttributes support
+    - ActiveSDB:
+      - Dynamic attribute accessors
+      - "Columns" support
+      - Simple Type Casting support
+    - ELB:
+      - API '2009-11-25' support (stickiness policies)
+    - ACF:
+      - API '2010-03-01' support (origin access policy and streaming distributions)
+  - Bunch of small issues were fixed
+  - Time objects were replaced by Strings (as Amazon returns them) to make the gem more consistent:
+    - :last_modified_time in:
+        RightAws::AcfInterface#incrementally_list_distributions,
+        RightAws::AcfInterface#create_distribution_by_config,
+        RightAws::AcfInterface#get_distribution,
+        RightAws::AcfInterface#get_distribution_config
+    - :timestamp in:
+        RightAws::AcwInterface#get_metric_statistics
+    - :aws_created_at in:
+        RightAws::Ec2#create_volume,
+        RightAws::Ec2#describe_volumes
+    - :aws_attached_at in:
+        RightAws::Ec2#attach_volume,
+        RightAws::Ec2#detach_volume,
+        RightAws::Ec2#describe_volumes
+    - :aws_started_at in:
+        RightAws::Ec2#describe_snapshots,
+        RightAws::Ec2#create_snapshot,
+        RightAws::Ec2#try_create_snapshot
+    - :created_time in:
+        RightAws::ElbInterface#describe_load_balancers

data/Manifest.txt

@@ -6,8 +6,19 @@ lib/awsbase/benchmark_fix.rb
 lib/awsbase/right_awsbase.rb
 lib/awsbase/support.rb
 lib/ec2/right_ec2.rb
+lib/ec2/right_ec2_images.rb
+lib/ec2/right_ec2_instances.rb
+lib/ec2/right_ec2_security_groups.rb
+lib/ec2/right_ec2_spot_instances.rb
+lib/ec2/right_ec2_ebs.rb
+lib/ec2/right_ec2_reserved_instances.rb
+lib/ec2/right_ec2_vpc.rb
+lib/ec2/right_ec2_monitoring.rb
 lib/right_aws.rb
 lib/s3/right_s3.rb
+lib/acw/right_acw_interface.rb
+lib/elb/right_elb_interface.rb
+lib/as/right_as_interface.rb
 lib/s3/right_s3_interface.rb
 lib/sdb/active_sdb.rb
 lib/sdb/right_sdb_interface.rb
@@ -16,6 +27,9 @@ lib/sqs/right_sqs_gen2.rb
 lib/sqs/right_sqs_gen2_interface.rb
 lib/sqs/right_sqs_interface.rb
 lib/acf/right_acf_interface.rb
+lib/acf/right_acf_streaming_interface.rb
+lib/acf/right_acf_origin_access_identities.rb
+lib/rds/right_rds_interface.rb
 test/ec2/test_helper.rb
 test/ec2/test_right_ec2.rb
 test/http_connection.rb
@@ -32,3 +46,5 @@ test/test_credentials.rb
 test/ts_right_aws.rb
 test/acf/test_helper.rb
 test/acf/test_right_acf.rb
+test/rds/test_helper.rb
+test/rds/test_right_rds.rb

data/README.txt

@@ -9,17 +9,20 @@ The RightScale AWS gems have been designed to provide a robust, fast, and secure
 These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon. 
 The RightScale AWS gems comprise:
 
-- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
-  associated EBS (Elastic Block Store)
+- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud), VPC (Virtual Private Cloud) and the associated EBS (Elastic Block Store)
 - RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
-- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
-- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
+- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service)
+- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service)
 - RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
 - RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+- RightAws::AsInterface  -- interface to Amazon Auto Scaling
+- RightAws::AcwInterface -- interface to Amazon Cloud Watch
+- RightAws::ElbInterface -- interface to Amazon Elastic Load Balancer
+- RightAws::RdsInterface -- interface to Amazon RDS instances
 
 == FEATURES:
 
-- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+- Full programmmatic access to EC2, EBS, S3, SQS, SDB, CloudFront, AS, ACW, ELB and RDS.
 - Complete error handling: all operations check for errors and report complete
   error information by raising an AwsError.
 - Persistent HTTP connections with robust network-level retry layer using
@@ -38,7 +41,7 @@ The RightScale AWS gems comprise:
   AWS accounts.
 - Support for both first- and second-generation SQS (API versions 2007-05-01
   and 2008-01-01).  These versions of SQS are not compatible.
-- Support for signature versions 0, 1 and 2 on all services.
+- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
 - Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
 - Test suite (requires AWS account to do "live" testing).
 
@@ -119,9 +122,7 @@ multithreaded mode.
   'incompatible Net::HTTP monkey-patch'
 
   This is due to a conflict between the right_http_connection gem and another
-  gem required by attachment_fu.  It may be possible to require right_aws (and
-  thus right_http_connection) in the .after_initialize method of the config object in
-  environment.rb (check the docs for Rails::Configuration.after_initialize).
+  gem required by attachment_fu.
 
 - 8/07: Amazon has changed the semantics of the SQS service.  A
   new queue may not be created within 60 seconds of the destruction of any

data/Rakefile

@@ -10,36 +10,27 @@ require 'lib/right_aws.rb'
 testglobs =     ["test/ts_right_aws.rb"]
 
 
-# Suppress Hoe's self-inclusion as a dependency for our Gem. This also keeps
-# Rake & rubyforge out of the dependency list. Users must manually install
+# Suppress Hoe's self-inclusion as a dependency for our Gem.  This also keeps
+# Rake & rubyforge out of the dependency list.  Users must manually install
 # these gems to run tests, etc.
-# TRB 2/24/09: also do this for the extra_dev_deps array present in newer hoes.
-# Older versions of RubyGems will try to install developer-dependencies as
-# required runtime dependencies.  It would be great to take advantage of the extra dev deps, but not
-# at the cost of requiring many additional dependencies if the user is running an older RubyGems.
 class Hoe
   def extra_deps
     @extra_deps.reject do |x|
       Array(x).first == 'hoe'
     end
   end
-  def extra_dev_deps
-    @extra_dev_deps.reject do |x|
-      Array(x).first == 'hoe'
-    end
-  end
 end
 
 Hoe.new('right_aws', RightAws::VERSION::STRING) do |p|
-  p.rubyforge_name = 'rightscale'
+  p.rubyforge_name = 'rightaws'
   p.author = 'RightScale, Inc.'
-  p.email = 'rubygems@rightscale.com'
-  p.summary = 'Interface classes for the Amazon EC2/EBS, SQS, S3, SDB, and ACF Web Services'
+  p.email = 'support@rightscale.com'
+  p.summary = 'Interface classes for the Amazon EC2, SQS, and S3 Web Services'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.remote_rdoc_dir = "/right_aws_gem_doc"
-  p.extra_deps = [['right_http_connection','>= 1.2.4']]
+  p.extra_deps = [['right_http_connection','>= 1.2.1']]
   p.test_globs = testglobs 
 end
 
@@ -109,4 +100,11 @@ task :testacf do
   require 'test/acf/test_right_acf.rb'
 end
 
+desc "Test RDS interface"
+task :testrds do
+  require 'test/test_credentials'
+  TestCredentials.get_credentials
+  require 'test/rds/test_right_rds.rb'
+end
+
 # vim: syntax=Ruby

data/lib/acf/right_acf_interface.rb

@@ -20,7 +20,6 @@
 # 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
 
   # = RightAws::AcfInterface -- RightScale Amazon's CloudFront interface
@@ -42,7 +41,7 @@ module RightAws
   #      :origin             => "my-bucket.s3.amazonaws.com",
   #      :cnames             => ["x1.my-awesome-site.net", "x1.my-awesome-site.net"]
   #      :comment            => "My comments",
-  #      :last_modified_time => Wed Sep 10 17:00:04 UTC 2008 }, ..., {...} ]
+  #      :last_modified_time => "2008-09-10T17:00:04.000Z" }, ..., {...} ]
   #
   #  distibution = list.first
   #
@@ -56,7 +55,7 @@ module RightAws
   #     :aws_id             => "E2REJM3VUN5RSI",
   #     :comment            => "Woo-Hoo!",
   #     :origin             => "my-bucket.s3.amazonaws.com",
-  #     :last_modified_time => Wed Sep 10 17:00:54 UTC 2008 }
+  #     :last_modified_time => "2008-09-10T17:00:54.000Z" }
   #
   #  config = acf.get_distribution_config(distibution[:aws_id]) #=>
   #    {:enabled          => true,
@@ -76,7 +75,7 @@ module RightAws
     
     include RightAwsBaseInterface
 
-    API_VERSION      = "2008-06-30"
+    API_VERSION      = "2010-03-01"
     DEFAULT_HOST     = 'cloudfront.amazonaws.com'
     DEFAULT_PORT     = 443
     DEFAULT_PROTOCOL = 'https'
@@ -93,22 +92,23 @@ module RightAws
     # Create a new handle to a CloudFront account. All handles share the same per process or per thread
     # HTTP connection to CloudFront. Each handle is for a specific account. The params have the
     # following options:
+    # * <tt>:endpoint_url</tt> a fully qualified url to Amazon API endpoint (this overwrites: :server, :port, :service, :protocol). Example: 'https://cloudfront.amazonaws.com'
     # * <tt>:server</tt>: CloudFront service host, default: DEFAULT_HOST
     # * <tt>:port</tt>: CloudFront 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>:cache</tt>: true/false: caching for list_distributions method, default: false.
     #
     #  acf = RightAws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX',
-    #    {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=>  #<RightAws::AcfInterface::0xb7b3c30c>
+    #    {:logger => Logger.new('/tmp/x.log')}) #=>  #<RightAws::AcfInterface::0xb7b3c30c>
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-      init({ :name             => 'ACF',
-             :default_host     => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).host   : DEFAULT_HOST,
-             :default_port     => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).port   : DEFAULT_PORT,
-             :default_service  => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).path   : DEFAULT_PATH,
-             :default_protocol => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).scheme : DEFAULT_PROTOCOL },
+      init({ :name                => 'ACF',
+             :default_host        => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).host   : DEFAULT_HOST,
+             :default_port        => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).port   : DEFAULT_PORT,
+             :default_service     => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).path   : DEFAULT_PATH,
+             :default_protocol    => ENV['ACF_URL'] ? URI.parse(ENV['ACF_URL']).scheme : DEFAULT_PROTOCOL,
+             :default_api_version => ENV['ACF_API_VERSION'] || API_VERSION },
            aws_access_key_id     || ENV['AWS_ACCESS_KEY_ID'], 
            aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY'], 
            params)
@@ -119,14 +119,20 @@ module RightAws
     #-----------------------------------------------------------------
 
     # Generates request hash for REST API.
-    def generate_request(method, path, body=nil, headers={})  # :nodoc:
+    def generate_request(method, path, params={}, body=nil, headers={})  # :nodoc:
+      # Params
+      params.delete_if{ |key, val| val.blank? }
+      unless params.blank?
+        path += "?" + params.to_a.collect{ |key,val| "#{AwsUtils::amz_escape(key)}=#{AwsUtils::amz_escape(val.to_s)}" }.join("&")
+      end
+      # Headers
       headers['content-type'] ||= 'text/xml' if body
       headers['date'] = Time.now.httpdate
       # Auth
       signature = AwsUtils::sign(@aws_secret_access_key, headers['date'])
       headers['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
       # Request
-      path    = "#{@params[:default_service]}/#{API_VERSION}/#{path}"
+      path    = "#{@params[:service]}#{@params[:api_version]}/#{path}"
       request = "Net::HTTP::#{method.capitalize}".constantize.new(path)
       request.body = body if body
       # Set request headers
@@ -141,9 +147,7 @@ module RightAws
       # Sends request to Amazon and parses the response.
       # Raises AwsError if any banana happened.
     def request_info(request, parser, &block) # :nodoc:
-      thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:acf_connection] ||= Rightscale::HttpConnection.new(:exception => RightAws::AwsError, :logger => @logger)
-      request_info_impl(thread[:acf_connection], @@bench, request, parser, &block)
+      request_info_impl(:acf_connection, @@bench, request, parser, &block)
     end
 
     #-----------------------------------------------------------------
@@ -158,10 +162,6 @@ module RightAws
       REXML::Text::unnormalize(text)
     end
 
-    def xmlns # :nodoc:
-      %Q{"http://#{@params[:server]}/doc/#{API_VERSION}/"}
-    end
-
     def generate_call_reference # :nodoc:
       result = Time.now.strftime('%Y%m%d%H%M%S')
       10.times{ result << rand(10).to_s }
@@ -174,11 +174,62 @@ module RightAws
       hash
     end
 
+    def distribution_config_to_xml(config, xml_wrapper='DistributionConfig') # :nodoc:
+      cnames = ''
+      logging = ''
+      origin_access_identity = ''
+      trusted_signers = ''
+      # CNAMES
+      unless config[:cnames].blank?
+        Array(config[:cnames]).each { |cname| cnames += "  <CNAME>#{cname}</CNAME>\n" }
+      end
+      # Logging
+      unless config[:logging].blank?
+        logging = "  <Logging>\n" +
+                  "    <Bucket>#{config[:logging][:bucket]}</Bucket>\n" +
+                  "    <Prefix>#{config[:logging][:prefix]}</Prefix>\n" +
+                  "  </Logging>\n"
+      end
+      # Origin Access Identity
+      unless config[:origin_access_identity].blank?
+        origin_access_identity = config[:origin_access_identity]
+        unless origin_access_identity[%r{^origin-access-identity}]
+          origin_access_identity = "origin-access-identity/cloudfront/#{origin_access_identity}"
+        end
+        origin_access_identity = "  <OriginAccessIdentity>#{origin_access_identity}</OriginAccessIdentity>\n"
+      end
+      # Trusted Signers
+      unless config[:trusted_signers].blank?
+        trusted_signers = "  <TrustedSigners>\n"
+        Array(config[:trusted_signers]).each do |trusted_signer|
+          trusted_signers += if trusted_signer.to_s[/self/i]
+                               "    <Self/>\n"
+                             else
+                               "    <AwsAccountNumber>#{trusted_signer}</AwsAccountNumber>\n"
+                             end
+        end
+        trusted_signers += "  </TrustedSigners>\n"
+      end
+
+      # XML
+      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+      "<#{xml_wrapper} xmlns=\"http://#{@params[:server]}/doc/#{API_VERSION}/\">\n" +
+      "  <Origin>#{config[:origin]}</Origin>\n" +
+      "  <CallerReference>#{config[:caller_reference]}</CallerReference>\n" +
+      "  <Comment>#{AcfInterface::escape(config[:comment].to_s)}</Comment>\n" +
+      "  <Enabled>#{config[:enabled]}</Enabled>\n" +
+      cnames  +
+      logging +
+      origin_access_identity +
+      trusted_signers +
+      "</#{xml_wrapper}>"
+    end
+
     #-----------------------------------------------------------------
     #      API Calls:
     #-----------------------------------------------------------------
 
-    # List distributions.
+    # List all distributions.
     # Returns an array of distributions or RightAws::AwsError exception.
     #
     #  acf.list_distributions #=>
@@ -191,14 +242,62 @@ module RightAws
     #      :last_modified_time => Wed Sep 10 17:00:04 UTC 2008 }, ..., {...} ]
     #
     def list_distributions
-      request_hash = generate_request('GET', 'distribution')
-      request_cache_or_info :list_distributions, request_hash,  AcfDistributionListParser, @@bench
+      result = []
+      incrementally_list_distributions do |response|
+        result += response[:distributions]
+        true
+      end
+      result
+    end
+
+    # Incrementally list distributions.
+    # 
+    # Optional params: +:marker+ and +:max_items+.
+    #
+    #   # get first distribution
+    #   incrementally_list_distributions(:max_items => 1) #=>
+    #      {:distributions=>
+    #        [{:status=>"Deployed",
+    #          :aws_id=>"E2Q0AOOMFNPSYL",
+    #          :origin=>"my-bucket.s3.amazonaws.com",
+    #          :domain_name=>"d1s5gmdtmafnre.6hops.net",
+    #          :comment=>"ONE LINE OF COMMENT",
+    #          :last_modified_time=>"2008-10-22T19:31:23.000Z",
+    #          :enabled=>true,
+    #          :cnames=>[]}],
+    #       :is_truncated=>true,
+    #       :max_items=>1,
+    #       :marker=>"",
+    #       :next_marker=>"E2Q0AOOMFNPSYL"}
+    #
+    #   # get max 100 distributions (the list will be restricted by a default MaxItems value ==100 )
+    #   incrementally_list_distributions
+    #
+    #   # list distributions by 10
+    #   incrementally_list_distributions(:max_items => 10) do |response|
+    #     puts response.inspect # a list of 10 distributions
+    #     true # return false if the listing should be broken otherwise use true
+    #   end
+    #
+    def incrementally_list_distributions(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', 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?
+      end 
+      last_response 
     end
 
     # Create a new distribution.
     # Returns the just created distribution or RightAws::AwsError exception.
     #
-    #  acf.create_distribution('bucket-for-k-dzreyev.s3.amazonaws.com', 'Woo-Hoo!', true, ['web1.my-awesome-site.net'] ) #=>
+    #  acf.create_distribution('my-bucket.s3.amazonaws.com', 'Woo-Hoo!', true, ['web1.my-awesome-site.net'], nil,
+    #                          { :prefix=>"log/", :bucket=>"my-logs.s3.amazonaws.com" } ) #=>
     #    {:comment            => "Woo-Hoo!",
     #     :enabled            => true,
     #     :location           => "https://cloudfront.amazonaws.com/2008-06-30/distribution/E2REJM3VUN5RSI",
@@ -206,30 +305,26 @@ module RightAws
     #     :aws_id             => "E2REJM3VUN5RSI",
     #     :domain_name        => "d3dxv71tbbt6cd.6hops.net",
     #     :origin             => "my-bucket.s3.amazonaws.com",
-    #     :cnames             => ["web1.my-awesome-site.net"]
-    #     :last_modified_time => Wed Sep 10 17:00:54 UTC 2008,
+    #     :cnames             => ["web1.my-awesome-site.net"],
+    #     :logging            => { :prefix => "log/",
+    #                              :bucket => "my-logs.s3.amazonaws.com"},
+    #     :last_modified_time => "2008-10-22T19:31:23.000Z",
     #     :caller_reference   => "200809102100536497863003"}
     #
-    def create_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil)
-      # join CNAMES
-      cnames_str = ''
-      unless cnames.blank?
-        cnames.to_a.each { |cname| cnames_str += "\n           <CNAME>#{cname}</CNAME>" }
-      end
-      # reference
-      caller_reference ||= generate_call_reference
-      body = <<-EOXML
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DistributionConfig xmlns=#{xmlns}>
-           <Origin>#{origin}</Origin>
-           <CallerReference>#{caller_reference}</CallerReference>
-           #{cnames_str.lstrip}
-           <Comment>#{AcfInterface::escape(comment.to_s)}</Comment>
-           <Enabled>#{enabled}</Enabled>
-        </DistributionConfig>
-      EOXML
-      request_hash = generate_request('POST', 'distribution', body.strip)
-      merge_headers(request_info(request_hash, AcfDistributionParser.new))
+    def create_distribution(origin, comment='', enabled=true, cnames=[], caller_reference=nil, logging={})
+      config = { :origin  => origin,
+                 :comment => comment,
+                 :enabled => enabled,
+                 :cnames  => Array(cnames),
+                 :caller_reference => caller_reference }
+      config[:logging] = logging unless logging.blank?
+      create_distribution_by_config(config)
+    end
+
+    def create_distribution_by_config(config)
+      config[:caller_reference] ||= generate_call_reference
+      link = generate_request('POST', 'distribution', {}, distribution_config_to_xml(config))
+      merge_headers(request_info(link, AcfDistributionListParser.new(:logger => @logger))[:distributions].first)
     end
 
     # Get a distribution's information.
@@ -245,11 +340,30 @@ module RightAws
     #     :aws_id             => "E2REJM3VUN5RSI",
     #     :comment            => "Woo-Hoo!",
     #     :origin             => "my-bucket.s3.amazonaws.com",
-    #     :last_modified_time => Wed Sep 10 17:00:54 UTC 2008 }
+    #     :last_modified_time => "2008-09-10T17:00:54.000Z" }
+    #
+    #  acf.get_distribution('E2FNSBHNVVF11E') #=>
+    #    {:e_tag=>"E1Q2DJEPTQOLJD",
+    #     :status=>"InProgress",
+    #     :last_modified_time=>"2010-04-17T17:24:25.000Z",
+    #     :cnames=>["web1.my-awesome-site.net", "web2.my-awesome-site.net"],
+    #     :aws_id=>"E2FNSBHNVVF11E",
+    #     :logging=>{:prefix=>"xlog/", :bucket=>"my-bucket.s3.amazonaws.com"},
+    #     :enabled=>true,
+    #     :active_trusted_signers=>
+    #      [{:aws_account_number=>"120288270000",
+    #        :key_pair_ids=>["APKAJTD5OHNDX0000000", "APKAIK74BJWCL0000000"]},
+    #       {:aws_account_number=>"self"},
+    #       {:aws_account_number=>"648772220000"}],
+    #     :caller_reference=>"201004171154450740700072",
+    #     :domain_name=>"d1f6lpevremt5m.cloudfront.net",
+    #     :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G",
+    #     :trusted_signers=>["self", "648772220000", "120288270000"],
+    #     :origin=>"my-bucket.s3.amazonaws.com"}
     #
     def get_distribution(aws_id)
-      request_hash = generate_request('GET', "distribution/#{aws_id}")
-      merge_headers(request_info(request_hash, AcfDistributionParser.new))
+      link = generate_request('GET', "distribution/#{aws_id}")
+      merge_headers(request_info(link, AcfDistributionListParser.new(:logger => @logger))[:distributions].first)
     end
 
     # Get a distribution's configuration.
@@ -263,9 +377,18 @@ module RightAws
     #     :comment          => "Woo-Hoo!",
     #     :origin           => "my-bucket.s3.amazonaws.com"}
     #
+    #  acf.get_distribution_config('E2FNSBHNVVF11E') #=>
+    #    {:e_tag=>"E1Q2DJEPTQOLJD",
+    #     :logging=>{:prefix=>"xlog/", :bucket=>"my-bucket.s3.amazonaws.com"},
+    #     :enabled=>true,
+    #     :caller_reference=>"201004171154450740700072",
+    #     :origin_access_identity=>"origin-access-identity/cloudfront/E3JPJZ80ZBX24G",
+    #     :trusted_signers=>["self", "648772220000", "120288270000"],
+    #     :origin=>"my-bucket.s3.amazonaws.com"}
+    #
     def get_distribution_config(aws_id)
-      request_hash = generate_request('GET', "distribution/#{aws_id}/config")
-      merge_headers(request_info(request_hash, AcfDistributionConfigParser.new))
+      link = generate_request('GET', "distribution/#{aws_id}/config")
+      merge_headers(request_info(link, AcfDistributionListParser.new(:logger => @logger))[:distributions].first)
     end
 
     # Set a distribution's configuration 
@@ -279,30 +402,21 @@ module RightAws
     #     :cnames           => ["web1.my-awesome-site.net", "web2.my-awesome-site.net"]
     #     :comment          => "Woo-Hoo!",
     #     :origin           => "my-bucket.s3.amazonaws.com"}
-    #  config[:comment] = 'Olah-lah!'
-    #  config[:enabled] = false
+    #
+    #  config[:comment]                = 'Olah-lah!'
+    #  config[:enabled]                = false
+    #  config[:origin_access_identity] = "origin-access-identity/cloudfront/E3JPJZ80ZBX24G"
+    #  # or just
+    #  # config[:origin_access_identity] = "E3JPJZ80ZBX24G"
+    #  config[:trusted_signers]        = ['self', '648772220000', '120288270000']
+    #  config[:logging]                = { :bucket => 'my-bucket.s3.amazonaws.com', :prefix => 'xlog/' }
+    #  
     #  acf.set_distribution_config('E2REJM3VUN5RSI', config) #=> true
     #
     def set_distribution_config(aws_id, config)
-      # join CNAMES
-      cnames_str = ''
-      unless config[:cnames].blank?
-        config[:cnames].to_a.each { |cname| cnames_str += "\n           <CNAME>#{cname}</CNAME>" }
-      end
-      # format request's XML body
-      body = <<-EOXML
-        <?xml version="1.0" encoding="UTF-8"?>
-        <DistributionConfig xmlns=#{xmlns}>
-           <Origin>#{config[:origin]}</Origin>
-           <CallerReference>#{config[:caller_reference]}</CallerReference>
-           #{cnames_str.lstrip}
-           <Comment>#{AcfInterface::escape(config[:comment].to_s)}</Comment>
-           <Enabled>#{config[:enabled]}</Enabled>
-        </DistributionConfig>
-      EOXML
-      request_hash = generate_request('PUT', "distribution/#{aws_id}/config", body.strip,
-                                      'If-Match' => config[:e_tag])
-      request_info(request_hash, RightHttp2xxParser.new)
+      link = generate_request('PUT', "distribution/#{aws_id}/config", {}, distribution_config_to_xml(config),
+                                     'If-Match' => config[:e_tag])
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
     end
 
     # Delete a distribution. The enabled distribution cannot be deleted.
@@ -311,9 +425,9 @@ module RightAws
     #  acf.delete_distribution('E2REJM3VUN5RSI', 'E39OHHU1ON65SI') #=> true
     #
     def delete_distribution(aws_id, e_tag)
-      request_hash = generate_request('DELETE', "distribution/#{aws_id}", nil,
-                                      'If-Match' => e_tag)
-      request_info(request_hash, RightHttp2xxParser.new)
+      link = generate_request('DELETE', "distribution/#{aws_id}", {}, nil,
+                                        'If-Match' => e_tag)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
     end
 
     #-----------------------------------------------------------------
@@ -322,58 +436,50 @@ module RightAws
 
     class AcfDistributionListParser < RightAWSParser # :nodoc:
       def reset
-        @result = []
+        @result = { :distributions => [] }
       end
       def tagstart(name, attributes)
-        @distribution = { :cnames => [] } if name == 'DistributionSummary'
-      end
-      def tagend(name)
-        case name
-          when 'Id'                  then @distribution[:aws_id]             = @text
-          when 'Status'              then @distribution[:status]             = @text
-          when 'LastModifiedTime'    then @distribution[:last_modified_time] = Time.parse(@text)
-          when 'DomainName'          then @distribution[:domain_name]        = @text
-          when 'Origin'              then @distribution[:origin]             = @text
-          when 'Comment'             then @distribution[:comment]            = AcfInterface::unescape(@text)
-          when 'CNAME'               then @distribution[:cnames]            << @text
-          when 'DistributionSummary' then @result << @distribution
+        case full_tag_name
+        when %r{/Signer$}
+          @active_signer = {}
+        when %r{(Streaming)?DistributionSummary$},
+             %r{^(Streaming)?Distribution$},
+             %r{^(Streaming)?DistributionConfig$}
+          @distribution = { }
         end
       end
-    end
-
-    class AcfDistributionParser < RightAWSParser # :nodoc:
-      def reset
-        @result = { :cnames => [] }
-      end
       def tagend(name)
         case name
-          when 'Id'               then @result[:aws_id]             = @text
-          when 'Status'           then @result[:status]             = @text
-          when 'LastModifiedTime' then @result[:last_modified_time] = Time.parse(@text)
-          when 'DomainName'       then @result[:domain_name]        = @text
-          when 'Origin'           then @result[:origin]             = @text
-          when 'CallerReference'  then @result[:caller_reference]   = @text
-          when 'Comment'          then @result[:comment]            = AcfInterface::unescape(@text)
-          when 'Enabled'          then @result[:enabled]            = @text == 'true' ? true : false
-          when 'CNAME'            then @result[:cnames]            << @text
+          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 @distribution[:aws_id]             = @text
+          when 'Status'           then @distribution[:status]             = @text
+          when 'LastModifiedTime' then @distribution[:last_modified_time] = @text
+          when 'DomainName'       then @distribution[:domain_name]        = @text
+          when 'Origin'           then @distribution[:origin]             = @text
+          when 'Comment'          then @distribution[:comment]            = AcfInterface::unescape(@text)
+          when 'CallerReference'  then @distribution[:caller_reference]   = @text
+          when 'CNAME'            then (@distribution[:cnames] ||= [])   << @text
+          when 'Enabled'          then @distribution[:enabled]            = (@text == 'true')
+          when 'Bucket'           then (@distribution[:logging] ||= {})[:bucket] = @text
+          when 'Prefix'           then (@distribution[:logging] ||= {})[:prefix] = @text
+          when 'OriginAccessIdentity' then @distribution[:origin_access_identity] = @text
         end
-      end
-    end
-
-    class AcfDistributionConfigParser < RightAWSParser # :nodoc:
-      def reset
-        @result = { :cnames => [] }
-      end
-      def tagend(name)
-        case name
-          when 'Origin'           then @result[:origin]           = @text
-          when 'CallerReference'  then @result[:caller_reference] = @text
-          when 'Comment'          then @result[:comment]          = AcfInterface::unescape(@text)
-          when 'Enabled'          then @result[:enabled]          = @text == 'true' ? true : false
-          when 'CNAME'            then @result[:cnames]          << @text
+        case full_tag_name
+        when %r{/TrustedSigners/Self$}             then (@distribution[:trusted_signers] ||= []) << 'self'
+        when %r{/TrustedSigners/AwsAccountNumber$} then (@distribution[:trusted_signers] ||= []) << @text
+        when %r{/Signer/Self$}                     then @active_signer[:aws_account_number] = 'self'
+        when %r{/Signer/AwsAccountNumber$}         then @active_signer[:aws_account_number] = @text
+        when %r{/Signer/KeyPairId$}                then (@active_signer[:key_pair_ids] ||= []) << @text
+        when %r{/Signer$}                          then (@distribution[:active_trusted_signers] ||= []) << @active_signer
+        when %r{(Streaming)?DistributionSummary$},
+             %r{^(Streaming)?Distribution$},
+             %r{^(Streaming)?DistributionConfig$}
+          @result[:distributions] << @distribution
         end
       end
     end
-
   end
 end