dont use waitUntil

Author: Hweinstock

packages/core/src/awsService/ec2/sshKeyPair.ts

@@ -6,7 +6,7 @@ import os from 'os'
 import { fs, globals } from '../../shared'
 import { ToolkitError } from '../../shared/errors'
 import { tryRun } from '../../shared/utilities/pathFind'
-import { Timeout, waitUntil } from '../../shared/utilities/timeoutUtils'
+import { Timeout } from '../../shared/utilities/timeoutUtils'
 import { findAsync } from '../../shared/utilities/collectionUtils'
 import { RunParameterContext } from '../../shared/utilities/processUtils'
 
@@ -37,19 +37,8 @@ export class SshKeyPair {
         if (!keyGenerated) {
             throw new ToolkitError('ec2: Unable to generate ssh key pair with either ed25519 or rsa')
         }
-        // waitUntil avoids Windows race condition of using key right after creation.
-        const maxRetries = 5
-        await waitUntil(
-            async () => {
-                return await fs.exists(keyPath)
-            },
-            { maxRetries: maxRetries }
-        )
-
         if (!(await fs.exists(keyPath))) {
-            throw new ToolkitError(
-                `ec2: Failed to generate keys, resulting key not found at ${keyPath} after ${maxRetries} tries`
-            )
+            throw new ToolkitError(`ec2: Failed to generate keys, resulting key not found at ${keyPath}`)
         }
     }
 

packages/core/src/shared/utilities/timeoutUtils.ts

@@ -191,8 +191,6 @@ interface WaitUntilOptions {
     readonly interval?: number
     /** Wait for "truthy" result, else wait for any defined result including `false` (default: true) */
     readonly truthy?: boolean
-    /** Max retries (default: unlimited) */
-    readonly maxRetries?: number
 }
 
 /**
@@ -205,7 +203,7 @@ interface WaitUntilOptions {
  */
 export async function waitUntil<T>(fn: () => Promise<T>, options: WaitUntilOptions): Promise<T | undefined> {
     const opt = { timeout: 5000, interval: 500, truthy: true, ...options }
-    for (let i = 0; options.maxRetries ?? true; i++) {
+    for (let i = 0; true; i++) {
         const start: number = globals.clock.Date.now()
         let result: T