feat(client-s3): add md5 header for operations with httpChecksumRequired trait (#2507)

* chore: apply md5 to s3 control operations

* chore: remove stream hasher customization, rename md5 customization to sqs customization

* feat(client-s3): add md5 header for operations with httpChecksumRequired trait

* feat(client-s3-control): add md5 header for operations with httpChecksumRequired trait

* chore: address checkstyle violations

Author: AllanZhengYP

clients/client-s3-control/S3ControlClient.ts

@@ -186,9 +186,11 @@ import {
   Logger as __Logger,
   Provider as __Provider,
   StreamCollector as __StreamCollector,
+  StreamHasher as __StreamHasher,
   UrlParser as __UrlParser,
   UserAgent as __UserAgent,
 } from "@aws-sdk/types";
+import { Readable } from "stream";
 
 export type ServiceInputTypes =
   | CreateAccessPointCommandInput
@@ -403,6 +405,20 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
    * @internal
    */
   defaultUserAgentProvider?: Provider<__UserAgent>;
+
+  /**
+   * A function that, given a hash constructor and a stream, calculates the
+   * hash of the streamed value.
+   * @internal
+   */
+  streamHasher?: __StreamHasher<Readable> | __StreamHasher<Blob>;
+
+  /**
+   * A constructor for a class implementing the @aws-sdk/types.Hash interface
+   * that computes MD5 hashes.
+   * @internal
+   */
+  md5?: __HashConstructor;
 }
 
 type S3ControlClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>> &

clients/client-s3-control/commands/CreateBucketCommand.ts

@@ -4,6 +4,7 @@ import {
   deserializeAws_restXmlCreateBucketCommand,
   serializeAws_restXmlCreateBucketCommand,
 } from "../protocols/Aws_restXml";
+import { getApplyMd5BodyChecksumPlugin } from "@aws-sdk/middleware-apply-body-checksum";
 import { getRedirectFromPostIdPlugin } from "@aws-sdk/middleware-sdk-s3-control";
 import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
