Skip to content

fix(startup): Q may fail if Toolkit fails #5731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged

fix(startup): Q may fail if Toolkit fails #5731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
}
2 changes: 1 addition & 1 deletion packages/core/src/codewhisperer/commands/basicCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ export const registerToolkitApiCallback = Commands.declare(
} else if (isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
// when this command is executed by Amazon Q activation
const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
_toolkitApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
_toolkitApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
}
if (_toolkitApi) {
registerToolkitApiCallbackOnce()
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class AmazonQLoginWebview extends CommonAuthWebview {
}
await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
const importedApi = toolkitExt?.exports.getApi(VSCODE_EXTENSION_ID.amazonq)
const importedApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
if (importedApi && 'listConnections' in importedApi) {
return ((await importedApi?.listConnections()) as AwsConnection[]).filter(
// No need to display Builder ID as an existing connection,
Expand Down
13 changes: 2 additions & 11 deletions packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
import { getConfigFilename, getCredentialsFilename } from '../../../auth/credentials/sharedCredentialsFile'
import { fs } from '../../../shared'

/** Async version of "doesNotThrow" */
async function assertDoesNotThrow(fn: () => Promise<void>): Promise<void> {
try {
await fn()
} catch (err) {
assert.fail(`Provided function threw error ${err}`)
}
}

describe('UserCredentialsUtils', function () {
let tempFolder: string
let defaultConfigFileName: string
Expand Down Expand Up @@ -151,8 +142,8 @@ describe('UserCredentialsUtils', function () {
`creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
)

await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, 'r--'))
await assertDoesNotThrow(async () => await fs.checkPerms(credentialsFilename, '-w-'))
await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, 'r--'))
Copy link
Contributor

@jpinkney-aws jpinkney-aws Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes somehow related to this PR? Otherwise the change looks good to me

Copy link
Contributor Author

@justinmk3 justinmk3 Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no just a fixup for a recent commit

await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, '-w-'))
})
})

Expand Down
Loading