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

Author: Muzaffer Aydin

buildspec/linuxE2ETests.yml

@@ -37,7 +37,7 @@ phases:
         commands:
             - export HOME=/home/codebuild-user
             # Ignore failure until throttling issues are fixed.
-            - xvfb-run npm run testE2E
+            - xvfb-run npm run testE2E; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxIntegrationTests.yml

@@ -92,7 +92,7 @@ phases:
     build:
         commands:
             - export HOME=/home/codebuild-user
-            - xvfb-run npm run testInteg
+            - xvfb-run npm run testInteg; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxTests.yml

@@ -41,7 +41,7 @@ phases:
                     # Ensure that "foo | run_and_report" fails correctly.
                     set -o pipefail
                     . buildspec/shared/common.sh
-                    2>&1 xvfb-run npm test --silent | run_and_report 2 \
+                    { 2>&1 xvfb-run npm test --silent; npm run mergeReports -- "$?"; } | run_and_report 2 \
                         'rejected promise not handled' \
                         'This typically indicates a bug. Read https://developer.mozilla.org/docs/Web/JavaScript/Guide/Using_promises#error_handling'
                 }

package.json

@@ -36,7 +36,8 @@
         "lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --ignore-pattern '**/resources/js/graphStateMachine.js' --fix --ext .ts packages plugins",
         "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"
+        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
+        "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
         "@aws-toolkits/telemetry": "^1.0.289",

packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit."
+}

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

@@ -8,9 +8,9 @@ import vscode from 'vscode'
 import sinon from 'sinon'
 import { join } from 'path'
 import { getTestWorkspaceFolder } from 'aws-core-vscode/test'
-import { CodeAnalysisScope, ZipUtil } from 'aws-core-vscode/codewhisperer'
+import { CodeAnalysisScope, CodeWhispererConstants, ZipUtil } from 'aws-core-vscode/codewhisperer'
 import { codeScanTruncDirPrefix } from 'aws-core-vscode/codewhisperer'
-import { ToolkitError } from 'aws-core-vscode/shared'
+import { tempDirPath, ToolkitError } from 'aws-core-vscode/shared'
 import { LspClient } from 'aws-core-vscode/amazonq'
 import { fs } from 'aws-core-vscode/shared'
 import path from 'path'
