Adds support for additional server-side encryption mode and storage class values for accessing Amazon FSx data from Amazon S3 using S3 Access Points

Author: aws-sdk-dotnet-automation

generator/ServiceModels/s3/s3-2006-03-01.api.json

@@ -6615,7 +6615,8 @@
         "OUTPOSTS",
         "GLACIER_IR",
         "SNOW",
-        "EXPRESS_ONEZONE"
+        "EXPRESS_ONEZONE",
+        "FSX_OPENZFS"
       ]
     },
     "ObjectVersion":{
@@ -8866,6 +8867,7 @@
       "type":"string",
       "enum":[
         "AES256",
+        "aws:fsx",
         "aws:kms",
         "aws:kms:dsse"
       ]
@@ -9013,7 +9015,8 @@
         "OUTPOSTS",
         "GLACIER_IR",
         "SNOW",
-        "EXPRESS_ONEZONE"
+        "EXPRESS_ONEZONE",
+        "FSX_OPENZFS"
       ]
     },
     "StorageClassAnalysis":{

generator/ServiceModels/s3/s3-2006-03-01.docs.json

@@ -327,8 +327,14 @@ internal bool IsSetRequestCharged()
 
         /// <summary>
         /// <para>
-        /// The server-side encryption algorithm used when storing this object in Amazon S3 (for example, <c>AES256</c>, <c>aws:kms</c>).
+        /// The server-side encryption algorithm used when storing this object in Amazon S3.
         /// </para>
+        /// <note> 
+        /// <para>
+        /// When accessing data stored in Amazon FSx file systems using S3 access points, the
+        /// only valid server side encryption option is <c>aws:fsx</c>.
+        /// </para>
+        /// </note>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryptionMethod
         {

generator/ServiceModels/s3/s3-2006-03-01.normal.json

@@ -811,6 +811,16 @@ internal bool IsSetSourceVersionId()
         /// encryption-related request headers, you must ensure the encryption key is the same customer managed key that you specified for the directory bucket's default encryption configuration. 
         /// </para>
         /// </li>
+        /// <li> 
+        /// <para>
+        /// <b>S3 access points for Amazon FSx </b> - When accessing data stored in Amazon FSx
+        /// file systems using S3 access points, the only valid server side encryption option
+        /// is <c>aws:fsx</c>. All Amazon FSx file systems have encryption configured by default
+        /// and are encrypted at rest. Data is automatically encrypted before being written to
+        /// the file system, and automatically decrypted as it is read. These processes are handled
+        /// transparently by Amazon FSx.
+        /// </para>
+        /// </li>
         /// </ul>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryptionMethod

sdk/src/Services/S3/Custom/Model/CompleteMultipartUploadResponse.cs

@@ -109,8 +109,15 @@ internal bool IsSetRequestCharged()
 
         /// <summary>
         /// <para>
-        /// The server-side encryption algorithm used when you store this object in Amazon S3 (for example, <c>AES256</c>, <c>aws:kms</c>, <c>aws:kms:dsse</c>).
+        /// The server-side encryption algorithm used when you store this object in Amazon S3
+        /// or Amazon FSx.
         /// </para>
+        /// <note> 
+        /// <para>
+        /// When accessing data stored in Amazon FSx file systems using S3 access points, the
+        /// only valid server side encryption option is <c>aws:fsx</c>.
+        /// </para>
+        /// </note>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryptionMethod
         {

sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs

@@ -195,8 +195,15 @@ internal bool IsSetLastModified()
 
         /// <summary>
         /// <para>
-        /// The server-side encryption algorithm used when you store this object in Amazon S3 (for example, <c>AES256</c>, <c>aws:kms</c>).
+        /// The server-side encryption algorithm used when you store this object in Amazon S3
+        /// or Amazon FSx.
         /// </para>
+        /// <note> 
+        /// <para>
+        /// When accessing data stored in Amazon FSx file systems using S3 access points, the
+        /// only valid server side encryption option is <c>aws:fsx</c>.
+        /// </para>
+        /// </note>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryptionMethod
         {

sdk/src/Services/S3/Custom/Model/CopyObjectResponse.cs

@@ -76,6 +76,14 @@ internal bool IsSetSessionMode()
         /// For directory buckets, there are only two supported options for server-side encryption: server-side encryption with Amazon S3 managed keys (SSE-S3) (<c>AES256</c>) and server-side encryption with KMS keys (SSE-KMS) (<c>aws:kms</c>). 
         /// By default, Amazon S3 encrypts data with SSE-S3. For more information, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-serv-side-encryption.html">Protecting data with server-side encryption</a> in the <i>Amazon S3 User Guide</i>.
         /// </para>
+        /// <para>
+        /// <b>S3 access points for Amazon FSx </b> - When accessing data stored in Amazon FSx
+        /// file systems using S3 access points, the only valid server side encryption option
+        /// is <c>aws:fsx</c>. All Amazon FSx file systems have encryption configured by default
+        /// and are encrypted at rest. Data is automatically encrypted before being written to
+        /// the file system, and automatically decrypted as it is read. These processes are handled
+        /// transparently by Amazon FSx.
+        /// </para>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryption
         {

sdk/src/Services/S3/Custom/Model/CopyPartResponse.cs

@@ -50,7 +50,16 @@ internal bool IsSetCredentials()
         }
 
         /// <summary>
-        /// The server-side encryption algorithm used when you store objects in the directory bucket.
+        /// <para>
+        /// The server-side encryption algorithm used when you store objects in the directory
+        /// bucket.
+        /// </para>
+        /// <note> 
+        /// <para>
+        /// When accessing data stored in Amazon FSx file systems using S3 access points, the
+        /// only valid server side encryption option is <c>aws:fsx</c>.
+        /// </para>
+        /// </note>
         /// </summary>
         public ServerSideEncryptionMethod ServerSideEncryption
         {

sdk/src/Services/S3/Custom/Model/CreateSessionRequest.cs

@@ -71,6 +71,7 @@ namespace Amazon.S3.Model
 	public partial class DeleteBucketIntelligentTieringConfigurationRequest : AmazonWebServiceRequest
 	{
         private string bucketName;
+        private string expectedBucketOwner;
         private string intelligentTieiringId;
 
         /// <summary>
@@ -88,6 +89,26 @@ internal bool IsSetBucketName()
             return !(string.IsNullOrEmpty(this.bucketName));
         }
 
+        /// <summary>
+        /// Gets and sets the property ExpectedBucketOwner. 
+        /// <para>
+        /// The account ID of the expected bucket owner. If the account ID that you provide does
+        /// not match the actual owner of the bucket, the request fails with the HTTP status code
+        /// <c>403 Forbidden</c> (access denied).
+        /// </para>
+        /// </summary>
+        public string ExpectedBucketOwner
+        {
+            get { return this.expectedBucketOwner; }
+            set { this.expectedBucketOwner = value; }
+        }
+
+        // Check to see if ExpectedBucketOwner property is set
+        internal bool IsSetExpectedBucketOwner()
+        {
+            return this.expectedBucketOwner != null;
+        }
+
         /// <summary>
         /// <para>The ID used to identify the S3 Intelligent-Tiering configuration.</para>
         /// </summary>