Merge branch 'master' into fsRefactor

Hweinstock · Hweinstock · commit d922357a71b9 · 2024-10-07T12:14:38.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json b/packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
+}
diff --git a/packages/amazonq/.changes/next-release/Removal-c259464a-0437-47e6-be6c-8df023ad477c.json b/packages/amazonq/.changes/next-release/Removal-c259464a-0437-47e6-be6c-8df023ad477c.json
@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Minimum required VSCode version is now 1.83"
+}
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -1046,6 +1046,6 @@
     },
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -5,7 +5,7 @@
     "license": "Apache-2.0",
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     },
     "exports": {
         ".": "./dist/src/extension.js",
diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts
@@ -5,8 +5,8 @@
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { createWriteStream } from 'fs'
 import * as crypto from 'crypto'
+import { createWriteStream } from 'fs'
 import { getLogger } from '../../shared/logger/logger'
 import { CurrentWsFolders, collectFilesForIndex } from '../../shared/utilities/workspaceUtils'
 import fetch from 'node-fetch'
diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts
@@ -462,7 +462,7 @@ export const registerToolkitApiCallback = Commands.declare(
             } else if (isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
                 // when this command is executed by Amazon Q activation
                 const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
-                _toolkitApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
+                _toolkitApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
             }
             if (_toolkitApi) {
                 registerToolkitApiCallbackOnce()
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -91,13 +91,22 @@ export class Messenger {
             )
         )
     }
