File tree 3 files changed +24
-2
lines changed
3 files changed +24
-2
lines changed Original file line number Diff line number Diff line change @@ -111,12 +111,14 @@ or Openstack Swift
111
111
112
112
If ` endpoint ` set the ` region ` option will be ignored.
113
113
114
- * Default:* ` [region].s3.amazonaws.com `
114
+ * Default:* ` [region].s3.amazonaws.com `
115
115
116
116
### acl
117
117
118
118
The ACL to apply to the objects.
119
119
120
+ Set to ` false ` to not apply any ACLs.
121
+
120
122
* Default:* ` public-read `
121
123
122
124
### prefix
Original file line number Diff line number Diff line change @@ -94,14 +94,17 @@ module.exports = {
94
94
brotliCompressedFilePaths : brotliCompressedFiles ,
95
95
prefix : prefix ,
96
96
bucket : bucket ,
97
- acl : acl ,
98
97
manifestPath : manifestPath ,
99
98
cacheControl : cacheControl ,
100
99
expires : expires ,
101
100
batchSize : batchSize ,
102
101
defaultMimeType : defaultMimeType
103
102
} ;
104
103
104
+ if ( acl ) {
105
+ options . acl = acl ;
106
+ }
107
+
105
108
if ( serverSideEncryption ) {
106
109
options . serverSideEncryption = serverSideEncryption ;
107
110
}
Original file line number Diff line number Diff line change @@ -340,5 +340,22 @@ describe('s3 plugin', function() {
340
340
done ( reason ) ;
341
341
} ) ;
342
342
} ) ;
343
+
344
+ it ( 'does not add an ACL' , function ( ) {
345
+ context . config . s3 . acl = false
346
+
347
+ var plugin = subject . createDeployPlugin ( {
348
+ name : 's3'
349
+ } ) ;
350
+
351
+ context . uploadClient . upload = function ( options ) {
352
+ return RSVP . resolve ( options ) ;
353
+ } ;
354
+ plugin . beforeHook ( context ) ;
355
+ return assert . isFulfilled ( plugin . upload ( context ) )
356
+ . then ( function ( options ) {
357
+ assert . equal ( options . acl , undefined , 'acl is not present' ) ;
358
+ } ) ;
359
+ } ) ;
343
360
} ) ;
344
361
} ) ;
You can’t perform that action at this time.
0 commit comments