Merge branch 'aws:master' into master

Author: Hweinstock

buildspec/linuxIntegrationTests.yml

@@ -51,6 +51,27 @@ phases:
             # Ensure that "docker" group has permissions to the socket.
             # - chown codebuild-user /var/run/docker.sock
             - chmod 666 /var/run/docker.sock
+            # Pull Docker Images for SAM tests
+
+            # Nodejs
+            - |
+                docker pull public.ecr.aws/sam/build-nodejs18.x:latest
+                docker pull public.ecr.aws/sam/build-nodejs20.x:latest
+                docker pull public.ecr.aws/sam/build-nodejs22.x:latest
+            # Java
+            - |
+                docker pull public.ecr.aws/sam/build-java8.al2:latest
+                docker pull public.ecr.aws/sam/build-java11:latest
+                docker pull public.ecr.aws/sam/build-java17:latest
+            # Python
+            - |
+                docker pull public.ecr.aws/sam/build-python3.10:latest
+                docker pull public.ecr.aws/sam/build-python3.11:latest
+                docker pull public.ecr.aws/sam/build-python3.12:latest
+                docker pull public.ecr.aws/sam/build-python3.13:latest
+            # Dotnet
+            - |
+                docker pull public.ecr.aws/sam/build-dotnet6:latest
 
     pre_build:
         commands:

codecov.yml

@@ -81,11 +81,6 @@ coverage:
                 target: 80
                 threshold: 5
                 only_pulls: true
-            tests:
-                # Most code in test/ should always be "covered"!
-                target: 95
-                paths:
-                    - '**/test/**'
         patch:
             default:
                 # Note: `default` measures the entire project.

packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code Review: Cleaned up output logs when running /review"
+}

packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file."
+}

packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly."
+}

packages/amazonq/package.json

@@ -210,7 +210,8 @@
                     "type": "tree",
                     "id": "aws.amazonq.SecurityIssuesTree",
                     "name": "%AWS.amazonq.security%",
-                    "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView"
+                    "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView",
+                    "visibility": "collapsed"
                 },
                 {
                     "type": "webview",

packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts

@@ -14,11 +14,13 @@ import { ToolkitError } from 'aws-core-vscode/shared'
 import { LspClient } from 'aws-core-vscode/amazonq'
 import { fs } from 'aws-core-vscode/shared'
 import path from 'path'
+import JSZip from 'jszip'
 
 describe('zipUtil', function () {
     const workspaceFolder = getTestWorkspaceFolder()
     const appRoot = join(workspaceFolder, 'java11-plain-maven-sam-app')
     const appCodePath = join(appRoot, 'HelloWorldFunction', 'src', 'main', 'java', 'helloworld', 'App.java')
+    const appCodePathWithRepeatedProjectName = join(workspaceFolder, 'workspaceFolder', 'App.java')
 
     describe('getProjectPaths', function () {
         it('Should return the correct project paths', function () {
@@ -112,6 +114,30 @@ describe('zipUtil', function () {
             )
             assert.equal(zipMetadata2.lines, zipMetadata.lines + 1)
         })
+
+        it('should handle path with repeated project name for file scan', async function () {
+            const zipMetadata = await zipUtil.generateZip(
+                vscode.Uri.file(appCodePathWithRepeatedProjectName),
+                CodeAnalysisScope.FILE_ON_DEMAND
+            )
+
+            const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath)
+            const zip = await JSZip.loadAsync(zipFileData)
+            const files = Object.keys(zip.files)
+            assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java')))
+        })
+
+        it('should handle path with repeated project name for project scan', async function () {
+            const zipMetadata = await zipUtil.generateZip(
+                vscode.Uri.file(appCodePathWithRepeatedProjectName),
+                CodeAnalysisScope.PROJECT
+            )
+
+            const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath)
+            const zip = await JSZip.loadAsync(zipFileData)
+            const files = Object.keys(zip.files)
+            assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java')))
+        })
     })
 
     describe('generateZipTestGen', function () {

packages/core/src/codewhisperer/commands/basicCommands.ts

@@ -464,7 +464,6 @@ export const applySecurityFix = Commands.declare(
                 new vscode.Range(document.lineAt(0).range.start, document.lineAt(document.lineCount - 1).range.end),
                 updatedContent
             )
-            SecurityIssueProvider.instance.disableEventHandler()
             const isApplied = await vscode.workspace.applyEdit(edit)
             if (isApplied) {
                 void document.save().then((didSave) => {

packages/core/src/codewhisperer/service/securityIssueProvider.ts

@@ -12,7 +12,6 @@ export class SecurityIssueProvider {
     }
 
     private _issues: AggregatedCodeScanIssue[] = []
-    private _disableEventHandler: boolean = false
     public get issues() {
         return this._issues
     }
@@ -21,19 +20,11 @@ export class SecurityIssueProvider {
         this._issues = issues
     }
 
-    public disableEventHandler() {
-        this._disableEventHandler = true
-    }
-
     public handleDocumentChange(event: vscode.TextDocumentChangeEvent) {
         // handleDocumentChange function may be triggered while testing by our own code generation.
         if (!event.contentChanges || event.contentChanges.length === 0) {
             return
         }
-        if (this._disableEventHandler) {
-            this._disableEventHandler = false
-            return
-        }
         const { changedRange, lineOffset } = event.contentChanges.reduce(
             (acc, change) => ({
                 changedRange: acc.changedRange.union(change.range),

packages/core/src/codewhisperer/util/gitUtil.ts

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { showOutputMessage } from '../../shared/utilities/messages'
-import { getLogger, globals, removeAnsi } from '../../shared'
+import { getLogger, removeAnsi } from '../../shared'
 import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils'
 import { Uri } from 'vscode'
 
@@ -17,10 +16,10 @@ export async function isGitRepo(folder: Uri): Promise<boolean> {
         rejectOnErrorCode: true,
         onStdout: (text) => {
             output += text
-            showOutputMessage(removeAnsi(text), globals.outputChannel)
+            getLogger().verbose(removeAnsi(text))
         },
         onStderr: (text) => {
-            showOutputMessage(removeAnsi(text), globals.outputChannel)
+            getLogger().error(removeAnsi(text))
         },
         spawnOptions: {
             cwd: folder.fsPath,