bake timeout into the fs module

Author: Hweinstock

packages/core/src/shared/credentials/userCredentialsUtils.ts

@@ -9,8 +9,6 @@ import { fileExists } from '../filesystemUtilities'
 import { isNonNullable } from '../utilities/tsUtils'
 import { getConfigFilename, getCredentialsFilename } from '../../auth/credentials/sharedCredentialsFile'
 import { fs } from '../../shared/fs/fs'
-import { waitUntil } from '../utilities/timeoutUtils'
-import { isWin } from '../vscode/env'
 
 const header = `
 # AWS credentials file used by AWS CLI, SDKs, and tools.
@@ -100,9 +98,5 @@ export class UserCredentialsUtils {
         }
 
         await fs.writeFile(dest, contents.join('\n'))
-        // Windows Race condition with writing files.
-        if (isWin()) {
-            await waitUntil(() => fs.exists(dest), { timeout: 5000, interval: 100 })
-        }
     }
 }

packages/core/src/shared/fs/fs.ts

@@ -304,6 +304,9 @@ export class FileSystem {
         }
 
         await write(uri)
+        if (isWin()) {
+            await waitUntil(async () => await fs.exists(uri), { timeout: 5000, truthy: true })
+        }
     }
 
     /**
@@ -428,7 +431,7 @@ export class FileSystem {
             })
         }
 
-        return vfs.delete(uri, opt).then(undefined, async (err) => {
+        vfs.delete(uri, opt).then(undefined, async (err) => {
             const notFound = isFileNotFoundError(err)
 
             if (notFound && opt.force) {
@@ -461,6 +464,11 @@ export class FileSystem {
 
             throw err
         })
+
+        // Windows race condition
+        if (isWin()) {
+            await waitUntil(async () => !(await fs.exists(fileOrDir)), { timeout: 5000, truthy: true })
+        }
     }
 
     async readdir(uri: vscode.Uri | string): Promise<[string, vscode.FileType][]> {