aws-sdk-s3 1.96.2 → 1.132.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +256 -0
- data/VERSION +1 -1
- data/lib/aws-sdk-s3/bucket.rb +226 -76
- data/lib/aws-sdk-s3/bucket_acl.rb +30 -7
- data/lib/aws-sdk-s3/bucket_cors.rb +35 -10
- data/lib/aws-sdk-s3/bucket_lifecycle.rb +39 -12
- data/lib/aws-sdk-s3/bucket_lifecycle_configuration.rb +40 -10
- data/lib/aws-sdk-s3/bucket_logging.rb +30 -7
- data/lib/aws-sdk-s3/bucket_notification.rb +28 -10
- data/lib/aws-sdk-s3/bucket_policy.rb +35 -10
- data/lib/aws-sdk-s3/bucket_request_payment.rb +30 -7
- data/lib/aws-sdk-s3/bucket_tagging.rb +35 -10
- data/lib/aws-sdk-s3/bucket_versioning.rb +78 -17
- data/lib/aws-sdk-s3/bucket_website.rb +35 -10
- data/lib/aws-sdk-s3/client.rb +3854 -2120
- data/lib/aws-sdk-s3/client_api.rb +601 -208
- data/lib/aws-sdk-s3/customizations/bucket.rb +23 -47
- data/lib/aws-sdk-s3/customizations/errors.rb +27 -0
- data/lib/aws-sdk-s3/customizations/object.rb +130 -24
- data/lib/aws-sdk-s3/customizations/types/permanent_redirect.rb +26 -0
- data/lib/aws-sdk-s3/customizations.rb +2 -0
- data/lib/aws-sdk-s3/encryption/client.rb +7 -3
- data/lib/aws-sdk-s3/encryption/decrypt_handler.rb +0 -4
- data/lib/aws-sdk-s3/encryption/kms_cipher_provider.rb +13 -9
- data/lib/aws-sdk-s3/encryptionV2/client.rb +7 -3
- data/lib/aws-sdk-s3/encryptionV2/decrypt_handler.rb +1 -4
- data/lib/aws-sdk-s3/encryptionV2/encrypt_handler.rb +0 -4
- data/lib/aws-sdk-s3/encryptionV2/kms_cipher_provider.rb +10 -6
- data/lib/aws-sdk-s3/endpoint_parameters.rb +146 -0
- data/lib/aws-sdk-s3/endpoint_provider.rb +509 -0
- data/lib/aws-sdk-s3/endpoints.rb +2150 -0
- data/lib/aws-sdk-s3/file_downloader.rb +57 -27
- data/lib/aws-sdk-s3/file_uploader.rb +12 -5
- data/lib/aws-sdk-s3/multipart_file_uploader.rb +26 -7
- data/lib/aws-sdk-s3/multipart_stream_uploader.rb +41 -13
- data/lib/aws-sdk-s3/multipart_upload.rb +138 -16
- data/lib/aws-sdk-s3/multipart_upload_part.rb +144 -18
- data/lib/aws-sdk-s3/object.rb +364 -160
- data/lib/aws-sdk-s3/object_acl.rb +32 -9
- data/lib/aws-sdk-s3/object_copier.rb +7 -5
- data/lib/aws-sdk-s3/object_multipart_copier.rb +41 -19
- data/lib/aws-sdk-s3/object_summary.rb +291 -123
- data/lib/aws-sdk-s3/object_version.rb +99 -46
- data/lib/aws-sdk-s3/plugins/accelerate.rb +3 -44
- data/lib/aws-sdk-s3/plugins/arn.rb +22 -180
- data/lib/aws-sdk-s3/plugins/bucket_dns.rb +3 -39
- data/lib/aws-sdk-s3/plugins/bucket_name_restrictions.rb +1 -6
- data/lib/aws-sdk-s3/plugins/dualstack.rb +1 -55
- data/lib/aws-sdk-s3/plugins/endpoints.rb +262 -0
- data/lib/aws-sdk-s3/plugins/expect_100_continue.rb +2 -1
- data/lib/aws-sdk-s3/plugins/iad_regional_endpoint.rb +6 -29
- data/lib/aws-sdk-s3/plugins/md5s.rb +5 -3
- data/lib/aws-sdk-s3/plugins/s3_signer.rb +35 -100
- data/lib/aws-sdk-s3/plugins/skip_whole_multipart_get_checksums.rb +31 -0
- data/lib/aws-sdk-s3/plugins/streaming_retry.rb +23 -2
- data/lib/aws-sdk-s3/presigned_post.rb +99 -78
- data/lib/aws-sdk-s3/presigner.rb +24 -29
- data/lib/aws-sdk-s3/resource.rb +25 -3
- data/lib/aws-sdk-s3/types.rb +3307 -4625
- data/lib/aws-sdk-s3.rb +5 -1
- metadata +14 -11
- data/lib/aws-sdk-s3/arn/access_point_arn.rb +0 -69
- data/lib/aws-sdk-s3/arn/object_lambda_arn.rb +0 -69
- data/lib/aws-sdk-s3/arn/outpost_access_point_arn.rb +0 -73
- data/lib/aws-sdk-s3/plugins/object_lambda_endpoint.rb +0 -25
@@ -36,6 +36,17 @@ module Aws
|
|
36
36
|
def rewind; end
|
37
37
|
end
|
38
38
|
|
39
|
+
class NonRetryableStreamingError < StandardError
|
40
|
+
|
41
|
+
def initialize(error)
|
42
|
+
super('Unable to retry request - retry could result in processing duplicated chunks.')
|
43
|
+
set_backtrace(error.backtrace)
|
44
|
+
@original_error = error
|
45
|
+
end
|
46
|
+
|
47
|
+
attr_reader :original_error
|
48
|
+
end
|
49
|
+
|
39
50
|
# This handler works with the ResponseTarget plugin to provide smart
|
40
51
|
# retries of S3 streaming operations that support the range parameter
|
41
52
|
# (currently only: get_object). When a 200 OK with a TruncatedBodyError
|
@@ -84,8 +95,18 @@ module Aws
|
|
84
95
|
end
|
85
96
|
|
86
97
|
context.http_response.on_error do |error|
|
87
|
-
if retryable_body?(context)
|
88
|
-
|
98
|
+
if retryable_body?(context)
|
99
|
+
if truncated_body?(error)
|
100
|
+
context.http_request.headers[:range] = "bytes=#{context.http_response.body.size}-"
|
101
|
+
else
|
102
|
+
case context.http_response.body
|
103
|
+
when RetryableManagedFile
|
104
|
+
# call rewind on the underlying file
|
105
|
+
context.http_response.body.instance_variable_get(:@file).rewind
|
106
|
+
else
|
107
|
+
raise NonRetryableStreamingError, error
|
108
|
+
end
|
109
|
+
end
|
89
110
|
end
|
90
111
|
end
|
91
112
|
end
|
@@ -98,7 +98,7 @@ module Aws
|
|
98
98
|
# or call the associated method.
|
99
99
|
#
|
100
100
|
# ```ruby
|
101
|
-
# post = Aws::S3::PresignedPost.new(creds, region, bucket)
|
101
|
+
# post = Aws::S3::PresignedPost.new(creds, region, bucket)
|
102
102
|
# post.content_type('text/plain')
|
103
103
|
# ```
|
104
104
|
#
|
@@ -176,11 +176,17 @@ module Aws
|
|
176
176
|
# ```
|
177
177
|
#
|
178
178
|
class PresignedPost
|
179
|
+
@@allowed_fields = []
|
179
180
|
|
180
181
|
# @param [Credentials] credentials Security credentials for signing
|
181
182
|
# the post policy.
|
182
183
|
# @param [String] bucket_region Region of the target bucket.
|
183
184
|
# @param [String] bucket_name Name of the target bucket.
|
185
|
+
# @option options [Boolean] :use_accelerate_endpoint (false) When `true`,
|
186
|
+
# PresignedPost will attempt to use accelerated endpoint.
|
187
|
+
# @option options [String] :url See {PresignedPost#url}.
|
188
|
+
# @option options [Sting, Array<String>] :allow_any
|
189
|
+
# See {PresignedPost#allow_any}.
|
184
190
|
# @option options [Time] :signature_expiration Specify when the signature on
|
185
191
|
# the post will expire. Defaults to one hour from creation of the
|
186
192
|
# presigned post. May not exceed one week from creation time.
|
@@ -205,7 +211,7 @@ module Aws
|
|
205
211
|
# See {PresignedPost#content_encoding}.
|
206
212
|
# @option options [String] :content_encoding_starts_with
|
207
213
|
# See {PresignedPost#content_encoding_starts_with}.
|
208
|
-
# @option options [
|
214
|
+
# @option options [Time] :expires See {PresignedPost#expires}.
|
209
215
|
# @option options [String] :expires_starts_with
|
210
216
|
# See {PresignedPost#expires_starts_with}.
|
211
217
|
# @option options [Range<Integer>] :content_length_range
|
@@ -232,6 +238,8 @@ module Aws
|
|
232
238
|
# See {PresignedPost#server_side_encryption_customer_algorithm}.
|
233
239
|
# @option options [String] :server_side_encryption_customer_key
|
234
240
|
# See {PresignedPost#server_side_encryption_customer_key}.
|
241
|
+
# @option options [String] :server_side_encryption_customer_key_starts_with
|
242
|
+
# See {PresignedPost#server_side_encryption_customer_key_starts_with}.
|
235
243
|
def initialize(credentials, bucket_region, bucket_name, options = {})
|
236
244
|
@credentials = credentials.credentials
|
237
245
|
@bucket_region = bucket_region
|
@@ -247,7 +255,12 @@ module Aws
|
|
247
255
|
case option_name
|
248
256
|
when :allow_any then allow_any(option_value)
|
249
257
|
when :signature_expiration then @signature_expiration = option_value
|
250
|
-
else
|
258
|
+
else
|
259
|
+
if @@allowed_fields.include?(option_name)
|
260
|
+
send("#{option_name}", option_value)
|
261
|
+
else
|
262
|
+
raise ArgumentError, "Unsupported option: #{option_name}"
|
263
|
+
end
|
251
264
|
end
|
252
265
|
end
|
253
266
|
end
|
@@ -279,44 +292,52 @@ module Aws
|
|
279
292
|
end
|
280
293
|
|
281
294
|
# @api private
|
282
|
-
def self.define_field(field, *args)
|
295
|
+
def self.define_field(field, *args, &block)
|
296
|
+
@@allowed_fields << field
|
283
297
|
options = args.last.is_a?(Hash) ? args.pop : {}
|
284
298
|
field_name = args.last || field.to_s
|
285
299
|
|
286
|
-
|
287
|
-
|
288
|
-
|
300
|
+
if block_given?
|
301
|
+
define_method("#{field}", block)
|
302
|
+
else
|
303
|
+
define_method("#{field}") do |value|
|
304
|
+
with(field_name, value)
|
305
|
+
end
|
289
306
|
|
290
|
-
|
291
|
-
|
292
|
-
|
307
|
+
if options[:starts_with]
|
308
|
+
@@allowed_fields << "#{field}_starts_with".to_sym
|
309
|
+
define_method("#{field}_starts_with") do |value|
|
310
|
+
starts_with(field_name, value)
|
311
|
+
end
|
293
312
|
end
|
294
313
|
end
|
295
314
|
end
|
296
315
|
|
297
316
|
# @!group Fields
|
298
317
|
|
299
|
-
#
|
300
|
-
#
|
301
|
-
#
|
318
|
+
# @!method key(key)
|
319
|
+
# The key to use for the uploaded object. You can use `${filename}`
|
320
|
+
# as a variable in the key. This will be replaced with the name
|
321
|
+
# of the file as provided by the user.
|
302
322
|
#
|
303
|
-
#
|
304
|
-
#
|
305
|
-
#
|
323
|
+
# For example, if the key is given as `/user/betty/${filename}` and
|
324
|
+
# the file uploaded is named `lolcatz.jpg`, the resultant key will
|
325
|
+
# be `/user/betty/lolcatz.jpg`.
|
306
326
|
#
|
307
|
-
#
|
308
|
-
#
|
309
|
-
#
|
310
|
-
|
327
|
+
# @param [String] key
|
328
|
+
# @see http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html)
|
329
|
+
# @return [self]
|
330
|
+
define_field(:key) do |key|
|
311
331
|
@key_set = true
|
312
332
|
with('key', key)
|
313
333
|
end
|
314
334
|
|
315
|
-
#
|
316
|
-
#
|
317
|
-
#
|
318
|
-
#
|
319
|
-
|
335
|
+
# @!method key_starts_with(prefix)
|
336
|
+
# Specify a prefix the uploaded
|
337
|
+
# @param [String] prefix
|
338
|
+
# @see #key
|
339
|
+
# @return [self]
|
340
|
+
define_field(:key_starts_with) do |prefix|
|
320
341
|
@key_set = true
|
321
342
|
starts_with('key', prefix)
|
322
343
|
end
|
@@ -393,27 +414,30 @@ module Aws
|
|
393
414
|
# @return [self]
|
394
415
|
define_field(:content_encoding, 'Content-Encoding', starts_with: true)
|
395
416
|
|
396
|
-
#
|
397
|
-
#
|
398
|
-
#
|
399
|
-
#
|
400
|
-
#
|
401
|
-
#
|
402
|
-
|
417
|
+
# @!method expires(time)
|
418
|
+
# The date and time at which the object is no longer cacheable.
|
419
|
+
# @note This does not affect the expiration of the presigned post
|
420
|
+
# signature.
|
421
|
+
# @param [Time] time
|
422
|
+
# @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.21
|
423
|
+
# @return [self]
|
424
|
+
define_field(:expires) do |time|
|
403
425
|
with('Expires', time.httpdate)
|
404
426
|
end
|
405
427
|
|
406
|
-
#
|
407
|
-
#
|
408
|
-
#
|
409
|
-
|
428
|
+
# @!method expires_starts_with(prefix)
|
429
|
+
# @param [String] prefix
|
430
|
+
# @see #expires
|
431
|
+
# @return [self]
|
432
|
+
define_field(:expires_starts_with) do |prefix|
|
410
433
|
starts_with('Expires', prefix)
|
411
434
|
end
|
412
435
|
|
413
|
-
#
|
414
|
-
#
|
415
|
-
#
|
416
|
-
|
436
|
+
# @!method content_length_range(byte_range)
|
437
|
+
# The minimum and maximum allowable size for the uploaded content.
|
438
|
+
# @param [Range<Integer>] byte_range
|
439
|
+
# @return [self]
|
440
|
+
define_field(:content_length_range) do |byte_range|
|
417
441
|
min = byte_range.begin
|
418
442
|
max = byte_range.end
|
419
443
|
max -= 1 if byte_range.exclude_end?
|
@@ -488,22 +512,24 @@ module Aws
|
|
488
512
|
# @return [self]
|
489
513
|
define_field(:website_redirect_location, 'x-amz-website-redirect-location')
|
490
514
|
|
491
|
-
#
|
492
|
-
#
|
493
|
-
#
|
494
|
-
#
|
495
|
-
|
515
|
+
# @!method metadata(hash)
|
516
|
+
# Metadata hash to store with the uploaded object. Hash keys will be
|
517
|
+
# prefixed with "x-amz-meta-".
|
518
|
+
# @param [Hash<String,String>] hash
|
519
|
+
# @return [self]
|
520
|
+
define_field(:metadata) do |hash|
|
496
521
|
hash.each do |key, value|
|
497
522
|
with("x-amz-meta-#{key}", value)
|
498
523
|
end
|
499
524
|
self
|
500
525
|
end
|
501
526
|
|
502
|
-
#
|
503
|
-
#
|
504
|
-
#
|
505
|
-
#
|
506
|
-
|
527
|
+
# @!method metadata_starts_with(hash)
|
528
|
+
# Specify allowable prefix for each key in the metadata hash.
|
529
|
+
# @param [Hash<String,String>] hash
|
530
|
+
# @see #metadata
|
531
|
+
# @return [self]
|
532
|
+
define_field(:metadata_starts_with) do |hash|
|
507
533
|
hash.each do |key, value|
|
508
534
|
starts_with("x-amz-meta-#{key}", value)
|
509
535
|
end
|
@@ -552,25 +578,27 @@ module Aws
|
|
552
578
|
'x-amz-server-side-encryption-customer-algorithm'
|
553
579
|
)
|
554
580
|
|
555
|
-
#
|
556
|
-
#
|
557
|
-
#
|
581
|
+
# @!method server_side_encryption_customer_key(value)
|
582
|
+
# Specifies the customer-provided encryption key for Amazon S3 to use
|
583
|
+
# in encrypting data. This value is used to store the object and then
|
584
|
+
# it is discarded; Amazon does not store the encryption key.
|
558
585
|
#
|
559
|
-
#
|
586
|
+
# You must also call {#server_side_encryption_customer_algorithm}.
|
560
587
|
#
|
561
|
-
#
|
562
|
-
#
|
563
|
-
#
|
564
|
-
|
588
|
+
# @param [String] value
|
589
|
+
# @see #server_side_encryption_customer_algorithm
|
590
|
+
# @return [self]
|
591
|
+
define_field(:server_side_encryption_customer_key) do |value|
|
565
592
|
field_name = 'x-amz-server-side-encryption-customer-key'
|
566
593
|
with(field_name, base64(value))
|
567
594
|
with(field_name + '-MD5', base64(OpenSSL::Digest::MD5.digest(value)))
|
568
595
|
end
|
569
596
|
|
570
|
-
#
|
571
|
-
#
|
572
|
-
#
|
573
|
-
|
597
|
+
# @!method server_side_encryption_customer_key_starts_with(prefix)
|
598
|
+
# @param [String] prefix
|
599
|
+
# @see #server_side_encryption_customer_key
|
600
|
+
# @return [self]
|
601
|
+
define_field(:server_side_encryption_customer_key_starts_with) do |prefix|
|
574
602
|
field_name = 'x-amz-server-side-encryption-customer-key'
|
575
603
|
starts_with(field_name, prefix)
|
576
604
|
end
|
@@ -610,22 +638,15 @@ module Aws
|
|
610
638
|
end
|
611
639
|
|
612
640
|
def bucket_url
|
613
|
-
|
614
|
-
|
615
|
-
|
616
|
-
|
617
|
-
|
618
|
-
|
619
|
-
|
620
|
-
|
621
|
-
|
622
|
-
url.path = "/#{@bucket_name}"
|
623
|
-
end
|
624
|
-
if @bucket_region == 'us-east-1'
|
625
|
-
# keep legacy behavior by default
|
626
|
-
url.host = Plugins::IADRegionalEndpoint.legacy_host(url.host)
|
627
|
-
end
|
628
|
-
url.to_s
|
641
|
+
# Taken from Aws::S3::Endpoints module
|
642
|
+
params = Aws::S3::EndpointParameters.new(
|
643
|
+
bucket: @bucket_name,
|
644
|
+
region: @bucket_region,
|
645
|
+
accelerate: @accelerate,
|
646
|
+
use_global_endpoint: true
|
647
|
+
)
|
648
|
+
endpoint = Aws::S3::EndpointProvider.new.resolve_endpoint(params)
|
649
|
+
endpoint.url
|
629
650
|
end
|
630
651
|
|
631
652
|
# @return [Hash]
|
data/lib/aws-sdk-s3/presigner.rb
CHANGED
@@ -49,7 +49,8 @@ module Aws
|
|
49
49
|
# before the presigned URL expires. Defaults to 15 minutes. As signature
|
50
50
|
# version 4 has a maximum expiry time of one week for presigned URLs,
|
51
51
|
# attempts to set this value to greater than one week (604800) will
|
52
|
-
# raise an exception.
|
52
|
+
# raise an exception. The min value of this option and the credentials
|
53
|
+
# expiration time is used in the presigned URL.
|
53
54
|
#
|
54
55
|
# @option params [Time] :time (Time.now) The starting time for when the
|
55
56
|
# presigned url becomes active.
|
@@ -96,7 +97,8 @@ module Aws
|
|
96
97
|
# before the presigned URL expires. Defaults to 15 minutes. As signature
|
97
98
|
# version 4 has a maximum expiry time of one week for presigned URLs,
|
98
99
|
# attempts to set this value to greater than one week (604800) will
|
99
|
-
# raise an exception.
|
100
|
+
# raise an exception. The min value of this option and the credentials
|
101
|
+
# expiration time is used in the presigned URL.
|
100
102
|
#
|
101
103
|
# @option params [Time] :time (Time.now) The starting time for when the
|
102
104
|
# presigned url becomes active.
|
@@ -133,7 +135,7 @@ module Aws
|
|
133
135
|
virtual_host = params.delete(:virtual_host)
|
134
136
|
time = params.delete(:time)
|
135
137
|
unsigned_headers = unsigned_headers(params)
|
136
|
-
|
138
|
+
secure = params.delete(:secure) != false
|
137
139
|
expires_in = expires_in(params)
|
138
140
|
|
139
141
|
req = @client.build_request(method, params)
|
@@ -141,7 +143,7 @@ module Aws
|
|
141
143
|
handle_presigned_url_context(req)
|
142
144
|
|
143
145
|
x_amz_headers = sign_but_dont_send(
|
144
|
-
req, expires_in,
|
146
|
+
req, expires_in, secure, time, unsigned_headers, hoist
|
145
147
|
)
|
146
148
|
[req.send_request.data, x_amz_headers]
|
147
149
|
end
|
@@ -151,14 +153,6 @@ module Aws
|
|
151
153
|
BLACKLISTED_HEADERS - whitelist_headers
|
152
154
|
end
|
153
155
|
|
154
|
-
def http_scheme(params)
|
155
|
-
if params.delete(:secure) == false
|
156
|
-
'http'
|
157
|
-
else
|
158
|
-
@client.config.endpoint.scheme
|
159
|
-
end
|
160
|
-
end
|
161
|
-
|
162
156
|
def expires_in(params)
|
163
157
|
if (expires_in = params.delete(:expires_in))
|
164
158
|
if expires_in > ONE_WEEK
|
@@ -175,8 +169,7 @@ module Aws
|
|
175
169
|
end
|
176
170
|
|
177
171
|
def use_bucket_as_hostname(req)
|
178
|
-
req.
|
179
|
-
req.handle do |context|
|
172
|
+
req.handle(priority: 35) do |context|
|
180
173
|
uri = context.http_request.endpoint
|
181
174
|
uri.host = context.params[:bucket]
|
182
175
|
uri.path.sub!("/#{context.params[:bucket]}", '')
|
@@ -197,22 +190,21 @@ module Aws
|
|
197
190
|
|
198
191
|
# @param [Seahorse::Client::Request] req
|
199
192
|
def sign_but_dont_send(
|
200
|
-
req, expires_in,
|
193
|
+
req, expires_in, secure, time, unsigned_headers, hoist = true
|
201
194
|
)
|
202
195
|
x_amz_headers = {}
|
203
196
|
|
204
197
|
http_req = req.context.http_request
|
205
198
|
|
206
199
|
req.handlers.remove(Aws::S3::Plugins::S3Signer::LegacyHandler)
|
207
|
-
req.handlers.remove(Aws::
|
200
|
+
req.handlers.remove(Aws::Plugins::Sign::Handler)
|
208
201
|
req.handlers.remove(Seahorse::Client::Plugins::ContentLength::Handler)
|
209
202
|
|
210
203
|
req.handle(step: :send) do |context|
|
211
|
-
if
|
212
|
-
|
213
|
-
endpoint.scheme =
|
214
|
-
endpoint.port =
|
215
|
-
http_req.endpoint = URI.parse(endpoint.to_s)
|
204
|
+
# if an endpoint was not provided, force secure or insecure
|
205
|
+
if context.config.regional_endpoint
|
206
|
+
http_req.endpoint.scheme = secure ? 'https' : 'http'
|
207
|
+
http_req.endpoint.port = secure ? 443 : 80
|
216
208
|
end
|
217
209
|
|
218
210
|
query = http_req.endpoint.query ? http_req.endpoint.query.split('&') : []
|
@@ -231,18 +223,21 @@ module Aws
|
|
231
223
|
end
|
232
224
|
http_req.endpoint.query = query.join('&') unless query.empty?
|
233
225
|
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
226
|
+
auth_scheme = context[:auth_scheme]
|
227
|
+
scheme_name = auth_scheme['name']
|
228
|
+
region = if scheme_name == 'sigv4a'
|
229
|
+
auth_scheme['signingRegionSet'].first
|
230
|
+
else
|
231
|
+
auth_scheme['signingRegion']
|
232
|
+
end
|
240
233
|
signer = Aws::Sigv4::Signer.new(
|
241
|
-
service:
|
234
|
+
service: auth_scheme['signingName'] || 's3',
|
242
235
|
region: region || context.config.region,
|
243
236
|
credentials_provider: context.config.credentials,
|
237
|
+
signing_algorithm: scheme_name.to_sym,
|
238
|
+
uri_escape_path: !!!auth_scheme['disableDoubleEncoding'],
|
244
239
|
unsigned_headers: unsigned_headers,
|
245
|
-
|
240
|
+
apply_checksum_header: false
|
246
241
|
)
|
247
242
|
|
248
243
|
url = signer.presign_url(
|
data/lib/aws-sdk-s3/resource.rb
CHANGED
@@ -41,7 +41,7 @@ module Aws::S3
|
|
41
41
|
# acl: "private", # accepts private, public-read, public-read-write, authenticated-read
|
42
42
|
# bucket: "BucketName", # required
|
43
43
|
# create_bucket_configuration: {
|
44
|
-
# location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
|
44
|
+
# location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ap-southeast-3, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2, ap-south-2, eu-south-2
|
45
45
|
# },
|
46
46
|
# grant_full_control: "GrantFullControl",
|
47
47
|
# grant_read: "GrantRead",
|
@@ -49,6 +49,7 @@ module Aws::S3
|
|
49
49
|
# grant_write: "GrantWrite",
|
50
50
|
# grant_write_acp: "GrantWriteACP",
|
51
51
|
# object_lock_enabled_for_bucket: false,
|
52
|
+
# object_ownership: "BucketOwnerPreferred", # accepts BucketOwnerPreferred, ObjectWriter, BucketOwnerEnforced
|
52
53
|
# })
|
53
54
|
# @param [Hash] options ({})
|
54
55
|
# @option options [String] :acl
|
@@ -74,9 +75,28 @@ module Aws::S3
|
|
74
75
|
# @option options [Boolean] :object_lock_enabled_for_bucket
|
75
76
|
# Specifies whether you want S3 Object Lock to be enabled for the new
|
76
77
|
# bucket.
|
78
|
+
# @option options [String] :object_ownership
|
79
|
+
# The container element for object ownership for a bucket's ownership
|
80
|
+
# controls.
|
81
|
+
#
|
82
|
+
# BucketOwnerPreferred - Objects uploaded to the bucket change ownership
|
83
|
+
# to the bucket owner if the objects are uploaded with the
|
84
|
+
# `bucket-owner-full-control` canned ACL.
|
85
|
+
#
|
86
|
+
# ObjectWriter - The uploading account will own the object if the object
|
87
|
+
# is uploaded with the `bucket-owner-full-control` canned ACL.
|
88
|
+
#
|
89
|
+
# BucketOwnerEnforced - Access control lists (ACLs) are disabled and no
|
90
|
+
# longer affect permissions. The bucket owner automatically owns and has
|
91
|
+
# full control over every object in the bucket. The bucket only accepts
|
92
|
+
# PUT requests that don't specify an ACL or bucket owner full control
|
93
|
+
# ACLs, such as the `bucket-owner-full-control` canned ACL or an
|
94
|
+
# equivalent form of this ACL expressed in the XML format.
|
77
95
|
# @return [Bucket]
|
78
96
|
def create_bucket(options = {})
|
79
|
-
|
97
|
+
Aws::Plugins::UserAgent.feature('resource') do
|
98
|
+
@client.create_bucket(options)
|
99
|
+
end
|
80
100
|
Bucket.new(
|
81
101
|
name: options[:bucket],
|
82
102
|
client: @client
|
@@ -102,7 +122,9 @@ module Aws::S3
|
|
102
122
|
def buckets(options = {})
|
103
123
|
batches = Enumerator.new do |y|
|
104
124
|
batch = []
|
105
|
-
resp =
|
125
|
+
resp = Aws::Plugins::UserAgent.feature('resource') do
|
126
|
+
@client.list_buckets(options)
|
127
|
+
end
|
106
128
|
resp.data.buckets.each do |b|
|
107
129
|
batch << Bucket.new(
|
108
130
|
name: b.name,
|