Merge branch 'master' into muaydin/docdb-polling-bug-fix

Author: Muzaffer Aydin

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 * @aws/aws-ides-team
 packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
-packages/core/src/codewhispererChat/ @aws/dexp
-packages/core/src/amazonq/ @aws/dexp
+packages/core/src/codewhispererChat/ @aws/flare
+packages/core/src/amazonq/ @aws/flare
 packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,6 +6,7 @@
 
 ---
 
-<!--- REMINDER: Ensure that your PR meets the guidelines in CONTRIBUTING.md -->
+- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
+- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
 
 License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/node.js.yml

@@ -84,7 +84,7 @@ jobs:
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
+              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
               uses: codecov/codecov-action@v5
               with:
                   flags: macos-toolkit-unittests
@@ -95,7 +95,7 @@ jobs:
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
+              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
               uses: codecov/codecov-action@v5
               with:
                   flags: macos-amazonq-unittests
@@ -154,7 +154,7 @@ jobs:
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
+              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
               uses: codecov/codecov-action@v5
               with:
                   flags: windows-unittests

CONTRIBUTING.md

@@ -238,9 +238,12 @@ You can find documentation to create VSCode IDE settings for CodeCatalyst bluepr
 
 Before sending a pull request:
 
+1. Treat all work as PUBLIC. Private `feature/x` branches will _not_ be squash-merged at release time. This has several benefits:
+    - Avoids mistakes (accidental exposure to public)!
+    - Avoids needing to erase (squash-merge) history.
 1. Check that you are working against the latest source on the `master` branch.
-2. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. Open an issue to discuss any significant work.
+1. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+1. Open an issue to discuss any significant work.
 
 To send a pull request:
 

buildspec/shared/common.sh

@@ -6,13 +6,9 @@
 
 # Ignore these patterns when deciding if the build should fail.
 #   - "waiting for browser": from `ssoAccessTokenProvider.test.ts`, unclear how to fix it.
-#   - "Webview is disposed": only happens on vscode "minimum" (1.68.0)
 #   - "HTTPError: Response code …": caused by github rate-limiting.
 #   - "npm WARN deprecated querystring": transitive dep of aws sdk v2 (check `npm ls querystring`), so that's blocked until we migrate to v3.
 _ignore_pat='Timed-out waiting for browser login flow\|HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
-if [ "$VSCODE_TEST_VERSION" = 'minimum' ]; then
-    _ignore_pat="$_ignore_pat"'\|Webview is disposed'
-fi
 
 # Do not print (noisy) lines matching these patterns.
 #   - "ERROR:bus… Failed to connect to the bus": noise related to "xvfb". https://github.com/cypress-io/cypress/issues/19299

codecov.yml

@@ -5,45 +5,98 @@ codecov:
     notify:
         require_ci_to_pass: no
 
+ignore:
+    - 'node_modules/'
+    - 'plugins/'
+    - 'scripts/'
+    - 'src.gen/'
+
 coverage:
     precision: 2
     round: down
     range: '70...100'
 
     status:
         project:
+            # Note: `default` measures the entire project.
+            # It does NOT define defaults "inherited" by other `project` items.
+            # https://docs.codecov.com/docs/commit-status
             default:
-                target: 70%
-                threshold: 5%
-                informational: true
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                target: 80
+                threshold: 5
+                only_pulls: true
             codewhisperer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/codewhisperer/*
+                    - 'packages/core/src/codewhisperer/'
+                    - 'packages/core/src/amazonq*/*'
+                    - 'packages/amazonq/src/'
                 flags:
                     - 'codewhisperer'
+                target: 80
+                threshold: 5
+                only_pulls: true
             amazonqFeatureDev:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/amazonqFeatureDev/*
+                    - 'packages/core/src/amazonqFeatureDev/*'
                 flags:
                     - 'amazonqFeatureDev'
+                target: 80
+                threshold: 5
+                only_pulls: true
             amazonqGumby:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/amazonqGumby/*
+                    - 'packages/core/src/amazonqGumby/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
             codewhispererChat:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/codewhispererChat/*
+                    - 'packages/core/src/codewhispererChat/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
             applicationcomposer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/applicationcomposer/*
+                    - 'packages/core/src/applicationcomposer/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
             stepFunctions:
-                target: 50%
-                threshold: 10%
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
                 paths:
-                    - packages/core/src/stepFunctions/*
+                    - 'packages/core/src/stepFunctions/*'
+                target: 50
+                threshold: 10
+                only_pulls: true
             threatComposer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/threatComposer/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            tests:
+                # Most code in test/ should always be "covered"!
+                target: 95
                 paths:
-                    - packages/core/src/threatComposer/*
-        patch: false
+                    - '**/test/**'
+        patch:
+            default:
+                # Note: `default` measures the entire project.
+                # It does NOT define defaults "inherited" by other `project` items.
+                # https://docs.codecov.com/docs/commit-status
+                target: 90
+                threshold: 5
+                only_pulls: true
+                informational: false # Fail if PR changes are not covered.
+                # branches:
+                #     - master
         changes: false
 
 comment: false
@@ -54,7 +107,9 @@ github_checks:
 flags:
     codewhisperer:
         paths:
-            - packages/core/src/codewhisperer/
+            - 'packages/core/src/codewhisperer/'
+            - 'packages/core/src/amazonq*/*'
+            - 'packages/amazonq/src/'
     amazonqFeatureDev:
         paths:
-            - packages/core/src/amazonqFeatureDev/
+            - 'packages/core/src/amazonqFeatureDev/'

package-lock.json

@@ -39,7 +39,7 @@
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.282",
+        "@aws-toolkits/telemetry": "^1.0.284",
         "@playwright/browser-chromium": "^1.43.1",
         "@types/he": "^1.2.3",
         "@types/vscode": "^1.68.0",

package.json

@@ -0,0 +1,34 @@
+{
+	"date": "2024-12-03",
+	"version": "1.39.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Added a getting started page for exploring amazon q agents"
+		},
+		{
+			"type": "Feature",
+			"description": "`/test` in Q chat to generate unit tests for java and python"
+		},
+		{
+			"type": "Feature",
+			"description": "`/doc` in Q chat to generate and update documentation for your project"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Scan is now Amazon Q Code Review"
+		},
+		{
+			"type": "Feature",
+			"description": "`/review` in Q chat to scan your code for vulnerabilities and quality issues, and generate fixes"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: New TreeView to display security scan issues and vulnerabilities detected in your project. The TreeView provides an organized and hierarchical view of the scan results, making it easier to navigate and prioritize the issues that need to be addressed."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Added ability to suppress or ignore security issues"
+		}
+	]
+}

packages/amazonq/.changes/1.39.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "@workspace is missing from the welcome to q chat tab"
+}