Merge branch 'master' into master

Author: ashishrp-aws

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -11,7 +11,8 @@
                 "aws-cli",
                 "sam-cli",
                 "docker",
-                "finch"
+                "finch",
+                "path-resolver"
             ]
         },
         {

packages/core/src/shared/utilities/cliUtils.ts

@@ -55,7 +55,10 @@ interface Cli {
     exec?: string
 }
 
-export type AwsClis = Extract<ToolId, 'session-manager-plugin' | 'aws-cli' | 'sam-cli' | 'docker' | 'finch'>
+export type AwsClis = Extract<
+    ToolId,
+    'session-manager-plugin' | 'aws-cli' | 'sam-cli' | 'docker' | 'finch' | 'path-resolver'
+>
 
 /**
  * CLIs and their full filenames and download paths for their respective OSes
@@ -185,6 +188,15 @@ export const awsClis: { [cli in AwsClis]: Cli } = {
         manualInstallLink: 'https://runfinch.com/docs/getting-started/installation/',
         exec: 'finch',
     },
+    'path-resolver': {
+        command: {
+            windows: ['where'],
+            unix: ['which'],
+        },
+        source: {}, // OS utilities used to locate files and executables
+        name: 'Path resolver',
+        manualInstallLink: '',
+    },
 }
 
 /**
@@ -579,6 +591,24 @@ export async function updateAwsCli(): Promise<string> {
     }
 
     const result = await installCli('aws-cli', false)
+
+    // Get the which/ where command, run it to find the AWS CLI path, and display it to the user
+    const whichCommands = getOsCommands(awsClis['path-resolver'])
+    if (whichCommands && whichCommands.length > 0) {
+        const whichCmd = whichCommands[0]
+        const cliExec = awsClis['aws-cli'].exec
+        if (cliExec) {
+            getLogger().info(`Running "${whichCmd} ${cliExec}" to find AWS CLI path`)
+            const whichResult = await new ChildProcess(whichCmd, [cliExec]).run()
+            if (whichResult.exitCode === 0 && whichResult.stdout) {
+                const cliPath = whichResult.stdout.trim().split('\n')[0]
+                const cliInUseMessage = `Toolkit is using AWS CLI at "${cliPath}".`
+                getLogger().info(cliInUseMessage)
+                void vscode.window.showInformationMessage(cliInUseMessage)
+            }
+        }
+    }
+
     return result
 }
 

packages/core/src/test/shared/utilities/cliUtils.test.ts

@@ -5,16 +5,25 @@
 
 import assert from 'assert'
 import * as path from 'path'
-import { installCli } from '../../../shared/utilities/cliUtils'
+import sinon from 'sinon'
+import { installCli, updateAwsCli } from '../../../shared/utilities/cliUtils'
 import globals from '../../../shared/extensionGlobals'
 import { ChildProcess } from '../../../shared/utilities/processUtils'
 import { SeverityLevel } from '../vscode/message'
 import { assertTelemetryCurried } from '../../testUtil'
 import { getTestWindow } from '../../shared/vscode/window'
 import { fs } from '../../../shared'
+import { getOpenExternalStub } from '../../globalSetup.test'
 
 describe('cliUtils', async function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
     afterEach(async function () {
+        sandbox.restore()
         await fs.delete(path.join(globals.context.globalStorageUri.fsPath, 'tools'), { recursive: true, force: true })
     })
 
@@ -61,4 +70,78 @@ describe('cliUtils', async function () {
             })
         })
     })
+
+    describe('updateAwsCli', function () {
+        it('cancels when user does not confirm update', async function () {
+            getTestWindow().onDidShowMessage((m) => m.close())
+
+            await assert.rejects(() => updateAwsCli(), /cancelled/)
+        })
+
+        it('installs CLI and shows path when user confirms', async function () {
+            let messageCount = 0
+            getTestWindow().onDidShowMessage((m) => {
+                messageCount++
+                if (messageCount === 1 && m.items.some((i) => i.title === 'Update')) {
+                    m.selectItem('Update')
+                } else if (m.message.includes('not supported')) {
+                    // Toolkit shows "Auto install of AWS CLI is not supported on your platform"
+                    // with "Install manually..." button. We close this message to simulate the user dismissing it.
+                    m.close()
+                }
+            })
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({
+                exitCode: 0,
+                stdout: '/usr/local/bin/aws\n',
+                stderr: '',
+            } as any)
+
+            if (process.platform === 'linux') {
+                await assert.rejects(() => updateAwsCli(), /cancelled/)
+            } else {
+                const result = await updateAwsCli()
+                assert.ok(result)
+                const messages = getTestWindow().shownMessages
+                assert.ok(messages.some((m) => m.message.includes('/usr/local/bin/aws')))
+            }
+        })
+
+        it('opens manual install link when user selects "Install manually" on Linux', async function () {
+            let messageCount = 0
+            const openExternalStub = getOpenExternalStub().resolves(true)
+
+            getTestWindow().onDidShowMessage((m) => {
+                messageCount++
+                if (messageCount === 1 && m.items.some((i) => i.title === 'Update')) {
+                    m.selectItem('Update')
+                } else if (m.message.includes('not supported')) {
+                    // Linux: no installer source defined, so auto-install shows "not supported" message.
+                    // Simulate user clicking "Install manually..." button
+                    const manualInstallButton = m.items.find((i) => i.title === 'Install manually...')
+                    if (manualInstallButton) {
+                        m.selectItem(manualInstallButton.title)
+                    }
+                }
+            })
+
+            if (process.platform === 'linux') {
+                await assert.rejects(() => updateAwsCli(), /cancelled/)
+
+                // Verify the manual install link was opened
+                assert.ok(openExternalStub.calledOnce)
+                const openedUrl = openExternalStub.firstCall.args.toString()
+                assert.ok(openedUrl.includes('getting-started-install.html'))
+            } else {
+                // Non-Linux platforms should succeed (existing behavior)
+                sandbox.stub(ChildProcess.prototype, 'run').resolves({
+                    exitCode: 0,
+                    stdout: '/usr/local/bin/aws',
+                    stderr: '',
+                } as any)
+
+                const result = await updateAwsCli()
+                assert.ok(result)
+            }
+        })
+    })
 })

packages/toolkit/.changes/next-release/Bug Fix-b1fd8c29-a44d-46a5-8b88-8dcdc2e4dab3.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "AWS CLI update success message now shows the actual CLI installation path that the Toolkit uses for console credentials."
+}