implement general wrapper

Author: Hweinstock

packages/core/src/extension.ts

@@ -52,6 +52,7 @@ import { registerCommands } from './commands'
 import endpoints from '../resources/endpoints.json'
 import { getLogger, maybeShowMinVscodeWarning, setupUninstallHandler } from './shared'
 import { showViewLogsMessage } from './shared/utilities/messages'
+import { AWSClientBuilderV3 } from './shared/awsClientBuilderV3'
 
 disableAwsSdkWarning()
 
@@ -116,6 +117,7 @@ export async function activateCommon(
     globals.machineId = await getMachineId()
     globals.awsContext = new DefaultAwsContext()
     globals.sdkClientBuilder = new DefaultAWSClientBuilder(globals.awsContext)
+    globals.sdkClientBuilderV3 = new AWSClientBuilderV3(globals.awsContext)
     globals.loginManager = new LoginManager(globals.awsContext, new CredentialsStore())
 
     // order matters here

packages/core/src/shared/awsClientBuilderV3.ts

@@ -27,8 +27,10 @@ import { omitIfPresent } from './utilities/tsUtils'
 
 export type AwsClientConstructor<C> = new (o: AwsClientOptions) => C
 
-interface AwsClient {
+export interface AwsClient {
     middlewareStack: any // Ideally this would extends MiddlewareStack<Input, Output>, but this causes issues on client construction.
+    send: any
+    destroy: () => void
 }
 
 interface AwsConfigOptions {

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

@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import globals from '../extensionGlobals'
+import { AwsClient, AwsClientConstructor } from '../awsClientBuilderV3'
+import { pageableToCollection } from '../utilities/collectionUtils'
+
+export abstract class ClientWrapper<C extends AwsClient> implements vscode.Disposable {
+    protected client: C | undefined
+
+    public constructor(
+        public readonly regionCode: string,
+        private readonly clientType: AwsClientConstructor<any>
+    ) {}
+
+    protected async getClient() {
+        if (this.client) {
+            return this.client
+        }
+        this.client = await globals.sdkClientBuilderV3.createAwsService(this.clientType, undefined, this.regionCode)
+        return this.client!
+    }
+
+    protected async makeRequest<CommandInput extends object, Command extends object>(
+        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>(
+        command: new (o: CommandInput) => Command,
+        commandOptions: CommandInput,
+        collectKey: keyof CommandOutput & string,
+        nextTokenKey?: keyof CommandOutput & keyof CommandInput & string
+    ) {
+        const requester = async (req: CommandInput) => await this.makeRequest(command, req)
+        const response = pageableToCollection(
+            requester,
+            commandOptions,
+            nextTokenKey ?? ('NextToken' as never),
+            collectKey
+        )
+        return response
+    }
+
+    public dispose() {
+        this.client?.destroy()
+    }
+}

packages/core/src/shared/extensionGlobals.ts

@@ -19,6 +19,7 @@ import { UriHandler } from './vscode/uriHandler'
 import { GlobalState } from './globalState'
 import { setContext } from './vscode/setContext'
 import { getLogger } from './logger/logger'
+import { AWSClientBuilderV3 } from './awsClientBuilderV3'
 
 type Clock = Pick<
     typeof globalThis,
@@ -197,6 +198,7 @@ export interface ToolkitGlobals {
     awsContext: AwsContext
     regionProvider: RegionProvider
     sdkClientBuilder: AWSClientBuilder
+    sdkClientBuilderV3: AWSClientBuilderV3
     telemetry: TelemetryService & { logger: TelemetryLogger }
     /** template.yaml registry. _Avoid_ calling this until it is actually needed (for SAM features). */
     templateRegistry: Promise<CloudFormationTemplateRegistry>