chore: Migrate away from deprecated dependencies

limhjgrace · limhjgrace · commit f3bb632fcbf0 · 2025-03-27T14:27:36.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -116,12 +116,12 @@
     },
     "dependencies": {
         "@aws-crypto/sha256-js": "^2.0.2",
-        "@aws-sdk/fetch-http-handler": "^3.36.0",
-        "@aws-sdk/protocol-http": "^3.36.0",
         "@aws-sdk/querystring-builder": "^3.36.0",
-        "@aws-sdk/signature-v4": "^3.36.0",
-        "@aws-sdk/util-hex-encoding": "^3.36.0",
         "@babel/runtime": "^7.16.0",
+        "@smithy/fetch-http-handler": "^4.1.0",
+        "@smithy/protocol-http": "^4.1.6",
+        "@smithy/signature-v4": "^4.2.2",
+        "@smithy/util-hex-encoding": "^3.0.0",
         "shimmer": "^1.2.1",
         "ua-parser-js": "^1.0.33",
         "uuid": "^9.0.0",
diff --git a/src/dispatch/Authentication.ts b/src/dispatch/Authentication.ts
@@ -1,7 +1,7 @@
 import { CognitoIdentityClient } from './CognitoIdentityClient';
 import { Config } from '../orchestration/Orchestration';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { CRED_KEY, CRED_RENEW_MS } from '../utils/constants';
 
 export abstract class Authentication {
diff --git a/src/dispatch/BasicAuthentication.ts b/src/dispatch/BasicAuthentication.ts
@@ -1,6 +1,6 @@
 import { Config } from '../orchestration/Orchestration';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { StsClient } from './StsClient';
 import { Authentication } from './Authentication';
 
diff --git a/src/dispatch/BeaconHttpHandler.ts b/src/dispatch/BeaconHttpHandler.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { buildQueryString } from '@aws-sdk/querystring-builder';
 
 export class BeaconHttpHandler implements HttpHandler {
@@ -15,6 +15,14 @@ export class BeaconHttpHandler implements HttpHandler {
         });
     }
 
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
+
     private sendBeacon(signedRequest: HttpRequest) {
         let path = signedRequest.path;
         if (signedRequest.query) {
diff --git a/src/dispatch/CognitoIdentityClient.ts b/src/dispatch/CognitoIdentityClient.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-underscore-dangle */
-import { HttpHandler, HttpRequest } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest } from '@smithy/protocol-http';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
 import { responseToJson } from './utils';
 import { IDENTITY_KEY } from '../utils/constants';
diff --git a/src/dispatch/DataPlaneClient.ts b/src/dispatch/DataPlaneClient.ts
@@ -1,5 +1,5 @@
-import { toHex } from '@aws-sdk/util-hex-encoding';
-import { SignatureV4 } from '@aws-sdk/signature-v4';
+import { toHex } from '@smithy/util-hex-encoding';
+import { SignatureV4 } from '@smithy/signature-v4';
 import {
     AwsCredentialIdentityProvider,
     AwsCredentialIdentity,
@@ -8,7 +8,7 @@ import {
     HeaderBag
 } from '@aws-sdk/types';
 import { Sha256 } from '@aws-crypto/sha256-js';
-import { HttpHandler, HttpRequest } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest } from '@smithy/protocol-http';
 import {
     AppMonitorDetails,
     PutRumEventsRequest,
diff --git a/src/dispatch/FetchHttpHandler.ts b/src/dispatch/FetchHttpHandler.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { buildQueryString } from '@aws-sdk/querystring-builder';
 import { HeaderBag, HttpHandlerOptions } from '@aws-sdk/types';
 
@@ -135,4 +135,12 @@ export class FetchHttpHandler implements HttpHandler {
         }
         return Promise.race(raceOfPromises);
     }
+
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
 }
diff --git a/src/dispatch/RetryHttpHandler.ts b/src/dispatch/RetryHttpHandler.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { is2xx, is429, is5xx } from '../plugins/utils/http-utils';
 
 export type BackoffFunction = (retry: number) => number;
@@ -57,4 +57,12 @@ export class RetryHttpHandler implements HttpHandler {
             setTimeout(resolve, milliseconds)
         );
     }
+
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
 }
