aws-sdk-s3 1.87.0 → 1.96.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +778 -0
  3. data/LICENSE.txt +202 -0
  4. data/VERSION +1 -0
  5. data/lib/aws-sdk-s3.rb +2 -2
  6. data/lib/aws-sdk-s3/arn/access_point_arn.rb +15 -8
  7. data/lib/aws-sdk-s3/arn/object_lambda_arn.rb +69 -0
  8. data/lib/aws-sdk-s3/arn/outpost_access_point_arn.rb +10 -8
  9. data/lib/aws-sdk-s3/bucket.rb +22 -21
  10. data/lib/aws-sdk-s3/bucket_acl.rb +6 -4
  11. data/lib/aws-sdk-s3/bucket_cors.rb +5 -5
  12. data/lib/aws-sdk-s3/bucket_lifecycle.rb +3 -3
  13. data/lib/aws-sdk-s3/bucket_lifecycle_configuration.rb +3 -3
  14. data/lib/aws-sdk-s3/bucket_logging.rb +3 -4
  15. data/lib/aws-sdk-s3/bucket_notification.rb +2 -2
  16. data/lib/aws-sdk-s3/bucket_policy.rb +3 -3
  17. data/lib/aws-sdk-s3/bucket_request_payment.rb +5 -6
  18. data/lib/aws-sdk-s3/bucket_tagging.rb +3 -3
  19. data/lib/aws-sdk-s3/bucket_versioning.rb +4 -4
  20. data/lib/aws-sdk-s3/bucket_website.rb +3 -3
  21. data/lib/aws-sdk-s3/client.rb +1368 -1015
  22. data/lib/aws-sdk-s3/client_api.rb +62 -1
  23. data/lib/aws-sdk-s3/customizations/bucket.rb +8 -3
  24. data/lib/aws-sdk-s3/customizations/object.rb +39 -14
  25. data/lib/aws-sdk-s3/encryptionV2/default_cipher_provider.rb +3 -3
  26. data/lib/aws-sdk-s3/errors.rb +1 -1
  27. data/lib/aws-sdk-s3/event_streams.rb +1 -1
  28. data/lib/aws-sdk-s3/file_uploader.rb +2 -2
  29. data/lib/aws-sdk-s3/multipart_upload.rb +7 -7
  30. data/lib/aws-sdk-s3/multipart_upload_part.rb +7 -7
  31. data/lib/aws-sdk-s3/object.rb +127 -42
  32. data/lib/aws-sdk-s3/object_acl.rb +7 -5
  33. data/lib/aws-sdk-s3/object_summary.rb +40 -41
  34. data/lib/aws-sdk-s3/object_version.rb +14 -14
  35. data/lib/aws-sdk-s3/plugins/accelerate.rb +7 -4
  36. data/lib/aws-sdk-s3/plugins/arn.rb +96 -55
  37. data/lib/aws-sdk-s3/plugins/dualstack.rb +10 -3
  38. data/lib/aws-sdk-s3/plugins/expect_100_continue.rb +2 -1
  39. data/lib/aws-sdk-s3/plugins/get_bucket_location_fix.rb +1 -1
  40. data/lib/aws-sdk-s3/plugins/iad_regional_endpoint.rb +11 -11
  41. data/lib/aws-sdk-s3/plugins/md5s.rb +1 -1
  42. data/lib/aws-sdk-s3/plugins/object_lambda_endpoint.rb +25 -0
  43. data/lib/aws-sdk-s3/plugins/s3_signer.rb +24 -26
  44. data/lib/aws-sdk-s3/presigner.rb +27 -30
  45. data/lib/aws-sdk-s3/resource.rb +5 -3
  46. data/lib/aws-sdk-s3/types.rb +1029 -570
  47. data/lib/aws-sdk-s3/waiters.rb +1 -1
  48. metadata +13 -9
data/LICENSE.txt ADDED
@@ -0,0 +1,202 @@
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright [yyyy] [name of copyright owner]
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/VERSION ADDED
@@ -0,0 +1 @@
1
+ 1.96.1
data/lib/aws-sdk-s3.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  # WARNING ABOUT GENERATED CODE
4
4
  #
5
5
  # This file is generated. See the contributing guide for more information:
6
- # https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
6
+ # https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
7
7
  #
8
8
  # WARNING ABOUT GENERATED CODE
9
9
 
@@ -69,6 +69,6 @@ require_relative 'aws-sdk-s3/event_streams'
69
69
  # @!group service
70
70
  module Aws::S3
71
71
 
72
- GEM_VERSION = '1.87.0'
72
+ GEM_VERSION = '1.96.1'
73
73
 
74
74
  end
@@ -9,8 +9,6 @@ module Aws
9
9
  @type, @access_point_name, @extra = @resource.split(/[:,\/]/)
10
10
  end
