fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/bin/fog

@@ -37,6 +37,10 @@ else
   @irb.context.prompt_mode = :FOG
   @irb.context.workspace = IRB::WorkSpace.new(binding)
 
+  trap 'INT' do
+    @irb.signal_handle
+  end
+
   Formatador.display_line('Welcome to fog interactive!')
   Formatador.display_line(":#{Fog.credential} provides #{providers}")
   providers = Fog.providers

data/changelog.txt

@@ -1,3 +1,156 @@
+1.8.0 12/01/2012 057c0c525a39e77cb2037c9fec3d851b209c151b
+=========================================================
+
+Stats! { 'collaborators' => 41, 'downloads' => 1334733, 'forks' => 630, 'open_issues' => 98, 'watchers' => 2258 }
+
+[AWS]
+  Adds ModifyVolumeAttribute. thanks Eric Stonfer
+
+[Brightbox]
+  Removes incorrect yard tag. thanks Paul Thornthwaite
+  Updates request docs to use Yard. thanks Paul Thornthwaite
+  Adds baseline documentation. thanks Paul Thornthwaite
+  Documents #request method. thanks Paul Thornthwaite
+  Comments out rogue text. thanks Paul Thornthwaite
+  Fixes generated files EOF with newlines. thanks Paul Thornthwaite
+  Adds Servers#bootstrap. thanks Paul Thornthwaite
+  Adds way to check auth method. thanks Paul Thornthwaite
+  Adds reset FTP for scoped accounts. thanks Paul Thornthwaite
+  Fixes Compute#account to pass service. thanks Paul Thornthwaite
+  Fixes Account#reset_ftp_password. thanks Paul Thornthwaite
+  Fixes test to run out of sequence. thanks Paul Thornthwaite
+  Expands documentation for Compute class. thanks Paul Thornthwaite
+  Tests recognised options. thanks Paul Thornthwaite
+  Refactors credential code in Compute. thanks Paul Thornthwaite
+  Extracts authentication connection. thanks Paul Thornthwaite
+  Refactors how tokens are requested. thanks Paul Thornthwaite
+  Moves tokens to CredentialSet. thanks Paul Thornthwaite
+  Extracts parts of request out of compute. thanks Paul Thornthwaite
+  Adds support for refresh tokens. thanks Paul Thornthwaite
+  Adds option to disable token management. thanks Paul Thornthwaite
+  Adds means to update scoped account. thanks Paul Thornthwaite
+  Moves more of public API into Shared. thanks Paul Thornthwaite
+  Guards unimplemented mock tests. thanks Paul Thornthwaite
+
+[Docs]
+  Switches to using Yard for documentation. thanks Paul Thornthwaite
+
+[aws]
+  fixed auto scaling model group 'destroy' method where it needs to use merge! instead of merge to set the opts local variable in place,  otherwise the options passed to the method are droppedon the floor. thanks Jay Perry
+
+[aws|compute]
+  add offeringType to output from describe_reserved_instances_offerings. thanks geemus
+  fix mocks/tests around describe_reserved_instances_offerings. thanks geemus
+  fix one more offeringType mock format test failure. thanks geemus
+
+[aws|dynamodb]
+  port off of sts for credentials, now uses signature v4. thanks geemus
+
+[aws|storage]
+  Add Fog::Storage::AWS#delete_multiple_objects. thanks Garret Alfert
+  Add mock for Fog::Storage::AWS#delete_multiple_objects. thanks Garret Alfert
+  Little improvements to delete_multiple_objects tests. thanks Garret Alfert
+  Add Fog::Storage::AWS#delete_multiple_objects. thanks Garret Alfert
+  Add mock for Fog::Storage::AWS#delete_multiple_objects. thanks Garret Alfert
+  Little improvements to delete_multiple_objects tests. thanks Garret Alfert
+
+[core]
+  Adds fog User-Agent header. thanks Paul Thornthwaite
+  Splits Fog::VERSION into own file. thanks Paul Thornthwaite
+  Adds fog User-Agent header. thanks Paul Thornthwaite
+  Updates Rakefile to use Fog::VERSION. thanks Paul Thornthwaite
+
+[dns]
+  Add more record tests. thanks Brian Hartsock
+
+[docs]
+  Updates link on fog.io to point to doc. thanks Paul Thornthwaite
+  Updates contributing notes. thanks Paul Thornthwaite
+  Replaces link to API to `rubydoc.info`. thanks Paul Thornthwaite
+  Adds 1.8.7 note to fog.io collaborators guide. thanks Paul Thornthwaite
+
+[misc]
+  Add support for AWS Australia (ap-southeast-2). thanks Amy Woodward
+  Add Hosted Zone ID for ap-southeast-2. thanks Amy Woodward
+  Do not add empty security group. thanks Dan Bode
+  Add attr group. thanks Dan Bode
+  Sync with latest OpenStack flavors extensions. thanks Dan Prince
+  OpenStack floating_ip (aka address) test fixes. thanks Dan Prince
+  OpenStack: Remove volumes from limits tests. thanks Dan Prince
+  OpenStack: updates to quota tests. thanks Dan Prince
+  OpenStack: security group test fixes. thanks Dan Prince
+  add support for Storage::Rackspace::File#access_control_allow_origin and #origin. thanks Dusty Jones
+  add support for Storage::Rackspace::File#access_control_allow_origin and #origin. thanks Dusty Jones
+  Save the file instance before testing for presence of attribute. thanks Dusty Jones
+  Fix describe_instances stateReason handling. thanks Edward Muller
+  added support for Storage::Rackspace::File#metadata. thanks Evan Smith
+  added support for Storage::Rackspace::File#metadata. thanks Evan Smith
+  merged with origin. thanks Evan Smith
+  Rackspace Cloud Files. can load metadata from existing file. can set metadata for new file. can unset metadata for existing file. thanks Evan Smith
+  merged with upstream master. thanks Evan Smith
+  Implemented bootstrap method for Rackspace Compute v2.     Added ability to set "metadata" and "personality" fields when creating a server on Rackspace Compute v2.     Improved response parsing when dealing with Rackspace DNS service. thanks Jesse Scott
+  Removed the commented out password setting line for Rackspace Compute v2 bootstrap method. thanks Jesse Scott
+  Clarified the logic for finding the newly created DNS record for Rackspace Cloud DNS. thanks Jesse Scott
+  fix warning message to follow correct bucket naming guidelines. thanks Michael Elfassy
+  Bucket names cannot begin with the "goog" prefix. Also change for DNS compliant subdomain. thanks Michael Elfassy
+  VMWare vsphere provider refactor. thanks Ohad Levy
+  do not force trailing / on path. thanks Ohad Levy
+  Removes dead link to DNS tests. thanks Paul Thornthwaite
+  Adds link to Code Climate metrics. thanks Paul Thornthwaite
+  Extracts Changelog Rake task to class. thanks Paul Thornthwaite
+  Moves fog.io generation a prerequsite. thanks Paul Thornthwaite
+  Extracts docs rake tasks to a class. thanks Paul Thornthwaite
+  Extracts testing Rake tasks to class. thanks Paul Thornthwaite
+  Moves new Task classes to better location. thanks Paul Thornthwaite
+  Revert "[core] Adds fog User-Agent header". thanks Paul Thornthwaite
+  Inconsistent usage of cpus / vpcus in libvirt / requests.     Reported number of cpus was always 1 for libvirt domains. thanks Romain Vrignaud
+  use CGI.escape when encoding the POST body. thanks Sam Cooper
+  Added versioned delete_multiple_objects support. thanks Timur Alperovich
+  Add support for volume_pool_name. thanks Vincent Demeester
+  fixes issue#1313 ~ Creating user via `Aws.iam.users` ignores `:path`. thanks VirtualStaticVoid
+  revised create logic to default path to '/'. thanks VirtualStaticVoid
+  added test for create logic to default path to '/'. thanks VirtualStaticVoid
+  added support for mock. thanks VirtualStaticVoid
+  revised test order. thanks VirtualStaticVoid
+  README: s/'cloud computing'/'cloud services'. thanks Wesley Beary
+  Adding explicit support for metadata for Rackspace compute_v2. thanks heyryanw
+  removed Fog::AWS[:rds] this was creating issues with was security credentials. thanks mauro catenacci
+  Adding public_ip_address and private_ip_address to Fog::Compute::RackspaceV2::Server. thanks sashap
+  Adding bootstrap and setup for RackspaceV2 servers. thanks sashap
+
+[openstack]
+  Add Accept header with application/json media type to requests. thanks Andrew Donald Kennedy
+  Refactor Openstack Authentication. thanks Nelvin Driz
+  Fix Typo in Merge of Authentication Refactoring. thanks Nelvin Driz
+  Make use of the unscoped token for reauthentication. thanks Philip Mark M. Deazeta
+
+[openstack|compute]
+  Add "Reset Server State" request. thanks Nelvin Driz
+  Add `get_limits` request. thanks Nelvin Driz
+
+[openstack|identity]
+  use tenant_id parameter in users model. thanks Philip Mark M. Deazeta
+  Add `attr_accessor :unscoped_token` to Mock. thanks Philip Mark M. Deazeta
+
+[opnestack|identity]
+  Added set_tenant request for identity service. thanks Philip Mark M. Deazeta
+
+[rackspace|computev2]
+  aded test for bootstrap. thanks Brian Hartsock
+
+[rackspace|dns]
+  fixed tests, merged some formatting to reduce duplication. thanks Brian Hartsock
+
+[rackspace|storage]
+  rackspace files tests should be pending in mocked mode. thanks geemus
+
+[readme]
+  update outdated sponsorship section. thanks geemus
+
+[vsphere]
+  ensure reload works correctly for server. thanks Ohad Levy
+
+
 1.7.0 11/04/2012 aa853488c9d84d849f52cf348787030fbb963163
 =========================================================
 