@@ -111,6 +112,7 @@ export class CreateBucketCommand extends $Command<
   ): Handler<CreateBucketCommandInput, CreateBucketCommandOutput> {
     this.middlewareStack.use(getSerdePlugin(configuration, this.serialize, this.deserialize));
     this.middlewareStack.use(getRedirectFromPostIdPlugin(configuration));
+    this.middlewareStack.use(getApplyMd5BodyChecksumPlugin(configuration));
 
     const stack = clientStack.concat(this.middlewareStack);
 

clients/client-s3-control/commands/PutBucketLifecycleConfigurationCommand.ts

@@ -4,6 +4,7 @@ import {
   deserializeAws_restXmlPutBucketLifecycleConfigurationCommand,
   serializeAws_restXmlPutBucketLifecycleConfigurationCommand,
 } from "../protocols/Aws_restXml";
+import { getApplyMd5BodyChecksumPlugin } from "@aws-sdk/middleware-apply-body-checksum";
 import { getProcessArnablesPlugin } from "@aws-sdk/middleware-sdk-s3-control";
 import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
@@ -84,6 +85,7 @@ export class PutBucketLifecycleConfigurationCommand extends $Command<
   ): Handler<PutBucketLifecycleConfigurationCommandInput, PutBucketLifecycleConfigurationCommandOutput> {
     this.middlewareStack.use(getSerdePlugin(configuration, this.serialize, this.deserialize));
     this.middlewareStack.use(getProcessArnablesPlugin(configuration));
+    this.middlewareStack.use(getApplyMd5BodyChecksumPlugin(configuration));
 
     const stack = clientStack.concat(this.middlewareStack);
 

clients/client-s3-control/commands/PutBucketPolicyCommand.ts

@@ -4,6 +4,7 @@ import {
   deserializeAws_restXmlPutBucketPolicyCommand,
   serializeAws_restXmlPutBucketPolicyCommand,
 } from "../protocols/Aws_restXml";
+import { getApplyMd5BodyChecksumPlugin } from "@aws-sdk/middleware-apply-body-checksum";
 import { getProcessArnablesPlugin } from "@aws-sdk/middleware-sdk-s3-control";
 import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
@@ -100,6 +101,7 @@ export class PutBucketPolicyCommand extends $Command<
   ): Handler<PutBucketPolicyCommandInput, PutBucketPolicyCommandOutput> {
     this.middlewareStack.use(getSerdePlugin(configuration, this.serialize, this.deserialize));
     this.middlewareStack.use(getProcessArnablesPlugin(configuration));
+    this.middlewareStack.use(getApplyMd5BodyChecksumPlugin(configuration));
 
     const stack = clientStack.concat(this.middlewareStack);
 

clients/client-s3-control/commands/PutBucketTaggingCommand.ts

@@ -4,6 +4,7 @@ import {
   deserializeAws_restXmlPutBucketTaggingCommand,
   serializeAws_restXmlPutBucketTaggingCommand,
 } from "../protocols/Aws_restXml";
+import { getApplyMd5BodyChecksumPlugin } from "@aws-sdk/middleware-apply-body-checksum";
 import { getProcessArnablesPlugin } from "@aws-sdk/middleware-sdk-s3-control";
 import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
@@ -145,6 +146,7 @@ export class PutBucketTaggingCommand extends $Command<
   ): Handler<PutBucketTaggingCommandInput, PutBucketTaggingCommandOutput> {
     this.middlewareStack.use(getSerdePlugin(configuration, this.serialize, this.deserialize));
     this.middlewareStack.use(getProcessArnablesPlugin(configuration));
+    this.middlewareStack.use(getApplyMd5BodyChecksumPlugin(configuration));
 
     const stack = clientStack.concat(this.middlewareStack);
 

clients/client-s3-control/package.json

@@ -32,8 +32,12 @@
     "@aws-sdk/config-resolver": "3.18.0",
     "@aws-sdk/credential-provider-node": "3.18.0",
     "@aws-sdk/fetch-http-handler": "3.18.0",
+    "@aws-sdk/hash-blob-browser": "3.18.0",
     "@aws-sdk/hash-node": "3.18.0",
+    "@aws-sdk/hash-stream-node": "3.18.0",
     "@aws-sdk/invalid-dependency": "3.18.0",
+    "@aws-sdk/md5-js": "3.18.0",
+    "@aws-sdk/middleware-apply-body-checksum": "3.18.0",
     "@aws-sdk/middleware-content-length": "3.18.0",
     "@aws-sdk/middleware-host-header": "3.18.0",
     "@aws-sdk/middleware-logger": "3.18.0",

clients/client-s3-control/runtimeConfig.browser.ts

@@ -2,7 +2,9 @@ import packageInfo from "./package.json";
 
 import { Sha256 } from "@aws-crypto/sha256-browser";
 import { FetchHttpHandler, streamCollector } from "@aws-sdk/fetch-http-handler";
+import { blobHasher as streamHasher } from "@aws-sdk/hash-blob-browser";
 import { invalidProvider } from "@aws-sdk/invalid-dependency";
+import { Md5 } from "@aws-sdk/md5-js";
 import { DEFAULT_MAX_ATTEMPTS, DEFAULT_RETRY_MODE } from "@aws-sdk/middleware-retry";
 import { fromBase64, toBase64 } from "@aws-sdk/util-base64-browser";
 import { calculateBodyLength } from "@aws-sdk/util-body-length-browser";
@@ -26,11 +28,13 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
     clientVersion: packageInfo.version,
   }),
   maxAttempts: DEFAULT_MAX_ATTEMPTS,
+  md5: Md5,
   region: invalidProvider("Region is missing"),
   requestHandler: new FetchHttpHandler(),
   retryModeProvider: () => Promise.resolve(DEFAULT_RETRY_MODE),
   sha256: Sha256,
   streamCollector,