11
11
 
12
- attr_reader :access_point_name
13
-
14
12
  def support_dualstack?
15
13
  true
16
14
  end
@@ -21,15 +19,20 @@ module Aws
21
19
 
22
20
  def validate_arn!
23
21
  unless @service == 's3'
24
- raise ArgumentError, 'Must provide a valid S3 accesspoint ARN.'
22
+ raise ArgumentError, 'Must provide a valid S3 Access Point ARN.'
25
23
  end
26
24
 
27
25
  if @region.empty? || @account_id.empty?
28
26
  raise ArgumentError,
29
- 'S3 accesspoint ARNs must contain both a region '\
27
+ 'S3 Access Point ARNs must contain both a region '\
30
28
  'and an account id.'
31
29
  end
32
30
 
31
+ if @region.include?('-fips') || @region.include?('fips-')
32
+ raise ArgumentError,
33
+ 'S3 Access Point ARNs cannot contain a FIPS region'
34
+ end
35
+
33
36
  if @type != 'accesspoint'
34
37
  raise ArgumentError, 'Invalid ARN, resource format is not correct'
35
38
  end
@@ -52,10 +55,14 @@ module Aws
52
55
  end
53
56
  end
54
57
 
55
- def host_url(region, dualstack = false)
56
- sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
57
- "#{@access_point_name}-#{@account_id}"\
58
- ".s3-accesspoint#{'.dualstack' if dualstack}.#{region}.#{sfx}"
58
+ def host_url(region, fips = false, dualstack = false, custom_endpoint = nil)
59
+ pfx = "#{@access_point_name}-#{@account_id}"
60
+ if custom_endpoint
61
+ "#{pfx}.#{custom_endpoint}"
62
+ else
63
+ sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
64
+ "#{pfx}.s3-accesspoint#{'-fips' if fips}#{'.dualstack' if dualstack}.#{region}.#{sfx}"
65
+ end
59
66
  end
60
67
  end
61
68
  end
@@ -0,0 +1,69 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Aws
4
+ module S3
5
+ # @api private
6
+ class ObjectLambdaARN < Aws::ARN
7
+ def initialize(options)
8
+ super(options)
9
+ @type, @access_point_name, @extra = @resource.split(/[:,\/]/)
10
+ end
11
+
12
+ def support_dualstack?
13
+ false
14
+ end
15
+
16
+ def support_fips?
17
+ true
18
+ end
19
+
20
+ def validate_arn!
21
+ unless @service == 's3-object-lambda'
22
+ raise ArgumentError, 'Must provide a valid S3 Object Lambdas ARN.'
23
+ end
24
+
25
+ if @region.empty? || @account_id.empty?
26
+ raise ArgumentError,
27
+ 'S3 Object Lambdas ARNs must contain both a region '\
28
+ 'and an account id.'
29
+ end
30
+
31
+ if @region.include?('-fips') || @region.include?('fips-')
32
+ raise ArgumentError,
33
+ 'S3 Access Point ARNs cannot contain a FIPS region'
34
+ end
35
+
36
+ if @type != 'accesspoint'
37
+ raise ArgumentError, 'Invalid ARN, resource format is not correct.'
38
+ end
39
+
40
+ if @access_point_name.nil? || @access_point_name.empty?
41
+ raise ArgumentError, 'Missing ARN accesspoint name.'
42
+ end
43
+
44
+ if @extra
45
+ raise ArgumentError,
46
+ 'ARN accesspoint resource must be a single value.'
47
+ end
48
+
49
+ unless Seahorse::Util.host_label?(
50
+ "#{@access_point_name}-#{@account_id}"
51
+ )
52
+ raise ArgumentError,
53
+ "#{@access_point_name}-#{@account_id} is not a valid "\
54
+ 'host label.'
55
+ end
56
+ end
57
+
58
+ def host_url(region, fips = false, _dualstack = false, custom_endpoint = nil)
59
+ pfx = "#{@access_point_name}-#{@account_id}"
60
+ if custom_endpoint
61
+ "#{pfx}.#{custom_endpoint}"
62
+ else
63
+ sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
64
+ "#{pfx}.s3-object-lambda#{'-fips' if fips}.#{region}.#{sfx}"
65
+ end
66
+ end
67
+ end
68
+ end
69
+ end
@@ -10,8 +10,6 @@ module Aws
10
10
  @resource.split(/[:,\/]/)
11
11
  end
12
12
 
13
- attr_reader :outpost_id, :access_point_name
14
-
15
13
  def support_dualstack?
16
14
  false
17
15
  end
@@ -22,17 +20,17 @@ module Aws
22
20
 
23
21
  def validate_arn!
24
22
  unless @service == 's3-outposts'
25
- raise ArgumentError, 'Must provide a valid S3 outposts ARN.'
23
+ raise ArgumentError, 'Must provide a valid S3 Outposts ARN.'
26
24
  end