@@ -142,97 +142,58 @@ describe('zipUtil', function () {
 
     describe('generateZipTestGen', function () {
         let zipUtil: ZipUtil
-        let mockFs: sinon.SinonStubbedInstance<typeof fs>
-        const projectPath = '/test/project'
-        const zipDirPath = '/test/zip'
-        const zipFilePath = '/test/zip/test.zip'
+        let getZipDirPathStub: sinon.SinonStub
+        let testTempDirPath: string
 
         beforeEach(function () {
             zipUtil = new ZipUtil()
-            mockFs = sinon.stub(fs)
-
-            const mockRepoMapPath = '/path/to/repoMapData.json'
-            mockFs.exists.withArgs(mockRepoMapPath).resolves(true)
-            sinon.stub(LspClient, 'instance').get(() => ({
-                getRepoMapJSON: sinon.stub().resolves(mockRepoMapPath),
-            }))
-
-            sinon.stub(zipUtil, 'getZipDirPath').returns(zipDirPath)
-            sinon.stub(zipUtil as any, 'zipProject').resolves(zipFilePath)
+            testTempDirPath = path.join(tempDirPath, CodeWhispererConstants.TestGenerationTruncDirPrefix)
+            getZipDirPathStub = sinon.stub(zipUtil, 'getZipDirPath')
+            getZipDirPathStub.callsFake(() => testTempDirPath)
         })
 
         afterEach(function () {
             sinon.restore()
         })
 
-        it('Should generate zip for test generation successfully', async function () {
-            mockFs.stat.resolves({
-                type: vscode.FileType.File,
-                size: 1000,
-                ctime: Date.now(),
-                mtime: Date.now(),
-            } as vscode.FileStat)
-
-            mockFs.readFileBytes.resolves(Buffer.from('test content'))
+        it('should generate zip for test generation successfully', async function () {
+            const mkdirSpy = sinon.spy(fs, 'mkdir')
 
-            // Fix: Create a Set from the array
-            zipUtil['_totalSize'] = 500
-            zipUtil['_totalBuildSize'] = 200
-            zipUtil['_totalLines'] = 100
-            zipUtil['_language'] = 'typescript'
-            zipUtil['_pickedSourceFiles'] = new Set(['file1.ts', 'file2.ts'])
+            const result = await zipUtil.generateZipTestGen(appRoot, false)
 
-            const result = await zipUtil.generateZipTestGen(projectPath, false)
-
-            assert.ok(mockFs.mkdir.calledWith(path.join(zipDirPath, 'utgRequiredArtifactsDir')))
+            assert.ok(mkdirSpy.calledWith(path.join(testTempDirPath, 'utgRequiredArtifactsDir')))
             assert.ok(
-                mockFs.mkdir.calledWith(path.join(zipDirPath, 'utgRequiredArtifactsDir', 'buildAndExecuteLogDir'))
+                mkdirSpy.calledWith(path.join(testTempDirPath, 'utgRequiredArtifactsDir', 'buildAndExecuteLogDir'))
             )
-            assert.ok(mockFs.mkdir.calledWith(path.join(zipDirPath, 'utgRequiredArtifactsDir', 'repoMapData')))
-            assert.ok(mockFs.mkdir.calledWith(path.join(zipDirPath, 'utgRequiredArtifactsDir', 'testCoverageDir')))
-
-            // assert.ok(
-            //     mockFs.copy.calledWith(
-            //         '/path/to/repoMapData.json',
-            //         path.join(zipDirPath, 'utgRequiredArtifactsDir', 'repoMapData', 'repoMapData.json')
-            //     )
-            // )
-
-            assert.strictEqual(result.rootDir, zipDirPath)
-            assert.strictEqual(result.zipFilePath, zipFilePath)
-            assert.strictEqual(result.srcPayloadSizeInBytes, 500)
-            assert.strictEqual(result.buildPayloadSizeInBytes, 200)
-            assert.strictEqual(result.zipFileSizeInBytes, 1000)
-            assert.strictEqual(result.lines, 100)
-            assert.strictEqual(result.language, 'typescript')
-            assert.deepStrictEqual(Array.from(result.scannedFiles), ['file1.ts', 'file2.ts'])
-        })
-
-        // it('Should handle LSP client error', async function () {
-        //     // Override the default stub with one that rejects
-        //     sinon.stub(LspClient, 'instance').get(() => ({
-        //         getRepoMapJSON: sinon.stub().rejects(new Error('LSP error')),
-        //     }))
+            assert.ok(mkdirSpy.calledWith(path.join(testTempDirPath, 'utgRequiredArtifactsDir', 'repoMapData')))
+            assert.ok(mkdirSpy.calledWith(path.join(testTempDirPath, 'utgRequiredArtifactsDir', 'testCoverageDir')))
 
-        //     await assert.rejects(() => zipUtil.generateZipTestGen(projectPath), /LSP error/)
-        // })
+            assert.strictEqual(result.rootDir, testTempDirPath)
+            assert.strictEqual(result.zipFilePath, testTempDirPath + CodeWhispererConstants.codeScanZipExt)
+            assert.ok(result.srcPayloadSizeInBytes > 0)
+            assert.strictEqual(result.buildPayloadSizeInBytes, 0)
+            assert.ok(result.zipFileSizeInBytes > 0)
+            assert.strictEqual(result.lines, 150)
+            assert.strictEqual(result.language, 'java')
+            assert.strictEqual(result.scannedFiles.size, 4)
+        })
 
         it('Should handle file system errors during directory creation', async function () {
             sinon.stub(LspClient, 'instance').get(() => ({
                 getRepoMapJSON: sinon.stub().resolves('{"mock": "data"}'),
             }))
-            mockFs.mkdir.rejects(new Error('Directory creation failed'))
+            sinon.stub(fs, 'mkdir').rejects(new Error('Directory creation failed'))
 
-            await assert.rejects(() => zipUtil.generateZipTestGen(projectPath, false), /Directory creation failed/)
+            await assert.rejects(() => zipUtil.generateZipTestGen(appRoot, false), /Directory creation failed/)
         })
 
         it('Should handle zip project errors', async function () {
             sinon.stub(LspClient, 'instance').get(() => ({
                 getRepoMapJSON: sinon.stub().resolves('{"mock": "data"}'),
             }))
-            ;(zipUtil as any).zipProject.rejects(new Error('Zip failed'))
+            sinon.stub(zipUtil, 'zipProject' as keyof ZipUtil).rejects(new Error('Zip failed'))
 
-            await assert.rejects(() => zipUtil.generateZipTestGen(projectPath, false), /Zip failed/)
+            await assert.rejects(() => zipUtil.generateZipTestGen(appRoot, false), /Zip failed/)
         })
 
         it('Should handle file copy to downloads folder error', async function () {
@@ -241,31 +202,15 @@ describe('zipUtil', function () {
                 getRepoMapJSON: sinon.stub().resolves('{"mock": "data"}'),
             }))
 
-            // Mock file operations
-            const mockFs = {
-                mkdir: sinon.stub().resolves(),
-                copy: sinon.stub().rejects(new Error('Copy failed')),
-                exists: sinon.stub().resolves(true),
-                stat: sinon.stub().resolves({
-                    type: vscode.FileType.File,
-                    size: 1000,
-                    ctime: Date.now(),
-                    mtime: Date.now(),
-                } as vscode.FileStat),
-            }
-
-            // Since the function now uses Promise.all for directory creation and file operations,
-            // we need to ensure the mkdir succeeds but the copy fails
-            fs.mkdir = mockFs.mkdir
-            fs.copy = mockFs.copy
-            fs.exists = mockFs.exists
-            fs.stat = mockFs.stat
-
-            await assert.rejects(() => zipUtil.generateZipTestGen(projectPath, false), /Copy failed/)
+            const mkdirSpy = sinon.spy(fs, 'mkdir')
+            sinon.stub(fs, 'exists').resolves(true)
+            sinon.stub(fs, 'copy').rejects(new Error('Copy failed'))
+
+            await assert.rejects(() => zipUtil.generateZipTestGen(appRoot, false), /Copy failed/)
 
             // Verify mkdir was called for all directories
-            assert(mockFs.mkdir.called, 'mkdir should have been called')
-            assert.strictEqual(mockFs.mkdir.callCount, 4, 'mkdir should have been called 4 times')
+            assert(mkdirSpy.called, 'mkdir should have been called')
+            assert.strictEqual(mkdirSpy.callCount, 4, 'mkdir should have been called 4 times')
         })
     })
 })