-
+    /**
+     * Tries to calculate the total number of code blocks.
+     * NOTES:
+     *  - Not correct on all examples. Some may cause it to return 0 unexpectedly.
+     *  - Plans in place (as of 4/22/2024) to move this server side.
+     *  - See original pr: https://github.com/aws/aws-toolkit-vscode/pull/4761 for more details.
+     * @param message raw message response from codewhisperer client.
+     * @returns count of multi-line code blocks in response.
+     */
     public async countTotalNumberOfCodeBlocks(message: string): Promise<number> {
+        //TODO: remove this when moved to server-side.
         if (message === undefined) {
             return 0
         }
 
-        // // To Convert Markdown text to HTML using marked library
+        // To Convert Markdown text to HTML using marked library
         const html = await marked(message)
 
         const dom = new JSDOM(html)
diff --git a/packages/core/src/lambda/commands/uploadLambda.ts b/packages/core/src/lambda/commands/uploadLambda.ts
@@ -12,7 +12,7 @@ import AdmZip from 'adm-zip'
 import * as path from 'path'
 import { fs } from '../../shared'
 import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import { cloud9Findfile, makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import * as localizedText from '../../shared/localizedText'
 import { getLogger } from '../../shared/logger'
 import { SamCliBuildInvocation } from '../../shared/sam/cli/samCliBuild'
@@ -494,17 +494,15 @@ export async function findApplicationJsonFile(
     }
     const isdir = await fs.existsDir(startPath.fsPath)
     const parentDir = isdir ? startPath.fsPath : path.dirname(startPath.fsPath)
-    const found = cloud9
-        ? await cloud9Findfile(parentDir, '.application.json')
-        : await vscode.workspace.findFiles(
-              new vscode.RelativePattern(parentDir, '**/.application.json'),
-              // exclude:
-              // - null      = NO excludes apply
-              // - undefined = default excludes apply (e.g. the `files.exclude` setting but not `search.exclude`).
-              // eslint-disable-next-line unicorn/no-null
-              null,
-              1
-          )
+    const found = await vscode.workspace.findFiles(
+        new vscode.RelativePattern(parentDir, '**/.application.json'),
+        // exclude:
+        // - null      = NO excludes apply
+        // - undefined = default excludes apply (e.g. the `files.exclude` setting but not `search.exclude`).
+        // eslint-disable-next-line unicorn/no-null
+        null,
+        1
+    )
     if (!found || found.length === 0) {
         getLogger().debug('uploadLambda: .application.json not found in: "%s"', parentDir)
     }
diff --git a/packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts b/packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts
@@ -45,7 +45,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
         }
         await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
         const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
-        const importedApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
+        const importedApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
         if (importedApi && 'listConnections' in importedApi) {
             return ((await importedApi?.listConnections()) as AwsConnection[]).filter(
                 // No need to display Builder ID as an existing connection,
diff --git a/packages/core/src/shared/filesystemUtilities.ts b/packages/core/src/shared/filesystemUtilities.ts
@@ -221,35 +221,6 @@ export async function hasFileWithSuffix(dir: string, suffix: string, exclude?: v
     return matchedFiles.length > 0
 }
 
-/**
- * TEMPORARY SHIM for vscode.workspace.findFiles() on Cloud9.
- *
- * @param dir Directory to search
- * @param fileName Name of file to locate
- * @returns  List of one or zero Uris (for compat with vscode.workspace.findFiles())
- */
-export async function cloud9Findfile(dir: string, fileName: string): Promise<vscode.Uri[]> {
-    getLogger().debug('cloud9Findfile: %s', dir)
-    const files = await fs.readdir(dir)
-    const subDirs: vscode.Uri[] = []
-    for (const file of files) {
-        const [currentFileName] = file
-        const filePath = path.join(dir, currentFileName)
-        if (filePath === path.join(dir, fileName)) {
-            return [vscode.Uri.file(filePath)]
-        }
-        if (await fs.existsDir(filePath)) {
-            subDirs.push(vscode.Uri.file(filePath))
-        }
-    }
-    for (const d of subDirs) {
-        const found = await cloud9Findfile(d.fsPath, fileName)
-        if (found.length > 0) {
-            return found
-        }
-    }
-    return []
-}
 /**
  * @returns  A string path to the last locally stored download location. If none, returns the users 'Downloads' directory path.
  */
diff --git a/packages/core/src/test/credentials/auth.test.ts b/packages/core/src/test/credentials/auth.test.ts
@@ -19,7 +19,6 @@ import { UserCredentialsUtils } from '../../shared/credentials/userCredentialsUt
 import { getCredentialsFilename } from '../../auth/credentials/sharedCredentialsFile'
 import { Connection, isIamConnection, isSsoConnection, scopesSsoAccountAccess } from '../../auth/connection'
 import { AuthNode, createDeleteConnectionButton, promptForConnection } from '../../auth/utils'
-import { isMinVscode } from '../../shared/vscode/env'
 
 const ssoProfile = createSsoProfile()
 const scopedSsoProfile = createSsoProfile({ scopes: ['foo'] })
@@ -586,10 +585,6 @@ describe('Auth', function () {
         })
 
         it('reauthenticates a connection if the user selects an expired one', async function () {
-            if (isMinVscode('1.83.0')) {
-                this.skip()
-            }
-
             getTestWindow().onDidShowQuickPick(async (picker) => {
                 await picker.untilReady()
                 const connItem = picker.findItemOrThrow(/IAM Identity Center/)
diff --git a/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts
@@ -21,15 +21,6 @@ import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { getConfigFilename, getCredentialsFilename } from '../../../auth/credentials/sharedCredentialsFile'
 import { fs } from '../../../shared'
 
-/** Async version of "doesNotThrow" */
-async function assertDoesNotThrow(fn: () => Promise<void>): Promise<void> {
-    try {
-        await fn()
-    } catch (err) {
-        assert.fail(`Provided function threw error ${err}`)
-    }
-}
-
 describe('UserCredentialsUtils', function () {
     let tempFolder: string
     let defaultConfigFileName: string
@@ -151,8 +142,8 @@ describe('UserCredentialsUtils', function () {
                 `creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
             )
 
-            await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, 'r--'))
-            await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, '-w-'))
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, 'r--'))
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, '-w-'))
         })
     })
 
diff --git a/packages/core/src/test/shared/vscode/runCommand.test.ts b/packages/core/src/test/shared/vscode/runCommand.test.ts
@@ -17,7 +17,6 @@ import { assertTelemetry, getMetrics, installFakeClock } from '../../testUtil'
 import { getTestWindow } from '../../shared/vscode/window'
 import { makeTemporaryToolkitFolder } from '../../../shared'
 import path from 'path'
-import * as env from '../../../shared/vscode/env'
 import { fakeErrorChain, getAwsServiceError } from '../errors.test'
 
 async function throwMe(errorOrFn?: Error | (() => Promise<never>)): Promise<void | never> {
@@ -104,10 +103,6 @@ describe('runCommand', function () {
         }
 
         it('vscode ISDIR', async function () {
-            if (env.isMinVscode('1.83.0')) {
-                this.skip()
-            }
-
             const pat = (() => {
                 switch (os.platform()) {
                     case 'win32':
diff --git a/packages/core/src/test/techdebt.test.ts b/packages/core/src/test/techdebt.test.ts
@@ -18,16 +18,7 @@ describe('tech debt', function () {
 
     it('vscode minimum version', async function () {
         const minVscode = env.getMinVscodeVersion()
-
-        assert.ok(
-            semver.lt(minVscode, '1.75.0'),
-            'remove filesystemUtilities.findFile(), use vscode.workspace.findFiles() instead (after Cloud9 VFS fixes bug)'
-        )
-
-        assert.ok(
-            semver.lt(minVscode, '1.75.0'),
-            'remove AsyncLocalStorage polyfill used in `spans.ts` if Cloud9 is on node 14+'
-        )
+        assert.ok(semver.lt(minVscode, '1.84.0'))
 
         // see https://github.com/microsoft/vscode/issues/173861
         assert.ok(
diff --git a/packages/core/src/testInteg/tryInstallLsp.test.ts b/packages/core/src/testInteg/tryInstallLsp.test.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import sinon from 'sinon'
+import { Content } from 'aws-sdk/clients/codecommit'
+import AdmZip from 'adm-zip'
+import path from 'path'
+import { LspController } from '../amazonq'
+import { fs, getRandomString, globals } from '../shared'
+import { createTestWorkspace } from '../test/testUtil'
+import { performanceTest } from '../shared/performance/performance'
+
+// fakeFileContent is matched to fakeQServerContent based on hash.
+const fakeHash = '4eb2865c8f40a322aa04e17d8d83bdaa605d6f1cb363af615240a5442a010e0aef66e21bcf4c88f20fabff06efe8a214'
+
+const fakeQServerContent = {
+    filename: 'qserver-fake.zip',
+    url: 'https://aws-language-servers/fake.zip',
+    hashes: [`sha384:${fakeHash}`],
+    bytes: 93610849,
+    serverVersion: '1.1.1',
+}
+
+const fakeNodeContent = {
+    filename: 'fake-file',
+    url: 'https://aws-language-servers.fake-file',
+    hashes: [`sha384:${fakeHash}`],
+    bytes: 94144448,
+    serverVersion: '1.1.1',
+}
+
+function createStubs(numberOfFiles: number, fileSize: number) {
+    // Avoid making HTTP request or mocking giant manifest, stub what we need directly from request.
+    sinon.stub(LspController.prototype, 'fetchManifest')
+    // Directly feed the runtime specifications.
+    sinon.stub(LspController.prototype, 'getQserverFromManifest').returns(fakeQServerContent)
+    sinon.stub(LspController.prototype, 'getNodeRuntimeFromManifest').returns(fakeNodeContent)
+    // avoid fetch call.
+    sinon.stub(LspController.prototype, '_download').callsFake(getFakeDownload(numberOfFiles, fileSize))
+    // Hard code the hash since we are creating files on the spot, whose hashes can't be predicted.
+    sinon.stub(LspController.prototype, 'getFileSha384').resolves(fakeHash)
+    // Don't allow tryInstallLsp to move runtimes out of temporary folder.
+    sinon.stub(fs, 'rename')
+}
+
+/**
+ * Creates a fake zip with some files in it.
+ * @param filepath where to write the zip to.
+ * @param _content unused parameter, for compatability with real function.
+ */
+const getFakeDownload = function (numberOfFiles: number, fileSize: number) {
+    return async function (filepath: string, _content: Content) {
+        const dummyFilesPath = (
+            await createTestWorkspace(numberOfFiles, {
+                fileNamePrefix: 'fakeFile',
+                fileContent: getRandomString(fileSize),
+                workspaceName: 'workspace',
+            })
+        ).uri.fsPath
+        await fs.writeFile(path.join(dummyFilesPath, 'qserver'), 'this value shouldnt matter')
+        const zip = new AdmZip()
+        zip.addLocalFolder(dummyFilesPath)
+        zip.writeZip(filepath)
+    }
+}
+
+function performanceTestWrapper(numFiles: number, fileSize: number) {
+    return performanceTest(
+        {
+            testRuns: 10,
+            linux: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 6,
+                duration: 15,
+            },
+            darwin: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 6,
+                duration: 15,
+            },
+            win32: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 6,
+                duration: 15,
+            },
+        },
+        'many small files in zip',
+        function () {
+            return {
+                setup: async () => {
+                    createStubs(numFiles, fileSize)
+                },
+                execute: async () => {
+                    return await LspController.instance.tryInstallLsp(globals.context)
+                },
+                verify: async (_setup: any, result: boolean) => {
+                    assert.ok(result)
+                },
+            }
+        }
+    )
+}
+
+describe('tryInstallLsp', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+    describe('performance tests', function () {
+        performanceTestWrapper(250, 10)
+        performanceTestWrapper(10, 1000)
+    })
+})
diff --git a/packages/toolkit/.changes/next-release/Breaking Change-91df9fbf-ea4b-4087-b43f-77f35253c525.json b/packages/toolkit/.changes/next-release/Breaking Change-91df9fbf-ea4b-4087-b43f-77f35253c525.json
@@ -0,0 +1,4 @@
+{
+	"type": "Breaking Change",
+	"description": "Bumping VS Code minimum version to 1.83.0"
+}
diff --git a/packages/toolkit/.changes/next-release/Removal-cf2f67d7-fd40-4834-960c-bbd57508a7f4.json b/packages/toolkit/.changes/next-release/Removal-cf2f67d7-fd40-4834-960c-bbd57508a7f4.json
@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Minimum required VSCode version is now 1.83"
+}
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -53,7 +53,7 @@
     "browser": "./dist/src/extensionWeb",
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     },
     "scripts": {
         "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production",

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
 +}
Original file line number	Diff line number	Diff line change
`@@ -1046,6 +1046,6 @@`
`1046`	`1046`	`},`
`1047`	`1047`	`"engines": {`
`1048`	`1048`	`"npm": "^10.1.0",`
`1049`		`- "vscode": "^1.68.0"`
	`1049`	`+ "vscode": "^1.83.0"`
`1050`	`1050`	`}`
`1051`	`1051`	`}`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ export const registerToolkitApiCallback = Commands.declare(`
`462`	`462`	`} else if (isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {`
`463`	`463`	`// when this command is executed by Amazon Q activation`
`464`	`464`	`const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)`
`465`		`- _toolkitApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)`
	`465`	`+ _toolkitApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)`
`466`	`466`	`}`
`467`	`467`	`if (_toolkitApi) {`
`468`	`468`	`registerToolkitApiCallbackOnce()`
Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,22 @@ export class Messenger {`
`91`	`91`	`)`
`92`	`92`	`)`
`93`	`93`	`}`
`94`		`-`
	`94`	`+ /**`
	`95`	`+ * Tries to calculate the total number of code blocks.`
	`96`	`+ * NOTES:`
	`97`	`+ * - Not correct on all examples. Some may cause it to return 0 unexpectedly.`
	`98`	`+ * - Plans in place (as of 4/22/2024) to move this server side.`
	`99`	`+ * - See original pr: https://github.com/aws/aws-toolkit-vscode/pull/4761 for more details.`
	`100`	`+ * @param message raw message response from codewhisperer client.`
	`101`	`+ * @returns count of multi-line code blocks in response.`
	`102`	`+ */`
`95`	`103`	`public async countTotalNumberOfCodeBlocks(message: string): Promise<number> {`
	`104`	`+ //TODO: remove this when moved to server-side.`
`96`	`105`	`if (message === undefined) {`
`97`	`106`	`return 0`
`98`	`107`	`}`
`99`	`108`
`100`		`- // // To Convert Markdown text to HTML using marked library`
	`109`	`+ // To Convert Markdown text to HTML using marked library`
`101`	`110`	`const html = await marked(message)`
`102`	`111`
`103`	`112`	`const dom = new JSDOM(html)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {`
`45`	`45`	`}`
`46`	`46`	`await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)`
`47`	`47`	`const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)`
`48`		`- const importedApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)`
	`48`	`+ const importedApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)`
`49`	`49`	`if (importedApi && 'listConnections' in importedApi) {`
`50`	`50`	`return ((await importedApi?.listConnections()) as AwsConnection[]).filter(`
`51`	`51`	`// No need to display Builder ID as an existing connection,`