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

data/apis/source/storagegateway-2013-06-30.paginators.json

@@ -0,0 +1,28 @@
+{
+  "pagination": {
+    "DescribeCachediSCSIVolumes": {
+      "result_key": "CachediSCSIVolumes"
+    },
+    "DescribeStorediSCSIVolumes": {
+      "result_key": "StorediSCSIVolumes"
+    },
+    "ListGateways": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "limit_key": "Limit",
+      "result_key": "Gateways"
+    },
+    "ListLocalDisks": {
+      "result_key": "Disks"
+    },
+    "ListVolumeRecoveryPoints": {
+      "result_key": "VolumeRecoveryPointInfos"
+    },
+    "ListVolumes": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "limit_key": "Limit",
+      "result_key": "VolumeInfos"
+    }
+  }
+}

data/doc-src/plugins/apis.rb

@@ -56,10 +56,53 @@ Returns a new instance of {#{svc_name}}.
 end
 
 def document_svc_class(svc_name, apis)
+
+  oldest_api = apis.sort_by(&:version).first
+  default_api = apis.sort_by(&:version).last
+  full_name = default_api.metadata['service_full_name']
+
   namespace = YARD::Registry['Aws']
   klass = YARD::CodeObjects::ClassObject.new(namespace, svc_name)
   klass.superclass = YARD::Registry['Aws::Service']
-  klass.docstring = 'A service constructor.'
+  klass.docstring = <<-DOCSTRING
+A service client builder for #{full_name}.
+
+## Configuration
+
+You can specify global default configuration options via `Aws.config`.  Values
+in `Aws.config` are used as default options for all services.
+
+    Aws.config[:region] = 'us-west-2'
+
+You can specify service specific defaults as well:
+
+    Aws.config[:#{svc_name.downcase}] = { region: 'us-west-1' }
+
+This has a higher precendence that values at the root of `Aws.config` and will
+only applied to objects constructed by {new}.
+
+## Regions & Endpoints
+
+You must configure a default region with `Aws.config` or provide a `:region`
+when creating a service client.  The regions listed below will connect
+to the following endpoints:
+
+#{default_api.metadata['regional_endpoints'].map { |r,e| "* `#{r}` - #{e}"}.join("\n")}
+
+## API Versions
+
+Calling {new} will construct and return a versioned service client. The client
+will default to the most recent API version. You can also specify an API version:
+
+    #{svc_name.downcase} = Aws::#{svc_name}.new # Aws::#{svc_name}::V#{default_api.version.gsub(/-/, '')}
+    #{svc_name.downcase} = Aws::#{svc_name}.new(api_version: '#{oldest_api.version}') # Aws::#{svc_name}::V#{oldest_api.version.gsub(/-/, '')}
+
+The following API versions are available for Aws::#{svc_name}:
+
+#{apis.map{ |a| "* {V#{a.version.gsub(/-/, '')} #{a.version}}" }.join("\n")}
+
+You can specify the API version for the client by passing `:api_version` to {new}.
+  DOCSTRING
   klass.docstring.add_tag(YARD::Tags::Tag.new(:service, svc_name))
 
   svc = Aws.const_get(svc_name)

data/doc-src/templates/default/fulldoc/html/setup.rb

@@ -35,7 +35,7 @@ def class_list(root = Registry.root)
 
     services = Registry.at('Aws').children.select { |c| c.has_tag?(:service) }
 
-    services.each do |svc|
+    services.sort_by(&:name).each do |svc|
       out << "<li><a class='toggle'></a>"
       out << linkify(svc, svc.name)
       out << " &lt; Service"

data/features/common/step_definitions.rb

@@ -1,10 +1,8 @@
 def call_request(service, operation_name, params = {})
   service = instance_variable_get("@#{service}")
-  begin
-    @response = service.build_request(operation_name, params).send_request
-  rescue Aws::Errors::ServiceError => error
-    @error = error
-  end
+  @response = service.build_request(operation_name, params).send_request
+  @error = @response.error
+  @response
 end
 
 def eventually(seconds = 15, &block)

data/features/env.rb

@@ -21,3 +21,5 @@ else
   puts msg
   exit(0)
 end
+
+Aws.config[:raise_response_errors] = false

data/features/glacier/client.feature

@@ -20,6 +20,14 @@ Feature: Amazon Glacier
     When I upload an archive from a 5.5MB large file
     Then I should be able to delete the archive
 
+  # There was an issue where the client would fail attempting to compute
+  # a checksum of an empty body, this step ensures that the checksum
+  # computation does not hang.
+  @upload
+  Scenario: Attempting to upload an empty archive
+    When I upload an archive with the contents ""
+    Then a "InvalidParameterValueException" error should be raised
+
   Scenario: Error handling
     When I call "list_vaults" on "glacier" with:
     """

data/features/glacier/step_definitions.rb

@@ -1,9 +1,9 @@
 def upload_glacier_archive(contents)
-  @response = @glacier.upload_archive(
+  resp = call_request('glacier', 'upload_archive', {
     vault_name: @vault_name,
-    account_id: '-',
-    body: contents)
-  @archive_id = @response.archive_id
+    body: contents,
+  })
+  @archive_id = resp.data.archive_id if resp.data
 end
 
 When(/^I upload an archive with the contents "(.*?)"$/) do |contents|
@@ -18,8 +18,8 @@ When(/^I upload an archive from a (\d+\.\d+)MB large file$/) do |size|
 end
 
 Then(/^I should be able to delete the archive$/) do
-  @glacier.delete_archive(
+  call_request('glacier', 'delete_archive', {
     vault_name: @vault_name,
-    account_id: '-',
-    archive_id: @archive_id)
+    archive_id: @archive_id,
+  })
 end

data/features/s3/step_definitions.rb

@@ -40,9 +40,8 @@ end
 
 Then(/^the bucket should not exist$/) do
   eventually do
-    expect {
-      @s3.get_bucket_location(bucket: @bucket_name)
-    }.to raise_error(Aws::S3::Errors::NoSuchBucket)
+    resp = @s3.get_bucket_location(bucket: @bucket_name)
+    expect(resp.error).to be_kind_of(Aws::S3::Errors::NoSuchBucket)
   end
 end
 

data/lib/aws.rb

@@ -3,103 +3,109 @@ module Aws
   # @api private
   GEM_ROOT = File.dirname(File.dirname(__FILE__))
 
+  # @api private
+  SRC = GEM_ROOT + '/lib/aws'
+
   @config = {}
 
-  autoload :Credentials, 'aws/credentials'
-  autoload :Errors, 'aws/errors'
-  autoload :ErrorHandler, 'aws/error_handler'
-  autoload :RequestHandler, 'aws/request_handler'
-  autoload :ResponseHandler, 'aws/response_handler'
-  autoload :Service, 'aws/service'
-  autoload :Structure, 'aws/structure'
-  autoload :TimestampFormatter, 'aws/timestamp_formatter'
-  autoload :Util, 'aws/util'
-  autoload :VERSION, 'aws/version'
+  autoload :Credentials, "#{SRC}/credentials"
+  autoload :Errors, "#{SRC}/errors"
+  autoload :ErrorHandler, "#{SRC}/error_handler"
+  autoload :InstanceProfileCredentials, "#{SRC}/instance_profile_credentials"
+  autoload :RequestHandler, "#{SRC}/request_handler"
+  autoload :ResponseHandler, "#{SRC}/response_handler"
+  autoload :Service, "#{SRC}/service"
+  autoload :Structure, "#{SRC}/structure"
+  autoload :TimestampFormatter, "#{SRC}/timestamp_formatter"
+  autoload :Util, "#{SRC}/util"
+  autoload :VERSION, "#{SRC}/version"
 
   # @api private
   module Api
-    autoload :BaseTranslator, 'aws/api/base_translator'
-    autoload :Documentor, 'aws/api/documentor'
-    autoload :DocExample, 'aws/api/doc_example'
-    autoload :InputShapeTranslator, 'aws/api/shape_translator'
-    autoload :OperationTranslator, 'aws/api/operation_translator'
-    autoload :OutputShapeTranslator, 'aws/api/shape_translator'
-    autoload :ServiceNamer, 'aws/api/service_namer'
-    autoload :ShapeTranslator, 'aws/api/shape_translator'
-    autoload :Translator, 'aws/api/translator'
-    autoload :Visitor, 'aws/api/visitor'
+    autoload :BaseTranslator, "#{SRC}/api/base_translator"
+    autoload :Documentor, "#{SRC}/api/documentor"
+    autoload :DocExample, "#{SRC}/api/doc_example"
+    autoload :InputShapeTranslator, "#{SRC}/api/shape_translator"
+    autoload :OperationTranslator, "#{SRC}/api/operation_translator"
+    autoload :OutputShapeTranslator, "#{SRC}/api/shape_translator"
+    autoload :ServiceNamer, "#{SRC}/api/service_namer"
+    autoload :ShapeTranslator, "#{SRC}/api/shape_translator"
+    autoload :Translator, "#{SRC}/api/translator"
+    autoload :Visitor, "#{SRC}/api/visitor"
 
     module ServiceTranslators
-      autoload :CloudFront, 'aws/api/service_translators/cloud_front'
-      autoload :DynamoDB, 'aws/api/service_translators/dynamo_db'
-      autoload :Glacier, 'aws/api/service_translators/glacier'
-      autoload :ImportExport, 'aws/api/service_translators/import_export'
-      autoload :Route53, 'aws/api/service_translators/route53'
-      autoload :S3, 'aws/api/service_translators/s3'
-      autoload :SQS, 'aws/api/service_translators/sqs'
-      autoload :SWF, 'aws/api/service_translators/swf'
+      autoload :CloudFront, "#{SRC}/api/service_translators/cloud_front"
+      autoload :DynamoDB, "#{SRC}/api/service_translators/dynamo_db"
+      autoload :Glacier, "#{SRC}/api/service_translators/glacier"
+      autoload :ImportExport, "#{SRC}/api/service_translators/import_export"
+      autoload :Route53, "#{SRC}/api/service_translators/route53"
+      autoload :S3, "#{SRC}/api/service_translators/s3"
+      autoload :SQS, "#{SRC}/api/service_translators/sqs"
+      autoload :SWF, "#{SRC}/api/service_translators/swf"
     end
 
   end
 
   # @api private
   module Json
-    autoload :Builder, 'aws/json/builder'
-    autoload :ErrorParser, 'aws/json/error_parser'
-    autoload :Parser, 'aws/json/parser'
-    autoload :Serializer, 'aws/json/serializer'
+    autoload :Builder, "#{SRC}/json/builder"
+    autoload :ErrorParser, "#{SRC}/json/error_parser"
+    autoload :Parser, "#{SRC}/json/parser"
+    autoload :Serializer, "#{SRC}/json/serializer"
   end
 
   module Plugins
-    autoload :Credentials, 'aws/plugins/credentials'
-    autoload :DynamoDBExtendedRetries, 'aws/plugins/dynamodb_extended_retries'
-    autoload :GlacierApiVersion, 'aws/plugins/glacier_api_version'
-    autoload :GlacierChecksums, 'aws/plugins/glacier_checksums'
-    autoload :GlobalConfiguration, 'aws/plugins/global_configuration'
-    autoload :JsonProtocol, 'aws/plugins/json_protocol'
-    autoload :JsonRpcHeaders, 'aws/plugins/json_rpc_headers'
-    autoload :QueryProtocol, 'aws/plugins/query_protocol'
-    autoload :RegionalEndpoint, 'aws/plugins/regional_endpoint'
-    autoload :RetryErrors, 'aws/plugins/retry_errors'
-    autoload :S3BucketDns, 'aws/plugins/s3_bucket_dns'
-    autoload :S3CompleteMultipartUploadFix, 'aws/plugins/s3_complete_multipart_upload_fix'
-    autoload :S3GetBucketLocationFix, 'aws/plugins/s3_get_bucket_location_fix'
-    autoload :S3Md5s, 'aws/plugins/s3_md5s'
-    autoload :S3Redirects, 'aws/plugins/s3_redirects'
-    autoload :S3Signer, 'aws/plugins/s3_signer'
-    autoload :SignatureV2, 'aws/plugins/signature_v2'
-    autoload :SignatureV3, 'aws/plugins/signature_v3'
-    autoload :SignatureV4, 'aws/plugins/signature_v4'
-    autoload :SQSQueueUrls, 'aws/plugins/sqs_queue_urls'
-    autoload :SWFReadTimeouts, 'aws/plugins/swf_read_timeouts'
-    autoload :UserAgent, 'aws/plugins/user_agent'
-    autoload :XmlProtocol, 'aws/plugins/xml_protocol'
+    autoload :Credentials, "#{SRC}/plugins/credentials"
+    autoload :DynamoDBExtendedRetries, "#{SRC}/plugins/dynamodb_extended_retries"
+    autoload :GlacierAccountId, "#{SRC}/plugins/glacier_account_id"
+    autoload :GlacierApiVersion, "#{SRC}/plugins/glacier_api_version"
+    autoload :GlacierChecksums, "#{SRC}/plugins/glacier_checksums"
+    autoload :GlobalConfiguration, "#{SRC}/plugins/global_configuration"
+    autoload :InstanceProfileCredentials, "#{SRC}/plugins/instance_profile_credentials"
+    autoload :JsonProtocol, "#{SRC}/plugins/json_protocol"
+    autoload :JsonRpcHeaders, "#{SRC}/plugins/json_rpc_headers"
+    autoload :QueryProtocol, "#{SRC}/plugins/query_protocol"
+    autoload :RegionalEndpoint, "#{SRC}/plugins/regional_endpoint"
+    autoload :RetryErrors, "#{SRC}/plugins/retry_errors"
+    autoload :S3BucketDns, "#{SRC}/plugins/s3_bucket_dns"
+    autoload :S3CompleteMultipartUploadFix, "#{SRC}/plugins/s3_complete_multipart_upload_fix"
+    autoload :S3GetBucketLocationFix, "#{SRC}/plugins/s3_get_bucket_location_fix"
+    autoload :S3Md5s, "#{SRC}/plugins/s3_md5s"
+    autoload :S3Redirects, "#{SRC}/plugins/s3_redirects"
+    autoload :S3Signer, "#{SRC}/plugins/s3_signer"
+    autoload :SignatureV2, "#{SRC}/plugins/signature_v2"
+    autoload :SignatureV3, "#{SRC}/plugins/signature_v3"
+    autoload :SignatureV4, "#{SRC}/plugins/signature_v4"
+    autoload :SQSQueueUrls, "#{SRC}/plugins/sqs_queue_urls"
+    autoload :SWFReadTimeouts, "#{SRC}/plugins/swf_read_timeouts"
+    autoload :UserAgent, "#{SRC}/plugins/user_agent"
+    autoload :XmlProtocol, "#{SRC}/plugins/xml_protocol"
   end
 
   # @api private
   module Query
-    autoload :Builder, 'aws/query/builder'
-    autoload :Param, 'aws/query/param'
-    autoload :ParamList, 'aws/query/param_list'
-    autoload :Serializer, 'aws/query/serializer'
+    autoload :Builder, "#{SRC}/query/builder"
+    autoload :Param, "#{SRC}/query/param"
+    autoload :ParamList, "#{SRC}/query/param_list"
+    autoload :Serializer, "#{SRC}/query/serializer"
   end
 
   # @api private
   module Signers
-    autoload :Base, 'aws/signers/base'
-    autoload :Handler, 'aws/signers/handler'
-    autoload :S3, 'aws/signers/s3'
-    autoload :V2, 'aws/signers/v2'
-    autoload :V3, 'aws/signers/v3'
-    autoload :V4, 'aws/signers/v4'
+    autoload :Base, "#{SRC}/signers/base"
+    autoload :Handler, "#{SRC}/signers/handler"
+    autoload :S3, "#{SRC}/signers/s3"
+    autoload :V2, "#{SRC}/signers/v2"
+    autoload :V3, "#{SRC}/signers/v3"
+    autoload :V4, "#{SRC}/signers/v4"
   end
 
   # @api private
   module Xml
-    autoload :Builder, 'aws/xml/builder'
-    autoload :ErrorParser,  'aws/xml/error_parser'
-    autoload :Parser, 'aws/xml/parser'
-    autoload :Serializer, 'aws/xml/serializer'
+    autoload :Builder, "#{SRC}/xml/builder"
+    autoload :ErrorParser,  "#{SRC}/xml/error_parser"
+    autoload :Parser, "#{SRC}/xml/parser"
+    autoload :Serializer, "#{SRC}/xml/serializer"
   end
 
   class << self

data/lib/aws/api/service_translators/glacier.rb

@@ -11,6 +11,7 @@ module Aws::Api::ServiceTranslators::Glacier
     end
 
     def apply_plugins(api)
+      api.plugins << "Aws::Plugins::GlacierAccountId"
       api.plugins << "Aws::Plugins::GlacierApiVersion"
       api.plugins << "Aws::Plugins::GlacierChecksums"
     end

data/lib/aws/api/translator.rb

@@ -4,6 +4,18 @@ module Aws
   module Api
     class Translator < BaseTranslator
 
+      DEFAULT_PLUGINS = %w(
+        Seahorse::Client::Plugins::Logging
+        Seahorse::Client::Plugins::RestfulBindings
+        Seahorse::Client::Plugins::ContentLength
+        Aws::Plugins::UserAgent
+        Aws::Plugins::RetryErrors
+        Aws::Plugins::GlobalConfiguration
+        Aws::Plugins::RegionalEndpoint
+        Aws::Plugins::InstanceProfileCredentials
+        Aws::Plugins::Credentials
+      )
+
       def self.translate(src, options = {})
         super(src, options)
       end
@@ -91,14 +103,7 @@ module Aws
 
       def set_type(type)
         plugins = @properties['plugins'] ||= []
-        plugins << 'Seahorse::Client::Plugins::Logging'
-        plugins << 'Seahorse::Client::Plugins::RestfulBindings'
-        plugins << 'Seahorse::Client::Plugins::ContentLength'
-        plugins << 'Aws::Plugins::UserAgent'
-        plugins << 'Aws::Plugins::RetryErrors'
-        plugins << 'Aws::Plugins::GlobalConfiguration'
-        plugins << 'Aws::Plugins::RegionalEndpoint'
-        plugins << 'Aws::Plugins::Credentials'
+        plugins.concat(DEFAULT_PLUGINS)
         plugins.push(*case type
           when 'query' then ['Aws::Plugins::QueryProtocol']
           when 'json' then [

data/lib/aws/credentials.rb

@@ -11,24 +11,24 @@ module Aws
     end
 
     # @return [String, nil]
-    attr_accessor :access_key_id
+    attr_reader :access_key_id
 
     # @return [String, nil]
-    attr_accessor :secret_access_key
+    attr_reader :secret_access_key
 
     # @return [String, nil]
-    attr_accessor :session_token
+    attr_reader :session_token
 
     # @return [Boolean] Returns `true` if the access key id and secret
     #   access key are both set.
     def set?
-      !!(@access_key_id && @secret_access_key)
+      !!(access_key_id && secret_access_key)
     end
 
     # Removing the secret access key from the default inspect string.
     # @api private
     def inspect
-      "#<#{self.class.name} access_key_id=#{access_key_id}>"
+      "#<#{self.class.name} access_key_id=#{access_key_id.inspect}>"
     end
 
   end

data/lib/aws/instance_profile_credentials.rb

@@ -0,0 +1,113 @@
+require 'time'
+require 'net/http'
+
+module Aws
+  class InstanceProfileCredentials < Credentials
+
+    # @api private
+    class Non200Response < RuntimeError; end
+
+    # These are the errors we trap when attempting to talk to the
+    # instance metadata service.  Any of these imply the service
+    # is not present, no responding or some other non-recoverable
+    # error.
+    # @api private
+    FAILURES = [
+      Errno::EHOSTUNREACH,
+      Errno::ECONNREFUSED,
+      SocketError,
+      Timeout::Error,
+      Non200Response,
+    ]
+
+    # @param [Hash] options
+    # @option options [String] :ip_address ('169.254.169.254')
+    # @option options [Integer] :port (80)
+    # @option options [Float] :http_open_timeout (1)
+    # @option options [Float] :http_read_timeout (1)
+    # @option options [IO] :http_debug_output (nil) HTTP wire
+    #   traces are sent to this object.  You can specify something
+    #   like $stdout.
+    def initialize options = {}
+      @ip_address = options[:ip_address] || '169.254.169.254'
+      @port = options[:port] || 80
+      @http_open_timeout = options[:http_open_timeout] || 1
+      @http_read_timeout = options[:http_read_timeout] || 1
+      @http_debug_output = options[:http_debug_output]
+      refresh!
+    end
+
+    # @return [String,nil]
+    def access_key_id
+      refresh_if_stale
+      @access_key_id
+    end
+
+    # @return [String,nil]
+    def secret_access_key
+      refresh_if_stale
+      @secret_access_key
+    end
+
+    # @return [String,nil]
+    def session_token
+      refresh_if_stale
+      @session_token
+    end
+
+    # @return [Time,nil]
+    def expiration
+      refresh_if_stale
+      @expiration
+    end
+
+    def refresh!
+      credentials = MultiJson.load(get_credentials)
+      @access_key_id = credentials['AccessKeyId']
+      @secret_access_key = credentials['SecretAccessKey']
+      @session_token = credentials['Token']
+      if expires = credentials['Expiration']
+        @expiration = Time.parse(expires)
+      else
+        @expiration = nil
+      end
+    end
+
+    private
+
+    # Refreshes instance metadata credentials if they are within
+    # 5 minutes of expiration.
+    def refresh_if_stale
+      refresh! if @expiration && @expiration.utc <= Time.now.utc + 5 * 60
+    end
+
+    def get_credentials
+      open_connection do |conn|
+        path = '/latest/meta-data/iam/security-credentials/'
+        profile_name = http_get(conn, path).lines.first.strip
+        http_get(conn, path + profile_name)
+      end
+    rescue *FAILURES => e
+      '{}'
+    end
+
+    def open_connection
+      http = Net::HTTP.new(@ip_address, @port)
+      http.open_timeout = @http_open_timeout
+      http.read_timeout = @http_read_timeout
+      http.set_debug_output(@http_debug_output) if @http_debug_output
+      http.start
+      yield(http).tap { http.finish }
+    end
+
+    def http_get(connection, path)
+      response = connection.request(Net::HTTP::Get.new(path))
+      if response.code.to_i == 200
+        response.body
+      else
+        raise Non200Response
+      end
+    end
+
+  end
+end