fog 1.1.0 → 1.2.0

data/docs/_layouts/default.html

@@ -35,7 +35,7 @@
       <dl>
         <dt>version</dt><dd>vX.Y.Z</dd>
         <dt>install</dt><dd><code>gem install fog</code></dd>
-        <dt>source</dt><dd><a href="http://github.com/fog/fog">geemus/fog</a></dd>
+        <dt>source</dt><dd><a href="http://github.com/fog/fog">fog/fog</a></dd>
       </dl>
     </header>
 

data/docs/compute/index.markdown

@@ -61,7 +61,7 @@ Cycling servers is great, but in order to actually ssh in we need to setup ssh k
 
     server = connection.servers.bootstrap(:private_key_path => '~/.ssh/id_rsa', :public_key_path => '~/.ssh/id_rsa.pub', :username => 'ubuntu')
 
-Bootstrap will create the server, but it will also make sure that port 22 is open for traffic and has ssh keys setup.  In order to hook everything up it will need the server to be running, so by the time it finishes it will be ready.  You can then make commands to it directly:
+Bootstrap will create the server, but it will also make sure that port 22 is open for traffic and has ssh keys setup. The ssh key pair you specified will be registered under the name "fog\_default" unless you've set `Fog.credential` to a custom string value. In order to hook everything up `bootstrap` will need the server to be running, so by the time it finishes it will be ready. You can then make commands to it directly:
 
     server.ssh('pwd')
     server.ssh(['pwd', 'whoami'])
@@ -70,6 +70,20 @@ These return an array of results, where each has stdout, stderr and status value
 
     server.destroy
 
+
+### Managing multiple ssh key pairs on EC2
+
+The key pair you've specified, will be registered as "fog\_default" after running `bootstrap` for the first time. If you want to use multiple key pairs with the same AWS credentials, you need to set `Fog.credential` to register your other key pairs under different names. Your additional key pair will then be registered as "fog\_#{Fog.credential}":
+
+    Fog.credential = 'my_custom_key'
+    connection.servers.bootstrap(:private_key_path => '~/.ssh/my_custom_key', :public_key_path => '~/.ssh/my_custom_key.pub')
+
+If you've already registered a custom key pair e.g. using `connection.create_key_pair` or `connection.import_key_pair`, you can set your key paths using `Fog.credentials` and pass in the name of this key so `bootstrap` will use it instead of "fog\_default":
+
+    Fog.credentials = Fog.credentials.merge({ :private_key_path => "~/.ssh/my_custom_key", :public_key_path => "~/.ssh/my_custom_key.pub" })
+    connection.import_key_pair('my_custom_key', IO.read('~/.ssh/my_custom_key.pub')) if connection.key_pairs.get('my_custom_key').nil?
+    server = connection.servers.bootstrap(:key_name => 'my_custom_key')
+
 ## Rackspace Cloud Servers
 
 Rackspace has <a href="http://www.rackspacecloud.com/cloud_hosting_products/servers">Cloud Servers</a> and you can sign up <a href="https://www.rackspacecloud.com/signup">here</a> and get your credentials <a href="https://manage.rackspacecloud.com/APIAccess.do">here</a>.

data/docs/index.markdown

@@ -45,7 +45,7 @@ geemus says: "That should give you everything you need to get started, but let m
 * Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
-* Rebase your branch against geemus/fog to make sure everything is up to date.
+* Rebase your branch against fog/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
 ## Resources
@@ -66,7 +66,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 
 (The MIT License)
 