data/docs/storage/aws.markdown

@@ -0,0 +1,21 @@
+---
+layout: default
+title:  Storage
+---
+
+## AWS Specific Options
+
+Here's a couple Fog features specific only to AWS S3.
+
+**Encryption**. Amazon provides the option to AES256 encrypt files at rest on 
+upload by setting the "x-amz-server-side-encryption" HTTP request header to 
+AES256. You can short hand set this HTTP header via the ````encryption```` key 
+value pair. For example,
+
+    # encrypt file at rest
+    file = directory.files.create(
+      :key      => 'resume.html',
+      :body     => File.open("/path/to/my/resume.html"),
+      :public   => true, 
+      :encryption   => 'AES256'
+    )

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-maestrodev'
-  s.version           = '1.7.0.20121114190951'
-  s.date              = '2012-11-14'
+  s.version           = '1.8.0.20130109172219'
+  s.date              = '2013-01-09'
   s.rubyforge_project = 'fog'
 
 
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll')
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
-  s.add_development_dependency('rdoc')
+  s.add_development_dependency('yard')
   s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
   s.add_development_dependency('rbovirt', '>=0.0.11')

data/lib/fog.rb

@@ -1,11 +1,6 @@
 require File.join(File.dirname(__FILE__), 'fog', 'core')
 
 module Fog
