fix: add override config to all native middleware

AllanZhengYP · AllanZhengYP · commit 0e335e9237ee · 2021-01-27T02:12:33.000Z
diff --git a/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts b/packages/middleware-apply-body-checksum/src/applyMd5BodyChecksumMiddleware.ts
@@ -50,6 +50,7 @@ export const applyMd5BodyChecksumMiddlewareOptions: BuildHandlerOptions = {
   name: "applyMd5BodyChecksumMiddleware",
   step: "build",
   tags: ["SET_CONTENT_MD5", "BODY_CHECKSUM"],
+  override: true,
 };
 
 export const getApplyMd5BodyChecksumPlugin = (config: Md5BodyChecksumResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.ts b/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.ts
@@ -85,6 +85,7 @@ export const bucketEndpointMiddlewareOptions: RelativeMiddlewareOptions = {
   name: "bucketEndpointMiddleware",
   relation: "before",
   toMiddleware: "hostHeaderMiddleware",
+  override: true,
 };
 
 export const getBucketEndpointPlugin = (options: BucketEndpointResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-content-length/src/index.ts b/packages/middleware-content-length/src/index.ts
@@ -46,6 +46,7 @@ export const contentLengthMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["SET_CONTENT_LENGTH", "CONTENT_LENGTH"],
   name: "contentLengthMiddleware",
+  override: true,
 };
 
 export const getContentLengthPlugin = (options: { bodyLengthChecker: BodyLengthCalculator }): Pluggable<any, any> => ({
diff --git a/packages/middleware-eventstream/src/handling-middleware.ts b/packages/middleware-eventstream/src/handling-middleware.ts
@@ -16,4 +16,5 @@ export const eventStreamHandlingMiddlewareOptions: RelativeMiddlewareOptions = {
   name: "eventStreamHandlingMiddleware",
   relation: "after",
   toMiddleware: "awsAuthMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-eventstream/src/headers-middleware.ts b/packages/middleware-eventstream/src/headers-middleware.ts
@@ -18,4 +18,5 @@ export const eventStreamHeaderMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["EVENT_STREAM", "HEADER", "CONTENT_TYPE", "CONTENT_SHA256"],
   name: "eventStreamHeaderMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-expect-continue/src/index.ts b/packages/middleware-expect-continue/src/index.ts
@@ -35,6 +35,7 @@ export const addExpectContinueMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["SET_EXPECT_HEADER", "EXPECT_HEADER"],
   name: "addExpectContinueMiddleware",
+  override: true,
 };
 
 export const getAddExpectContinuePlugin = (options: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-host-header/src/index.ts b/packages/middleware-host-header/src/index.ts
@@ -37,6 +37,7 @@ export const hostHeaderMiddlewareOptions: BuildHandlerOptions & AbsoluteLocation
   step: "build",
   priority: "low",
   tags: ["HOST"],
+  override: true,
 };
 
 export const getHostHeaderPlugin = (options: HostHeaderResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-location-constraint/src/index.ts b/packages/middleware-location-constraint/src/index.ts
@@ -45,6 +45,7 @@ export const locationConstraintMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["LOCATION_CONSTRAINT", "CREATE_BUCKET_CONFIGURATION"],
   name: "locationConstraintMiddleware",
+  override: true,
 };
 
 export const getLocationConstraintPlugin = (config: LocationConstraintResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-logger/src/loggerMiddleware.ts b/packages/middleware-logger/src/loggerMiddleware.ts
@@ -42,6 +42,7 @@ export const loggerMiddlewareOptions: InitializeHandlerOptions & AbsoluteLocatio
   name: "loggerMiddleware",
   tags: ["LOGGER"],
   step: "initialize",
+  override: true,
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/middleware-retry/src/omitRetryHeadersMiddleware.ts b/packages/middleware-retry/src/omitRetryHeadersMiddleware.ts
@@ -28,6 +28,7 @@ export const omitRetryHeadersMiddlewareOptions: RelativeMiddlewareOptions = {
   tags: ["RETRY", "HEADERS", "OMIT_RETRY_HEADERS"],
   relation: "before",
   toMiddleware: "awsAuthMiddleware",
+  override: true,
 };
 
 export const getOmitRetryHeadersPlugin = (options: unknown): Pluggable<any, any> => ({
diff --git a/packages/middleware-retry/src/retryMiddleware.ts b/packages/middleware-retry/src/retryMiddleware.ts
@@ -27,6 +27,7 @@ export const retryMiddlewareOptions: FinalizeRequestHandlerOptions & AbsoluteLoc
   tags: ["RETRY"],
   step: "finalizeRequest",
   priority: "high",
+  override: true,
 };
 
 export const getRetryPlugin = (options: RetryResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-api-gateway/src/index.ts b/packages/middleware-sdk-api-gateway/src/index.ts
@@ -31,6 +31,7 @@ export const acceptHeaderMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["SET_ACCEPT_HEADER", "ACCEPT_HEADER"],
   name: "acceptHeaderMiddleware",
+  override: true,
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/middleware-sdk-ec2/src/index.ts b/packages/middleware-sdk-ec2/src/index.ts
@@ -81,6 +81,7 @@ export const copySnapshotPresignedUrlMiddlewareOptions: InitializeHandlerOptions
   step: "initialize",
   tags: ["CROSS_REGION_PRESIGNED_URL"],
   name: "crossRegionPresignedUrlMiddleware",
+  override: true,
 };
 
 export const getCopySnapshotPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-glacier/src/account-id-default.ts b/packages/middleware-sdk-glacier/src/account-id-default.ts
@@ -25,4 +25,5 @@ export const accountIdDefaultMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["ACCOUNT_ID_DEFAULT"],
   name: "accountIdDefaultMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-sdk-glacier/src/add-checksum-headers.ts b/packages/middleware-sdk-glacier/src/add-checksum-headers.ts
@@ -49,4 +49,5 @@ export const addChecksumHeadersMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["SET_CHECKSUM_HEADERS"],
   name: "addChecksumHeadersMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts b/packages/middleware-sdk-glacier/src/add-glacier-api-version.ts
@@ -30,4 +30,5 @@ export const addGlacierApiVersionMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["SET_GLACIER_VERSION"],
   name: "addGlacierApiVersionMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-sdk-machinelearning/src/predict-endpoint.ts b/packages/middleware-sdk-machinelearning/src/predict-endpoint.ts
@@ -41,6 +41,7 @@ export const predictEndpointMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["PREDICT_ENDPOINT"],
   name: "predictEndpointMiddleware",
+  override: true,
 };
 
 export const getPredictEndpointPlugin = (config: ResolvedPredictEndpointMiddlewareConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-rds/src/index.ts b/packages/middleware-sdk-rds/src/index.ts
@@ -109,6 +109,7 @@ export const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions
   step: "initialize",
   tags: ["CROSS_REGION_PRESIGNED_URL"],
   name: "crossRegionPresignedUrlMiddleware",
+  override: true,
 };
 
 export const getCrossRegionPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-route53/src/change-resource-record-sets.ts b/packages/middleware-sdk-route53/src/change-resource-record-sets.ts
@@ -67,6 +67,7 @@ export const changeResourceRecordSetsMiddlewareOptions: InitializeHandlerOptions
   step: "initialize",
   tags: ["ROUTE53_IDS", "CHANGE_RESOURCE_RECORD_SETS"],
   name: "changeResourceRecordSetsMiddleware",
+  override: true,
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/middleware-sdk-route53/src/id-normalizer.ts b/packages/middleware-sdk-route53/src/id-normalizer.ts
@@ -43,6 +43,7 @@ export const idNormalizerMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["ROUTE53_IDS"],
   name: "idNormalizerMiddleware",
+  override: true,
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/middleware-sdk-s3-control/src/redirect-from-postid.ts b/packages/middleware-sdk-s3-control/src/redirect-from-postid.ts
@@ -27,6 +27,7 @@ export const redirectFromPostIdMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   name: "redirectFromPostIdMiddleware",
   tags: ["OUTPOST"],
+  override: true,
 };
 
 export const getRedirectFromPostIdPlugin = (options: S3ControlResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-s3/src/throw-200-exceptions.ts b/packages/middleware-sdk-s3/src/throw-200-exceptions.ts
@@ -59,6 +59,7 @@ export const throw200ExceptionsMiddlewareOptions: RelativeMiddlewareOptions = {
   toMiddleware: "deserializerMiddleware",
   tags: ["THROW_200_EXCEPTIONS", "S3"],
   name: "throw200ExceptionsMiddleware",
+  override: true,
 };
 
 /**
diff --git a/packages/middleware-sdk-s3/src/use-regional-endpoint.ts b/packages/middleware-sdk-s3/src/use-regional-endpoint.ts
@@ -40,6 +40,7 @@ export const useRegionalEndpointMiddlewareOptions: BuildHandlerOptions = {
   step: "build",
   tags: ["USE_REGIONAL_ENDPOINT", "S3"],
   name: "useRegionalEndpointMiddleware",
+  override: true,
 };
 
 /**
diff --git a/packages/middleware-sdk-s3/src/validate-bucket-name.ts b/packages/middleware-sdk-s3/src/validate-bucket-name.ts
@@ -37,6 +37,7 @@ export const validateBucketNameMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["VALIDATE_BUCKET_NAME"],
   name: "validateBucketNameMiddleware",
+  override: true,
 };
 
 /**
diff --git a/packages/middleware-sdk-sqs/src/receive-message.ts b/packages/middleware-sdk-sqs/src/receive-message.ts
@@ -52,6 +52,7 @@ export const receiveMessageMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["VALIDATE_BODY_MD5"],
   name: "receiveMessageMiddleware",
+  override: true,
 };
 
 export const getReceiveMessagePlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-sqs/src/send-message-batch.ts b/packages/middleware-sdk-sqs/src/send-message-batch.ts
@@ -60,6 +60,7 @@ export const sendMessageBatchMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["VALIDATE_BODY_MD5"],
   name: "sendMessageBatchMiddleware",
+  override: true,
 };
 
 export const getSendMessageBatchPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-sqs/src/send-message.ts b/packages/middleware-sdk-sqs/src/send-message.ts
@@ -36,6 +36,7 @@ export const sendMessageMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   tags: ["VALIDATE_BODY_MD5"],
   name: "sendMessageMiddleware",
+  override: true,
 };
 
 export const getSendMessagePlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
diff --git a/packages/middleware-sdk-transcribe-streaming/src/middleware-endpoint.ts b/packages/middleware-sdk-transcribe-streaming/src/middleware-endpoint.ts
@@ -58,4 +58,5 @@ export const websocketURLMiddlewareOptions: RelativeMiddlewareOptions = {
   tags: ["WEBSOCKET", "EVENT_STREAM"],
   relation: "after",
   toMiddleware: "eventStreamHeaderMiddleware",
+  override: true,
 };
diff --git a/packages/middleware-sdk-transcribe-streaming/src/middleware-session-id.ts b/packages/middleware-sdk-transcribe-streaming/src/middleware-session-id.ts
@@ -47,4 +47,5 @@ export const injectSessionIdMiddlewareOptions: InitializeHandlerOptions = {
   step: "initialize",
   name: "injectSessionIdMiddleware",
   tags: ["WEBSOCKET", "EVENT_STREAM"],
+  override: true,
 };
diff --git a/packages/middleware-serde/src/serdePlugin.ts b/packages/middleware-serde/src/serdePlugin.ts
@@ -16,12 +16,14 @@ export const deserializerMiddlewareOption: DeserializeHandlerOptions = {
   name: "deserializerMiddleware",
   step: "deserialize",
   tags: ["DESERIALIZER"],
+  override: true,
 };
 
 export const serializerMiddlewareOption: SerializeHandlerOptions = {
   name: "serializerMiddleware",
   step: "serialize",
   tags: ["SERIALIZER"],
+  override: true,
 };
 
 export function getSerdePlugin<
diff --git a/packages/middleware-signing/src/middleware.ts b/packages/middleware-signing/src/middleware.ts
@@ -50,6 +50,7 @@ export const awsAuthMiddlewareOptions: RelativeMiddlewareOptions = {
   tags: ["SIGNATURE", "AWSAUTH"],
   relation: "after",
   toMiddleware: "retryMiddleware",
+  override: true,
 };
 
 export const getAwsAuthPlugin = (options: AwsAuthResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-ssec/src/index.ts b/packages/middleware-ssec/src/index.ts
@@ -59,6 +59,7 @@ export const ssecMiddlewareOptions: InitializeHandlerOptions = {
   name: "ssecMiddleware",
   step: "initialize",
   tags: ["SSE"],
+  override: true,
 };
 
 export const getSsecPlugin = (config: ResolvedSsecMiddlewareConfig): Pluggable<any, any> => ({
diff --git a/packages/middleware-user-agent/src/user-agent-middleware.ts b/packages/middleware-user-agent/src/user-agent-middleware.ts
@@ -76,6 +76,7 @@ export const getUserAgentMiddlewareOptions: BuildHandlerOptions & AbsoluteLocati
   step: "build",
   priority: "low",
   tags: ["SET_USER_AGENT", "USER_AGENT"],
+  override: true,
 };
 
 export const getUserAgentPlugin = (config: UserAgentResolvedConfig): Pluggable<any, any> => ({
diff --git a/packages/s3-request-presigner/src/getSignedUrl.ts b/packages/s3-request-presigner/src/getSignedUrl.ts
@@ -41,19 +41,12 @@ export const getSignedUrl = async <
     } as any;
   };
   const middlewareName = "presignInterceptMiddleware";
-  try {
-    client.middlewareStack.addRelativeTo(presignInterceptMiddleware, {
-      name: middlewareName,
-      relation: "before",
-      toMiddleware: "awsAuthMiddleware",
-    });
-  } catch (e) {
-    if (e.message!.includes(`Duplicated middleware name '${middlewareName}'`)) {
-      // Swallow if the interceptor is already added. See https://github.com/aws/aws-sdk-js-v3/issues/1857
-    } else {
-      throw e;
-    }
-  }
+  client.middlewareStack.addRelativeTo(presignInterceptMiddleware, {
+    name: middlewareName,
+    relation: "before",
+    toMiddleware: "awsAuthMiddleware",
+    override: true,
+  });
 
   let presigned: HttpRequest;
   try {
