fix breaking test

Author: Hweinstock

packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts

@@ -286,7 +286,7 @@ export class SamInvokeWebview extends VueWebview {
      */
     public async invokeLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<void> {
         const finalConfig = finalizeConfig(
-            resolveWorkspaceFolderVariable(undefined, config),
+            await resolveWorkspaceFolderVariable(undefined, config),
             'Editor-Created Debug Config'
         )
         const targetUri = await getUriFromLaunchConfig(finalConfig)

packages/core/src/shared/icons.ts

@@ -11,7 +11,7 @@ import { Uri, ThemeIcon, ThemeColor } from 'vscode'
 import { isCloud9 } from './extensionUtilities'
 import { memoize } from './utilities/functionUtils'
 import { getLogger } from './logger/logger'
-import fs from './fs/fs'
+import { existsSync } from 'fs'
 
 // Animation:
 // https://code.visualstudio.com/api/references/icons-in-labels#animation
@@ -87,25 +87,25 @@ export function addColor(icon: IconPath, color: string | ThemeColor): IconPath {
     return new Icon(icon.id, icon.source, typeof color === 'string' ? new ThemeColor(color) : color)
 }
 
-async function resolveIconId(
+function resolveIconId(
     id: IconId,
     shouldUseCloud9 = isCloud9(),
     iconsPath = globals.context.asAbsolutePath(path.join('resources', 'icons'))
-): Promise<IconPath> {
+): IconPath {
     const [namespace, ...rest] = id.split('-')
     const name = rest.join('-')
 
     // This 'override' logic is to support legacy use-cases, though ideally we wouldn't need it at all
-    const cloud9Override = shouldUseCloud9 ? await resolvePathsSync(path.join(iconsPath, 'cloud9'), id) : undefined
-    const override = cloud9Override ?? (await resolvePathsSync(path.join(iconsPath, namespace), name))
+    const cloud9Override = shouldUseCloud9 ? resolvePathsSync(path.join(iconsPath, 'cloud9'), id) : undefined
+    const override = cloud9Override ?? resolvePathsSync(path.join(iconsPath, namespace), name)
     if (override) {
         getLogger().verbose(`icons: using override for "${id}"`)
         return override
     }
 
     // TODO: remove when they support codicons + the contribution point
     if (shouldUseCloud9) {
-        const generated = await resolvePathsSync(path.join(iconsPath, 'cloud9', 'generated'), id)
+        const generated = resolvePathsSync(path.join(iconsPath, 'cloud9', 'generated'), id)
 
         if (generated) {
             return generated
@@ -121,16 +121,16 @@ async function resolveIconId(
     return new Icon(namespace === 'vscode' ? name : id, source)
 }
 
-async function resolvePathsSync(
+function resolvePathsSync(
     rootDir: string,
     target: string
-): Promise<{ light: Uri; dark: Uri; toString: () => string } | undefined> {
+): { light: Uri; dark: Uri; toString: () => string } | undefined {
     const filename = `${target}.svg`
     const darkPath = path.join(rootDir, 'dark', filename)
     const lightPath = path.join(rootDir, 'light', filename)
 
     try {
-        if (!isWeb() && (await fs.exists(darkPath)) && (await fs.exists(lightPath))) {
+        if (!isWeb() && existsSync(darkPath) && existsSync(lightPath)) {
             return { dark: Uri.file(darkPath), light: Uri.file(lightPath), toString: () => filename }
         }
     } catch (error) {

packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fs } from '../../../shared'
+import { readFileSync } from 'fs'
 import { getLogger, Logger } from '../../../shared/logger'
 
 /**
@@ -12,13 +12,10 @@ import { getLogger, Logger } from '../../../shared/logger'
  *
  * @returns the escaped ASL Json definition string of the state machine construct
  */
-export async function getStateMachineDefinitionFromCfnTemplate(
-    uniqueIdentifier: string,
-    templatePath: string
-): Promise<string> {
+export function getStateMachineDefinitionFromCfnTemplate(uniqueIdentifier: string, templatePath: string): string {
     const logger: Logger = getLogger()
     try {
-        const data = await fs.readFileText(templatePath)
+        const data = readFileSync(templatePath, 'utf-8')
         const jsonObj = JSON.parse(data)
         const resources = jsonObj?.Resources
         if (!resources) {

packages/core/src/test/awsService/redshift/notebook/cellStatusBarItemProvider.test.ts

@@ -31,17 +31,17 @@ describe('CellStatusBarItemProvider', function () {
         sinon.restore()
     })
 
-    it('provides "Connect" status bar item when cell has no connectionParams', () => {
+    it('provides "Connect" status bar item when cell has no connectionParams', async () => {
         const cell = { notebook: { metadata: { connectionParams: undefined } } }
         const expectedText = '$(notebook-state-error) Connect'
-        const result = cellStatusBarItemProvider.provideCellStatusBarItems(cell, undefined)
+        const result = await cellStatusBarItemProvider.provideCellStatusBarItems(cell, undefined)
         assert(Array.isArray(result))
         assert.strictEqual(result.length, 1)
         assert.strictEqual(result[0].text, expectedText)
     })
 
-    it('provides status bar with success-icon and connection information', () => {
-        const result = cellStatusBarItemProvider.provideCellStatusBarItems(cell, token)
+    it('provides status bar with success-icon and connection information', async () => {
+        const result = await cellStatusBarItemProvider.provideCellStatusBarItems(cell, token)
         const expectedText = '$(notebook-state-success) Connected to TestWarehouse'
         const expectedCommand = {
             command: 'aws.redshift.notebookConnectClicked',

packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts

@@ -473,7 +473,7 @@ describe('CodeExtractor', function () {
             //Create a zip file that clashes with destination content
             zipHandler = createZipFileInTempDirectory(fileName, 'Second file content', zipName)
 
-            const collisionOccured = codeExtractor.checkFileCollisions(zipName, destinationDirectory)
+            const collisionOccured = await codeExtractor.checkFileCollisions(zipName, destinationDirectory)
 
             assert.strictEqual(collisionOccured, true, 'should confirm that collision occurs')
             assert(outputChannel.value.includes(expectedMessage), `channel missing msg: ${expectedMessage}`)
@@ -491,7 +491,7 @@ describe('CodeExtractor', function () {
             const fileName2 = 'test2.txt'
             zipHandler = createZipFileInTempDirectory(fileName2, 'Second file content', zipName)
 
-            const collisionOccured = codeExtractor.checkFileCollisions(zipName, destinationDirectory)
+            const collisionOccured = await codeExtractor.checkFileCollisions(zipName, destinationDirectory)
             assert.strictEqual(
                 collisionOccured,
                 false,

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

@@ -11,46 +11,46 @@ import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesy
 import { fs } from '../../shared'
 
 describe('getIcon', function () {
-    it('returns a ThemeIcon for `vscode` codicons', async function () {
-        const icon = await getIcon('vscode-gear', false)
+    it('returns a ThemeIcon for `vscode` codicons', function () {
+        const icon = getIcon('vscode-gear', false)
 
         assert.ok(icon instanceof ThemeIcon)
         assert.strictEqual(icon.id, 'gear')
     })
 
-    it('returns a ThemeIcon for `aws` icons', async function () {
-        const icon = await getIcon('aws-cdk-logo', false)
+    it('returns a ThemeIcon for `aws` icons', function () {
+        const icon = getIcon('aws-cdk-logo', false)
 
         assert.ok(icon instanceof ThemeIcon)
         assert.strictEqual(icon.id, 'aws-cdk-logo')
     })
 
-    it('returns icon URIs for non-codicon icons', async function () {
-        const icon = await getIcon('vscode-help', false)
+    it('returns icon URIs for non-codicon icons', function () {
+        const icon = getIcon('vscode-help', false)
 
         assert.ok(!(icon instanceof ThemeIcon))
         assert.ok(icon.dark.path.endsWith('/resources/icons/vscode/dark/help.svg'))
         assert.ok(icon.light.path.endsWith('/resources/icons/vscode/light/help.svg'))
     })
 
     it('can use specific icons for Cloud9', async function () {
-        const icon = await getIcon('vscode-help', true)
+        const icon = getIcon('vscode-help', true)
 
         assert.ok(!(icon instanceof ThemeIcon))
         assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/dark/vscode-help.svg'))
         assert.ok(icon.light.path.endsWith('/resources/icons/cloud9/light/vscode-help.svg'))
     })
 
     it('can use generated icons for Cloud9', async function () {
-        const icon = await getIcon('aws-cdk-logo', true)
+        const icon = getIcon('aws-cdk-logo', true)
 
         assert.ok(!(icon instanceof ThemeIcon))
         assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/generated/dark/aws-cdk-logo.svg'))
         assert.ok(icon.light.path.endsWith('/resources/icons/cloud9/generated/light/aws-cdk-logo.svg'))
     })
 
     it('can use codicons for Cloud9', async function () {
-        const icon = await getIcon('vscode-gear', true)
+        const icon = getIcon('vscode-gear', true)
 
         assert.ok(!(icon instanceof ThemeIcon))
         assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/generated/dark/vscode-gear.svg'))
@@ -72,7 +72,7 @@ describe('getIcon', function () {
                 await fs.writeFile(p, '<svg></svg>')
             }
 
-            const icon = await getIcon('aws-cdk-logo', false, tempDir)
+            const icon = getIcon('aws-cdk-logo', false, tempDir)
 
             assert.ok(!(icon instanceof ThemeIcon))
             assert.strictEqual(icon.dark.fsPath, Uri.file(paths[1]).fsPath)
@@ -90,7 +90,7 @@ describe('getIcon', function () {
             await fs.mkdir(path.dirname(logoPath))
             await fs.writeFile(logoPath, '<svg></svg>')
 
-            const icon = await getIcon('aws-cdk-logo', false, tempDir)
+            const icon = getIcon('aws-cdk-logo', false, tempDir)
 
             assert.ok(icon instanceof ThemeIcon)
             assert.strictEqual(icon.source?.fsPath, Uri.file(logoPath).fsPath)
@@ -102,17 +102,17 @@ describe('getIcon', function () {
 
 describe('codicon', function () {
     it('inserts icon ids', async function () {
-        const result = codicon`my icon: ${await getIcon('vscode-gear')}`
+        const result = codicon`my icon: ${getIcon('vscode-gear')}`
         assert.strictEqual(result, 'my icon: $(gear)')
     })
 
     it('skips adding icons if no icon font is available', async function () {
-        const result = codicon`my icon: ${await getIcon('vscode-help')}`
+        const result = codicon`my icon: ${getIcon('vscode-help')}`
         assert.strictEqual(result, 'my icon:')
     })
 
     it('trims the resulting string', async function () {
-        const result = codicon`  some text ${await getIcon('vscode-help')}      `
+        const result = codicon`  some text ${getIcon('vscode-help')}      `
         assert.strictEqual(result, 'some text')
     })
 })

packages/core/src/test/shared/vscode/runCommand.test.ts

@@ -158,8 +158,7 @@ describe('runCommand', function () {
         })
 
         it('nodejs EACCES (not wrapped by toolkit `PermissionsError`)', async function () {
-            const expectedMsg =
-                os.platform() === 'win32' ? /EPERM: operation not permitted/ : /EACCES: permission denied/
+            const expectedMsg = 'Expected rw-, found r--.'
             const viewLogsDialog = getTestWindow().waitForMessage(expectedMsg)
 
             await Promise.all([

packages/core/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts

@@ -15,7 +15,7 @@ const cdkOutPath = normalize(normalize(__dirname).replace('/dist', '') + '/resou
 const templatePath = normalize(`${cdkOutPath}/templateJsonTester.template.json`)
 
 describe('Get State Machine Definition from Cfn Template', function () {
-    it('get the correct cfn definition for state machine with correct inputs', function () {
+    it('get the correct cfn definition for state machine with correct inputs', async function () {
         let data = getCfnDefinition.getStateMachineDefinitionFromCfnTemplate(uniqueIdendifier, templatePath)
         data = getCfnDefinition.toUnescapedAslJsonString(data)
         assert.strictEqual(data, unescapedJsonString)