27
25
 
28
26
  if @region.empty? || @account_id.empty?
29
27
  raise ArgumentError,
30
- 'S3 accesspoint ARNs must contain both a region '\
28
+ 'S3 Outpost ARNs must contain both a region '\
31
29
  'and an account id.'
32
30
  end
33
31
 
34
32
  if @type != 'outpost' && @subtype != 'accesspoint'
35
- raise ArgumentError, 'Invalid ARN, resource format is not correct'
33
+ raise ArgumentError, 'Invalid ARN, resource format is not correct.'
36
34
  end
37
35
 
38
36
  if @outpost_id.nil? || @outpost_id.empty?
@@ -62,9 +60,13 @@ module Aws
62
60
  end
63
61
 
64
62
  # Outpost ARNs currently do not support dualstack
65
- def host_url(region, _dualstack = false)
66
- "#{@access_point_name}-#{@account_id}.#{@outpost_id}"\
67
- ".s3-outposts.#{region}.amazonaws.com"
63
+ def host_url(region, _fips = false, _dualstack = false, custom_endpoint = nil)
64
+ pfx = "#{@access_point_name}-#{@account_id}.#{@outpost_id}"
65
+ if custom_endpoint
66
+ "#{pfx}.#{custom_endpoint}"
67
+ else
68
+ "#{pfx}.s3-outposts.#{region}.amazonaws.com"
69
+ end
68
70
  end
69
71
  end
70
72
  end
@@ -3,7 +3,7 @@
3
3
  # WARNING ABOUT GENERATED CODE
4
4
  #
5
5
  # This file is generated. See the contributing guide for more information:
6
- # https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
6
+ # https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
7
7
  #
8
8
  # WARNING ABOUT GENERATED CODE
9
9
 
@@ -245,8 +245,10 @@ module Aws::S3
245
245
  # @option options [String] :grant_read_acp
246
246
  # Allows grantee to read the bucket ACL.
247
247
  # @option options [String] :grant_write
248
- # Allows grantee to create, overwrite, and delete any object in the
249
- # bucket.
248
+ # Allows grantee to create new objects in the bucket.
249
+ #
250
+ # For the bucket and object owners of existing objects, also allows
251
+ # deletions and overwrites of those objects.
250
252
  # @option options [String] :grant_write_acp
251
253
  # Allows grantee to write the ACL for the applicable bucket.
252
254
  # @option options [Boolean] :object_lock_enabled_for_bucket
@@ -266,7 +268,7 @@ module Aws::S3
266
268
  # })
267
269
  # @param [Hash] options ({})
268
270
  # @option options [String] :expected_bucket_owner
269
- # The account id of the expected bucket owner. If the bucket is owned by
271
+ # The account ID of the expected bucket owner. If the bucket is owned by
270
272
  # a different account, the request will fail with an HTTP `403 (Access
271
273
  # Denied)` error.
272
274
  # @return [EmptyStructure]
@@ -306,7 +308,7 @@ module Aws::S3
306
308
  # request. Bucket owners need not specify this parameter in their
307
309
  # requests. For information about downloading objects from requester
308
310
  # pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
309
- # in the *Amazon S3 Developer Guide*.
311
+ # in the *Amazon S3 User Guide*.
310
312
  #
311
313
  #
312
314
  #
@@ -316,7 +318,7 @@ module Aws::S3
316
318
  # Governance-type Object Lock in place. You must have sufficient
317
319
  # permissions to perform this operation.
318
320
  # @option options [String] :expected_bucket_owner
319
- # The account id of the expected bucket owner. If the bucket is owned by
321
+ # The account ID of the expected bucket owner. If the bucket is owned by
320
322
  # a different account, the request will fail with an HTTP `403 (Access
321
323
  # Denied)` error.
322
324
  # @return [Types::DeleteObjectsOutput]
@@ -456,7 +458,7 @@ module Aws::S3
456
458
  #
457
459
  # This action is not supported by Amazon S3 on Outposts.
458
460
  # @option options [required, String] :key
459
- # Object key for which the PUT operation was initiated.
461
+ # Object key for which the PUT action was initiated.
460
462
  # @option options [Hash<String,String>] :metadata
461
463
  # A map of metadata to store with the object in S3.
462
464
  # @option options [String] :server_side_encryption
@@ -468,7 +470,7 @@ module Aws::S3
468
470
  # and high availability. Depending on performance needs, you can specify
469
471
  # a different Storage Class. Amazon S3 on Outposts only uses the
470
472
  # OUTPOSTS Storage Class. For more information, see [Storage Classes][1]
471
- # in the *Amazon S3 Service Developer Guide*.
473
+ # in the *Amazon S3 User Guide*.
472
474
  #