-
-  unless const_defined?(:VERSION)
-    VERSION = '1.7.0'
-  end
-
 end
 
 # FIXME: these should go away (force usage of Fog::[Compute, CDN, DNS, Storage]  etc)

data/lib/fog/atmos/models/storage/directories.rb

@@ -14,7 +14,7 @@ module Fog
         def all
           directory ? ns = directory.key : ns = ''
           ns = ns + '/' unless ns =~ /\/$/
-          data = connection.get_namespace(ns).body[:DirectoryList]
+          data = service.get_namespace(ns).body[:DirectoryList]
           data = {:DirectoryEntry => []} if data.kind_of? String
           data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
           dirs = data[:DirectoryEntry].select {|de| de[:FileType] == 'directory'}
@@ -28,7 +28,7 @@ module Fog
         def get(key, options = {})
           return nil if key == '' # Root dir shouldn't be retrieved like this.
           key =~ /\/$/ ? ns = key : ns = key + '/'
-          res = connection.get_namespace ns
+          res = service.get_namespace ns
           emc_meta = res.headers['x-emc-meta']
           obj_id = emc_meta.scan(/objectid=(\w+),/).flatten[0]
           new(:objectid => obj_id, :key => ns)

data/lib/fog/atmos/models/storage/directory.rb

@@ -12,25 +12,25 @@ module Fog
         def files
           @files ||= begin
                        Fog::Storage::Atmos::Files.new(
-                                                          :directory    => self,
-                                                          :connection   => connection
-                                                          )
-          end
+                         :directory => self,
+                         :service   => service
+                       )
+                     end
         end
 
         def directories
           @directories ||= begin
