feat(client-s3): Integrate double encryption feature to SDKs.

aws · Jun 13, 2023 · 55c2691 · 55c2691
1 parent 7500e95
commit 55c2691
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 15 deletions.
diff --git a/clients/client-s3/src/commands/CompleteMultipartUploadCommand.ts b/clients/client-s3/src/commands/CompleteMultipartUploadCommand.ts
@@ -206,7 +206,7 @@ export interface CompleteMultipartUploadCommandOutput extends CompleteMultipartU
  * //   ChecksumCRC32C: "STRING_VALUE",
  * //   ChecksumSHA1: "STRING_VALUE",
  * //   ChecksumSHA256: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   VersionId: "STRING_VALUE",
  * //   SSEKMSKeyId: "STRING_VALUE",
  * //   BucketKeyEnabled: true || false,

diff --git a/clients/client-s3/src/commands/CopyObjectCommand.ts b/clients/client-s3/src/commands/CopyObjectCommand.ts
@@ -285,7 +285,7 @@ export interface CopyObjectCommandOutput extends CopyObjectOutput, __MetadataBea
  *   },
  *   MetadataDirective: "COPY" || "REPLACE",
  *   TaggingDirective: "COPY" || "REPLACE",
- *   ServerSideEncryption: "AES256" || "aws:kms",
+ *   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  *   StorageClass: "STANDARD" || "REDUCED_REDUNDANCY" || "STANDARD_IA" || "ONEZONE_IA" || "INTELLIGENT_TIERING" || "GLACIER" || "DEEP_ARCHIVE" || "OUTPOSTS" || "GLACIER_IR" || "SNOW",
  *   WebsiteRedirectLocation: "STRING_VALUE",
  *   SSECustomerAlgorithm: "STRING_VALUE",
@@ -319,7 +319,7 @@ export interface CopyObjectCommandOutput extends CopyObjectOutput, __MetadataBea
  * //   Expiration: "STRING_VALUE",
  * //   CopySourceVersionId: "STRING_VALUE",
  * //   VersionId: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   SSECustomerAlgorithm: "STRING_VALUE",
  * //   SSECustomerKeyMD5: "STRING_VALUE",
  * //   SSEKMSKeyId: "STRING_VALUE",

diff --git a/clients/client-s3/src/commands/CreateMultipartUploadCommand.ts b/clients/client-s3/src/commands/CreateMultipartUploadCommand.ts
@@ -358,7 +358,7 @@ export interface CreateMultipartUploadCommandOutput extends CreateMultipartUploa
  *   Metadata: { // Metadata
  *     "<keys>": "STRING_VALUE",
  *   },
- *   ServerSideEncryption: "AES256" || "aws:kms",
+ *   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  *   StorageClass: "STANDARD" || "REDUCED_REDUNDANCY" || "STANDARD_IA" || "ONEZONE_IA" || "INTELLIGENT_TIERING" || "GLACIER" || "DEEP_ARCHIVE" || "OUTPOSTS" || "GLACIER_IR" || "SNOW",
  *   WebsiteRedirectLocation: "STRING_VALUE",
  *   SSECustomerAlgorithm: "STRING_VALUE",
@@ -383,7 +383,7 @@ export interface CreateMultipartUploadCommandOutput extends CreateMultipartUploa
  * //   Bucket: "STRING_VALUE",
  * //   Key: "STRING_VALUE",
  * //   UploadId: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   SSECustomerAlgorithm: "STRING_VALUE",
  * //   SSECustomerKeyMD5: "STRING_VALUE",
  * //   SSEKMSKeyId: "STRING_VALUE",

diff --git a/clients/client-s3/src/commands/GetBucketEncryptionCommand.ts b/clients/client-s3/src/commands/GetBucketEncryptionCommand.ts
@@ -79,7 +79,7 @@ export interface GetBucketEncryptionCommandOutput extends GetBucketEncryptionOut
  * //     Rules: [ // ServerSideEncryptionRules // required
  * //       { // ServerSideEncryptionRule
  * //         ApplyServerSideEncryptionByDefault: { // ServerSideEncryptionByDefault
- * //           SSEAlgorithm: "AES256" || "aws:kms", // required
+ * //           SSEAlgorithm: "AES256" || "aws:kms" || "aws:kms:dsse", // required
  * //           KMSMasterKeyID: "STRING_VALUE",
  * //         },
  * //         BucketKeyEnabled: true || false,

diff --git a/clients/client-s3/src/commands/GetObjectCommand.ts b/clients/client-s3/src/commands/GetObjectCommand.ts
@@ -266,7 +266,7 @@ export interface GetObjectCommandOutput extends __WithSdkStreamMixin<GetObjectOu
  * //   ContentType: "STRING_VALUE",
  * //   Expires: new Date("TIMESTAMP"),
  * //   WebsiteRedirectLocation: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   Metadata: { // Metadata
  * //     "<keys>": "STRING_VALUE",
  * //   },

diff --git a/clients/client-s3/src/commands/HeadObjectCommand.ts b/clients/client-s3/src/commands/HeadObjectCommand.ts
@@ -202,7 +202,7 @@ export interface HeadObjectCommandOutput extends HeadObjectOutput, __MetadataBea
  * //   ContentType: "STRING_VALUE",
  * //   Expires: new Date("TIMESTAMP"),
  * //   WebsiteRedirectLocation: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   Metadata: { // Metadata
  * //     "<keys>": "STRING_VALUE",
  * //   },

