aws-sdk-core 2.6.7 → 2.6.9

data/apis/gamelift/2015-10-01/examples-1.json

@@ -1,5 +1,5 @@
 {
-  "version":"1.0",
-  "examples":{
+  "version": "1.0",
+  "examples": {
   }
 }

data/lib/aws-sdk-core/plugins/s3_accelerate.rb

@@ -15,6 +15,7 @@ module Aws
     class S3Accelerate < Seahorse::Client::Plugin
 
       option(:use_accelerate_endpoint, false)
+      option(:use_dualstack_endpoint, false)
 
       def add_handlers(handlers, config)
         operations = config.api.operation_names - [
@@ -38,7 +39,13 @@ module Aws
       class AccelerateHandler < Seahorse::Client::Handler
 
         def call(context)
-          use_accelerate_endpoint(context) if context[:use_accelerate_endpoint]
+          if context[:use_accelerate_endpoint]
+            if context[:use_dualstack_endpoint]
+              use_combined_accelerate_dualstack_endpoint(context)
+            else
+              use_accelerate_endpoint(context)
+            end
+          end
           @handler.call(context)
         end
 
@@ -54,6 +61,16 @@ module Aws
           context.http_request.endpoint = endpoint.to_s
         end
 
+        def use_combined_accelerate_dualstack_endpoint(context)
+          bucket_name = context.params[:bucket]
+          validate_bucket_name!(bucket_name)
+          endpoint = URI.parse(context.http_request.endpoint.to_s)
+          endpoint.scheme = 'https'
+          endpoint.port = 443
+          endpoint.host = "#{bucket_name}.s3-accelerate.dualstack.amazonaws.com"
+          context.http_request.endpoint = endpoint.to_s
+        end
+
         def validate_bucket_name!(bucket_name)
           unless S3BucketDns.dns_compatible?(bucket_name, ssl = true)
             msg = "unable to use `accelerate: true` on buckets with "

data/lib/aws-sdk-core/plugins/s3_dualstack.rb

@@ -8,6 +8,7 @@ module Aws
     class S3Dualstack < Seahorse::Client::Plugin
 
       option(:use_dualstack_endpoint, false)
+      option(:use_accelerate_endpoint, false)
 
       def add_handlers(handlers, config)
         handlers.add(OptionHandler, step: :initialize)
@@ -27,12 +28,12 @@ module Aws
       # @api private
       class DualstackHandler < Seahorse::Client::Handler
         def call(context)
-          use_dualstack_endpoint(context) if context[:use_dualstack_endpoint]
+          apply_dualstack_endpoint(context) if use_dualstack_endpoint?(context)
           @handler.call(context)
         end
 
         private
-        def use_dualstack_endpoint(context)
+        def apply_dualstack_endpoint(context)
           bucket_name = context.params[:bucket]
           region = context.config.region
           force_path_style = context.config.force_path_style
@@ -55,16 +56,12 @@ module Aws
           bucket_name && S3BucketDns.dns_compatible?(bucket_name, ssl) &&
             !context.config.force_path_style
         end
-      end
 
-      def after_initialize(client)
-        cfg = client.config
-        if cfg.use_accelerate_endpoint && cfg.use_dualstack_endpoint
-          msg = "Use of the :use_accelerate_endpoint and :use_dualstack_endpoint"\
-            " options together is not currently supported."
-          raise ArgumentError, msg
+        def use_dualstack_endpoint?(context)
+          context[:use_dualstack_endpoint] && !context[:use_accelerate_endpoint]
         end
       end
+
     end
   end
 end

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.6.7'
+  VERSION = '2.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.9
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath