intermediate changes

ref:40ac71fae6ea311a73473cf4297ca93bf27559c3

1 files changed, 120 insertions, 136 deletions

diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h
index d704b0708b..ccb52d1e7c 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h
@@ -88,186 +88,170 @@ namespace Model
 
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline const Aws::String& GetBucket() const{ return m_bucket; }
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline bool BucketHasBeenSet() const { return m_bucketHasBeenSet; }
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline void SetBucket(const Aws::String& value) { m_bucketHasBeenSet = true; m_bucket = value; }
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline void SetBucket(Aws::String&& value) { m_bucketHasBeenSet = true; m_bucket = std::move(value); }
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline void SetBucket(const char* value) { m_bucketHasBeenSet = true; m_bucket.assign(value); }
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline CopyObjectRequest& WithBucket(const Aws::String& value) { SetBucket(value); return *this;}
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline CopyObjectRequest& WithBucket(Aws::String&& value) { SetBucket(std::move(value)); return *this;}
 
     /**
-     * <p>The name of the destination bucket.</p> <p>When using this API with an access
-     * point, you must direct requests to the access point hostname. The access point
-     * hostname takes the form
+     * <p>The name of the destination bucket.</p> <p>When using this action with an
+     * access point, you must direct requests to the access point hostname. The access
+     * point hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com.
-     * When using this operation with an access point through the AWS SDKs, you provide
+     * When using this action with an access point through the AWS SDKs, you provide
      * the access point ARN in place of the bucket name. For more information about
      * access point ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html">Using
-     * Access Points</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p> <p>When using this API with Amazon S3 on Outposts, you must
-     * direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname
-     * takes the form
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-access-points.html">Using
+     * Access Points</a> in the <i>Amazon S3 User Guide</i>.</p> <p>When using this
+     * action with Amazon S3 on Outposts, you must direct requests to the S3 on
+     * Outposts hostname. The S3 on Outposts hostname takes the form
      * <i>AccessPointName</i>-<i>AccountId</i>.<i>outpostID</i>.s3-outposts.<i>Region</i>.amazonaws.com.
-     * When using this operation using S3 on Outposts through the AWS SDKs, you provide
+     * When using this action using S3 on Outposts through the AWS SDKs, you provide
      * the Outposts bucket ARN in place of the bucket name. For more information about
      * S3 on Outposts ARNs, see <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/S3onOutposts.html">Using
-     * S3 on Outposts</a> in the <i>Amazon Simple Storage Service Developer
-     * Guide</i>.</p>
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
+     * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
     inline CopyObjectRequest& WithBucket(const char* value) { SetBucket(value); return *this;}
 
@@ -497,7 +481,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -533,7 +517,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -569,7 +553,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -605,7 +589,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -641,7 +625,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -677,7 +661,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -713,7 +697,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -749,7 +733,7 @@ namespace Model
      * <p>Specifies the source object for the copy operation. You specify the value in
      * one of two formats, depending on whether you want to access the source object
      * through an <a
-     * href="https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html">access
+     * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html">access
      * point</a>:</p> <ul> <li> <p>For objects not accessed through an access point,
      * specify the name of the source bucket and the key of the source object,
      * separated by a slash (/). For example, to copy the object
@@ -1832,8 +1816,8 @@ namespace Model
      * <p>Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption
      * with server-side encryption using AWS KMS (SSE-KMS). Setting this header to
      * <code>true</code> causes Amazon S3 to use an S3 Bucket Key for object encryption
-     * with SSE-KMS. </p> <p>Specifying this header with a COPY operation doesn’t
-     * affect bucket-level settings for S3 Bucket Key.</p>
+     * with SSE-KMS. </p> <p>Specifying this header with a COPY action doesn’t affect
+     * bucket-level settings for S3 Bucket Key.</p>
      */
     inline bool GetBucketKeyEnabled() const{ return m_bucketKeyEnabled; }
 
@@ -1841,8 +1825,8 @@ namespace Model
      * <p>Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption
      * with server-side encryption using AWS KMS (SSE-KMS). Setting this header to
      * <code>true</code> causes Amazon S3 to use an S3 Bucket Key for object encryption
-     * with SSE-KMS. </p> <p>Specifying this header with a COPY operation doesn’t
-     * affect bucket-level settings for S3 Bucket Key.</p>
+     * with SSE-KMS. </p> <p>Specifying this header with a COPY action doesn’t affect
+     * bucket-level settings for S3 Bucket Key.</p>
      */
     inline bool BucketKeyEnabledHasBeenSet() const { return m_bucketKeyEnabledHasBeenSet; }
 
@@ -1850,8 +1834,8 @@ namespace Model
      * <p>Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption
      * with server-side encryption using AWS KMS (SSE-KMS). Setting this header to
      * <code>true</code> causes Amazon S3 to use an S3 Bucket Key for object encryption
-     * with SSE-KMS. </p> <p>Specifying this header with a COPY operation doesn’t
-     * affect bucket-level settings for S3 Bucket Key.</p>
+     * with SSE-KMS. </p> <p>Specifying this header with a COPY action doesn’t affect
+     * bucket-level settings for S3 Bucket Key.</p>
      */
     inline void SetBucketKeyEnabled(bool value) { m_bucketKeyEnabledHasBeenSet = true; m_bucketKeyEnabled = value; }
 
@@ -1859,8 +1843,8 @@ namespace Model
      * <p>Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption
      * with server-side encryption using AWS KMS (SSE-KMS). Setting this header to
      * <code>true</code> causes Amazon S3 to use an S3 Bucket Key for object encryption
-     * with SSE-KMS. </p> <p>Specifying this header with a COPY operation doesn’t
-     * affect bucket-level settings for S3 Bucket Key.</p>
+     * with SSE-KMS. </p> <p>Specifying this header with a COPY action doesn’t affect
+     * bucket-level settings for S3 Bucket Key.</p>
      */
     inline CopyObjectRequest& WithBucketKeyEnabled(bool value) { SetBucketKeyEnabled(value); return *this;}
 
@@ -2204,56 +2188,56 @@ namespace Model
 
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline const Aws::String& GetExpectedBucketOwner() const{ return m_expectedBucketOwner; }
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline bool ExpectedBucketOwnerHasBeenSet() const { return m_expectedBucketOwnerHasBeenSet; }
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline void SetExpectedBucketOwner(const Aws::String& value) { m_expectedBucketOwnerHasBeenSet = true; m_expectedBucketOwner = value; }
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline void SetExpectedBucketOwner(Aws::String&& value) { m_expectedBucketOwnerHasBeenSet = true; m_expectedBucketOwner = std::move(value); }
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline void SetExpectedBucketOwner(const char* value) { m_expectedBucketOwnerHasBeenSet = true; m_expectedBucketOwner.assign(value); }
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline CopyObjectRequest& WithExpectedBucketOwner(const Aws::String& value) { SetExpectedBucketOwner(value); return *this;}
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
     inline CopyObjectRequest& WithExpectedBucketOwner(Aws::String&& value) { SetExpectedBucketOwner(std::move(value)); return *this;}
 
     /**
-     * <p>The account id of the expected destination bucket owner. If the destination
+     * <p>The account ID of the expected destination bucket owner. If the destination
      * bucket is owned by a different account, the request will fail with an HTTP
      * <code>403 (Access Denied)</code> error.</p>
      */
@@ -2261,56 +2245,56 @@ namespace Model
 
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline const Aws::String& GetExpectedSourceBucketOwner() const{ return m_expectedSourceBucketOwner; }
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline bool ExpectedSourceBucketOwnerHasBeenSet() const { return m_expectedSourceBucketOwnerHasBeenSet; }
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline void SetExpectedSourceBucketOwner(const Aws::String& value) { m_expectedSourceBucketOwnerHasBeenSet = true; m_expectedSourceBucketOwner = value; }
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline void SetExpectedSourceBucketOwner(Aws::String&& value) { m_expectedSourceBucketOwnerHasBeenSet = true; m_expectedSourceBucketOwner = std::move(value); }
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline void SetExpectedSourceBucketOwner(const char* value) { m_expectedSourceBucketOwnerHasBeenSet = true; m_expectedSourceBucketOwner.assign(value); }
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline CopyObjectRequest& WithExpectedSourceBucketOwner(const Aws::String& value) { SetExpectedSourceBucketOwner(value); return *this;}
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */
     inline CopyObjectRequest& WithExpectedSourceBucketOwner(Aws::String&& value) { SetExpectedSourceBucketOwner(std::move(value)); return *this;}
 
     /**
-     * <p>The account id of the expected source bucket owner. If the source bucket is
+     * <p>The account ID of the expected source bucket owner. If the source bucket is
      * owned by a different account, the request will fail with an HTTP <code>403
      * (Access Denied)</code> error.</p>
      */