chore(signature-v4): use normalizeProvider from util-middleware (#3459)

Author: trivikr

packages/signature-v4-crt/package.json

@@ -24,6 +24,7 @@
     "@aws-sdk/querystring-parser": "*",
     "@aws-sdk/signature-v4": "*",
     "@aws-sdk/util-hex-encoding": "*",
+    "@aws-sdk/util-middleware": "*",
     "@aws-sdk/util-uri-escape": "*",
     "aws-crt": "^1.11.3",
     "tslib": "^2.3.1"

packages/signature-v4-crt/src/CrtSignerV4.ts

@@ -3,8 +3,6 @@ import {
   getCanonicalQuery,
   getPayloadHash,
   moveHeadersToQuery,
-  normalizeCredentialsProvider,
-  normalizeRegionProvider,
   prepareRequest,
   SignatureV4CryptoInit,
   SignatureV4Init,
@@ -19,6 +17,7 @@ import {
   RequestSigner,
   RequestSigningArguments,
 } from "@aws-sdk/types";
+import { normalizeProvider } from "@aws-sdk/util-middleware";
 import { auth as crtAuth, http as crtHttp, io as crtIO } from "aws-crt";
 
 import { MAX_PRESIGNED_TTL, SHA256_HEADER } from "./constants";
@@ -82,8 +81,8 @@ export class CrtSignerV4 implements RequestPresigner, RequestSigner {
     this.uriEscapePath = uriEscapePath;
     this.signingAlgorithm = signingAlgorithm;
     this.applyChecksum = applyChecksum;
-    this.regionProvider = normalizeRegionProvider(region);
-    this.credentialProvider = normalizeCredentialsProvider(credentials);
+    this.regionProvider = normalizeProvider(region);
+    this.credentialProvider = normalizeProvider(credentials);
     crtIO.enable_logging(crtIO.LogLevel.ERROR);
   }
 

packages/signature-v4/package.json

@@ -23,6 +23,7 @@
     "@aws-sdk/is-array-buffer": "*",
     "@aws-sdk/types": "*",
     "@aws-sdk/util-hex-encoding": "*",
+    "@aws-sdk/util-middleware": "*",
     "@aws-sdk/util-uri-escape": "*",
     "tslib": "^2.3.1"
   },

packages/signature-v4/src/SignatureV4.ts

@@ -16,6 +16,7 @@ import {
   StringSigner,
 } from "@aws-sdk/types";
 import { toHex } from "@aws-sdk/util-hex-encoding";
+import { normalizeProvider } from "@aws-sdk/util-middleware";
 
 import {
   ALGORITHM_IDENTIFIER,
@@ -39,7 +40,6 @@ import { getCanonicalQuery } from "./getCanonicalQuery";
 import { getPayloadHash } from "./getPayloadHash";
 import { hasHeader } from "./headerUtil";
 import { moveHeadersToQuery } from "./moveHeadersToQuery";
-import { normalizeCredentialsProvider, normalizeRegionProvider } from "./normalizeProvider";
 import { prepareRequest } from "./prepareRequest";
 import { iso8601 } from "./utilDate";
 
@@ -112,8 +112,8 @@ export class SignatureV4 implements RequestPresigner, RequestSigner, StringSigne
     this.uriEscapePath = uriEscapePath;
     // default to true if applyChecksum isn't set
     this.applyChecksum = typeof applyChecksum === "boolean" ? applyChecksum : true;
-    this.regionProvider = normalizeRegionProvider(region);
-    this.credentialProvider = normalizeCredentialsProvider(credentials);
+    this.regionProvider = normalizeProvider(region);
+    this.credentialProvider = normalizeProvider(credentials);
   }
 
   public async presign(originalRequest: HttpRequest, options: RequestPresigningArguments = {}): Promise<HttpRequest> {

packages/signature-v4/src/index.ts

@@ -4,5 +4,4 @@ export { getCanonicalQuery } from "./getCanonicalQuery";
 export { getPayloadHash } from "./getPayloadHash";
 export { moveHeadersToQuery } from "./moveHeadersToQuery";
 export { prepareRequest } from "./prepareRequest";
-export { normalizeCredentialsProvider, normalizeRegionProvider } from "./normalizeProvider";
 export * from "./credentialDerivation";