migrate next chunk of files

Author: Hweinstock

packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts

@@ -6,11 +6,9 @@
 import assert from 'assert'
 import * as os from 'os'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as vscode from 'vscode'
 import * as sampleDotNetSamProgram from './sampleDotNetSamProgram'
 
-import { writeFile } from 'fs-extra'
 import {
     DotNetLambdaHandlerComponents,
     generateDotNetLambdaHandler,
@@ -19,6 +17,7 @@ import {
     isValidLambdaHandler,
 } from '../../../shared/codelens/csharpCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
 
 const fakeRange = new vscode.Range(0, 0, 0, 0)
 
@@ -31,12 +30,12 @@ describe('getLambdaHandlerComponents', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder)
     })
 
     it('Detects a public function symbol', async function () {
         const programFile = path.join(tempFolder, 'program.cs')
-        await writeFile(programFile, sampleDotNetSamProgram.getFunctionText())
+        await fs.writeFile(programFile, sampleDotNetSamProgram.getFunctionText())
 
         const textDoc = await vscode.workspace.openTextDocument(programFile)
         const documentSymbols = sampleDotNetSamProgram.getDocumentSymbols()

packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts

@@ -5,12 +5,11 @@
 
 import assert from 'assert'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as vscode from 'vscode'
 
-import { writeFile } from 'fs-extra'
 import { isValidFuncSignature } from '../../../shared/codelens/goCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
 
 describe('getLambdaHandlerCandidates', async function () {
     let tempFolder: string
@@ -23,12 +22,12 @@ describe('getLambdaHandlerCandidates', async function () {
         programFile = path.join(tempFolder, 'program.go')
         dummyMod = path.join(tempFolder, 'go.mod')
 
-        await writeFile(programFile, getFunctionText())
-        await writeFile(dummyMod, 'require github.com/aws/aws-lambda-go v1.13.3\nmodule hello-world\ngo 1.14')
+        await fs.writeFile(programFile, getFunctionText())
+        await fs.writeFile(dummyMod, 'require github.com/aws/aws-lambda-go v1.13.3\nmodule hello-world\ngo 1.14')
     })
 
     after(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder)
     })
 
     it('Detects only good function symbols from a mock program', async function () {

packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts

@@ -4,7 +4,6 @@
  */
 
 import assert from 'assert'
-import * as fs from 'fs-extra'
 import * as os from 'os'
 import * as path from 'path'
 import * as vscode from 'vscode'
@@ -17,6 +16,7 @@ import {
 } from '../../../shared/codelens/javaCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import * as SampleJavaSamProgram from './sampleJavaSamProgram'
+import { fs } from '../../../shared'
 
 const fakeRange = new vscode.Range(0, 0, 0, 0)
 
@@ -30,7 +30,7 @@ describe('javaCodeLensProvider', () => {
         })
 
         afterEach(async () => {
-            await fs.remove(tempFolder)
+            await fs.delete(tempFolder)
         })
 
         it('Detects a public function symbol', async function () {

packages/core/src/test/shared/codelens/localLambdaRunner.test.ts

@@ -5,7 +5,6 @@
 
 import assert from 'assert'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
 import * as fsUtils from '../../../shared/filesystemUtilities'
 import { SamCliBuildInvocation, SamCliBuildInvocationArguments } from '../../../shared/sam/cli/samCliBuild'
 import * as localLambdaRunner from '../../../shared/sam/localLambdaRunner'
@@ -14,6 +13,7 @@ import { FakeExtensionContext } from '../../fakeExtensionContext'
 import { SamLaunchRequestArgs } from '../../../shared/sam/debugger/awsSamDebugger'
 import { assertLogsContain } from '../../globalSetup.test'
 import { ToolkitError } from '../../../shared/errors'
+import { fs } from '../../../shared'
 
 describe('localLambdaRunner', async function () {
     let tempDir: string
@@ -26,7 +26,7 @@ describe('localLambdaRunner', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempDir)
+        await fs.delete(tempDir)
     })
 
     describe('attachDebugger', async function () {

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

@@ -4,7 +4,6 @@
  */
 
 import assert from 'assert'
-import * as fs from 'fs-extra'
 import * as path from 'path'
 import * as sinon from 'sinon'
 
@@ -20,6 +19,7 @@ import { UserCredentialsUtils } from '../../../shared/credentials/userCredential
 import { EnvironmentVariables } from '../../../shared/environmentVariables'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { getConfigFilename, getCredentialsFilename } from '../../../auth/credentials/sharedCredentialsFile'
+import { fs } from '../../../shared'
 
 describe('UserCredentialsUtils', function () {
     let tempFolder: string
@@ -35,17 +35,14 @@ describe('UserCredentialsUtils', function () {
     })
 
     afterEach(async function () {
-        if (fs.existsSync(defaultConfigFileName)) {
-            await fs.rm(defaultConfigFileName)
-        }
-        if (fs.existsSync(defaultCredentialsFilename)) {
-            await fs.rm(defaultCredentialsFilename)
-        }
+        await fs.delete(defaultConfigFileName)
+        await fs.delete(defaultCredentialsFilename)
+
         sinon.restore()
     })
 
     after(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder)
     })
 
     describe('findExistingCredentialsFilenames', function () {
@@ -58,8 +55,8 @@ describe('UserCredentialsUtils', function () {
                 AWS_CONFIG_FILE: configFilename,
             } as EnvironmentVariables)
 
-            createCredentialsFile(credentialsFilename, ['default'])
-            createCredentialsFile(configFilename, ['default'])
+            await createCredentialsFile(credentialsFilename, ['default'])
+            await createCredentialsFile(configFilename, ['default'])
 
             const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
             assert.strictEqual(foundFiles.length, 2)
@@ -74,7 +71,7 @@ describe('UserCredentialsUtils', function () {
                 AWS_CONFIG_FILE: configFilename,
             } as EnvironmentVariables)
 
-            createCredentialsFile(credentialsFilename, ['default'])
+            await createCredentialsFile(credentialsFilename, ['default'])
 
             const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
             assert.strictEqual(foundFiles.length, 1)
@@ -90,7 +87,7 @@ describe('UserCredentialsUtils', function () {
                 AWS_CONFIG_FILE: configFilename,
             } as EnvironmentVariables)
 
-            createCredentialsFile(configFilename, ['default'])
+            await createCredentialsFile(configFilename, ['default'])
 
             const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
             assert.strictEqual(foundFiles.length, 1)
@@ -124,7 +121,7 @@ describe('UserCredentialsUtils', function () {
                 profileName: profileName,
                 secretKey: 'ABC',
             }
-            createCredentialsFile(credentialsFilename, [profileName])
+            await createCredentialsFile(credentialsFilename, [profileName])
             await UserCredentialsUtils.generateCredentialsFile(creds)
 
             const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
@@ -144,10 +141,9 @@ describe('UserCredentialsUtils', function () {
                 creds.secretKey,
                 `creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
             )
-            await fs.access(credentialsFilename, fs.constants.R_OK).catch((_err) => assert(false, 'Should be readable'))
-            await fs
-                .access(credentialsFilename, fs.constants.W_OK)
-                .catch((_err) => assert(false, 'Should be writeable'))
+
+            assert.ok(await fs.checkPerms(credentialsFilename, 'r--'))
+            assert.ok(await fs.checkPerms(credentialsFilename, '-w-'))
         })
     })
 
@@ -156,7 +152,7 @@ describe('UserCredentialsUtils', function () {
             const credentialsFilename = path.join(tempFolder, 'credentials-generation-test')
             const profileName = 'someRandomProfileName'
 
-            createCredentialsFile(credentialsFilename, [profileName])
+            await createCredentialsFile(credentialsFilename, [profileName])
 
             const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
             const profile = getSectionDataOrThrow(
@@ -168,7 +164,7 @@ describe('UserCredentialsUtils', function () {
         })
     })
 
-    function createCredentialsFile(filename: string, profileNames: string[]): void {
+    async function createCredentialsFile(filename: string, profileNames: string[]): Promise<void> {
         let fileContents = ''
 
         profileNames.forEach((profileName) => {
@@ -179,6 +175,6 @@ REGION = us-weast-3
 `
         })
 
-        fs.writeFileSync(filename, fileContents)
+        await fs.writeFile(filename, fileContents)
     }
 })

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

@@ -19,6 +19,7 @@ import { extensionVersion } from '../../shared/vscode/env'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import globals from '../../shared/extensionGlobals'
 import { createQuickStartWebview } from '../../shared/extensionStartup'
+import { fs } from '../../shared'
 
 describe('extensionUtilities', function () {
     describe('createQuickStartWebview', async function () {
@@ -33,7 +34,7 @@ describe('extensionUtilities', function () {
 
         afterEach(async function () {
             if (tempDir) {
-                await remove(tempDir)
+                await fs.delete(tempDir)
             }
         })
 
@@ -44,7 +45,7 @@ describe('extensionUtilities', function () {
         it('returns a webview with unaltered text if a valid file is passed without tokens', async function () {
             const filetext = 'this temp page does not have any tokens'
             const filepath = 'tokenless'
-            await writeFile(path.join(context.extensionPath, filepath), filetext)
+            await fs.writeFile(path.join(context.extensionPath, filepath), filetext)
             const webview = await createQuickStartWebview(context, filepath)
 
             assert.strictEqual(typeof webview, 'object')
@@ -57,7 +58,7 @@ describe('extensionUtilities', function () {
             const basetext = 'this temp page has tokens: '
             const filetext = basetext + token
             const filepath = 'tokenless'
-            await writeFile(path.join(context.extensionPath, filepath), filetext)
+            await fs.writeFile(path.join(context.extensionPath, filepath), filetext)
             const webview = await createQuickStartWebview(context, filepath)
 
             assert.strictEqual(typeof webview, 'object')

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

@@ -5,7 +5,6 @@
 
 import assert from 'assert'
 import * as os from 'os'
-import { writeFile, remove } from 'fs-extra'
 import * as path from 'path'
 import {
     fileExists,
@@ -15,6 +14,7 @@ import {
     makeTemporaryToolkitFolder,
     tempDirPath,
 } from '../../shared/filesystemUtilities'
+import { fs } from '../../shared'
 
 describe('filesystemUtilities', function () {
     const targetFilename = 'findThisFile12345.txt'
@@ -27,14 +27,14 @@ describe('filesystemUtilities', function () {
         tempFolder = await makeTemporaryToolkitFolder()
         targetFilePath = path.join(tempFolder, targetFilename)
 
-        await writeFile(targetFilePath, 'Hello, World!', 'utf8')
+        await fs.writeFile(targetFilePath, 'Hello, World!', 'utf8')
 
         foldersToCleanUp.push(tempFolder)
     })
 
     afterEach(async function () {
         for (const folder of foldersToCleanUp) {
-            await remove(folder)
+            await fs.delete(folder)
         }
     })
 
@@ -45,17 +45,17 @@ describe('filesystemUtilities', function () {
         })
         it(`returns a filename that does not exist in the directory`, async function () {
             const dir = tempFolder
-            await writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-0.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-2.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-0.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-2.txt'), '', 'utf8')
             assert.strictEqual(await getNonexistentFilename(dir, 'foo', '.txt', 99), 'foo-3.txt')
             assert.strictEqual(await getNonexistentFilename(dir, 'foo', '', 99), 'foo')
         })
         it(`returns "foo-RANDOM.txt" if max is reached`, async function () {
             const dir = tempFolder
-            await writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
             // Looks like "foo-75446d5d.txt".
             assert.ok(/^foo-[a-fA-F0-9]{8}.txt$/.test(await getNonexistentFilename(dir, 'foo', '.txt', 1)))
         })

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

@@ -6,8 +6,6 @@
 import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-
 import {
     CloudFormationTemplateRegistry,
     getResourcesForHandler,
@@ -18,6 +16,7 @@ import { badYaml, makeSampleSamTemplateYaml, strToYamlFile } from '../cloudforma
 import { assertEqualPaths, toFile } from '../../testUtil'
 import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
 import { WatchedItem } from '../../../shared/fs/watchedFiles'
+import { fs } from '../../../shared'
 
 // TODO almost all of these tests should be moved to test WatchedFiles instead
 describe('CloudFormation Template Registry', async function () {
@@ -33,7 +32,7 @@ describe('CloudFormation Template Registry', async function () {
         })
 
         afterEach(async function () {
-            await fs.remove(tempFolder)
+            await fs.delete(tempFolder)
         })
 
         describe('addItem', async function () {
@@ -349,7 +348,7 @@ describe('CloudFormation Template Registry', async function () {
         })
 
         afterEach(async function () {
-            await fs.remove(tempFolder)
+            await fs.delete(tempFolder)
         })
 
         const resource: {

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

@@ -4,11 +4,11 @@
  */
 
 import assert from 'assert'
-import * as fs from 'fs-extra'
 import * as path from 'path'
 import { Uri, ThemeIcon } from 'vscode'
 import { codicon, getIcon } from '../../shared/icons'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
+import { fs } from '../../shared'
 
 describe('getIcon', function () {
     it('returns a ThemeIcon for `vscode` codicons', function () {
@@ -68,7 +68,7 @@ describe('getIcon', function () {
 
         try {
             for (const p of paths) {
-                await fs.mkdirp(path.dirname(p))
+                await fs.mkdir(path.dirname(p))
                 await fs.writeFile(p, '<svg></svg>')
             }
 
@@ -87,7 +87,7 @@ describe('getIcon', function () {
         const logoPath = path.join(tempDir, 'aws', 'cdk', 'logo.svg')
 
         try {
-            await fs.mkdirp(path.dirname(logoPath))
+            await fs.mkdir(path.dirname(logoPath))
             await fs.writeFile(logoPath, '<svg></svg>')
 
             const icon = getIcon('aws-cdk-logo', false, tempDir)