Merge branch 'aws:master' into master

.github/workflows/node.js.yml

@@ -84,6 +84,17 @@ jobs:
                   git remote add forkUpstream https://github.com/$REPO_NAME  # URL of the fork
                   git fetch forkUpstream  # Fetch fork
 
+            - name: Merge in target branch to avoid false negatives.
+              env:
+                  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+              # Note: "git merge" should always succeed here, because GHA won't
+              # start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
+              # Also, because `git merge` makes a commit, we need to establish an identity to avoid 'Committer identity unknown' error
+              run: |
+                  git config --global user.name "aws-toolkit-automation"
+                  git config --global user.email "<>"
+                  git merge origin/$TARGET_BRANCH
+
             - name: Compute git diff
               env:
                   CURRENT_BRANCH: ${{ github.head_ref }}

buildspec/release/80notify.yml

@@ -0,0 +1,26 @@
+version: 0.2
+
+phases:
+    install:
+        runtime-versions:
+            nodejs: 20
+
+    pre_build:
+        commands:
+            # Check for implicit env vars passed from the release pipeline.
+            - test -n "${NOTIFY_URL}"
+            - test -n "${TARGET_EXTENSION}"
+
+    build:
+        commands:
+            - echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
+            - export EXTENSION_NAME=$([ "$TARGET_EXTENSION" = "amazonq" ] && echo "Amazon Q" || echo "AWS Toolkit")
+            - export VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
+            - export CHANGELOG=$(cat packages/${TARGET_EXTENSION}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print if $. == 2')
+            - MESSAGE=$(envsubst < ./buildspec/release/notify.txt)
+            - |
+                if [ "$STAGE" != "prod" ]; then
+                  echo "SKIPPED (stage=${STAGE}): 'curl -v POST \"[NOTIFY_URL]\" -H \"Content-Type:application/json\" --data \"{\"Content\":\"${MESSAGE}\"}\"'"
+                  exit 0
+                fi
+                curl -v POST "${NOTIFY_URL}" -H "Content-Type:application/json" --data "{\"Content\":\"${MESSAGE}\"}"

buildspec/release/notify.txt

@@ -0,0 +1,6 @@
+Released ${EXTENSION_NAME} v${VERSION} for VS Code
+
+${CHANGELOG}
+
+Changelog: https://github.com/aws/aws-toolkit-vscode/blob/master/packages/${TARGET_EXTENSION}/CHANGELOG.md
+Release Artifact: https://github.com/aws/aws-toolkit-vscode/releases/tag/${TARGET_EXTENSION}/v${VERSION}

docs/faq-credentials.md

@@ -13,3 +13,7 @@ Issue [aws-toolkit-vscode#3667](https://github.com/aws/aws-toolkit-vscode/issues
 2. Attempt to sign in again with AWS Builder ID
 3. If sign is is successful you can remove the old folder: `rm -rf ~/.aws/sso-OLD`
     1. Or revert the change: `mv ~/.aws/sso-OLD ~/.aws/sso`
+
+### AWS Shared Credentials File
+
+When authenticating with IAM credentials, the profile name, access key, and secret key will be stored on disk at a default location of `~/.aws/credentials` on Linux and MacOS, and `%USERPROFILE%\.aws\credentials` on Windows machines. The toolkit also supports editting this file manually, with the format specified [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html#file-format-creds). The credentials files also supports [role assumption](https://docs.aws.amazon.com/sdkref/latest/guide/access-assume-role.html) and [MFA](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa.html). Note that this credentials file is shared between all local AWS development tools. For more information, see the full documentation [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html).

package.json

@@ -37,7 +37,8 @@
         "clean": "npm run clean -w packages/ -w plugins/",
         "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
-        "mergeReports": "ts-node ./scripts/mergeReports.ts"
+        "mergeReports": "ts-node ./scripts/mergeReports.ts",
+        "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
         "@aws-toolkits/telemetry": "^1.0.296",

packages/amazonq/.changes/1.47.0.json

@@ -0,0 +1,38 @@
+{
+	"date": "2025-02-13",
+	"version": "1.47.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "`Send to prompt` and other context menu options not sent if chat was closed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Truncating user input to 4096 characters for unit test generation."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Q identify active test file and infer source file for test generation."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code review starts automatically when invoked from menu"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: automatically download results when ready"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: support Java 21 transformations"
+		},
+		{
+			"type": "Removal",
+			"description": "Reverted prefetch logic to enable more stable inline completion"
+		}
+	]
+}

packages/amazonq/.changes/1.48.0.json

@@ -0,0 +1,30 @@
+{
+	"date": "2025-02-20",
+	"version": "1.48.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: update workspace too large error message "
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Auto-review should not remove issues from manual reviews"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: allow View Summary button to work even after accepting diff"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Fixing the issue of target file does not exist."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /doc: Add support for infrastructure diagrams"
+		}
+	]
+}

