aws-sdk-s3 1.8.0 → 1.9.1
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/lib/aws-sdk-s3/bucket.rb +1 -1
- data/lib/aws-sdk-s3/bucket_lifecycle.rb +2 -2
- data/lib/aws-sdk-s3/bucket_lifecycle_configuration.rb +2 -2
- data/lib/aws-sdk-s3/bucket_logging.rb +5 -2
- data/lib/aws-sdk-s3/client.rb +30 -23
- data/lib/aws-sdk-s3/client_api.rb +32 -2
- data/lib/aws-sdk-s3/encryption/decrypt_handler.rb +2 -1
- data/lib/aws-sdk-s3/encryption/kms_cipher_provider.rb +2 -0
- data/lib/aws-sdk-s3/file_downloader.rb +20 -50
- data/lib/aws-sdk-s3/object.rb +11 -4
- data/lib/aws-sdk-s3/object_summary.rb +11 -4
- data/lib/aws-sdk-s3/plugins/accelerate.rb +5 -1
- data/lib/aws-sdk-s3/plugins/dualstack.rb +1 -1
- data/lib/aws-sdk-s3/presigner.rb +1 -1
- data/lib/aws-sdk-s3/types.rb +179 -43
- data/lib/aws-sdk-s3.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 51a82ae22cd23753c02541ce0110a83eec4135ee
|
4
|
+
data.tar.gz: '08b42b8e920d3a999870dadb092bcc93b50a8230'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2a793fa3d84eba541171ba31df755972507f52b5f60c0a2858091c5c7991d1fb97fc5fe8646bb35c3aa73e2f405b02f4901f11ce5d1e6796329b84509b21b8b6
|
7
|
+
data.tar.gz: 2975fc246122bbe261d603f21f6a7e47c0b1ce275e64d486bb8cb1b07d478b600aed7bcd6800b4948b96e34f242bffe40fc0b22d0b096fc61c73135ea01cca71
|
data/lib/aws-sdk-s3/bucket.rb
CHANGED
@@ -313,7 +313,7 @@ module Aws::S3
|
|
313
313
|
# "MetadataKey" => "MetadataValue",
|
314
314
|
# },
|
315
315
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
316
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
316
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
317
317
|
# website_redirect_location: "WebsiteRedirectLocation",
|
318
318
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
319
319
|
# sse_customer_key: "SSECustomerKey",
|
@@ -196,11 +196,11 @@ module Aws::S3
|
|
196
196
|
# transition: {
|
197
197
|
# date: Time.now,
|
198
198
|
# days: 1,
|
199
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
199
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
200
200
|
# },
|
201
201
|
# noncurrent_version_transition: {
|
202
202
|
# noncurrent_days: 1,
|
203
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
203
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
204
204
|
# },
|
205
205
|
# noncurrent_version_expiration: {
|
206
206
|
# noncurrent_days: 1,
|
@@ -212,13 +212,13 @@ module Aws::S3
|
|
212
212
|
# {
|
213
213
|
# date: Time.now,
|
214
214
|
# days: 1,
|
215
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
215
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
216
216
|
# },
|
217
217
|
# ],
|
218
218
|
# noncurrent_version_transitions: [
|
219
219
|
# {
|
220
220
|
# noncurrent_days: 1,
|
221
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
221
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
222
222
|
# },
|
223
223
|
# ],
|
224
224
|
# noncurrent_version_expiration: {
|
@@ -30,6 +30,9 @@ module Aws::S3
|
|
30
30
|
@bucket_name
|
31
31
|
end
|
32
32
|
|
33
|
+
# Container for logging information. Presence of this element indicates
|
34
|
+
# that logging is enabled. Parameters TargetBucket and TargetPrefix are
|
35
|
+
# required in this case.
|
33
36
|
# @return [Types::LoggingEnabled]
|
34
37
|
def logging_enabled
|
35
38
|
data[:logging_enabled]
|
@@ -172,7 +175,7 @@ module Aws::S3
|
|
172
175
|
# bucket_logging.put({
|
173
176
|
# bucket_logging_status: { # required
|
174
177
|
# logging_enabled: {
|
175
|
-
# target_bucket: "TargetBucket",
|
178
|
+
# target_bucket: "TargetBucket", # required
|
176
179
|
# target_grants: [
|
177
180
|
# {
|
178
181
|
# grantee: {
|
@@ -185,7 +188,7 @@ module Aws::S3
|
|
185
188
|
# permission: "FULL_CONTROL", # accepts FULL_CONTROL, READ, WRITE
|
186
189
|
# },
|
187
190
|
# ],
|
188
|
-
# target_prefix: "TargetPrefix",
|
191
|
+
# target_prefix: "TargetPrefix", # required
|
189
192
|
# },
|
190
193
|
# },
|
191
194
|
# content_md5: "ContentMD5",
|
data/lib/aws-sdk-s3/client.rb
CHANGED
@@ -547,7 +547,7 @@ module Aws::S3
|
|
547
547
|
# metadata_directive: "COPY", # accepts COPY, REPLACE
|
548
548
|
# tagging_directive: "COPY", # accepts COPY, REPLACE
|
549
549
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
550
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
550
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
551
551
|
# website_redirect_location: "WebsiteRedirectLocation",
|
552
552
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
553
553
|
# sse_customer_key: "SSECustomerKey",
|
@@ -817,7 +817,7 @@ module Aws::S3
|
|
817
817
|
# "MetadataKey" => "MetadataValue",
|
818
818
|
# },
|
819
819
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
820
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
820
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
821
821
|
# website_redirect_location: "WebsiteRedirectLocation",
|
822
822
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
823
823
|
# sse_customer_key: "SSECustomerKey",
|
@@ -1744,9 +1744,9 @@ module Aws::S3
|
|
1744
1744
|
# resp.rules[0].status #=> String, one of "Enabled", "Disabled"
|
1745
1745
|
# resp.rules[0].transition.date #=> Time
|
1746
1746
|
# resp.rules[0].transition.days #=> Integer
|
1747
|
-
# resp.rules[0].transition.storage_class #=> String, one of "GLACIER", "STANDARD_IA"
|
1747
|
+
# resp.rules[0].transition.storage_class #=> String, one of "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
1748
1748
|
# resp.rules[0].noncurrent_version_transition.noncurrent_days #=> Integer
|
1749
|
-
# resp.rules[0].noncurrent_version_transition.storage_class #=> String, one of "GLACIER", "STANDARD_IA"
|
1749
|
+
# resp.rules[0].noncurrent_version_transition.storage_class #=> String, one of "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
1750
1750
|
# resp.rules[0].noncurrent_version_expiration.noncurrent_days #=> Integer
|
1751
1751
|
# resp.rules[0].abort_incomplete_multipart_upload.days_after_initiation #=> Integer
|
1752
1752
|
#
|
@@ -1818,10 +1818,10 @@ module Aws::S3
|
|
1818
1818
|
# resp.rules[0].transitions #=> Array
|
1819
1819
|
# resp.rules[0].transitions[0].date #=> Time
|
1820
1820
|
# resp.rules[0].transitions[0].days #=> Integer
|
1821
|
-
# resp.rules[0].transitions[0].storage_class #=> String, one of "GLACIER", "STANDARD_IA"
|
1821
|
+
# resp.rules[0].transitions[0].storage_class #=> String, one of "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
1822
1822
|
# resp.rules[0].noncurrent_version_transitions #=> Array
|
1823
1823
|
# resp.rules[0].noncurrent_version_transitions[0].noncurrent_days #=> Integer
|
1824
|
-
# resp.rules[0].noncurrent_version_transitions[0].storage_class #=> String, one of "GLACIER", "STANDARD_IA"
|
1824
|
+
# resp.rules[0].noncurrent_version_transitions[0].storage_class #=> String, one of "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
1825
1825
|
# resp.rules[0].noncurrent_version_expiration.noncurrent_days #=> Integer
|
1826
1826
|
# resp.rules[0].abort_incomplete_multipart_upload.days_after_initiation #=> Integer
|
1827
1827
|
#
|
@@ -2199,7 +2199,7 @@ module Aws::S3
|
|
2199
2199
|
# resp.replication_configuration.rules[0].source_selection_criteria.sse_kms_encrypted_objects.status #=> String, one of "Enabled", "Disabled"
|
2200
2200
|
# resp.replication_configuration.rules[0].destination.bucket #=> String
|
2201
2201
|
# resp.replication_configuration.rules[0].destination.account #=> String
|
2202
|
-
# resp.replication_configuration.rules[0].destination.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
|
2202
|
+
# resp.replication_configuration.rules[0].destination.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"
|
2203
2203
|
# resp.replication_configuration.rules[0].destination.access_control_translation.owner #=> String, one of "Destination"
|
2204
2204
|
# resp.replication_configuration.rules[0].destination.encryption_configuration.replica_kms_key_id #=> String
|
2205
2205
|
#
|
@@ -2646,7 +2646,7 @@ module Aws::S3
|
|
2646
2646
|
# resp.sse_customer_algorithm #=> String
|
2647
2647
|
# resp.sse_customer_key_md5 #=> String
|
2648
2648
|
# resp.ssekms_key_id #=> String
|
2649
|
-
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
|
2649
|
+
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"
|
2650
2650
|
# resp.request_charged #=> String, one of "requester"
|
2651
2651
|
# resp.replication_status #=> String, one of "COMPLETE", "PENDING", "FAILED", "REPLICA"
|
2652
2652
|
# resp.parts_count #=> Integer
|
@@ -3093,7 +3093,7 @@ module Aws::S3
|
|
3093
3093
|
# resp.sse_customer_algorithm #=> String
|
3094
3094
|
# resp.sse_customer_key_md5 #=> String
|
3095
3095
|
# resp.ssekms_key_id #=> String
|
3096
|
-
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
|
3096
|
+
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"
|
3097
3097
|
# resp.request_charged #=> String, one of "requester"
|
3098
3098
|
# resp.replication_status #=> String, one of "COMPLETE", "PENDING", "FAILED", "REPLICA"
|
3099
3099
|
# resp.parts_count #=> Integer
|
@@ -3492,7 +3492,7 @@ module Aws::S3
|
|
3492
3492
|
# resp.uploads[0].upload_id #=> String
|
3493
3493
|
# resp.uploads[0].key #=> String
|
3494
3494
|
# resp.uploads[0].initiated #=> Time
|
3495
|
-
# resp.uploads[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
|
3495
|
+
# resp.uploads[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"
|
3496
3496
|
# resp.uploads[0].owner.display_name #=> String
|
3497
3497
|
# resp.uploads[0].owner.id #=> String
|
3498
3498
|
# resp.uploads[0].initiator.id #=> String
|
@@ -3757,7 +3757,7 @@ module Aws::S3
|
|
3757
3757
|
# resp.contents[0].last_modified #=> Time
|
3758
3758
|
# resp.contents[0].etag #=> String
|
3759
3759
|
# resp.contents[0].size #=> Integer
|
3760
|
-
# resp.contents[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "GLACIER"
|
3760
|
+
# resp.contents[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
3761
3761
|
# resp.contents[0].owner.display_name #=> String
|
3762
3762
|
# resp.contents[0].owner.id #=> String
|
3763
3763
|
# resp.name #=> String
|
@@ -3893,7 +3893,7 @@ module Aws::S3
|
|
3893
3893
|
# resp.contents[0].last_modified #=> Time
|
3894
3894
|
# resp.contents[0].etag #=> String
|
3895
3895
|
# resp.contents[0].size #=> Integer
|
3896
|
-
# resp.contents[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "GLACIER"
|
3896
|
+
# resp.contents[0].storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "GLACIER", "STANDARD_IA", "ONEZONE_IA"
|
3897
3897
|
# resp.contents[0].owner.display_name #=> String
|
3898
3898
|
# resp.contents[0].owner.id #=> String
|
3899
3899
|
# resp.name #=> String
|
@@ -4028,7 +4028,7 @@ module Aws::S3
|
|
4028
4028
|
# resp.initiator.display_name #=> String
|
4029
4029
|
# resp.owner.display_name #=> String
|
4030
4030
|
# resp.owner.id #=> String
|
4031
|
-
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA"
|
4031
|
+
# resp.storage_class #=> String, one of "STANDARD", "REDUCED_REDUNDANCY", "STANDARD_IA", "ONEZONE_IA"
|
4032
4032
|
# resp.request_charged #=> String, one of "requester"
|
4033
4033
|
#
|
4034
4034
|
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts AWS API Documentation
|
@@ -4424,11 +4424,11 @@ module Aws::S3
|
|
4424
4424
|
# transition: {
|
4425
4425
|
# date: Time.now,
|
4426
4426
|
# days: 1,
|
4427
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4427
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4428
4428
|
# },
|
4429
4429
|
# noncurrent_version_transition: {
|
4430
4430
|
# noncurrent_days: 1,
|
4431
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4431
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4432
4432
|
# },
|
4433
4433
|
# noncurrent_version_expiration: {
|
4434
4434
|
# noncurrent_days: 1,
|
@@ -4523,13 +4523,13 @@ module Aws::S3
|
|
4523
4523
|
# {
|
4524
4524
|
# date: Time.now,
|
4525
4525
|
# days: 1,
|
4526
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4526
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4527
4527
|
# },
|
4528
4528
|
# ],
|
4529
4529
|
# noncurrent_version_transitions: [
|
4530
4530
|
# {
|
4531
4531
|
# noncurrent_days: 1,
|
4532
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4532
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4533
4533
|
# },
|
4534
4534
|
# ],
|
4535
4535
|
# noncurrent_version_expiration: {
|
@@ -4595,7 +4595,7 @@ module Aws::S3
|
|
4595
4595
|
# bucket: "BucketName", # required
|
4596
4596
|
# bucket_logging_status: { # required
|
4597
4597
|
# logging_enabled: {
|
4598
|
-
# target_bucket: "TargetBucket",
|
4598
|
+
# target_bucket: "TargetBucket", # required
|
4599
4599
|
# target_grants: [
|
4600
4600
|
# {
|
4601
4601
|
# grantee: {
|
@@ -4608,7 +4608,7 @@ module Aws::S3
|
|
4608
4608
|
# permission: "FULL_CONTROL", # accepts FULL_CONTROL, READ, WRITE
|
4609
4609
|
# },
|
4610
4610
|
# ],
|
4611
|
-
# target_prefix: "TargetPrefix",
|
4611
|
+
# target_prefix: "TargetPrefix", # required
|
4612
4612
|
# },
|
4613
4613
|
# },
|
4614
4614
|
# content_md5: "ContentMD5",
|
@@ -4915,7 +4915,7 @@ module Aws::S3
|
|
4915
4915
|
# destination: { # required
|
4916
4916
|
# bucket: "BucketName", # required
|
4917
4917
|
# account: "AccountId",
|
4918
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
4918
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
4919
4919
|
# access_control_translation: {
|
4920
4920
|
# owner: "Destination", # required, accepts Destination
|
4921
4921
|
# },
|
@@ -5432,7 +5432,7 @@ module Aws::S3
|
|
5432
5432
|
# "MetadataKey" => "MetadataValue",
|
5433
5433
|
# },
|
5434
5434
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
5435
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
5435
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
5436
5436
|
# website_redirect_location: "WebsiteRedirectLocation",
|
5437
5437
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
5438
5438
|
# sse_customer_key: "SSECustomerKey",
|
@@ -5713,6 +5713,10 @@ module Aws::S3
|
|
5713
5713
|
# field_delimiter: "FieldDelimiter",
|
5714
5714
|
# quote_character: "QuoteCharacter",
|
5715
5715
|
# },
|
5716
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
5717
|
+
# json: {
|
5718
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
5719
|
+
# },
|
5716
5720
|
# },
|
5717
5721
|
# expression_type: "SQL", # required, accepts SQL
|
5718
5722
|
# expression: "Expression", # required
|
@@ -5724,6 +5728,9 @@ module Aws::S3
|
|
5724
5728
|
# field_delimiter: "FieldDelimiter",
|
5725
5729
|
# quote_character: "QuoteCharacter",
|
5726
5730
|
# },
|
5731
|
+
# json: {
|
5732
|
+
# record_delimiter: "RecordDelimiter",
|
5733
|
+
# },
|
5727
5734
|
# },
|
5728
5735
|
# },
|
5729
5736
|
# output_location: {
|
@@ -5762,7 +5769,7 @@ module Aws::S3
|
|
5762
5769
|
# value: "MetadataValue",
|
5763
5770
|
# },
|
5764
5771
|
# ],
|
5765
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
5772
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
5766
5773
|
# },
|
5767
5774
|
# },
|
5768
5775
|
# },
|
@@ -6087,7 +6094,7 @@ module Aws::S3
|
|
6087
6094
|
params: params,
|
6088
6095
|
config: config)
|
6089
6096
|
context[:gem_name] = 'aws-sdk-s3'
|
6090
|
-
context[:gem_version] = '1.
|
6097
|
+
context[:gem_version] = '1.9.1'
|
6091
6098
|
Seahorse::Client::Request.new(handlers, context)
|
6092
6099
|
end
|
6093
6100
|
|
@@ -48,6 +48,8 @@ module Aws::S3
|
|
48
48
|
BucketName = Shapes::StringShape.new(name: 'BucketName')
|
49
49
|
BucketVersioningStatus = Shapes::StringShape.new(name: 'BucketVersioningStatus')
|
50
50
|
Buckets = Shapes::ListShape.new(name: 'Buckets')
|
51
|
+
BytesProcessed = Shapes::IntegerShape.new(name: 'BytesProcessed')
|
52
|
+
BytesScanned = Shapes::IntegerShape.new(name: 'BytesScanned')
|
51
53
|
CORSConfiguration = Shapes::StructureShape.new(name: 'CORSConfiguration')
|
52
54
|
CORSRule = Shapes::StructureShape.new(name: 'CORSRule')
|
53
55
|
CORSRules = Shapes::ListShape.new(name: 'CORSRules', flattened: true)
|
@@ -66,6 +68,7 @@ module Aws::S3
|
|
66
68
|
CompletedMultipartUpload = Shapes::StructureShape.new(name: 'CompletedMultipartUpload')
|
67
69
|
CompletedPart = Shapes::StructureShape.new(name: 'CompletedPart')
|
68
70
|
CompletedPartList = Shapes::ListShape.new(name: 'CompletedPartList', flattened: true)
|
71
|
+
CompressionType = Shapes::StringShape.new(name: 'CompressionType')
|
69
72
|
Condition = Shapes::StructureShape.new(name: 'Condition')
|
70
73
|
ConfirmRemoveSelfBucketAccess = Shapes::BooleanShape.new(name: 'ConfirmRemoveSelfBucketAccess')
|
71
74
|
ContentDisposition = Shapes::StringShape.new(name: 'ContentDisposition')
|
@@ -128,6 +131,7 @@ module Aws::S3
|
|
128
131
|
DisplayName = Shapes::StringShape.new(name: 'DisplayName')
|
129
132
|
ETag = Shapes::StringShape.new(name: 'ETag')
|
130
133
|
EmailAddress = Shapes::StringShape.new(name: 'EmailAddress')
|
134
|
+
EnableRequestProgress = Shapes::BooleanShape.new(name: 'EnableRequestProgress')
|
131
135
|
EncodingType = Shapes::StringShape.new(name: 'EncodingType')
|
132
136
|
Encryption = Shapes::StructureShape.new(name: 'Encryption')
|
133
137
|
EncryptionConfiguration = Shapes::StructureShape.new(name: 'EncryptionConfiguration')
|
@@ -235,6 +239,9 @@ module Aws::S3
|
|
235
239
|
IsEnabled = Shapes::BooleanShape.new(name: 'IsEnabled')
|
236
240
|
IsLatest = Shapes::BooleanShape.new(name: 'IsLatest')
|
237
241
|
IsTruncated = Shapes::BooleanShape.new(name: 'IsTruncated')
|
242
|
+
JSONInput = Shapes::StructureShape.new(name: 'JSONInput')
|
243
|
+
JSONOutput = Shapes::StructureShape.new(name: 'JSONOutput')
|
244
|
+
JSONType = Shapes::StringShape.new(name: 'JSONType')
|
238
245
|
KMSContext = Shapes::StringShape.new(name: 'KMSContext')
|
239
246
|
KeyCount = Shapes::IntegerShape.new(name: 'KeyCount')
|
240
247
|
KeyMarker = Shapes::StringShape.new(name: 'KeyMarker')
|
@@ -334,6 +341,7 @@ module Aws::S3
|
|
334
341
|
Permission = Shapes::StringShape.new(name: 'Permission')
|
335
342
|
Policy = Shapes::StringShape.new(name: 'Policy')
|
336
343
|
Prefix = Shapes::StringShape.new(name: 'Prefix')
|
344
|
+
Progress = Shapes::StructureShape.new(name: 'Progress')
|
337
345
|
Protocol = Shapes::StringShape.new(name: 'Protocol')
|
338
346
|
PutBucketAccelerateConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketAccelerateConfigurationRequest')
|
339
347
|
PutBucketAclRequest = Shapes::StructureShape.new(name: 'PutBucketAclRequest')
|
@@ -382,6 +390,7 @@ module Aws::S3
|
|
382
390
|
RequestCharged = Shapes::StringShape.new(name: 'RequestCharged')
|
383
391
|
RequestPayer = Shapes::StringShape.new(name: 'RequestPayer')
|
384
392
|
RequestPaymentConfiguration = Shapes::StructureShape.new(name: 'RequestPaymentConfiguration')
|
393
|
+
RequestProgress = Shapes::StructureShape.new(name: 'RequestProgress')
|
385
394
|
ResponseCacheControl = Shapes::StringShape.new(name: 'ResponseCacheControl')
|
386
395
|
ResponseContentDisposition = Shapes::StringShape.new(name: 'ResponseContentDisposition')
|
387
396
|
ResponseContentEncoding = Shapes::StringShape.new(name: 'ResponseContentEncoding')
|
@@ -418,6 +427,7 @@ module Aws::S3
|
|
418
427
|
SseKmsEncryptedObjects = Shapes::StructureShape.new(name: 'SseKmsEncryptedObjects')
|
419
428
|
SseKmsEncryptedObjectsStatus = Shapes::StringShape.new(name: 'SseKmsEncryptedObjectsStatus')
|
420
429
|
StartAfter = Shapes::StringShape.new(name: 'StartAfter')
|
430
|
+
Stats = Shapes::StructureShape.new(name: 'Stats')
|
421
431
|
StorageClass = Shapes::StringShape.new(name: 'StorageClass')
|
422
432
|
StorageClassAnalysis = Shapes::StructureShape.new(name: 'StorageClassAnalysis')
|
423
433
|
StorageClassAnalysisDataExport = Shapes::StructureShape.new(name: 'StorageClassAnalysisDataExport')
|
@@ -1110,6 +1120,8 @@ module Aws::S3
|
|
1110
1120
|
Initiator.struct_class = Types::Initiator
|
1111
1121
|
|
1112
1122
|
InputSerialization.add_member(:csv, Shapes::ShapeRef.new(shape: CSVInput, location_name: "CSV"))
|
1123
|
+
InputSerialization.add_member(:compression_type, Shapes::ShapeRef.new(shape: CompressionType, location_name: "CompressionType"))
|
1124
|
+
InputSerialization.add_member(:json, Shapes::ShapeRef.new(shape: JSONInput, location_name: "JSON"))
|
1113
1125
|
InputSerialization.struct_class = Types::InputSerialization
|
1114
1126
|
|
1115
1127
|
InventoryConfiguration.add_member(:destination, Shapes::ShapeRef.new(shape: InventoryDestination, required: true, location_name: "Destination"))
|
@@ -1145,6 +1157,12 @@ module Aws::S3
|
|
1145
1157
|
InventorySchedule.add_member(:frequency, Shapes::ShapeRef.new(shape: InventoryFrequency, required: true, location_name: "Frequency"))
|
1146
1158
|
InventorySchedule.struct_class = Types::InventorySchedule
|
1147
1159
|
|
1160
|
+
JSONInput.add_member(:type, Shapes::ShapeRef.new(shape: JSONType, location_name: "Type"))
|
1161
|
+
JSONInput.struct_class = Types::JSONInput
|
1162
|
+
|
1163
|
+
JSONOutput.add_member(:record_delimiter, Shapes::ShapeRef.new(shape: RecordDelimiter, location_name: "RecordDelimiter"))
|
1164
|
+
JSONOutput.struct_class = Types::JSONOutput
|
1165
|
+
|
1148
1166
|
LambdaFunctionConfiguration.add_member(:id, Shapes::ShapeRef.new(shape: NotificationId, location_name: "Id"))
|
1149
1167
|
LambdaFunctionConfiguration.add_member(:lambda_function_arn, Shapes::ShapeRef.new(shape: LambdaFunctionArn, required: true, location_name: "CloudFunction"))
|
1150
1168
|
LambdaFunctionConfiguration.add_member(:events, Shapes::ShapeRef.new(shape: EventList, required: true, location_name: "Event"))
|
@@ -1334,9 +1352,9 @@ module Aws::S3
|
|
1334
1352
|
ListPartsRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
|
1335
1353
|
ListPartsRequest.struct_class = Types::ListPartsRequest
|
1336
1354
|
|
1337
|
-
LoggingEnabled.add_member(:target_bucket, Shapes::ShapeRef.new(shape: TargetBucket, location_name: "TargetBucket"))
|
1355
|
+
LoggingEnabled.add_member(:target_bucket, Shapes::ShapeRef.new(shape: TargetBucket, required: true, location_name: "TargetBucket"))
|
1338
1356
|
LoggingEnabled.add_member(:target_grants, Shapes::ShapeRef.new(shape: TargetGrants, location_name: "TargetGrants"))
|
1339
|
-
LoggingEnabled.add_member(:target_prefix, Shapes::ShapeRef.new(shape: TargetPrefix, location_name: "TargetPrefix"))
|
1357
|
+
LoggingEnabled.add_member(:target_prefix, Shapes::ShapeRef.new(shape: TargetPrefix, required: true, location_name: "TargetPrefix"))
|
1340
1358
|
LoggingEnabled.struct_class = Types::LoggingEnabled
|
1341
1359
|
|
1342
1360
|
Metadata.key = Shapes::ShapeRef.new(shape: MetadataKey)
|
@@ -1425,6 +1443,7 @@ module Aws::S3
|
|
1425
1443
|
OutputLocation.struct_class = Types::OutputLocation
|
1426
1444
|
|
1427
1445
|
OutputSerialization.add_member(:csv, Shapes::ShapeRef.new(shape: CSVOutput, location_name: "CSV"))
|
1446
|
+
OutputSerialization.add_member(:json, Shapes::ShapeRef.new(shape: JSONOutput, location_name: "JSON"))
|
1428
1447
|
OutputSerialization.struct_class = Types::OutputSerialization
|
1429
1448
|
|
1430
1449
|
Owner.add_member(:display_name, Shapes::ShapeRef.new(shape: DisplayName, location_name: "DisplayName"))
|
@@ -1439,6 +1458,10 @@ module Aws::S3
|
|
1439
1458
|
|
1440
1459
|
Parts.member = Shapes::ShapeRef.new(shape: Part)
|
1441
1460
|
|
1461
|
+
Progress.add_member(:bytes_scanned, Shapes::ShapeRef.new(shape: BytesScanned, location_name: "BytesScanned"))
|
1462
|
+
Progress.add_member(:bytes_processed, Shapes::ShapeRef.new(shape: BytesProcessed, location_name: "BytesProcessed"))
|
1463
|
+
Progress.struct_class = Types::Progress
|
1464
|
+
|
1442
1465
|
PutBucketAccelerateConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
|
1443
1466
|
PutBucketAccelerateConfigurationRequest.add_member(:accelerate_configuration, Shapes::ShapeRef.new(shape: AccelerateConfiguration, required: true, location_name: "AccelerateConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
|
1444
1467
|
PutBucketAccelerateConfigurationRequest.struct_class = Types::PutBucketAccelerateConfigurationRequest
|
@@ -1682,6 +1705,9 @@ module Aws::S3
|
|
1682
1705
|
RequestPaymentConfiguration.add_member(:payer, Shapes::ShapeRef.new(shape: Payer, required: true, location_name: "Payer"))
|
1683
1706
|
RequestPaymentConfiguration.struct_class = Types::RequestPaymentConfiguration
|
1684
1707
|
|
1708
|
+
RequestProgress.add_member(:enabled, Shapes::ShapeRef.new(shape: EnableRequestProgress, location_name: "Enabled"))
|
1709
|
+
RequestProgress.struct_class = Types::RequestProgress
|
1710
|
+
|
1685
1711
|
RestoreObjectOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
|
1686
1712
|
RestoreObjectOutput.add_member(:restore_output_path, Shapes::ShapeRef.new(shape: RestoreOutputPath, location: "header", location_name: "x-amz-restore-output-path"))
|
1687
1713
|
RestoreObjectOutput.struct_class = Types::RestoreObjectOutput
|
@@ -1764,6 +1790,10 @@ module Aws::S3
|
|
1764
1790
|
SseKmsEncryptedObjects.add_member(:status, Shapes::ShapeRef.new(shape: SseKmsEncryptedObjectsStatus, required: true, location_name: "Status"))
|
1765
1791
|
SseKmsEncryptedObjects.struct_class = Types::SseKmsEncryptedObjects
|
1766
1792
|
|
1793
|
+
Stats.add_member(:bytes_scanned, Shapes::ShapeRef.new(shape: BytesScanned, location_name: "BytesScanned"))
|
1794
|
+
Stats.add_member(:bytes_processed, Shapes::ShapeRef.new(shape: BytesProcessed, location_name: "BytesProcessed"))
|
1795
|
+
Stats.struct_class = Types::Stats
|
1796
|
+
|
1767
1797
|
StorageClassAnalysis.add_member(:data_export, Shapes::ShapeRef.new(shape: StorageClassAnalysisDataExport, location_name: "DataExport"))
|
1768
1798
|
StorageClassAnalysis.struct_class = Types::StorageClassAnalysis
|
1769
1799
|
|
@@ -25,6 +25,7 @@ module Aws
|
|
25
25
|
POSSIBLE_ENCRYPTION_FORMATS = %w(
|
26
26
|
AES/GCM/NoPadding
|
27
27
|
AES/CBC/PKCS5Padding
|
28
|
+
AES/CBC/PKCS7Padding
|
28
29
|
)
|
29
30
|
|
30
31
|
def call(context)
|
@@ -162,7 +163,7 @@ module Aws
|
|
162
163
|
# The encrypted object contains both the cipher text
|
163
164
|
# plus a trailing auth tag. This decrypter will the body
|
164
165
|
# expect for the trailing auth tag.
|
165
|
-
|
166
|
+
IOAuthDecrypter.new(
|
166
167
|
io: http_resp.body,
|
167
168
|
encrypted_content_length: content_length - auth_tag_length,
|
168
169
|
cipher: cipher)
|
@@ -89,39 +89,13 @@ module Aws
|
|
89
89
|
if @chunk_size && @chunk_size > file_size
|
90
90
|
raise ArgumentError, ":chunk_size shouldn't exceed total file size."
|
91
91
|
else
|
92
|
-
|
92
|
+
@chunk_size || [(file_size.to_f / MAX_PARTS).ceil, MIN_CHUNK_SIZE].max.to_i
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
96
|
-
def
|
97
|
-
# sort file by start range count or part number
|
98
|
-
files.sort do |a, b|
|
99
|
-
a[/([^\=]+)$/].split('-')[0].to_i <=> b[/([^\=]+)$/].split('-')[0].to_i
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
def concatenate_parts(fileparts)
|
104
|
-
File.open(@path, 'wb')do |output_path|
|
105
|
-
sort_files(fileparts).each {|part| IO.copy_stream(part, output_path)}
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
def file_batches(chunks, dir, mode)
|
110
|
-
batches = []
|
96
|
+
def batches(chunks, mode)
|
111
97
|
chunks = (1..chunks) if mode.eql? 'part_number'
|
112
|
-
chunks.each_slice(@thread_count)
|
113
|
-
batches << map_files(slice, dir, mode)
|
114
|
-
end
|
115
|
-
batches
|
116
|
-
end
|
117
|
-
|
118
|
-
def map_files(slice, dir, mode)
|
119
|
-
case mode
|
120
|
-
when 'range'
|
121
|
-
slice.inject({}) {|h, chunk| h[chunk] = File.join(dir, chunk); h}
|
122
|
-
when 'part_number'
|
123
|
-
slice.inject({}) {|h, part| h[part] = File.join(dir, "part_number=#{part}"); h}
|
124
|
-
end
|
98
|
+
chunks.each_slice(@thread_count).to_a
|
125
99
|
end
|
126
100
|
|
127
101
|
def multithreaded_get_by_ranges(chunks)
|
@@ -133,32 +107,28 @@ module Aws
|
|
133
107
|
end
|
134
108
|
|
135
109
|
def thread_batches(chunks, param)
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
:bucket => @bucket,
|
147
|
-
:key => @key,
|
148
|
-
param.to_sym => chunk,
|
149
|
-
:response_target => file
|
150
|
-
)
|
151
|
-
end
|
110
|
+
batches(chunks, param).each do |batch|
|
111
|
+
threads = []
|
112
|
+
batch.each do |chunk|
|
113
|
+
threads << Thread.new do
|
114
|
+
resp = @client.get_object(
|
115
|
+
:bucket => @bucket,
|
116
|
+
:key => @key,
|
117
|
+
param.to_sym => chunk
|
118
|
+
)
|
119
|
+
write(resp)
|
152
120
|
end
|
153
|
-
threads.each(&:join)
|
154
121
|
end
|
155
|
-
|
156
|
-
ensure
|
157
|
-
# clean up tmp dir
|
158
|
-
FileUtils.remove_entry(dir)
|
122
|
+
threads.each(&:join)
|
159
123
|
end
|
160
124
|
end
|
161
125
|
|
126
|
+
def write(resp)
|
127
|
+
range, _ = resp.content_range.split(" ").last.split("/")
|
128
|
+
head, _ = range.split("-").map {|s| s.to_i}
|
129
|
+
IO.write(@path, resp.body.read, head)
|
130
|
+
end
|
131
|
+
|
162
132
|
def single_request
|
163
133
|
@client.get_object(
|
164
134
|
bucket: @bucket, key: @key, response_target: @path
|
data/lib/aws-sdk-s3/object.rb
CHANGED
@@ -425,7 +425,7 @@ module Aws::S3
|
|
425
425
|
# metadata_directive: "COPY", # accepts COPY, REPLACE
|
426
426
|
# tagging_directive: "COPY", # accepts COPY, REPLACE
|
427
427
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
428
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
428
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
429
429
|
# website_redirect_location: "WebsiteRedirectLocation",
|
430
430
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
431
431
|
# sse_customer_key: "SSECustomerKey",
|
@@ -676,7 +676,7 @@ module Aws::S3
|
|
676
676
|
# "MetadataKey" => "MetadataValue",
|
677
677
|
# },
|
678
678
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
679
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
679
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
680
680
|
# website_redirect_location: "WebsiteRedirectLocation",
|
681
681
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
682
682
|
# sse_customer_key: "SSECustomerKey",
|
@@ -786,7 +786,7 @@ module Aws::S3
|
|
786
786
|
# "MetadataKey" => "MetadataValue",
|
787
787
|
# },
|
788
788
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
789
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
789
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
790
790
|
# website_redirect_location: "WebsiteRedirectLocation",
|
791
791
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
792
792
|
# sse_customer_key: "SSECustomerKey",
|
@@ -899,6 +899,10 @@ module Aws::S3
|
|
899
899
|
# field_delimiter: "FieldDelimiter",
|
900
900
|
# quote_character: "QuoteCharacter",
|
901
901
|
# },
|
902
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
903
|
+
# json: {
|
904
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
905
|
+
# },
|
902
906
|
# },
|
903
907
|
# expression_type: "SQL", # required, accepts SQL
|
904
908
|
# expression: "Expression", # required
|
@@ -910,6 +914,9 @@ module Aws::S3
|
|
910
914
|
# field_delimiter: "FieldDelimiter",
|
911
915
|
# quote_character: "QuoteCharacter",
|
912
916
|
# },
|
917
|
+
# json: {
|
918
|
+
# record_delimiter: "RecordDelimiter",
|
919
|
+
# },
|
913
920
|
# },
|
914
921
|
# },
|
915
922
|
# output_location: {
|
@@ -948,7 +955,7 @@ module Aws::S3
|
|
948
955
|
# value: "MetadataValue",
|
949
956
|
# },
|
950
957
|
# ],
|
951
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
958
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
952
959
|
# },
|
953
960
|
# },
|
954
961
|
# },
|
@@ -268,7 +268,7 @@ module Aws::S3
|
|
268
268
|
# metadata_directive: "COPY", # accepts COPY, REPLACE
|
269
269
|
# tagging_directive: "COPY", # accepts COPY, REPLACE
|
270
270
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
271
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
271
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
272
272
|
# website_redirect_location: "WebsiteRedirectLocation",
|
273
273
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
274
274
|
# sse_customer_key: "SSECustomerKey",
|
@@ -519,7 +519,7 @@ module Aws::S3
|
|
519
519
|
# "MetadataKey" => "MetadataValue",
|
520
520
|
# },
|
521
521
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
522
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
522
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
523
523
|
# website_redirect_location: "WebsiteRedirectLocation",
|
524
524
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
525
525
|
# sse_customer_key: "SSECustomerKey",
|
@@ -629,7 +629,7 @@ module Aws::S3
|
|
629
629
|
# "MetadataKey" => "MetadataValue",
|
630
630
|
# },
|
631
631
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
632
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
632
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
633
633
|
# website_redirect_location: "WebsiteRedirectLocation",
|
634
634
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
635
635
|
# sse_customer_key: "SSECustomerKey",
|
@@ -742,6 +742,10 @@ module Aws::S3
|
|
742
742
|
# field_delimiter: "FieldDelimiter",
|
743
743
|
# quote_character: "QuoteCharacter",
|
744
744
|
# },
|
745
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
746
|
+
# json: {
|
747
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
748
|
+
# },
|
745
749
|
# },
|
746
750
|
# expression_type: "SQL", # required, accepts SQL
|
747
751
|
# expression: "Expression", # required
|
@@ -753,6 +757,9 @@ module Aws::S3
|
|
753
757
|
# field_delimiter: "FieldDelimiter",
|
754
758
|
# quote_character: "QuoteCharacter",
|
755
759
|
# },
|
760
|
+
# json: {
|
761
|
+
# record_delimiter: "RecordDelimiter",
|
762
|
+
# },
|
756
763
|
# },
|
757
764
|
# },
|
758
765
|
# output_location: {
|
@@ -791,7 +798,7 @@ module Aws::S3
|
|
791
798
|
# value: "MetadataValue",
|
792
799
|
# },
|
793
800
|
# ],
|
794
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
801
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
795
802
|
# },
|
796
803
|
# },
|
797
804
|
# },
|
@@ -60,6 +60,8 @@ each bucket. [Go here for more information](http://docs.aws.amazon.com/AmazonS3
|
|
60
60
|
endpoint.port = 443
|
61
61
|
endpoint.host = "#{bucket_name}.s3-accelerate.amazonaws.com"
|
62
62
|
context.http_request.endpoint = endpoint.to_s
|
63
|
+
# s3 accelerate endpoint doesn't work with 'expect' header
|
64
|
+
context.http_request.headers.delete('expect')
|
63
65
|
end
|
64
66
|
|
65
67
|
def use_combined_accelerate_dualstack_endpoint(context)
|
@@ -70,10 +72,12 @@ each bucket. [Go here for more information](http://docs.aws.amazon.com/AmazonS3
|
|
70
72
|
endpoint.port = 443
|
71
73
|
endpoint.host = "#{bucket_name}.s3-accelerate.dualstack.amazonaws.com"
|
72
74
|
context.http_request.endpoint = endpoint.to_s
|
75
|
+
# s3 accelerate endpoint doesn't work with 'expect' header
|
76
|
+
context.http_request.headers.delete('expect')
|
73
77
|
end
|
74
78
|
|
75
79
|
def validate_bucket_name!(bucket_name)
|
76
|
-
unless BucketDns.dns_compatible?(bucket_name,
|
80
|
+
unless BucketDns.dns_compatible?(bucket_name, _ssl = true)
|
77
81
|
msg = "unable to use `accelerate: true` on buckets with "
|
78
82
|
msg << "non-DNS compatible names"
|
79
83
|
raise ArgumentError, msg
|
@@ -38,7 +38,7 @@ for all operations.
|
|
38
38
|
def apply_dualstack_endpoint(context)
|
39
39
|
bucket_name = context.params[:bucket]
|
40
40
|
region = context.config.region
|
41
|
-
|
41
|
+
context.config.force_path_style
|
42
42
|
dns_suffix = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
|
43
43
|
|
44
44
|
if use_bucket_dns?(bucket_name, context)
|
data/lib/aws-sdk-s3/presigner.rb
CHANGED
data/lib/aws-sdk-s3/types.rb
CHANGED
@@ -401,13 +401,13 @@ module Aws::S3
|
|
401
401
|
# {
|
402
402
|
# date: Time.now,
|
403
403
|
# days: 1,
|
404
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
404
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
405
405
|
# },
|
406
406
|
# ],
|
407
407
|
# noncurrent_version_transitions: [
|
408
408
|
# {
|
409
409
|
# noncurrent_days: 1,
|
410
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
410
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
411
411
|
# },
|
412
412
|
# ],
|
413
413
|
# noncurrent_version_expiration: {
|
@@ -435,7 +435,7 @@ module Aws::S3
|
|
435
435
|
#
|
436
436
|
# {
|
437
437
|
# logging_enabled: {
|
438
|
-
# target_bucket: "TargetBucket",
|
438
|
+
# target_bucket: "TargetBucket", # required
|
439
439
|
# target_grants: [
|
440
440
|
# {
|
441
441
|
# grantee: {
|
@@ -448,11 +448,14 @@ module Aws::S3
|
|
448
448
|
# permission: "FULL_CONTROL", # accepts FULL_CONTROL, READ, WRITE
|
449
449
|
# },
|
450
450
|
# ],
|
451
|
-
# target_prefix: "TargetPrefix",
|
451
|
+
# target_prefix: "TargetPrefix", # required
|
452
452
|
# },
|
453
453
|
# }
|
454
454
|
#
|
455
455
|
# @!attribute [rw] logging_enabled
|
456
|
+
# Container for logging information. Presence of this element
|
457
|
+
# indicates that logging is enabled. Parameters TargetBucket and
|
458
|
+
# TargetPrefix are required in this case.
|
456
459
|
# @return [Types::LoggingEnabled]
|
457
460
|
#
|
458
461
|
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketLoggingStatus AWS API Documentation
|
@@ -954,7 +957,7 @@ module Aws::S3
|
|
954
957
|
# metadata_directive: "COPY", # accepts COPY, REPLACE
|
955
958
|
# tagging_directive: "COPY", # accepts COPY, REPLACE
|
956
959
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
957
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
960
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
958
961
|
# website_redirect_location: "WebsiteRedirectLocation",
|
959
962
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
960
963
|
# sse_customer_key: "SSECustomerKey",
|
@@ -1379,7 +1382,7 @@ module Aws::S3
|
|
1379
1382
|
# "MetadataKey" => "MetadataValue",
|
1380
1383
|
# },
|
1381
1384
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
1382
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
1385
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
1383
1386
|
# website_redirect_location: "WebsiteRedirectLocation",
|
1384
1387
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
1385
1388
|
# sse_customer_key: "SSECustomerKey",
|
@@ -2011,7 +2014,7 @@ module Aws::S3
|
|
2011
2014
|
# {
|
2012
2015
|
# bucket: "BucketName", # required
|
2013
2016
|
# account: "AccountId",
|
2014
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
2017
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
2015
2018
|
# access_control_translation: {
|
2016
2019
|
# owner: "Destination", # required, accepts Destination
|
2017
2020
|
# },
|
@@ -2460,6 +2463,9 @@ module Aws::S3
|
|
2460
2463
|
end
|
2461
2464
|
|
2462
2465
|
# @!attribute [rw] logging_enabled
|
2466
|
+
# Container for logging information. Presence of this element
|
2467
|
+
# indicates that logging is enabled. Parameters TargetBucket and
|
2468
|
+
# TargetPrefix are required in this case.
|
2463
2469
|
# @return [Types::LoggingEnabled]
|
2464
2470
|
#
|
2465
2471
|
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLoggingOutput AWS API Documentation
|
@@ -3613,16 +3619,31 @@ module Aws::S3
|
|
3613
3619
|
# field_delimiter: "FieldDelimiter",
|
3614
3620
|
# quote_character: "QuoteCharacter",
|
3615
3621
|
# },
|
3622
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
3623
|
+
# json: {
|
3624
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
3625
|
+
# },
|
3616
3626
|
# }
|
3617
3627
|
#
|
3618
3628
|
# @!attribute [rw] csv
|
3619
3629
|
# Describes the serialization of a CSV-encoded object.
|
3620
3630
|
# @return [Types::CSVInput]
|
3621
3631
|
#
|
3632
|
+
# @!attribute [rw] compression_type
|
3633
|
+
# Specifies object's compression format. Valid values: NONE, GZIP.
|
3634
|
+
# Default Value: NONE.
|
3635
|
+
# @return [String]
|
3636
|
+
#
|
3637
|
+
# @!attribute [rw] json
|
3638
|
+
# Specifies JSON as object's input serialization format.
|
3639
|
+
# @return [Types::JSONInput]
|
3640
|
+
#
|
3622
3641
|
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InputSerialization AWS API Documentation
|
3623
3642
|
#
|
3624
3643
|
class InputSerialization < Struct.new(
|
3625
|
-
:csv
|
3644
|
+
:csv,
|
3645
|
+
:compression_type,
|
3646
|
+
:json)
|
3626
3647
|
include Aws::Structure
|
3627
3648
|
end
|
3628
3649
|
|
@@ -3850,6 +3871,42 @@ module Aws::S3
|
|
3850
3871
|
include Aws::Structure
|
3851
3872
|
end
|
3852
3873
|
|
3874
|
+
# @note When making an API call, you may pass JSONInput
|
3875
|
+
# data as a hash:
|
3876
|
+
#
|
3877
|
+
# {
|
3878
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
3879
|
+
# }
|
3880
|
+
#
|
3881
|
+
# @!attribute [rw] type
|
3882
|
+
# The type of JSON. Valid values: Document, Lines.
|
3883
|
+
# @return [String]
|
3884
|
+
#
|
3885
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/JSONInput AWS API Documentation
|
3886
|
+
#
|
3887
|
+
class JSONInput < Struct.new(
|
3888
|
+
:type)
|
3889
|
+
include Aws::Structure
|
3890
|
+
end
|
3891
|
+
|
3892
|
+
# @note When making an API call, you may pass JSONOutput
|
3893
|
+
# data as a hash:
|
3894
|
+
#
|
3895
|
+
# {
|
3896
|
+
# record_delimiter: "RecordDelimiter",
|
3897
|
+
# }
|
3898
|
+
#
|
3899
|
+
# @!attribute [rw] record_delimiter
|
3900
|
+
# The value used to separate individual records in the output.
|
3901
|
+
# @return [String]
|
3902
|
+
#
|
3903
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/JSONOutput AWS API Documentation
|
3904
|
+
#
|
3905
|
+
class JSONOutput < Struct.new(
|
3906
|
+
:record_delimiter)
|
3907
|
+
include Aws::Structure
|
3908
|
+
end
|
3909
|
+
|
3853
3910
|
# Container for specifying the AWS Lambda notification configuration.
|
3854
3911
|
#
|
3855
3912
|
# @note When making an API call, you may pass LambdaFunctionConfiguration
|
@@ -3922,11 +3979,11 @@ module Aws::S3
|
|
3922
3979
|
# transition: {
|
3923
3980
|
# date: Time.now,
|
3924
3981
|
# days: 1,
|
3925
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
3982
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
3926
3983
|
# },
|
3927
3984
|
# noncurrent_version_transition: {
|
3928
3985
|
# noncurrent_days: 1,
|
3929
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
3986
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
3930
3987
|
# },
|
3931
3988
|
# noncurrent_version_expiration: {
|
3932
3989
|
# noncurrent_days: 1,
|
@@ -4015,13 +4072,13 @@ module Aws::S3
|
|
4015
4072
|
# {
|
4016
4073
|
# date: Time.now,
|
4017
4074
|
# days: 1,
|
4018
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4075
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4019
4076
|
# },
|
4020
4077
|
# ],
|
4021
4078
|
# noncurrent_version_transitions: [
|
4022
4079
|
# {
|
4023
4080
|
# noncurrent_days: 1,
|
4024
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
4081
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
4025
4082
|
# },
|
4026
4083
|
# ],
|
4027
4084
|
# noncurrent_version_expiration: {
|
@@ -5039,11 +5096,15 @@ module Aws::S3
|
|
5039
5096
|
include Aws::Structure
|
5040
5097
|
end
|
5041
5098
|
|
5099
|
+
# Container for logging information. Presence of this element indicates
|
5100
|
+
# that logging is enabled. Parameters TargetBucket and TargetPrefix are
|
5101
|
+
# required in this case.
|
5102
|
+
#
|
5042
5103
|
# @note When making an API call, you may pass LoggingEnabled
|
5043
5104
|
# data as a hash:
|
5044
5105
|
#
|
5045
5106
|
# {
|
5046
|
-
# target_bucket: "TargetBucket",
|
5107
|
+
# target_bucket: "TargetBucket", # required
|
5047
5108
|
# target_grants: [
|
5048
5109
|
# {
|
5049
5110
|
# grantee: {
|
@@ -5056,7 +5117,7 @@ module Aws::S3
|
|
5056
5117
|
# permission: "FULL_CONTROL", # accepts FULL_CONTROL, READ, WRITE
|
5057
5118
|
# },
|
5058
5119
|
# ],
|
5059
|
-
# target_prefix: "TargetPrefix",
|
5120
|
+
# target_prefix: "TargetPrefix", # required
|
5060
5121
|
# }
|
5061
5122
|
#
|
5062
5123
|
# @!attribute [rw] target_bucket
|
@@ -5292,18 +5353,19 @@ module Aws::S3
|
|
5292
5353
|
end
|
5293
5354
|
|
5294
5355
|
# Container for the transition rule that describes when noncurrent
|
5295
|
-
# objects transition to the STANDARD\_IA or GLACIER storage
|
5296
|
-
# your bucket is versioning-enabled (or versioning is
|
5297
|
-
# can set this action to request that Amazon S3
|
5298
|
-
# object versions to the STANDARD\_IA
|
5299
|
-
# specific period in the object's
|
5356
|
+
# objects transition to the STANDARD\_IA, ONEZONE\_IA or GLACIER storage
|
5357
|
+
# class. If your bucket is versioning-enabled (or versioning is
|
5358
|
+
# suspended), you can set this action to request that Amazon S3
|
5359
|
+
# transition noncurrent object versions to the STANDARD\_IA, ONEZONE\_IA
|
5360
|
+
# or GLACIER storage class at a specific period in the object's
|
5361
|
+
# lifetime.
|
5300
5362
|
#
|
5301
5363
|
# @note When making an API call, you may pass NoncurrentVersionTransition
|
5302
5364
|
# data as a hash:
|
5303
5365
|
#
|
5304
5366
|
# {
|
5305
5367
|
# noncurrent_days: 1,
|
5306
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
5368
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
5307
5369
|
# }
|
5308
5370
|
#
|
5309
5371
|
# @!attribute [rw] noncurrent_days
|
@@ -5625,7 +5687,7 @@ module Aws::S3
|
|
5625
5687
|
# value: "MetadataValue",
|
5626
5688
|
# },
|
5627
5689
|
# ],
|
5628
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
5690
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
5629
5691
|
# },
|
5630
5692
|
# }
|
5631
5693
|
#
|
@@ -5654,16 +5716,24 @@ module Aws::S3
|
|
5654
5716
|
# field_delimiter: "FieldDelimiter",
|
5655
5717
|
# quote_character: "QuoteCharacter",
|
5656
5718
|
# },
|
5719
|
+
# json: {
|
5720
|
+
# record_delimiter: "RecordDelimiter",
|
5721
|
+
# },
|
5657
5722
|
# }
|
5658
5723
|
#
|
5659
5724
|
# @!attribute [rw] csv
|
5660
5725
|
# Describes the serialization of CSV-encoded Select results.
|
5661
5726
|
# @return [Types::CSVOutput]
|
5662
5727
|
#
|
5728
|
+
# @!attribute [rw] json
|
5729
|
+
# Specifies JSON as request's output serialization format.
|
5730
|
+
# @return [Types::JSONOutput]
|
5731
|
+
#
|
5663
5732
|
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/OutputSerialization AWS API Documentation
|
5664
5733
|
#
|
5665
5734
|
class OutputSerialization < Struct.new(
|
5666
|
-
:csv
|
5735
|
+
:csv,
|
5736
|
+
:json)
|
5667
5737
|
include Aws::Structure
|
5668
5738
|
end
|
5669
5739
|
|
@@ -5716,6 +5786,22 @@ module Aws::S3
|
|
5716
5786
|
include Aws::Structure
|
5717
5787
|
end
|
5718
5788
|
|
5789
|
+
# @!attribute [rw] bytes_scanned
|
5790
|
+
# Current number of object bytes scanned.
|
5791
|
+
# @return [Integer]
|
5792
|
+
#
|
5793
|
+
# @!attribute [rw] bytes_processed
|
5794
|
+
# Current number of uncompressed object bytes processed.
|
5795
|
+
# @return [Integer]
|
5796
|
+
#
|
5797
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Progress AWS API Documentation
|
5798
|
+
#
|
5799
|
+
class Progress < Struct.new(
|
5800
|
+
:bytes_scanned,
|
5801
|
+
:bytes_processed)
|
5802
|
+
include Aws::Structure
|
5803
|
+
end
|
5804
|
+
|
5719
5805
|
# @note When making an API call, you may pass PutBucketAccelerateConfigurationRequest
|
5720
5806
|
# data as a hash:
|
5721
5807
|
#
|
@@ -6059,13 +6145,13 @@ module Aws::S3
|
|
6059
6145
|
# {
|
6060
6146
|
# date: Time.now,
|
6061
6147
|
# days: 1,
|
6062
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
6148
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
6063
6149
|
# },
|
6064
6150
|
# ],
|
6065
6151
|
# noncurrent_version_transitions: [
|
6066
6152
|
# {
|
6067
6153
|
# noncurrent_days: 1,
|
6068
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
6154
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
6069
6155
|
# },
|
6070
6156
|
# ],
|
6071
6157
|
# noncurrent_version_expiration: {
|
@@ -6113,11 +6199,11 @@ module Aws::S3
|
|
6113
6199
|
# transition: {
|
6114
6200
|
# date: Time.now,
|
6115
6201
|
# days: 1,
|
6116
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
6202
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
6117
6203
|
# },
|
6118
6204
|
# noncurrent_version_transition: {
|
6119
6205
|
# noncurrent_days: 1,
|
6120
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
6206
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
6121
6207
|
# },
|
6122
6208
|
# noncurrent_version_expiration: {
|
6123
6209
|
# noncurrent_days: 1,
|
@@ -6155,7 +6241,7 @@ module Aws::S3
|
|
6155
6241
|
# bucket: "BucketName", # required
|
6156
6242
|
# bucket_logging_status: { # required
|
6157
6243
|
# logging_enabled: {
|
6158
|
-
# target_bucket: "TargetBucket",
|
6244
|
+
# target_bucket: "TargetBucket", # required
|
6159
6245
|
# target_grants: [
|
6160
6246
|
# {
|
6161
6247
|
# grantee: {
|
@@ -6168,7 +6254,7 @@ module Aws::S3
|
|
6168
6254
|
# permission: "FULL_CONTROL", # accepts FULL_CONTROL, READ, WRITE
|
6169
6255
|
# },
|
6170
6256
|
# ],
|
6171
|
-
# target_prefix: "TargetPrefix",
|
6257
|
+
# target_prefix: "TargetPrefix", # required
|
6172
6258
|
# },
|
6173
6259
|
# },
|
6174
6260
|
# content_md5: "ContentMD5",
|
@@ -6420,7 +6506,7 @@ module Aws::S3
|
|
6420
6506
|
# destination: { # required
|
6421
6507
|
# bucket: "BucketName", # required
|
6422
6508
|
# account: "AccountId",
|
6423
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
6509
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
6424
6510
|
# access_control_translation: {
|
6425
6511
|
# owner: "Destination", # required, accepts Destination
|
6426
6512
|
# },
|
@@ -6802,7 +6888,7 @@ module Aws::S3
|
|
6802
6888
|
# "MetadataKey" => "MetadataValue",
|
6803
6889
|
# },
|
6804
6890
|
# server_side_encryption: "AES256", # accepts AES256, aws:kms
|
6805
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
6891
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
6806
6892
|
# website_redirect_location: "WebsiteRedirectLocation",
|
6807
6893
|
# sse_customer_algorithm: "SSECustomerAlgorithm",
|
6808
6894
|
# sse_customer_key: "SSECustomerKey",
|
@@ -7217,7 +7303,7 @@ module Aws::S3
|
|
7217
7303
|
# destination: { # required
|
7218
7304
|
# bucket: "BucketName", # required
|
7219
7305
|
# account: "AccountId",
|
7220
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
7306
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
7221
7307
|
# access_control_translation: {
|
7222
7308
|
# owner: "Destination", # required, accepts Destination
|
7223
7309
|
# },
|
@@ -7265,7 +7351,7 @@ module Aws::S3
|
|
7265
7351
|
# destination: { # required
|
7266
7352
|
# bucket: "BucketName", # required
|
7267
7353
|
# account: "AccountId",
|
7268
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
7354
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
7269
7355
|
# access_control_translation: {
|
7270
7356
|
# owner: "Destination", # required, accepts Destination
|
7271
7357
|
# },
|
@@ -7328,6 +7414,18 @@ module Aws::S3
|
|
7328
7414
|
include Aws::Structure
|
7329
7415
|
end
|
7330
7416
|
|
7417
|
+
# @!attribute [rw] enabled
|
7418
|
+
# Specifies whether periodic QueryProgress frames should be sent.
|
7419
|
+
# Valid values: TRUE, FALSE. Default value: FALSE.
|
7420
|
+
# @return [Boolean]
|
7421
|
+
#
|
7422
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RequestProgress AWS API Documentation
|
7423
|
+
#
|
7424
|
+
class RequestProgress < Struct.new(
|
7425
|
+
:enabled)
|
7426
|
+
include Aws::Structure
|
7427
|
+
end
|
7428
|
+
|
7331
7429
|
# @!attribute [rw] request_charged
|
7332
7430
|
# If present, indicates that the requester was successfully charged
|
7333
7431
|
# for the request.
|
@@ -7371,6 +7469,10 @@ module Aws::S3
|
|
7371
7469
|
# field_delimiter: "FieldDelimiter",
|
7372
7470
|
# quote_character: "QuoteCharacter",
|
7373
7471
|
# },
|
7472
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
7473
|
+
# json: {
|
7474
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
7475
|
+
# },
|
7374
7476
|
# },
|
7375
7477
|
# expression_type: "SQL", # required, accepts SQL
|
7376
7478
|
# expression: "Expression", # required
|
@@ -7382,6 +7484,9 @@ module Aws::S3
|
|
7382
7484
|
# field_delimiter: "FieldDelimiter",
|
7383
7485
|
# quote_character: "QuoteCharacter",
|
7384
7486
|
# },
|
7487
|
+
# json: {
|
7488
|
+
# record_delimiter: "RecordDelimiter",
|
7489
|
+
# },
|
7385
7490
|
# },
|
7386
7491
|
# },
|
7387
7492
|
# output_location: {
|
@@ -7420,7 +7525,7 @@ module Aws::S3
|
|
7420
7525
|
# value: "MetadataValue",
|
7421
7526
|
# },
|
7422
7527
|
# ],
|
7423
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
7528
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
7424
7529
|
# },
|
7425
7530
|
# },
|
7426
7531
|
# },
|
@@ -7482,6 +7587,10 @@ module Aws::S3
|
|
7482
7587
|
# field_delimiter: "FieldDelimiter",
|
7483
7588
|
# quote_character: "QuoteCharacter",
|
7484
7589
|
# },
|
7590
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
7591
|
+
# json: {
|
7592
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
7593
|
+
# },
|
7485
7594
|
# },
|
7486
7595
|
# expression_type: "SQL", # required, accepts SQL
|
7487
7596
|
# expression: "Expression", # required
|
@@ -7493,6 +7602,9 @@ module Aws::S3
|
|
7493
7602
|
# field_delimiter: "FieldDelimiter",
|
7494
7603
|
# quote_character: "QuoteCharacter",
|
7495
7604
|
# },
|
7605
|
+
# json: {
|
7606
|
+
# record_delimiter: "RecordDelimiter",
|
7607
|
+
# },
|
7496
7608
|
# },
|
7497
7609
|
# },
|
7498
7610
|
# output_location: {
|
@@ -7531,7 +7643,7 @@ module Aws::S3
|
|
7531
7643
|
# value: "MetadataValue",
|
7532
7644
|
# },
|
7533
7645
|
# ],
|
7534
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
7646
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
7535
7647
|
# },
|
7536
7648
|
# },
|
7537
7649
|
# }
|
@@ -7634,11 +7746,11 @@ module Aws::S3
|
|
7634
7746
|
# transition: {
|
7635
7747
|
# date: Time.now,
|
7636
7748
|
# days: 1,
|
7637
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
7749
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
7638
7750
|
# },
|
7639
7751
|
# noncurrent_version_transition: {
|
7640
7752
|
# noncurrent_days: 1,
|
7641
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
7753
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
7642
7754
|
# },
|
7643
7755
|
# noncurrent_version_expiration: {
|
7644
7756
|
# noncurrent_days: 1,
|
@@ -7670,11 +7782,12 @@ module Aws::S3
|
|
7670
7782
|
#
|
7671
7783
|
# @!attribute [rw] noncurrent_version_transition
|
7672
7784
|
# Container for the transition rule that describes when noncurrent
|
7673
|
-
# objects transition to the STANDARD\_IA or GLACIER
|
7674
|
-
# your bucket is versioning-enabled (or versioning
|
7675
|
-
# can set this action to request that Amazon S3
|
7676
|
-
# object versions to the STANDARD\_IA
|
7677
|
-
# specific period in the
|
7785
|
+
# objects transition to the STANDARD\_IA, ONEZONE\_IA or GLACIER
|
7786
|
+
# storage class. If your bucket is versioning-enabled (or versioning
|
7787
|
+
# is suspended), you can set this action to request that Amazon S3
|
7788
|
+
# transition noncurrent object versions to the STANDARD\_IA,
|
7789
|
+
# ONEZONE\_IA or GLACIER storage class at a specific period in the
|
7790
|
+
# object's lifetime.
|
7678
7791
|
# @return [Types::NoncurrentVersionTransition]
|
7679
7792
|
#
|
7680
7793
|
# @!attribute [rw] noncurrent_version_expiration
|
@@ -7773,7 +7886,7 @@ module Aws::S3
|
|
7773
7886
|
# value: "MetadataValue",
|
7774
7887
|
# },
|
7775
7888
|
# ],
|
7776
|
-
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
|
7889
|
+
# storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
|
7777
7890
|
# }
|
7778
7891
|
#
|
7779
7892
|
# @!attribute [rw] bucket_name
|
@@ -7868,6 +7981,10 @@ module Aws::S3
|
|
7868
7981
|
# field_delimiter: "FieldDelimiter",
|
7869
7982
|
# quote_character: "QuoteCharacter",
|
7870
7983
|
# },
|
7984
|
+
# compression_type: "NONE", # accepts NONE, GZIP
|
7985
|
+
# json: {
|
7986
|
+
# type: "DOCUMENT", # accepts DOCUMENT, LINES
|
7987
|
+
# },
|
7871
7988
|
# },
|
7872
7989
|
# expression_type: "SQL", # required, accepts SQL
|
7873
7990
|
# expression: "Expression", # required
|
@@ -7879,6 +7996,9 @@ module Aws::S3
|
|
7879
7996
|
# field_delimiter: "FieldDelimiter",
|
7880
7997
|
# quote_character: "QuoteCharacter",
|
7881
7998
|
# },
|
7999
|
+
# json: {
|
8000
|
+
# record_delimiter: "RecordDelimiter",
|
8001
|
+
# },
|
7882
8002
|
# },
|
7883
8003
|
# }
|
7884
8004
|
#
|
@@ -8038,6 +8158,22 @@ module Aws::S3
|
|
8038
8158
|
include Aws::Structure
|
8039
8159
|
end
|
8040
8160
|
|
8161
|
+
# @!attribute [rw] bytes_scanned
|
8162
|
+
# Total number of object bytes scanned.
|
8163
|
+
# @return [Integer]
|
8164
|
+
#
|
8165
|
+
# @!attribute [rw] bytes_processed
|
8166
|
+
# Total number of uncompressed object bytes processed.
|
8167
|
+
# @return [Integer]
|
8168
|
+
#
|
8169
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Stats AWS API Documentation
|
8170
|
+
#
|
8171
|
+
class Stats < Struct.new(
|
8172
|
+
:bytes_scanned,
|
8173
|
+
:bytes_processed)
|
8174
|
+
include Aws::Structure
|
8175
|
+
end
|
8176
|
+
|
8041
8177
|
# @note When making an API call, you may pass StorageClassAnalysis
|
8042
8178
|
# data as a hash:
|
8043
8179
|
#
|
@@ -8275,7 +8411,7 @@ module Aws::S3
|
|
8275
8411
|
# {
|
8276
8412
|
# date: Time.now,
|
8277
8413
|
# days: 1,
|
8278
|
-
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA
|
8414
|
+
# storage_class: "GLACIER", # accepts GLACIER, STANDARD_IA, ONEZONE_IA
|
8279
8415
|
# }
|
8280
8416
|
#
|
8281
8417
|
# @!attribute [rw] date
|
data/lib/aws-sdk-s3.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: aws-sdk-s3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.9.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Amazon Web Services
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-04-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk-kms
|
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
152
152
|
version: '0'
|
153
153
|
requirements: []
|
154
154
|
rubyforge_project:
|
155
|
-
rubygems_version: 2.5.
|
155
|
+
rubygems_version: 2.5.2.2
|
156
156
|
signing_key:
|
157
157
|
specification_version: 4
|
158
158
|
summary: AWS SDK for Ruby - Amazon S3
|