fix: add back retry logic so that tests can run

Author: Hweinstock

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

@@ -40,6 +40,7 @@ import { DevSettings } from '../settings'
 import { getServiceEnvVarConfig } from '../vscode/env'
 import { AwsCommand } from '../awsClientBuilderV3'
 import { ClientWrapper } from './clientWrapper'
+import { StandardRetryStrategy } from '@smithy/util-retry'
 
 export interface CodeCatalystConfig {
     readonly region: string
@@ -137,13 +138,15 @@ function toBranch(
 async function createCodeCatalystClient(
     connection: SsoConnection,
     regionCode: string,
-    endpoint: string
+    endpoint: string,
+    maxRetries: number
 ): Promise<CodeCatalyst> {
     const c = await globals.sdkClientBuilder.createAwsService(CodeCatalyst, {
         region: regionCode,
         correctClockSkew: true,
         endpoint: endpoint,
         token: new TokenProvider(connection),
+        maxRetries,
     } as ServiceConfigurationOptions)
 
     return c
@@ -152,14 +155,16 @@ async function createCodeCatalystClient(
 function createCodeCatalystClientV3(
     connection: SsoConnection,
     regionCode: string,
-    endpoint: string
+    endpoint: string,
+    maxRetries: number
 ): CodeCatalystSDKClient {
     return globals.sdkClientBuilderV3.createAwsService({
         serviceClient: CodeCatalystSDKClient,
         clientOptions: {
             region: regionCode,
             endpoint: endpoint,
             token: new TokenProvider(connection),
+            retryStrategy: new StandardRetryStrategy(maxRetries),
         },
     })
 }
@@ -192,10 +197,11 @@ export async function createClient(
     connection: SsoConnection,
     regionCode = getCodeCatalystConfig().region,
     endpoint = getCodeCatalystConfig().endpoint,
+    maxRetries: number = 1,
     authOptions: AuthOptions = {}
 ): Promise<CodeCatalystClient> {
-    const sdkClient = await createCodeCatalystClient(connection, regionCode, endpoint)
-    const sdkv3Client = createCodeCatalystClientV3(connection, regionCode, endpoint)
+    const sdkClient = await createCodeCatalystClient(connection, regionCode, endpoint, maxRetries)
+    const sdkv3Client = createCodeCatalystClientV3(connection, regionCode, endpoint, maxRetries)
     const c = new CodeCatalystClientInternal(connection, sdkClient, sdkv3Client)
     try {
         await c.verifySession()

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

@@ -386,7 +386,7 @@ abstract class TestClientBase implements AwsClient {
     public middlewareStack: { add: MiddlewareStack<any, MetadataBearer>['add'] } = {
         add: (_: any, __: any) => {},
     }
-    public async send(command: AwsCommand, options?: any): Promise<any> {}
+    public async send(command: AwsCommand<object, object>, options?: any): Promise<any> {}
     public destroy(): void {}
 }
 

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

@@ -425,15 +425,9 @@ describe('Test how this codebase uses the CodeCatalyst API', function () {
      */
     async function createTestCodeCatalystClient(auth: Auth): Promise<CodeCatalystClient> {
         const conn = await useCodeCatalystSsoConnection(auth)
-        return await createCodeCatalystClient(conn, undefined, undefined, {
-            // Add retries for tests since many may be running in parallel in github CI.
-            // AWS SDK adds jitter automatically.
-            // https://github.com/aws/aws-sdk-js/blob/3e616251947c73d5239178c167a9d73d985ca581/lib/util.js#L884
-            retryDelayOptions: {
-                base: 1200, // ms
-            },
-            maxRetries: 5,
-        })
+        // 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)
     }
 
     /**