packages/amazonq/.changes/1.49.0.json

@@ -0,0 +1,26 @@
+{
+	"date": "2025-02-27",
+	"version": "1.49.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: skip running tests locally when user chooses to do so"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: ignored lines should not show up in scan issues"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test: update capability card text"
+		}
+	]
+}

packages/amazonq/.changes/next-release/Feature-90704e88-3ab3-4030-8bc6-fdde95aa3923.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: Code reviews are now created with additional workspace context to enable grouping of related scans in the backend"
+}

packages/amazonq/.changes/next-release/Feature-cf1e3d13-1b3d-4b23-bf6b-d6d46c75565c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: increase chat input height to 3 lines"
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 1.49.0 2025-02-27
+
+- **Bug Fix** Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace.
+- **Bug Fix** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
+- **Bug Fix** /transform: skip running tests locally when user chooses to do so
+- **Bug Fix** /review: ignored lines should not show up in scan issues
+- **Bug Fix** /test: update capability card text
+
+## 1.48.0 2025-02-20
+
+- **Bug Fix** /dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop
+- **Bug Fix** Amazon Q /doc: update workspace too large error message 
+- **Bug Fix** /review: Auto-review should not remove issues from manual reviews
+- **Bug Fix** /transform: allow View Summary button to work even after accepting diff
+- **Bug Fix** Amazon Q /test: Fixing the issue of target file does not exist.
+- **Feature** Amazon Q /doc: Add support for infrastructure diagrams
+
+## 1.47.0 2025-02-13
+
+- **Bug Fix** `Send to prompt` and other context menu options not sent if chat was closed
+- **Bug Fix** Amazon Q /test: Truncating user input to 4096 characters for unit test generation.
+- **Bug Fix** Amazon Q /test: Q identify active test file and infer source file for test generation.
+- **Bug Fix** /review: Code review starts automatically when invoked from menu
+- **Feature** Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files
+- **Feature** /transform: automatically download results when ready
+- **Feature** /transform: support Java 21 transformations
+- **Removal** Reverted prefetch logic to enable more stable inline completion
+
 ## 1.46.0 2025-02-05
 
 - **Bug Fix** Citation links are not clickable as numbers, but appear as non-clickable texts

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.47.0-SNAPSHOT",
+    "version": "1.50.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/src/app/amazonqScan/app.ts

@@ -25,7 +25,6 @@ export function init(appContext: AmazonQAppInitContext) {
         authClicked: new vscode.EventEmitter<any>(),
         tabOpened: new vscode.EventEmitter<any>(),
         tabClosed: new vscode.EventEmitter<any>(),
-        runScan: new vscode.EventEmitter<any>(),
         formActionClicked: new vscode.EventEmitter<any>(),
         errorThrown: new vscode.EventEmitter<any>(),
         showSecurityScan: new vscode.EventEmitter<any>(),

packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts

@@ -49,7 +49,7 @@ export class ScanController {
         this.authController = new AuthController()
 
         this.chatControllerMessageListeners.tabOpened.event((data) => {
-            return this.tabOpened(data)
+            return this.tabOpened(data).then(() => this.scanInitiated(data))
         })
 
         this.chatControllerMessageListeners.tabClosed.event((data) => {
@@ -60,10 +60,6 @@ export class ScanController {
             this.authClicked(data)
         })
 
-        this.chatControllerMessageListeners.runScan.event((data) => {
-            return this.scanInitiated(data)
-        })
-
         this.chatControllerMessageListeners.formActionClicked.event((data) => {
             return this.formActionClicked(data)
         })

packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts

@@ -40,9 +40,6 @@ export class UIMessageListener {
             case 'auth-follow-up-was-clicked':
                 this.authClicked(msg)
                 break
-            case 'review':
-                this.scan(msg)
-                break
             case 'form-action-click':
                 this.formActionClicked(msg)
                 break
@@ -61,12 +58,6 @@ export class UIMessageListener {
         }
     }
 
-    private scan(msg: UIMessage) {
-        this.scanControllerEventsEmitters?.runScan.fire({
-            tabID: msg.tabID,
-        })
-    }
-
     private formActionClicked(msg: UIMessage) {
         this.scanControllerEventsEmitters?.formActionClicked.fire({
             ...msg,

packages/amazonq/src/extension.ts

@@ -142,7 +142,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         // Give time for the extension to finish initializing.
         globals.clock.setTimeout(async () => {
             CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
-            void focusAmazonQPanel.execute(placeholder, 'firstStartUp')
+            void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)
         }, 1000)
     }
 }