-                       Fog::Storage::Atmos::Directories.new(
-                                                               :directory    => self,
-                                                               :connection   => connection
-                                                               )
-          end
+                             Fog::Storage::Atmos::Directories.new(
+                               :directory => self,
+                               :service   => service
+                             )
+                           end
         end
 
         def save
           self.key = attributes[:directory].key + key if attributes[:directory]
           self.key = key + '/' unless key =~ /\/$/
-          res = connection.post_namespace key
+          res = service.post_namespace key
           reload
         end
 
@@ -42,7 +42,7 @@ module Fog
               d.destroy(opts)
             end
           end
-          connection.delete_namespace key
+          service.delete_namespace key
         end
 
 

data/lib/fog/atmos/models/storage/file.rb

@@ -29,7 +29,7 @@ module Fog
         end
 
         def copy(target_directory_key, target_file_key, options={})
-          target_directory = connection.directories.new(:key => target_directory_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.create(
             :key => target_file_key,
             :body => body
@@ -38,7 +38,7 @@ module Fog
 
         def destroy
           requires :directory, :key
-          connection.delete_namespace([directory.key, key].join('/'))
+          service.delete_namespace([directory.key, key].join('/'))
           true
         end
 
@@ -60,15 +60,15 @@ module Fog
           file = directory.files.head(key)
           self.objectid = if file.present? then file.attributes['x-emc-meta'].scan(/objectid=(\w+),/).flatten[0] else nil end
           if self.objectid.present?
-            uri = URI::HTTP.build(:scheme => connection.ssl? ? "http" : "https" , :host => connection.host, :port => connection.port.to_i, :path => "/rest/objects/#{self.objectid}" )
+            uri = URI::HTTP.build(:scheme => service.ssl? ? "http" : "https" , :host => service.host, :port => service.port.to_i, :path => "/rest/objects/#{self.objectid}" )
 
             sb = "GET\n"
             sb += uri.path.downcase + "\n"
-            sb += connection.uid + "\n"
+            sb += service.uid + "\n"
             sb += String(expires.to_i())
 
-            signature = connection.sign( sb )
-            uri.query = "uid=#{CGI::escape(connection.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
+            signature = service.sign( sb )
+            uri.query = "uid=#{CGI::escape(service.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
             uri.to_s
           else
             nil
@@ -83,11 +83,11 @@ module Fog
           options[:headers]['Content-Type'] = content_type if content_type
           options[:body] = body
           begin
-            data = connection.post_namespace(ns, options)
+            data = service.post_namespace(ns, options)
             self.objectid = data.headers['location'].split('/')[-1]
           rescue => error
             if error.message =~ /The resource you are trying to create already exists./
-              data = connection.put_namespace(ns, options)
+              data = service.put_namespace(ns, options)
             else
               raise error
             end

data/lib/fog/atmos/models/storage/files.rb

@@ -19,7 +19,7 @@ module Fog
           requires :directory
           directory ? ns = directory.key : ns = ''
           ns = ns + '/' unless ns =~ /\/$/
-          data = connection.get_namespace(ns).body[:DirectoryList]
+          data = service.get_namespace(ns).body[:DirectoryList]
           data = {:DirectoryEntry => []} if data.kind_of? String
           data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
           files = data[:DirectoryEntry].select {|de| de[:FileType] == 'regular'}
@@ -32,7 +32,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = connection.get_namespace(directory.key + key, :parse => false)#, &block)
+          data = service.get_namespace(directory.key + key, :parse => false)#, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -51,7 +51,7 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_namespace(directory.key + key, :parse => false)
+          data = service.head_namespace(directory.key + key, :parse => false)
           file_data = data.headers.merge({
             :body => data.body,
             :key => key

data/lib/fog/aws.rb

@@ -3,6 +3,7 @@ require 'fog/aws/credential_fetcher'
 require 'fog/aws/signaturev4'
 module Fog
   module AWS
+    COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
 
     extend Fog::Provider
 

data/lib/fog/aws/auto_scaling.rb

@@ -258,7 +258,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/cloud_watch.rb

@@ -55,7 +55,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/compute.rb

@@ -65,6 +65,7 @@ module Fog
       request :create_tags
       request :create_volume
       request :create_vpc
+      request :copy_snapshot
       request :delete_dhcp_options
       request :delete_internet_gateway
       request :delete_key_pair
@@ -113,6 +114,7 @@ module Fog
       request :modify_instance_attribute
       request :modify_network_interface_attribute
       request :modify_snapshot_attribute
+      request :modify_volume_attribute
       request :purchase_reserved_instances_offering
       request :reboot_instances
       request :release_address
@@ -220,7 +222,7 @@ module Fog
           setup_credentials(options)
           @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', 'sa-east-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', '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
@@ -319,7 +321,7 @@ module Fog
           @region                 = options[:region] ||= 'us-east-1'
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
-          @version                = options[:version]     ||  '2012-07-20'
+          @version                = options[:version]     ||  '2012-12-01'
 
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)

data/lib/fog/aws/dynamodb.rb

@@ -76,41 +76,30 @@ module Fog
         # * DynamoDB object with connection to aws
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          #TODO check dynamodb stuff
+          @region = options[:region] || 'us-east-1'
 
           setup_credentials(options)
-          
+
           @connection_options     = options[:connection_options] || {}
-          
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || "dynamodb.#{options[:region]}.amazonaws.com"
+
+          @host       = options[:host]        || "dynamodb.#{@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 setup_credentials(options)
-          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]
-            @aws_credentials_expire_at = options[:aws_credentials_expire_at]
-          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
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @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]
+          @aws_credentials_expire_at  = options[:aws_credentials_expire_at]
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'dynamodb')
         end
 
         def reload
@@ -119,25 +108,27 @@ module Fog
 
         def request(params)
           refresh_credentials_if_expired
-          idempotent = params.delete(:idempotent)
-
-          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',
+
+          # defaults for all dynamodb requests
+          params.merge!({
+            :expects  => 200,
+            :host     => @host,
+            :method   => :post,
+            :path     => '/'
           })
 
+          # setup headers and sign with signature v4
+          date = Fog::Time.now
+          params[:headers] = {
+            'Content-Type'  => 'application/x-amz-json-1.0',
+            'Date'          => date.to_iso8601_basic,
+            'Host'          => @host,
+          }.merge!(params[:headers])
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
+          params[:headers]['Authorization'] = @signer.sign(params, date)
+
+          response = @connection.request(params)
+
           unless response.body.empty?
             response.body = Fog::JSON.decode(response.body)
           end
@@ -145,31 +136,6 @@ module Fog
           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