diff --git a/src/dispatch/StsClient.ts b/src/dispatch/StsClient.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest } from '@smithy/protocol-http';
 import { CognitoIdentityClientConfig } from './CognitoIdentityClient';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
 import { responseToString } from './utils';
diff --git a/src/dispatch/__tests__/BeaconHttpHandler.test.ts b/src/dispatch/__tests__/BeaconHttpHandler.test.ts
@@ -1,7 +1,7 @@
 import * as Utils from '../../test-utils/test-utils';
 import { BeaconHttpHandler } from '../BeaconHttpHandler';
 import { DataPlaneClient } from '../DataPlaneClient';
-import { HttpHandler, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpResponse } from '@smithy/protocol-http';
 import { advanceTo } from 'jest-date-mock';
 
 const sendBeacon = jest.fn(() => true);
diff --git a/src/dispatch/__tests__/CognitoIdentityClient.test.ts b/src/dispatch/__tests__/CognitoIdentityClient.test.ts
@@ -1,5 +1,5 @@
 import * as Utils from '../../test-utils/test-utils';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { advanceTo } from 'jest-date-mock';
 import { CognitoIdentityClient } from '../CognitoIdentityClient';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
@@ -19,7 +19,7 @@ const uniqueIdentityCookie = `${IDENTITY_KEY}_${APPLICATION_ID}`;
 
 const fetchHandler = jest.fn();
 
