add recursive option

Hweinstock · Hweinstock · commit 5d6b5f7a6948 · 2024-10-02T16:54:20.000-04:00
diff --git a/packages/core/src/test/awsService/cdk/detectCdkProjects.test.ts b/packages/core/src/test/awsService/cdk/detectCdkProjects.test.ts
@@ -44,7 +44,7 @@ describe('detectCdkProjects', function () {
 
     afterEach(async function () {
         for (const path of workspacePaths) {
-            await fs.delete(path)
+            await fs.delete(path, { recursive: true })
         }
 
         workspacePaths.length = 0
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
@@ -46,7 +46,7 @@ describe('saveCurrentLogDataContent', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempDir)
+        await fs.delete(tempDir, { recursive: true })
     })
 
     it('saves log content to a file', async function () {
diff --git a/packages/core/src/test/awsService/ec2/sshKeyPair.test.ts b/packages/core/src/test/awsService/ec2/sshKeyPair.test.ts
@@ -35,7 +35,7 @@ describe('SshKeyUtility', async function () {
     })
 
     after(async function () {
-        await fs.delete(temporaryDirectory, { recursive: true, force: true })
+        await fs.delete(temporaryDirectory, { recursive: true })
         clock.uninstall()
         sinon.restore()
     })
diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts
@@ -48,7 +48,7 @@ describe('transformByQ', function () {
 
     afterEach(async function () {
         sinon.restore()
-        await fs.delete(tempDir)
+        await fs.delete(tempDir, { recursive: true })
     })
 
     it('WHEN converting short duration in milliseconds THEN converts correctly', async function () {
diff --git a/packages/core/src/test/credentials/sharedCredentials.test.ts b/packages/core/src/test/credentials/sharedCredentials.test.ts
@@ -26,7 +26,7 @@ describe('sharedCredentials', function () {
     })
 
     after(async function () {
-        await fs.delete(tempFolder, { force: true, recursive: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     describe('getCredentialsFilename', function () {
diff --git a/packages/core/src/test/dynamicResources/awsResourceManager.test.ts b/packages/core/src/test/dynamicResources/awsResourceManager.test.ts
@@ -71,7 +71,7 @@ describe('ResourceManager', function () {
         registerMappingSpy.restore()
         sandbox.restore()
         await resourceManager.dispose()
-        await fs.delete(tempFolder, { recursive: true, force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('opens resources in preview mode', async function () {
diff --git a/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts b/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
@@ -353,7 +353,7 @@ describe('SchemaCodeDownload', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -450,7 +450,7 @@ describe('CodeExtractor', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(destinationDirectory)
+        await fs.delete(destinationDirectory, { recursive: true })
         sandbox.restore()
     })
 
@@ -525,7 +525,7 @@ describe('CodeExtractor', function () {
 
         afterEach(async function () {
             sandbox.restore()
-            await fs.delete(destinationDirectory)
+            await fs.delete(destinationDirectory, { recursive: true })
         })
 
         it('should extract files if no collision present', async function () {
diff --git a/packages/core/src/test/lambda/commands/createNewSamApp.test.ts b/packages/core/src/test/lambda/commands/createNewSamApp.test.ts
@@ -80,7 +80,7 @@ describe('createNewSamApp', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
         const r = await globals.templateRegistry
         r.reset()
     })
@@ -93,7 +93,7 @@ describe('createNewSamApp', function () {
             )
         })
         it('returns the target ".yml" file when it exists', async function () {
-            await fs.delete(fakeTarget)
+            await fs.delete(fakeTarget, { recursive: true })
             tempTemplate = vscode.Uri.file(path.join(tempFolder, 'test.yml'))
             fakeTarget = path.join(tempFolder, 'template.yml')
             await testutil.toFile('target file', fakeTarget)
diff --git a/packages/core/src/test/lambda/commands/deploySamApplication.test.ts b/packages/core/src/test/lambda/commands/deploySamApplication.test.ts
@@ -158,7 +158,7 @@ describe('deploySamApplication', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempToolkitFolder, { force: true })
+        await fs.delete(tempToolkitFolder, { recursive: true })
     })
 
     it('deploys with the happy path', async function () {
diff --git a/packages/core/src/test/lambda/commands/uploadLambda.test.ts b/packages/core/src/test/lambda/commands/uploadLambda.test.ts
@@ -34,7 +34,7 @@ describe('uploadLambda', async function () {
         folderUri = vscode.Uri.file(tempFolder)
     })
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('finds application.json file from dir path - flat', async function () {
diff --git a/packages/core/src/test/lambda/config/templates.test.ts b/packages/core/src/test/lambda/config/templates.test.ts
@@ -784,7 +784,7 @@ describe('getExistingConfiguration', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
         const r = await globals.templateRegistry
         r.reset()
     })
diff --git a/packages/core/src/test/lambda/local/debugConfiguration.test.ts b/packages/core/src/test/lambda/local/debugConfiguration.test.ts
@@ -35,7 +35,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     async function makeFakeSamLaunchConfig() {
diff --git a/packages/core/src/test/lambda/wizards/uploadLambdaWizard.test.ts b/packages/core/src/test/lambda/wizards/uploadLambdaWizard.test.ts
@@ -58,7 +58,7 @@ describe('UploadLambdaWizard', function () {
             tester = await createWizardTester(new UploadLambdaWizard(undefined, invokePath))
         })
         afterEach(async function () {
-            await fs.delete(tempDir, { force: true })
+            await fs.delete(tempDir, { recursive: true })
         })
 
         it('skip select directory, auto selected', function () {
@@ -84,7 +84,7 @@ describe('UploadLambdaWizard', function () {
             tester = await createWizardTester(new UploadLambdaWizard(undefined, invokePath))
         })
         afterEach(async function () {
-            await fs.delete(tempDir, { force: true })
+            await fs.delete(tempDir, { recursive: true })
         })
 
         it('skip select directory, auto selected', function () {
diff --git a/packages/core/src/test/shared/cloudformation/cloudformation.test.ts b/packages/core/src/test/shared/cloudformation/cloudformation.test.ts
@@ -30,7 +30,7 @@ describe('CloudFormation', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(filename, { force: true })
+        await fs.delete(filename, { recursive: true })
     })
 
     it('isValidFilename()', async function () {
diff --git a/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts
@@ -30,7 +30,7 @@ describe('getLambdaHandlerComponents', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('Detects a public function symbol', async function () {
diff --git a/packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts
@@ -27,7 +27,7 @@ describe('getLambdaHandlerCandidates', async function () {
     })
 
     after(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('Detects only good function symbols from a mock program', async function () {
diff --git a/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts
@@ -30,7 +30,7 @@ describe('javaCodeLensProvider', () => {
         })
 
         afterEach(async () => {
-            await fs.delete(tempFolder, { force: true })
+            await fs.delete(tempFolder, { recursive: true })
         })
 
         it('Detects a public function symbol', async function () {
diff --git a/packages/core/src/test/shared/codelens/localLambdaRunner.test.ts b/packages/core/src/test/shared/codelens/localLambdaRunner.test.ts
@@ -26,7 +26,7 @@ describe('localLambdaRunner', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempDir, { force: true })
+        await fs.delete(tempDir, { recursive: true })
     })
 
     describe('attachDebugger', async function () {
diff --git a/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts
@@ -42,7 +42,7 @@ describe('UserCredentialsUtils', function () {
     })
 
     after(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     describe('findExistingCredentialsFilenames', function () {
diff --git a/packages/core/src/test/shared/extensionUtilities.test.ts b/packages/core/src/test/shared/extensionUtilities.test.ts
@@ -34,7 +34,7 @@ describe('extensionUtilities', function () {
 
         afterEach(async function () {
             if (tempDir) {
-                await fs.delete(tempDir, { recursive: true, force: true })
+                await fs.delete(tempDir, { recursive: true })
             }
         })
 
diff --git a/packages/core/src/test/shared/filesystemUtilities.test.ts b/packages/core/src/test/shared/filesystemUtilities.test.ts
@@ -34,7 +34,7 @@ describe('filesystemUtilities', function () {
 
     afterEach(async function () {
         for (const folder of foldersToCleanUp) {
-            await fs.delete(folder, { force: true })
+            await fs.delete(folder, { recursive: true })
         }
     })
 
diff --git a/packages/core/src/test/shared/fs/fs.test.ts b/packages/core/src/test/shared/fs/fs.test.ts
@@ -348,7 +348,7 @@ describe('FileSystem', function () {
             const dir = await testFolder.mkdir()
             const f = path.join(dir, 'missingfile.txt')
             assert(!existsSync(f))
-            await fs.delete(f)
+            await fs.delete(f, { recursive: true })
         })
 
         it('error if file *and* its parent dir not found', async function () {
diff --git a/packages/core/src/test/shared/fs/templateRegistry.test.ts b/packages/core/src/test/shared/fs/templateRegistry.test.ts
@@ -32,7 +32,7 @@ describe('CloudFormation Template Registry', async function () {
         })
 
         afterEach(async function () {
-            await fs.delete(tempFolder, { force: true })
+            await fs.delete(tempFolder, { recursive: true })
         })
 
         describe('addItem', async function () {
@@ -348,7 +348,7 @@ describe('CloudFormation Template Registry', async function () {
         })
 
         afterEach(async function () {
-            await fs.delete(tempFolder)
+            await fs.delete(tempFolder, { recursive: true })
         })
 
         const resource: {
diff --git a/packages/core/src/test/shared/logger/activation.test.ts b/packages/core/src/test/shared/logger/activation.test.ts
@@ -27,7 +27,7 @@ describe('makeLogger', function () {
         }
 
         testLogger = undefined
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { force: true, recursive: true })
     })
 
     it('creates a logger object', function () {
diff --git a/packages/core/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts b/packages/core/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
@@ -17,7 +17,7 @@ describe('FileResourceFetcher', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('loads the contents of a file', async function () {
diff --git a/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts b/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts
@@ -54,7 +54,7 @@ describe('SamCliBuildInvocation', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('invokes `sam build` with args', async function () {
diff --git a/packages/core/src/test/shared/sam/cli/samCliConfiguration.test.ts b/packages/core/src/test/shared/sam/cli/samCliConfiguration.test.ts
@@ -20,7 +20,7 @@ describe('samCliConfiguration', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('uses config value when referencing file that exists', async function () {
diff --git a/packages/core/src/test/shared/sam/cli/samCliLocalInvoke.test.ts b/packages/core/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
@@ -39,7 +39,7 @@ describe('SamCliLocalInvokeInvocation', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('invokes `sam local` with args', async function () {
diff --git a/packages/core/src/test/shared/sam/cli/samCliStartApi.test.ts b/packages/core/src/test/shared/sam/cli/samCliStartApi.test.ts
@@ -25,7 +25,7 @@ describe('SamCliStartApi', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('invokes `sam local start-api` with correct args', async function () {
diff --git a/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts b/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
@@ -163,9 +163,9 @@ describe('SamDebugConfigurationProvider', async function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
         if (tempFolderSimilarName) {
-            await fs.delete(tempFolderSimilarName)
+            await fs.delete(tempFolderSimilarName, { recursive: true })
         }
         ;(await globals.templateRegistry).reset()
         sandbox.restore()
@@ -3305,7 +3305,7 @@ describe('debugConfiguration', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
         const r = await globals.templateRegistry
         r.reset()
     })
diff --git a/packages/core/src/test/shared/telemetry/telemetryService.test.ts b/packages/core/src/test/shared/telemetry/telemetryService.test.ts
@@ -67,7 +67,7 @@ describe('TelemetryService', function () {
     })
 
     afterEach(async function () {
-        await fs.delete(service.persistFilePath)
+        await fs.delete(service.persistFilePath, { recursive: true })
         sandbox.restore()
         clock.uninstall()
     })
diff --git a/packages/core/src/test/shared/utilities/cliUtils.test.ts b/packages/core/src/test/shared/utilities/cliUtils.test.ts
@@ -15,7 +15,7 @@ import { fs } from '../../../shared'
 
 describe('cliUtils', async function () {
     afterEach(async function () {
-        await fs.delete(path.join(globals.context.globalStorageUri.fsPath, 'tools'), { force: true })
+        await fs.delete(path.join(globals.context.globalStorageUri.fsPath, 'tools'), { recursive: true, force: true })
     })
 
     describe('installCli', async function () {
diff --git a/packages/core/src/test/shared/utilities/osUtils.test.ts b/packages/core/src/test/shared/utilities/osUtils.test.ts
@@ -21,7 +21,7 @@ describe('isNewOsSession', () => {
 
             // Mimic a fresh restart (/tmp/ folder is deleted)
             const files = await fs.readdir(tmpDir)
-            await Promise.all(files.map(async (file) => await fs.delete(`${tmpDir}/${file[0]}`)))
+            await Promise.all(files.map(async (file) => await fs.delete(`${tmpDir}/${file[0]}`), { recursive: true }))
 
             // Since the tmp/ folder was cleared it is considered a new session
             assert.strictEqual(await isNewOsSession(tmpDir), true)
diff --git a/packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts b/packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts
@@ -47,7 +47,7 @@ describe('transformByQ', async function () {
 
     after(async function () {
         if (tempDir !== '') {
-            await fs.delete(tempDir)
+            await fs.delete(tempDir, { recursive: true })
         }
     })
 
diff --git a/packages/core/src/testE2E/codewhisperer/securityScan.test.ts b/packages/core/src/testE2E/codewhisperer/securityScan.test.ts
@@ -64,7 +64,7 @@ describe('CodeWhisperer security scan', async function () {
 
     afterEach(async function () {
         if (tempFolder !== undefined) {
-            await fs.delete(tempFolder)
+            await fs.delete(tempFolder, { recursive: true })
         }
     })
 
diff --git a/packages/core/src/testInteg/cloudformation/templateRegistry.test.ts b/packages/core/src/testInteg/cloudformation/templateRegistry.test.ts
@@ -37,7 +37,7 @@ describe('CloudFormation Template Registry', async function () {
 
     afterEach(async function () {
         registry.dispose()
-        await fs.delete(testDir)
+        await fs.delete(testDir, { recursive: true })
     })
 
     it('adds initial template files with yaml and yml extensions at various nesting levels', async function () {
@@ -99,7 +99,7 @@ describe('CloudFormation Template Registry', async function () {
 
         await registryHasTargetNumberOfFiles(registry, 1)
 
-        await fs.delete(filepath)
+        await fs.delete(filepath, { recursive: true })
 
         await registryHasTargetNumberOfFiles(registry, 0)
     })
diff --git a/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts
diff --git a/packages/core/src/testInteg/stepFunctions/visualizeStateMachine.test.ts b/packages/core/src/testInteg/stepFunctions/visualizeStateMachine.test.ts

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ describe('detectCdkProjects', function () {`
`44`	`44`
`45`	`45`	`afterEach(async function () {`
`46`	`46`	`for (const path of workspacePaths) {`
`47`		`- await fs.delete(path)`
	`47`	`+ await fs.delete(path, { recursive: true })`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`workspacePaths.length = 0`