Updated type declaration of captureAWSv3Client to fix TS errors (#575)

aws · Mar 9, 2023 · 7e92f33 · 7e92f33 · camitz · Mar 27, 2023
1 parent 3abe727
commit 7e92f33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/core/lib/patchers/aws3_p.d.ts b/packages/core/lib/patchers/aws3_p.d.ts
@@ -1,4 +1,3 @@
-import { Client } from '@aws-sdk/types';
 import { SegmentLike } from '../aws-xray';
 /**
  * Instruments AWS SDK V3 clients with X-Ray via middleware.
@@ -7,4 +6,4 @@ import { SegmentLike } from '../aws-xray';
  * @param manualSegment - Parent segment or subsegment that is passed in for manual mode users
  * @returns - the client with the X-Ray instrumentation middleware added to its middleware stack
  */
-export declare function captureAWSClient<T extends Client<any, any, any>>(client: T, manualSegment?: SegmentLike): T
+export declare function captureAWSClient<T extends { middlewareStack: { remove: any, use: any }, config: any }>(client: T, manualSegment?: SegmentLike): T
diff --git a/packages/core/lib/patchers/aws3_p.ts b/packages/core/lib/patchers/aws3_p.ts
@@ -1,6 +1,5 @@
 import {
   Pluggable,
-  Client,
   BuildMiddleware,
   MiddlewareStack,
   BuildHandlerOptions,
@@ -189,7 +188,7 @@ const getXRayPlugin = (config: RegionResolvedConfig, manualSegment?: SegmentLike
  * @param manualSegment - Parent segment or subsegment that is passed in for manual mode users
  * @returns - the client with the X-Ray instrumentation middleware added to its middleware stack
  */
-export function captureAWSClient<T extends Client<any, any, any>>(client: T, manualSegment?: SegmentLike): T {
+export function captureAWSClient<T extends { middlewareStack: { remove: any, use: any }, config: any }>(client: T, manualSegment?: SegmentLike): T {
   // Remove existing middleware to ensure operation is idempotent
   client.middlewareStack.remove(XRAY_PLUGIN_NAME);
   client.middlewareStack.use(getXRayPlugin(client.config, manualSegment));