473
475
  #
474
476
  #
@@ -515,14 +517,12 @@ module Aws::S3
515
517
  # If `x-amz-server-side-encryption` is present and has the value of
516
518
  # `aws:kms`, this header specifies the ID of the AWS Key Management
517
519
  # Service (AWS KMS) symmetrical customer managed customer master key
518
- # (CMK) that was used for the object.
519
- #
520
- # If the value of `x-amz-server-side-encryption` is `aws:kms`, this
521
- # header specifies the ID of the symmetric customer managed AWS KMS CMK
522
- # that will be used for the object. If you specify
520
+ # (CMK) that was used for the object. If you specify
523
521
  # `x-amz-server-side-encryption:aws:kms`, but do not provide`
524
522
  # x-amz-server-side-encryption-aws-kms-key-id`, Amazon S3 uses the AWS
525
- # managed CMK in AWS to protect the data.
523
+ # managed CMK in AWS to protect the data. If the KMS key does not exist
524
+ # in the same account issuing the command, you must use the full ARN and
525
+ # not just the ID.
526
526
  # @option options [String] :ssekms_encryption_context
527
527
  # Specifies the AWS KMS Encryption Context to use for object encryption.
528
528
  # The value of this header is a base64-encoded UTF-8 string holding JSON
@@ -533,14 +533,14 @@ module Aws::S3
533
533
  # Setting this header to `true` causes Amazon S3 to use an S3 Bucket Key
534
534
  # for object encryption with SSE-KMS.
535
535
  #
536
- # Specifying this header with a PUT operation doesn’t affect
537
- # bucket-level settings for S3 Bucket Key.
536
+ # Specifying this header with a PUT action doesn’t affect bucket-level
537
+ # settings for S3 Bucket Key.
538
538
  # @option options [String] :request_payer
539
539
  # Confirms that the requester knows that they will be charged for the
540
540
  # request. Bucket owners need not specify this parameter in their
541
541
  # requests. For information about downloading objects from requester
542
542
  # pays buckets, see [Downloading Objects in Requestor Pays Buckets][1]
543
- # in the *Amazon S3 Developer Guide*.
543
+ # in the *Amazon S3 User Guide*.
544
544
  #
545
545
  #
546
546
  #
@@ -552,6 +552,7 @@ module Aws::S3
552
552
  # The Object Lock mode that you want to apply to this object.
553
553
  # @option options [Time,DateTime,Date,Integer,String] :object_lock_retain_until_date
554
554
  # The date and time when you want this object's Object Lock to expire.
555
+ # Must be formatted as a timestamp parameter.
555
556
  # @option options [String] :object_lock_legal_hold_status
556
557
  # Specifies whether a legal hold will be applied to this object. For
557
558
  # more information about S3 Object Lock, see [Object Lock][1].
@@ -560,7 +561,7 @@ module Aws::S3
560
561
  #
561
562
  # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html
562
563
  # @option options [String] :expected_bucket_owner
563
- # The account id of the expected bucket owner. If the bucket is owned by
564
+ # The account ID of the expected bucket owner. If the bucket is owned by
564
565
  # a different account, the request will fail with an HTTP `403 (Access
565
566
  # Denied)` error.
566
567
  # @return [Object]
@@ -668,7 +669,7 @@ module Aws::S3
668
669
  # list only if they have an upload ID lexicographically greater than the
669
670
  # specified `upload-id-marker`.
670
671
  # @option options [String] :expected_bucket_owner
671
- # The account id of the expected bucket owner. If the bucket is owned by
672
+ # The account ID of the expected bucket owner. If the bucket is owned by
672
673
  # a different account, the request will fail with an HTTP `403 (Access
673
674
  # Denied)` error.
674
675
  # @return [MultipartUpload::Collection]
@@ -748,7 +749,7 @@ module Aws::S3
748
749
  # @option options [String] :version_id_marker
749
750
  # Specifies the object version you want to start listing from.
750
751
  # @option options [String] :expected_bucket_owner
751
- # The account id of the expected bucket owner. If the bucket is owned by
752
+ # The account ID of the expected bucket owner. If the bucket is owned by
752
753
  # a different account, the request will fail with an HTTP `403 (Access
753
754
  # Denied)` error.
754
755
  # @return [ObjectVersion::Collection]
@@ -804,7 +805,7 @@ module Aws::S3
804
805
  # the list objects request in V2 style. Bucket owners need not specify
805
806
  # this parameter in their requests.
806
807
  # @option options [String] :expected_bucket_owner
807
- # The account id of the expected bucket owner. If the bucket is owned by
808
+ # The account ID of the expected bucket owner. If the bucket is owned by
808
809
  # a different account, the request will fail with an HTTP `403 (Access
809
810
  # Denied)` error.
810
811
  # @return [ObjectSummary::Collection]