aws-sdk-core 2.0.0.rc1 → 2.0.0.rc2

data/lib/aws/plugins/credentials.rb

@@ -31,10 +31,11 @@ module Aws
       }
 
       option(:credentials) do |config|
-        Aws::Credentials.new(
+        credentials = Aws::Credentials.new(
           config.access_key_id,
           config.secret_access_key,
           config.session_token)
+        credentials.set? ? credentials : nil
       end
 
       def after_initialize(client)

data/lib/aws/plugins/glacier_account_id.rb

@@ -0,0 +1,11 @@
+module Aws
+  module Plugins
+    class GlacierAccountId < Seahorse::Client::Plugin
+      option :account_id, '-'
+
+      handle_request(step: :validate, priority: 99) do |context|
+        context.params[:account_id] ||= context.config.account_id
+      end
+    end
+  end
+end

data/lib/aws/plugins/glacier_checksums.rb

@@ -59,14 +59,18 @@ module Aws
           tree_digest = OpenSSL::Digest::Digest.new('sha256')
           tree_parts = []
 
-          until body.eof?
+          # if the body is empty/EOF, then we should compute the
+          # digests of the empty string
+          if body.size == 0
+            tree_parts << tree_digest.update('').digest
+            digest.update('')
+          end
 
+          until body.eof?
             chunk = body.read(1024 * 1024) # read 1MB
             tree_parts << tree_digest.update(chunk).digest
             tree_digest.reset
-
             digest.update(chunk)
-
           end
 
           body.rewind

data/lib/aws/plugins/instance_profile_credentials.rb

@@ -0,0 +1,14 @@
+module Aws
+  module Plugins
+    # Adds support for loading access credentials from the EC2 instance
+    # metada service.
+    class InstanceProfileCredentials < Seahorse::Client::Plugin
+
+      option(:credentials) do
+        credentials = Aws::InstanceProfileCredentials.new
+        credentials.set? ? credentials : nil
+      end
+
+    end
+  end
+end

data/lib/aws/plugins/s3_bucket_dns.rb

@@ -19,37 +19,40 @@ module Aws
       # the classic region.
       option(:force_path_style, false)
 
+      def add_handlers(handlers, config)
+        handlers.add(Handler) unless config.force_path_style
+      end
+
       # @api private
       class Handler < Seahorse::Client::Handler
 
         def call(context)
-          unless context.config.force_path_style
-            move_dns_compat_bucket_to_subdomain(context)
-          end
+          move_dns_compat_bucket_to_subdomain(context)
           @handler.call(context)
         end
 
         private
 
         def move_dns_compat_bucket_to_subdomain(context)
-          if bucket_name = context.params[:bucket]
-            req = context.http_request
-            if S3BucketDns.dns_compatible?(bucket_name, req.endpoint.https?)
-              move_bucket_to_subdomain(bucket_name, req)
-            end
+          bucket_name = context.params[:bucket]
+          endpoint = context.http_request.endpoint
+          if
+            bucket_name &&
+            S3BucketDns.dns_compatible?(bucket_name, endpoint.https?)
+          then
+            move_bucket_to_subdomain(bucket_name, endpoint)
           end
         end
 
-        def move_bucket_to_subdomain(bucket_name, req)
-          req.endpoint.host = "#{bucket_name}.#{req.endpoint.host}"
-          req.path = req.path[(bucket_name.size + 1)..-1]
-          req.path = "/#{req.path}" unless req.path.match(/^\//)
+        def move_bucket_to_subdomain(bucket_name, endpoint)
+          endpoint.host = "#{bucket_name}.#{endpoint.host}"
+          request_uri = endpoint.request_uri.sub("/#{bucket_name}", '')
+          request_uri = "/#{request_uri}" unless request_uri.match(/^\//)
+          endpoint.request_uri = request_uri
         end
 
       end
 
-      handler(Handler)
-
       class << self
 
         # @param [String] bucket_name

data/lib/aws/plugins/s3_md5s.rb

@@ -4,7 +4,7 @@ require 'base64'
 module Aws
   module Plugins
 
-    # @seahorse.client.option [Boolean] :compute_optional_md5s (true)
+    # @seahorse.client.option [Boolean] :compute_checksums (true)
     #   When `true` a MD5 checksum will be computed for all requests that
     #   accept the optional `Content-MD5` header.  Checksum errors returned
     #   by Amazon S3 are automatically retried up to `:retry_limit` times.
@@ -41,7 +41,7 @@ module Aws
 
       end
 
-      option(:compute_optional_md5s, true)
+      option(:compute_checksums, true)
 
       def add_handlers(handlers, config)
         options = {
@@ -49,7 +49,7 @@ module Aws
           step: :build, # the request is built but before it is signed
         }
 
-        if !config.compute_optional_md5s
+        if !config.compute_checksums
           options[:operations] = REQUIRED_OPERATIONS
         end
 

data/lib/aws/service.rb

@@ -176,6 +176,16 @@ module Aws
         klass
       end
 
+      # @api private
+      def const_missing(constant)
+        if constant =~ /^V\d{8}$/
+          api = api(api_version(constant))
+          const_set(constant, Seahorse::Client.define(api: api))
+        else
+          super
+        end
+      end
+
       private
 
       def svc_locked_version
@@ -196,15 +206,6 @@ module Aws
         @apis ||= {}
       end
 
-      def const_missing(constant)
-        if constant =~ /^V\d{8}$/
-          api = api(api_version(constant))
-          const_set(constant, Seahorse::Client.define(api: api))
-        else
-          super
-        end
-      end
-
       def api(api_version)
         api = apis[api_version]
         case api

data/lib/aws/signers/s3.rb

@@ -137,7 +137,7 @@ module Aws
         end
 
         # append the path name (no querystring)
-        parts << request.path.split('?')[0]
+        parts << request.endpoint.path
 
         # lastly any sub resource querystring params need to be appened
         # in lexigraphical ordered joined by '&' and prefixed by '?'
@@ -152,7 +152,7 @@ module Aws
       end
 
       def signed_querystring_params(request)
-        request.querystring.to_s.split('&').select do |p|
+        request.endpoint.querystring.to_s.split('&').select do |p|
           SIGNED_QUERYSTRING_PARAMS.include?(p.split('=')[0])
         end.map { |p| URI.decode(p) }
       end

data/lib/aws/signers/v2.rb

@@ -26,7 +26,7 @@ module Aws
         [
           http_request.http_method,
           host(http_request),
-          http_request.pathname,
+          http_request.endpoint.path,
           params.to_s,
         ].join("\n")
       end

data/lib/aws/signers/v4.rb

@@ -77,8 +77,8 @@ module Aws
       def canonical_request(request)
         [
           request.http_method,
-          request.pathname,
-          request.querystring,
+          request.endpoint.path,
+          request.endpoint.querystring,
           canonical_headers(request) + "\n",
           signed_headers(request),
           request.headers['X-Amz-Content-Sha256']

data/lib/aws/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

data/lib/aws/xml/serializer.rb

@@ -4,7 +4,7 @@ module Aws
     class Serializer
 
       def setup_request(context)
-        context.http_request.headers['Content-Type'] = 'application/xml'
+        context.http_request.headers['Content-Type'] ||= 'application/xml'
       end
 
       def serialize_params(context, rules, params)

data/spec/aws/instance_profile_credentials_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+module Aws
+  describe InstanceProfileCredentials do
+
+    let(:path) { '/latest/meta-data/iam/security-credentials/' }
+
+    describe 'without instance metadata service present' do
+
+      [
+        Errno::EHOSTUNREACH,
+        Errno::ECONNREFUSED,
+        SocketError,
+        Timeout::Error,
+      ].each do |error_class|
+        it "returns no credentials for #{error_class}" do
+          stub_request(:get, "http://169.254.169.254#{path}").to_raise(error_class)
+          expect(InstanceProfileCredentials.new.set?).to be(false)
+        end
+      end
+
+    end
+
+    describe 'with instance metadata service present' do
+
+      let(:expiration) { Time.now.utc + 3600 }
+      let(:expiration2) { expiration + 3600 }
+
+      let(:resp) { <<-JSON.strip }
+{
+  "Code" : "Success",
+  "LastUpdated" : "2013-11-22T20:03:48Z",
+  "Type" : "AWS-HMAC",
+  "AccessKeyId" : "akid",
+  "SecretAccessKey" : "secret",
+  "Token" : "session-token",
+  "Expiration" : "#{expiration.strftime('%Y-%m-%dT%H:%M:%SZ')}"
+}
+      JSON
+
+      let(:resp2) { <<-JSON.strip }
+{
+  "Code" : "Success",
+  "LastUpdated" : "2013-11-22T20:03:48Z",
+  "Type" : "AWS-HMAC",
+  "AccessKeyId" : "akid-2",
+  "SecretAccessKey" : "secret-2",
+  "Token" : "session-token-2",
+  "Expiration" : "#{(expiration2).strftime('%Y-%m-%dT%H:%M:%SZ')}"
+}
+      JSON
+
+      before(:each) do
+        stub_request(:get, "http://169.254.169.254#{path}").
+          to_return(:status => 200, :body => "profile-name\n")
+        stub_request(:get, "http://169.254.169.254#{path}profile-name").
+          to_return(:status => 200, :body => resp).
+          to_return(:status => 200, :body => resp2)
+      end
+
+      it 'populates credentials from the instance profile' do
+        c = InstanceProfileCredentials.new
+        expect(c.access_key_id).to eq('akid')
+        expect(c.secret_access_key).to eq('secret')
+        expect(c.session_token).to eq('session-token')
+        expect(c.expiration.to_s).to eq(expiration.to_s)
+      end
+
+      it 're-queries the metadata service when #refresh! is called' do
+        c = InstanceProfileCredentials.new
+        c.refresh!
+        expect(c.access_key_id).to eq('akid-2')
+        expect(c.secret_access_key).to eq('secret-2')
+        expect(c.session_token).to eq('session-token-2')
+        expect(c.expiration.to_s).to eq(expiration2.to_s)
+      end
+
+      describe 'auto refreshing' do
+
+        # expire in 4 minutes
+        let(:expiration) { Time.now.utc + 299 }
+
+        it 'auto-refreshes within 5 minutes from expiration' do
+          c = InstanceProfileCredentials.new
+          expect(c.access_key_id).to eq('akid-2')
+          expect(c.secret_access_key).to eq('secret-2')
+          expect(c.session_token).to eq('session-token-2')
+          expect(c.expiration.to_s).to eq(expiration2.to_s)
+        end
+
+      end
+    end
+  end
+end

data/spec/aws/operations_spec.rb

@@ -84,7 +84,7 @@ module Aws
       if f.request
         expect(http_req.endpoint.host).to eq(f.request.host) if f.request.host
         expect(http_req.http_method).to eq(f.request.method) if f.request.method
-        expect(http_req.path).to eq(f.request.path) if f.request.path
+        expect(http_req.endpoint.request_uri).to eq(f.request.path) if f.request.path
         if f.request.headers
           f.request.headers.each_pair do |header, value|
             expected_value = value.nil? ? nil : value.to_s

data/spec/aws/plugins/credentials_spec.rb

@@ -21,9 +21,9 @@ module Aws
           expect(config.build!).to respond_to(:credentials)
         end
 
-        it 'defaults to a Credentials object' do
+        it 'defaults to nil when credentials not set' do
           plugin.add_options(config)
-          expect(config.build!.credentials).to be_kind_of(Aws::Credentials)
+          expect(config.build!.credentials).to be(nil)
         end
 
         it 'hydrates credentials from the env (AWS_)' do

data/spec/fixtures/operations/glacier/account_id_param.yml

@@ -0,0 +1,13 @@
+# This test ensures the `:account_id` param can be specified and that
+# it will override the default configured account id.
+config:
+  account_id: 'CONFIG-ACCOUNT-ID'
+operation: list_vaults
+params:
+  :account_id: 'PARAM-ACCOUNT-ID'
+request:
+  path: /PARAM-ACCOUNT-ID/vaults
+response:
+  status_code: 200
+  body: |
+    {"Marker":null,"VaultList":[]}

data/spec/fixtures/operations/glacier/custom_account_id.yml

@@ -0,0 +1,11 @@
+# This test ensures the default `:account_id` of '-' can be replaced via config
+config:
+  account_id: 'ACCOUNT-ID'
+operation: list_vaults
+params: {}
+request:
+  path: /ACCOUNT-ID/vaults
+response:
+  status_code: 200
+  body: |
+    {"Marker":null,"VaultList":[]}

data/spec/fixtures/operations/glacier/default_account_id.yml

@@ -0,0 +1,10 @@
+# This test ensures the `:account_id` need not be supplied and that it defaults
+# to the '-' string, which means current account
+operation: list_vaults
+params: {}
+request:
+  path: /-/vaults
+response:
+  status_code: 200
+  body: |
+    {"Marker":null,"VaultList":[]}

data/spec/fixtures/operations/s3/content_type_header.yml

@@ -0,0 +1,12 @@
+# This test ensures that the content type param makes it to the Content-Type
+# header.  There was a bug that caused S3 to always set the content
+# type to application/xml.
+operation: put_object
+params:
+  :bucket: 'bucket-name'
+  :key: 'key'
+  :body: 'abc'
+  :content_type: 'text/plain'
+request:
+  headers:
+    Content-Type: 'text/plain'

data/spec/fixtures/operations/s3/md5_checksum_disabled.yml

@@ -1,5 +1,5 @@
 config:
-  compute_optional_md5s: false
+  compute_checksums: false
 operation: put_object
 params:
   :bucket: 'bucket-name'

data/tasks/apis.rake

@@ -8,7 +8,6 @@ namespace :api do
 
   desc "Lists the supported services and their API versions"
   task :versions do
-    require 'aws-sdk-core'
     supported = []
     Aws.service_classes.each do |key, svc|
       name = svc.default_client_class.api.metadata['service_full_name']
@@ -26,6 +25,8 @@ namespace :api do
       svc_task = "translate:#{svc}"
       version_task = "translate:#{svc}:#{version}"
       task(version_task) { translate_api(path) }
+
+      desc "Translate source APIs for #{svc}" if ENV['ALL']
       task(svc_task => version_task)
 
       desc "Translate source APIs into Seahorse APIs"
@@ -36,7 +37,6 @@ namespace :api do
 end
 
 def translate_api(path)
-  require 'aws-sdk-core'
   api = Aws::Api::Translator.translate(
     JSON.parse(File.read(path), max_nesting: false), documentation: false,
     errors: false)

data/tasks/docs.rake

@@ -1,11 +1,13 @@
 namespace :doc do
 
+  desc "Delete the locally generated docs" if ENV['ALL']
   task :clobber do
     rm_rf ".yardoc"
     rm_rf "doc"
   end
 
   # Updates the list of supported services and versions in the README
+  desc "Updated the list of supported services in the README" if ENV['ALL']
   task :readme do
     lines = []
     skip = false
@@ -35,7 +37,6 @@ def supported_services_table
   line = "| %-35s | %-25s | %-30s |\n"
 
   lines = []
-  require 'aws-sdk-core'
   Aws.service_classes.keys.sort_by(&:downcase).each do |svc|
     svc = Aws.service_classes[svc]
     client = svc.default_client_class