packages/core/src/amazonq/explorer/amazonQTreeNode.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { ResourceTreeDataProvider, TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
-import { AuthState, isPreviousQUser } from '../../codewhisperer/util/authUtil'
+import { AuthState } from '../../codewhisperer/util/authUtil'
 import { createLearnMoreNode, createInstallQNode, createDismissNode } from './amazonQChildrenNodes'
 import { Commands } from '../../shared/vscode/commands2'
 
@@ -40,10 +40,7 @@ export class AmazonQNode implements TreeNode {
     }
 
     public getChildren() {
-        const children = [createInstallQNode(), createLearnMoreNode()]
-        if (!isPreviousQUser()) {
-            children.push(createDismissNode())
-        }
+        const children = [createInstallQNode(), createLearnMoreNode(), createDismissNode()]
         return children
     }
 

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -50,7 +50,6 @@ import {
     CodeTransformJavaTargetVersionsAllowed,
     CodeTransformJavaSourceVersionsAllowed,
 } from '../../../shared/telemetry/telemetry'
-import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
 import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
 import DependencyVersions from '../../models/dependencies'
 import { getStringHash } from '../../../shared/utilities/textUtilities'
@@ -364,15 +363,16 @@ export class GumbyController {
                 await this.handleUserLanguageUpgradeProjectChoice(message)
                 break
             case ButtonActions.CANCEL_TRANSFORMATION_FORM:
-                telemetry.codeTransform_submitSelection.emit({
-                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                    userChoice: 'Cancel',
-                    result: MetadataResult.Pass,
-                })
-                this.transformationFinished({
-                    message: CodeWhispererConstants.jobCancelledChatMessage,
-                    tabID: message.tabID,
-                    includeStartNewTransformationButton: true,
+                telemetry.codeTransform_submitSelection.run(() => {
+                    telemetry.record({
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        userChoice: 'Cancel',
+                    })
+                    this.transformationFinished({
+                        message: CodeWhispererConstants.jobCancelledChatMessage,
+                        tabID: message.tabID,
+                        includeStartNewTransformationButton: true,
+                    })
                 })
                 break
             case ButtonActions.CONFIRM_SKIP_TESTS_FORM:

packages/core/src/auth/auth.ts

@@ -339,11 +339,6 @@ export class Auth implements AuthService, ConnectionManager {
             metadata: { connectionState: 'unauthenticated' },
         })
 
-        // Remove the split session logout prompt, if it exists.
-        if (!isAmazonQ()) {
-            await globals.globalState.update('aws.toolkit.separationPromptDismissed', true)
-        }
-
         try {
             ;(await tokenProvider.getToken()) ?? (await tokenProvider.createToken())
             const storedProfile = await this.store.addProfile(id, profile)
@@ -1136,71 +1131,3 @@ export function hasVendedIamCredentials(isC9?: boolean, isSM?: boolean) {
     isSM ??= isSageMaker()
     return isSM || isC9
 }
-
-type LoginCommand = 'aws.toolkit.auth.manageConnections' | 'aws.codecatalyst.manageConnections'
-/**
- * Temporary class that handles notifiting users who were logged out as part of
- * splitting auth sessions between extensions.
- *
- * TODO: Remove after some time.
- */
-export class SessionSeparationPrompt {
-    // Local variable handles per session displays, e.g. we forgot a CodeCatalyst connection AND
-    // an Explorer only connection. We only want to display once in this case.
-    // However, we don't want to set this at the global state level until a user interacts with the
-    // notification in case they miss it the first time.
-    #separationPromptDisplayed = false
-
-    /**
-     * Open a prompt for that last used command name (or do nothing if no command name has ever been passed),
-     * which is useful to redisplay the prompt after reloads in case a user misses it.
-     */
-    public async showAnyPreviousPrompt() {
-        const cmd = globals.globalState.tryGet('aws.toolkit.separationPromptCommand', String)
-        return cmd ? await this.showForCommand(cmd as LoginCommand) : undefined
-    }
-
-    /**
-     * Displays a sign in prompt to the user if they have been logged out of the Toolkit as part of
-     * separating auth sessions between extensions. It will executed the passed command for sign in,
-     * (e.g. codecatalyst sign in vs explorer)
-     */
-    public async showForCommand(cmd: LoginCommand) {
-        if (
-            this.#separationPromptDisplayed ||
-            globals.globalState.get<boolean>('aws.toolkit.separationPromptDismissed')
-        ) {
-            return
-        }
-
-        await globals.globalState.update('aws.toolkit.separationPromptCommand', cmd)
-
-        await telemetry.toolkit_showNotification.run(async () => {
-            telemetry.record({ id: 'sessionSeparation' })
-            this.#separationPromptDisplayed = true
-            void vscode.window
-                .showWarningMessage(
-                    'Amazon Q and AWS Toolkit no longer share connections. Please sign in again to use AWS Toolkit.',
-                    'Sign In'
-                )
-                .then(async (resp) => {
-                    await telemetry.toolkit_invokeAction.run(async () => {
-                        telemetry.record({ source: 'sessionSeparationNotification' })
-                        if (resp === 'Sign In') {
-                            telemetry.record({ action: 'signIn' })
-                            await vscode.commands.executeCommand(cmd)
-                        } else {
-                            telemetry.record({ action: 'dismiss' })
-                        }
-
-                        await globals.globalState.update('aws.toolkit.separationPromptDismissed', true)
-                    })
-                })
-        })
-    }
-
-    static #instance: SessionSeparationPrompt
-    public static get instance() {
-        return (this.#instance ??= new SessionSeparationPrompt())
-    }
-}

packages/core/src/codecatalyst/activation.ts

@@ -26,7 +26,6 @@ import { DevEnvActivityStarter } from './devEnv'
 import { learnMoreCommand, onboardCommand, reauth } from './explorer'
 import { isInDevEnv } from '../shared/vscode/env'
 import { hasScopes, scopesCodeWhispererCore, getTelemetryMetadataForConn } from '../auth/connection'
-import { SessionSeparationPrompt } from '../auth/auth'
 import { telemetry } from '../shared/telemetry/telemetry'
 import { asStringifiedStack } from '../shared/telemetry/spans'
 
@@ -64,7 +63,6 @@ export async function activate(ctx: ExtContext): Promise<void> {
                     })
 
                     await authProvider.secondaryAuth.forgetConnection()
-                    await SessionSeparationPrompt.instance.showForCommand('aws.codecatalyst.manageConnections')
                 })
             },
             { emit: false, functionId: { name: 'activate', class: 'CodeCatalyst' } }