Merge remote-tracking branch 'upstream/master' into custom

Author: Will-ShaoHua

packages/amazonq/.changes/next-release/bugfix-ad9a8829-efa0-463b-ba2f-c89ff1cb69e4.json

@@ -0,0 +1,4 @@
+{
+	"type": "bugfix",
+	"description": "/review: disable auto-review by default"
+}

packages/amazonq/src/extensionNode.ts

@@ -112,6 +112,11 @@ async function getAuthState(): Promise<Omit<AuthUserState, 'source'>> {
         getLogger().error(`Current Amazon Q connection is not SSO, type is: %s`, currConn?.type)
     }
 
+    // Pending profile selection state means users already log in with Sso service
+    if (authState === 'pendingProfileSelection') {
+        authState = 'connected'
+    }
+
     return {
         authStatus:
             authState === 'connected' || authState === 'expired' || authState === 'connectedWithNetworkError'

packages/amazonq/src/lsp/chat/messages.ts

@@ -295,10 +295,17 @@ export function registerMessageListeners(
     languageClient.onRequest<ShowDocumentParams, ShowDocumentResult>(
         ShowDocumentRequest.method,
         async (params: ShowDocumentParams): Promise<ShowDocumentParams | ResponseError<ShowDocumentResult>> => {
-            const uri = vscode.Uri.parse(params.uri)
-            const doc = await vscode.workspace.openTextDocument(uri)
-            await vscode.window.showTextDocument(doc, { preview: false })
-            return params
+            try {
+                const uri = vscode.Uri.parse(params.uri)
+                const doc = await vscode.workspace.openTextDocument(uri)
+                await vscode.window.showTextDocument(doc, { preview: false })
+                return params
+            } catch (e) {
+                return new ResponseError(
+                    LSPErrorCodes.RequestFailed,
+                    `Failed to open document: ${(e as Error).message}`
+                )
+            }
         }
     )
 

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

@@ -16,6 +16,7 @@ import {
     pollScanJobStatus,
     SecurityScanTimedOutError,
     CodeWhispererConstants,
+    CodeScansState,
 } from 'aws-core-vscode/codewhisperer'
 import { timeoutUtils } from 'aws-core-vscode/shared'
 import assert from 'assert'
@@ -281,6 +282,7 @@ describe('securityScanHandler', function () {
                 shouldAdvanceTime: true,
             })
             sinon.stub(timeoutUtils, 'sleep').resolves()
+            sinon.stub(CodeScansState.instance, 'isScansEnabled').returns(true)
         })
 
         afterEach(function () {

packages/core/src/codewhisperer/models/model.ts

@@ -280,7 +280,7 @@ export class CodeScansState {
         return (this.#instance ??= new this())
     }
 
-    protected constructor(fallback: boolean = true) {
+    protected constructor(fallback: boolean = false) {
         this.#fallback = fallback
     }
 

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

@@ -193,36 +193,36 @@ describe('CodeWhisperer-basicCommands', function () {
             codeScansState = new TestCodeScansState()
         })
 
-        it('has auto scans enabled by default', async function () {
+        it('has auto scans disabled by default', async function () {
             targetCommand = testCommand(toggleCodeScans, codeScansState)
-            assert.strictEqual(codeScansState.isScansEnabled(), true)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
         })
 
         it('toggles states as expected', async function () {
             targetCommand = testCommand(toggleCodeScans, codeScansState)
-            assert.strictEqual(codeScansState.isScansEnabled(), true)
-            await targetCommand.execute(placeholder, cwQuickPickSource)
             assert.strictEqual(codeScansState.isScansEnabled(), false)
             await targetCommand.execute(placeholder, cwQuickPickSource)
             assert.strictEqual(codeScansState.isScansEnabled(), true)
             await targetCommand.execute(placeholder, cwQuickPickSource)
             assert.strictEqual(codeScansState.isScansEnabled(), false)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
         })
 
         it('setScansEnabled() works as expected', async function () {
-            // initially true
-            assert.strictEqual(codeScansState.isScansEnabled(), true)
-
-            await codeScansState.setScansEnabled(false)
+            // initially false
             assert.strictEqual(codeScansState.isScansEnabled(), false)
 
-            // set new state to current state
-            await codeScansState.setScansEnabled(false)
-            assert.strictEqual(codeScansState.isScansEnabled(), false)
+            await codeScansState.setScansEnabled(true)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
 
-            // set to opposite state
+            // set new state to current state
             await codeScansState.setScansEnabled(true)
             assert.strictEqual(codeScansState.isScansEnabled(), true)
+
+            // set to opposite state
+            await codeScansState.setScansEnabled(false)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
         })
 
         it('triggers event listener when toggled', async function () {
@@ -239,28 +239,28 @@ describe('CodeWhisperer-basicCommands', function () {
             assert.strictEqual(eventListener.callCount, 1)
         })
 
-        it('emits aws_modifySetting event on user toggling autoScans - deactivate', async function () {
+        it('emits aws_modifySetting event on user toggling autoScans - activate', async function () {
             targetCommand = testCommand(toggleCodeScans, codeScansState)
             await targetCommand.execute(placeholder, cwQuickPickSource)
 
-            assert.strictEqual(codeScansState.isScansEnabled(), false)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
             assertTelemetryCurried('aws_modifySetting')({
                 settingId: CodeWhispererConstants.autoScansConfig.settingId,
-                settingState: CodeWhispererConstants.autoScansConfig.deactivated,
+                settingState: CodeWhispererConstants.autoScansConfig.activated,
             })
         })
 
-        it('emits aws_modifySetting event on user toggling autoScans -- activate', async function () {
-            codeScansState = new TestCodeScansState(false)
-            assert.strictEqual(codeScansState.isScansEnabled(), false)
+        it('emits aws_modifySetting event on user toggling autoScans -- deactivate', async function () {
+            codeScansState = new TestCodeScansState(true)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
 
             targetCommand = testCommand(toggleCodeScans, codeScansState)
             await targetCommand.execute(placeholder, cwQuickPickSource)
 
-            assert.strictEqual(codeScansState.isScansEnabled(), true)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
             assertTelemetryCurried('aws_modifySetting')({
                 settingId: CodeWhispererConstants.autoScansConfig.settingId,
-                settingState: CodeWhispererConstants.autoScansConfig.activated,
+                settingState: CodeWhispererConstants.autoScansConfig.deactivated,
             })
         })