refactor types to have any middleware

Author: Hweinstock

packages/core/src/shared/awsClientBuilderV3.ts

@@ -15,7 +15,7 @@ import {
     HandlerExecutionContext,
     HttpHandlerOptions,
     MetadataBearer,
-    MiddlewareStack,
+    //MiddlewareStack,
     Provider,
     RetryStrategy,
     UserAgent,
@@ -32,11 +32,11 @@ import { Client, SmithyResolvedConfiguration } from '@aws-sdk/smithy-client'
 export type AwsClient = Client<HttpHandlerOptions, any, MetadataBearer, SmithyResolvedConfiguration<HttpHandlerOptions>>
 export type AwsClientConstructor<C> = new (o: AwsClientOptions) => C
 
-interface AwsClient2 {
-    middlewareStack: AwsMiddlewareStack
+interface AwsClient2<Input extends object, Output extends MetadataBearer> {
+    middlewareStack: AwsMiddlewareStack<Input, Output>
 }
 
-type AwsMiddlewareStack = any
+type AwsMiddlewareStack<Input extends object, Output extends object> = any
 interface AwsConfigOptions {
     credentials: AwsCredentialIdentityProvider
     region: string | Provider<string>
@@ -48,17 +48,17 @@ interface AwsConfigOptions {
 }
 export type AwsClientOptions = AwsConfigOptions
 
-export interface AWSClientBuilderV3 {
-    createAwsService<C extends AwsClient2>(
-        type: AwsClientConstructor<C>,
-        options?: Partial<AwsClientOptions>,
-        region?: string,
-        userAgent?: boolean,
-        settings?: DevSettings
-    ): Promise<C>
-}
-
-export class DefaultAWSClientBuilderV3 implements AWSClientBuilderV3 {
+// export interface AWSClientBuilderV3 {
+//     createAwsService<Input extends object, Output extends MetadataBearer, C extends AwsClient2<Input, Output>>(
+//         type: AwsClientConstructor<C>,
+//         options?: Partial<AwsClientOptions>,
+//         region?: string,
+//         userAgent?: boolean,
+//         settings?: DevSettings
+//     ): Promise<C>
+// }
+
+export class DefaultAWSClientBuilderV3 {
     public constructor(private readonly context: AwsContext) {}
 
     private getShim(): CredentialsShim {
@@ -69,7 +69,11 @@ export class DefaultAWSClientBuilderV3 implements AWSClientBuilderV3 {
         return shim
     }
 
-    public async createAwsService<C extends AwsClient2>(
+    public async createAwsService<
+        Input extends object,
+        Output extends MetadataBearer,
+        C extends AwsClient2<Input, Output>,
+    >(
         type: AwsClientConstructor<C>,
         options?: Partial<AwsClientOptions>,
         region?: string,
@@ -102,7 +106,7 @@ export class DefaultAWSClientBuilderV3 implements AWSClientBuilderV3 {
 
         const service = new type(opt)
         // TODO: add middleware for logging, telemetry, endpoints.
-        service.middlewareStack.add(telemetryMiddleware, { step: 'deserialize' } as DeserializeHandlerOptions)
+        service.middlewareStack.add!(telemetryMiddleware, { step: 'deserialize' } as DeserializeHandlerOptions)
         return service
     }
 }

packages/core/src/test/shared/defaultAwsClientBuilderV3.test.ts

@@ -9,25 +9,20 @@ import { getClientId } from '../../shared/telemetry/util'
 import { FakeMemento } from '../fakeExtensionContext'
 import { FakeAwsContext } from '../utilities/fakeAwsContext'
 import { GlobalState } from '../../shared/globalState'
-import {
-    AwsClient,
-    AwsClientConstructor,
-    DefaultAWSClientBuilderV3,
-    getServiceId,
-    recordErrorTelemetry,
-} from '../../shared/awsClientBuilderV3'
+import { DefaultAWSClientBuilderV3, getServiceId, recordErrorTelemetry } from '../../shared/awsClientBuilderV3'
 import { Client } from '@aws-sdk/smithy-client'
 import { extensionVersion } from '../../shared'
 import { assertTelemetry } from '../testUtil'
 import { telemetry } from '../../shared/telemetry'
-import { CloudFormationClient } from '@aws-sdk/client-cloudformation'
+//import { ActivateOrganizationsAccessCommand, CloudFormationClient } from '@aws-sdk/client-cloudformation'
 
 describe('DefaultAwsClientBuilderV3', function () {
     let builder: DefaultAWSClientBuilderV3
 
     beforeEach(async function () {
         builder = new DefaultAWSClientBuilderV3(new FakeAwsContext())
-        const c = await builder.createAwsService(CloudFormationClient, undefined, 'us-east-1')
+        //const c = await builder.createAwsService(CloudFormationClient, undefined, 'us-east-1')
+        //await c.send(new ActivateOrganizationsAccessCommand({ dryRun: true }))
     })
 
     describe('createAndConfigureSdkClient', function () {