aws-sdk-core 2.0.0.rc13 → 2.0.0.rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316a6bcf420559fb4f1d2d0d4a419c5eabfca62f
-  data.tar.gz: d658cd390c1996551dc8d5a2718b5949eeaa73cc
+  metadata.gz: 6a114b4f1b2952bcbc8fa69c0d2c1ee77d4b765a
+  data.tar.gz: 3e315c708aaa188211a0166108b65b00e5070fe4
 SHA512:
-  metadata.gz: c88dd7bbf3c8f37030cb8d732e752929effc253ba1ddef29c917265c57e387dedbf4bc64132953752097e68edf5312e9b5a2a9f910e9ad288a55eb073e501344
-  data.tar.gz: c3c02a802d170c10a00f6f5b465bd28ce030d096a428e1ddd4e8c644a8d9a5e9b101d49767563e1cda266ba551c87fd7026561e684112b8b319a2a99cbadd62b
+  metadata.gz: 72899869dde1fbddf3a7eb0fb61edf6616e3a15d97bc88e1820c8a04fa6256e1a3eee999ae45054534063bf820db61c690f4d4fd554700bf11e873e53ebfb2e8
+  data.tar.gz: 556e7a49dcad168eddbf0133db95945c4b979d4a03e8bcaf21f2a1fd13117caad0c570c33cded18f98a76fd9540900fb09cfbde9a29258427ff96c18ed74f605

data/README.md

@@ -1,4 +1,4 @@
-# AWS SDK Core [![Build Status](https://travis-ci.org/aws/aws-sdk-core-ruby.png?branch=master)](https://travis-ci.org/aws/aws-sdk-core-ruby) [![Code Climate](https://codeclimate.com/github/aws/aws-sdk-core-ruby.png)](https://codeclimate.com/github/aws/aws-sdk-core-ruby)
+# AWS SDK Core [![Build Status](https://travis-ci.org/aws/aws-sdk-core-ruby.png?branch=master)](https://travis-ci.org/aws/aws-sdk-core-ruby) [![Code Climate](https://codeclimate.com/github/aws/aws-sdk-core-ruby.png)](https://codeclimate.com/github/aws/aws-sdk-core-ruby) [![Coverage Status](https://coveralls.io/repos/aws/aws-sdk-core-ruby/badge.png?branch=master)](https://coveralls.io/r/aws/aws-sdk-core-ruby?branch=master)
 
 This library is in a developer preview period.
 
