Adds support for using dualstack with accelerate with S3.

aws · Oct 13, 2016 · ec99a24 · ec99a24
1 parent 471dd1a
commit ec99a24
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/.changes/next-release/feature-S3-2319154a.json b/.changes/next-release/feature-S3-2319154a.json
@@ -0,0 +1,5 @@
+{
+  "type": "feature",
+  "category": "S3",
+  "description": "Adds support for using dualstack with accelerate endpoints."
+}
diff --git a/lib/services/s3.js b/lib/services/s3.js
@@ -62,10 +62,6 @@ AWS.util.update(AWS.S3.prototype, {
       messages.push('An endpoint must be provided when configuring ' +
                     '`s3BucketEndpoint` to true.');
     }
-    if (this.config.useAccelerateEndpoint && this.config.useDualstack) {
-      messages.push('`useAccelerateEndpoint` and `useDualstack` ' +
-                    'cannot both be configured to true.');
-    }
     if (messages.length === 1) {
       msg = messages[0];
     } else if (messages.length > 1) {
@@ -173,7 +169,11 @@ AWS.util.update(AWS.S3.prototype, {
     if (b) {
       if (!service.pathStyleBucketName(b)) {
         if (service.config.useAccelerateEndpoint && service.isValidAccelerateOperation(req.operation)) {
-          endpoint.hostname = b + '.s3-accelerate.amazonaws.com';
+          if (service.config.useDualstack) {
+            endpoint.hostname = b + '.s3-accelerate.dualstack.amazonaws.com';
+          } else {
+            endpoint.hostname = b + '.s3-accelerate.amazonaws.com';
+          }
         } else if (!service.config.s3BucketEndpoint) {
           endpoint.hostname =
             b + '.' + endpoint.hostname;

diff --git a/test/services/s3.spec.coffee b/test/services/s3.spec.coffee
@@ -49,10 +49,6 @@ describe 'AWS.S3', ->
       expect(-> new AWS.S3(s3BucketEndpoint: true)).to.throw(
         /An endpoint must be provided/)
 
-    it 'does not allow useDualstack and useAccelerateEndpoint to both be true', ->
-      expect(-> new AWS.S3(useDualstack: true, useAccelerateEndpoint: true)).to.throw(
-        /cannot both be configured to true/)
-
   describe 'endpoint', ->
 
     it 'sets hostname to s3.amazonaws.com when region is un-specified', ->
@@ -235,19 +231,44 @@ describe 'AWS.S3', ->
         req = build('getObject', {Bucket: 'foo', Key: 'baz'})
         expect(req.endpoint.hostname).to.equal('foo.s3-accelerate.amazonaws.com')
 
-      describe 'does not use s3-accelerate', ->
+      describe 'does not use s3-accelerate.dualstack or s3-accelerate', ->
         it 'on dns-incompatible buckets', ->
           req = build('getObject', {Bucket: 'foo.baz', Key: 'bar'})
-          expect(req.endpoint.hostname).to.not.contain('s3-accelerate.amazonaws.com')
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
 
         it 'on excluded operations', ->
           req = build('listBuckets')
-          expect(req.endpoint.hostname).to.not.contain('s3-accelerate.amazonaws.com')
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
           req = build('createBucket', {Bucket: 'foo'})
-          expect(req.endpoint.hostname).to.not.contain('s3-accelerate.amazonaws.com')
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
           req = build('deleteBucket', {Bucket: 'foo'})
-          expect(req.endpoint.hostname).to.not.contain('s3-accelerate.amazonaws.com')
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
 
+    describe 'with useAccelerateEndpoint and dualstack set to true', ->
+      beforeEach ->
+        s3 = new AWS.S3(useAccelerateEndpoint: true, useDualstack: true)
+
+      it 'changes the hostname to use s3-accelerate for dns-comaptible buckets', ->
+        req = build('getObject', {Bucket: 'foo', Key: 'bar'})
+        expect(req.endpoint.hostname).to.equal('foo.s3-accelerate.dualstack.amazonaws.com')
+
+      it 'overrides s3BucketEndpoint configuration when s3BucketEndpoint is set', ->
+        s3 = new AWS.S3(useAccelerateEndpoint: true, useDualstack: true, s3BucketEndpoint: true, endpoint: 'foo.region.amazonaws.com')
+        req = build('getObject', {Bucket: 'foo', Key: 'baz'})
+        expect(req.endpoint.hostname).to.equal('foo.s3-accelerate.dualstack.amazonaws.com')
+
+      describe 'does not use s3-accelerate.dualstack or s3-accelerate', ->
+        it 'on dns-incompatible buckets', ->
+          req = build('getObject', {Bucket: 'foo.baz', Key: 'bar'})
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
+
+        it 'on excluded operations', ->
+          req = build('listBuckets')
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
+          req = build('createBucket', {Bucket: 'foo'})
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
+          req = build('deleteBucket', {Bucket: 'foo'})
+          expect(req.endpoint.hostname).to.not.contain('s3-accelerate')
 
     describe 'uri escaped params', ->
       it 'uri-escapes path and querystring params', ->