finish replacements

Author: Hweinstock

packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts

@@ -4,11 +4,11 @@
  */
 import assert from 'assert'
 import sinon from 'sinon'
-import fs from 'fs-extra'
 import os from 'os'
 import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
 import path from 'path'
 import { getTestResourceFilePath } from './amazonQGumbyUtil'
+import { fs } from 'aws-core-vscode/shared'
 
 describe('DiffModel', function () {
     afterEach(() => {
@@ -20,7 +20,7 @@ describe('DiffModel', function () {
 
         const workspacePath = 'workspace'
 
-        sinon.replace(fs, 'existsSync', (path) => {
+        sinon.replace(fs, 'exists', async (path) => {
             const pathStr = path.toString()
             if (pathStr.includes(workspacePath)) {
                 return false
@@ -42,9 +42,9 @@ describe('DiffModel', function () {
 
         const workspacePath = os.tmpdir()
 
-        sinon.replace(fs, 'existsSync', (path) => true)
+        sinon.replace(fs, 'exists', async (path) => true)
 
-        fs.writeFileSync(
+        await fs.writeFile(
             path.join(workspacePath, 'README.md'),
             'This guide walks you through using Gradle to build a simple Java project.'
         )
@@ -56,6 +56,6 @@ describe('DiffModel', function () {
 
         assert.strictEqual(change instanceof ModifiedChangeNode, true)
 
-        fs.rmSync(path.join(workspacePath, 'README.md'))
+        await fs.delete(path.join(workspacePath, 'README.md'))
     })
 })

packages/core/src/test/stepFunctions/utils.test.ts

@@ -5,12 +5,12 @@
 
 import assert from 'assert'
 import { IAM } from 'aws-sdk'
-import * as fs from 'fs-extra'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import { isDocumentValid, isStepFunctionsRole, StateMachineGraphCache } from '../../stepFunctions/utils'
 import globals from '../../shared/extensionGlobals'
+import { fs } from '../../shared'
 
 const requestBody = 'request body string'
 const assetUrl = 'https://something'
@@ -24,7 +24,7 @@ describe('StateMachineGraphCache', function () {
     })
 
     after(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder)
     })
 
     describe('updateCachedFile', function () {

packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts

@@ -5,7 +5,6 @@
 
 import * as os from 'os'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
 import * as codeWhisperer from '../../codewhisperer/client/codewhisperer'
 import assert from 'assert'
@@ -15,6 +14,7 @@ import AdmZip from 'adm-zip'
 import { setValidConnection } from '../util/connection'
 import { transformByQState, ZipManifest } from '../../codewhisperer/models/model'
 import globals from '../../shared/extensionGlobals'
+import { fs } from '../../shared'
 
 describe('transformByQ', async function () {
     let tempDir = ''
@@ -29,10 +29,10 @@ describe('transformByQ', async function () {
             this.skip()
         }
         tempDir = path.join(os.tmpdir(), 'gumby-test')
-        fs.mkdirSync(tempDir)
+        await fs.mkdir(tempDir)
         tempFileName = `testfile-${globals.clock.Date.now()}.txt`
         tempFilePath = path.join(tempDir, tempFileName)
-        fs.writeFileSync(tempFilePath, 'sample content for the test file')
+        await fs.writeFile(tempFilePath, 'sample content for the test file')
         transformByQState.setProjectPath(tempDir)
         const zipCodeResult = await zipCode({
             dependenciesFolder: {
@@ -47,13 +47,13 @@ describe('transformByQ', async function () {
 
     after(async function () {
         if (tempDir !== '') {
-            await fs.remove(tempDir)
+            await fs.delete(tempDir)
         }
     })
 
     it('WHEN upload payload with missing sha256 in headers THEN fails to upload', async function () {
-        const buffer = fs.readFileSync(zippedCodePath)
-        const sha256 = getSha256(buffer)
+        const buffer = await fs.readFile(zippedCodePath)
+        const sha256 = getSha256(Buffer.from(buffer))
         const response = await codeWhisperer.codeWhispererClient.createUploadUrl({
             contentChecksum: sha256,
             contentChecksumType: CodeWhispererConstants.contentChecksumType,
@@ -63,10 +63,13 @@ describe('transformByQ', async function () {
             'x-amz-checksum-sha256': '',
             'Content-Type': 'application/zip',
         }
+        const body = await fs.readFileAsString(zippedCodePath)
         await assert.rejects(
             () =>
-                request.fetch('PUT', response.uploadUrl, { body: fs.readFileSync(zippedCodePath), headers: headersObj })
-                    .response
+                request.fetch('PUT', response.uploadUrl, {
+                    body: body,
+                    headers: headersObj,
+                }).response
         )
     })
 
@@ -85,8 +88,8 @@ describe('transformByQ', async function () {
     })
 
     it('WHEN createUploadUrl THEN URL uses HTTPS and sets 60 second expiration', async function () {
-        const buffer = fs.readFileSync(zippedCodePath)
-        const sha256 = getSha256(buffer)
+        const buffer = await fs.readFile(zippedCodePath)
+        const sha256 = getSha256(Buffer.from(buffer))
         const response = await codeWhisperer.codeWhispererClient.createUploadUrl({
             contentChecksum: sha256,
             contentChecksumType: CodeWhispererConstants.contentChecksumType,

packages/core/src/testInteg/cloudformation/templateRegistry.test.ts

@@ -4,13 +4,13 @@
  */
 
 import * as path from 'path'
-import * as fs from 'fs-extra'
 
 import { CloudFormationTemplateRegistry } from '../../shared/fs/templateRegistry'
 import { makeSampleSamTemplateYaml, strToYamlFile } from '../../test/shared/cloudformation/cloudformationTestUtils'
 import { getTestWorkspaceFolder } from '../integrationTestsUtilities'
 import { Timeout, sleep, waitUntil } from '../../shared/utilities/timeoutUtils'
 import assert from 'assert'
+import { fs } from '../../shared'
 
 /**
  * Note: these tests are pretty shallow right now. They do not test the following:
@@ -30,14 +30,14 @@ describe('CloudFormation Template Registry', async function () {
     beforeEach(async function () {
         testDir = path.join(workspaceDir, dir.toString())
         testDirNested = path.join(testDir, 'nested')
-        await fs.mkdirp(testDirNested)
+        await fs.mkdir(testDirNested)
         registry = new CloudFormationTemplateRegistry()
         dir++
     })
 
     afterEach(async function () {
         registry.dispose()
-        await fs.remove(testDir)
+        await fs.delete(testDir)
     })
 
     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.remove(filepath)
+        await fs.delete(filepath)
 
         await registryHasTargetNumberOfFiles(registry, 0)
     })

packages/core/src/testInteg/sam.test.ts

@@ -5,7 +5,7 @@
 
 import assert from 'assert'
 import { Runtime } from 'aws-sdk/clients/lambda'
-import { mkdirpSync, mkdtemp } from 'fs-extra'
+import { mkdtempSync } from 'fs'
 import * as path from 'path'
 import * as semver from 'semver'
 import * as vscode from 'vscode'
@@ -27,6 +27,7 @@ import { insertTextIntoFile } from '../shared/utilities/textUtilities'
 import globals from '../shared/extensionGlobals'
 import { closeAllEditors } from '../test/testUtil'
 import { ToolkitError } from '../shared/errors'
+import { fs } from '../shared'
 
 const projectFolder = testUtils.getTestWorkspaceFolder()
 
@@ -393,9 +394,9 @@ describe('SAM Integration Tests', async function () {
         await testUtils.configureAwsToolkitExtension()
         // await testUtils.configureGoExtension()
 
-        testSuiteRoot = await mkdtemp(path.join(projectFolder, 'inttest'))
+        testSuiteRoot = mkdtempSync(path.join(projectFolder, 'inttest'))
         console.log('testSuiteRoot: ', testSuiteRoot)
-        mkdirpSync(testSuiteRoot)
+        await fs.mkdir(testSuiteRoot)
     })
 
     after(async function () {
@@ -417,7 +418,7 @@ describe('SAM Integration Tests', async function () {
             randomTestScenario = scenarios[0]
 
             runtimeTestRoot = path.join(testSuiteRoot, 'randomScenario')
-            mkdirpSync(runtimeTestRoot)
+            await fs.mkdir(runtimeTestRoot)
         })
 
         after(async function () {
@@ -453,7 +454,7 @@ describe('SAM Integration Tests', async function () {
             before(async function () {
                 runtimeTestRoot = path.join(testSuiteRoot, scenario.runtime)
                 console.log('runtimeTestRoot: ', runtimeTestRoot)
-                mkdirpSync(runtimeTestRoot)
+                await fs.mkdir(runtimeTestRoot)
             })
 
             after(async function () {
@@ -480,7 +481,7 @@ describe('SAM Integration Tests', async function () {
                 let cfnTemplatePath: string
 
                 before(async function () {
-                    testDir = await mkdtemp(path.join(runtimeTestRoot, 'samapp-'))
+                    testDir = mkdtempSync(path.join(runtimeTestRoot, 'samapp-'))
                     log(`testDir: ${testDir}`)
 
                     await createSamApplication(testDir, scenario)

packages/core/src/testInteg/schema/schema.test.ts

@@ -5,7 +5,6 @@
 
 import globals from '../../shared/extensionGlobals'
 import { GlobalStorage } from '../../shared/globalStorage'
-import * as fs from 'fs-extra'
 import { getDefaultSchemas, samAndCfnSchemaUrl } from '../../shared/schemas'
 import {
     getCITestSchemas,
@@ -18,6 +17,7 @@ import {
 } from '../../test/shared/schema/testUtils'
 import { assertTelemetry } from '../../test/testUtil'
 import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { fs } from '../../shared'
 
 describe('Sam Schema Regression', function () {
     let samSchema: JSONObject
@@ -72,7 +72,7 @@ describe('getDefaultSchemas()', () => {
     beforeEach(async () => {})
 
     it('uses cache after initial fetch for CFN/SAM schema', async () => {
-        fs.removeSync(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
+        await fs.delete(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
         await globals.telemetry.setTelemetryEnabled(true)
         globals.telemetry.clearRecords()
         globals.telemetry.logger.clear()
@@ -81,7 +81,7 @@ describe('getDefaultSchemas()', () => {
         await getDefaultSchemas()
         await waitUntil(
             async () => {
-                return fs.existsSync(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
+                return await fs.exists(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
             },
             { truthy: true, interval: 200, timeout: 5000 }
         )

packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts

@@ -4,10 +4,8 @@
  */
 
 import assert from 'assert'
-import { writeFile, mkdirp, remove } from 'fs-extra'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import * as fs from 'fs'
 import {
     collectFiles,
     collectFilesForIndex,
@@ -22,6 +20,7 @@ import { assertTelemetry, createTestWorkspace, createTestWorkspaceFolder, toFile
 import sinon from 'sinon'
 import { performanceTest } from '../../../shared/performance/performance'
 import { randomUUID } from '../../../shared/crypto'
+import { fs } from '../../../shared'
 
 describe('findParentProjectFile', async function () {
     const workspaceDir = getTestWorkspaceFolder()
@@ -75,14 +74,14 @@ describe('findParentProjectFile', async function () {
     ]
 
     before(async function () {
-        await mkdirp(path.join(workspaceDir, 'someproject', 'src'))
-        await mkdirp(path.join(workspaceDir, 'someotherproject'))
+        await fs.mkdir(path.join(workspaceDir, 'someproject', 'src'))
+        await fs.mkdir(path.join(workspaceDir, 'someotherproject'))
         globalRegistry = globals.codelensRootRegistry
     })
 
     after(async function () {
-        await remove(path.join(workspaceDir, 'someproject'))
-        await remove(path.join(workspaceDir, 'someotherproject'))
+        await fs.delete(path.join(workspaceDir, 'someproject'))
+        await fs.delete(path.join(workspaceDir, 'someotherproject'))
         globals.codelensRootRegistry = globalRegistry
     })
 
@@ -92,7 +91,7 @@ describe('findParentProjectFile', async function () {
 
     afterEach(async function () {
         for (const file of filesToDelete) {
-            await remove(file.fsPath)
+            await fs.delete(file.fsPath)
         }
         filesToDelete = []
         globals.codelensRootRegistry.dispose()
@@ -102,7 +101,7 @@ describe('findParentProjectFile', async function () {
         it(test.scenario, async () => {
             filesToDelete = test.filesToUse
             for (const file of test.filesToUse) {
-                await writeFile(file.fsPath, '')
+                await fs.writeFile(file.fsPath, '')
                 // Add it to the registry. The registry is async and we are not
                 // testing the registry in this test, so manually use it
                 await globals.codelensRootRegistry.addItem(file)
@@ -448,7 +447,7 @@ describe('getWorkspaceFoldersByPrefixes', function () {
             subDir: 'test/app',
         })
         const newRoot = path.join(ws1.uri.fsPath, '../app_cdk')
-        await fs.promises.mkdir(newRoot, { recursive: true })
+        await fs.mkdir(newRoot)
         const ws2: vscode.WorkspaceFolder = {
             index: 0,
             uri: vscode.Uri.file(newRoot),

packages/core/src/testInteg/stepFunctions/visualizeStateMachine.test.ts

@@ -4,13 +4,13 @@
  */
 
 import assert from 'assert'
-import * as fs from 'fs-extra'
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { MessageObject } from '../../stepFunctions/commands/visualizeStateMachine/aslVisualization'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import { closeAllEditors, toTextEditor } from '../../test/testUtil'
 import { previewStateMachineCommand } from '../../stepFunctions/activation'
+import { fs } from '../../shared'
 
 const sampleStateMachine = `
 	 {
@@ -89,7 +89,7 @@ describe('visualizeStateMachine', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder)
         sinon.restore()
     })