Merge remote-tracking branch 'origin/master' into HEAD

Author: Hweinstock

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
+}

packages/amazonq/.changes/next-release/Bug Fix-21c570d4-388e-460f-88e1-7034ed7e17d4.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+}

packages/amazonq/.changes/next-release/Bug Fix-6b8cf110-2050-4ac1-8a3b-637ed54980cf.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/transform: skip running tests locally when user chooses to do so"
+}

packages/amazonq/.changes/next-release/Bug Fix-8e53fbd9-35d8-40f0-95be-5c7ac2478353.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: ignored lines should not show up in scan issues"
+}

packages/amazonq/.changes/next-release/Bug Fix-b183d3cf-e277-4465-a28d-53a0bdf7f424.json

@@ -162,6 +162,7 @@ describe('Amazon Q Code Transformation', function () {
             const tmpDir = (await TestFolder.create()).path
 
             transformByQState.setSummaryFilePath(path.join(tmpDir, 'summary.md'))
+            transformByQState.setToPartiallySucceeded()
 
             transformByQState
                 .getChatMessenger()

packages/amazonq/test/e2e/amazonq/transformByQ.test.ts

@@ -8,15 +8,14 @@ import {
     prepareRepoData,
     PrepareRepoDataOptions,
     TelemetryHelper,
-    ContentLengthError,
     maxRepoSizeBytes,
 } from 'aws-core-vscode/amazonqFeatureDev'
 import { assertTelemetry, getWorkspaceFolder, TestFolder } from 'aws-core-vscode/test'
 import { fs, AmazonqCreateUpload, ZipStream } from 'aws-core-vscode/shared'
 import { MetricName, Span } from 'aws-core-vscode/telemetry'
 import sinon from 'sinon'
 import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
-import { CurrentWsFolders } from 'aws-core-vscode/amazonq'
+import { ContentLengthError, CurrentWsFolders } from 'aws-core-vscode/amazonq'
 import path from 'path'
 
 const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {

packages/amazonq/test/unit/amazonqFeatureDev/util/files.test.ts

@@ -20,7 +20,7 @@ import { timeoutUtils } from 'aws-core-vscode/shared'
 import assert from 'assert'
 import sinon from 'sinon'
 import * as vscode from 'vscode'
-import fs from 'fs' // eslint-disable-line no-restricted-imports
+import path from 'path'
 
 const buildRawCodeScanIssue = (params?: Partial<RawCodeScanIssue>): RawCodeScanIssue => ({
     filePath: 'workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
@@ -65,17 +65,18 @@ const buildMockListCodeScanFindingsResponse = (
     nextToken: nextToken ? 'nextToken' : undefined,
 })
 
+function getWorkspaceFolder(): string {
+    return (
+        vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ??
+        path.join(__dirname, '../../../../../../core/src/testFixtures/workspaceFolder')
+    )
+}
+
 describe('securityScanHandler', function () {
     describe('listScanResults', function () {
         let mockClient: Stub<DefaultCodeWhispererClient>
         beforeEach(function () {
             mockClient = stub(DefaultCodeWhispererClient)
-            sinon.stub(fs, 'existsSync').returns(true)
-            sinon.stub(fs, 'statSync').returns({ isFile: () => true } as fs.Stats)
-        })
-
-        afterEach(function () {
-            sinon.restore()
         })
 
         it('should make ListCodeScanFindings request and aggregate findings by file path', async function () {
@@ -85,14 +86,13 @@ describe('securityScanHandler', function () {
                 mockClient,
                 'jobId',
                 'codeScanFindingsSchema',
-                ['projectPath'],
+                [getWorkspaceFolder()],
                 CodeAnalysisScope.PROJECT,
                 undefined
             )
 
-            assert.equal(aggregatedCodeScanIssueList.length, 2)
+            assert.equal(aggregatedCodeScanIssueList.length, 1)
             assert.equal(aggregatedCodeScanIssueList[0].issues.length, 1)
-            assert.equal(aggregatedCodeScanIssueList[1].issues.length, 1)
         })
 
         it('should handle ListCodeScanFindings request with paginated response', async function () {
@@ -123,12 +123,12 @@ describe('securityScanHandler', function () {
                 mockClient,
                 'jobId',
                 'codeScanFindingsSchema',
-                ['projectPath'],
+                [getWorkspaceFolder()],
                 CodeAnalysisScope.PROJECT,
                 undefined
             )
 
-            assert.equal(aggregatedCodeScanIssueList.length, 2)
+            assert.equal(aggregatedCodeScanIssueList.length, 1)
             assert.equal(aggregatedCodeScanIssueList[0].issues.length, 3)
         })
 
@@ -145,7 +145,7 @@ describe('securityScanHandler', function () {
                     mockClient,
                     'jobId',
                     'codeScanFindingsSchema',
-                    ['projectPath'],
+                    [getWorkspaceFolder()],
                     scope,
                     undefined
                 )

packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts

@@ -473,7 +473,7 @@
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.10.0",
-        "esbuild-loader": "^4.3.0",
+        "esbuild-loader": "2.20.0",
         "file-loader": "^6.2.0",
         "jsdom": "^23.0.1",
         "json-schema-to-typescript": "^13.1.1",
@@ -524,7 +524,7 @@
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
-        "amazon-states-language-service": "^1.15.0",
+        "amazon-states-language-service": "^1.16.1",
         "async-lock": "^1.4.0",
         "aws-sdk": "^2.1692.0",
         "aws-ssm-document-language-service": "^1.0.0",

packages/core/package.json

@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+/**
+ * Shared error type for content length validation.
+ * When thrown from common components, individual agents can catch and transform this error
+ * to provide their own customized error messages.
+ */
+import { ToolkitError } from '../shared/errors'
+
+export class ContentLengthError extends ToolkitError {
+    constructor(message: string) {
+        super(message, { code: 'ContentLengthError' })
+    }
+}