Merge remote-tracking branch 'upstream/master' into cwspr-usergroup

Author: Will-ShaoHua

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
+}

packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Minimum required VSCode version is now 1.83"
+}

packages/amazonq/.changes/next-release/Removal-c259464a-0437-47e6-be6c-8df023ad477c.json

@@ -1046,6 +1046,6 @@
     },
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     }
 }

packages/amazonq/package.json

@@ -36,7 +36,7 @@ describe('HumanInTheLoopManager', async function () {
         )
         const outputPathResult = path.join(outputDirectoryPath, 'pom.xml')
         assertEqualPaths(newPomFilePath.fsPath, outputPathResult)
-        const newPomFileContents = await fs.readFileAsString(newPomFilePath.path)
+        const newPomFileContents = await fs.readFileText(newPomFilePath.path)
         assert.strictEqual(
             stripStringWhitespace(newPomFileContents),
             stripStringWhitespace(`<?xml version="1.0" encoding="UTF-8"?>

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

@@ -23,7 +23,7 @@ describe('package validations', function () {
      */
     it('has synced contributes.icons with core/package.json', async function () {
         const corePackageJson = JSON.parse(
-            await fs.readFileAsString(path.resolve(__dirname, '../../../../core/package.json'))
+            await fs.readFileText(path.resolve(__dirname, '../../../../core/package.json'))
         )
         assert.deepStrictEqual(packageJson.contributes.icons, corePackageJson.contributes.icons)
     })

packages/amazonq/test/unit/validation.test.ts

@@ -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",

packages/core/package.json

@@ -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'
@@ -133,7 +133,7 @@ export class LspController {
     }
 
     async getFileSha384(filePath: string): Promise<string> {
-        const fileBuffer = await fs.readFile(filePath)
+        const fileBuffer = await fs.readFileBytes(filePath)
         const hash = crypto.createHash('sha384')
         hash.update(fileBuffer)
         return hash.digest('hex')

packages/core/src/amazonq/lsp/lspController.ts

@@ -230,15 +230,15 @@ async function loadConfigFile(configUri?: vscode.Uri): Promise<ReturnType<typeof
         return []
     }
 
-    return parseIni(await fs.readFileAsString(configUri), configUri)
+    return parseIni(await fs.readFileText(configUri), configUri)
 }
 
 async function loadCredentialsFile(credentialsUri?: vscode.Uri): Promise<ReturnType<typeof parseIni>> {
     if (!credentialsUri || !(await fs.exists(credentialsUri))) {
         return []
     }
 
-    return parseIni(await fs.readFileAsString(credentialsUri), credentialsUri)
+    return parseIni(await fs.readFileText(credentialsUri), credentialsUri)
 }
 
 /**

packages/core/src/auth/credentials/sharedCredentials.ts

@@ -218,7 +218,7 @@ export class AuthSSOServer {
 
     private async loadResource(res: http.ServerResponse, resourcePath: string) {
         try {
-            const file = await fs.readFile(resourcePath)
+            const file = await fs.readFileBytes(resourcePath)
             res.writeHead(200)
             res.end(file)
         } catch (e) {