-Copyright (c) 2010 [geemus (Wesley Beary)](http://github.com/geemus)
+Copyright (c) 2012 [geemus (Wesley Beary)](http://github.com/geemus)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/docs/storage/index.markdown

@@ -35,8 +35,8 @@ First, create a connection with your new account:
     # create a connection
     connection = Fog::Storage.new({
       :provider                 => 'AWS',
-      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
-      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID
+      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID,
+      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY
     })
 
     # First, a place to contain the glorious details
@@ -131,8 +131,8 @@ Sign up <a href="http://gs-signup-redirect.appspot.com/">here</a> and get your c
 
     connection = Fog::Storage.new({
       :provider                         => 'Google',
-      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY,
-      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID
+      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID,
+      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY
     })
 
 ## Rackspace CloudFiles

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.1.0'
-  s.date              = '2011-11-11'
+  s.version           = '1.2.0'
+  s.date              = '2012-03-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,12 +37,12 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.7.4')
+  s.add_dependency('excon', '~>0.12.0')
   s.add_dependency('formatador', '~>0.2.0')
-  s.add_dependency('multi_json', '~>1.0.3')
+  s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')
   s.add_dependency('net-scp', '~>1.0.4')
-  s.add_dependency('net-ssh', '>=2.2.1')
+  s.add_dependency('net-ssh', '>=2.1.3')
   s.add_dependency('nokogiri', '~>1.5.0')
   s.add_dependency('ruby-hmac')
 
@@ -52,9 +52,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('rdoc')
+  s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
+  s.add_development_dependency('rbovirt', '>=0.0.8')
   s.add_development_dependency('shindo', '~>0.3.4')
   s.add_development_dependency('virtualbox', '~>0.9.1')
+  s.add_development_dependency('fission')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog/aws/auto_scaling.rb

@@ -77,22 +77,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'autoscaling.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'autoscaling.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'autoscaling.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'autoscaling.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'autoscaling.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'autoscaling.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "autoscaling.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @port       = options[:port]        || 443
           @persistent = options[:persistent]  || false
@@ -206,7 +191,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 

data/lib/fog/aws/beanstalk.rb

@@ -0,0 +1,140 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+
+module Fog
+  module AWS
+    class ElasticBeanstalk < Fog::Service
+
+      class InvalidParameterError < Fog::Errors::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      request_path 'fog/aws/requests/beanstalk'
+
+      request :check_dns_availability
+      request :create_application
+      request :create_application_version
+      request :create_configuration_template
+      request :create_environment
+      request :create_storage_location
+      request :delete_application
+      request :delete_application_version
+      request :delete_configuration_template
+      request :delete_environment_configuration
+      request :describe_applications
+      request :describe_application_versions
+      request :describe_configuration_options
+      request :describe_configuration_settings
+      request :describe_environment_resources
+      request :describe_environments
+      request :describe_events
+      request :list_available_solution_stacks
+      request :rebuild_environment
+      request :request_environment_info
+      request :restart_app_server
+      request :retrieve_environment_info
+      request :swap_environment_cnames
+      request :terminate_environment
+      request :update_application
+      request :update_application_version
+      request :update_configuration_template
+      request :update_environment
+      request :validate_configuration_settings
+
+      model_path 'fog/aws/models/beanstalk'
+
+      model       :application
+      collection  :applications
+      model       :environment
+      collection  :environments
+      model       :event
+      collection  :events
+      model       :template
+      collection  :templates
+      model       :version
+      collection  :versions
+
+      class Mock
+
+        def initialize(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'fog/core/parser'
+          require 'multi_json'
+
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+
+          @connection_options = options[:connection_options] || {}
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || "elasticbeanstalk.#{options[:region]}.amazonaws.com"
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        # Returns an array of available solutions stack details
+        def solution_stacks
+          list_available_solution_stacks.body['ListAvailableSolutionStacksResult']['SolutionStackDetails']
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = AWS.signed_params(
+              params,
+              {
+                  :aws_access_key_id  => @aws_access_key_id,
+                  :hmac               => @hmac,
+                  :host               => @host,
+                  :path               => @path,
+                  :port               => @port,
+                  :version            => '2010-12-01'
+              }
+          )
+
+          begin
+            response = @connection.request({
+                                               :body       => body,
+                                               :expects    => 200,
+                                               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+                                               :idempotent => idempotent,
+                                               :host       => @host,
+                                               :method     => 'POST',
+                                               :parser     => parser
+                                           })
+          rescue Excon::Errors::HTTPStatusError => error
+            if match = error.response.body.match(/<Code>(.*)<\/Code>[ \t\n]*<Message>(.*)<\/Message>/)
+              raise case match[1].split('.').last
+                      when 'InvalidParameterValue'
+                        Fog::AWS::ElasticBeanstalk::InvalidParameterError.slurp(error, match[2])
+                      else
+                        Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[1]} => #{match[2]}")
+                    end
+            else
+              raise error
+            end
+          end
+
+        end
+      end
+
+
+    end
+  end
+end

data/lib/fog/aws/cloud_formation.rb

@@ -54,22 +54,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'cloudformation.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'cloudformation.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'cloudformation.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'cloudformation.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'cloudformation.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'cloudformation.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/fog/aws/cloud_watch.rb

@@ -57,7 +57,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1', 'ap-northeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
         # * CloudWatch object with connection to AWS.
@@ -68,22 +68,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'monitoring.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'monitoring.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'monitoring.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'monitoring.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'monitoring.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'monitoring.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/fog/aws/compute.rb

@@ -6,7 +6,7 @@ module Fog
     class AWS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
 
       model_path 'fog/aws/models/compute'
       model       :address
@@ -29,6 +29,10 @@ module Fog
       collection  :volumes
       model       :spot_request
       collection  :spot_requests
+      model       :subnet
+      collection  :subnets
+      model       :vpc
+      collection  :vpcs
 
       request_path 'fog/aws/requests/compute'
       request :allocate_address
@@ -42,21 +46,26 @@ module Fog
       request :create_security_group
       request :create_snapshot
       request :create_spot_datafeed_subscription
+      request :create_subnet
       request :create_tags
       request :create_volume
+      request :create_vpc
       request :delete_key_pair
       request :delete_security_group
       request :delete_placement_group
       request :delete_snapshot
       request :delete_spot_datafeed_subscription
+      request :delete_subnet
       request :delete_tags
       request :delete_volume
+      request :delete_vpc
       request :deregister_image
       request :describe_addresses
       request :describe_availability_zones
       request :describe_images
       request :describe_instances
       request :describe_reserved_instances
+      request :describe_instance_status
       request :describe_key_pairs
       request :describe_placement_groups
       request :describe_regions
@@ -66,8 +75,11 @@ module Fog
       request :describe_spot_datafeed_subscription
       request :describe_spot_instance_requests
       request :describe_spot_price_history
+      request :describe_subnets
       request :describe_tags
       request :describe_volumes
+      request :describe_volume_status
+      request :describe_vpcs
       request :detach_volume
       request :disassociate_address
       request :get_console_output
@@ -123,6 +135,7 @@ module Fog
                   'default' => {
                     'groupDescription'    => 'default group',
                     'groupName'           => 'default',
+                    'groupId'             => 'sg-11223344',
                     'ipPermissionsEgress' => [],
                     'ipPermissions'       => [
                       {
@@ -170,7 +183,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
@@ -247,8 +260,9 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in
-        #     ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance,
+        #     'eu-west-1', 'us-east-1', and etc.
+        #   * aws_session_token<~String> - when using Session Tokens or Federated Users, a session_token must be presented
         #
         # ==== Returns
         # * EC2 object with connection to aws.
@@ -257,6 +271,7 @@ module Fog
 
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @region                 = options[:region] ||= 'us-east-1'
@@ -268,22 +283,7 @@ module Fog
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
-            @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              'ec2.ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              'ec2.ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              'ec2.eu-west-1.amazonaws.com'
-            when 'us-east-1'
-              'ec2.us-east-1.amazonaws.com'
-            when 'us-west-1'
-              'ec2.us-west-1.amazonaws.com'
-            when 'us-west-2'
-              'ec2.us-west-2.amazonaws.com'
-            else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-            end
+            @host = options[:host] || "ec2.#{options[:region]}.amazonaws.com"
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || false
             @port       = options[:port]        || 443
@@ -306,11 +306,12 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2011-05-15'
+              :version            => '2012-03-01'
             }
           )
 

data/lib/fog/aws/dns.rb

@@ -89,7 +89,7 @@ module Fog
           @persistent = options[:persistent]  || true
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @version    = options[:version]     || '2010-10-01'
+          @version    = options[:version]     || '2011-05-05'
 
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
@@ -104,7 +104,7 @@ module Fog
           params[:headers] ||= {}
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['X-Amzn-Authorization'] = "AWS3-HTTPS AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}"
-          params[:path] = "/#{@version}/#{params[:path]}" 
+          params[:path] = "/#{@version}/#{params[:path]}"
           @connection.request(params, &block)
         end
 

data/lib/fog/aws/dynamodb.rb

@@ -0,0 +1,162 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+
+module Fog
+  module AWS
+    class DynamoDB < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :aws_session_token, :host, :path, :port, :scheme, :persistent, :region
+
+      request_path 'fog/aws/requests/dynamodb'
+      request :batch_get_item
+      request :create_table
+      request :delete_item
+      request :delete_table
+      request :describe_table
+      request :get_item
+      request :list_tables
+      request :put_item
+      request :query
+      request :scan
+      request :update_item
+      request :update_table
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :domains => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
+
+        def data
+          self.class.data[@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data.delete(@aws_access_key_id)
+        end
+
+      end
+
+      class Real
+
+        # Initialize connection to DynamoDB
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   ddb = DynamoDB.new(
+        #     :aws_access_key_id => your_aws_access_key_id,
+        #     :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * DynamoDB object with connection to aws
+        def initialize(options={})
+          require 'multi_json'
+
+          if options[:aws_session_token]
+            @aws_access_key_id      = options[:aws_access_key_id]
+            @aws_secret_access_key  = options[:aws_secret_access_key]
+            @aws_session_token      = options[:aws_session_token]
+          else
+            sts = Fog::AWS::STS.new(
+              :aws_access_key_id      => options[:aws_access_key_id],
+              :aws_secret_access_key  => options[:aws_secret_access_key]
+            )
+            session_data = sts.get_session_token.body
+
+            @aws_access_key_id      = session_data['AccessKeyId']
+            @aws_secret_access_key  = session_data['SecretAccessKey']
+            @aws_session_token      = session_data['SessionToken']
+          end
+          @connection_options     = options[:connection_options] || {}
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || "dynamodb.#{options[:region]}.amazonaws.com"
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || '80' #443
+          @scheme     = options[:scheme]      || 'http' #'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+        end
+
+        private
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          idempotent = params.delete(:idempotent)
+
+          now = Fog::Time.now
+          headers = {
+            'Content-Type'          => 'application/x-amz-json-1.0',
+            'x-amz-date'            => Fog::Time.now.to_date_header,
+            'x-amz-security-token'  => @aws_session_token
+          }.merge(params[:headers])
+          headers['x-amzn-authorization']  = signed_authorization_header(params, headers)
+
+          response = @connection.request({
+            :body       => params[:body],
+            :expects    => 200,
+            :headers    => headers,
+            :host       => @host,
+            :idempotent => idempotent,
+            :method     => 'POST',
+          })
+
+          unless response.body.empty?
+            response.body = MultiJson.decode(response.body)
+          end
+
+          response
+        end
+
+        def signed_authorization_header(params, headers)
+          string_to_sign = "POST\n/\n\nhost:#{@host}:#{@port}\n"
+
+          amz_headers, canonical_amz_headers = {}, ''
+          for key, value in headers
+            if key[0..5] == 'x-amz-'
+              amz_headers[key] = value
+            end
+          end
+          amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
+          for key, value in amz_headers
+            canonical_amz_headers << "#{key}:#{value}\n"
+          end
+          string_to_sign << canonical_amz_headers
+          string_to_sign << "\n"
+          string_to_sign << (params[:body] || '')
+
+          string_to_sign = OpenSSL::Digest::SHA256.digest(string_to_sign)
+
+          signed_string = @hmac.sign(string_to_sign)
+          signature = Base64.encode64(signed_string).chomp!
+
+          "AWS3 AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA256,Signature=#{signature}"
+        end
+
+      end
+    end
+  end
+end