+  streamHasher,
   utf8Decoder: fromUtf8,
   utf8Encoder: toUtf8,
 };

clients/client-s3-control/runtimeConfig.ts

@@ -4,9 +4,11 @@ import { decorateDefaultCredentialProvider } from "@aws-sdk/client-sts";
 import { NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS } from "@aws-sdk/config-resolver";
 import { defaultProvider as credentialDefaultProvider } from "@aws-sdk/credential-provider-node";
 import { Hash } from "@aws-sdk/hash-node";
+import { fileStreamHasher as streamHasher } from "@aws-sdk/hash-stream-node";
 import { NODE_MAX_ATTEMPT_CONFIG_OPTIONS, NODE_RETRY_MODE_CONFIG_OPTIONS } from "@aws-sdk/middleware-retry";
 import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
 import { NodeHttpHandler, streamCollector } from "@aws-sdk/node-http-handler";
+import { HashConstructor as __HashConstructor } from "@aws-sdk/types";
 import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
 import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
 import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
@@ -29,11 +31,13 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
     clientVersion: packageInfo.version,
   }),
   maxAttempts: loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
+  md5: Hash.bind(null, "md5"),
   region: loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
   requestHandler: new NodeHttpHandler(),
   retryModeProvider: loadNodeConfig(NODE_RETRY_MODE_CONFIG_OPTIONS),
   sha256: Hash.bind(null, "sha256"),
   streamCollector,
+  streamHasher,
   utf8Decoder: fromUtf8,
   utf8Encoder: toUtf8,
 };

clients/client-s3/S3Client.ts

@@ -603,20 +603,6 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
    */
   regionInfoProvider?: RegionInfoProvider;
 
-  /**
-   * A constructor for a class implementing the @aws-sdk/types.Hash interface
-   * that computes MD5 hashes.
-   * @internal
-   */
-  md5?: __HashConstructor;
-
-  /**
-   * A function that, given a hash constructor and a stream, calculates the
-   * hash of the streamed value.
-   * @internal
-   */
-  streamHasher?: __StreamHasher<Readable> | __StreamHasher<Blob>;
-
   /**
    * Whether to escape request path when signing the request.
    */
@@ -636,6 +622,20 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
    * The function that provides necessary utilities for generating and parsing event stream
    */
   eventStreamSerdeProvider?: __EventStreamSerdeProvider;
+
+  /**
+   * A function that, given a hash constructor and a stream, calculates the
+   * hash of the streamed value.
+   * @internal
+   */
+  streamHasher?: __StreamHasher<Readable> | __StreamHasher<Blob>;
+
+  /**
+   * A constructor for a class implementing the @aws-sdk/types.Hash interface
+   * that computes MD5 hashes.
+   * @internal
+   */
+  md5?: __HashConstructor;
 }
 
 type S3ClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>> &

clients/client-s3/commands/PutBucketAclCommand.ts

@@ -4,6 +4,7 @@ import {
   deserializeAws_restXmlPutBucketAclCommand,
   serializeAws_restXmlPutBucketAclCommand,
 } from "../protocols/Aws_restXml";
+import { getApplyMd5BodyChecksumPlugin } from "@aws-sdk/middleware-apply-body-checksum";
 import { getBucketEndpointPlugin } from "@aws-sdk/middleware-bucket-endpoint";
 import { getSerdePlugin } from "@aws-sdk/middleware-serde";
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
@@ -252,6 +253,7 @@ export class PutBucketAclCommand extends $Command<
   ): Handler<PutBucketAclCommandInput, PutBucketAclCommandOutput> {
     this.middlewareStack.use(getSerdePlugin(configuration, this.serialize, this.deserialize));
     this.middlewareStack.use(getBucketEndpointPlugin(configuration));
+    this.middlewareStack.use(getApplyMd5BodyChecksumPlugin(configuration));
 
     const stack = clientStack.concat(this.middlewareStack);