Merge branch 'master' into fixWindowsTest

Author: Hweinstock

package-lock.json

@@ -3,8 +3,7 @@
     "workspaces": [
         "packages/core/src/web",
         "packages/*",
-        "plugins/*",
-        "src.gen/@amzn/codewhisperer-streaming"
+        "plugins/*"
     ],
     "version": "0.0.1",
     "private": true,
@@ -21,6 +20,7 @@
     },
     "scripts": {
         "prepare": "ts-node ./scripts/prepare.ts",
+        "preinstall": "cd src.gen/@amzn/codewhisperer-streaming && npm i",
         "postinstall": "npm run buildCustomLintPlugin && npm run postinstall -ws --if-present",
         "buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
         "compile": "npm run compile -w packages/",

package.json

@@ -0,0 +1,10 @@
+{
+	"date": "2024-09-27",
+	"version": "1.27.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue that incorrectly removes hardcoded credentials detections from auto scans."
+		}
+	]
+}

packages/amazonq/.changes/1.27.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev: define first folder as a root path for LLM-created files when using workspaces"
+}

packages/amazonq/.changes/next-release/Bug Fix-385bc912-dc06-4b16-91ae-47fa1c586367.json

@@ -1,3 +1,7 @@
+## 1.27.0 2024-09-27
+
+- **Bug Fix** Security Scan: Fixes an issue that incorrectly removes hardcoded credentials detections from auto scans.
+
 ## 1.26.0 2024-09-19
 
 - **Bug Fix** Security Scan: Fixed an issue where the wrong icon was used in the status bar menu.

packages/amazonq/.changes/next-release/Bug Fix-93a879d3-5fa1-47d3-a908-77fcbce9335d.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.27.0-SNAPSHOT",
+    "version": "1.28.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -352,7 +352,7 @@
                 {
                     "command": "aws.amazonq.generateUnitTests",
                     "group": "cw_chat@5",
-                    "when": "aws.codewhisperer.connected && aws.isInternalUser"
+                    "when": "false"
                 },
                 {
                     "command": "aws.amazonq.sendToPrompt",
@@ -432,7 +432,7 @@
                 "command": "aws.amazonq.generateUnitTests",
                 "title": "%AWS.command.amazonq.generateUnitTests%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected && aws.isInternalUser"
+                "enablement": "false"
             },
             {
                 "command": "aws.amazonq.reconnect",
@@ -615,7 +615,7 @@
                 "key": "win+alt+t",
                 "mac": "cmd+alt+t",
                 "linux": "meta+alt+t",
-                "when": "aws.codewhisperer.connected && aws.isInternalUser"
+                "when": "false"
             },
             {
                 "command": "aws.amazonq.invokeInlineCompletion",

packages/amazonq/.changes/next-release/Feature-cd5797a0-6460-4fc6-b3f7-47f55f9bf163.json

@@ -68,7 +68,13 @@ function registerNewFiles(
         fs.registerProvider(uri, new VirtualMemoryFile(contents))
         const prefix =
             workspaceFolderPrefixes === undefined ? '' : zipFilePath.substring(0, zipFilePath.indexOf(path.sep))
-        const folder = workspaceFolderPrefixes === undefined ? workspaceFolders[0] : workspaceFolderPrefixes[prefix]
+        const folder =
+            workspaceFolderPrefixes === undefined
+                ? workspaceFolders[0]
+                : workspaceFolderPrefixes[prefix] ??
+                  workspaceFolderPrefixes[
+                      Object.values(workspaceFolderPrefixes).find((val) => val.index === 0)?.name ?? ''
+                  ]
         if (folder === undefined) {
             getLogger().error(`No workspace folder found for file: ${zipFilePath} and prefix: ${prefix}`)
             continue
@@ -78,7 +84,9 @@ function registerNewFiles(
             fileContent,
             virtualMemoryUri: uri,
             workspaceFolder: folder,
-            relativePath: zipFilePath.substring(workspaceFolderPrefixes === undefined ? 0 : prefix.length + 1),
+            relativePath: zipFilePath.substring(
+                workspaceFolderPrefixes === undefined ? 0 : prefix.length > 0 ? prefix.length + 1 : 0
+            ),
             rejected: false,
         })
     }

packages/amazonq/CHANGELOG.md

@@ -63,15 +63,18 @@ export async function prepareRepoData(
         const iterator = ignoredExtensionMap.entries()
 
         for (let i = 0; i < ignoredExtensionMap.size; i++) {
-            const [key, value] = iterator.next().value
-            await amznTelemetry.amazonq_bundleExtensionIgnored.run(async (bundleSpan) => {
-                const event = {
-                    filenameExt: key,
-                    count: value,
-                }
+            const iteratorValue = iterator.next().value
+            if (iteratorValue) {
+                const [key, value] = iteratorValue
+                await amznTelemetry.amazonq_bundleExtensionIgnored.run(async (bundleSpan) => {
+                    const event = {
+                        filenameExt: key,
+                        count: value,
+                    }
 
-                bundleSpan.record(event)
-            })
+                    bundleSpan.record(event)
+                })
+            }
         }
 
         telemetry.setRepositorySize(totalBytes)
@@ -117,7 +120,9 @@ export function getPathsFromZipFilePath(
     }
     // otherwise the first part of the zipPath is the prefix
     const prefix = zipFilePath.substring(0, zipFilePath.indexOf(path.sep))
-    const workspaceFolder = workspacesByPrefix[prefix]
+    const workspaceFolder =
+        workspacesByPrefix[prefix] ??
+        (workspacesByPrefix[Object.values(workspacesByPrefix).find((val) => val.index === 0)?.name ?? ''] || undefined)
     if (workspaceFolder === undefined) {
         throw new ToolkitError(`Could not find workspace folder for prefix ${prefix}`)
     }