@@ -9,7 +9,26 @@ than the clients in version 1 of the Ruby SDK.
 
 For version 1.0 of the Ruby SDK, see [aws/aws-sdk-ruby](http://github.com/aws/aws-sdk-ruby).
 
-## 2.0.0.rc11 Upgrading Notes
+#### 2.0.0.rc14 Upgrading Notes
+
+RC14 simplifies the API versioning strategy. This may require small changes for
+users that use the API version locking options. Also, there are minor changes
+when configuring raw endpoints.
+
+* Versioned client classes removed, e.g. `Aws::S3::Client::V20060301.new` should
+  be replaced with `Aws::S3::Client.new` The `:api_version` constructor option
+  is no longer accepted.
+
+* Aws helper methods for client construction deprecated; For example,
+  calling `Aws.s3` will generate a deprecation warning. Call `Aws::S3::Client.new`
+  instead. Top-level helpers will be removed as of v2.0.0 final.
+
+* When configuring an `:endpoint` directly, you must now specify the
+  HTTP scheme, e.g. "http://localhost:3000", instead of "localhost:3000".
+  Please note, this should only be done for testing. Normally you only
+  need to configure a `:region`.
+
+#### 2.0.0.rc11 Upgrading Notes
 
 RC 11 requires a few minor updates.  These should be the final public-facing
 changes before 2.0.0 final.
@@ -193,23 +212,24 @@ version.
 
 | Service Name                        | Service Class             | API Versions                   |
 | ----------------------------------- | ------------------------- | ------------------------------ |
-| Amazon CloudFront                   | CloudFront                | 2014-01-31 — 2014-05-31  |
-| Amazon CloudSearch                  | CloudSearch               | 2011-02-01 — 2013-01-01  |
+| Amazon CloudFront                   | CloudFront                | 2014-05-31                     |
+| Amazon CloudSearch                  | CloudSearch               | 2013-01-01                     |
 | Amazon CloudSearch Domain           | CloudSearchDomain         | 2013-01-01                     |
 | Amazon CloudWatch                   | CloudWatch                | 2010-08-01                     |
 | Amazon CloudWatch Logs              | CloudWatchLogs            | 2014-03-28                     |
 | Amazon Cognito Identity             | CognitoIdentity           | 2014-06-30                     |
 | Amazon Cognito Sync                 | CognitoSync               | 2014-06-30                     |
-| Amazon DynamoDB                     | DynamoDB                  | 2011-12-05 — 2012-08-10  |
+| Amazon DynamoDB                     | DynamoDB                  | 2012-08-10                     |
 | Amazon Elastic Compute Cloud        | EC2                       | 2014-06-15                     |
 | Amazon Elastic MapReduce            | EMR                       | 2009-03-31                     |
 | Amazon Elastic Transcoder           | ElasticTranscoder         | 2012-09-25                     |
-| Amazon ElastiCache                  | ElastiCache               | 2014-03-24                     |
+| Amazon ElastiCache                  | ElastiCache               | 2014-07-15                     |
 | Amazon Glacier                      | Glacier                   | 2012-06-01                     |
 | Amazon Kinesis                      | Kinesis                   | 2013-12-02                     |
 | Amazon Redshift                     | Redshift                  | 2012-12-01                     |
-| Amazon Relational Database Service  | RDS                       | 2013-01-10 — 2013-09-09  |
+| Amazon Relational Database Service  | RDS                       | 2013-09-09                     |
 | Amazon Route 53                     | Route53                   | 2013-04-01                     |
+| Amazon Route 53 Domains             | Route53Domains            | 2014-05-15                     |
 | Amazon Simple Email Service         | SES                       | 2010-12-01                     |
 | Amazon Simple Notification Service  | SNS                       | 2010-03-31                     |
 | Amazon Simple Queue Service         | SQS                       | 2012-11-05                     |

data/apis/s3-2006-03-01.api.json

@@ -6,7 +6,18 @@
     "globalEndpoint":"s3.amazonaws.com",
     "serviceAbbreviation":"Amazon S3",
     "serviceFullName":"Amazon Simple Storage Service",
-    "signatureVersion":"s3",
+    "signatureVersion":"v4",
+    "v3Regions": [
+      "us-east-1",
+      "us-west-1",
+      "us-west-2",
+      "ap-northeast-1",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "sa-east-1",
+      "eu-west-1",
+      "us-gov-west-1"
+    ],
     "timestampFormat":"rfc822",
     "protocol":"rest-xml"
   },
