Merge master into feature/hybridChat-local

Author: aws-toolkit-automation

packages/core/src/auth/utils.ts

@@ -10,6 +10,7 @@ const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
 import * as localizedText from '../shared/localizedText'
+import { consoleSessionHelpUrl } from '../shared/constants'
 import { codicon, getIcon } from '../shared/icons'
 import { createQuickPick, DataQuickPickItem, showQuickPick } from '../shared/ui/pickerPrompter'
 import { isValidResponse } from '../shared/wizards/wizard'
@@ -926,5 +927,19 @@ export async function setupConsoleConnection(profileName: string, region: string
     getLogger().info('Auth: Sets up a connection via browser login for profile: %s, region: %s', profileName, region)
     await vscode.commands.executeCommand('aws.toolkit.auth.consoleLogin', profileName, region)
     const connectionId = getConnectionIdFromProfile(profileName)
+    // Verify connection was actually created before trying to use it.
+    // The telemetry wrapper around the console login command catches and logs errors but returns undefined
+    // instead of re-throwing them. When users cancel (userCancelled=true), the command completes without error,
+    // so we must check if the connection exists before attempting to use it to avoid confusing downstream errors.
+    const connection = await Auth.instance.getConnection({ id: connectionId })
+    if (!connection) {
+        const message = 'Unable to connect to AWS. Console login was cancelled or did not complete successfully.'
+        void vscode.window.showWarningMessage(message, localizedText.learnMore).then((selection) => {
+            if (selection === localizedText.learnMore) {
+                void vscode.env.openExternal(vscode.Uri.parse(consoleSessionHelpUrl))
+            }
+        })
+        throw new ToolkitError(message, { cancelled: true })
+    }
     await Auth.instance.useConnection({ id: connectionId })
 }

packages/core/src/shared/constants.ts

@@ -43,7 +43,8 @@ export const credentialHelpUrl: string =
     'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/setup-credentials.html'
 export const ssoCredentialsHelpUrl: string =
     'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/sso-credentials.html'
-
+export const consoleSessionHelpUrl: string =
+    'https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sign-in.html#cli-configure-sign-in-prerequisites'
 export const supportedLambdaRuntimesUrl: string =
     'https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html'
 export const createUrlForLambdaFunctionUrl = 'https://docs.aws.amazon.com/lambda/latest/dg/urls-configuration.html'

packages/core/src/test/auth/utils.test.ts

@@ -9,6 +9,7 @@ import * as vscode from 'vscode'
 import { Auth } from '../../auth/auth'
 import { ToolkitError } from '../../shared/errors'
 import * as authUtils from '../../auth/utils'
+import { getTestWindow } from '../shared/vscode/window'
 
 describe('getConnectionIdFromProfile', function () {
     it('constructs connection ID from profile name', function () {
@@ -35,16 +36,39 @@ describe('setupConsoleConnection', function () {
 
     it('creates connection after successful console login', async function () {
         const executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand').resolves()
+        const getConnectionStub = sandbox
+            .stub(Auth.instance, 'getConnection')
+            .resolves({ id: 'profile:test-profile' } as any)
         const useConnectionStub = sandbox.stub(Auth.instance, 'useConnection').resolves()
 
         await authUtils.setupConsoleConnection('test-profile', 'us-east-1')
 
         assert.ok(executeCommandStub.calledOnceWith('aws.toolkit.auth.consoleLogin', 'test-profile', 'us-east-1'))
+        assert.ok(getConnectionStub.calledOnceWith({ id: 'profile:test-profile' }))
         assert.ok(useConnectionStub.calledOnceWith({ id: 'profile:test-profile' }))
     })
 
+    it('throws error when connection was not created', async function () {
+        sandbox.stub(vscode.commands, 'executeCommand').resolves()
+        sandbox.stub(Auth.instance, 'getConnection').resolves(undefined)
+        getTestWindow().onDidShowMessage((m) => m.close())
+
+        await assert.rejects(
+            () => authUtils.setupConsoleConnection('test-profile', 'us-east-1'),
+            (err: ToolkitError) => {
+                assert.strictEqual(
+                    err.message,
+                    'Unable to connect to AWS. Console login was cancelled or did not complete successfully.'
+                )
+                assert.strictEqual(err.cancelled, true)
+                return true
+            }
+        )
+    })
+
     it('throws error when useConnection fails', async function () {
         sandbox.stub(vscode.commands, 'executeCommand').resolves()
+        sandbox.stub(Auth.instance, 'getConnection').resolves({ id: 'profile:test-profile' } as any)
         const error = new Error('useConnection failed')
         sandbox.stub(Auth.instance, 'useConnection').rejects(error)
 

packages/toolkit/.changes/next-release/Bug Fix-726900f0-c604-49ba-85ca-d35d454ffa9d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Lamdbda: Console-to-IDE transition shows \"Connection does not exist\" error when console login is cancelled or fail."
+}