types: slightly improve types

Author: Hweinstock

packages/core/src/shared/awsClientBuilderV3.ts

@@ -12,6 +12,7 @@ import {
     DeserializeHandler,
     DeserializeHandlerOptions,
     DeserializeMiddleware,
+    Handler,
     HandlerExecutionContext,
     MetadataBearer,
     MiddlewareStack,
@@ -33,10 +34,18 @@ export type AwsClientConstructor<C> = new (o: AwsClientOptions) => C
 
 // AWS-SDKv3 does not export generic types for clients so we need to build them as needed
 // https://github.com/aws/aws-sdk-js-v3/issues/5856#issuecomment-2096950979
-interface AwsClient {
+export interface AwsClient {
     middlewareStack: {
         add: MiddlewareStack<any, MetadataBearer>['add']
     }
+    send: (command: AwsCommand, options?: any) => Promise<any>
+    destroy: () => void
+}
+
+export interface AwsCommand {
+    input: object
+    middlewareStack: any
+    resolveMiddleware: (stack: any, configuration: any, options: any) => Handler<any, any>
 }
 
 interface AwsClientOptions {

packages/core/src/shared/clients/wrapper.ts

@@ -4,7 +4,7 @@
  */
 import * as vscode from 'vscode'
 import globals from '../extensionGlobals'
-import { AwsClient, AwsClientConstructor } from '../awsClientBuilderV3'
+import { AwsClient, AwsClientConstructor, AwsCommand } from '../awsClientBuilderV3'
 import { pageableToCollection } from '../utilities/collectionUtils'
 
 export abstract class ClientWrapper<C extends AwsClient> implements vscode.Disposable {
@@ -23,15 +23,19 @@ export abstract class ClientWrapper<C extends AwsClient> implements vscode.Dispo
         return this.client!
     }
 
-    protected async makeRequest<CommandInput extends object, Command extends object>(
+    protected async makeRequest<CommandInput extends object, Command extends AwsCommand>(
         command: new (o: CommandInput) => Command,
         commandOptions: CommandInput
     ) {
         const client = await this.getClient()
         return await client.send(new command(commandOptions))
     }
 
-    protected makePaginatedRequest<CommandInput extends object, CommandOutput extends object, Command extends object>(
+    protected makePaginatedRequest<
+        CommandInput extends object,
+        CommandOutput extends object,
+        Command extends AwsCommand,
+    >(
         command: new (o: CommandInput) => Command,
         commandOptions: CommandInput,
         collectKey: keyof CommandOutput & string,