diff --git a/clients/client-s3/src/commands/PutBucketEncryptionCommand.ts b/clients/client-s3/src/commands/PutBucketEncryptionCommand.ts
@@ -85,7 +85,7 @@ export interface PutBucketEncryptionCommandOutput extends __MetadataBearer {}
  *     Rules: [ // ServerSideEncryptionRules // required
  *       { // ServerSideEncryptionRule
  *         ApplyServerSideEncryptionByDefault: { // ServerSideEncryptionByDefault
- *           SSEAlgorithm: "AES256" || "aws:kms", // required
+ *           SSEAlgorithm: "AES256" || "aws:kms" || "aws:kms:dsse", // required
  *           KMSMasterKeyID: "STRING_VALUE",
  *         },
  *         BucketKeyEnabled: true || false,

diff --git a/clients/client-s3/src/commands/PutObjectCommand.ts b/clients/client-s3/src/commands/PutObjectCommand.ts
@@ -174,7 +174,7 @@ export interface PutObjectCommandOutput extends PutObjectOutput, __MetadataBeare
  *   Metadata: { // Metadata
  *     "<keys>": "STRING_VALUE",
  *   },
- *   ServerSideEncryption: "AES256" || "aws:kms",
+ *   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  *   StorageClass: "STANDARD" || "REDUCED_REDUNDANCY" || "STANDARD_IA" || "ONEZONE_IA" || "INTELLIGENT_TIERING" || "GLACIER" || "DEEP_ARCHIVE" || "OUTPOSTS" || "GLACIER_IR" || "SNOW",
  *   WebsiteRedirectLocation: "STRING_VALUE",
  *   SSECustomerAlgorithm: "STRING_VALUE",
@@ -199,7 +199,7 @@ export interface PutObjectCommandOutput extends PutObjectOutput, __MetadataBeare
  * //   ChecksumCRC32C: "STRING_VALUE",
  * //   ChecksumSHA1: "STRING_VALUE",
  * //   ChecksumSHA256: "STRING_VALUE",
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   VersionId: "STRING_VALUE",
  * //   SSECustomerAlgorithm: "STRING_VALUE",
  * //   SSECustomerKeyMD5: "STRING_VALUE",

diff --git a/clients/client-s3/src/commands/RestoreObjectCommand.ts b/clients/client-s3/src/commands/RestoreObjectCommand.ts
@@ -352,7 +352,7 @@ export interface RestoreObjectCommandOutput extends RestoreObjectOutput, __Metad
  *         BucketName: "STRING_VALUE", // required
  *         Prefix: "STRING_VALUE", // required
  *         Encryption: { // Encryption
- *           EncryptionType: "AES256" || "aws:kms", // required
+ *           EncryptionType: "AES256" || "aws:kms" || "aws:kms:dsse", // required
  *           KMSKeyId: "STRING_VALUE",
  *           KMSContext: "STRING_VALUE",
  *         },

diff --git a/clients/client-s3/src/commands/UploadPartCommand.ts b/clients/client-s3/src/commands/UploadPartCommand.ts
@@ -204,7 +204,7 @@ export interface UploadPartCommandOutput extends UploadPartOutput, __MetadataBea
  * const command = new UploadPartCommand(input);
  * const response = await client.send(command);
  * // { // UploadPartOutput
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   ETag: "STRING_VALUE",
  * //   ChecksumCRC32: "STRING_VALUE",
  * //   ChecksumCRC32C: "STRING_VALUE",

diff --git a/clients/client-s3/src/commands/UploadPartCopyCommand.ts b/clients/client-s3/src/commands/UploadPartCopyCommand.ts
@@ -251,7 +251,7 @@ export interface UploadPartCopyCommandOutput extends UploadPartCopyOutput, __Met
  * //     ChecksumSHA1: "STRING_VALUE",
  * //     ChecksumSHA256: "STRING_VALUE",
  * //   },
- * //   ServerSideEncryption: "AES256" || "aws:kms",
+ * //   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  * //   SSECustomerAlgorithm: "STRING_VALUE",
  * //   SSECustomerKeyMD5: "STRING_VALUE",
  * //   SSEKMSKeyId: "STRING_VALUE",

diff --git a/clients/client-s3/src/commands/WriteGetObjectResponseCommand.ts b/clients/client-s3/src/commands/WriteGetObjectResponseCommand.ts
@@ -120,7 +120,7 @@ export interface WriteGetObjectResponseCommandOutput extends __MetadataBearer {}
  *   ReplicationStatus: "COMPLETE" || "PENDING" || "FAILED" || "REPLICA",
  *   RequestCharged: "requester",
  *   Restore: "STRING_VALUE",
- *   ServerSideEncryption: "AES256" || "aws:kms",
+ *   ServerSideEncryption: "AES256" || "aws:kms" || "aws:kms:dsse",
  *   SSECustomerAlgorithm: "STRING_VALUE",
  *   SSEKMSKeyId: "STRING_VALUE",
  *   SSECustomerKeyMD5: "STRING_VALUE",

diff --git a/clients/client-s3/src/models/models_0.ts b/clients/client-s3/src/models/models_0.ts
@@ -341,6 +341,7 @@ export interface AccessControlTranslation {
 export const ServerSideEncryption = {
   AES256: "AES256",
   aws_kms: "aws:kms",
+  aws_kms_dsse: "aws:kms:dsse",
 } as const;
 
 /**