@@ -15,7 +26,7 @@
       "name":"AbortMultipartUpload",
       "http":{
         "method":"DELETE",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"AbortMultipartUploadRequest"},
       "errors":[
@@ -32,7 +43,7 @@
       "name":"CompleteMultipartUpload",
       "http":{
         "method":"POST",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"CompleteMultipartUploadRequest"},
       "output":{"shape":"CompleteMultipartUploadOutput"},
@@ -43,7 +54,7 @@
       "name":"CopyObject",
       "http":{
         "method":"PUT",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"CopyObjectRequest"},
       "output":{"shape":"CopyObjectOutput"},
@@ -81,7 +92,7 @@
       "name":"CreateMultipartUpload",
       "http":{
         "method":"POST",
-        "requestUri":"/{Bucket}/{Key}?uploads"
+        "requestUri":"/{Bucket}/{Key+}?uploads"
       },
       "input":{"shape":"CreateMultipartUploadRequest"},
       "output":{"shape":"CreateMultipartUploadOutput"},
@@ -153,7 +164,7 @@
       "name":"DeleteObject",
       "http":{
         "method":"DELETE",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"DeleteObjectRequest"},
       "output":{"shape":"DeleteObjectOutput"},
@@ -297,7 +308,7 @@
       "name":"GetObject",
       "http":{
         "method":"GET",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"GetObjectRequest"},
       "output":{"shape":"GetObjectOutput"},
@@ -315,7 +326,7 @@
       "name":"GetObjectAcl",
       "http":{
         "method":"GET",
-        "requestUri":"/{Bucket}/{Key}?acl"
+        "requestUri":"/{Bucket}/{Key+}?acl"
       },
       "input":{"shape":"GetObjectAclRequest"},
       "output":{"shape":"GetObjectAclOutput"},
@@ -333,7 +344,7 @@
       "name":"GetObjectTorrent",
       "http":{
         "method":"GET",
-        "requestUri":"/{Bucket}/{Key}?torrent"
+        "requestUri":"/{Bucket}/{Key+}?torrent"
       },
       "input":{"shape":"GetObjectTorrentRequest"},
       "output":{"shape":"GetObjectTorrentOutput"},
@@ -361,7 +372,7 @@
       "name":"HeadObject",
       "http":{
         "method":"HEAD",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"HeadObjectRequest"},
       "output":{"shape":"HeadObjectOutput"},
@@ -432,7 +443,7 @@
       "name":"ListParts",
       "http":{
         "method":"GET",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"ListPartsRequest"},
       "output":{"shape":"ListPartsOutput"},
@@ -543,7 +554,7 @@
       "name":"PutObject",
       "http":{
         "method":"PUT",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"PutObjectRequest"},
       "output":{"shape":"PutObjectOutput"},
@@ -554,7 +565,7 @@
       "name":"PutObjectAcl",
       "http":{
         "method":"PUT",
-        "requestUri":"/{Bucket}/{Key}?acl"
+        "requestUri":"/{Bucket}/{Key+}?acl"
       },
       "input":{"shape":"PutObjectAclRequest"},
       "errors":[
@@ -571,7 +582,7 @@
       "name":"RestoreObject",
       "http":{
         "method":"POST",
-        "requestUri":"/{Bucket}/{Key}?restore"
+        "requestUri":"/{Bucket}/{Key+}?restore"
       },
       "input":{"shape":"RestoreObjectRequest"},
       "errors":[
@@ -589,7 +600,7 @@
       "name":"UploadPart",
       "http":{
         "method":"PUT",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"UploadPartRequest"},
       "output":{"shape":"UploadPartOutput"},
@@ -600,7 +611,7 @@
       "name":"UploadPartCopy",
       "http":{
         "method":"PUT",
-        "requestUri":"/{Bucket}/{Key}"
+        "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"UploadPartCopyRequest"},
       "output":{"shape":"UploadPartCopyOutput"},

data/bin/aws.rb

@@ -2,7 +2,6 @@
 
 root = File.dirname(File.dirname(__FILE__))
 $:.unshift(File.join(root, 'lib'))
-$:.unshift(File.join(root, 'vendor', 'seahorse', 'lib'))
 
 require 'rubygems'
 require 'optparse'

data/endpoints.json

@@ -6,13 +6,11 @@
       {
         "services": ["iam", "sts"],
         "config": {
-          "signatureVersion": "v4",
           "endpoint": "{scheme}://{service}.cn-north-1.amazonaws.com.cn"
         }
       },
       {
         "config": {
-          "signatureVersion": "v4",
           "endpoint": "{scheme}://{service}.{region}.amazonaws.com.cn"
         }
       }
@@ -29,8 +27,14 @@
         }
       },
       {
+        "services": ["s3"],
         "config": {
-          "endpoint": "{scheme}://{service}.{region}.us-gov.amazonaws.com"
+          "endpoint": "{scheme}://{service}-{region}.amazonaws.com"
+        }
+      },
+      {
+        "config": {
+          "endpoint": "{scheme}://{service}.{region}.amazonaws.com"
         }
       }
     ]

data/lib/aws.rb

@@ -8,7 +8,10 @@ module Aws
 
   @config = {}
 
-  autoload :ClientFactory, "#{SRC}/client_factory"
+  @services = {}
+
+  @service_added_callbacks = []
+
   autoload :CredentialProviderChain, "#{SRC}/credential_provider_chain"
   autoload :Credentials, "#{SRC}/credentials"
   autoload :EmptyStructure, "#{SRC}/empty_structure"
@@ -18,6 +21,7 @@ module Aws
   autoload :PageableResponse, "#{SRC}/pageable_response"
   autoload :RestBodyHandler, "#{SRC}/rest_body_handler"
   autoload :Service, "#{SRC}/service"
+  autoload :ServiceBuilder, "#{SRC}/service_builder"
   autoload :SharedCredentials, "#{SRC}/shared_credentials"
   autoload :Structure, "#{SRC}/structure"
   autoload :TreeHash, "#{SRC}/tree_hash"
@@ -133,8 +137,8 @@ module Aws
     # @param [Plugin] plugin
     # @return [void]
     def add_plugin(plugin)
-      service_clients.each do |client|
-        client.add_plugin(plugin)
+      client_classes.each do |client_class|
+        client_class.add_plugin(plugin)
       end
     end
 
@@ -143,68 +147,81 @@ module Aws
     # @param [Plugin] plugin
     # @return [void]
     def remove_plugin(plugin)
-      service_clients.each do |client|
-        client.remove_plugin(plugin)
+      client_classes.each do |client_class|
+        client_class.remove_plugin(plugin)
       end
     end
 
-    # @return [Hash<Symbol,Module>]
     # @api private
-    def service_modules
-      @service_modules ||= {}
+    def services
+      @services
     end
 
     # @return [Array<Class>]
     # @api private
-    def service_clients
-      service_modules.map { |_,svc_mod| svc_mod.const_get(:Client) }
+    def client_classes
+      @services.values.map { |svc_module, options| svc_module.const_get(:Client) }
     end
 
-    # Registers a new service interface.  This method accepts a constant
-    # (class name) for the new service class and map of API
-    # versions.
+    # Yields to the given block for each service that has already been
+    # defined via {add_service}. Also yields to the given block for
+    # each new service added after the callback is registered.
+    # @api private
+    def service_added(&block)
+      callback = Proc.new
+      @services.each do |svc_name, (svc_module, options)|
+        callback.call(svc_name, svc_module, options)
+      end
+      @service_added_callbacks << callback
+    end
+
+    # Registers a new service. Creates a Client class and an Errors
+    # module.
     #
     #     # register a new service & API version
     #     Aws.add_service('S3', {
-    #       '2006-03-01' => {
-    #          'api' => '/path/to/api.json',
-    #          'paginators' => '/path/to/paginators.json',
-    #        }
-    #     }
+    #       'api' => '/path/to/api.json',
+    #       'paginators' => '/path/to/paginators.json',
+    #       'resources' => '/path/to/resources.json',
+    #     })
     #
     #     # create a versioned client
-    #     Aws::S3.new
-    #     #=> #<Aws::S3::V20060301>
+    #     Aws::S3::Client.new
+    #     #=> #<Aws::S3::Client>
     #
-    # You can register multiple API versions for a service, and
+    # To register multiple API versions for the same service, use separate
+    # service names.
     #
-    # @param [String] name The name of the new service class.
-    # @param [Hash<YYYY-MM-DD,Hash>] versions A hash of API versions.  Hash
-    #   keys are API version dates, and values are hashes of:
-    #   * 'api' - path to API defintion
-    #   * 'paginators' - path to paginator defintion
-    # @return [class<Service>]
-    def add_service(name, versions = {})
-      identifier = name.to_s.downcase.to_sym
-      svc = const_set(name, Service.define(identifier, versions))
-      add_helper(identifier, svc)
-      svc
+    # @param (see ServiceBuilder.new)
+    # @option (see ServiceBuilder.new)
+    # @return (see ServiceBuilder.new)
+    def add_service(svc_name, options = {})
+      identifier = svc_name.downcase.to_sym
+      svc_module = ServiceBuilder.new(identifier, options)
+      const_set(svc_name, svc_module)
+      @services[identifier] = [svc_module, options]
+      @service_added_callbacks.each do |callback|
+        callback.call(identifier, svc_module, options)
+      end
+      svc_module
     end
 
-    private
+  end
 
-    def add_helper(method_name, svc_mod)
-      service_modules[method_name] = svc_mod
-      define_method(method_name) do |options = {}|
-        svc_mod.const_get(:Client).new(options)
+  service_added do |identifier, svc_module, _|
+    define_singleton_method(identifier) do |options={}|
+      unless instance_variable_get("@#{identifier}_warned")
+        instance_variable_set("@#{identifier}_warned", true)
+        warn(<<-MSG.strip)
+Aws.#{identifier} deprecated as of v2.0.0.rc14 and will be removed as of v2.0.0.0 final; use #{svc_module.name}::Client.new() instead
+        MSG
       end
-      module_function(method_name)
+      svc_module::Client.new(options)
     end
-
   end
 
   Api::Manifest.default_manifest.services.each do |service|
-    add_service(service.name, service.versions)
+    add_service(service.name, service.versions.values.last)
   end
 
 end

data/lib/aws/endpoint_provider.rb

@@ -17,7 +17,7 @@ module Aws
         if region_matches?(rule_group, options)
           rule_group['rules'].each do |rule|
             if service_matches?(rule, options)
-              return apply_rule(rule, options)
+              return expand_endpoint(rule['config']['endpoint'], options)
             end
           end
         end
@@ -29,18 +29,14 @@ module Aws
     #   optional placeholders. This is applied when rules match during
     #   resolution. Valid placeholders include:
     #
-    #   * "{scheme}"
-    #   * "{region}"
-    #   * "{service}"
+    #   * `{scheme}`
+    #   * `{region}`
+    #   * `{service}`
     #
     #   An example pattern:
     #
     #       "#{scheme}://{service}.{region}.amazonaws.com"
     #
-    # @option options [String] :signature_version When resolving and a match
-    #   is found, this is returned with the resolved `:pattern`. This can be
-    #   used to provide per-endpoint overrides for the signature version.
-    #
     # @option options [Integer] :priority (100) A number from 0 to 999.
     #   Rules with lower number have a higher priority and are evaluated first.
     #
@@ -65,8 +61,6 @@ module Aws
       rule['services'] = options[:services] if options[:services]
       rule['config'] = {}
       rule['config']['endpoint'] = options[:pattern]
-      rule['config']['signatureVersion'] = options[:signature_version] if
-        options[:signature_version]
       {
         'priority' => options[:priority] || 100,
         'regionPrefix' => options[:region_prefix] || '',
@@ -82,17 +76,7 @@ module Aws
       rule['services'].nil? || rule['services'].include?(options[:service])
     end
 
-    def apply_rule(rule, options)
-      rule['config'].each.with_object({}) do |(key, value), result|
-        if key == 'endpoint'
-          result[:endpoint] = resolve_endpoint(value, options)
-        else
-          result[Seahorse::Util.underscore(key).to_sym] = value
-        end
-      end
-    end
-
-    def resolve_endpoint(pattern, options)
+    def expand_endpoint(pattern, options)
       pattern.gsub(/{\w+}/) { |match| options[match[1..-2].to_sym] }
     end