-jest.mock('@aws-sdk/fetch-http-handler', () => ({
+jest.mock('@smithy/fetch-http-handler', () => ({
     FetchHttpHandler: jest
         .fn()
         .mockImplementation(() => ({ handle: fetchHandler }))
diff --git a/src/dispatch/__tests__/DataPlaneClient.test.ts b/src/dispatch/__tests__/DataPlaneClient.test.ts
@@ -1,8 +1,8 @@
 import * as Utils from '../../test-utils/test-utils';
 import { BeaconHttpHandler } from '../BeaconHttpHandler';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { DataPlaneClient } from '../DataPlaneClient';
-import { HttpRequest } from '@aws-sdk/protocol-http';
+import { HttpRequest } from '@smithy/protocol-http';
 import { advanceTo } from 'jest-date-mock';
 import { HeaderBag } from '@aws-sdk/types';
 
@@ -13,7 +13,7 @@ jest.mock('../BeaconHttpHandler', () => ({
         .mockImplementation(() => ({ handle: beaconHandler }))
 }));
 const fetchHandler = jest.fn(() => Promise.resolve());
-jest.mock('@aws-sdk/fetch-http-handler', () => ({
+jest.mock('@smithy/fetch-http-handler', () => ({
     FetchHttpHandler: jest
         .fn()
         .mockImplementation(() => ({ handle: fetchHandler }))
diff --git a/src/dispatch/__tests__/RetryHttpHandler.test.ts b/src/dispatch/__tests__/RetryHttpHandler.test.ts
@@ -1,17 +1,18 @@
 import * as Utils from '../../test-utils/test-utils';
 import { DataPlaneClient } from '../DataPlaneClient';
-import { HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpResponse } from '@smithy/protocol-http';
 import { advanceTo } from 'jest-date-mock';
 import { RetryHttpHandler } from '../RetryHttpHandler';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 
 const fetchHandler = jest.fn<Promise<Record<string, unknown>>, []>(() =>
     Promise.resolve({ response: { statusCode: 500 } })
 );
-jest.mock('@aws-sdk/fetch-http-handler', () => ({
-    FetchHttpHandler: jest
-        .fn()
-        .mockImplementation(() => ({ handle: fetchHandler }))
+
+jest.mock('@smithy/fetch-http-handler', () => ({
+    FetchHttpHandler: jest.fn().mockImplementation(() => ({
+        handle: fetchHandler
+    }))
 }));
 
 const mockBackoff = () => 0;
@@ -21,7 +22,7 @@ describe('RetryHttpHandler tests', () => {
         jest.useRealTimers();
         advanceTo(0);
         fetchHandler.mockClear();
-        (FetchHttpHandler as jest.Mock).mockImplementation(() => {
+        (FetchHttpHandler as unknown as jest.Mock).mockImplementation(() => {
             return {
                 handle: fetchHandler
             };
diff --git a/src/dispatch/__tests__/StsClient.test.ts b/src/dispatch/__tests__/StsClient.test.ts
@@ -1,6 +1,6 @@
 import * as Utils from '../../test-utils/test-utils';
 import { AwsCredentialIdentity } from '@aws-sdk/types';
-import { FetchHttpHandler } from '@aws-sdk/fetch-http-handler';
+import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { advanceTo } from 'jest-date-mock';
 import { getReadableStream } from '../../test-utils/test-utils';
 import { StsClient } from '../StsClient';
@@ -10,7 +10,7 @@ const mockCredentials =
 
 const fetchHandler = jest.fn();
 
-jest.mock('@aws-sdk/fetch-http-handler', () => ({
+jest.mock('@smithy/fetch-http-handler', () => ({
     FetchHttpHandler: jest
         .fn()
         .mockImplementation(() => ({ handle: fetchHandler }))
diff --git a/src/dispatch/utils.ts b/src/dispatch/utils.ts
@@ -1,4 +1,4 @@
-import { HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpResponse } from '@smithy/protocol-http';
 
 export const responseToJson = async (
     response: HttpResponse
diff --git a/src/test-utils/http-handler-utils.ts b/src/test-utils/http-handler-utils.ts
@@ -1,4 +1,4 @@
-import { HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { HeaderBag } from '@aws-sdk/types';
 
 const setElementText = (name: string, text: string) => {
diff --git a/src/test-utils/integ-http-handler.ts b/src/test-utils/integ-http-handler.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { FetchHttpHandler } from '../dispatch/FetchHttpHandler';
 import { HttpHandlerOptions } from '@aws-sdk/types';
 import { ClientBuilder } from '../dispatch/Dispatch';
@@ -49,4 +49,12 @@ class ShowIntegRequestHandler implements HttpHandler {
             return response;
         });
     }
+
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
 }
diff --git a/src/test-utils/mock-http-custom-headers.ts b/src/test-utils/mock-http-custom-headers.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { ClientBuilder } from '../dispatch/Dispatch';
 import { DataPlaneClient } from '../dispatch/DataPlaneClient';
 import { logRequestToPage, logResponseToPage } from './http-handler-utils';
@@ -45,4 +45,12 @@ class ShowMockRequestHandler implements HttpHandler {
         logResponseToPage(response);
         return Promise.resolve({ response });
     }
+
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
 }
diff --git a/src/test-utils/mock-http-handler.ts b/src/test-utils/mock-http-handler.ts
@@ -1,4 +1,4 @@
-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { ClientBuilder } from '../dispatch/Dispatch';
 import { DataPlaneClient } from '../dispatch/DataPlaneClient';
 import { logRequestToPage, logResponseToPage } from './http-handler-utils';
@@ -38,4 +38,12 @@ class ShowMockRequestHandler implements HttpHandler {
         logResponseToPage(response);
         return Promise.resolve({ response });
     }
+
+    updateHttpClientConfig(_key: never, _value: never): void {
+        // No-op: Customize if needed
+    }
+
+    httpHandlerConfigs(): Record<string, never> {
+        return {};
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';`
	`1`	`+import { HttpHandler, HttpRequest, HttpResponse } from '@smithy/protocol-http';`
`2`	`2`	`import { buildQueryString } from '@aws-sdk/querystring-builder';`
`3`	`3`	`import { HeaderBag, HttpHandlerOptions } from '@aws-sdk/types';`
`4`	`4`
`@@ -135,4 +135,12 @@ export class FetchHttpHandler implements HttpHandler {`
`135`	`135`	`}`
`136`	`136`	`return Promise.race(raceOfPromises);`
`137`	`137`	`}`
	`138`	`+`
	`139`	`+ updateHttpClientConfig(_key: never, _value: never): void {`
	`140`	`+ // No-op: Customize if needed`
	`141`	`+ }`
	`142`	`+`
	`143`	`+ httpHandlerConfigs(): Record<string, never> {`
	`144`	`+ return {};`
	`145`	`+ }`
`138`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { HttpHandler, HttpRequest } from '@aws-sdk/protocol-http';`
	`1`	`+import { HttpHandler, HttpRequest } from '@smithy/protocol-http';`
`2`	`2`	`import { CognitoIdentityClientConfig } from './CognitoIdentityClient';`
`3`	`3`	`import { AwsCredentialIdentity } from '@aws-sdk/types';`
`4`	`4`	`import { responseToString } from './utils';`