refactor: cleanup minor problems

Author: Hweinstock

packages/core/src/shared/awsClientBuilderV3.ts

@@ -54,7 +54,10 @@ export interface AwsClient {
     middlewareStack: {
         add: MiddlewareStack<any, MetadataBearer>['add']
     }
-    send: (command: AwsCommand<object, object>, options?: any) => Promise<any>
+    send<InputType extends object, OutputType extends object>(
+        command: AwsCommand<InputType, OutputType>,
+        options?: any
+    ): Promise<OutputType>
     destroy: () => void
 }
 

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

@@ -100,7 +100,6 @@ import { DevSettings } from '../settings'
 import { getServiceEnvVarConfig } from '../vscode/env'
 import { AwsCommand } from '../awsClientBuilderV3'
 import { ClientWrapper } from './clientWrapper'
-import { StandardRetryStrategy } from '@smithy/util-retry'
 import { ServiceException } from '@aws-sdk/smithy-client'
 import { AccessDeniedException } from '@aws-sdk/client-sso-oidc'
 import { TokenIdentityProvider } from '@aws-sdk/types'
@@ -221,16 +220,14 @@ function toBranch(
 function createCodeCatalystClientV3(
     tokenProvider: TokenIdentityProvider,
     regionCode: string,
-    endpoint: string,
-    maxRetries: number
+    endpoint: string
 ): CodeCatalystSDKClient {
     return globals.sdkClientBuilderV3.createAwsService({
         serviceClient: CodeCatalystSDKClient,
         clientOptions: {
             region: regionCode,
             endpoint: endpoint,
             token: tokenProvider,
-            retryStrategy: new StandardRetryStrategy(maxRetries),
         },
     })
 }
@@ -262,10 +259,9 @@ export async function createClient(
     connection: SsoConnection,
     regionCode = getCodeCatalystConfig().region,
     endpoint = getCodeCatalystConfig().endpoint,
-    maxRetries: number = 5,
     authOptions: AuthOptions = {}
 ): Promise<CodeCatalystClient> {
-    const sdkv3Client = createCodeCatalystClientV3(getTokenProvider(connection), regionCode, endpoint, maxRetries)
+    const sdkv3Client = createCodeCatalystClientV3(getTokenProvider(connection), regionCode, endpoint)
     const c = new CodeCatalystClientInternal(connection, sdkv3Client, regionCode)
     try {
         await c.verifySession()

packages/core/src/testE2E/codecatalyst/client.test.ts

@@ -192,7 +192,7 @@ describe('Test how this codebase uses the CodeCatalyst API', function () {
             assert.strictEqual(actualDevEnv.org.name, spaceName)
             assert.strictEqual(actualDevEnv.alias, differentDevEnvSettings.alias)
             assert.strictEqual(actualDevEnv.instanceType, 'dev.standard1.medium')
-            assert.strictEqual(actualDevEnv.persistentStorage && actualDevEnv.persistentStorage.sizeInGiB, 32)
+            assert.ok(actualDevEnv.persistentStorage && actualDevEnv.persistentStorage.sizeInGiB === 32)
         })
 
         it.skip('creates a Dev Environment using an existing branch', async function () {
@@ -429,9 +429,7 @@ describe('Test how this codebase uses the CodeCatalyst API', function () {
      */
     async function createTestCodeCatalystClient(auth: Auth): Promise<CodeCatalystClient> {
         const conn = await useCodeCatalystSsoConnection(auth)
-        // Add retries for tests since many may be running in parallel in github CI.
-        // AWS SDK adds jitter automatically.
-        return await createCodeCatalystClient(conn, undefined, undefined, 5)
+        return await createCodeCatalystClient(conn, undefined, undefined)
     }
 
     /**