From de2ae73d0c0f7b03f58033f499dc4bfd7a4b6f21 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Mon, 7 Oct 2024 10:20:20 -0700 Subject: [PATCH 001/202] feat(cwl): Initialize TailLogGroup command with Wizard (#5722) ## Problem CWL is planning on supporting a LiveTail experience in AWSToolkit for VSCode ## Solution Registers `aws.cwl.tailLogGroup` as a recognized command in AWS Toolkit. In this PR, running this command will simply take the user through a Wizard to collect the configuration for the tailing session, and logs it. In follow up PRs, I will take this Wizard input and use it to call CWL APIs and output streamed LogEvents to a TextDocument. This command will be able to be executed in the command pallet, or by pressing a "play button" icon when viewing LogGroups in the CloudWatch Logs explorer menu. --- .../awsService/cloudWatchLogs/activation.ts | 11 +- .../cloudWatchLogs/commands/tailLogGroup.ts | 108 ++++++++++++ .../liveTailLogStreamSubmenu.ts | 166 ++++++++++++++++++ packages/core/src/shared/constants.ts | 8 + .../commands/tailLogGroup.test.ts | 28 +++ .../liveTailLogStreamSubmenu.test.ts | 74 ++++++++ packages/toolkit/package.json | 22 +++ 7 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts create mode 100644 packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts create mode 100644 packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts create mode 100644 packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index a186a8ba983..03760b158e7 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -19,6 +19,7 @@ import { searchLogGroup } from './commands/searchLogGroup' import { changeLogSearchParams } from './changeLogSearch' import { CloudWatchLogsNode } from './explorer/cloudWatchLogsNode' import { loadAndOpenInitialLogStreamFile, LogStreamCodeLensProvider } from './document/logStreamsCodeLensProvider' +import { tailLogGroup } from './commands/tailLogGroup' export async function activate(context: vscode.ExtensionContext, configuration: Settings): Promise { const registry = LogDataRegistry.instance @@ -89,6 +90,14 @@ export async function activate(context: vscode.ExtensionContext, configuration: Commands.register('aws.cwl.changeFilterPattern', async () => changeLogSearchParams(registry, 'filterPattern')), - Commands.register('aws.cwl.changeTimeFilter', async () => changeLogSearchParams(registry, 'timeFilter')) + Commands.register('aws.cwl.changeTimeFilter', async () => changeLogSearchParams(registry, 'timeFilter')), + + Commands.register('aws.cwl.tailLogGroup', async (node: LogGroupNode | CloudWatchLogsNode) => { + const logGroupInfo = + node instanceof LogGroupNode + ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! } + : undefined + await tailLogGroup(logGroupInfo) + }) ) } diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts new file mode 100644 index 00000000000..53903f9610d --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -0,0 +1,108 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as nls from 'vscode-nls' +import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient' +import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons' +import { createInputBox } from '../../../shared/ui/inputPrompter' +import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter' +import { Wizard } from '../../../shared/wizards/wizard' +import { CloudWatchLogsGroupInfo } from '../registry/logDataRegistry' +import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu' +import { CancellationError } from '../../../shared/utilities/timeoutUtils' +import { LogStreamFilterResponse, LogStreamFilterSubmenu } from '../liveTailLogStreamSubmenu' +import { getLogger, ToolkitError } from '../../../shared' +import { cwlFilterPatternHelpUrl } from '../../../shared/constants' + +const localize = nls.loadMessageBundle() + +export interface TailLogGroupWizardResponse { + regionLogGroupSubmenuResponse: RegionSubmenuResponse + logStreamFilter: LogStreamFilterResponse + filterPattern: string +} + +export async function tailLogGroup(logData?: { regionName: string; groupName: string }): Promise { + const wizard = new TailLogGroupWizard(logData) + const wizardResponse = await wizard.run() + if (!wizardResponse) { + throw new CancellationError('user') + } + + //TODO: Remove Log. For testing while we aren't yet consuming the wizardResponse. + getLogger().info(JSON.stringify(wizardResponse)) +} + +export class TailLogGroupWizard extends Wizard { + public constructor(logGroupInfo?: CloudWatchLogsGroupInfo) { + super({ + initState: { + regionLogGroupSubmenuResponse: logGroupInfo + ? { + data: logGroupInfo.groupName, + region: logGroupInfo.regionName, + } + : undefined, + }, + }) + this.form.regionLogGroupSubmenuResponse.bindPrompter(createRegionLogGroupSubmenu) + this.form.logStreamFilter.bindPrompter((state) => { + if (!state.regionLogGroupSubmenuResponse?.data) { + throw new ToolkitError('LogGroupName is null') + } + return new LogStreamFilterSubmenu( + state.regionLogGroupSubmenuResponse.data, + state.regionLogGroupSubmenuResponse.region + ) + }) + this.form.filterPattern.bindPrompter((state) => createFilterPatternPrompter()) + } +} + +export function createRegionLogGroupSubmenu(): RegionSubmenu { + return new RegionSubmenu( + getLogGroupQuickPickOptions, + { + title: localize('AWS.cwl.tailLogGroup.logGroupPromptTitle', 'Select Log Group to tail'), + buttons: [createExitButton()], + }, + { title: localize('AWS.cwl.tailLogGroup.regionPromptTitle', 'Select Region for Log Group') }, + 'LogGroups' + ) +} + +async function getLogGroupQuickPickOptions(regionCode: string): Promise[]> { + const client = new DefaultCloudWatchLogsClient(regionCode) + const logGroups = client.describeLogGroups() + + const logGroupsOptions: DataQuickPickItem[] = [] + + for await (const logGroupObject of logGroups) { + if (!logGroupObject.arn || !logGroupObject.logGroupName) { + throw new ToolkitError('LogGroupObject name or arn undefined') + } + + logGroupsOptions.push({ + label: logGroupObject.logGroupName, + data: formatLogGroupArn(logGroupObject.arn), + }) + } + + return logGroupsOptions +} + +function formatLogGroupArn(logGroupArn: string): string { + return logGroupArn.endsWith(':*') ? logGroupArn.substring(0, logGroupArn.length - 2) : logGroupArn +} + +export function createFilterPatternPrompter() { + const helpUri = cwlFilterPatternHelpUrl + return createInputBox({ + title: 'Provide log event filter pattern', + placeholder: 'filter pattern (case sensitive; empty matches all)', + prompt: 'Optional pattern to use to filter the results to include only log events that match the pattern.', + buttons: [createHelpButton(helpUri), createBackButton(), createExitButton()], + }) +} diff --git a/packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts new file mode 100644 index 00000000000..e39cd1b8282 --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts @@ -0,0 +1,166 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import { Prompter, PromptResult } from '../../shared/ui/prompter' +import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient' +import { createCommonButtons } from '../../shared/ui/buttons' +import { createInputBox, InputBoxPrompter } from '../../shared/ui/inputPrompter' +import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../shared/ui/pickerPrompter' +import { pageableToCollection } from '../../shared/utilities/collectionUtils' +import { CloudWatchLogs } from 'aws-sdk' +import { isValidResponse, StepEstimator } from '../../shared/wizards/wizard' +import { isNonNullable } from '../../shared/utilities/tsUtils' +import { + startLiveTailHelpUrl, + startLiveTailLogStreamNamesHelpUrl, + startLiveTailLogStreamPrefixHelpUrl, +} from '../../shared/constants' + +export type LogStreamFilterType = 'menu' | 'prefix' | 'specific' | 'all' + +export interface LogStreamFilterResponse { + readonly filter?: string + readonly type: LogStreamFilterType +} + +export class LogStreamFilterSubmenu extends Prompter { + private logStreamPrefixRegEx = /^[^:*]*$/ + private currentState: LogStreamFilterType = 'menu' + private steps?: [current: number, total: number] + private region: string + private logGroupArn: string + public defaultPrompter: QuickPickPrompter = this.createMenuPrompter() + + public constructor(logGroupArn: string, region: string) { + super() + this.region = region + this.logGroupArn = logGroupArn + } + + public createMenuPrompter() { + const helpUri = startLiveTailHelpUrl + const prompter = createQuickPick(this.menuOptions, { + title: 'Select LogStream filter type', + buttons: createCommonButtons(helpUri), + }) + return prompter + } + + private get menuOptions(): DataQuickPickItem[] { + const options: DataQuickPickItem[] = [] + options.push({ + label: 'All', + detail: 'Include log events from all LogStreams in the selected LogGroup', + data: 'all', + }) + options.push({ + label: 'Specific', + detail: 'Include log events from only a specific LogStream', + data: 'specific', + }) + options.push({ + label: 'Prefix', + detail: 'Include log events from LogStreams that begin with a provided prefix', + data: 'prefix', + }) + return options + } + + public createLogStreamPrefixBox(): InputBoxPrompter { + const helpUri = startLiveTailLogStreamPrefixHelpUrl + return createInputBox({ + title: 'Enter LogStream prefix', + placeholder: 'logStream prefix (case sensitive; empty matches all)', + prompt: 'Only log events in the LogStreams that have names that start with the prefix that you specify here are included in the Live Tail session', + validateInput: (input) => this.validateLogStreamPrefix(input), + buttons: createCommonButtons(helpUri), + }) + } + + public validateLogStreamPrefix(prefix: string) { + if (prefix.length > 512) { + return 'LogStream prefix cannot be longer than 512 characters' + } + + if (!this.logStreamPrefixRegEx.test(prefix)) { + return 'LogStream prefix must match pattern: [^:*]*' + } + } + + public createLogStreamSelector(): QuickPickPrompter { + const helpUri = startLiveTailLogStreamNamesHelpUrl + const client = new DefaultCloudWatchLogsClient(this.region) + const request: CloudWatchLogs.DescribeLogStreamsRequest = { + logGroupIdentifier: this.logGroupArn, + orderBy: 'LastEventTime', + descending: true, + } + const requester = (request: CloudWatchLogs.DescribeLogStreamsRequest) => client.describeLogStreams(request) + const collection = pageableToCollection(requester, request, 'nextToken', 'logStreams') + + const items = collection + .filter(isNonNullable) + .map((streams) => streams!.map((stream) => ({ data: stream.logStreamName!, label: stream.logStreamName! }))) + + return createQuickPick(items, { + title: 'Select LogStream', + buttons: createCommonButtons(helpUri), + }) + } + + private switchState(newState: LogStreamFilterType) { + this.currentState = newState + } + + protected async promptUser(): Promise> { + while (true) { + switch (this.currentState) { + case 'menu': { + const prompter = this.createMenuPrompter() + this.steps && prompter.setSteps(this.steps[0], this.steps[1]) + + const resp = await prompter.prompt() + if (resp === 'prefix') { + this.switchState('prefix') + } else if (resp === 'specific') { + this.switchState('specific') + } else if (resp === 'all') { + return { filter: undefined, type: resp } + } else { + return undefined + } + + break + } + case 'prefix': { + const resp = await this.createLogStreamPrefixBox().prompt() + if (isValidResponse(resp)) { + return { filter: resp, type: 'prefix' } + } + this.switchState('menu') + break + } + case 'specific': { + const resp = await this.createLogStreamSelector().prompt() + if (isValidResponse(resp)) { + return { filter: resp, type: 'specific' } + } + this.switchState('menu') + break + } + } + } + } + + public setSteps(current: number, total: number): void { + this.steps = [current, total] + } + + // Unused + public get recentItem(): any { + return + } + public set recentItem(response: any) {} + public setStepEstimator(estimator: StepEstimator): void {} +} diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts index 6d6cf842552..9ab654222e8 100644 --- a/packages/core/src/shared/constants.ts +++ b/packages/core/src/shared/constants.ts @@ -130,6 +130,14 @@ export const ecsIamPermissionsUrl = vscode.Uri.parse( export const CLOUDWATCH_LOGS_SCHEME = 'aws-cwl' // eslint-disable-line @typescript-eslint/naming-convention export const AWS_SCHEME = 'aws' // eslint-disable-line @typescript-eslint/naming-convention +export const startLiveTailHelpUrl = + 'https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartLiveTail.html' +export const startLiveTailLogStreamPrefixHelpUrl = `${startLiveTailHelpUrl}#CWL-StartLiveTail-request-logStreamNamePrefixes` +export const startLiveTailLogStreamNamesHelpUrl = `${startLiveTailHelpUrl}#CWL-StartLiveTail-request-logStreamNames` + +export const cwlFilterPatternHelpUrl = + 'https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html' + export const lambdaPackageTypeImage = 'Image' // URLs for App Runner diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts new file mode 100644 index 00000000000..4b2e382f38c --- /dev/null +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -0,0 +1,28 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import { TailLogGroupWizard } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup' +import { createWizardTester } from '../../../shared/wizards/wizardTestUtils' + +describe('TailLogGroupWizard', async function () { + it('prompts regionLogGroup submenu first if context not provided', async function () { + const wizard = new TailLogGroupWizard() + const tester = await createWizardTester(wizard) + tester.regionLogGroupSubmenuResponse.assertShowFirst() + tester.logStreamFilter.assertShowSecond() + tester.filterPattern.assertShowThird() + }) + + it('skips regionLogGroup submenu if context provided', async function () { + const wizard = new TailLogGroupWizard({ + groupName: 'test-groupName', + regionName: 'test-regionName', + }) + const tester = await createWizardTester(wizard) + tester.regionLogGroupSubmenuResponse.assertDoesNotShow() + tester.logStreamFilter.assertShowFirst() + tester.filterPattern.assertShowSecond() + }) +}) diff --git a/packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts new file mode 100644 index 00000000000..0ac71141b7a --- /dev/null +++ b/packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts @@ -0,0 +1,74 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { LogStreamFilterSubmenu } from '../../../awsService/cloudWatchLogs/liveTailLogStreamSubmenu' +import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../../shared/ui/testUtils' +import { getTestWindow } from '../../shared/vscode/window' + +describe('liveTailLogStreamSubmenu', async function () { + let logStreamFilterSubmenu: LogStreamFilterSubmenu + let logStreamMenuPrompter: QuickPickPrompterTester + const testRegion = 'us-east-1' + const testLogGroupArn = 'my-log-group-arn' + + beforeEach(async function () { + logStreamFilterSubmenu = new LogStreamFilterSubmenu(testRegion, testLogGroupArn) + logStreamMenuPrompter = createQuickPickPrompterTester(logStreamFilterSubmenu.defaultPrompter) + }) + + describe('Menu prompter', async function () { + it('gives option for each filter type', async function () { + logStreamMenuPrompter.assertContainsItems('All', 'Specific', 'Prefix') + logStreamMenuPrompter.acceptItem('All') + await logStreamMenuPrompter.result() + }) + }) + + describe('LogStream Prefix Submenu', function () { + it('accepts valid input', async function () { + const validInput = 'my-log-stream' + getTestWindow().onDidShowInputBox((input) => { + input.acceptValue(validInput) + }) + const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() + const result = inputBox.prompt() + assert.strictEqual(await result, validInput) + }) + + it('rejects invalid input (:)', async function () { + const invalidInput = 'my-log-stream:' + getTestWindow().onDidShowInputBox((input) => { + input.acceptValue(invalidInput) + assert.deepEqual(input.validationMessage, 'LogStream prefix must match pattern: [^:*]*') + input.hide() + }) + const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() + await inputBox.prompt() + }) + + it('rejects invalid input (*)', async function () { + const invalidInput = 'my-log-stream*' + getTestWindow().onDidShowInputBox((input) => { + input.acceptValue(invalidInput) + assert.deepEqual(input.validationMessage, 'LogStream prefix must match pattern: [^:*]*') + input.hide() + }) + const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() + await inputBox.prompt() + }) + + it('rejects invalid input (length)', async function () { + const invalidInput = 'a'.repeat(520) + getTestWindow().onDidShowInputBox((input) => { + input.acceptValue(invalidInput) + assert.deepEqual(input.validationMessage, 'LogStream prefix cannot be longer than 512 characters') + input.hide() + }) + const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() + await inputBox.prompt() + }) + }) +}) diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 3e957178a01..8054cb1a30e 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -1730,6 +1730,16 @@ "group": "inline@1", "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/" }, + { + "command": "aws.cwl.tailLogGroup", + "group": "0@1", + "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/" + }, + { + "command": "aws.cwl.tailLogGroup", + "group": "inline@1", + "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/" + }, { "command": "aws.apig.copyUrl", "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/", @@ -3123,6 +3133,18 @@ } } }, + { + "command": "aws.cwl.tailLogGroup", + "title": "%AWS.command.cloudWatchLogs.tailLogGroup%", + "category": "%AWS.title%", + "enablement": "isCloud9 || !aws.isWebExtHost", + "icon": "$(notebook-execute)", + "cloud9": { + "cn": { + "category": "%AWS.title.cn%" + } + } + }, { "command": "aws.saveCurrentLogDataContent", "title": "%AWS.command.saveCurrentLogDataContent%", From 78cb83cda4ef804b6ece8a4933add4a8528e1432 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 15 Oct 2024 06:55:27 -0700 Subject: [PATCH 002/202] feat(cwl): Create LiveTailSession object and registry. Adds MaxLine configuration (#5738) ## Problem 1. On the client side, VSCode needs to be aware of some additional context of a running LiveTail session, other than just the response from the StartLiveTail API call (Abort Controller, Max Lines config, TextDocument URI, etc). 2. Additionally, we want to be able to have multiple LiveTail sessions running, and have a way to organize all of them. ## Solution 1. Create a LiveTailSession class in AWSToolkit that will persist all of the metadata and context the LiveTail feature needs to operate. 2. Create a LiveTailSessionRegistry that maps a vscode URI to a LiveTailSession. The URI for a LiveTailSession is composed of the API request elements. This will allow us to tell when a user is making a duplicate request. This URI will also be used as the URI of the TextDocument to display the session results. ## Additional Changes * Adds VSCode preference config for LiveTail max events. This will be used to cap the number of live tail events can be in the TextDocument at a given time. When the limit is reached, the oldest log events will be dropped in order to fit new events streaming in. * Adds a missing String for "Tail Log Group" --- package-lock.json | 5539 ++++++++++------- packages/core/package.json | 1 + packages/core/package.nls.json | 2 + .../cloudWatchLogs/cloudWatchLogsUtils.ts | 5 +- .../registry/liveTailSession.ts | 93 + .../registry/liveTailSessionRegistry.ts | 48 + packages/core/src/shared/constants.ts | 2 + .../core/src/shared/settings-toolkit.gen.ts | 1 + .../registry/liveTailRegistry.test.ts | 136 + packages/toolkit/package.json | 7 + 10 files changed, 3648 insertions(+), 2186 deletions(-) create mode 100644 packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts create mode 100644 packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts create mode 100644 packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts diff --git a/package-lock.json b/package-lock.json index bd06c2c49e5..96d057dea54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,186 +61,267 @@ "resolved": "src.gen/@amzn/codewhisperer-streaming", "link": true }, - "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.637.0", + "node_modules/@aws-crypto/crc32": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", + "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.637.0", - "@aws-sdk/client-sts": "3.637.0", - "@aws-sdk/core": "3.635.0", - "@aws-sdk/credential-provider-node": "3.637.0", - "@aws-sdk/middleware-host-header": "3.620.0", - "@aws-sdk/middleware-logger": "3.609.0", - "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.637.0", - "@aws-sdk/region-config-resolver": "3.614.0", - "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.637.0", - "@aws-sdk/util-user-agent-browser": "3.609.0", - "@aws-sdk/util-user-agent-node": "3.614.0", - "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.4.0", - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/hash-node": "^3.0.3", - "@smithy/invalid-dependency": "^3.0.3", - "@smithy/middleware-content-length": "^3.0.5", - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.15", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.15", - "@smithy/util-defaults-mode-node": "^3.0.15", - "@smithy/util-endpoints": "^2.0.5", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "@smithy/util-utf8": "^3.0.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", + "node_modules/@aws-crypto/crc32/node_modules/@aws-sdk/types": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", + "node_modules/@aws-crypto/crc32/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/sha256-js": { + "node_modules/@aws-crypto/sha256-browser": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", + "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-js": "^5.2.0", + "@aws-crypto/supports-web-crypto": "^5.2.0", "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/@aws-sdk/types": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/util": { + "node_modules/@aws-crypto/sha256-js": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", + "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", + "node_modules/@aws-crypto/sha256-js/node_modules/@aws-sdk/types": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-crypto/sha256-js/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/abort-controller": { - "version": "3.1.1", + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", + "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/config-resolver": { - "version": "3.0.5", + "node_modules/@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/util/node_modules/@aws-sdk/types": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", + "node_modules/@aws-crypto/util/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/fetch-http-handler": { - "version": "3.2.4", + "node_modules/@aws-sdk/client-cloudwatch-logs": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.666.0.tgz", + "integrity": "sha512-6LHXxGtpDjpay9oO89chJAL7CZjhF3FTJ7I5GFc7TwVXzM+/1fYXJKAF17aV85OA0g1P+sXd/h9Qg4ZpyedZgw==", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.666.0", + "@aws-sdk/client-sts": "3.666.0", + "@aws-sdk/core": "3.666.0", + "@aws-sdk/credential-provider-node": "3.666.0", + "@aws-sdk/middleware-host-header": "3.664.0", + "@aws-sdk/middleware-logger": "3.664.0", + "@aws-sdk/middleware-recursion-detection": "3.664.0", + "@aws-sdk/middleware-user-agent": "3.666.0", + "@aws-sdk/region-config-resolver": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@aws-sdk/util-endpoints": "3.664.0", + "@aws-sdk/util-user-agent-browser": "3.664.0", + "@aws-sdk/util-user-agent-node": "3.666.0", + "@smithy/config-resolver": "^3.0.9", + "@smithy/core": "^2.4.8", + "@smithy/eventstream-serde-browser": "^3.0.10", + "@smithy/eventstream-serde-config-resolver": "^3.0.7", + "@smithy/eventstream-serde-node": "^3.0.9", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/hash-node": "^3.0.7", + "@smithy/invalid-dependency": "^3.0.7", + "@smithy/middleware-content-length": "^3.0.9", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-retry": "^3.0.23", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", "@smithy/util-base64": "^3.0.0", - "tslib": "^2.6.2" + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", + "@smithy/util-endpoints": "^2.1.3", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/hash-node": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sso": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.666.0.tgz", + "integrity": "sha512-+h5Xk64dM4on1MwjTYxlwtI8ilytU7zjTVRzMAYOysmH71Bc8YsLOfonFHvzhF/AXpKJu3f1BhM65S0tasPcrw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.666.0", + "@aws-sdk/middleware-host-header": "3.664.0", + "@aws-sdk/middleware-logger": "3.664.0", + "@aws-sdk/middleware-recursion-detection": "3.664.0", + "@aws-sdk/middleware-user-agent": "3.666.0", + "@aws-sdk/region-config-resolver": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@aws-sdk/util-endpoints": "3.664.0", + "@aws-sdk/util-user-agent-browser": "3.664.0", + "@aws-sdk/util-user-agent-node": "3.666.0", + "@smithy/config-resolver": "^3.0.9", + "@smithy/core": "^2.4.8", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/hash-node": "^3.0.7", + "@smithy/invalid-dependency": "^3.0.7", + "@smithy/middleware-content-length": "^3.0.9", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-retry": "^3.0.23", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", + "@smithy/util-endpoints": "^2.1.3", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -248,262 +329,459 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sso-oidc": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.666.0.tgz", + "integrity": "sha512-mW//v5EvHMU2SulW1FqmjJJPDNhzySRb/YUU+jq9AFDIYUdjF6j6wM+iavCW/4gLqOct0RT7B62z8jqyHkUCEQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.666.0", + "@aws-sdk/credential-provider-node": "3.666.0", + "@aws-sdk/middleware-host-header": "3.664.0", + "@aws-sdk/middleware-logger": "3.664.0", + "@aws-sdk/middleware-recursion-detection": "3.664.0", + "@aws-sdk/middleware-user-agent": "3.666.0", + "@aws-sdk/region-config-resolver": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@aws-sdk/util-endpoints": "3.664.0", + "@aws-sdk/util-user-agent-browser": "3.664.0", + "@aws-sdk/util-user-agent-node": "3.666.0", + "@smithy/config-resolver": "^3.0.9", + "@smithy/core": "^2.4.8", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/hash-node": "^3.0.7", + "@smithy/invalid-dependency": "^3.0.7", + "@smithy/middleware-content-length": "^3.0.9", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-retry": "^3.0.23", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", + "@smithy/util-endpoints": "^2.1.3", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.666.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sts": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.666.0.tgz", + "integrity": "sha512-tw8yxcxvaj0d/A4YJXIh3mISzsQe8rThIVKvpyhEdl1lEoz81skCccX5u3gHajciSdga/V0DxhBbsO+eE1bZkw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.666.0", + "@aws-sdk/core": "3.666.0", + "@aws-sdk/credential-provider-node": "3.666.0", + "@aws-sdk/middleware-host-header": "3.664.0", + "@aws-sdk/middleware-logger": "3.664.0", + "@aws-sdk/middleware-recursion-detection": "3.664.0", + "@aws-sdk/middleware-user-agent": "3.666.0", + "@aws-sdk/region-config-resolver": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@aws-sdk/util-endpoints": "3.664.0", + "@aws-sdk/util-user-agent-browser": "3.664.0", + "@aws-sdk/util-user-agent-node": "3.666.0", + "@smithy/config-resolver": "^3.0.9", + "@smithy/core": "^2.4.8", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/hash-node": "^3.0.7", + "@smithy/invalid-dependency": "^3.0.7", + "@smithy/middleware-content-length": "^3.0.9", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-retry": "^3.0.23", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.23", + "@smithy/util-defaults-mode-node": "^3.0.23", + "@smithy/util-endpoints": "^2.1.3", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/core": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.666.0.tgz", + "integrity": "sha512-jxNjs0sAVX+CWwoa4kHUENLHuBwjT1EILBoctmQoiIb1v5KpKwZnSByHTpvUkFmbuwWQPEnJkJCqzIHjEmjisA==", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/types": "3.664.0", + "@smithy/core": "^2.4.8", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/property-provider": "^3.1.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/signature-v4": "^4.2.0", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/util-middleware": "^3.0.7", + "fast-xml-parser": "4.4.1", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-content-length": { - "version": "3.0.5", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-env": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.664.0.tgz", + "integrity": "sha512-95rE+9Voaco0nmKJrXqfJAxSSkSWqlBy76zomiZrUrv7YuijQtHCW8jte6v6UHAFAaBzgFsY7QqBxs15u9SM7g==", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-endpoint": { - "version": "3.1.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-http": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.666.0.tgz", + "integrity": "sha512-j1Cob+tYmJ/m9agSsFPdAhLfILBqZzolF17XJvmEzQC2edltQ6NR0Wd09GQvtiAFZy7gn1l40bKuxX6Tq5U6XQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-middleware": "^3.0.3", + "@aws-sdk/types": "3.664.0", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/property-provider": "^3.1.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/util-stream": "^3.1.9", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-retry": { - "version": "3.0.15", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.666.0.tgz", + "integrity": "sha512-u09aUZJQNK8zVAKJKEOQ2mLsv39YxR20US00/WAPNW9sMWWhl4raT97tsalOUc6ZTHOEqHHmEVZXuscINnkaww==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/service-error-classification": "^3.0.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "tslib": "^2.6.2", - "uuid": "^9.0.1" + "@aws-sdk/credential-provider-env": "3.664.0", + "@aws-sdk/credential-provider-http": "3.666.0", + "@aws-sdk/credential-provider-process": "3.664.0", + "@aws-sdk/credential-provider-sso": "3.666.0", + "@aws-sdk/credential-provider-web-identity": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@smithy/credential-provider-imds": "^3.2.4", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.666.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-serde": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-node": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.666.0.tgz", + "integrity": "sha512-C43L9kxAb2lvIZ+eKVuyX9xYrkpg+Zyq0fLasK1wekC6M/Qj/uqE1KFz9ddDE8Dv1HwiE+UZk5psM0KatQpPGQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/credential-provider-env": "3.664.0", + "@aws-sdk/credential-provider-http": "3.666.0", + "@aws-sdk/credential-provider-ini": "3.666.0", + "@aws-sdk/credential-provider-process": "3.664.0", + "@aws-sdk/credential-provider-sso": "3.666.0", + "@aws-sdk/credential-provider-web-identity": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@smithy/credential-provider-imds": "^3.2.4", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-stack": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-process": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.664.0.tgz", + "integrity": "sha512-sQicIw/qWTsmMw8EUQNJXdrWV5SXaZc2zGdCQsQxhR6wwNO2/rZ5JmzdcwUADmleBVyPYk3KGLhcofF/qXT2Ng==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-config-provider": { - "version": "3.1.4", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-sso": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.666.0.tgz", + "integrity": "sha512-aaa5Ig8hI7lSh1CSQP0oaLvjylz6+3mKUgdvw69zv0MdX3TUZiQRDCsfqK0P3VNsj/QSvBytSjuNDuSaYcACJg==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", + "@aws-sdk/client-sso": "3.666.0", + "@aws-sdk/token-providers": "3.664.0", + "@aws-sdk/types": "3.664.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-http-handler": { - "version": "3.1.4", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.664.0.tgz", + "integrity": "sha512-10ltP1BfSKRJVXd8Yr5oLbo+VSDskWbps0X3szSsxTk0Dju1xvkz7hoIjylWLvtGbvQ+yb2pmsJYKCudW/4DJg==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^3.1.1", - "@smithy/protocol-http": "^4.1.0", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.664.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/property-provider": { - "version": "3.1.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-host-header": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.664.0.tgz", + "integrity": "sha512-4tCXJ+DZWTq38eLmFgnEmO8X4jfWpgPbWoCyVYpRHCPHq6xbrU65gfwS9jGx25L4YdEce641ChI9TKLryuUgRA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-logger": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.664.0.tgz", + "integrity": "sha512-eNykMqQuv7eg9pAcaLro44fscIe1VkFfhm+gYnlxd+PH6xqapRki1E68VHehnIptnVBdqnWfEqLUSLGm9suqhg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-builder": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.664.0.tgz", + "integrity": "sha512-jq27WMZhm+dY8BWZ9Ipy3eXtZj0lJzpaKQE3A3tH5AOIlUV/gqrmnJ9CdqVVef4EJsq9Yil4ZzQjKKmPsxveQg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-uri-escape": "^3.0.0", + "@aws-sdk/types": "3.664.0", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-parser": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.666.0.tgz", + "integrity": "sha512-d8XJ103SGCMsFIKEowpOaZr0W8AkLNd+3CS7W95yb6YmN7lcNGL54RtTSy3m8YJI6W2jXftPFN2oLG4K3aywVQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/core": "3.666.0", + "@aws-sdk/types": "3.664.0", + "@aws-sdk/util-endpoints": "3.664.0", + "@smithy/core": "^2.4.8", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/service-error-classification": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/region-config-resolver": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.664.0.tgz", + "integrity": "sha512-o/B8dg8K+9714RGYPgMxZgAChPe/MTSMkf/eHXTUFHNik5i1HgVKfac22njV2iictGy/6GhpFsKa1OWNYAkcUg==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0" + "@aws-sdk/types": "3.664.0", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.7", + "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.4", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/token-providers": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.664.0.tgz", + "integrity": "sha512-dBAvXW2/6bAxidvKARFxyCY2uCynYBKRFN00NhS1T5ggxm3sUnuTpWw1DTjl02CVPkacBOocZf10h8pQbHSK8w==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sso-oidc": "^3.664.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/smithy-client": { - "version": "3.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/types": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz", + "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "@smithy/util-stream": "^3.1.3", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-endpoints": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.664.0.tgz", + "integrity": "sha512-KrXoHz6zmAahVHkyWMRT+P6xJaxItgmklxEDrT+npsUB4d5C/lhw16Crcp9TDi828fiZK3GYKRAmmNhvmzvBNg==", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/types": "3.664.0", + "@smithy/types": "^3.5.0", + "@smithy/util-endpoints": "^2.1.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/url-parser": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.664.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.664.0.tgz", + "integrity": "sha512-c/PV3+f1ss4PpskHbcOxTZ6fntV2oXy/xcDR9nW+kVaz5cM1G702gF0rvGLKPqoBwkj2rWGe6KZvEBeLzynTUQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^3.0.3", - "@smithy/types": "^3.3.0", + "@aws-sdk/types": "3.664.0", + "@smithy/types": "^3.5.0", + "bowser": "^2.11.0", "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-base64": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.666.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.666.0.tgz", + "integrity": "sha512-DzbOMcAqrn51Z0fz5FvofaYmQA+sOJKO2cb8zQrix3TkzsTw1vRLo/cgQUJuJRGptbQCe1gnj7+21Gd5hpU6Ag==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@aws-sdk/middleware-user-agent": "3.666.0", + "@aws-sdk/types": "3.664.0", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/abort-controller": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz", + "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz", + "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==", "license": "Apache-2.0", "dependencies": { + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-body-length-node": { + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/is-array-buffer": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -512,357 +790,383 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz", + "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==", "license": "Apache-2.0", "dependencies": { + "@smithy/middleware-serde": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-middleware": "^3.0.7", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.15", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-retry": { + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz", + "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==", "license": "Apache-2.0", "dependencies": { - "@smithy/config-resolver": "^3.0.5", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@smithy/node-config-provider": "^3.1.8", + "@smithy/protocol-http": "^4.1.4", + "@smithy/service-error-classification": "^3.0.7", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", + "tslib": "^2.6.2", + "uuid": "^9.0.1" }, "engines": { - "node": ">= 10.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-hex-encoding": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-serde": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz", + "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-middleware": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-stack": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz", + "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-retry": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^3.0.3", - "@smithy/types": "^3.3.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-stream": { - "version": "3.1.3", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/node-http-handler": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz", + "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", + "@smithy/abort-controller": "^3.1.5", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-uri-escape": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-utf8": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/querystring-builder": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz", + "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", + "@smithy/types": "^3.5.0", + "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/querystring-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", + "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda": { - "version": "3.637.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/service-error-classification": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz", + "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.637.0", - "@aws-sdk/client-sts": "3.637.0", - "@aws-sdk/core": "3.635.0", - "@aws-sdk/credential-provider-node": "3.637.0", - "@aws-sdk/middleware-host-header": "3.620.0", - "@aws-sdk/middleware-logger": "3.609.0", - "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.637.0", - "@aws-sdk/region-config-resolver": "3.614.0", - "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.637.0", - "@aws-sdk/util-user-agent-browser": "3.609.0", - "@aws-sdk/util-user-agent-node": "3.614.0", - "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.4.0", - "@smithy/eventstream-serde-browser": "^3.0.6", - "@smithy/eventstream-serde-config-resolver": "^3.0.3", - "@smithy/eventstream-serde-node": "^3.0.5", - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/hash-node": "^3.0.3", - "@smithy/invalid-dependency": "^3.0.3", - "@smithy/middleware-content-length": "^3.0.5", - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.15", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.15", - "@smithy/util-defaults-mode-node": "^3.0.15", - "@smithy/util-endpoints": "^2.0.5", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "@smithy/util-stream": "^3.1.3", - "@smithy/util-utf8": "^3.0.0", - "@smithy/util-waiter": "^3.1.2", - "tslib": "^2.6.2" + "@smithy/types": "^3.5.0" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/crc32": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/smithy-client": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", + "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "@smithy/util-stream": "^3.1.9", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/url-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", + "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", "license": "Apache-2.0", "dependencies": { + "@smithy/querystring-parser": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/util": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-base64": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/abort-controller": { - "version": "3.1.1", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/config-resolver": { - "version": "3.0.5", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-retry": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz", + "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", + "@smithy/service-error-classification": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-stream": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz", + "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/eventstream-codec": { - "version": "3.1.2", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/crc32": "5.2.0", - "@smithy/types": "^3.3.0", - "@smithy/util-hex-encoding": "^3.0.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/eventstream-serde-browser": { - "version": "3.0.6", + "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^3.0.5", - "@smithy/types": "^3.3.0", + "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/eventstream-serde-config-resolver": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cognito-identity": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.637.0", + "@aws-sdk/client-sts": "3.637.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/eventstream-serde-node": { - "version": "3.0.5", + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/types": { + "version": "3.609.0", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-serde-universal": "^3.0.5", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -870,11 +1174,10 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/eventstream-serde-universal": { - "version": "3.0.5", + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/abort-controller": { + "version": "3.1.1", "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-codec": "^3.1.2", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -882,7 +1185,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/fetch-http-handler": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/fetch-http-handler": { "version": "3.2.4", "license": "Apache-2.0", "dependencies": { @@ -893,78 +1196,34 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/hash-node": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.0", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-content-length": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-endpoint": { - "version": "3.1.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-retry": { - "version": "3.0.15", + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-retry": { + "version": "3.0.15", "license": "Apache-2.0", "dependencies": { "@smithy/node-config-provider": "^3.1.4", @@ -981,7 +1240,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -992,7 +1251,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1003,7 +1262,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1016,7 +1275,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1030,7 +1289,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -1041,7 +1300,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -1052,7 +1311,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1064,7 +1323,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1075,7 +1334,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/service-error-classification": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/service-error-classification": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1085,7 +1344,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1096,7 +1355,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -1111,7 +1370,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/types": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -1121,7 +1380,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1130,7 +1389,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1142,7 +1401,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1153,64 +1412,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/config-resolver": "^3.0.5", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1220,7 +1422,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-middleware": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1231,7 +1433,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-retry": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-retry": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1243,7 +1445,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-stream": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-stream": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -1260,7 +1462,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1271,7 +1473,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-uri-escape": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1281,7 +1483,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-utf8": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1292,7 +1494,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1303,13 +1505,16 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso": { + "node_modules/@aws-sdk/client-lambda": { "version": "3.637.0", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.637.0", + "@aws-sdk/client-sts": "3.637.0", "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", "@aws-sdk/middleware-host-header": "3.620.0", "@aws-sdk/middleware-logger": "3.609.0", "@aws-sdk/middleware-recursion-detection": "3.620.0", @@ -1321,6 +1526,9 @@ "@aws-sdk/util-user-agent-node": "3.614.0", "@smithy/config-resolver": "^3.0.5", "@smithy/core": "^2.4.0", + "@smithy/eventstream-serde-browser": "^3.0.6", + "@smithy/eventstream-serde-config-resolver": "^3.0.3", + "@smithy/eventstream-serde-node": "^3.0.5", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/hash-node": "^3.0.3", "@smithy/invalid-dependency": "^3.0.3", @@ -1343,259 +1551,75 @@ "@smithy/util-endpoints": "^2.0.5", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", + "@smithy/util-stream": "^3.1.3", "@smithy/util-utf8": "^3.0.0", + "@smithy/util-waiter": "^3.1.2", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.637.0", + "node_modules/@aws-sdk/client-lambda/node_modules/@aws-sdk/types": { + "version": "3.609.0", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.635.0", - "@aws-sdk/credential-provider-node": "3.637.0", - "@aws-sdk/middleware-host-header": "3.620.0", - "@aws-sdk/middleware-logger": "3.609.0", - "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.637.0", - "@aws-sdk/region-config-resolver": "3.614.0", - "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.637.0", - "@aws-sdk/util-user-agent-browser": "3.609.0", - "@aws-sdk/util-user-agent-node": "3.614.0", - "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.4.0", - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/hash-node": "^3.0.3", - "@smithy/invalid-dependency": "^3.0.3", - "@smithy/middleware-content-length": "^3.0.5", - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.15", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.15", - "@smithy/util-defaults-mode-node": "^3.0.15", - "@smithy/util-endpoints": "^2.0.5", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.637.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/abort-controller": { + "version": "3.1.1", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/util": { - "version": "5.2.0", + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.4", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.0", "license": "Apache-2.0", "dependencies": { + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/abort-controller": { - "version": "3.1.1", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/config-resolver": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/fetch-http-handler": { - "version": "3.2.4", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", - "@smithy/util-base64": "^3.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/hash-node": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-content-length": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-endpoint": { - "version": "3.1.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-retry": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-retry": { "version": "3.0.15", "license": "Apache-2.0", "dependencies": { @@ -1613,7 +1637,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1624,7 +1648,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1635,7 +1659,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1648,7 +1672,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1662,7 +1686,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -1673,7 +1697,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -1684,7 +1708,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1696,7 +1720,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1707,7 +1731,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/service-error-classification": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/service-error-classification": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1717,7 +1741,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -1728,7 +1752,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -1743,7 +1767,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/types": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -1753,7 +1777,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1762,7 +1786,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1774,7 +1798,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1785,64 +1809,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/config-resolver": "^3.0.5", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1852,7 +1819,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-middleware": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1863,7 +1830,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-retry": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-retry": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -1875,7 +1842,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-stream": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-stream": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -1892,7 +1859,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1903,7 +1870,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-uri-escape": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1913,7 +1880,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1924,7 +1891,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -1935,120 +1902,127 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/util": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/client-sso": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/abort-controller": { - "version": "3.1.1", + "node_modules/@aws-sdk/client-sso-oidc": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.637.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/config-resolver": { - "version": "3.0.5", + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/types": { + "version": "3.609.0", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/abort-controller": { + "version": "3.1.1", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/fetch-http-handler": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/fetch-http-handler": { "version": "3.2.4", "license": "Apache-2.0", "dependencies": { @@ -2059,39 +2033,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/hash-node": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/is-array-buffer": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/is-array-buffer": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2101,19 +2043,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-content-length": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-endpoint": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-endpoint": { "version": "3.1.0", "license": "Apache-2.0", "dependencies": { @@ -2129,7 +2059,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-retry": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-retry": { "version": "3.0.15", "license": "Apache-2.0", "dependencies": { @@ -2147,7 +2077,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2158,7 +2088,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2169,7 +2099,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2182,7 +2112,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2196,7 +2126,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -2207,7 +2137,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -2218,7 +2148,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2230,7 +2160,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2241,7 +2171,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/service-error-classification": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/service-error-classification": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2251,7 +2181,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2262,7 +2192,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -2277,7 +2207,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/types": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -2287,7 +2217,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2296,7 +2226,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2308,7 +2238,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2319,64 +2249,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.15", - "license": "Apache-2.0", - "dependencies": { - "@smithy/config-resolver": "^3.0.5", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2386,7 +2259,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-middleware": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2397,7 +2270,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-retry": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-retry": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2409,7 +2282,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-stream": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-stream": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -2426,7 +2299,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2437,7 +2310,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-uri-escape": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2447,7 +2320,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2458,7 +2331,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2469,119 +2342,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts": { - "version": "3.637.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.637.0", - "@aws-sdk/core": "3.635.0", - "@aws-sdk/credential-provider-node": "3.637.0", - "@aws-sdk/middleware-host-header": "3.620.0", - "@aws-sdk/middleware-logger": "3.609.0", - "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.637.0", - "@aws-sdk/region-config-resolver": "3.614.0", - "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.637.0", - "@aws-sdk/util-user-agent-browser": "3.609.0", - "@aws-sdk/util-user-agent-node": "3.614.0", - "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.4.0", - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/hash-node": "^3.0.3", - "@smithy/invalid-dependency": "^3.0.3", - "@smithy/middleware-content-length": "^3.0.5", - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.15", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.15", - "@smithy/util-defaults-mode-node": "^3.0.15", - "@smithy/util-endpoints": "^2.0.5", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/util": { - "version": "5.2.0", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/types": { "version": "3.609.0", "license": "Apache-2.0", "dependencies": { @@ -2592,7 +2353,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/abort-controller": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/abort-controller": { "version": "3.1.1", "license": "Apache-2.0", "dependencies": { @@ -2603,35 +2364,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/config-resolver": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/fetch-http-handler": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/fetch-http-handler": { "version": "3.2.4", "license": "Apache-2.0", "dependencies": { @@ -2642,39 +2375,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/hash-node": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/is-array-buffer": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/is-array-buffer": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2684,19 +2385,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-content-length": { - "version": "3.0.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-endpoint": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-endpoint": { "version": "3.1.0", "license": "Apache-2.0", "dependencies": { @@ -2712,7 +2401,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-retry": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-retry": { "version": "3.0.15", "license": "Apache-2.0", "dependencies": { @@ -2730,7 +2419,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2741,7 +2430,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2752,7 +2441,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2765,7 +2454,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2779,7 +2468,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -2790,7 +2479,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -2801,7 +2490,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2813,7 +2502,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2824,7 +2513,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/service-error-classification": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/service-error-classification": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2834,7 +2523,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -2845,7 +2534,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -2860,7 +2549,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/types": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -2870,7 +2559,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -2879,7 +2568,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2891,7 +2580,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2902,64 +2591,68 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-body-length-browser": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-middleware": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-retry": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.15", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-stream": { + "version": "3.1.3", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/node-http-handler": "^3.1.4", "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 10.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.15", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/config-resolver": "^3.0.5", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">= 10.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -2969,39 +2662,70 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-middleware": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-retry": { - "version": "3.0.3", + "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^3.0.3", - "@smithy/types": "^3.3.0", + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-stream": { - "version": "3.1.3", + "node_modules/@aws-sdk/client-sts": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.637.0", + "@aws-sdk/core": "3.635.0", + "@aws-sdk/credential-provider-node": "3.637.0", + "@aws-sdk/middleware-host-header": "3.620.0", + "@aws-sdk/middleware-logger": "3.609.0", + "@aws-sdk/middleware-recursion-detection": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.637.0", + "@aws-sdk/region-config-resolver": "3.614.0", + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@aws-sdk/util-user-agent-browser": "3.609.0", + "@aws-sdk/util-user-agent-node": "3.614.0", + "@smithy/config-resolver": "^3.0.5", + "@smithy/core": "^2.4.0", "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/hash-node": "^3.0.3", + "@smithy/invalid-dependency": "^3.0.3", + "@smithy/middleware-content-length": "^3.0.5", + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-retry": "^3.0.15", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", "@smithy/node-http-handler": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-body-length-node": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.15", + "@smithy/util-defaults-mode-node": "^3.0.15", + "@smithy/util-endpoints": "^2.0.5", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -3009,69 +2733,18 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-uri-escape": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/core": { - "version": "3.635.0", + "node_modules/@aws-sdk/client-sts/node_modules/@aws-sdk/types": { + "version": "3.609.0", "license": "Apache-2.0", "dependencies": { - "@smithy/core": "^2.4.0", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/protocol-http": "^4.1.0", - "@smithy/signature-v4": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", - "@smithy/util-middleware": "^3.0.3", - "fast-xml-parser": "4.4.1", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/abort-controller": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/abort-controller": { "version": "3.1.1", "license": "Apache-2.0", "dependencies": { @@ -3082,7 +2755,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/fetch-http-handler": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/fetch-http-handler": { "version": "3.2.4", "license": "Apache-2.0", "dependencies": { @@ -3093,7 +2766,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/is-array-buffer": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/is-array-buffer": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3103,7 +2776,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-endpoint": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-endpoint": { "version": "3.1.0", "license": "Apache-2.0", "dependencies": { @@ -3119,7 +2792,25 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-retry": { + "version": "3.0.15", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.4", + "@smithy/protocol-http": "^4.1.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3130,7 +2821,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3141,7 +2832,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3154,7 +2845,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3168,7 +2859,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -3179,7 +2870,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -3190,7 +2881,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3202,7 +2893,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3213,7 +2904,17 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/service-error-classification": { + "version": "3.0.3", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3224,7 +2925,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -3239,7 +2940,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/types": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -3249,7 +2950,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3258,7 +2959,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3270,7 +2971,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3281,7 +2982,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3291,7 +2992,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-middleware": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3302,7 +3003,19 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-stream": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-retry": { + "version": "3.0.3", + "license": "Apache-2.0", + "dependencies": { + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-stream": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -3319,76 +3032,69 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-uri-escape": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/core/node_modules/@smithy/util-utf8": { + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.46.0", + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/property-provider": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/types": { - "version": "3.46.0", - "license": "Apache-2.0", - "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.635.0", + "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.609.0", - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/util-stream": "^3.1.3", + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/core": { + "version": "3.635.0", "license": "Apache-2.0", "dependencies": { + "@smithy/core": "^2.4.0", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/signature-v4": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "fast-xml-parser": "4.4.1", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/abort-controller": { + "node_modules/@aws-sdk/core/node_modules/@smithy/abort-controller": { "version": "3.1.1", "license": "Apache-2.0", "dependencies": { @@ -3399,7 +3105,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/fetch-http-handler": { + "node_modules/@aws-sdk/core/node_modules/@smithy/fetch-http-handler": { "version": "3.2.4", "license": "Apache-2.0", "dependencies": { @@ -3410,7 +3116,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/is-array-buffer": { + "node_modules/@aws-sdk/core/node_modules/@smithy/is-array-buffer": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3420,7 +3126,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-endpoint": { + "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-endpoint": { "version": "3.1.0", "license": "Apache-2.0", "dependencies": { @@ -3436,7 +3142,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-serde": { + "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-serde": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3447,7 +3153,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-stack": { + "node_modules/@aws-sdk/core/node_modules/@smithy/middleware-stack": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3458,7 +3164,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-config-provider": { + "node_modules/@aws-sdk/core/node_modules/@smithy/node-config-provider": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3471,7 +3177,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-http-handler": { + "node_modules/@aws-sdk/core/node_modules/@smithy/node-http-handler": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3485,7 +3191,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/property-provider": { + "node_modules/@aws-sdk/core/node_modules/@smithy/property-provider": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -3496,7 +3202,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/protocol-http": { + "node_modules/@aws-sdk/core/node_modules/@smithy/protocol-http": { "version": "4.1.0", "license": "Apache-2.0", "dependencies": { @@ -3507,7 +3213,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/querystring-builder": { + "node_modules/@aws-sdk/core/node_modules/@smithy/querystring-builder": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3519,7 +3225,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/querystring-parser": { + "node_modules/@aws-sdk/core/node_modules/@smithy/querystring-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3530,7 +3236,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/shared-ini-file-loader": { + "node_modules/@aws-sdk/core/node_modules/@smithy/shared-ini-file-loader": { "version": "3.1.4", "license": "Apache-2.0", "dependencies": { @@ -3541,7 +3247,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/smithy-client": { + "node_modules/@aws-sdk/core/node_modules/@smithy/smithy-client": { "version": "3.2.0", "license": "Apache-2.0", "dependencies": { @@ -3556,7 +3262,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/types": { + "node_modules/@aws-sdk/core/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -3566,7 +3272,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/url-parser": { + "node_modules/@aws-sdk/core/node_modules/@smithy/url-parser": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3575,7 +3281,7 @@ "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-base64": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-base64": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3587,7 +3293,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-buffer-from": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3598,7 +3304,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-hex-encoding": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3608,7 +3314,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-middleware": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", "dependencies": { @@ -3619,7 +3325,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-stream": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-stream": { "version": "3.1.3", "license": "Apache-2.0", "dependencies": { @@ -3636,7 +3342,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-uri-escape": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3646,7 +3352,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-utf8": { + "node_modules/@aws-sdk/core/node_modules/@smithy/util-utf8": { "version": "3.0.0", "license": "Apache-2.0", "dependencies": { @@ -3657,368 +3363,338 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds": { + "node_modules/@aws-sdk/credential-provider-env": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/node-config-provider": "3.46.0", "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/types": "3.46.0", - "@aws-sdk/url-parser": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/node-config-provider": { + "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/types": { "version": "3.46.0", "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/property-provider": "3.46.0", - "@aws-sdk/shared-ini-file-loader": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" - }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/querystring-parser": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http": { + "version": "3.635.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@aws-sdk/types": "3.609.0", + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/property-provider": "^3.1.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/smithy-client": "^3.2.0", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.1.3", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": { + "version": "3.609.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/types": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/abort-controller": { + "version": "3.1.1", "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/url-parser": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.4", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/querystring-parser": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/protocol-http": "^4.1.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-base64": "^3.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.46.0", - "@aws-sdk/credential-provider-imds": "3.46.0", - "@aws-sdk/credential-provider-sso": "3.46.0", - "@aws-sdk/credential-provider-web-identity": "3.46.0", - "@aws-sdk/property-provider": "3.46.0", - "@aws-sdk/shared-ini-file-loader": "3.46.0", - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-credentials": "3.46.0", - "tslib": "^2.3.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/ie11-detection": { - "version": "2.0.2", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^1.11.1" + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.4", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-browser": { - "version": "2.0.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-serde": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/ie11-detection": "^2.0.0", - "@aws-crypto/sha256-js": "^2.0.0", - "@aws-crypto/supports-web-crypto": "^2.0.0", - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-js": { - "version": "2.0.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-stack": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", - "tslib": "^1.11.1" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-js/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/supports-web-crypto": { - "version": "2.0.2", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-config-provider": { + "version": "3.1.4", "license": "Apache-2.0", "dependencies": { - "tslib": "^1.11.1" + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util": { - "version": "2.0.2", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-http-handler": { + "version": "3.1.4", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "^3.110.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/abort-controller": "^3.1.1", + "@smithy/protocol-http": "^4.1.0", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/@aws-sdk/types": { - "version": "3.342.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/property-provider": { + "version": "3.1.3", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/@aws-sdk/types/node_modules/tslib": { - "version": "2.5.3", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/tslib": { - "version": "1.14.1", - "license": "0BSD" - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/abort-controller": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/protocol-http": { + "version": "4.1.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/client-sso": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/querystring-builder": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.46.0", - "@aws-sdk/fetch-http-handler": "3.46.0", - "@aws-sdk/hash-node": "3.46.0", - "@aws-sdk/invalid-dependency": "3.46.0", - "@aws-sdk/middleware-content-length": "3.46.0", - "@aws-sdk/middleware-host-header": "3.46.0", - "@aws-sdk/middleware-logger": "3.46.0", - "@aws-sdk/middleware-retry": "3.46.0", - "@aws-sdk/middleware-serde": "3.46.0", - "@aws-sdk/middleware-stack": "3.46.0", - "@aws-sdk/middleware-user-agent": "3.46.0", - "@aws-sdk/node-config-provider": "3.46.0", - "@aws-sdk/node-http-handler": "3.46.0", - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/smithy-client": "3.46.0", - "@aws-sdk/types": "3.46.0", - "@aws-sdk/url-parser": "3.46.0", - "@aws-sdk/util-base64-browser": "3.46.0", - "@aws-sdk/util-base64-node": "3.46.0", - "@aws-sdk/util-body-length-browser": "3.46.0", - "@aws-sdk/util-body-length-node": "3.46.0", - "@aws-sdk/util-user-agent-browser": "3.46.0", - "@aws-sdk/util-user-agent-node": "3.46.0", - "@aws-sdk/util-utf8-browser": "3.46.0", - "@aws-sdk/util-utf8-node": "3.46.0", - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "@smithy/util-uri-escape": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/config-resolver": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/querystring-parser": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/signature-v4": "3.46.0", - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-config-provider": "3.46.0", - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.4", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.46.0", - "@aws-sdk/property-provider": "3.46.0", - "@aws-sdk/shared-ini-file-loader": "3.46.0", - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-credentials": "3.46.0", - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/fetch-http-handler": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/smithy-client": { + "version": "3.2.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/querystring-builder": "3.46.0", - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-base64-browser": "3.46.0", - "tslib": "^2.3.0" + "@smithy/middleware-endpoint": "^3.1.0", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.1.3", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/hash-node": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/types": { + "version": "3.3.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-buffer-from": "3.46.0", - "tslib": "^2.3.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/invalid-dependency": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/url-parser": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/querystring-parser": "^3.0.3", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/is-array-buffer": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-base64": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-content-length": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-host-header": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-logger": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-middleware": { + "version": "3.0.3", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-retry": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-stream": { + "version": "3.1.3", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/service-error-classification": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0", - "uuid": "^8.3.2" + "@smithy/fetch-http-handler": "^3.2.4", + "@smithy/node-http-handler": "^3.1.4", + "@smithy/types": "^3.3.0", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-serde": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-stack": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-utf8": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 12.0.0" + "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-user-agent": { + "node_modules/@aws-sdk/credential-provider-imds": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/node-config-provider": "3.46.0", + "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/types": "3.46.0", + "@aws-sdk/url-parser": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/node-config-provider": { + "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/node-config-provider": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { @@ -4031,13 +3707,10 @@ "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/node-http-handler": { + "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/querystring-parser": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/abort-controller": "3.46.0", - "@aws-sdk/protocol-http": "3.46.0", - "@aws-sdk/querystring-builder": "3.46.0", "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, @@ -4045,455 +3718,508 @@ "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/protocol-http": { + "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/shared-ini-file-loader": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/querystring-builder": { + "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/types": { "version": "3.46.0", "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.46.0", - "@aws-sdk/util-uri-escape": "3.46.0", - "tslib": "^2.3.0" - }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/querystring-parser": { + "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/url-parser": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/querystring-parser": "3.46.0", "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" - }, - "engines": { - "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/service-error-classification": { + "node_modules/@aws-sdk/credential-provider-ini": { "version": "3.46.0", "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.46.0", + "@aws-sdk/credential-provider-imds": "3.46.0", + "@aws-sdk/credential-provider-sso": "3.46.0", + "@aws-sdk/credential-provider-web-identity": "3.46.0", + "@aws-sdk/property-provider": "3.46.0", + "@aws-sdk/shared-ini-file-loader": "3.46.0", + "@aws-sdk/types": "3.46.0", + "@aws-sdk/util-credentials": "3.46.0", + "tslib": "^2.3.0" + }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/ie11-detection": { + "version": "2.0.2", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": ">= 12.0.0" + "tslib": "^1.11.1" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/smithy-client": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-browser": { + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-stack": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" - }, - "engines": { - "node": ">= 12.0.0" + "@aws-crypto/ie11-detection": "^2.0.0", + "@aws-crypto/sha256-js": "^2.0.0", + "@aws-crypto/supports-web-crypto": "^2.0.0", + "@aws-crypto/util": "^2.0.0", + "@aws-sdk/types": "^3.1.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-js": { + "version": "2.0.0", "license": "Apache-2.0", - "engines": { - "node": ">= 12.0.0" + "dependencies": { + "@aws-crypto/util": "^2.0.0", + "@aws-sdk/types": "^3.1.0", + "tslib": "^1.11.1" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/url-parser": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/sha256-js/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/supports-web-crypto": { + "version": "2.0.2", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/querystring-parser": "3.46.0", - "@aws-sdk/types": "3.46.0", - "tslib": "^2.3.0" + "tslib": "^1.11.1" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-body-length-browser": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util": { + "version": "2.0.2", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@aws-sdk/types": "^3.110.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-body-length-node": { - "version": "3.46.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/@aws-sdk/types": { + "version": "3.342.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "tslib": "^2.5.0" }, "engines": { - "node": ">= 12.0.0" + "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-buffer-from": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/@aws-sdk/types/node_modules/tslib": { + "version": "2.5.3", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-crypto/util/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/abort-controller": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/is-array-buffer": "3.46.0", + "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-config-provider": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/client-sso": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-crypto/sha256-browser": "2.0.0", + "@aws-crypto/sha256-js": "2.0.0", + "@aws-sdk/config-resolver": "3.46.0", + "@aws-sdk/fetch-http-handler": "3.46.0", + "@aws-sdk/hash-node": "3.46.0", + "@aws-sdk/invalid-dependency": "3.46.0", + "@aws-sdk/middleware-content-length": "3.46.0", + "@aws-sdk/middleware-host-header": "3.46.0", + "@aws-sdk/middleware-logger": "3.46.0", + "@aws-sdk/middleware-retry": "3.46.0", + "@aws-sdk/middleware-serde": "3.46.0", + "@aws-sdk/middleware-stack": "3.46.0", + "@aws-sdk/middleware-user-agent": "3.46.0", + "@aws-sdk/node-config-provider": "3.46.0", + "@aws-sdk/node-http-handler": "3.46.0", + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/smithy-client": "3.46.0", + "@aws-sdk/types": "3.46.0", + "@aws-sdk/url-parser": "3.46.0", + "@aws-sdk/util-base64-browser": "3.46.0", + "@aws-sdk/util-base64-node": "3.46.0", + "@aws-sdk/util-body-length-browser": "3.46.0", + "@aws-sdk/util-body-length-node": "3.46.0", + "@aws-sdk/util-user-agent-browser": "3.46.0", + "@aws-sdk/util-user-agent-node": "3.46.0", + "@aws-sdk/util-utf8-browser": "3.46.0", + "@aws-sdk/util-utf8-node": "3.46.0", "tslib": "^2.3.0" }, "engines": { - "node": ">= 12.0.0" + "node": ">=12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-credentials": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/config-resolver": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/shared-ini-file-loader": "3.46.0", + "@aws-sdk/signature-v4": "3.46.0", + "@aws-sdk/types": "3.46.0", + "@aws-sdk/util-config-provider": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-uri-escape": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-sso": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/client-sso": "3.46.0", + "@aws-sdk/property-provider": "3.46.0", + "@aws-sdk/shared-ini-file-loader": "3.46.0", + "@aws-sdk/types": "3.46.0", + "@aws-sdk/util-credentials": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-browser": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/fetch-http-handler": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/querystring-builder": "3.46.0", "@aws-sdk/types": "3.46.0", - "bowser": "^2.11.0", + "@aws-sdk/util-base64-browser": "3.46.0", "tslib": "^2.3.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-node": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/hash-node": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/node-config-provider": "3.46.0", "@aws-sdk/types": "3.46.0", + "@aws-sdk/util-buffer-from": "3.46.0", "tslib": "^2.3.0" }, "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-utf8-browser": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/invalid-dependency": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" } }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/uuid": { - "version": "8.3.2", - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.637.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/is-array-buffer": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.620.1", - "@aws-sdk/credential-provider-http": "3.635.0", - "@aws-sdk/credential-provider-ini": "3.637.0", - "@aws-sdk/credential-provider-process": "3.620.1", - "@aws-sdk/credential-provider-sso": "3.637.0", - "@aws-sdk/credential-provider-web-identity": "3.621.0", - "@aws-sdk/types": "3.609.0", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-env": { - "version": "3.620.1", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-content-length": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.609.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.637.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-host-header": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.620.1", - "@aws-sdk/credential-provider-http": "3.635.0", - "@aws-sdk/credential-provider-process": "3.620.1", - "@aws-sdk/credential-provider-sso": "3.637.0", - "@aws-sdk/credential-provider-web-identity": "3.621.0", - "@aws-sdk/types": "3.609.0", - "@smithy/credential-provider-imds": "^3.2.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.637.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-process": { - "version": "3.620.1", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-logger": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.609.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.621.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-retry": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.609.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/service-error-classification": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0", + "uuid": "^8.3.2" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.621.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-serde": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/credential-provider-imds": { - "version": "3.2.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-stack": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "tslib": "^2.6.2" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/node-config-provider": { - "version": "3.1.4", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/property-provider": { - "version": "3.1.3", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/node-config-provider": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/property-provider": "3.46.0", + "@aws-sdk/shared-ini-file-loader": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/querystring-parser": { - "version": "3.0.3", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/node-http-handler": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/abort-controller": "3.46.0", + "@aws-sdk/protocol-http": "3.46.0", + "@aws-sdk/querystring-builder": "3.46.0", + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.4", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/protocol-http": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/querystring-builder": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.6.2" + "@aws-sdk/types": "3.46.0", + "@aws-sdk/util-uri-escape": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/url-parser": { - "version": "3.0.3", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/querystring-parser": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^3.0.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" + }, + "engines": { + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.37.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/service-error-classification": { + "version": "3.46.0", + "license": "Apache-2.0", + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/shared-ini-file-loader": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/property-provider": "3.37.0", - "@aws-sdk/shared-ini-file-loader": "3.37.0", - "@aws-sdk/types": "3.37.0", - "@aws-sdk/util-credentials": "3.37.0", "tslib": "^2.3.0" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/property-provider": { - "version": "3.37.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/smithy-client": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.37.0", + "@aws-sdk/middleware-stack": "3.46.0", + "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, "engines": { - "node": ">= 10.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.37.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": { + "version": "3.46.0", + "license": "Apache-2.0", + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/url-parser": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/querystring-parser": "3.46.0", + "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" - }, - "engines": { - "node": ">= 10.0.0" } }, - "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.637.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-body-length-browser": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.637.0", - "@aws-sdk/token-providers": "3.614.0", - "@aws-sdk/types": "3.609.0", - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "tslib": "^2.3.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-body-length-node": { + "version": "3.46.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-buffer-from": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/is-array-buffer": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/property-provider": { - "version": "3.1.3", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-config-provider": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.4", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-credentials": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/shared-ini-file-loader": "3.46.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-uri-escape": { + "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.6.2" + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-web-identity": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-browser": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/property-provider": "3.46.0", + "@aws-sdk/types": "3.46.0", + "bowser": "^2.11.0", + "tslib": "^2.3.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.46.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/node-config-provider": "3.46.0", "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, @@ -4501,19 +4227,34 @@ "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-utf8-browser": { "version": "3.46.0", "license": "Apache-2.0", - "engines": { - "node": ">= 12.0.0" + "dependencies": { + "tslib": "^2.3.0" } }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.620.0", + "node_modules/@aws-sdk/credential-provider-ini/node_modules/uuid": { + "version": "8.3.2", + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@aws-sdk/credential-provider-node": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/credential-provider-env": "3.620.1", + "@aws-sdk/credential-provider-http": "3.635.0", + "@aws-sdk/credential-provider-ini": "3.637.0", + "@aws-sdk/credential-provider-process": "3.620.1", + "@aws-sdk/credential-provider-sso": "3.637.0", + "@aws-sdk/credential-provider-web-identity": "3.621.0", "@aws-sdk/types": "3.609.0", - "@smithy/protocol-http": "^4.1.0", + "@smithy/credential-provider-imds": "^3.2.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -4521,10 +4262,12 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-env": { + "version": "3.620.1", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -4532,40 +4275,60 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-host-header/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/credential-provider-env": "3.620.1", + "@aws-sdk/credential-provider-http": "3.635.0", + "@aws-sdk/credential-provider-process": "3.620.1", + "@aws-sdk/credential-provider-sso": "3.637.0", + "@aws-sdk/credential-provider-web-identity": "3.621.0", + "@aws-sdk/types": "3.609.0", + "@smithy/credential-provider-imds": "^3.2.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.637.0" } }, - "node_modules/@aws-sdk/middleware-host-header/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-process": { + "version": "3.620.1", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-logger": { - "version": "3.609.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.621.0", "license": "Apache-2.0", "dependencies": { "@aws-sdk/types": "3.609.0", + "@smithy/property-provider": "^3.1.3", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.621.0" } }, - "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/types": { "version": "3.609.0", "license": "Apache-2.0", "dependencies": { @@ -4576,22 +4339,21 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-logger/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/property-provider": { + "version": "3.1.3", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.620.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.4", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "3.609.0", - "@smithy/protocol-http": "^4.1.0", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -4599,55 +4361,60 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": { - "version": "3.609.0", + "node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/types": { + "version": "3.3.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@aws-sdk/credential-provider-process": { + "version": "3.37.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" + "@aws-sdk/property-provider": "3.37.0", + "@aws-sdk/shared-ini-file-loader": "3.37.0", + "@aws-sdk/types": "3.37.0", + "@aws-sdk/util-credentials": "3.37.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 10.0.0" } }, - "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/property-provider": { + "version": "3.37.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.6.2" + "@aws-sdk/types": "3.37.0", + "tslib": "^2.3.0" }, "engines": { - "node": ">=16.0.0" + "node": ">= 10.0.0" } }, - "node_modules/@aws-sdk/middleware-stack": { - "version": "3.342.0", + "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/shared-ini-file-loader": { + "version": "3.37.0", "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.3.0" }, "engines": { - "node": ">=14.0.0" + "node": ">= 10.0.0" } }, - "node_modules/@aws-sdk/middleware-user-agent": { + "node_modules/@aws-sdk/credential-provider-sso": { "version": "3.637.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/client-sso": "3.637.0", + "@aws-sdk/token-providers": "3.614.0", "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.637.0", - "@smithy/protocol-http": "^4.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.4", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -4655,7 +4422,7 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/types": { "version": "3.609.0", "license": "Apache-2.0", "dependencies": { @@ -4666,8 +4433,8 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-user-agent/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/property-provider": { + "version": "3.1.3", "license": "Apache-2.0", "dependencies": { "@smithy/types": "^3.3.0", @@ -4677,7 +4444,18 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-user-agent/node_modules/@smithy/types": { + "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.4", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/types": { "version": "3.3.0", "license": "Apache-2.0", "dependencies": { @@ -4687,10 +4465,11 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/property-provider": { + "node_modules/@aws-sdk/credential-provider-web-identity": { "version": "3.46.0", "license": "Apache-2.0", "dependencies": { + "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/types": "3.46.0", "tslib": "^2.3.0" }, @@ -4698,15 +4477,212 @@ "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/property-provider/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/types": { "version": "3.46.0", "license": "Apache-2.0", "engines": { "node": ">= 12.0.0" } }, - "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.614.0", + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.620.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": { + "version": "3.609.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header/node_modules/@smithy/protocol-http": { + "version": "4.1.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header/node_modules/@smithy/types": { + "version": "3.3.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger": { + "version": "3.609.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": { + "version": "3.609.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger/node_modules/@smithy/types": { + "version": "3.3.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.620.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": { + "version": "3.609.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@smithy/protocol-http": { + "version": "4.1.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@smithy/types": { + "version": "3.3.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-stack": { + "version": "3.342.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.637.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.609.0", + "@aws-sdk/util-endpoints": "3.637.0", + "@smithy/protocol-http": "^4.1.0", + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/types": { + "version": "3.609.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent/node_modules/@smithy/protocol-http": { + "version": "4.1.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent/node_modules/@smithy/types": { + "version": "3.3.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@aws-sdk/property-provider": { + "version": "3.46.0", + "license": "Apache-2.0", + "dependencies": { + "@aws-sdk/types": "3.46.0", + "tslib": "^2.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/@aws-sdk/property-provider/node_modules/@aws-sdk/types": { + "version": "3.46.0", + "license": "Apache-2.0", + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.614.0", "license": "Apache-2.0", "dependencies": { "@aws-sdk/types": "3.609.0", @@ -4776,16 +4752,6 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/region-config-resolver/node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, "node_modules/@aws-sdk/region-config-resolver/node_modules/@smithy/util-middleware": { "version": "3.0.3", "license": "Apache-2.0", @@ -5778,174 +5744,1314 @@ "run-parallel": "^1.1.9" }, "engines": { - "node": ">= 8" + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@pkgr/core": { + "version": "0.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/@playwright/browser-chromium": { + "version": "1.43.1", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.43.1" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@playwright/browser-chromium/node_modules/playwright-core": { + "version": "1.43.1", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@sindresorhus/is": { + "version": "4.2.0", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.0.2", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^2.0.0" + } + }, + "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { + "version": "2.0.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "6.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.1", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, + "node_modules/@smithy/abort-controller": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/config-resolver": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz", + "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/util-config-provider": "^3.0.0", + "@smithy/util-middleware": "^3.0.7", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core": { + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz", + "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-retry": "^3.0.23", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/util-body-length-browser": "^3.0.0", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/abort-controller": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz", + "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz", + "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz", + "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-serde": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-middleware": "^3.0.7", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/middleware-retry": { + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz", + "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.8", + "@smithy/protocol-http": "^4.1.4", + "@smithy/service-error-classification": "^3.0.7", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-retry": "^3.0.7", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/middleware-serde": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz", + "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/middleware-stack": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz", + "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/node-http-handler": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz", + "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/abort-controller": "^3.1.5", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/querystring-builder": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz", + "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "@smithy/util-uri-escape": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/querystring-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", + "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/service-error-classification": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz", + "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/smithy-client": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", + "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "@smithy/util-stream": "^3.1.9", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/url-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", + "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/querystring-parser": "^3.0.7", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-base64": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-retry": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz", + "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/service-error-classification": "^3.0.7", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-stream": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz", + "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/core/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz", + "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^3.1.8", + "@smithy/property-provider": "^3.1.7", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/querystring-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", + "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/@smithy/url-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", + "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/querystring-parser": "^3.0.7", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/eventstream-codec": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.6.tgz", + "integrity": "sha512-SBiOYPBH+5wOyPS7lfI150ePfGLhnp/eTu5RnV9xvhGvRiKfnl6HzRK9wehBph+il8FxS9KTeadx7Rcmf1GLPQ==", + "license": "Apache-2.0", + "dependencies": { + "@aws-crypto/crc32": "5.2.0", + "@smithy/types": "^3.5.0", + "@smithy/util-hex-encoding": "^3.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/eventstream-codec/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-codec/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-browser": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.10.tgz", + "integrity": "sha512-1i9aMY6Pl/SmA6NjvidxnfBLHMPzhKu2BP148pEt5VwhMdmXn36PE2kWKGa9Hj8b0XGtCTRucpCncylevCtI7g==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-serde-universal": "^3.0.9", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-browser/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-config-resolver": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.7.tgz", + "integrity": "sha512-eVzhGQBPEqXXYHvIUku0jMTxd4gDvenRzUQPTmKVWdRvp9JUCKrbAXGQRYiGxUYq9+cqQckRm0wq3kTWnNtDhw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-config-resolver/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.9.tgz", + "integrity": "sha512-JE0Guqvt0xsmfQ5y1EI342/qtJqznBv8cJqkHZV10PwC8GWGU5KNgFbQnsVCcX+xF+qIqwwfRmeWoJCjuOLmng==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-serde-universal": "^3.0.9", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.9.tgz", + "integrity": "sha512-bydfgSisfepCufw9kCEnWRxqxJFzX/o8ysXWv+W9F2FIyiaEwZ/D8bBKINbh4ONz3i05QJ1xE7A5OKYvgJsXaw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/eventstream-codec": "^3.1.6", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/fetch-http-handler": { + "version": "2.5.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-base64": "^2.3.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/hash-node": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz", + "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/hash-node/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/hash-node/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/hash-node/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/invalid-dependency": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz", + "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/invalid-dependency/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-content-length": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz", + "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/middleware-content-length/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/middleware-content-length/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/middleware-endpoint": { + "version": "2.5.1", + "license": "Apache-2.0", + "dependencies": { + "@smithy/middleware-serde": "^2.3.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry": { + "version": "2.3.1", + "license": "Apache-2.0", + "dependencies": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/service-error-classification": "^2.1.5", + "@smithy/smithy-client": "^2.5.1", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "tslib": "^2.6.2", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-serde": { + "version": "2.3.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-stack": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-config-provider": { + "version": "2.3.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-http-handler": { + "version": "2.5.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/abort-controller": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/property-provider": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/protocol-http": { + "version": "3.3.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-builder": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "@smithy/util-uri-escape": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-parser": { + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/service-error-classification": { + "version": "2.1.5", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader": { + "version": "2.4.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/signature-v4": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz", + "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-middleware": "^3.0.7", + "@smithy/util-uri-escape": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "dev": true, - "license": "MIT", + "node_modules/@smithy/signature-v4/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, "engines": { - "node": ">= 8" + "node": ">=16.0.0" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "dev": true, - "license": "MIT", + "node_modules/@smithy/signature-v4/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", + "license": "Apache-2.0", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 8" + "node": ">=16.0.0" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "license": "MIT", - "optional": true, + "node_modules/@smithy/signature-v4/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, "engines": { - "node": ">=14" + "node": ">=16.0.0" } }, - "node_modules/@pkgr/core": { - "version": "0.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-buffer-from": { + "version": "3.0.0", + "license": "Apache-2.0", + "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" }, - "funding": { - "url": "https://opencollective.com/unts" + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@playwright/browser-chromium": { - "version": "1.43.1", - "dev": true, - "hasInstallScript": true, + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.43.1" + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=16.0.0" } }, - "node_modules/@playwright/browser-chromium/node_modules/playwright-core": { - "version": "1.43.1", - "dev": true, + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", "license": "Apache-2.0", - "bin": { - "playwright-core": "cli.js" + "dependencies": { + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=16" + "node": ">=16.0.0" } }, - "node_modules/@sindresorhus/is": { - "version": "4.2.0", - "license": "MIT", - "engines": { - "node": ">=10" + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@sinonjs/commons": { - "version": "1.8.3", - "dev": true, - "license": "BSD-3-Clause", + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "license": "Apache-2.0", "dependencies": { - "type-detect": "4.0.8" + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@sinonjs/fake-timers": { - "version": "10.0.2", - "dev": true, - "license": "BSD-3-Clause", + "node_modules/@smithy/smithy-client": { + "version": "2.5.1", + "license": "Apache-2.0", "dependencies": { - "@sinonjs/commons": "^2.0.0" + "@smithy/middleware-endpoint": "^2.5.1", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-stream": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { - "version": "2.0.0", - "dev": true, - "license": "BSD-3-Clause", + "node_modules/@smithy/types": { + "version": "2.12.0", + "license": "Apache-2.0", "dependencies": { - "type-detect": "4.0.8" + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@sinonjs/samsam": { - "version": "6.1.1", - "dev": true, - "license": "BSD-3-Clause", + "node_modules/@smithy/url-parser": { + "version": "2.2.0", + "license": "Apache-2.0", "dependencies": { - "@sinonjs/commons": "^1.6.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" + "@smithy/querystring-parser": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" } }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.1", - "dev": true, - "license": "(Unlicense OR Apache-2.0)" - }, - "node_modules/@smithy/abort-controller": { - "version": "2.2.0", + "node_modules/@smithy/util-base64": { + "version": "2.3.0", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@smithy/core": { - "version": "2.4.0", + "node_modules/@smithy/util-body-length-browser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz", + "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.15", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/abort-controller": { - "version": "3.1.1", + "node_modules/@smithy/util-body-length-node": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz", + "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/fetch-http-handler": { - "version": "3.2.4", + "node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^4.1.0", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", - "@smithy/util-base64": "^3.0.0", + "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/is-array-buffer": { + "node_modules/@smithy/util-config-provider": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz", + "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -5954,259 +7060,302 @@ "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/middleware-endpoint": { - "version": "3.1.0", + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz", + "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.4", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-middleware": "^3.0.3", + "@smithy/property-provider": "^3.1.7", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", + "bowser": "^2.11.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" + "node": ">= 10.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/middleware-retry": { - "version": "3.0.15", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/abort-controller": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz", + "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/protocol-http": "^4.1.0", - "@smithy/service-error-classification": "^3.0.3", - "@smithy/smithy-client": "^3.2.0", - "@smithy/types": "^3.3.0", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "tslib": "^2.6.2", - "uuid": "^9.0.1" + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/middleware-serde": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz", + "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/middleware-stack": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/node-config-provider": { + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/middleware-endpoint": { "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz", + "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-middleware": "^3.0.7", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/node-http-handler": { - "version": "3.1.4", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/middleware-serde": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz", + "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^3.1.1", - "@smithy/protocol-http": "^4.1.0", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/property-provider": { - "version": "3.1.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/middleware-stack": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz", + "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/querystring-builder": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/node-http-handler": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz", + "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-uri-escape": "^3.0.0", + "@smithy/abort-controller": "^3.1.5", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/querystring-parser": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/service-error-classification": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0" + "@smithy/types": "^3.5.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.4", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/querystring-builder": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz", + "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", + "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/smithy-client": { - "version": "3.2.0", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/querystring-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", + "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "@smithy/util-stream": "^3.1.3", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/url-parser": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/smithy-client": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", + "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/querystring-parser": "^3.0.3", - "@smithy/types": "^3.3.0", + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "@smithy/util-stream": "^3.1.9", "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-base64": { - "version": "3.0.0", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/url-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", + "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", "license": "Apache-2.0", "dependencies": { + "@smithy/querystring-parser": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-buffer-from": { + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-base64": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-hex-encoding": { + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", "license": "Apache-2.0", "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-middleware": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-hex-encoding": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-retry": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", "license": "Apache-2.0", "dependencies": { - "@smithy/service-error-classification": "^3.0.3", - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-stream": { - "version": "3.1.3", + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-stream": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz", + "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/fetch-http-handler": "^3.2.4", - "@smithy/node-http-handler": "^3.1.4", - "@smithy/types": "^3.3.0", + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/types": "^3.5.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -6217,8 +7366,10 @@ "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-uri-escape": { + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-uri-escape": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -6227,8 +7378,10 @@ "node": ">=16.0.0" } }, - "node_modules/@smithy/core/node_modules/@smithy/util-utf8": { + "node_modules/@smithy/util-defaults-mode-browser/node_modules/@smithy/util-utf8": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", "license": "Apache-2.0", "dependencies": { "@smithy/util-buffer-from": "^3.0.0", @@ -6238,340 +7391,347 @@ "node": ">=16.0.0" } }, - "node_modules/@smithy/fetch-http-handler": { - "version": "2.5.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/protocol-http": "^3.3.0", - "@smithy/querystring-builder": "^2.2.0", - "@smithy/types": "^2.12.0", - "@smithy/util-base64": "^2.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node": { + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz", + "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==", "license": "Apache-2.0", "dependencies": { + "@smithy/config-resolver": "^3.0.9", + "@smithy/credential-provider-imds": "^3.2.4", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/property-provider": "^3.1.7", + "@smithy/smithy-client": "^3.4.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">= 10.0.0" } }, - "node_modules/@smithy/middleware-endpoint": { - "version": "2.5.1", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/abort-controller": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz", + "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-serde": "^2.3.0", - "@smithy/node-config-provider": "^2.3.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", - "@smithy/url-parser": "^2.2.0", - "@smithy/util-middleware": "^2.2.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@smithy/middleware-retry": { - "version": "2.3.1", - "license": "Apache-2.0", - "dependencies": { - "@smithy/node-config-provider": "^2.3.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/service-error-classification": "^2.1.5", - "@smithy/smithy-client": "^2.5.1", - "@smithy/types": "^2.12.0", - "@smithy/util-middleware": "^2.2.0", - "@smithy/util-retry": "^2.2.0", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/middleware-serde": { - "version": "2.3.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/fetch-http-handler": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz", + "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" } }, - "node_modules/@smithy/middleware-stack": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/is-array-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/node-config-provider": { - "version": "2.3.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/middleware-endpoint": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz", + "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^2.2.0", - "@smithy/shared-ini-file-loader": "^2.4.0", - "@smithy/types": "^2.12.0", + "@smithy/middleware-serde": "^3.0.7", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", + "@smithy/url-parser": "^3.0.7", + "@smithy/util-middleware": "^3.0.7", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/node-http-handler": { - "version": "2.5.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/middleware-serde": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz", + "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==", "license": "Apache-2.0", "dependencies": { - "@smithy/abort-controller": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/querystring-builder": "^2.2.0", - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/property-provider": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/middleware-stack": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz", + "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/protocol-http": { - "version": "3.3.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/node-config-provider": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/querystring-builder": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/node-http-handler": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz", + "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", - "@smithy/util-uri-escape": "^2.2.0", + "@smithy/abort-controller": "^3.1.5", + "@smithy/protocol-http": "^4.1.4", + "@smithy/querystring-builder": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/querystring-parser": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/property-provider": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@smithy/service-error-classification": { - "version": "2.1.5", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^2.12.0" - }, - "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.4.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/protocol-http": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz", + "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^2.12.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4": { - "version": "4.1.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/querystring-builder": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz", + "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "@smithy/protocol-http": "^4.1.0", - "@smithy/types": "^3.3.0", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", + "@smithy/types": "^3.5.0", "@smithy/util-uri-escape": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/querystring-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz", + "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==", "license": "Apache-2.0", "dependencies": { + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/protocol-http": { - "version": "4.1.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/shared-ini-file-loader": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/types": { - "version": "3.3.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/smithy-client": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz", + "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==", "license": "Apache-2.0", "dependencies": { + "@smithy/middleware-endpoint": "^3.1.4", + "@smithy/middleware-stack": "^3.0.7", + "@smithy/protocol-http": "^4.1.4", + "@smithy/types": "^3.5.0", + "@smithy/util-stream": "^3.1.9", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/util-hex-encoding": { - "version": "3.0.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/url-parser": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz", + "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==", "license": "Apache-2.0", "dependencies": { + "@smithy/querystring-parser": "^3.0.7", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/util-middleware": { - "version": "3.0.3", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-base64": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/util-uri-escape": { + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-buffer-from": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", "license": "Apache-2.0", "dependencies": { + "@smithy/is-array-buffer": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/signature-v4/node_modules/@smithy/util-utf8": { + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-hex-encoding": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@smithy/smithy-client": { - "version": "2.5.1", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-middleware": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz", + "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==", "license": "Apache-2.0", "dependencies": { - "@smithy/middleware-endpoint": "^2.5.1", - "@smithy/middleware-stack": "^2.2.0", - "@smithy/protocol-http": "^3.3.0", - "@smithy/types": "^2.12.0", - "@smithy/util-stream": "^2.2.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/types": { - "version": "2.12.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-stream": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz", + "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==", "license": "Apache-2.0", "dependencies": { + "@smithy/fetch-http-handler": "^3.2.9", + "@smithy/node-http-handler": "^3.2.4", + "@smithy/types": "^3.5.0", + "@smithy/util-base64": "^3.0.0", + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@smithy/url-parser": { - "version": "2.2.0", - "license": "Apache-2.0", - "dependencies": { - "@smithy/querystring-parser": "^2.2.0", - "@smithy/types": "^2.12.0", - "tslib": "^2.6.2" + "node": ">=16.0.0" } }, - "node_modules/@smithy/util-base64": { - "version": "2.3.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "@smithy/util-utf8": "^2.3.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", + "node_modules/@smithy/util-defaults-mode-node/node_modules/@smithy/util-utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", + "@smithy/util-buffer-from": "^3.0.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.5", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz", + "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==", "license": "Apache-2.0", "dependencies": { - "@smithy/node-config-provider": "^3.1.4", - "@smithy/types": "^3.3.0", + "@smithy/node-config-provider": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { @@ -6579,12 +7739,14 @@ } }, "node_modules/@smithy/util-endpoints/node_modules/@smithy/node-config-provider": { - "version": "3.1.4", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz", + "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==", "license": "Apache-2.0", "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.4", - "@smithy/types": "^3.3.0", + "@smithy/property-provider": "^3.1.7", + "@smithy/shared-ini-file-loader": "^3.1.8", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { @@ -6592,10 +7754,12 @@ } }, "node_modules/@smithy/util-endpoints/node_modules/@smithy/property-provider": { - "version": "3.1.3", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz", + "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { @@ -6603,10 +7767,12 @@ } }, "node_modules/@smithy/util-endpoints/node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.4", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz", + "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==", "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.3.0", + "@smithy/types": "^3.5.0", "tslib": "^2.6.2" }, "engines": { @@ -6614,7 +7780,9 @@ } }, "node_modules/@smithy/util-endpoints/node_modules/@smithy/types": { - "version": "3.3.0", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz", + "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" @@ -19267,7 +20435,7 @@ "devDependencies": {}, "engines": { "npm": "^10.1.0", - "vscode": "^1.68.0" + "vscode": "^1.83.0" } }, "packages/core": { @@ -19277,6 +20445,7 @@ "license": "Apache-2.0", "dependencies": { "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming", + "@aws-sdk/client-cloudwatch-logs": "^3.666.0", "@aws-sdk/client-cognito-identity": "^3.637.0", "@aws-sdk/client-lambda": "^3.637.0", "@aws-sdk/client-sso": "^3.342.0", @@ -19428,7 +20597,7 @@ "devDependencies": {}, "engines": { "npm": "^10.1.0", - "vscode": "^1.68.0" + "vscode": "^1.83.0" } }, "plugins/eslint-plugin-aws-toolkits": { diff --git a/packages/core/package.json b/packages/core/package.json index c549bbd9e53..6bfaaa20fde 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -459,6 +459,7 @@ }, "dependencies": { "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming", + "@aws-sdk/client-cloudwatch-logs": "^3.666.0", "@aws-sdk/client-cognito-identity": "^3.637.0", "@aws-sdk/client-lambda": "^3.637.0", "@aws-sdk/client-sso": "^3.342.0", diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index 94dcd9c8832..9188e027081 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -154,6 +154,7 @@ "AWS.command.downloadSchemaItemCode": "Download Code Bindings", "AWS.command.viewLogs": "View Logs", "AWS.command.cloudWatchLogs.searchLogGroup": "Search Log Group", + "AWS.command.cloudWatchLogs.tailLogGroup": "Tail Log Group", "AWS.command.sam.newTemplate": "Create new SAM Template", "AWS.command.cloudFormation.newTemplate": "Create new CloudFormation Template", "AWS.command.quickStart": "View Quick Start", @@ -231,6 +232,7 @@ "AWS.cdk.explorerTitle": "CDK", "AWS.codecatalyst.explorerTitle": "CodeCatalyst", "AWS.cwl.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs (max 10000)", + "AWS.cwl.liveTailMaxEvents.desc": "Maximum amount of log entries that can be kept in a single live tail session. When the limit is reached, the oldest events will be removed to accomodate new events (min 1000; max 10000)", "AWS.samcli.deploy.bucket.recentlyUsed": "Buckets recently used for SAM deployments", "AWS.submenu.amazonqEditorContextSubmenu.title": "Amazon Q", "AWS.submenu.auth.title": "Authentication", diff --git a/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts index b8c769e92f8..7b9cdcd5afd 100644 --- a/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts +++ b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts @@ -126,4 +126,7 @@ export function createURIFromArgs( return vscode.Uri.parse(uriStr) } -export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { limit: Number }) {} +export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { + limit: Number, + liveTailMaxEvents: Number, +}) {} diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts new file mode 100644 index 00000000000..fe116e54621 --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -0,0 +1,93 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import * as vscode from 'vscode' +import { CloudWatchLogsClient, StartLiveTailCommand, StartLiveTailCommandOutput } from '@aws-sdk/client-cloudwatch-logs' +import { LogStreamFilterResponse } from '../liveTailLogStreamSubmenu' +import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' +import { Settings, ToolkitError } from '../../../shared' +import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' + +export type LiveTailSessionConfiguration = { + logGroupName: string + logStreamFilter?: LogStreamFilterResponse + logEventFilterPattern?: string + region: string +} + +export type LiveTailSessionClient = { + cwlClient: CloudWatchLogsClient + abortController: AbortController +} + +export class LiveTailSession { + private liveTailClient: LiveTailSessionClient + private _logGroupName: string + private logStreamFilter?: LogStreamFilterResponse + private logEventFilterPattern?: string + private _maxLines: number + private _uri: vscode.Uri + + static settings = new CloudWatchLogsSettings(Settings.instance) + + public constructor(configuration: LiveTailSessionConfiguration) { + this._logGroupName = configuration.logGroupName + this.logStreamFilter = configuration.logStreamFilter + this.liveTailClient = { + cwlClient: new CloudWatchLogsClient({ region: configuration.region }), + abortController: new AbortController(), + } + this._maxLines = LiveTailSession.settings.get('liveTailMaxEvents', 10000) + this._uri = createLiveTailURIFromArgs(configuration) + } + + public get maxLines() { + return this._maxLines + } + + public get uri() { + return this._uri + } + + public get logGroupName() { + return this._logGroupName + } + + public startLiveTailSession(): Promise { + const command = this.buildStartLiveTailCommand() + try { + return this.liveTailClient.cwlClient.send(command, { + abortSignal: this.liveTailClient.abortController.signal, + }) + } catch (e) { + throw new ToolkitError('Encountered error while trying to start LiveTail session.') + } + } + + public stopLiveTailSession() { + this.liveTailClient.abortController.abort() + this.liveTailClient.cwlClient.destroy() + } + + private buildStartLiveTailCommand(): StartLiveTailCommand { + let logStreamNamePrefix = undefined + let logStreamName = undefined + if (this.logStreamFilter) { + if (this.logStreamFilter.type === 'prefix') { + logStreamNamePrefix = this.logStreamFilter.filter + logStreamName = undefined + } else if (this.logStreamFilter.type === 'specific') { + logStreamName = this.logStreamFilter.filter + logStreamNamePrefix = undefined + } + } + + return new StartLiveTailCommand({ + logGroupIdentifiers: [this.logGroupName], + logStreamNamePrefixes: logStreamNamePrefix ? [logStreamNamePrefix] : undefined, + logStreamNames: logStreamName ? [logStreamName] : undefined, + logEventFilterPattern: this.logEventFilterPattern ? this.logEventFilterPattern : undefined, + }) + } +} diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts new file mode 100644 index 00000000000..1c8484bfbb1 --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts @@ -0,0 +1,48 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import * as vscode from 'vscode' +import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../shared/constants' +import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession' +import { ToolkitError } from '../../../shared' +import { NestedMap } from '../../../shared/utilities/map' + +export class LiveTailSessionRegistry extends NestedMap { + static #instance: LiveTailSessionRegistry + + public static get instance() { + return (this.#instance ??= new this()) + } + + public constructor() { + super() + } + + protected override hash(uri: vscode.Uri): string { + return uri.toString() + } + + protected override get name(): string { + return LiveTailSessionRegistry.name + } + + protected override get default(): LiveTailSession { + throw new ToolkitError('No LiveTailSession found for provided uri.') + } +} + +export function createLiveTailURIFromArgs(sessionData: LiveTailSessionConfiguration): vscode.Uri { + let uriStr = `${CLOUDWATCH_LOGS_LIVETAIL_SCHEME}:${sessionData.region}:${sessionData.logGroupName}` + + if (sessionData.logStreamFilter) { + if (sessionData.logStreamFilter.type !== 'all') { + uriStr += `:${sessionData.logStreamFilter.type}:${sessionData.logStreamFilter.filter}` + } else { + uriStr += `:${sessionData.logStreamFilter.type}` + } + } + uriStr += sessionData.logEventFilterPattern ? `:${sessionData.logEventFilterPattern}` : '' + + return vscode.Uri.parse(uriStr) +} diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts index d79e38c7aef..846479c8521 100644 --- a/packages/core/src/shared/constants.ts +++ b/packages/core/src/shared/constants.ts @@ -128,6 +128,8 @@ export const ecsIamPermissionsUrl = vscode.Uri.parse( * URI scheme for CloudWatch Logs Virtual Documents */ export const CLOUDWATCH_LOGS_SCHEME = 'aws-cwl' // eslint-disable-line @typescript-eslint/naming-convention +export const CLOUDWATCH_LOGS_LIVETAIL_SCHEME = 'aws-cwl-lt' // eslint-disable-line @typescript-eslint/naming-convention + export const AWS_SCHEME = 'aws' // eslint-disable-line @typescript-eslint/naming-convention export const amazonQDiffScheme = 'amazon-q-diff' diff --git a/packages/core/src/shared/settings-toolkit.gen.ts b/packages/core/src/shared/settings-toolkit.gen.ts index ea291352701..62b2bbb1bc4 100644 --- a/packages/core/src/shared/settings-toolkit.gen.ts +++ b/packages/core/src/shared/settings-toolkit.gen.ts @@ -22,6 +22,7 @@ export const toolkitSettings = { "aws.stepfunctions.asl.maxItemsComputed": {}, "aws.ssmDocument.ssm.maxItemsComputed": {}, "aws.cwl.limit": {}, + "aws.cwl.liveTailMaxEvents": {}, "aws.samcli.manuallySelectedBuckets": {}, "aws.samcli.enableCodeLenses": {}, "aws.suppressPrompts": { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts new file mode 100644 index 00000000000..cdddb6673a5 --- /dev/null +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts @@ -0,0 +1,136 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import * as vscode from 'vscode' +import assert from 'assert' +import { + LiveTailSession, + LiveTailSessionConfiguration, +} from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' +import { + createLiveTailURIFromArgs, + LiveTailSessionRegistry, +} from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry' +import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../../shared/constants' + +/** + * Exposes protected methods so we can test them + */ +class TestLiveTailSessionRegistry extends LiveTailSessionRegistry { + constructor() { + super() + } + + override hash(uri: vscode.Uri): string { + return super.hash(uri) + } + + override get default(): LiveTailSession { + return super.default + } +} + +describe('LiveTailRegistry', async function () { + const session = new LiveTailSession({ + logGroupName: 'test-log-group', + region: 'test-region', + }) + + let liveTailSessionRegistry: TestLiveTailSessionRegistry + + beforeEach(function () { + liveTailSessionRegistry = new TestLiveTailSessionRegistry() + }) + + it('hash()', function () { + assert.deepStrictEqual(liveTailSessionRegistry.hash(session.uri), session.uri.toString()) + }) + + it('default()', function () { + assert.throws(() => liveTailSessionRegistry.default) + }) +}) + +describe('LiveTailSession URI', async function () { + const testLogGroupName = 'test-log-group' + const testRegion = 'test-region' + const expectedUriBase = `${CLOUDWATCH_LOGS_LIVETAIL_SCHEME}:${testRegion}:${testLogGroupName}` + + it('is correct with no logStream filter, no filter pattern', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + } + const expectedUri = vscode.Uri.parse(expectedUriBase) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) + + it('is correct with no logStream filter, with filter pattern', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + logEventFilterPattern: 'test-filter', + } + const expectedUri = vscode.Uri.parse(`${expectedUriBase}:test-filter`) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) + + it('is correct with ALL logStream filter', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + logStreamFilter: { + type: 'all', + }, + } + const expectedUri = vscode.Uri.parse(`${expectedUriBase}:all`) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) + + it('is correct with prefix logStream filter', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + logStreamFilter: { + type: 'prefix', + filter: 'test-prefix', + }, + } + const expectedUri = vscode.Uri.parse(`${expectedUriBase}:prefix:test-prefix`) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) + + it('is correct with specific logStream filter', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + logStreamFilter: { + type: 'specific', + filter: 'test-stream', + }, + } + const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream`) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) + + it('is correct with specific logStream filter and filter pattern', function () { + const config: LiveTailSessionConfiguration = { + logGroupName: testLogGroupName, + region: testRegion, + logStreamFilter: { + type: 'specific', + filter: 'test-stream', + }, + logEventFilterPattern: 'test-filter', + } + const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream:test-filter`) + const uri = createLiveTailURIFromArgs(config) + assert.deepEqual(uri, expectedUri) + }) +}) diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index a0066f36cab..000dc1808dd 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -162,6 +162,13 @@ "description": "%AWS.cwl.limit.desc%", "maximum": 10000 }, + "aws.cwl.liveTailMaxEvents": { + "type": "number", + "default": 10000, + "description": "%AWS.cwl.liveTailMaxEvents.desc%", + "minimum": 1000, + "maximum": 10000 + }, "aws.samcli.manuallySelectedBuckets": { "type": "object", "description": "%AWS.samcli.deploy.bucket.recentlyUsed%", From ccf60331953575d25ad0bd2fdc8f90e5fbe3f241 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 15 Oct 2024 13:52:00 -0700 Subject: [PATCH 003/202] refactor(cwl): lift TailLogGroupWizard into its own class #5785 ## Problem Wizard code intermixed with command logic ## Solution Refactor out the Wizard so the TailLogGroup command class can focus only on command logic. * Additionally adds the AWSToolkit for VSCode UserAgent to the CWL LiveTail client. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 93 +----------------- .../registry/liveTailSession.ts | 8 +- .../{ => wizard}/liveTailLogStreamSubmenu.ts | 18 ++-- .../wizard/tailLogGroupWizard.ts | 96 +++++++++++++++++++ .../liveTailLogStreamSubmenu.test.ts | 6 +- .../tailLogGroupWizard.test.ts} | 2 +- 6 files changed, 117 insertions(+), 106 deletions(-) rename packages/core/src/awsService/cloudWatchLogs/{ => wizard}/liveTailLogStreamSubmenu.ts (90%) create mode 100644 packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts rename packages/core/src/test/awsService/cloudWatchLogs/{ => wizard}/liveTailLogStreamSubmenu.test.ts (93%) rename packages/core/src/test/awsService/cloudWatchLogs/{commands/tailLogGroup.test.ts => wizard/tailLogGroupWizard.test.ts} (96%) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 53903f9610d..129d22760ee 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -3,26 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as nls from 'vscode-nls' -import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient' -import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons' -import { createInputBox } from '../../../shared/ui/inputPrompter' -import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter' -import { Wizard } from '../../../shared/wizards/wizard' -import { CloudWatchLogsGroupInfo } from '../registry/logDataRegistry' -import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu' +import { TailLogGroupWizard } from '../wizard/tailLogGroupWizard' +import { getLogger } from '../../../shared' import { CancellationError } from '../../../shared/utilities/timeoutUtils' -import { LogStreamFilterResponse, LogStreamFilterSubmenu } from '../liveTailLogStreamSubmenu' -import { getLogger, ToolkitError } from '../../../shared' -import { cwlFilterPatternHelpUrl } from '../../../shared/constants' - -const localize = nls.loadMessageBundle() - -export interface TailLogGroupWizardResponse { - regionLogGroupSubmenuResponse: RegionSubmenuResponse - logStreamFilter: LogStreamFilterResponse - filterPattern: string -} export async function tailLogGroup(logData?: { regionName: string; groupName: string }): Promise { const wizard = new TailLogGroupWizard(logData) @@ -34,75 +17,3 @@ export async function tailLogGroup(logData?: { regionName: string; groupName: st //TODO: Remove Log. For testing while we aren't yet consuming the wizardResponse. getLogger().info(JSON.stringify(wizardResponse)) } - -export class TailLogGroupWizard extends Wizard { - public constructor(logGroupInfo?: CloudWatchLogsGroupInfo) { - super({ - initState: { - regionLogGroupSubmenuResponse: logGroupInfo - ? { - data: logGroupInfo.groupName, - region: logGroupInfo.regionName, - } - : undefined, - }, - }) - this.form.regionLogGroupSubmenuResponse.bindPrompter(createRegionLogGroupSubmenu) - this.form.logStreamFilter.bindPrompter((state) => { - if (!state.regionLogGroupSubmenuResponse?.data) { - throw new ToolkitError('LogGroupName is null') - } - return new LogStreamFilterSubmenu( - state.regionLogGroupSubmenuResponse.data, - state.regionLogGroupSubmenuResponse.region - ) - }) - this.form.filterPattern.bindPrompter((state) => createFilterPatternPrompter()) - } -} - -export function createRegionLogGroupSubmenu(): RegionSubmenu { - return new RegionSubmenu( - getLogGroupQuickPickOptions, - { - title: localize('AWS.cwl.tailLogGroup.logGroupPromptTitle', 'Select Log Group to tail'), - buttons: [createExitButton()], - }, - { title: localize('AWS.cwl.tailLogGroup.regionPromptTitle', 'Select Region for Log Group') }, - 'LogGroups' - ) -} - -async function getLogGroupQuickPickOptions(regionCode: string): Promise[]> { - const client = new DefaultCloudWatchLogsClient(regionCode) - const logGroups = client.describeLogGroups() - - const logGroupsOptions: DataQuickPickItem[] = [] - - for await (const logGroupObject of logGroups) { - if (!logGroupObject.arn || !logGroupObject.logGroupName) { - throw new ToolkitError('LogGroupObject name or arn undefined') - } - - logGroupsOptions.push({ - label: logGroupObject.logGroupName, - data: formatLogGroupArn(logGroupObject.arn), - }) - } - - return logGroupsOptions -} - -function formatLogGroupArn(logGroupArn: string): string { - return logGroupArn.endsWith(':*') ? logGroupArn.substring(0, logGroupArn.length - 2) : logGroupArn -} - -export function createFilterPatternPrompter() { - const helpUri = cwlFilterPatternHelpUrl - return createInputBox({ - title: 'Provide log event filter pattern', - placeholder: 'filter pattern (case sensitive; empty matches all)', - prompt: 'Optional pattern to use to filter the results to include only log events that match the pattern.', - buttons: [createHelpButton(helpUri), createBackButton(), createExitButton()], - }) -} diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index fe116e54621..ff2b044616d 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -4,10 +4,11 @@ */ import * as vscode from 'vscode' import { CloudWatchLogsClient, StartLiveTailCommand, StartLiveTailCommandOutput } from '@aws-sdk/client-cloudwatch-logs' -import { LogStreamFilterResponse } from '../liveTailLogStreamSubmenu' +import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' import { Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' +import { getUserAgent } from '../../../shared/telemetry/util' export type LiveTailSessionConfiguration = { logGroupName: string @@ -35,7 +36,10 @@ export class LiveTailSession { this._logGroupName = configuration.logGroupName this.logStreamFilter = configuration.logStreamFilter this.liveTailClient = { - cwlClient: new CloudWatchLogsClient({ region: configuration.region }), + cwlClient: new CloudWatchLogsClient({ + region: configuration.region, + customUserAgent: getUserAgent(), + }), abortController: new AbortController(), } this._maxLines = LiveTailSession.settings.get('liveTailMaxEvents', 10000) diff --git a/packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts similarity index 90% rename from packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts rename to packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts index e39cd1b8282..a76ec8861e4 100644 --- a/packages/core/src/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.ts +++ b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts @@ -2,20 +2,20 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import { Prompter, PromptResult } from '../../shared/ui/prompter' -import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient' -import { createCommonButtons } from '../../shared/ui/buttons' -import { createInputBox, InputBoxPrompter } from '../../shared/ui/inputPrompter' -import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../shared/ui/pickerPrompter' -import { pageableToCollection } from '../../shared/utilities/collectionUtils' +import { Prompter, PromptResult } from '../../../shared/ui/prompter' +import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient' +import { createCommonButtons } from '../../../shared/ui/buttons' +import { createInputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter' +import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter' +import { pageableToCollection } from '../../../shared/utilities/collectionUtils' import { CloudWatchLogs } from 'aws-sdk' -import { isValidResponse, StepEstimator } from '../../shared/wizards/wizard' -import { isNonNullable } from '../../shared/utilities/tsUtils' +import { isValidResponse, StepEstimator } from '../../../shared/wizards/wizard' +import { isNonNullable } from '../../../shared/utilities/tsUtils' import { startLiveTailHelpUrl, startLiveTailLogStreamNamesHelpUrl, startLiveTailLogStreamPrefixHelpUrl, -} from '../../shared/constants' +} from '../../../shared/constants' export type LogStreamFilterType = 'menu' | 'prefix' | 'specific' | 'all' diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts new file mode 100644 index 00000000000..c0ba4bdc3af --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts @@ -0,0 +1,96 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as nls from 'vscode-nls' +import { ToolkitError } from '../../../shared' +import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient' +import { cwlFilterPatternHelpUrl } from '../../../shared/constants' +import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons' +import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu' +import { createInputBox } from '../../../shared/ui/inputPrompter' +import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter' +import { Wizard } from '../../../shared/wizards/wizard' +import { CloudWatchLogsGroupInfo } from '../registry/logDataRegistry' +import { LogStreamFilterResponse, LogStreamFilterSubmenu } from './liveTailLogStreamSubmenu' + +const localize = nls.loadMessageBundle() + +export interface TailLogGroupWizardResponse { + regionLogGroupSubmenuResponse: RegionSubmenuResponse + logStreamFilter: LogStreamFilterResponse + filterPattern: string +} + +export class TailLogGroupWizard extends Wizard { + public constructor(logGroupInfo?: CloudWatchLogsGroupInfo) { + super({ + initState: { + regionLogGroupSubmenuResponse: logGroupInfo + ? { + data: logGroupInfo.groupName, + region: logGroupInfo.regionName, + } + : undefined, + }, + }) + this.form.regionLogGroupSubmenuResponse.bindPrompter(createRegionLogGroupSubmenu) + this.form.logStreamFilter.bindPrompter((state) => { + if (!state.regionLogGroupSubmenuResponse?.data) { + throw new ToolkitError('LogGroupName is null') + } + return new LogStreamFilterSubmenu( + state.regionLogGroupSubmenuResponse.data, + state.regionLogGroupSubmenuResponse.region + ) + }) + this.form.filterPattern.bindPrompter((state) => createFilterPatternPrompter()) + } +} + +export function createRegionLogGroupSubmenu(): RegionSubmenu { + return new RegionSubmenu( + getLogGroupQuickPickOptions, + { + title: localize('AWS.cwl.tailLogGroup.logGroupPromptTitle', 'Select Log Group to tail'), + buttons: [createExitButton()], + }, + { title: localize('AWS.cwl.tailLogGroup.regionPromptTitle', 'Select Region for Log Group') }, + 'LogGroups' + ) +} + +async function getLogGroupQuickPickOptions(regionCode: string): Promise[]> { + const client = new DefaultCloudWatchLogsClient(regionCode) + const logGroups = client.describeLogGroups() + + const logGroupsOptions: DataQuickPickItem[] = [] + + for await (const logGroupObject of logGroups) { + if (!logGroupObject.arn || !logGroupObject.logGroupName) { + throw new ToolkitError('LogGroupObject name or arn undefined') + } + + logGroupsOptions.push({ + label: logGroupObject.logGroupName, + data: formatLogGroupArn(logGroupObject.arn), + }) + } + + return logGroupsOptions +} + +function formatLogGroupArn(logGroupArn: string): string { + return logGroupArn.endsWith(':*') ? logGroupArn.substring(0, logGroupArn.length - 2) : logGroupArn +} + +export function createFilterPatternPrompter() { + const helpUri = cwlFilterPatternHelpUrl + return createInputBox({ + title: 'Provide log event filter pattern', + placeholder: 'filter pattern (case sensitive; empty matches all)', + prompt: 'Optional pattern to use to filter the results to include only log events that match the pattern.', + buttons: [createHelpButton(helpUri), createBackButton(), createExitButton()], + }) +} diff --git a/packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts similarity index 93% rename from packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts rename to packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts index 0ac71141b7a..7918817dd91 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/liveTailLogStreamSubmenu.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts @@ -4,9 +4,9 @@ */ import assert from 'assert' -import { LogStreamFilterSubmenu } from '../../../awsService/cloudWatchLogs/liveTailLogStreamSubmenu' -import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../../shared/ui/testUtils' -import { getTestWindow } from '../../shared/vscode/window' +import { LogStreamFilterSubmenu } from '../../../../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu' +import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../../../shared/ui/testUtils' +import { getTestWindow } from '../../../shared/vscode/window' describe('liveTailLogStreamSubmenu', async function () { let logStreamFilterSubmenu: LogStreamFilterSubmenu diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts similarity index 96% rename from packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts rename to packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts index 4b2e382f38c..137b372438e 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TailLogGroupWizard } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup' +import { TailLogGroupWizard } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' import { createWizardTester } from '../../../shared/wizards/wizardTestUtils' describe('TailLogGroupWizard', async function () { From 56b7efd65c2d4f49a972511bdaf03f9c3ddace8f Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 15 Oct 2024 15:16:29 -0700 Subject: [PATCH 004/202] refactor(cwl): change LiveTailRegistry to standard map #5789 ## Problem The nestedMap implementation of the registry was forcing a defined Default item. This doesn't fit the usecase I am aiming to provide by this registry. There is no default object to be returned. If an item doesn't exist in the registry, we should handle an undefined object, and not a placeholder. In other words, there is no concept of a placeholder/default value for a LiveTailSession. Additionally, `set` on the NestedMap would perform a deep merge. I am wanting to replace the object. Originally I defined the default object to an exception, but the NestedMap `set` operation calls `get`. And if there isn't already a value in the map, it would throw the exception defined as the default object. This means we could never add any item to the map. ## Solution Swap the underlying implementation of the registry to a basic Map. I am still defining a `LiveTailSessionRegistry` class so we can statically initialize a registry singleton, as well as leaving the possibility open to override or extend the `Map` class. Also so we can pass around the type `LiveTailSessionRegistry` instead of `Map`. --- .../registry/liveTailSessionRegistry.ts | 16 +------ .../registry/liveTailRegistry.test.ts | 48 +------------------ 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts index 1c8484bfbb1..4e23b3cbe6f 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts @@ -5,10 +5,8 @@ import * as vscode from 'vscode' import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../shared/constants' import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession' -import { ToolkitError } from '../../../shared' -import { NestedMap } from '../../../shared/utilities/map' -export class LiveTailSessionRegistry extends NestedMap { +export class LiveTailSessionRegistry extends Map { static #instance: LiveTailSessionRegistry public static get instance() { @@ -18,18 +16,6 @@ export class LiveTailSessionRegistry extends NestedMap liveTailSessionRegistry.default) - }) -}) - describe('LiveTailSession URI', async function () { const testLogGroupName = 'test-log-group' const testRegion = 'test-region' From 405f4561ed17733fcc490bc90a64a380e88f6cdd Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Mon, 21 Oct 2024 07:30:26 -0700 Subject: [PATCH 005/202] feat(cwl): initialize tailLogGroup command. starts stream and prints logEvents to textDocument (#5790) ## Problem TailLogGroup currently is just logging the Users WizardResponse. It does not start a LiveTail stream or print results to the VSCode editor ## Solution * Creates a `LiveTailSession` with the input params from the TailLogGroupWizard * Registers the LiveTailSession in the `LiveTailSessionRegistry` * Iterates the Response Stream and prints new LogEvents to a TextDocument * If there are no open tabs for a given session's TextDocument, the stream will be closed by triggering its AbortController and disposing its client. We will use a new URI Scheme for LiveTail text documents so we can identify a LiveTail session vs a Cloudwatch SearchLogGroup/ViewLogStream document. In the future, we will register LiveTail specific CodeLenses that depend upon this URI scheme. Defining a new URI scheme for a Text Document requires a Document Provider. In this use case, it is empty given that the response handling that writes to the document lives within the TailLogGroup command itself. --- .../awsService/cloudWatchLogs/activation.ts | 12 +- .../cloudWatchLogs/commands/tailLogGroup.ts | 145 +++++++++++++++- .../document/liveTailDocumentProvider.ts | 13 ++ .../registry/liveTailSession.ts | 14 +- .../commands/tailLogGroup.test.ts | 158 ++++++++++++++++++ 5 files changed, 333 insertions(+), 9 deletions(-) create mode 100644 packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts create mode 100644 packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index 03760b158e7..065cb9a7958 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -4,7 +4,7 @@ */ import * as vscode from 'vscode' -import { CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants' +import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME, CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants' import { Settings } from '../../shared/settings' import { addLogEvents } from './commands/addLogEvents' import { copyLogResource } from './commands/copyLogResource' @@ -20,11 +20,15 @@ import { changeLogSearchParams } from './changeLogSearch' import { CloudWatchLogsNode } from './explorer/cloudWatchLogsNode' import { loadAndOpenInitialLogStreamFile, LogStreamCodeLensProvider } from './document/logStreamsCodeLensProvider' import { tailLogGroup } from './commands/tailLogGroup' +import { LiveTailDocumentProvider } from './document/liveTailDocumentProvider' +import { LiveTailSessionRegistry } from './registry/liveTailSessionRegistry' export async function activate(context: vscode.ExtensionContext, configuration: Settings): Promise { const registry = LogDataRegistry.instance + const liveTailRegistry = LiveTailSessionRegistry.instance const documentProvider = new LogDataDocumentProvider(registry) + const liveTailDocumentProvider = new LiveTailDocumentProvider() context.subscriptions.push( vscode.languages.registerCodeLensProvider( @@ -40,6 +44,10 @@ export async function activate(context: vscode.ExtensionContext, configuration: vscode.workspace.registerTextDocumentContentProvider(CLOUDWATCH_LOGS_SCHEME, documentProvider) ) + context.subscriptions.push( + vscode.workspace.registerTextDocumentContentProvider(CLOUDWATCH_LOGS_LIVETAIL_SCHEME, liveTailDocumentProvider) + ) + context.subscriptions.push( vscode.workspace.onDidCloseTextDocument((doc) => { if (doc.isClosed && doc.uri.scheme === CLOUDWATCH_LOGS_SCHEME) { @@ -97,7 +105,7 @@ export async function activate(context: vscode.ExtensionContext, configuration: node instanceof LogGroupNode ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! } : undefined - await tailLogGroup(logGroupInfo) + await tailLogGroup(liveTailRegistry, logGroupInfo) }) ) } diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 129d22760ee..0480bd38877 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -3,17 +3,154 @@ * SPDX-License-Identifier: Apache-2.0 */ +import * as vscode from 'vscode' import { TailLogGroupWizard } from '../wizard/tailLogGroupWizard' -import { getLogger } from '../../../shared' import { CancellationError } from '../../../shared/utilities/timeoutUtils' +import { LiveTailSession, LiveTailSessionConfiguration } from '../registry/liveTailSession' +import { LiveTailSessionRegistry } from '../registry/liveTailSessionRegistry' +import { LiveTailSessionLogEvent, StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' +import { ToolkitError } from '../../../shared' -export async function tailLogGroup(logData?: { regionName: string; groupName: string }): Promise { +export async function tailLogGroup( + registry: LiveTailSessionRegistry, + logData?: { regionName: string; groupName: string } +): Promise { const wizard = new TailLogGroupWizard(logData) const wizardResponse = await wizard.run() if (!wizardResponse) { throw new CancellationError('user') } - //TODO: Remove Log. For testing while we aren't yet consuming the wizardResponse. - getLogger().info(JSON.stringify(wizardResponse)) + const liveTailSessionConfig: LiveTailSessionConfiguration = { + logGroupName: wizardResponse.regionLogGroupSubmenuResponse.data, + logStreamFilter: wizardResponse.logStreamFilter, + logEventFilterPattern: wizardResponse.filterPattern, + region: wizardResponse.regionLogGroupSubmenuResponse.region, + } + const session = new LiveTailSession(liveTailSessionConfig) + if (registry.has(session.uri)) { + await prepareDocument(session) + return + } + registry.set(session.uri, session) + + const document = await prepareDocument(session) + registerTabChangeCallback(session, registry, document) + const stream = await session.startLiveTailSession() + + await handleSessionStream(stream, document, session) +} + +export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry) { + const session = registry.get(sessionUri) + if (session === undefined) { + throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) + } + session.stopLiveTailSession() + registry.delete(sessionUri) +} + +export async function clearDocument(textDocument: vscode.TextDocument) { + const edit = new vscode.WorkspaceEdit() + const startPosition = new vscode.Position(0, 0) + const endPosition = new vscode.Position(textDocument.lineCount, 0) + edit.delete(textDocument.uri, new vscode.Range(startPosition, endPosition)) + await vscode.workspace.applyEdit(edit) +} + +async function prepareDocument(session: LiveTailSession): Promise { + const textDocument = await vscode.workspace.openTextDocument(session.uri) + await clearDocument(textDocument) + await vscode.window.showTextDocument(textDocument, { preview: false }) + await vscode.languages.setTextDocumentLanguage(textDocument, 'log') + return textDocument +} + +async function handleSessionStream( + stream: AsyncIterable, + document: vscode.TextDocument, + session: LiveTailSession +) { + try { + for await (const event of stream) { + if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) { + const formattedLogEvents = event.sessionUpdate.sessionResults.map((logEvent) => + formatLogEvent(logEvent) + ) + if (formattedLogEvents.length !== 0) { + await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) + } + } + } + } catch (err) { + throw new ToolkitError('Caught on-stream exception') + } +} + +function formatLogEvent(logEvent: LiveTailSessionLogEvent): string { + if (!logEvent.timestamp || !logEvent.message) { + return '' + } + const timestamp = new Date(logEvent.timestamp).toLocaleTimeString('en', { + timeStyle: 'medium', + hour12: false, + timeZone: 'UTC', + }) + let line = timestamp.concat('\t', logEvent.message) + if (!line.endsWith('\n')) { + line = line.concat('\n') + } + return line +} + +async function updateTextDocumentWithNewLogEvents( + formattedLogEvents: string[], + document: vscode.TextDocument, + maxLines: number +) { + const edit = new vscode.WorkspaceEdit() + formattedLogEvents.forEach((formattedLogEvent) => + edit.insert(document.uri, new vscode.Position(document.lineCount, 0), formattedLogEvent) + ) + await vscode.workspace.applyEdit(edit) +} + +/** + * The LiveTail session should be automatically closed if the user does not have the session's + * document in any Tab in their editor. + * + * `onDidCloseTextDocument` doesn't work for our case because the tailLogGroup command will keep the stream + * writing to the doc even when all its tabs/editors are closed, seemingly keeping the doc 'open'. + * Also there is no guarantee that this event fires when an editor tab is closed + * + * `onDidChangeVisibleTextEditors` returns editors that the user can see its contents. An editor that is open, but hidden + * from view, will not be returned. Meaning a Tab that is created (shown in top bar), but not open, will not be returned. Even if + * the tab isn't visible, we want to continue writing to the doc, and keep the session alive. + */ +function registerTabChangeCallback( + session: LiveTailSession, + registry: LiveTailSessionRegistry, + document: vscode.TextDocument +) { + vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { + const isOpen = isLiveTailSessionOpenInAnyTab(session) + if (!isOpen) { + closeSession(session.uri, registry) + void clearDocument(document) + } + }) +} + +function isLiveTailSessionOpenInAnyTab(liveTailSession: LiveTailSession) { + let isOpen = false + vscode.window.tabGroups.all.forEach(async (tabGroup) => { + tabGroup.tabs.forEach((tab) => { + if (tab.input instanceof vscode.TabInputText) { + if (liveTailSession.uri.toString() === tab.input.uri.toString()) { + isOpen = true + } + } + }) + }) + return isOpen } diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts new file mode 100644 index 00000000000..fe909579ae3 --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts @@ -0,0 +1,13 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as vscode from 'vscode' + +export class LiveTailDocumentProvider implements vscode.TextDocumentContentProvider { + provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult { + //Content will be written to the document via handling a LiveTail response stream in the TailLogGroup command. + return '' + } +} diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index ff2b044616d..e277f766054 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -3,7 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ import * as vscode from 'vscode' -import { CloudWatchLogsClient, StartLiveTailCommand, StartLiveTailCommandOutput } from '@aws-sdk/client-cloudwatch-logs' +import { + CloudWatchLogsClient, + StartLiveTailCommand, + StartLiveTailResponseStream, +} from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' import { Settings, ToolkitError } from '../../../shared' @@ -58,12 +62,16 @@ export class LiveTailSession { return this._logGroupName } - public startLiveTailSession(): Promise { + public async startLiveTailSession(): Promise> { const command = this.buildStartLiveTailCommand() try { - return this.liveTailClient.cwlClient.send(command, { + const commandOutput = await this.liveTailClient.cwlClient.send(command, { abortSignal: this.liveTailClient.abortController.signal, }) + if (!commandOutput.responseStream) { + throw new ToolkitError('LiveTail session response stream is undefined.') + } + return commandOutput.responseStream } catch (e) { throw new ToolkitError('Encountered error while trying to start LiveTail session.') } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts new file mode 100644 index 00000000000..c5061ffde1f --- /dev/null +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -0,0 +1,158 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as sinon from 'sinon' +import * as vscode from 'vscode' + +import assert from 'assert' +import { clearDocument, closeSession, tailLogGroup } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup' +import { StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' +import { LiveTailSessionRegistry } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry' +import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' +import { asyncGenerator } from '../../../../shared/utilities/collectionUtils' +import { + TailLogGroupWizard, + TailLogGroupWizardResponse, +} from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' +import { getTestWindow } from '../../../shared/vscode/window' + +describe('TailLogGroup', function () { + const testLogGroup = 'test-log-group' + const testRegion = 'test-region' + const testMessage = 'test-message' + + let sandbox: sinon.SinonSandbox + let registry: LiveTailSessionRegistry + let startLiveTailSessionSpy: sinon.SinonSpy + let stopLiveTailSessionSpy: sinon.SinonSpy + let wizardSpy: sinon.SinonSpy + + beforeEach(function () { + sandbox = sinon.createSandbox() + registry = new LiveTailSessionRegistry() + }) + + afterEach(function () { + sandbox.restore() + }) + + it('starts LiveTailSession and writes to document. Closes tab and asserts session gets closed.', async function () { + wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { + return getTestWizardResponse() + }) + startLiveTailSessionSpy = sandbox + .stub(LiveTailSession.prototype, 'startLiveTailSession') + .callsFake(async function () { + return getTestResponseStream() + }) + stopLiveTailSessionSpy = sandbox + .stub(LiveTailSession.prototype, 'stopLiveTailSession') + .callsFake(async function () { + return + }) + await tailLogGroup(registry, { + groupName: testLogGroup, + regionName: testRegion, + }) + assert.strictEqual(wizardSpy.calledOnce, true) + assert.strictEqual(startLiveTailSessionSpy.calledOnce, true) + assert.strictEqual(registry.size, 1) + + //registry is asserted to have only one entry, so this is assumed to be the session that was + //started in this test. + let sessionUri: vscode.Uri | undefined + registry.forEach((session) => (sessionUri = session.uri)) + if (sessionUri === undefined) { + throw Error + } + const document = getTestWindow().activeTextEditor?.document + assert.strictEqual(sessionUri.toString(), document?.uri.toString()) + assert.strictEqual(document?.getText().trim(), `12:00:00\t${testMessage}`) + + //Test that closing all tabs the session's document is open in will cause the session to close + const window = getTestWindow() + let tabs: vscode.Tab[] = [] + window.tabGroups.all.forEach((tabGroup) => { + tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!)) + }) + await Promise.all(tabs.map((tab) => window.tabGroups.close(tab))) + assert.strictEqual(registry.size, 0) + assert.strictEqual(stopLiveTailSessionSpy.calledOnce, true) + }) + + it('closeSession removes session from registry and calls underlying stopLiveTailSession function.', function () { + stopLiveTailSessionSpy = sandbox + .stub(LiveTailSession.prototype, 'stopLiveTailSession') + .callsFake(async function () { + return + }) + const session = new LiveTailSession({ + logGroupName: testLogGroup, + region: testRegion, + }) + registry.set(session.uri, session) + + closeSession(session.uri, registry) + assert.strictEqual(0, registry.size) + assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) + }) + + it('clearDocument clears all text from document', async function () { + const session = new LiveTailSession({ + logGroupName: testLogGroup, + region: testRegion, + }) + const testData = 'blah blah blah' + const document = await vscode.workspace.openTextDocument(session.uri) + const edit = new vscode.WorkspaceEdit() + edit.insert(document.uri, new vscode.Position(0, 0), testData) + await vscode.workspace.applyEdit(edit) + assert.strictEqual(document.getText(), testData) + + await clearDocument(document) + assert.strictEqual(document.getText(), '') + }) + + function getLiveTailSessionTabsFromTabGroup(tabGroup: vscode.TabGroup, sessionUri: vscode.Uri): vscode.Tab[] { + return tabGroup.tabs.filter((tab) => { + if (tab.input instanceof vscode.TabInputText) { + return sessionUri!.toString() === tab.input.uri.toString() + } + }) + } + + function getTestWizardResponse(): TailLogGroupWizardResponse { + return { + regionLogGroupSubmenuResponse: { + region: testRegion, + data: testLogGroup, + }, + filterPattern: '', + logStreamFilter: { + type: 'all', + }, + } + } + + function getTestResponseStream(): AsyncIterable { + const sessionStartFrame: StartLiveTailResponseStream = { + sessionStart: { + logGroupIdentifiers: [testLogGroup], + }, + sessionUpdate: undefined, + } + const sessionUpdateFrame: StartLiveTailResponseStream = { + sessionUpdate: { + sessionResults: [ + { + message: testMessage, + timestamp: 876830400000, + }, + ], + }, + } + return asyncGenerator([sessionStartFrame, sessionUpdateFrame]) + } +}) From 5ca462943c2dce25e745e25adc88ed4536ecce82 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 22 Oct 2024 14:49:51 -0700 Subject: [PATCH 006/202] refactor(cwl): remove LiveTail setting, re-use existing CWL setting #5831 * Remove CWL LiveTail limit setting. Instead pulls from existing limit preference. Updated description of limit preference to describe LiveTail line trimming behavior * Rename CWL Scheme variable to fit linting rules * Bubble up exception instead of rethrowing it. --- packages/core/package.nls.json | 3 +-- .../awsService/cloudWatchLogs/activation.ts | 4 ++-- .../cloudWatchLogs/cloudWatchLogsUtils.ts | 5 +---- .../cloudWatchLogs/commands/tailLogGroup.ts | 18 +++++++----------- .../cloudWatchLogs/registry/liveTailSession.ts | 2 +- .../registry/liveTailSessionRegistry.ts | 4 ++-- packages/core/src/shared/constants.ts | 2 +- .../core/src/shared/settings-toolkit.gen.ts | 1 - .../registry/liveTailRegistry.test.ts | 4 ++-- packages/toolkit/package.json | 7 ------- 10 files changed, 17 insertions(+), 33 deletions(-) diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index b029f874c53..20a1a035f29 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -232,8 +232,7 @@ "AWS.appcomposer.explorerTitle": "Infrastructure Composer", "AWS.cdk.explorerTitle": "CDK", "AWS.codecatalyst.explorerTitle": "CodeCatalyst", - "AWS.cwl.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs (max 10000)", - "AWS.cwl.liveTailMaxEvents.desc": "Maximum amount of log entries that can be kept in a single live tail session. When the limit is reached, the oldest events will be removed to accomodate new events (min 1000; max 10000)", + "AWS.cwl.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs. For LiveTail, when the limit is reached, the oldest events will be removed to accomodate new events. (max 10000)", "AWS.samcli.deploy.bucket.recentlyUsed": "Buckets recently used for SAM deployments", "AWS.submenu.amazonqEditorContextSubmenu.title": "Amazon Q", "AWS.submenu.auth.title": "Authentication", diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index 065cb9a7958..d2ff8fed2d7 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -4,7 +4,7 @@ */ import * as vscode from 'vscode' -import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME, CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants' +import { cloudwatchLogsLiveTailScheme, CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants' import { Settings } from '../../shared/settings' import { addLogEvents } from './commands/addLogEvents' import { copyLogResource } from './commands/copyLogResource' @@ -45,7 +45,7 @@ export async function activate(context: vscode.ExtensionContext, configuration: ) context.subscriptions.push( - vscode.workspace.registerTextDocumentContentProvider(CLOUDWATCH_LOGS_LIVETAIL_SCHEME, liveTailDocumentProvider) + vscode.workspace.registerTextDocumentContentProvider(cloudwatchLogsLiveTailScheme, liveTailDocumentProvider) ) context.subscriptions.push( diff --git a/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts index 294df856f03..e2356595153 100644 --- a/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts +++ b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts @@ -111,7 +111,4 @@ function createURIFromArgs(args: CloudWatchLogsArgs): vscode.Uri { } export const cwlUriSchema = new UriSchema(parseCloudWatchLogsUri, createURIFromArgs) -export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { - limit: Number, - liveTailMaxEvents: Number, -}) {} +export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { limit: Number }) {} diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 0480bd38877..b2463309029 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -71,19 +71,15 @@ async function handleSessionStream( document: vscode.TextDocument, session: LiveTailSession ) { - try { - for await (const event of stream) { - if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) { - const formattedLogEvents = event.sessionUpdate.sessionResults.map((logEvent) => - formatLogEvent(logEvent) - ) - if (formattedLogEvents.length !== 0) { - await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) - } + for await (const event of stream) { + if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) { + const formattedLogEvents = event.sessionUpdate.sessionResults.map((logEvent) => + formatLogEvent(logEvent) + ) + if (formattedLogEvents.length !== 0) { + await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) } } - } catch (err) { - throw new ToolkitError('Caught on-stream exception') } } diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index e277f766054..ba6e0fdd27f 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -46,7 +46,7 @@ export class LiveTailSession { }), abortController: new AbortController(), } - this._maxLines = LiveTailSession.settings.get('liveTailMaxEvents', 10000) + this._maxLines = LiveTailSession.settings.get('limit', 10000) this._uri = createLiveTailURIFromArgs(configuration) } diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts index 4e23b3cbe6f..2fcb2731a9c 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import * as vscode from 'vscode' -import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../shared/constants' +import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants' import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession' export class LiveTailSessionRegistry extends Map { @@ -19,7 +19,7 @@ export class LiveTailSessionRegistry extends Map { } export function createLiveTailURIFromArgs(sessionData: LiveTailSessionConfiguration): vscode.Uri { - let uriStr = `${CLOUDWATCH_LOGS_LIVETAIL_SCHEME}:${sessionData.region}:${sessionData.logGroupName}` + let uriStr = `${cloudwatchLogsLiveTailScheme}:${sessionData.region}:${sessionData.logGroupName}` if (sessionData.logStreamFilter) { if (sessionData.logStreamFilter.type !== 'all') { diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts index 7bb24801542..84135666a66 100644 --- a/packages/core/src/shared/constants.ts +++ b/packages/core/src/shared/constants.ts @@ -128,7 +128,7 @@ export const ecsIamPermissionsUrl = vscode.Uri.parse( * URI scheme for CloudWatch Logs Virtual Documents */ export const CLOUDWATCH_LOGS_SCHEME = 'aws-cwl' // eslint-disable-line @typescript-eslint/naming-convention -export const CLOUDWATCH_LOGS_LIVETAIL_SCHEME = 'aws-cwl-lt' // eslint-disable-line @typescript-eslint/naming-convention +export const cloudwatchLogsLiveTailScheme = 'aws-cwl-lt' export const AWS_SCHEME = 'aws' // eslint-disable-line @typescript-eslint/naming-convention export const ec2LogsScheme = 'aws-ec2' diff --git a/packages/core/src/shared/settings-toolkit.gen.ts b/packages/core/src/shared/settings-toolkit.gen.ts index 62b2bbb1bc4..ea291352701 100644 --- a/packages/core/src/shared/settings-toolkit.gen.ts +++ b/packages/core/src/shared/settings-toolkit.gen.ts @@ -22,7 +22,6 @@ export const toolkitSettings = { "aws.stepfunctions.asl.maxItemsComputed": {}, "aws.ssmDocument.ssm.maxItemsComputed": {}, "aws.cwl.limit": {}, - "aws.cwl.liveTailMaxEvents": {}, "aws.samcli.manuallySelectedBuckets": {}, "aws.samcli.enableCodeLenses": {}, "aws.suppressPrompts": { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts index edb586b4514..17ec44e0c07 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts @@ -6,12 +6,12 @@ import * as vscode from 'vscode' import assert from 'assert' import { LiveTailSessionConfiguration } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' import { createLiveTailURIFromArgs } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry' -import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../../shared/constants' +import { cloudwatchLogsLiveTailScheme } from '../../../../shared/constants' describe('LiveTailSession URI', async function () { const testLogGroupName = 'test-log-group' const testRegion = 'test-region' - const expectedUriBase = `${CLOUDWATCH_LOGS_LIVETAIL_SCHEME}:${testRegion}:${testLogGroupName}` + const expectedUriBase = `${cloudwatchLogsLiveTailScheme}:${testRegion}:${testLogGroupName}` it('is correct with no logStream filter, no filter pattern', function () { const config: LiveTailSessionConfiguration = { diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 9b2fa7f18d5..8ebfb3e61a5 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -162,13 +162,6 @@ "description": "%AWS.cwl.limit.desc%", "maximum": 10000 }, - "aws.cwl.liveTailMaxEvents": { - "type": "number", - "default": 10000, - "description": "%AWS.cwl.liveTailMaxEvents.desc%", - "minimum": 1000, - "maximum": 10000 - }, "aws.samcli.manuallySelectedBuckets": { "type": "object", "description": "%AWS.samcli.deploy.bucket.recentlyUsed%", From 64ecf84cbb7dbf17c79dc811a868ee15cf305bf2 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Wed, 23 Oct 2024 17:49:06 -0700 Subject: [PATCH 007/202] feat(cwl): Add line trimming to LiveTail when limit is reached (#5837) ## Problem * LiveTail sessions can run for a long time, on LogGroups that have a high volume of LogEvents. We want to not infinitely add logs to a TextDocument, leading to memory issues within VSCode. ## Solution Users can configure a `limit` preference (default: 10000 , max 10000 , min: 1000). When the number of lines in a Live Tail session (number of LogEvents) reaches the limit, the 'N' oldest logEvents will be removed, to fit in the 'N' newest events coming in from the response stream. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 16 ++++++ .../commands/tailLogGroup.test.ts | 54 +++++++++++++------ 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index b2463309029..800a79a7554 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -108,9 +108,25 @@ async function updateTextDocumentWithNewLogEvents( formattedLogEvents.forEach((formattedLogEvent) => edit.insert(document.uri, new vscode.Position(document.lineCount, 0), formattedLogEvent) ) + if (document.lineCount + formattedLogEvents.length > maxLines) { + trimOldestLines(formattedLogEvents.length, maxLines, document, edit) + } await vscode.workspace.applyEdit(edit) } +function trimOldestLines( + numNewLines: number, + maxLines: number, + document: vscode.TextDocument, + edit: vscode.WorkspaceEdit +) { + const numLinesToTrim = document.lineCount + numNewLines - maxLines + const startPosition = new vscode.Position(0, 0) + const endPosition = new vscode.Position(numLinesToTrim, 0) + const range = new vscode.Range(startPosition, endPosition) + edit.delete(document.uri, range) +} + /** * The LiveTail session should be automatically closed if the user does not have the session's * document in any Tab in their editor. diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index c5061ffde1f..5e988c9d7cc 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -8,7 +8,7 @@ import * as vscode from 'vscode' import assert from 'assert' import { clearDocument, closeSession, tailLogGroup } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup' -import { StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' +import { LiveTailSessionLogEvent, StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' import { LiveTailSessionRegistry } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry' import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' import { asyncGenerator } from '../../../../shared/utilities/collectionUtils' @@ -17,6 +17,7 @@ import { TailLogGroupWizardResponse, } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' import { getTestWindow } from '../../../shared/vscode/window' +import { CloudWatchLogsSettings } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' describe('TailLogGroup', function () { const testLogGroup = 'test-log-group' @@ -27,6 +28,7 @@ describe('TailLogGroup', function () { let registry: LiveTailSessionRegistry let startLiveTailSessionSpy: sinon.SinonSpy let stopLiveTailSessionSpy: sinon.SinonSpy + let cloudwatchSettingsSpy: sinon.SinonSpy let wizardSpy: sinon.SinonSpy beforeEach(function () { @@ -42,21 +44,42 @@ describe('TailLogGroup', function () { wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { return getTestWizardResponse() }) + const testMessage2 = `${testMessage}-2` + const testMessage3 = `${testMessage}-3` startLiveTailSessionSpy = sandbox .stub(LiveTailSession.prototype, 'startLiveTailSession') .callsFake(async function () { - return getTestResponseStream() + return getTestResponseStream([ + { + message: testMessage, + timestamp: 876830400000, + }, + { + message: testMessage2, + timestamp: 876830402000, + }, + { + message: testMessage3, + timestamp: 876830403000, + }, + ]) }) stopLiveTailSessionSpy = sandbox .stub(LiveTailSession.prototype, 'stopLiveTailSession') .callsFake(async function () { return }) + + //Set maxLines to 1. + cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => { + return 1 + }) await tailLogGroup(registry, { groupName: testLogGroup, regionName: testRegion, }) assert.strictEqual(wizardSpy.calledOnce, true) + assert.strictEqual(cloudwatchSettingsSpy.calledOnce, true) assert.strictEqual(startLiveTailSessionSpy.calledOnce, true) assert.strictEqual(registry.size, 1) @@ -69,7 +92,8 @@ describe('TailLogGroup', function () { } const document = getTestWindow().activeTextEditor?.document assert.strictEqual(sessionUri.toString(), document?.uri.toString()) - assert.strictEqual(document?.getText().trim(), `12:00:00\t${testMessage}`) + //Test responseStream has 3 events, maxLines is set to 1. Only 3rd event should be in doc. + assert.strictEqual(document?.getText().trim(), `12:00:03\t${testMessage3}`) //Test that closing all tabs the session's document is open in will cause the session to close const window = getTestWindow() @@ -136,23 +160,23 @@ describe('TailLogGroup', function () { } } - function getTestResponseStream(): AsyncIterable { + //Creates a test response stream. Each log event provided will be its own "frame" of the input stream. + function getTestResponseStream(logEvents: LiveTailSessionLogEvent[]): AsyncIterable { const sessionStartFrame: StartLiveTailResponseStream = { sessionStart: { logGroupIdentifiers: [testLogGroup], }, sessionUpdate: undefined, } - const sessionUpdateFrame: StartLiveTailResponseStream = { - sessionUpdate: { - sessionResults: [ - { - message: testMessage, - timestamp: 876830400000, - }, - ], - }, - } - return asyncGenerator([sessionStartFrame, sessionUpdateFrame]) + + const updateFrames: StartLiveTailResponseStream[] = logEvents.map((event) => { + return { + sessionUpdate: { + sessionResults: [event], + }, + } + }) + + return asyncGenerator([sessionStartFrame, ...updateFrames]) } }) From 5de67b5c964358f85bea0987029f9d3f0647da89 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Mon, 28 Oct 2024 07:03:05 -0700 Subject: [PATCH 008/202] feat(cwl): Support autoscrolling live tail session's visible editors (#5857) ## Problem New log events in a LiveTail session are added to the end of a TextDocument. Session updates can contain multiple LogEvents, leading to the text document growing quickly past the user's view. requiring them to constantly be scrolling the document themselves. ## Solution To maintain parity with CWL console experience (and the classic `tail -f` experience), we want to auto scroll the customer's LiveTail session's visible editors to the bottom. This will only happen IF the end of file is already in view. Meaning, if a User scrolls UP (causing the end of file to not be in view), auto scrolling will not enable. However, if they scroll back down to EOF themselves, it will re-enable. Simply, if the end of file is in view, when new logEvents are added to the document, the editor will be autoscrolled back to the end of the file. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 800a79a7554..ce78f7736b8 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -77,7 +77,11 @@ async function handleSessionStream( formatLogEvent(logEvent) ) if (formattedLogEvents.length !== 0) { + //Determine should scroll before adding new lines to doc because adding large + //amount of new lines can push bottom of file out of view before scrolling. + const editorsToScroll = getTextEditorsToScroll(document) await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) + editorsToScroll.forEach(scrollTextEditorToBottom) } } } @@ -99,6 +103,22 @@ function formatLogEvent(logEvent: LiveTailSessionLogEvent): string { return line } +//Auto scroll visible LiveTail session editors if the end-of-file is in view. +//This allows for newly added log events to stay in view. +function getTextEditorsToScroll(document: vscode.TextDocument): vscode.TextEditor[] { + return vscode.window.visibleTextEditors.filter((editor) => { + if (editor.document !== document) { + return false + } + return editor.visibleRanges[0].contains(new vscode.Position(document.lineCount - 1, 0)) + }) +} + +function scrollTextEditorToBottom(editor: vscode.TextEditor) { + const position = new vscode.Position(Math.max(editor.document.lineCount - 2, 0), 0) + editor.revealRange(new vscode.Range(position, position), vscode.TextEditorRevealType.Default) +} + async function updateTextDocumentWithNewLogEvents( formattedLogEvents: string[], document: vscode.TextDocument, From a5a0aea3bed262659338ec0a7c11b940388c6714 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Thu, 7 Nov 2024 16:24:44 -0800 Subject: [PATCH 009/202] feat(cwl): LiveTail statusbar #5938 Problem As LiveTail session is running, we want to display to the user metadata about their session. Solution While a livetail session is the active editor, in the bottom status bar, we will display the duration the session has been running for, how many events per/s, and if the log data is being sampled or not. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 73 ++++++++++++++----- .../registry/liveTailSession.ts | 45 +++++++++++- .../commands/tailLogGroup.test.ts | 21 +++++- 3 files changed, 118 insertions(+), 21 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index ce78f7736b8..69ab4569186 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -8,8 +8,12 @@ import { TailLogGroupWizard } from '../wizard/tailLogGroupWizard' import { CancellationError } from '../../../shared/utilities/timeoutUtils' import { LiveTailSession, LiveTailSessionConfiguration } from '../registry/liveTailSession' import { LiveTailSessionRegistry } from '../registry/liveTailSessionRegistry' -import { LiveTailSessionLogEvent, StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' -import { ToolkitError } from '../../../shared' +import { + LiveTailSessionLogEvent, + LiveTailSessionUpdate, + StartLiveTailResponseStream, +} from '@aws-sdk/client-cloudwatch-logs' +import { globals, ToolkitError } from '../../../shared' export async function tailLogGroup( registry: LiveTailSessionRegistry, @@ -35,13 +39,19 @@ export async function tailLogGroup( registry.set(session.uri, session) const document = await prepareDocument(session) - registerTabChangeCallback(session, registry, document) + const timer = globals.clock.setInterval(() => { + session.updateStatusBarItemText() + }, 500) + hideShowStatusBarItemsOnActiveEditor(session, document) + registerTabChangeCallback(session, registry, document, timer) + const stream = await session.startLiveTailSession() - await handleSessionStream(stream, document, session) + await handleSessionStream(stream, document, session, timer) } -export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry) { +export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry, timer: NodeJS.Timer) { + globals.clock.clearInterval(timer) const session = registry.get(sessionUri) if (session === undefined) { throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) @@ -63,27 +73,35 @@ async function prepareDocument(session: LiveTailSession): Promise, document: vscode.TextDocument, - session: LiveTailSession + session: LiveTailSession, + timer: NodeJS.Timer ) { - for await (const event of stream) { - if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) { - const formattedLogEvents = event.sessionUpdate.sessionResults.map((logEvent) => - formatLogEvent(logEvent) - ) - if (formattedLogEvents.length !== 0) { - //Determine should scroll before adding new lines to doc because adding large - //amount of new lines can push bottom of file out of view before scrolling. - const editorsToScroll = getTextEditorsToScroll(document) - await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) - editorsToScroll.forEach(scrollTextEditorToBottom) + try { + for await (const event of stream) { + if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) { + const formattedLogEvents = event.sessionUpdate.sessionResults.map((logEvent) => + formatLogEvent(logEvent) + ) + if (formattedLogEvents.length !== 0) { + //Determine should scroll before adding new lines to doc because adding large + //amount of new lines can push bottom of file out of view before scrolling. + const editorsToScroll = getTextEditorsToScroll(document) + await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) + editorsToScroll.forEach(scrollTextEditorToBottom) + } + session.eventRate = eventRate(event.sessionUpdate) + session.isSampled = isSampled(event.sessionUpdate) } } + } finally { + globals.clock.clearInterval(timer) } } @@ -147,6 +165,22 @@ function trimOldestLines( edit.delete(document.uri, range) } +function isSampled(event: LiveTailSessionUpdate): boolean { + return event.sessionMetadata === undefined || event.sessionMetadata.sampled === undefined + ? false + : event.sessionMetadata.sampled +} + +function eventRate(event: LiveTailSessionUpdate): number { + return event.sessionResults === undefined ? 0 : event.sessionResults.length +} + +function hideShowStatusBarItemsOnActiveEditor(session: LiveTailSession, document: vscode.TextDocument) { + vscode.window.onDidChangeActiveTextEditor((editor) => { + session.showStatusBarItem(editor?.document === document) + }) +} + /** * The LiveTail session should be automatically closed if the user does not have the session's * document in any Tab in their editor. @@ -162,12 +196,13 @@ function trimOldestLines( function registerTabChangeCallback( session: LiveTailSession, registry: LiveTailSessionRegistry, - document: vscode.TextDocument + document: vscode.TextDocument, + timer: NodeJS.Timer ) { vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { const isOpen = isLiveTailSessionOpenInAnyTab(session) if (!isOpen) { - closeSession(session.uri, registry) + closeSession(session.uri, registry, timer) void clearDocument(document) } }) diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index ba6e0fdd27f..7e4b64ccc57 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -10,7 +10,7 @@ import { } from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' -import { Settings, ToolkitError } from '../../../shared' +import { convertToTimeString, Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' import { getUserAgent } from '../../../shared/telemetry/util' @@ -33,6 +33,11 @@ export class LiveTailSession { private logEventFilterPattern?: string private _maxLines: number private _uri: vscode.Uri + private statusBarItem: vscode.StatusBarItem + private startTime: number | undefined + private endTime: number | undefined + private _eventRate: number + private _isSampled: boolean static settings = new CloudWatchLogsSettings(Settings.instance) @@ -48,6 +53,9 @@ export class LiveTailSession { } this._maxLines = LiveTailSession.settings.get('limit', 10000) this._uri = createLiveTailURIFromArgs(configuration) + this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 0) + this._eventRate = 0 + this._isSampled = false } public get maxLines() { @@ -62,6 +70,14 @@ export class LiveTailSession { return this._logGroupName } + public set eventRate(rate: number) { + this._eventRate = rate + } + + public set isSampled(isSampled: boolean) { + this._isSampled = isSampled + } + public async startLiveTailSession(): Promise> { const command = this.buildStartLiveTailCommand() try { @@ -71,6 +87,8 @@ export class LiveTailSession { if (!commandOutput.responseStream) { throw new ToolkitError('LiveTail session response stream is undefined.') } + this.startTime = Date.now() + this.endTime = undefined return commandOutput.responseStream } catch (e) { throw new ToolkitError('Encountered error while trying to start LiveTail session.') @@ -78,10 +96,24 @@ export class LiveTailSession { } public stopLiveTailSession() { + this.endTime = Date.now() + this.statusBarItem.dispose() this.liveTailClient.abortController.abort() this.liveTailClient.cwlClient.destroy() } + public getLiveTailSessionDuration(): number { + //Never started + if (this.startTime === undefined) { + return 0 + } + //Currently running + if (this.endTime === undefined) { + return Date.now() - this.startTime + } + return this.endTime - this.startTime + } + private buildStartLiveTailCommand(): StartLiveTailCommand { let logStreamNamePrefix = undefined let logStreamName = undefined @@ -102,4 +134,15 @@ export class LiveTailSession { logEventFilterPattern: this.logEventFilterPattern ? this.logEventFilterPattern : undefined, }) } + + public showStatusBarItem(shouldShow: boolean) { + shouldShow ? this.statusBarItem.show() : this.statusBarItem.hide() + } + + public updateStatusBarItemText() { + const elapsedTime = this.getLiveTailSessionDuration() + const timeString = convertToTimeString(elapsedTime) + const sampledString = this._isSampled ? 'Yes' : 'No' + this.statusBarItem.text = `Tailing: ${timeString}, ${this._eventRate} events/sec, Sampled: ${sampledString}` + } } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 5e988c9d7cc..2a5897db4cc 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -4,6 +4,7 @@ */ import * as sinon from 'sinon' +import * as FakeTimers from '@sinonjs/fake-timers' import * as vscode from 'vscode' import assert from 'assert' @@ -18,6 +19,7 @@ import { } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' import { getTestWindow } from '../../../shared/vscode/window' import { CloudWatchLogsSettings } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' +import { installFakeClock } from '../../../testUtil' describe('TailLogGroup', function () { const testLogGroup = 'test-log-group' @@ -31,11 +33,22 @@ describe('TailLogGroup', function () { let cloudwatchSettingsSpy: sinon.SinonSpy let wizardSpy: sinon.SinonSpy + let clock: FakeTimers.InstalledClock + + before(function () { + clock = installFakeClock() + }) + beforeEach(function () { + clock.reset() sandbox = sinon.createSandbox() registry = new LiveTailSessionRegistry() }) + after(function () { + clock.uninstall() + }) + afterEach(function () { sandbox.restore() }) @@ -112,15 +125,18 @@ describe('TailLogGroup', function () { .callsFake(async function () { return }) + // const fakeClock = installFakeClock() + const timer = setInterval(() => {}, 1000) const session = new LiveTailSession({ logGroupName: testLogGroup, region: testRegion, }) registry.set(session.uri, session) - closeSession(session.uri, registry) + closeSession(session.uri, registry, timer) assert.strictEqual(0, registry.size) assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) + assert.strictEqual(0, clock.countTimers()) }) it('clearDocument clears all text from document', async function () { @@ -172,6 +188,9 @@ describe('TailLogGroup', function () { const updateFrames: StartLiveTailResponseStream[] = logEvents.map((event) => { return { sessionUpdate: { + sessionMetadata: { + sampled: false, + }, sessionResults: [event], }, } From e6645d42d2daaf0df4b8e86823544adef7a0769f Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Fri, 8 Nov 2024 14:21:49 -0800 Subject: [PATCH 010/202] feat(cwl): "clear screen", "stop session" actions #5958 ## Problem Users may want to clear their screen during a tailing session. The liveTail document is read only. Users may want to stop their session without closing the document. ## Solution Provide a codeLens to clear the screen (make document empty) Provide a codeLens to stop the session without closing the document. Moves Interval Timer for updating the StatusBar to the LiveTailSession object so `stopLiveTailSession()` can interrupt it, and be guaranteed to be cleaned up. The TextDocument's URI and Session URI seem to not be equal. Looking up in the LiveTailSessionRegistry with a document URI causes a session to not be found. Converting with `toString` allows these URIs to match and the registry to work as intended. Improves Exception handling on-stream. Previously, stopping the session in an expected fashion (codeLens, Closing editors) would cause an exception to bubble up and appear to the User. New change recognizes when the Abort Controller triggers, signifying an error has not occured, and logs the event as opposed to surfacing an error. Exposing only `isAborted` so that a caller has to use `stopLiveTailSession` to trigger the abortController and guarantee that other clean up actions have taken place. --- .../awsService/cloudWatchLogs/activation.ts | 21 +++++++- .../cloudWatchLogs/commands/tailLogGroup.ts | 47 ++++++++++------- .../document/liveTailCodeLensProvider.ts | 52 +++++++++++++++++++ .../registry/liveTailSession.ts | 14 ++++- .../registry/liveTailSessionRegistry.ts | 2 +- .../commands/tailLogGroup.test.ts | 9 ++-- 6 files changed, 118 insertions(+), 27 deletions(-) create mode 100644 packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index 75951604bea..de75d9e72a4 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -19,13 +19,14 @@ import { searchLogGroup } from './commands/searchLogGroup' import { changeLogSearchParams } from './changeLogSearch' import { CloudWatchLogsNode } from './explorer/cloudWatchLogsNode' import { loadAndOpenInitialLogStreamFile, LogStreamCodeLensProvider } from './document/logStreamsCodeLensProvider' -import { tailLogGroup } from './commands/tailLogGroup' +import { clearDocument, closeSession, tailLogGroup } from './commands/tailLogGroup' import { LiveTailDocumentProvider } from './document/liveTailDocumentProvider' import { LiveTailSessionRegistry } from './registry/liveTailSessionRegistry' import { DeployedResourceNode } from '../appBuilder/explorer/nodes/deployedNode' import { isTreeNode } from '../../shared/treeview/resourceTreeDataProvider' import { getLogger } from '../../shared/logger/logger' import { ToolkitError } from '../../shared' +import { LiveTailCodeLensProvider } from './document/liveTailCodeLensProvider' export async function activate(context: vscode.ExtensionContext, configuration: Settings): Promise { const registry = LogDataRegistry.instance @@ -48,6 +49,16 @@ export async function activate(context: vscode.ExtensionContext, configuration: vscode.workspace.registerTextDocumentContentProvider(CLOUDWATCH_LOGS_SCHEME, documentProvider) ) + context.subscriptions.push( + vscode.languages.registerCodeLensProvider( + { + language: 'log', + scheme: cloudwatchLogsLiveTailScheme, + }, + new LiveTailCodeLensProvider() + ) + ) + context.subscriptions.push( vscode.workspace.registerTextDocumentContentProvider(cloudwatchLogsLiveTailScheme, liveTailDocumentProvider) ) @@ -112,6 +123,14 @@ export async function activate(context: vscode.ExtensionContext, configuration: await tailLogGroup(liveTailRegistry, logGroupInfo) }), + Commands.register('aws.cwl.stopTailingLogGroup', async (document: vscode.TextDocument) => { + closeSession(document.uri, liveTailRegistry) + }), + + Commands.register('aws.cwl.clearDocument', async (document: vscode.TextDocument) => { + await clearDocument(document) + }), + Commands.register('aws.appBuilder.searchLogs', async (node: DeployedResourceNode) => { try { const logGroupInfo = isTreeNode(node) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 69ab4569186..74ac67fca33 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -13,7 +13,8 @@ import { LiveTailSessionUpdate, StartLiveTailResponseStream, } from '@aws-sdk/client-cloudwatch-logs' -import { globals, ToolkitError } from '../../../shared' +import { getLogger, ToolkitError } from '../../../shared' +import { uriToKey } from '../cloudWatchLogsUtils' export async function tailLogGroup( registry: LiveTailSessionRegistry, @@ -32,32 +33,29 @@ export async function tailLogGroup( region: wizardResponse.regionLogGroupSubmenuResponse.region, } const session = new LiveTailSession(liveTailSessionConfig) - if (registry.has(session.uri)) { + if (registry.has(uriToKey(session.uri))) { await prepareDocument(session) return } - registry.set(session.uri, session) + registry.set(uriToKey(session.uri), session) const document = await prepareDocument(session) - const timer = globals.clock.setInterval(() => { - session.updateStatusBarItemText() - }, 500) + hideShowStatusBarItemsOnActiveEditor(session, document) - registerTabChangeCallback(session, registry, document, timer) + registerTabChangeCallback(session, registry, document) const stream = await session.startLiveTailSession() - await handleSessionStream(stream, document, session, timer) + await handleSessionStream(stream, document, session) } -export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry, timer: NodeJS.Timer) { - globals.clock.clearInterval(timer) - const session = registry.get(sessionUri) +export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry) { + const session = registry.get(uriToKey(sessionUri)) if (session === undefined) { throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) } session.stopLiveTailSession() - registry.delete(sessionUri) + registry.delete(uriToKey(sessionUri)) } export async function clearDocument(textDocument: vscode.TextDocument) { @@ -80,8 +78,7 @@ async function prepareDocument(session: LiveTailSession): Promise, document: vscode.TextDocument, - session: LiveTailSession, - timer: NodeJS.Timer + session: LiveTailSession ) { try { for await (const event of stream) { @@ -100,8 +97,21 @@ async function handleSessionStream( session.isSampled = isSampled(event.sessionUpdate) } } - } finally { - globals.clock.clearInterval(timer) + } catch (e) { + if (session.isAborted) { + //Expected case. User action cancelled stream (CodeLens, Close Editor, etc.). + //AbortSignal interrupts the LiveTail stream, causing error to be thrown here. + //Can assume that stopLiveTailSession() has already been called - AbortSignal is only + //exposed through that method. + getLogger().info(`Session stopped: ${uriToKey(session.uri)}`) + } else { + //Unexpected exception. + session.stopLiveTailSession() + throw ToolkitError.chain( + e, + `Unexpected on-stream exception while tailing session: ${session.uri.toString()}` + ) + } } } @@ -196,13 +206,12 @@ function hideShowStatusBarItemsOnActiveEditor(session: LiveTailSession, document function registerTabChangeCallback( session: LiveTailSession, registry: LiveTailSessionRegistry, - document: vscode.TextDocument, - timer: NodeJS.Timer + document: vscode.TextDocument ) { vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { const isOpen = isLiveTailSessionOpenInAnyTab(session) if (!isOpen) { - closeSession(session.uri, registry, timer) + closeSession(session.uri, registry) void clearDocument(document) } }) diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts new file mode 100644 index 00000000000..7c7bb1cd74c --- /dev/null +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts @@ -0,0 +1,52 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as vscode from 'vscode' +import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants' + +export class LiveTailCodeLensProvider implements vscode.CodeLensProvider { + onDidChangeCodeLenses?: vscode.Event | undefined + + provideCodeLenses( + document: vscode.TextDocument, + token: vscode.CancellationToken + ): vscode.ProviderResult { + const uri = document.uri + if (uri.scheme !== cloudwatchLogsLiveTailScheme) { + return [] + } + const codeLenses: vscode.CodeLens[] = [] + codeLenses.push(this.buildClearDocumentCodeLens(document)) + codeLenses.push(this.buildStopTailingCodeLens(document)) + return codeLenses + } + + private buildClearDocumentCodeLens(document: vscode.TextDocument): vscode.CodeLens { + const range = this.getBottomOfDocumentRange(document) + const command: vscode.Command = { + title: 'Clear document', + command: 'aws.cwl.clearDocument', + arguments: [document], + } + return new vscode.CodeLens(range, command) + } + + private buildStopTailingCodeLens(document: vscode.TextDocument): vscode.CodeLens { + const range = this.getBottomOfDocumentRange(document) + const command: vscode.Command = { + title: 'Stop tailing', + command: 'aws.cwl.stopTailingLogGroup', + arguments: [document], + } + return new vscode.CodeLens(range, command) + } + + private getBottomOfDocumentRange(document: vscode.TextDocument): vscode.Range { + return new vscode.Range( + new vscode.Position(document.lineCount - 1, 0), + new vscode.Position(document.lineCount - 1, 0) + ) + } +} diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index 7e4b64ccc57..f01e389bf3e 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -10,7 +10,7 @@ import { } from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' -import { convertToTimeString, Settings, ToolkitError } from '../../../shared' +import { convertToTimeString, globals, Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' import { getUserAgent } from '../../../shared/telemetry/util' @@ -39,6 +39,9 @@ export class LiveTailSession { private _eventRate: number private _isSampled: boolean + //While session is running, used to update the StatusBar each half second. + private statusBarUpdateTimer: NodeJS.Timer | undefined + static settings = new CloudWatchLogsSettings(Settings.instance) public constructor(configuration: LiveTailSessionConfiguration) { @@ -89,6 +92,10 @@ export class LiveTailSession { } this.startTime = Date.now() this.endTime = undefined + this.statusBarUpdateTimer = globals.clock.setInterval(() => { + this.updateStatusBarItemText() + }, 500) + return commandOutput.responseStream } catch (e) { throw new ToolkitError('Encountered error while trying to start LiveTail session.') @@ -98,6 +105,7 @@ export class LiveTailSession { public stopLiveTailSession() { this.endTime = Date.now() this.statusBarItem.dispose() + globals.clock.clearInterval(this.statusBarUpdateTimer) this.liveTailClient.abortController.abort() this.liveTailClient.cwlClient.destroy() } @@ -145,4 +153,8 @@ export class LiveTailSession { const sampledString = this._isSampled ? 'Yes' : 'No' this.statusBarItem.text = `Tailing: ${timeString}, ${this._eventRate} events/sec, Sampled: ${sampledString}` } + + public get isAborted() { + return this.liveTailClient.abortController.signal.aborted + } } diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts index 2fcb2731a9c..3d5bc5c59a8 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode' import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants' import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession' -export class LiveTailSessionRegistry extends Map { +export class LiveTailSessionRegistry extends Map { static #instance: LiveTailSessionRegistry public static get instance() { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 2a5897db4cc..e364c70ce34 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -18,7 +18,7 @@ import { TailLogGroupWizardResponse, } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' import { getTestWindow } from '../../../shared/vscode/window' -import { CloudWatchLogsSettings } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' +import { CloudWatchLogsSettings, uriToKey } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' import { installFakeClock } from '../../../testUtil' describe('TailLogGroup', function () { @@ -125,15 +125,14 @@ describe('TailLogGroup', function () { .callsFake(async function () { return }) - // const fakeClock = installFakeClock() - const timer = setInterval(() => {}, 1000) + const session = new LiveTailSession({ logGroupName: testLogGroup, region: testRegion, }) - registry.set(session.uri, session) + registry.set(uriToKey(session.uri), session) - closeSession(session.uri, registry, timer) + closeSession(session.uri, registry) assert.strictEqual(0, registry.size) assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) assert.strictEqual(0, clock.countTimers()) From ca25202dd2f76f25acaa44a798f8012616aa17fd Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Mon, 11 Nov 2024 13:46:02 -0800 Subject: [PATCH 011/202] fix(cwl): remove unnecessary catch and rethrow for pre-stream (#5976) ## Problem Exceptions can occur pre-stream (the synchronous portion of a StartLiveTail call that establishes the streaming connection). Currently, we are calling StartLiveTail in a try-catch, catching errrors, and throwing them as a ToolkitException. These are not chaining the root exception. This means when an error occurs, its root cause is being swallowed - causing user's to not know *why* their LiveTall command is failing. ## Solution Given that we are just rethrowing `err`. There's probably no point to this catch. Removing it, and letting the root exception throw. Forced pre-stream exception to throw with an IAM permission violation and this change applied. More clear as to what the actual problem is: Pop-up: `Failed to run command: aws.cwl.tailLogGroup: User: arn:aws:sts::203607498903:assumed-role/NoLiveTail/keegani-Isengard is not authorized to perform: logs:StartLiveTail on resource: arn:aws:logs:us-east-1:203607498903:log-group:/aws/codebuild/BATSSandboxCodeBuildPr-bf0a23097fbc3948a2c5b26f1616f7d32b622cba because no identity-based policy allows the logs:StartLiveTail action` Full log: ``` 2024-11-11 13:00:04.310 [error] aws.cwl.tailLogGroup: [AccessDeniedException: User: arn:aws:sts::203607498903:assumed-role/NoLiveTail/keegani-Isengard is not authorized to perform: logs:StartLiveTail on resource: arn:aws:logs:us-east-1:203607498903:log-group:/aws/codebuild/BATSSandboxCodeBuildPr-bf0a23097fbc3948a2c5b26f1616f7d32b622cba because no identity-based policy allows the logs:StartLiveTail action at de_AccessDeniedExceptionRes (/Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@aws-sdk/client-cloudwatch-logs/dist-cjs/index.js:2249:21) at de_CommandError (/Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@aws-sdk/client-cloudwatch-logs/dist-cjs/index.js:2203:19) at process.processTicksAndRejections (node:internal/process/task_queues:95:5) at async /Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-serde/dist-cjs/index.js:35:20 at async /Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@smithy/core/dist-cjs/index.js:168:18 at async /Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/middleware-retry/dist-cjs/index.js:320:38 at async /Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-logger/dist-cjs/index.js:34:22 at async LiveTailSession.startLiveTailSession (/Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/packages/core/dist/src/awsService/cloudWatchLogs/registry/liveTailSession.js:70:31) at async tailLogGroup (/Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/packages/core/dist/src/awsService/cloudWatchLogs/commands/tailLogGroup.js:58:20) at async /Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/packages/core/dist/src/awsService/cloudWatchLogs/activation.js:91:9 at async runCommand (/Users/keegani/workplace/aws-toolkit-vscode-release/aws-toolkit-vscode/packages/core/dist/src/shared/vscode/commands2.js:445:16) at async Y0.h (file:///Applications/Visual%20Studio%20Code.app/Contents/Resources/app/out/vs/workbench/api/node/extensionHostProcess.js:114:32825)] { '$fault': 'client', '$metadata': [Object], __type: 'AccessDeniedException' } ``` --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: Keegan Irby --- .../registry/liveTailSession.ts | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index f01e389bf3e..bb9aafe68db 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -82,24 +82,18 @@ export class LiveTailSession { } public async startLiveTailSession(): Promise> { - const command = this.buildStartLiveTailCommand() - try { - const commandOutput = await this.liveTailClient.cwlClient.send(command, { - abortSignal: this.liveTailClient.abortController.signal, - }) - if (!commandOutput.responseStream) { - throw new ToolkitError('LiveTail session response stream is undefined.') - } - this.startTime = Date.now() - this.endTime = undefined - this.statusBarUpdateTimer = globals.clock.setInterval(() => { - this.updateStatusBarItemText() - }, 500) - - return commandOutput.responseStream - } catch (e) { - throw new ToolkitError('Encountered error while trying to start LiveTail session.') + const commandOutput = await this.liveTailClient.cwlClient.send(this.buildStartLiveTailCommand(), { + abortSignal: this.liveTailClient.abortController.signal, + }) + if (!commandOutput.responseStream) { + throw new ToolkitError('LiveTail session response stream is undefined.') } + this.startTime = Date.now() + this.endTime = undefined + this.statusBarUpdateTimer = globals.clock.setInterval(() => { + this.updateStatusBarItemText() + }, 500) + return commandOutput.responseStream } public stopLiveTailSession() { From 5b80409542fd04411fbb9148537aac4a6c07bcf1 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 12 Nov 2024 13:34:03 -0800 Subject: [PATCH 012/202] fix(cwl): LiveTail fails to start when clicking with Play next to a LogGroup #5986 ## Problem Starting a LiveTail session by clicking Play next to a specific LogGroup in the explorer menu is failing. This is because the LogGroup name is passed into the Wizard response, and not a fully qualified Arn. StartLiveTail API request requires ARNs. ## Solution Detect if the context when initializing the TailLogGroup wizard is a LogGroup Name or Arn. If it is just a name, construct the Arn and set that in the Wizard response. Renames `LogGroupName` in `LiveTailSession` to `LogGroupArn` to make it more clear what is expected. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 2 +- .../registry/liveTailSession.ts | 17 ++++++----- .../registry/liveTailSessionRegistry.ts | 2 +- .../wizard/tailLogGroupWizard.ts | 17 +++++++++-- .../commands/tailLogGroup.test.ts | 7 +++-- .../registry/liveTailRegistry.test.ts | 12 ++++---- .../wizard/tailLogGroupWizard.test.ts | 30 +++++++++++++++++-- 7 files changed, 64 insertions(+), 23 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 74ac67fca33..6a41025be71 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -27,7 +27,7 @@ export async function tailLogGroup( } const liveTailSessionConfig: LiveTailSessionConfiguration = { - logGroupName: wizardResponse.regionLogGroupSubmenuResponse.data, + logGroupArn: wizardResponse.regionLogGroupSubmenuResponse.data, logStreamFilter: wizardResponse.logStreamFilter, logEventFilterPattern: wizardResponse.filterPattern, region: wizardResponse.regionLogGroupSubmenuResponse.region, diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index bb9aafe68db..e1e67be2a0b 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -9,13 +9,13 @@ import { StartLiveTailResponseStream, } from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' -import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' -import { convertToTimeString, globals, Settings, ToolkitError } from '../../../shared' +import { CloudWatchLogsSettings, uriToKey } from '../cloudWatchLogsUtils' +import { convertToTimeString, getLogger, globals, Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' import { getUserAgent } from '../../../shared/telemetry/util' export type LiveTailSessionConfiguration = { - logGroupName: string + logGroupArn: string logStreamFilter?: LogStreamFilterResponse logEventFilterPattern?: string region: string @@ -28,7 +28,7 @@ export type LiveTailSessionClient = { export class LiveTailSession { private liveTailClient: LiveTailSessionClient - private _logGroupName: string + private _logGroupArn: string private logStreamFilter?: LogStreamFilterResponse private logEventFilterPattern?: string private _maxLines: number @@ -45,7 +45,7 @@ export class LiveTailSession { static settings = new CloudWatchLogsSettings(Settings.instance) public constructor(configuration: LiveTailSessionConfiguration) { - this._logGroupName = configuration.logGroupName + this._logGroupArn = configuration.logGroupArn this.logStreamFilter = configuration.logStreamFilter this.liveTailClient = { cwlClient: new CloudWatchLogsClient({ @@ -69,8 +69,8 @@ export class LiveTailSession { return this._uri } - public get logGroupName() { - return this._logGroupName + public get logGroupArn() { + return this._logGroupArn } public set eventRate(rate: number) { @@ -93,6 +93,7 @@ export class LiveTailSession { this.statusBarUpdateTimer = globals.clock.setInterval(() => { this.updateStatusBarItemText() }, 500) + getLogger().info(`LiveTail session started: ${uriToKey(this.uri)}`) return commandOutput.responseStream } @@ -130,7 +131,7 @@ export class LiveTailSession { } return new StartLiveTailCommand({ - logGroupIdentifiers: [this.logGroupName], + logGroupIdentifiers: [this.logGroupArn], logStreamNamePrefixes: logStreamNamePrefix ? [logStreamNamePrefix] : undefined, logStreamNames: logStreamName ? [logStreamName] : undefined, logEventFilterPattern: this.logEventFilterPattern ? this.logEventFilterPattern : undefined, diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts index 3d5bc5c59a8..988725edc87 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts @@ -19,7 +19,7 @@ export class LiveTailSessionRegistry extends Map { } export function createLiveTailURIFromArgs(sessionData: LiveTailSessionConfiguration): vscode.Uri { - let uriStr = `${cloudwatchLogsLiveTailScheme}:${sessionData.region}:${sessionData.logGroupName}` + let uriStr = `${cloudwatchLogsLiveTailScheme}:${sessionData.region}:${sessionData.logGroupArn}` if (sessionData.logStreamFilter) { if (sessionData.logStreamFilter.type !== 'all') { diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts index c0ba4bdc3af..cc07bc71961 100644 --- a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts +++ b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts @@ -4,7 +4,7 @@ */ import * as nls from 'vscode-nls' -import { ToolkitError } from '../../../shared' +import { globals, ToolkitError } from '../../../shared' import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient' import { cwlFilterPatternHelpUrl } from '../../../shared/constants' import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons' @@ -29,7 +29,7 @@ export class TailLogGroupWizard extends Wizard { initState: { regionLogGroupSubmenuResponse: logGroupInfo ? { - data: logGroupInfo.groupName, + data: buildLogGroupArn(logGroupInfo.groupName, logGroupInfo.regionName), region: logGroupInfo.regionName, } : undefined, @@ -81,6 +81,19 @@ async function getLogGroupQuickPickOptions(regionCode: string): Promise Date: Wed, 13 Nov 2024 12:09:28 -0800 Subject: [PATCH 013/202] fix(cwl): pass credentials to LiveTail client #5993 ## Problem When creating the CloudWatchClient for a LiveTail session, we are not specifying which credentials to use. This is causing the client to always use the `Default` credential profile, even if a different AWS Credential profile is selected within AWSToolkit. ## Solution Resolve the active AWS credential from `globals.awsContext`, and supply that to the LiveTailSession constructor. These credentials are then use to construct the CWL client. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 8 ++++++-- .../registry/liveTailSession.ts | 3 +++ .../commands/tailLogGroup.test.ts | 20 ++++++++++++++++++- .../registry/liveTailRegistry.test.ts | 7 +++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 6a41025be71..f0ad31eb0fb 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -13,7 +13,7 @@ import { LiveTailSessionUpdate, StartLiveTailResponseStream, } from '@aws-sdk/client-cloudwatch-logs' -import { getLogger, ToolkitError } from '../../../shared' +import { getLogger, globals, ToolkitError } from '../../../shared' import { uriToKey } from '../cloudWatchLogsUtils' export async function tailLogGroup( @@ -25,12 +25,16 @@ export async function tailLogGroup( if (!wizardResponse) { throw new CancellationError('user') } - + const awsCredentials = await globals.awsContext.getCredentials() + if (awsCredentials === undefined) { + throw new ToolkitError('Failed to start LiveTail session: credentials are undefined.') + } const liveTailSessionConfig: LiveTailSessionConfiguration = { logGroupArn: wizardResponse.regionLogGroupSubmenuResponse.data, logStreamFilter: wizardResponse.logStreamFilter, logEventFilterPattern: wizardResponse.filterPattern, region: wizardResponse.regionLogGroupSubmenuResponse.region, + awsCredentials: awsCredentials, } const session = new LiveTailSession(liveTailSessionConfig) if (registry.has(uriToKey(session.uri))) { diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index e1e67be2a0b..3efbc349cf5 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import * as vscode from 'vscode' +import * as AWS from '@aws-sdk/types' import { CloudWatchLogsClient, StartLiveTailCommand, @@ -19,6 +20,7 @@ export type LiveTailSessionConfiguration = { logStreamFilter?: LogStreamFilterResponse logEventFilterPattern?: string region: string + awsCredentials: AWS.Credentials } export type LiveTailSessionClient = { @@ -49,6 +51,7 @@ export class LiveTailSession { this.logStreamFilter = configuration.logStreamFilter this.liveTailClient = { cwlClient: new CloudWatchLogsClient({ + credentials: configuration.awsCredentials, region: configuration.region, customUserAgent: getUserAgent(), }), diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index e6a8dff30aa..56819d86a8a 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -20,13 +20,14 @@ import { import { getTestWindow } from '../../../shared/vscode/window' import { CloudWatchLogsSettings, uriToKey } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' import { installFakeClock } from '../../../testUtil' -import { DefaultAwsContext } from '../../../../shared' +import { DefaultAwsContext, ToolkitError } from '../../../../shared' describe('TailLogGroup', function () { const testLogGroup = 'test-log-group' const testRegion = 'test-region' const testMessage = 'test-message' const testAwsAccountId = '1234' + const testAwsCredentials = {} as any as AWS.Credentials let sandbox: sinon.SinonSandbox let registry: LiveTailSessionRegistry @@ -57,6 +58,8 @@ describe('TailLogGroup', function () { it('starts LiveTailSession and writes to document. Closes tab and asserts session gets closed.', async function () { sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId) + sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(testAwsCredentials)) + wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { return getTestWizardResponse() }) @@ -122,6 +125,19 @@ describe('TailLogGroup', function () { assert.strictEqual(stopLiveTailSessionSpy.calledOnce, true) }) + it('throws if crendentials are undefined', async function () { + sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(undefined)) + wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { + return getTestWizardResponse() + }) + await assert.rejects(async () => { + await tailLogGroup(registry, { + groupName: testLogGroup, + regionName: testRegion, + }) + }, ToolkitError) + }) + it('closeSession removes session from registry and calls underlying stopLiveTailSession function.', function () { stopLiveTailSessionSpy = sandbox .stub(LiveTailSession.prototype, 'stopLiveTailSession') @@ -132,6 +148,7 @@ describe('TailLogGroup', function () { const session = new LiveTailSession({ logGroupArn: testLogGroup, region: testRegion, + awsCredentials: testAwsCredentials, }) registry.set(uriToKey(session.uri), session) @@ -145,6 +162,7 @@ describe('TailLogGroup', function () { const session = new LiveTailSession({ logGroupArn: testLogGroup, region: testRegion, + awsCredentials: testAwsCredentials, }) const testData = 'blah blah blah' const document = await vscode.workspace.openTextDocument(session.uri) diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts index 63cd5867998..1aeeec9e6ae 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts @@ -11,12 +11,14 @@ import { cloudwatchLogsLiveTailScheme } from '../../../../shared/constants' describe('LiveTailSession URI', async function () { const testLogGroupName = 'test-log-group' const testRegion = 'test-region' + const testAwsCredentials = {} as any as AWS.Credentials const expectedUriBase = `${cloudwatchLogsLiveTailScheme}:${testRegion}:${testLogGroupName}` it('is correct with no logStream filter, no filter pattern', function () { const config: LiveTailSessionConfiguration = { logGroupArn: testLogGroupName, region: testRegion, + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(expectedUriBase) const uri = createLiveTailURIFromArgs(config) @@ -28,6 +30,7 @@ describe('LiveTailSession URI', async function () { logGroupArn: testLogGroupName, region: testRegion, logEventFilterPattern: 'test-filter', + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(`${expectedUriBase}:test-filter`) const uri = createLiveTailURIFromArgs(config) @@ -41,6 +44,7 @@ describe('LiveTailSession URI', async function () { logStreamFilter: { type: 'all', }, + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(`${expectedUriBase}:all`) const uri = createLiveTailURIFromArgs(config) @@ -55,6 +59,7 @@ describe('LiveTailSession URI', async function () { type: 'prefix', filter: 'test-prefix', }, + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(`${expectedUriBase}:prefix:test-prefix`) const uri = createLiveTailURIFromArgs(config) @@ -69,6 +74,7 @@ describe('LiveTailSession URI', async function () { type: 'specific', filter: 'test-stream', }, + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream`) const uri = createLiveTailURIFromArgs(config) @@ -84,6 +90,7 @@ describe('LiveTailSession URI', async function () { filter: 'test-stream', }, logEventFilterPattern: 'test-filter', + awsCredentials: testAwsCredentials, } const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream:test-filter`) const uri = createLiveTailURIFromArgs(config) From d56a8ac57265af6ff5fad1343b347fd97907afab Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Wed, 13 Nov 2024 15:29:38 -0800 Subject: [PATCH 014/202] fix(cwl): set LogEventFilter when constructing LiveTailSession #6008 ## Problem LogEventFilter is an optional configuration parameter when building a LiveTailSession. Currently, the Constructor is not actually setting this property so it is always undefined. This means that if a user sets a Filter pattern, it will not be applied. ## Solution Set the property in LiveTailSession Constructor. Add missing unit tests to validate that LiveTailSession config values are set properly. Testing via `buildStartLiveTailCommand` because this is what actually gets sent to the CWL backend to start a LiveTailSession. --- .../registry/liveTailSession.ts | 6 +- .../registry/liveTailSession.test.ts | 80 +++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index 3efbc349cf5..329da2f6f54 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -11,9 +11,10 @@ import { } from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' import { CloudWatchLogsSettings, uriToKey } from '../cloudWatchLogsUtils' -import { convertToTimeString, getLogger, globals, Settings, ToolkitError } from '../../../shared' +import { getLogger, globals, Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' import { getUserAgent } from '../../../shared/telemetry/util' +import { convertToTimeString } from '../../../shared/datetime' export type LiveTailSessionConfiguration = { logGroupArn: string @@ -49,6 +50,7 @@ export class LiveTailSession { public constructor(configuration: LiveTailSessionConfiguration) { this._logGroupArn = configuration.logGroupArn this.logStreamFilter = configuration.logStreamFilter + this.logEventFilterPattern = configuration.logEventFilterPattern this.liveTailClient = { cwlClient: new CloudWatchLogsClient({ credentials: configuration.awsCredentials, @@ -120,7 +122,7 @@ export class LiveTailSession { return this.endTime - this.startTime } - private buildStartLiveTailCommand(): StartLiveTailCommand { + public buildStartLiveTailCommand(): StartLiveTailCommand { let logStreamNamePrefix = undefined let logStreamName = undefined if (this.logStreamFilter) { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts new file mode 100644 index 00000000000..07bab07983a --- /dev/null +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts @@ -0,0 +1,80 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import assert from 'assert' +import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' +import { StartLiveTailCommand } from '@aws-sdk/client-cloudwatch-logs' +import { LogStreamFilterResponse } from '../../../../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu' + +describe('LiveTailSession', async function () { + const testLogGroupArn = 'arn:aws:test-log-group' + const testRegion = 'test-region' + const testFilter = 'test-filter' + const testAwsCredentials = {} as any as AWS.Credentials + + it('builds StartLiveTailCommand: no stream Filter, no event filter.', function () { + const session = buildLiveTailSession({ type: 'all' }, undefined) + assert.deepStrictEqual( + session.buildStartLiveTailCommand().input, + new StartLiveTailCommand({ + logGroupIdentifiers: [testLogGroupArn], + logEventFilterPattern: undefined, + logStreamNamePrefixes: undefined, + logStreamNames: undefined, + }).input + ) + }) + + it('builds StartLiveTailCommand: with prefix stream Filter', function () { + const session = buildLiveTailSession({ type: 'prefix', filter: testFilter }, undefined) + assert.deepStrictEqual( + session.buildStartLiveTailCommand().input, + new StartLiveTailCommand({ + logGroupIdentifiers: [testLogGroupArn], + logEventFilterPattern: undefined, + logStreamNamePrefixes: [testFilter], + logStreamNames: undefined, + }).input + ) + }) + + it('builds StartLiveTailCommand: with specific stream Filter', function () { + const session = buildLiveTailSession({ type: 'specific', filter: testFilter }, undefined) + assert.deepStrictEqual( + session.buildStartLiveTailCommand().input, + new StartLiveTailCommand({ + logGroupIdentifiers: [testLogGroupArn], + logEventFilterPattern: undefined, + logStreamNamePrefixes: undefined, + logStreamNames: [testFilter], + }).input + ) + }) + + it('builds StartLiveTailCommand: with log event Filter', function () { + const session = buildLiveTailSession({ type: 'all' }, testFilter) + assert.deepStrictEqual( + session.buildStartLiveTailCommand().input, + new StartLiveTailCommand({ + logGroupIdentifiers: [testLogGroupArn], + logEventFilterPattern: testFilter, + logStreamNamePrefixes: undefined, + logStreamNames: undefined, + }).input + ) + }) + + function buildLiveTailSession( + logStreamFilter: LogStreamFilterResponse, + logEventFilterPattern: string | undefined + ): LiveTailSession { + return new LiveTailSession({ + logGroupArn: testLogGroupArn, + logStreamFilter: logStreamFilter, + logEventFilterPattern: logEventFilterPattern, + region: testRegion, + awsCredentials: testAwsCredentials, + }) + } +}) From 1e3fdcec07bb994d3e6abff13a1d5aa1da32fe01 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Wed, 20 Nov 2024 05:59:18 -0800 Subject: [PATCH 015/202] feat(cwl): Emit telemetry when starting and stopping liveTail sessions (#6047) ## Problem Cloudwatch wants to monitor usage metrics of the LiveTail integration ## Solution When starting a session emit telemetry for: * Session already started (this case happens when session is already running, and customer sends a new command that matches the already running session) * Has LogEventFilter * LogStream filter type * Source of the command (command palette, explorer) When closing a session: * Session duration * source of cancellation (ex: CodeLens, ClosingEditors) --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Keegan Irby --- package-lock.json | 8 +- package.json | 2 +- .../awsService/cloudWatchLogs/activation.ts | 7 +- .../cloudWatchLogs/commands/tailLogGroup.ts | 93 ++++++++++++------- .../document/liveTailCodeLensProvider.ts | 2 +- .../commands/tailLogGroup.test.ts | 7 +- 6 files changed, 72 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8110fbb3b1..1bb2e1050ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "vscode-nls-dev": "^4.0.4" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.282", + "@aws-toolkits/telemetry": "^1.0.284", "@playwright/browser-chromium": "^1.43.1", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", @@ -6046,9 +6046,9 @@ } }, "node_modules/@aws-toolkits/telemetry": { - "version": "1.0.282", - "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.282.tgz", - "integrity": "sha512-MHktYmucYHvEm4Sscr93UmKr83D9pKJIvETo1bZiNtCsE0jxcNglxZwqZruy13Fks5uk523ZhaIALW22TF0Zpg==", + "version": "1.0.284", + "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.284.tgz", + "integrity": "sha512-+3uHmr4St2cw8yuvVZOUY4Recv0wmzendGODCeUPIIUjsjCANF3H7G/qzIKRN3BHCoedcvzA/eSI+l4ENRXtiA==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 70f9d0f4c35..bc03c2b8395 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.282", + "@aws-toolkits/telemetry": "^1.0.284", "@playwright/browser-chromium": "^1.43.1", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index de75d9e72a4..e0766ed7f5b 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -120,11 +120,12 @@ export async function activate(context: vscode.ExtensionContext, configuration: node instanceof LogGroupNode ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! } : undefined - await tailLogGroup(liveTailRegistry, logGroupInfo) + const source = node ? (logGroupInfo ? 'ExplorerLogGroupNode' : 'ExplorerServiceNode') : 'Command' + await tailLogGroup(liveTailRegistry, source, logGroupInfo) }), - Commands.register('aws.cwl.stopTailingLogGroup', async (document: vscode.TextDocument) => { - closeSession(document.uri, liveTailRegistry) + Commands.register('aws.cwl.stopTailingLogGroup', async (document: vscode.TextDocument, source: string) => { + closeSession(document.uri, liveTailRegistry, source) }), Commands.register('aws.cwl.clearDocument', async (document: vscode.TextDocument) => { diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index f0ad31eb0fb..c96d33dc15f 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -4,6 +4,7 @@ */ import * as vscode from 'vscode' +import { telemetry } from '../../../shared/telemetry/telemetry' import { TailLogGroupWizard } from '../wizard/tailLogGroupWizard' import { CancellationError } from '../../../shared/utilities/timeoutUtils' import { LiveTailSession, LiveTailSessionConfiguration } from '../registry/liveTailSession' @@ -18,48 +19,70 @@ import { uriToKey } from '../cloudWatchLogsUtils' export async function tailLogGroup( registry: LiveTailSessionRegistry, + source: string, logData?: { regionName: string; groupName: string } ): Promise { - const wizard = new TailLogGroupWizard(logData) - const wizardResponse = await wizard.run() - if (!wizardResponse) { - throw new CancellationError('user') - } - const awsCredentials = await globals.awsContext.getCredentials() - if (awsCredentials === undefined) { - throw new ToolkitError('Failed to start LiveTail session: credentials are undefined.') - } - const liveTailSessionConfig: LiveTailSessionConfiguration = { - logGroupArn: wizardResponse.regionLogGroupSubmenuResponse.data, - logStreamFilter: wizardResponse.logStreamFilter, - logEventFilterPattern: wizardResponse.filterPattern, - region: wizardResponse.regionLogGroupSubmenuResponse.region, - awsCredentials: awsCredentials, - } - const session = new LiveTailSession(liveTailSessionConfig) - if (registry.has(uriToKey(session.uri))) { - await prepareDocument(session) - return - } - registry.set(uriToKey(session.uri), session) + await telemetry.cwlLiveTail_Start.run(async (span) => { + const wizard = new TailLogGroupWizard(logData) + const wizardResponse = await wizard.run() + if (!wizardResponse) { + throw new CancellationError('user') + } + const awsCredentials = await globals.awsContext.getCredentials() + if (awsCredentials === undefined) { + throw new ToolkitError('Failed to start LiveTail session: credentials are undefined.') + } + const liveTailSessionConfig: LiveTailSessionConfiguration = { + logGroupArn: wizardResponse.regionLogGroupSubmenuResponse.data, + logStreamFilter: wizardResponse.logStreamFilter, + logEventFilterPattern: wizardResponse.filterPattern, + region: wizardResponse.regionLogGroupSubmenuResponse.region, + awsCredentials: awsCredentials, + } + const session = new LiveTailSession(liveTailSessionConfig) + if (registry.has(uriToKey(session.uri))) { + await prepareDocument(session) + span.record({ + result: 'Succeeded', + sessionAlreadyStarted: true, + source: source, + }) + return + } - const document = await prepareDocument(session) + registry.set(uriToKey(session.uri), session) - hideShowStatusBarItemsOnActiveEditor(session, document) - registerTabChangeCallback(session, registry, document) + const document = await prepareDocument(session) - const stream = await session.startLiveTailSession() + hideShowStatusBarItemsOnActiveEditor(session, document) + registerTabChangeCallback(session, registry, document) - await handleSessionStream(stream, document, session) + const stream = await session.startLiveTailSession() + span.record({ + source: source, + result: 'Succeeded', + sessionAlreadyStarted: false, + hasLogEventFilterPattern: Boolean(wizardResponse.filterPattern), + logStreamFilterType: wizardResponse.logStreamFilter.type, + }) + await handleSessionStream(stream, document, session) + }) } -export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry) { - const session = registry.get(uriToKey(sessionUri)) - if (session === undefined) { - throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) - } - session.stopLiveTailSession() - registry.delete(uriToKey(sessionUri)) +export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry, source: string) { + telemetry.cwlLiveTail_Stop.run((span) => { + const session = registry.get(uriToKey(sessionUri)) + if (session === undefined) { + throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) + } + session.stopLiveTailSession() + registry.delete(uriToKey(sessionUri)) + span.record({ + result: 'Succeeded', + source: source, + duration: session.getLiveTailSessionDuration(), + }) + }) } export async function clearDocument(textDocument: vscode.TextDocument) { @@ -215,7 +238,7 @@ function registerTabChangeCallback( vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { const isOpen = isLiveTailSessionOpenInAnyTab(session) if (!isOpen) { - closeSession(session.uri, registry) + closeSession(session.uri, registry, 'ClosedEditors') void clearDocument(document) } }) diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts index 7c7bb1cd74c..0e4edcf52aa 100644 --- a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts @@ -38,7 +38,7 @@ export class LiveTailCodeLensProvider implements vscode.CodeLensProvider { const command: vscode.Command = { title: 'Stop tailing', command: 'aws.cwl.stopTailingLogGroup', - arguments: [document], + arguments: [document, 'codeLens'], } return new vscode.CodeLens(range, command) } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 56819d86a8a..90accf47711 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -27,6 +27,7 @@ describe('TailLogGroup', function () { const testRegion = 'test-region' const testMessage = 'test-message' const testAwsAccountId = '1234' + const testSource = 'test-source' const testAwsCredentials = {} as any as AWS.Credentials let sandbox: sinon.SinonSandbox @@ -93,7 +94,7 @@ describe('TailLogGroup', function () { cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => { return 1 }) - await tailLogGroup(registry, { + await tailLogGroup(registry, testSource, { groupName: testLogGroup, regionName: testRegion, }) @@ -131,7 +132,7 @@ describe('TailLogGroup', function () { return getTestWizardResponse() }) await assert.rejects(async () => { - await tailLogGroup(registry, { + await tailLogGroup(registry, testSource, { groupName: testLogGroup, regionName: testRegion, }) @@ -152,7 +153,7 @@ describe('TailLogGroup', function () { }) registry.set(uriToKey(session.uri), session) - closeSession(session.uri, registry) + closeSession(session.uri, registry, testSource) assert.strictEqual(0, registry.size) assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) assert.strictEqual(0, clock.countTimers()) From aceebe1267f75b6fdcc12c7f9868635e5286ca7d Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Wed, 20 Nov 2024 10:36:58 -0800 Subject: [PATCH 016/202] fix(cwl): Hide LiveTail CodeLenses and display info message when closing session (#6063) ## Problem Currently after closing a session in a way that leaves the TextDocument open (`Stop tailing` CodeLens), the codeLenses remain visible. This means a user could click `Stop tailing` again, and receive an error for not being able to find the running LiveTail session for the given document. Additionally, there is no feedback when a session is closed. Clicking `Stop tailing` doesn't signal to the user that the session was actually stopped. ## Solution * Provide a `refresh` method in the LiveTail CodeLens provider. This fires an event to force recomputing the CodeLenses on a document. * Modify LiveTail Lens provider to return no Lenses if the session is not running (in the registry) * Display an information window when a Session is stopped * Changes wording/placement on some log statements for consistency. --- .../awsService/cloudWatchLogs/activation.ts | 8 +++---- .../cloudWatchLogs/commands/tailLogGroup.ts | 24 ++++++++++++++----- .../document/liveTailCodeLensProvider.ts | 16 ++++++++++--- .../registry/liveTailSession.ts | 5 ++-- .../commands/tailLogGroup.test.ts | 9 ++++--- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts index e0766ed7f5b..bfcaaf1d0e2 100644 --- a/packages/core/src/awsService/cloudWatchLogs/activation.ts +++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts @@ -34,7 +34,7 @@ export async function activate(context: vscode.ExtensionContext, configuration: const documentProvider = new LogDataDocumentProvider(registry) const liveTailDocumentProvider = new LiveTailDocumentProvider() - + const liveTailCodeLensProvider = new LiveTailCodeLensProvider(liveTailRegistry) context.subscriptions.push( vscode.languages.registerCodeLensProvider( { @@ -55,7 +55,7 @@ export async function activate(context: vscode.ExtensionContext, configuration: language: 'log', scheme: cloudwatchLogsLiveTailScheme, }, - new LiveTailCodeLensProvider() + liveTailCodeLensProvider ) ) @@ -121,11 +121,11 @@ export async function activate(context: vscode.ExtensionContext, configuration: ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! } : undefined const source = node ? (logGroupInfo ? 'ExplorerLogGroupNode' : 'ExplorerServiceNode') : 'Command' - await tailLogGroup(liveTailRegistry, source, logGroupInfo) + await tailLogGroup(liveTailRegistry, source, liveTailCodeLensProvider, logGroupInfo) }), Commands.register('aws.cwl.stopTailingLogGroup', async (document: vscode.TextDocument, source: string) => { - closeSession(document.uri, liveTailRegistry, source) + closeSession(document.uri, liveTailRegistry, source, liveTailCodeLensProvider) }), Commands.register('aws.cwl.clearDocument', async (document: vscode.TextDocument) => { diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index c96d33dc15f..21b3b9ea8d7 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -16,10 +16,12 @@ import { } from '@aws-sdk/client-cloudwatch-logs' import { getLogger, globals, ToolkitError } from '../../../shared' import { uriToKey } from '../cloudWatchLogsUtils' +import { LiveTailCodeLensProvider } from '../document/liveTailCodeLensProvider' export async function tailLogGroup( registry: LiveTailSessionRegistry, source: string, + codeLensProvider: LiveTailCodeLensProvider, logData?: { regionName: string; groupName: string } ): Promise { await telemetry.cwlLiveTail_Start.run(async (span) => { @@ -55,9 +57,11 @@ export async function tailLogGroup( const document = await prepareDocument(session) hideShowStatusBarItemsOnActiveEditor(session, document) - registerTabChangeCallback(session, registry, document) + registerTabChangeCallback(session, registry, document, codeLensProvider) const stream = await session.startLiveTailSession() + getLogger().info(`LiveTail session started: ${uriToKey(session.uri)}`) + span.record({ source: source, result: 'Succeeded', @@ -69,14 +73,21 @@ export async function tailLogGroup( }) } -export function closeSession(sessionUri: vscode.Uri, registry: LiveTailSessionRegistry, source: string) { +export function closeSession( + sessionUri: vscode.Uri, + registry: LiveTailSessionRegistry, + source: string, + codeLensProvider: LiveTailCodeLensProvider +) { telemetry.cwlLiveTail_Stop.run((span) => { const session = registry.get(uriToKey(sessionUri)) if (session === undefined) { - throw new ToolkitError(`No LiveTail session found for URI: ${sessionUri.toString()}`) + throw new ToolkitError(`No LiveTail session found for URI: ${uriToKey(sessionUri)}`) } session.stopLiveTailSession() registry.delete(uriToKey(sessionUri)) + void vscode.window.showInformationMessage(`Stopped LiveTail session: ${uriToKey(sessionUri)}`) + codeLensProvider.refresh() span.record({ result: 'Succeeded', source: source, @@ -130,7 +141,7 @@ async function handleSessionStream( //AbortSignal interrupts the LiveTail stream, causing error to be thrown here. //Can assume that stopLiveTailSession() has already been called - AbortSignal is only //exposed through that method. - getLogger().info(`Session stopped: ${uriToKey(session.uri)}`) + getLogger().info(`LiveTail session stopped: ${uriToKey(session.uri)}`) } else { //Unexpected exception. session.stopLiveTailSession() @@ -233,12 +244,13 @@ function hideShowStatusBarItemsOnActiveEditor(session: LiveTailSession, document function registerTabChangeCallback( session: LiveTailSession, registry: LiveTailSessionRegistry, - document: vscode.TextDocument + document: vscode.TextDocument, + codeLensProvider: LiveTailCodeLensProvider ) { vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { const isOpen = isLiveTailSessionOpenInAnyTab(session) if (!isOpen) { - closeSession(session.uri, registry, 'ClosedEditors') + closeSession(session.uri, registry, 'ClosedEditors', codeLensProvider) void clearDocument(document) } }) diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts index 0e4edcf52aa..236cd6cad05 100644 --- a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts @@ -5,16 +5,22 @@ import * as vscode from 'vscode' import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants' +import { LiveTailSessionRegistry } from '../registry/liveTailSessionRegistry' +import { uriToKey } from '../cloudWatchLogsUtils' export class LiveTailCodeLensProvider implements vscode.CodeLensProvider { - onDidChangeCodeLenses?: vscode.Event | undefined + private _onDidChangeCodeLenses: vscode.EventEmitter = new vscode.EventEmitter() + public readonly onDidChangeCodeLenses: vscode.Event = this._onDidChangeCodeLenses.event - provideCodeLenses( + public constructor(private readonly registry: LiveTailSessionRegistry) {} + + public provideCodeLenses( document: vscode.TextDocument, token: vscode.CancellationToken ): vscode.ProviderResult { const uri = document.uri - if (uri.scheme !== cloudwatchLogsLiveTailScheme) { + //if registry does not contain session, it is assumed to have been stopped, thus, hide lenses. + if (uri.scheme !== cloudwatchLogsLiveTailScheme || !this.registry.has(uriToKey(uri))) { return [] } const codeLenses: vscode.CodeLens[] = [] @@ -23,6 +29,10 @@ export class LiveTailCodeLensProvider implements vscode.CodeLensProvider { return codeLenses } + public refresh() { + this._onDidChangeCodeLenses.fire() + } + private buildClearDocumentCodeLens(document: vscode.TextDocument): vscode.CodeLens { const range = this.getBottomOfDocumentRange(document) const command: vscode.Command = { diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index 329da2f6f54..6947fc74459 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -10,8 +10,8 @@ import { StartLiveTailResponseStream, } from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu' -import { CloudWatchLogsSettings, uriToKey } from '../cloudWatchLogsUtils' -import { getLogger, globals, Settings, ToolkitError } from '../../../shared' +import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils' +import { globals, Settings, ToolkitError } from '../../../shared' import { createLiveTailURIFromArgs } from './liveTailSessionRegistry' import { getUserAgent } from '../../../shared/telemetry/util' import { convertToTimeString } from '../../../shared/datetime' @@ -98,7 +98,6 @@ export class LiveTailSession { this.statusBarUpdateTimer = globals.clock.setInterval(() => { this.updateStatusBarItemText() }, 500) - getLogger().info(`LiveTail session started: ${uriToKey(this.uri)}`) return commandOutput.responseStream } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 90accf47711..285b380c52d 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -21,6 +21,7 @@ import { getTestWindow } from '../../../shared/vscode/window' import { CloudWatchLogsSettings, uriToKey } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' import { installFakeClock } from '../../../testUtil' import { DefaultAwsContext, ToolkitError } from '../../../../shared' +import { LiveTailCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/liveTailCodeLensProvider' describe('TailLogGroup', function () { const testLogGroup = 'test-log-group' @@ -32,6 +33,7 @@ describe('TailLogGroup', function () { let sandbox: sinon.SinonSandbox let registry: LiveTailSessionRegistry + let codeLensProvider: LiveTailCodeLensProvider let startLiveTailSessionSpy: sinon.SinonSpy let stopLiveTailSessionSpy: sinon.SinonSpy let cloudwatchSettingsSpy: sinon.SinonSpy @@ -47,6 +49,7 @@ describe('TailLogGroup', function () { clock.reset() sandbox = sinon.createSandbox() registry = new LiveTailSessionRegistry() + codeLensProvider = new LiveTailCodeLensProvider(registry) }) after(function () { @@ -94,7 +97,7 @@ describe('TailLogGroup', function () { cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => { return 1 }) - await tailLogGroup(registry, testSource, { + await tailLogGroup(registry, testSource, codeLensProvider, { groupName: testLogGroup, regionName: testRegion, }) @@ -132,7 +135,7 @@ describe('TailLogGroup', function () { return getTestWizardResponse() }) await assert.rejects(async () => { - await tailLogGroup(registry, testSource, { + await tailLogGroup(registry, testSource, codeLensProvider, { groupName: testLogGroup, regionName: testRegion, }) @@ -153,7 +156,7 @@ describe('TailLogGroup', function () { }) registry.set(uriToKey(session.uri), session) - closeSession(session.uri, registry, testSource) + closeSession(session.uri, registry, testSource, codeLensProvider) assert.strictEqual(0, registry.size) assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) assert.strictEqual(0, clock.countTimers()) From 63b1cce2a302fd3acfa0149bc6d39afa9f26dee5 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Thu, 21 Nov 2024 15:47:02 -0800 Subject: [PATCH 017/202] fix(cwl): Change wording in menus, add info message when opening running session (#6073) ## Problem Addresses feedback after working with Toolkit UXD. There are inconsistencies with formatting/capitalization of certain nouns in the LiveTail menu. Some of the verbiage is unclear/too lengthy. In the case there is an already running session and the user tries to start a new session with the same parameters, it is unclear that we are opening an already existing session and not starting a new one. ## Solution * Consistent spacing and capitalization of "Log Group" and "Log Stream" * Introduce new Info window when opening and existing session stream * Re-words LogStream filter type sub menu. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 3 ++- .../wizard/liveTailLogStreamSubmenu.ts | 23 ++++++++----------- .../wizard/tailLogGroupWizard.ts | 10 ++++---- .../wizard/liveTailLogStreamSubmenu.test.ts | 14 +++++++---- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 21b3b9ea8d7..de235cabc23 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -43,7 +43,8 @@ export async function tailLogGroup( } const session = new LiveTailSession(liveTailSessionConfig) if (registry.has(uriToKey(session.uri))) { - await prepareDocument(session) + await vscode.window.showTextDocument(session.uri, { preview: false }) + void vscode.window.showInformationMessage(`Switching editor to an existing session that matches request.`) span.record({ result: 'Succeeded', sessionAlreadyStarted: true, diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts index a76ec8861e4..c94259684bb 100644 --- a/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts +++ b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts @@ -41,7 +41,7 @@ export class LogStreamFilterSubmenu extends Prompter { public createMenuPrompter() { const helpUri = startLiveTailHelpUrl const prompter = createQuickPick(this.menuOptions, { - title: 'Select LogStream filter type', + title: 'Include log events from...', buttons: createCommonButtons(helpUri), }) return prompter @@ -50,18 +50,15 @@ export class LogStreamFilterSubmenu extends Prompter { private get menuOptions(): DataQuickPickItem[] { const options: DataQuickPickItem[] = [] options.push({ - label: 'All', - detail: 'Include log events from all LogStreams in the selected LogGroup', + label: 'All Log Streams', data: 'all', }) options.push({ - label: 'Specific', - detail: 'Include log events from only a specific LogStream', + label: 'Specific Log Stream', data: 'specific', }) options.push({ - label: 'Prefix', - detail: 'Include log events from LogStreams that begin with a provided prefix', + label: 'Log Streams matching prefix', data: 'prefix', }) return options @@ -70,9 +67,9 @@ export class LogStreamFilterSubmenu extends Prompter { public createLogStreamPrefixBox(): InputBoxPrompter { const helpUri = startLiveTailLogStreamPrefixHelpUrl return createInputBox({ - title: 'Enter LogStream prefix', - placeholder: 'logStream prefix (case sensitive; empty matches all)', - prompt: 'Only log events in the LogStreams that have names that start with the prefix that you specify here are included in the Live Tail session', + title: 'Enter Log Stream prefix', + placeholder: 'log stream prefix (case sensitive; empty matches all)', + prompt: 'Only log events in Log Streams whose name starts with the supplied prefix will be included.', validateInput: (input) => this.validateLogStreamPrefix(input), buttons: createCommonButtons(helpUri), }) @@ -80,11 +77,11 @@ export class LogStreamFilterSubmenu extends Prompter { public validateLogStreamPrefix(prefix: string) { if (prefix.length > 512) { - return 'LogStream prefix cannot be longer than 512 characters' + return 'Log Stream prefix cannot be longer than 512 characters' } if (!this.logStreamPrefixRegEx.test(prefix)) { - return 'LogStream prefix must match pattern: [^:*]*' + return 'Log Stream prefix must match pattern: [^:*]*' } } @@ -104,7 +101,7 @@ export class LogStreamFilterSubmenu extends Prompter { .map((streams) => streams!.map((stream) => ({ data: stream.logStreamName!, label: stream.logStreamName! }))) return createQuickPick(items, { - title: 'Select LogStream', + title: 'Select Log Stream', buttons: createCommonButtons(helpUri), }) } diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts index cc07bc71961..025820df792 100644 --- a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts +++ b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts @@ -38,7 +38,7 @@ export class TailLogGroupWizard extends Wizard { this.form.regionLogGroupSubmenuResponse.bindPrompter(createRegionLogGroupSubmenu) this.form.logStreamFilter.bindPrompter((state) => { if (!state.regionLogGroupSubmenuResponse?.data) { - throw new ToolkitError('LogGroupName is null') + throw new ToolkitError('Log Group name is null') } return new LogStreamFilterSubmenu( state.regionLogGroupSubmenuResponse.data, @@ -57,7 +57,7 @@ export function createRegionLogGroupSubmenu(): RegionSubmenu { buttons: [createExitButton()], }, { title: localize('AWS.cwl.tailLogGroup.regionPromptTitle', 'Select Region for Log Group') }, - 'LogGroups' + 'Log Groups' ) } @@ -69,7 +69,7 @@ async function getLogGroupQuickPickOptions(regionCode: string): Promise { input.acceptValue(invalidInput) - assert.deepEqual(input.validationMessage, 'LogStream prefix must match pattern: [^:*]*') + assert.deepEqual(input.validationMessage, 'Log Stream prefix must match pattern: [^:*]*') input.hide() }) const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() @@ -53,7 +57,7 @@ describe('liveTailLogStreamSubmenu', async function () { const invalidInput = 'my-log-stream*' getTestWindow().onDidShowInputBox((input) => { input.acceptValue(invalidInput) - assert.deepEqual(input.validationMessage, 'LogStream prefix must match pattern: [^:*]*') + assert.deepEqual(input.validationMessage, 'Log Stream prefix must match pattern: [^:*]*') input.hide() }) const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() @@ -64,7 +68,7 @@ describe('liveTailLogStreamSubmenu', async function () { const invalidInput = 'a'.repeat(520) getTestWindow().onDidShowInputBox((input) => { input.acceptValue(invalidInput) - assert.deepEqual(input.validationMessage, 'LogStream prefix cannot be longer than 512 characters') + assert.deepEqual(input.validationMessage, 'Log Stream prefix cannot be longer than 512 characters') input.hide() }) const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox() From 06b390d53d98324b7eee1246655754ccaa990427 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 26 Nov 2024 04:05:19 -0800 Subject: [PATCH 018/202] fix(cwl): Dispose event listeners when command exits (#6095) ## Problem TailLogGroup command is not being fully cleaned up properly. The event listeners for: * showing the StatusBar item * closing a session when exiting its editors are not being disposed of. As users stop sessions, these listeners remain active whilst doing no meaningful work. This is effectively a memory leak. Additionally during testing, I noticed that we are adding a session to the LiveTailRegistry before the session is actually started. This could cause an issue where a session stream isn't successfully created, but the session is still registered. ## Solution * Create an array of disposables and dispose of them as we exit the TailLogGroup command * Only register a session after startLiveTail returns Because now we dispose of the "tab close" listener when tailLogGroup exits, changes are needed in the unit tests to keep the mock response stream "open" as the test executes. This keeps tailLogGroup from returning/disposing while we perform test assertions and close the editors. --- .../cloudWatchLogs/commands/tailLogGroup.ts | 48 ++++--- .../commands/tailLogGroup.test.ts | 126 ++++++++---------- 2 files changed, 86 insertions(+), 88 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index de235cabc23..b87f7608430 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -52,25 +52,28 @@ export async function tailLogGroup( }) return } - - registry.set(uriToKey(session.uri), session) - const document = await prepareDocument(session) - hideShowStatusBarItemsOnActiveEditor(session, document) - registerTabChangeCallback(session, registry, document, codeLensProvider) + const disposables: vscode.Disposable[] = [] + disposables.push(hideShowStatusBarItemsOnActiveEditor(session, document)) + disposables.push(closeSessionWhenAllEditorsClosed(session, registry, document, codeLensProvider)) - const stream = await session.startLiveTailSession() - getLogger().info(`LiveTail session started: ${uriToKey(session.uri)}`) - - span.record({ - source: source, - result: 'Succeeded', - sessionAlreadyStarted: false, - hasLogEventFilterPattern: Boolean(wizardResponse.filterPattern), - logStreamFilterType: wizardResponse.logStreamFilter.type, - }) - await handleSessionStream(stream, document, session) + try { + const stream = await session.startLiveTailSession() + registry.set(uriToKey(session.uri), session) + codeLensProvider.refresh() + getLogger().info(`LiveTail session started: ${uriToKey(session.uri)}`) + span.record({ + source: source, + result: 'Succeeded', + sessionAlreadyStarted: false, + hasLogEventFilterPattern: Boolean(wizardResponse.filterPattern), + logStreamFilterType: wizardResponse.logStreamFilter.type, + }) + await handleSessionStream(stream, document, session) + } finally { + disposables.forEach((disposable) => disposable.dispose()) + } }) } @@ -224,8 +227,11 @@ function eventRate(event: LiveTailSessionUpdate): number { return event.sessionResults === undefined ? 0 : event.sessionResults.length } -function hideShowStatusBarItemsOnActiveEditor(session: LiveTailSession, document: vscode.TextDocument) { - vscode.window.onDidChangeActiveTextEditor((editor) => { +function hideShowStatusBarItemsOnActiveEditor( + session: LiveTailSession, + document: vscode.TextDocument +): vscode.Disposable { + return vscode.window.onDidChangeActiveTextEditor((editor) => { session.showStatusBarItem(editor?.document === document) }) } @@ -242,13 +248,13 @@ function hideShowStatusBarItemsOnActiveEditor(session: LiveTailSession, document * from view, will not be returned. Meaning a Tab that is created (shown in top bar), but not open, will not be returned. Even if * the tab isn't visible, we want to continue writing to the doc, and keep the session alive. */ -function registerTabChangeCallback( +function closeSessionWhenAllEditorsClosed( session: LiveTailSession, registry: LiveTailSessionRegistry, document: vscode.TextDocument, codeLensProvider: LiveTailCodeLensProvider -) { - vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { +): vscode.Disposable { + return vscode.window.tabGroups.onDidChangeTabs((tabEvent) => { const isOpen = isLiveTailSessionOpenInAnyTab(session) if (!isOpen) { closeSession(session.uri, registry, 'ClosedEditors', codeLensProvider) diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 285b380c52d..2bae9c98d85 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -4,23 +4,20 @@ */ import * as sinon from 'sinon' -import * as FakeTimers from '@sinonjs/fake-timers' import * as vscode from 'vscode' import assert from 'assert' import { clearDocument, closeSession, tailLogGroup } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup' -import { LiveTailSessionLogEvent, StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' +import { StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs' import { LiveTailSessionRegistry } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry' import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' -import { asyncGenerator } from '../../../../shared/utilities/collectionUtils' import { TailLogGroupWizard, TailLogGroupWizardResponse, } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard' import { getTestWindow } from '../../../shared/vscode/window' import { CloudWatchLogsSettings, uriToKey } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils' -import { installFakeClock } from '../../../testUtil' -import { DefaultAwsContext, ToolkitError } from '../../../../shared' +import { DefaultAwsContext, ToolkitError, waitUntil } from '../../../../shared' import { LiveTailCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/liveTailCodeLensProvider' describe('TailLogGroup', function () { @@ -39,23 +36,12 @@ describe('TailLogGroup', function () { let cloudwatchSettingsSpy: sinon.SinonSpy let wizardSpy: sinon.SinonSpy - let clock: FakeTimers.InstalledClock - - before(function () { - clock = installFakeClock() - }) - beforeEach(function () { - clock.reset() sandbox = sinon.createSandbox() registry = new LiveTailSessionRegistry() codeLensProvider = new LiveTailCodeLensProvider(registry) }) - after(function () { - clock.uninstall() - }) - afterEach(function () { sandbox.restore() }) @@ -64,47 +50,46 @@ describe('TailLogGroup', function () { sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId) sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(testAwsCredentials)) - wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { - return getTestWizardResponse() - }) - const testMessage2 = `${testMessage}-2` - const testMessage3 = `${testMessage}-3` + const startTimestamp = 1732276800000 // 11-22-2024 12:00:00PM GMT + const updateFrames: StartLiveTailResponseStream[] = [ + getSessionUpdateFrame(false, `${testMessage}-1`, startTimestamp + 1000), + getSessionUpdateFrame(false, `${testMessage}-2`, startTimestamp + 2000), + getSessionUpdateFrame(false, `${testMessage}-3`, startTimestamp + 3000), + ] + //Returns the configured update frames and then indefinitely blocks. + //This keeps the stream 'open', simulating an open network stream waiting for new events. + //If the stream were to close, the event listeners in the TailLogGroup command would dispose, + //breaking the 'closes tab closes session' assertions this test makes. + async function* generator(): AsyncIterable { + for (const frame of updateFrames) { + yield frame + } + await new Promise(() => {}) + } + startLiveTailSessionSpy = sandbox .stub(LiveTailSession.prototype, 'startLiveTailSession') - .callsFake(async function () { - return getTestResponseStream([ - { - message: testMessage, - timestamp: 876830400000, - }, - { - message: testMessage2, - timestamp: 876830402000, - }, - { - message: testMessage3, - timestamp: 876830403000, - }, - ]) - }) + .returns(Promise.resolve(generator())) stopLiveTailSessionSpy = sandbox .stub(LiveTailSession.prototype, 'stopLiveTailSession') .callsFake(async function () { return }) - + wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { + return getTestWizardResponse() + }) //Set maxLines to 1. cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => { return 1 }) - await tailLogGroup(registry, testSource, codeLensProvider, { + + //The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve. + //Run it in the background and use waitUntil to poll its state. + void tailLogGroup(registry, testSource, codeLensProvider, { groupName: testLogGroup, regionName: testRegion, }) - assert.strictEqual(wizardSpy.calledOnce, true) - assert.strictEqual(cloudwatchSettingsSpy.calledOnce, true) - assert.strictEqual(startLiveTailSessionSpy.calledOnce, true) - assert.strictEqual(registry.size, 1) + await waitUntil(async () => registry.size !== 0, { interval: 100, timeout: 1000 }) //registry is asserted to have only one entry, so this is assumed to be the session that was //started in this test. @@ -113,13 +98,24 @@ describe('TailLogGroup', function () { if (sessionUri === undefined) { throw Error } - const document = getTestWindow().activeTextEditor?.document + + assert.strictEqual(wizardSpy.calledOnce, true) + assert.strictEqual(cloudwatchSettingsSpy.calledOnce, true) + assert.strictEqual(startLiveTailSessionSpy.calledOnce, true) + assert.strictEqual(registry.size, 1) + + //Validate writing to the document. + //MaxLines is set to 1, and "testMessage3" is the last event in the stream, its contents should be the only thing in the doc. + const window = getTestWindow() + const document = window.activeTextEditor?.document assert.strictEqual(sessionUri.toString(), document?.uri.toString()) - //Test responseStream has 3 events, maxLines is set to 1. Only 3rd event should be in doc. - assert.strictEqual(document?.getText().trim(), `12:00:03\t${testMessage3}`) + const doesDocumentContainExpectedContent = await waitUntil( + async () => document?.getText().trim() === `12:00:03\t${testMessage}-3`, + { interval: 100, timeout: 1000 } + ) + assert.strictEqual(doesDocumentContainExpectedContent, true) //Test that closing all tabs the session's document is open in will cause the session to close - const window = getTestWindow() let tabs: vscode.Tab[] = [] window.tabGroups.all.forEach((tabGroup) => { tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!)) @@ -159,7 +155,6 @@ describe('TailLogGroup', function () { closeSession(session.uri, registry, testSource, codeLensProvider) assert.strictEqual(0, registry.size) assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce) - assert.strictEqual(0, clock.countTimers()) }) it('clearDocument clears all text from document', async function () { @@ -200,26 +195,23 @@ describe('TailLogGroup', function () { } } - //Creates a test response stream. Each log event provided will be its own "frame" of the input stream. - function getTestResponseStream(logEvents: LiveTailSessionLogEvent[]): AsyncIterable { - const sessionStartFrame: StartLiveTailResponseStream = { - sessionStart: { - logGroupIdentifiers: [testLogGroup], + function getSessionUpdateFrame( + isSampled: boolean, + message: string, + timestamp: number + ): StartLiveTailResponseStream { + return { + sessionUpdate: { + sessionMetadata: { + sampled: isSampled, + }, + sessionResults: [ + { + message: message, + timestamp: timestamp, + }, + ], }, - sessionUpdate: undefined, } - - const updateFrames: StartLiveTailResponseStream[] = logEvents.map((event) => { - return { - sessionUpdate: { - sessionMetadata: { - sampled: false, - }, - sessionResults: [event], - }, - } - }) - - return asyncGenerator([sessionStartFrame, ...updateFrames]) } }) From 591dc9a6167a62dce6b206d4c6d41b89362efd1a Mon Sep 17 00:00:00 2001 From: Scott Smith <154380171+scottwritescode@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:29:01 -0600 Subject: [PATCH 019/202] fix(amazon q): add pl/1, bms filetypes #6067 ## Problem The codefileExtensions does not contain an extension type for `.pli` which is the common extension for PL/1, or for `.bms` which is Basic Mapping Support and common for screen definition files in IBM mainframe. Because of this, the files and code in them are not accessible in the workspace context for Amazon Q using the `/dev` quick action. When using the Q quick action '\dev' for `.pli` or `.bms` files, Q responds with the following message: > This appears to be an empty program or workspace with no source files present. There is nothing to explain at this time since no code or files are available for analysis. ## Solution - Add `.pli` and `.bms` as a known code file extension types. --- .../Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json | 4 ++++ packages/core/src/shared/filetypes.ts | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json b/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json new file mode 100644 index 00000000000..0200cbbad42 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Q feature dev: recognize .bms, .pli code files" +} diff --git a/packages/core/src/shared/filetypes.ts b/packages/core/src/shared/filetypes.ts index 1e6027bb12b..5a469d3c423 100644 --- a/packages/core/src/shared/filetypes.ts +++ b/packages/core/src/shared/filetypes.ts @@ -161,6 +161,7 @@ export const codefileExtensions = new Set([ '.bash', '.bat', '.boo', + '.bms', '.c', '.cbl', '.cc', @@ -267,6 +268,7 @@ export const codefileExtensions = new Set([ '.pike', '.pir', '.pl', + '.pli', '.pm', '.pmod', '.pp', From d4b0ede08d8c42f0b061109a1efd834342f3d26f Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Mon, 2 Dec 2024 13:47:27 -1000 Subject: [PATCH 020/202] test(codewhisperer): disable Auto Scan after test case #6122 ## Problem fix #6078 ## Solution Turn off CodeWhisper scanning after test suite completes. --- .../src/test/awsService/appBuilder/walkthrough.test.ts | 7 +++++++ .../src/test/codewhisperer/commands/basicCommands.test.ts | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts index 9700b756c23..72dfb5c0ae2 100644 --- a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts +++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts @@ -25,6 +25,7 @@ import { ChildProcess } from '../../../shared/utilities/processUtils' import { assertTelemetryCurried } from '../../testUtil' import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher' import { SamCliInfoInvocation } from '../../../shared/sam/cli/samCliInfo' +import { CodeScansState } from '../../../codewhisperer' interface TestScenario { toolID: AwsClis @@ -81,6 +82,12 @@ const scenarios: TestScenario[] = [ ] describe('AppBuilder Walkthrough', function () { + before(async function () { + // ensure auto scan is disabled before testrun + await CodeScansState.instance.setScansEnabled(false) + assert.strictEqual(CodeScansState.instance.isScansEnabled(), false) + }) + describe('Reopen template after reload', function () { let sandbox: sinon.SinonSandbox let spyExecuteCommand: sinon.SinonSpy diff --git a/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts index 43c8b668581..8455a084fb0 100644 --- a/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts +++ b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts @@ -74,6 +74,12 @@ describe('CodeWhisperer-basicCommands', function () { sinon.restore() }) + after(async function () { + // disable auto scan after testrun + await CodeScansState.instance.setScansEnabled(false) + assert.strictEqual(CodeScansState.instance.isScansEnabled(), false) + }) + describe('toggleCodeSuggestion', function () { class TestCodeSuggestionsState extends CodeSuggestionsState { public constructor(initialState?: boolean) { From 6d5e016e7e063c85d38a692d0c710f920890bf6c Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:56:44 -0500 Subject: [PATCH 021/202] refactor(logs): drop "Amazon Q Logs" channel and just have "Amazon Q" (#6114) ## Problem We didn't have much use for the old "Amazon Q" channel in addition to "Amazon Q Logs". All the logs we used were in "Amazon Q Logs". ## Solution - Now, just have the useful "Amazon Q Logs" channel. - Move the Amazon Q Language Server logs in to Amazon Q Logs to unify all logs --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: nkomonen-amazon --- .../Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json | 4 ++++ packages/amazonq/src/extension.ts | 4 +--- packages/core/src/amazonq/lsp/lspClient.ts | 5 ++++- packages/core/src/extension.ts | 2 +- packages/core/src/shared/logger/activation.ts | 8 +++++--- 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json diff --git a/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json b/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json new file mode 100644 index 00000000000..c7df441d68b --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Amazon Q: Simplify log channel" +} diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts index add823b5a9e..f5cc7274426 100644 --- a/packages/amazonq/src/extension.ts +++ b/packages/amazonq/src/extension.ts @@ -97,10 +97,8 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is globals.manifestPaths.endpoints = context.asAbsolutePath(join('resources', 'endpoints.json')) globals.regionProvider = RegionProvider.fromEndpointsProvider(makeEndpointsProvider()) - const qOutputChannel = vscode.window.createOutputChannel('Amazon Q', { log: true }) const qLogChannel = vscode.window.createOutputChannel('Amazon Q Logs', { log: true }) - await activateLogger(context, amazonQContextPrefix, qOutputChannel, qLogChannel) - globals.outputChannel = qOutputChannel + await activateLogger(context, amazonQContextPrefix, qLogChannel) globals.logOutputChannel = qLogChannel globals.loginManager = new LoginManager(globals.awsContext, new CredentialsStore()) diff --git a/packages/core/src/amazonq/lsp/lspClient.ts b/packages/core/src/amazonq/lsp/lspClient.ts index 1d3dd2743e9..359d8d24256 100644 --- a/packages/core/src/amazonq/lsp/lspClient.ts +++ b/packages/core/src/amazonq/lsp/lspClient.ts @@ -32,7 +32,7 @@ import { } from './types' import { Writable } from 'stream' import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings' -import { fs, getLogger } from '../../shared' +import { fs, getLogger, globals } from '../../shared' const localize = nls.loadMessageBundle() @@ -228,6 +228,9 @@ export async function activate(extensionContext: ExtensionContext) { // this is used by LSP to determine index cache path, move to this folder so that when extension updates index is not deleted. extensionPath: path.join(fs.getUserHomeDir(), '.aws', 'amazonq', 'cache'), }, + // Log to the Amazon Q Logs so everything is in a single channel + // TODO: Add prefix to the language server logs so it is easier to search + outputChannel: globals.logOutputChannel, } // Create the language client and start the client. diff --git a/packages/core/src/extension.ts b/packages/core/src/extension.ts index 3f1039fbba7..ef4131c6f26 100644 --- a/packages/core/src/extension.ts +++ b/packages/core/src/extension.ts @@ -89,7 +89,7 @@ export async function activateCommon( // Setup the logger const toolkitOutputChannel = vscode.window.createOutputChannel('AWS Toolkit', { log: true }) const toolkitLogChannel = vscode.window.createOutputChannel('AWS Toolkit Logs', { log: true }) - await activateLogger(context, contextPrefix, toolkitOutputChannel, toolkitLogChannel) + await activateLogger(context, contextPrefix, toolkitLogChannel, toolkitOutputChannel) globals.outputChannel = toolkitOutputChannel globals.logOutputChannel = toolkitLogChannel diff --git a/packages/core/src/shared/logger/activation.ts b/packages/core/src/shared/logger/activation.ts index ac740d1b0f3..9cbce46e6fd 100644 --- a/packages/core/src/shared/logger/activation.ts +++ b/packages/core/src/shared/logger/activation.ts @@ -17,12 +17,14 @@ import { isBeta } from '../vscode/env' /** * Activate Logger functionality for the extension. + * + * @param outputChannel optional output channel for less granular logs */ export async function activate( extensionContext: vscode.ExtensionContext, contextPrefix: string, - outputChannel: vscode.LogOutputChannel, - logChannel: vscode.LogOutputChannel + logChannel: vscode.LogOutputChannel, + outputChannel?: vscode.LogOutputChannel ): Promise { const settings = Settings.instance.getSection('aws') const devLogfile = settings.get('dev.logfile', '') @@ -52,7 +54,7 @@ export async function activate( setLogger( makeLogger({ logLevel: chanLogLevel, - outputChannels: [outputChannel, logChannel], + outputChannels: outputChannel ? [outputChannel, logChannel] : [logChannel], useConsoleLog: true, }), 'debugConsole' From 59acbc6516c34959c628a4f01ab7fd9cc2a6ce7e Mon Sep 17 00:00:00 2001 From: Elvin Hwang <31689968+elvin-hwang@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:53:37 -0800 Subject: [PATCH 022/202] feat(toolkit): Upgrade amazon-states-language-service to 1.13.0 #6139 ref #6118 ref aws/amazon-states-language-service#159 ref aws/amazon-states-language-service#160 --- package-lock.json | 7 ++++--- packages/core/package.json | 2 +- .../Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json diff --git a/package-lock.json b/package-lock.json index 1ddd49baa35..936298a6639 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9162,8 +9162,9 @@ "link": true }, "node_modules/amazon-states-language-service": { - "version": "1.11.0", - "license": "MIT", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/amazon-states-language-service/-/amazon-states-language-service-1.13.0.tgz", + "integrity": "sha512-XT/7LL9+TRCB8H3t0kM6h2uivHa7Pn2lZGpvHKujH1MM+lQ7aaprAKrnZkfSk9++VFNbFJBAnKW+5NN2xVcvlA==", "dependencies": { "js-yaml": "^4.1.0", "vscode-json-languageservice": "5.3.5", @@ -20046,7 +20047,7 @@ "@vscode/debugprotocol": "^1.57.0", "@zip.js/zip.js": "^2.7.41", "adm-zip": "^0.5.10", - "amazon-states-language-service": "^1.11.0", + "amazon-states-language-service": "^1.13.0", "async-lock": "^1.4.0", "aws-sdk": "^2.1384.0", "aws-ssm-document-language-service": "^1.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index 0550107f734..9fbabf3a561 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -517,7 +517,7 @@ "@vscode/debugprotocol": "^1.57.0", "@zip.js/zip.js": "^2.7.41", "adm-zip": "^0.5.10", - "amazon-states-language-service": "^1.11.0", + "amazon-states-language-service": "^1.13.0", "async-lock": "^1.4.0", "aws-sdk": "^2.1384.0", "aws-ssm-document-language-service": "^1.0.0", diff --git a/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json b/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json new file mode 100644 index 00000000000..76f458362f4 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/)." +} From 08eb59e29f958d52573e9eb13b3720941188baf5 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Wed, 4 Dec 2024 11:48:46 -0800 Subject: [PATCH 023/202] test(cwl): Add unit test for starting and stopping LiveTailSession object. (#6110) ## Problem The `LiveTailSession` object's start/stop methods aren't directly under test. TailLogGroup tests are mocking their behavior. TailLogGroup command tests are more focused on managing the session registry, opening/writing to the document, and the close tab behaviors. ## Solution Write a test that's scoped to creating a `session` and calling start and stop on it. Assert that timers are handled/disposed of properly, and that the session response stream is returned. Addresses [this comment](https://github.com/aws/aws-toolkit-vscode/pull/6095#discussion_r1857571286). --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Keegan Irby --- .../registry/liveTailSession.ts | 6 +- .../registry/liveTailSession.test.ts | 71 ++++++++++++++++++- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index 6947fc74459..5a61bd13268 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -93,7 +93,7 @@ export class LiveTailSession { if (!commandOutput.responseStream) { throw new ToolkitError('LiveTail session response stream is undefined.') } - this.startTime = Date.now() + this.startTime = globals.clock.Date.now() this.endTime = undefined this.statusBarUpdateTimer = globals.clock.setInterval(() => { this.updateStatusBarItemText() @@ -102,7 +102,7 @@ export class LiveTailSession { } public stopLiveTailSession() { - this.endTime = Date.now() + this.endTime = globals.clock.Date.now() this.statusBarItem.dispose() globals.clock.clearInterval(this.statusBarUpdateTimer) this.liveTailClient.abortController.abort() @@ -116,7 +116,7 @@ export class LiveTailSession { } //Currently running if (this.endTime === undefined) { - return Date.now() - this.startTime + return globals.clock.Date.now() - this.startTime } return this.endTime - this.startTime } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts index 07bab07983a..924aa437989 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts @@ -2,10 +2,17 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ +import * as sinon from 'sinon' +import * as FakeTimers from '@sinonjs/fake-timers' import assert from 'assert' import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession' -import { StartLiveTailCommand } from '@aws-sdk/client-cloudwatch-logs' +import { + CloudWatchLogsClient, + StartLiveTailCommand, + StartLiveTailResponseStream, +} from '@aws-sdk/client-cloudwatch-logs' import { LogStreamFilterResponse } from '../../../../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu' +import { installFakeClock } from '../../../testUtil' describe('LiveTailSession', async function () { const testLogGroupArn = 'arn:aws:test-log-group' @@ -13,6 +20,26 @@ describe('LiveTailSession', async function () { const testFilter = 'test-filter' const testAwsCredentials = {} as any as AWS.Credentials + let sandbox: sinon.SinonSandbox + let clock: FakeTimers.InstalledClock + + before(function () { + clock = installFakeClock() + }) + + beforeEach(function () { + clock.reset() + sandbox = sinon.createSandbox() + }) + + after(function () { + clock.uninstall() + }) + + afterEach(function () { + sandbox.restore() + }) + it('builds StartLiveTailCommand: no stream Filter, no event filter.', function () { const session = buildLiveTailSession({ type: 'all' }, undefined) assert.deepStrictEqual( @@ -65,6 +92,36 @@ describe('LiveTailSession', async function () { ) }) + it('closes a started session', async function () { + const startLiveTailStub = sinon.stub(CloudWatchLogsClient.prototype, 'send').callsFake(function () { + return { + responseStream: mockResponseStream(), + } + }) + const session = buildLiveTailSession({ type: 'all' }, testFilter) + assert.strictEqual(session.getLiveTailSessionDuration(), 0) + + const returnedResponseStream = await session.startLiveTailSession() + assert.strictEqual(startLiveTailStub.calledOnce, true) + const requestArgs = startLiveTailStub.getCall(0).args + assert.deepEqual(requestArgs[0].input, session.buildStartLiveTailCommand().input) + assert.strictEqual(requestArgs[1].abortSignal !== undefined && !requestArgs[1].abortSignal.aborted, true) + assert.strictEqual(session.isAborted, false) + assert.strictEqual(clock.countTimers(), 1) + assert.deepStrictEqual(returnedResponseStream, mockResponseStream()) + + clock.tick(1000) + assert.strictEqual(session.getLiveTailSessionDuration(), 1000) + + session.stopLiveTailSession() + assert.strictEqual(session.isAborted, true) + assert.strictEqual(clock.countTimers(), 0) + + //Session is stopped; ticking the clock forward should not change the session duration + clock.tick(1000) + assert.strictEqual(session.getLiveTailSessionDuration(), 1000) + }) + function buildLiveTailSession( logStreamFilter: LogStreamFilterResponse, logEventFilterPattern: string | undefined @@ -77,4 +134,16 @@ describe('LiveTailSession', async function () { awsCredentials: testAwsCredentials, }) } + + async function* mockResponseStream(): AsyncIterable { + const frame: StartLiveTailResponseStream = { + sessionUpdate: { + sessionMetadata: { + sampled: false, + }, + sessionResults: [], + }, + } + yield frame + } }) From 2905eb8af1d8c39cd80ec49cbd46372eb55ecdde Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:48:15 -0500 Subject: [PATCH 024/202] deps(cross-spawn): update cross-spawn to 7.0.5 #6147 ## Problem https://github.com/advisories/GHSA-3xgq-45jj-v275 ## Solution Use version 7.0.5 --- packages/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/package.json b/packages/core/package.json index 6d6bbcdda32..41fb9e1c962 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -523,7 +523,7 @@ "aws-ssm-document-language-service": "^1.0.0", "bytes": "^3.1.2", "cross-fetch": "^4.0.0", - "cross-spawn": "^7.0.3", + "cross-spawn": "^7.0.5", "diff": "^5.1.0", "fast-json-patch": "^3.1.1", "glob": "^10.3.10", From c8bfe2f840a775a69fe0feda476822b4598ade89 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 4 Dec 2024 17:56:15 -0500 Subject: [PATCH 025/202] test(flaky): fix unresolved promise causing linux failures (#6088) ## Problem https://github.com/aws/aws-toolkit-vscode/issues/6043 To reproduce, add a 5 second delay to the `after` hook at the top level. One way to do this is to insert this at line 84. ``` after(async function () { clock.uninstall() await sleep(5000) }) ``` Despite asserting that the promise rejects within the test, the promise rejects after the test as well. Not entirely sure why this happening. - Tried manually wrapping in try-catch with an `await` instead of `assert.rejects` and it still fails. - Tried wrapping the promise in another promise before passing to `assert.rejects`. ## Solution What does appear to work, is manually handling the callback of the promise. That is, explicitly defining a `then` and `catch` method to assert the rejection, and awaiting the promise at the end of the test to ensure it resolves before the test finishes. Not sure why this works, but I am unable to reproduce the error with this change. ## Notes - `assert.rejects` implementation: https://github.com/nodejs/node/blob/3178a762d6a2b1a37b74f02266eea0f3d86603be/lib/assert.js#L653. Doesn't appear to be the problem because the same is observed when manually wrapping. - `await` docs: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- buildspec/shared/common.sh | 2 +- .../sso/ssoAccessTokenProvider.test.ts | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/buildspec/shared/common.sh b/buildspec/shared/common.sh index cce614e4406..a0dbc2e5837 100644 --- a/buildspec/shared/common.sh +++ b/buildspec/shared/common.sh @@ -8,7 +8,7 @@ # - "waiting for browser": from `ssoAccessTokenProvider.test.ts`, unclear how to fix it. # - "HTTPError: Response code …": caused by github rate-limiting. # - "npm WARN deprecated querystring": transitive dep of aws sdk v2 (check `npm ls querystring`), so that's blocked until we migrate to v3. -_ignore_pat='Timed-out waiting for browser login flow\|HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated' +_ignore_pat='HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated' # Do not print (noisy) lines matching these patterns. # - "ERROR:bus… Failed to connect to the bus": noise related to "xvfb". https://github.com/cypress-io/cypress/issues/19299 diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts index 1bde91b26d8..b662556e0aa 100644 --- a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts +++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts @@ -310,13 +310,6 @@ describe('SsoAccessTokenProvider', function () { }) it('respects the device authorization expiration time', async function () { - // XXX: Don't know how to fix this "unhandled rejection" caused by this test: - // rejected promise not handled within 1 second: Error: Timed-out waiting for browser login flow to complete - // at poll (…/src/auth/sso/ssoAccessTokenProvider.ts:251:15) - // at async SsoAccessTokenProvider.authorize (…/src/auth/sso/ssoAccessTokenProvider.ts:188:23) - // at async SsoAccessTokenProvider.runFlow (…/src/auth/sso/ssoAccessTokenProvider.ts:113:20) - // at async SsoAccessTokenProvider.createToken (…/src/auth/sso/ssoAccessTokenProvider.ts:102:24) - setupFlow() stubOpen() const exception = new AuthorizationPendingException({ message: '', $metadata: {} }) @@ -324,13 +317,22 @@ describe('SsoAccessTokenProvider', function () { oidcClient.createToken.rejects(exception) oidcClient.startDeviceAuthorization.resolves(authorization) - const resp = sut.createToken() + const resp = sut + .createToken() + .then(() => assert.fail('Should not resolve')) + .catch((e) => { + assert.ok( + e instanceof ToolkitError && + e.message === 'Timed-out waiting for browser login flow to complete' + ) + }) + const progress = await getTestWindow().waitForMessage(/login page opened/i) await clock.tickAsync(750) assert.ok(progress.visible) await clock.tickAsync(750) assert.ok(!progress.visible) - await assert.rejects(resp, ToolkitError) + await resp assertTelemetry('aws_loginWithBrowser', { result: 'Failed', isReAuth: undefined, From e46500e7f0326c89e6a7af86dc2476190e49a9c1 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 4 Dec 2024 18:32:41 -0500 Subject: [PATCH 026/202] fix(logs): avoid logging EC2 ARN on commands #6152 ## Problem The EC2 ARN sneaks its away into the logs via the `Ec2InstanceNode` tooltip property from `packages/core/src/awsService/ec2/explorer/ec2InstanceNode.ts`. When we run any command on this instance, we get the following logs with the middle section omitted for brevity. ``` 2024-12-04 17:25:10.859 [debug] command: running "aws.ec2.openTerminal" with arguments: [ { collapsibleState: 0, label: 'testInstance ({INSTANCE_ID}) RUNNING', ... contextValue: 'awsEc2RunningNode', iconPath: { id: 'pass', color: undefined }, tooltip: 'testInstance\n' + '{INSTANCE_ID}\n' + 'running\n' + 'arn:aws:ec2:us-east-1:{ACCOUNT_ID}:instance/{INSTANCE_ID}', id: '{INSTANCE_ID}' }, undefined ] ``` The actual AWS account ID in use is included in the logs. What makes this difficult is that this node is passed directly from VSCode here: https://github.com/aws/aws-toolkit-vscode/blob/d74f96c61f79716edf8a9a706a86c587887d3b9b/packages/core/src/awsService/ec2/activation.ts#L32-L37 and is processed by our commands wrapper here: https://github.com/aws/aws-toolkit-vscode/blob/d74f96c61f79716edf8a9a706a86c587887d3b9b/packages/core/src/shared/vscode/commands2.ts#L649-L660 The wrapper is logging the node directly from vscode, not giving us a chance to use `partialClone` on it first. ## Solution - omit all tooltips from the logs, since this is usually redundant information anyway. --- packages/core/src/shared/vscode/commands2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/shared/vscode/commands2.ts b/packages/core/src/shared/vscode/commands2.ts index 9de79d60d24..527862faebb 100644 --- a/packages/core/src/shared/vscode/commands2.ts +++ b/packages/core/src/shared/vscode/commands2.ts @@ -656,7 +656,7 @@ async function runCommand(fn: T, info: CommandInfo): Prom logger.debug( `command: running ${label} with arguments: %O`, - partialClone(args, 3, ['clientSecret', 'accessToken', 'refreshToken'], '[omitted]') + partialClone(args, 3, ['clientSecret', 'accessToken', 'refreshToken', 'tooltip'], '[omitted]') ) try { From 4c38aab31ebf420c6423a61b953c607f53fa8b6d Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:24:14 -0500 Subject: [PATCH 027/202] feat(ec2): dry run connection script to surface errors earlier. (#6037) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem Follow up to https://github.com/aws/aws-toolkit-vscode/pull/6018#discussion_r1844284580 ## Solution - Run `ssh` within the same env as it will be run on real connection. - Log any resulting errors, and inform user where the process failed. - Also part of this PR is moving some functions to `remoteSession.ts` that are general enough to be there. Error msg: Screenshot 2024-11-15 at 5 53 51 PM --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Justin M. Keyes --- packages/core/src/awsService/ec2/model.ts | 50 +++++++---- packages/core/src/codecatalyst/model.ts | 25 +----- packages/core/src/shared/extensions/ssh.ts | 37 ++++++++- packages/core/src/shared/remoteSession.ts | 22 ++++- .../src/test/shared/extensions/ssh.test.ts | 83 ++++++++++++++++++- 5 files changed, 173 insertions(+), 44 deletions(-) diff --git a/packages/core/src/awsService/ec2/model.ts b/packages/core/src/awsService/ec2/model.ts index fa7bbee71b7..085bfa0674b 100644 --- a/packages/core/src/awsService/ec2/model.ts +++ b/packages/core/src/awsService/ec2/model.ts @@ -13,6 +13,7 @@ import { SsmClient } from '../../shared/clients/ssmClient' import { Ec2Client } from '../../shared/clients/ec2Client' import { VscodeRemoteConnection, + createBoundProcess, ensureDependencies, getDeniedSsmActions, openRemoteTerminal, @@ -20,8 +21,13 @@ import { } from '../../shared/remoteSession' import { DefaultIamClient } from '../../shared/clients/iamClient' import { ErrorInformation } from '../../shared/errors' -import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../../shared/extensions/ssh' -import { createBoundProcess } from '../../codecatalyst/model' +import { + sshAgentSocketVariable, + SshError, + startSshAgent, + startVscodeRemote, + testSshConnection, +} from '../../shared/extensions/ssh' import { getLogger } from '../../shared/logger/logger' import { CancellationError, Timeout } from '../../shared/utilities/timeoutUtils' import { showMessageWithCancel } from '../../shared/utilities/messages' @@ -149,13 +155,6 @@ export class Ec2Connecter implements vscode.Disposable { } } - public throwGeneralConnectionError(selection: Ec2Selection, error: Error) { - this.throwConnectionError('Unable to connect to target instance. ', selection, { - code: 'EC2SSMConnect', - cause: error, - }) - } - public async checkForStartSessionError(selection: Ec2Selection): Promise { await this.checkForInstanceStatusError(selection) @@ -184,7 +183,7 @@ export class Ec2Connecter implements vscode.Disposable { const response = await this.ssmClient.startSession(selection.instanceId) await this.openSessionInTerminal(response, selection) } catch (err: unknown) { - this.throwGeneralConnectionError(selection, err as Error) + this.throwConnectionError('', selection, err as Error) } } @@ -193,11 +192,21 @@ export class Ec2Connecter implements vscode.Disposable { const remoteUser = await this.getRemoteUser(selection.instanceId) const remoteEnv = await this.prepareEc2RemoteEnvWithProgress(selection, remoteUser) - + const testSession = await this.ssmClient.startSession(selection.instanceId, 'AWS-StartSSHSession') try { + await testSshConnection( + remoteEnv.SessionProcess, + remoteEnv.hostname, + remoteEnv.sshPath, + remoteUser, + testSession + ) await startVscodeRemote(remoteEnv.SessionProcess, remoteEnv.hostname, '/', remoteEnv.vscPath, remoteUser) } catch (err) { - this.throwGeneralConnectionError(selection, err as Error) + const message = err instanceof SshError ? 'Testing SSH connection to instance failed' : '' + this.throwConnectionError(message, selection, err as Error) + } finally { + await this.ssmClient.terminateSession(testSession) } } @@ -208,12 +217,19 @@ export class Ec2Connecter implements vscode.Disposable { return remoteEnv } + private async startSSMSession(instanceId: string): Promise { + const ssmSession = await this.ssmClient.startSession(instanceId, 'AWS-StartSSHSession') + await this.addActiveSession(instanceId, ssmSession.SessionId!) + return ssmSession + } + public async prepareEc2RemoteEnv(selection: Ec2Selection, remoteUser: string): Promise { const logger = this.configureRemoteConnectionLogger(selection.instanceId) const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap() const keyPair = await this.configureSshKeys(selection, remoteUser) - const hostNamePrefix = 'aws-ec2-' - const sshConfig = new SshConfig(ssh, hostNamePrefix, 'ec2_connect', keyPair.getPrivateKeyPath()) + const hostnamePrefix = 'aws-ec2-' + const hostname = `${hostnamePrefix}${selection.instanceId}` + const sshConfig = new SshConfig(ssh, hostnamePrefix, 'ec2_connect', keyPair.getPrivateKeyPath()) const config = await sshConfig.ensureValid() if (config.isErr()) { @@ -222,8 +238,8 @@ export class Ec2Connecter implements vscode.Disposable { throw err } - const ssmSession = await this.ssmClient.startSession(selection.instanceId, 'AWS-StartSSHSession') - await this.addActiveSession(selection.instanceId, ssmSession.SessionId!) + + const ssmSession = await this.startSSMSession(selection.instanceId) const vars = getEc2SsmEnv(selection, ssm, ssmSession) const envProvider = async () => { @@ -236,7 +252,7 @@ export class Ec2Connecter implements vscode.Disposable { }) return { - hostname: `${hostNamePrefix}${selection.instanceId}`, + hostname, envProvider, sshPath: ssh, vscPath: vsc, diff --git a/packages/core/src/codecatalyst/model.ts b/packages/core/src/codecatalyst/model.ts index b2ba6912106..768a97890ee 100644 --- a/packages/core/src/codecatalyst/model.ts +++ b/packages/core/src/codecatalyst/model.ts @@ -19,7 +19,6 @@ import { getLogger } from '../shared/logger' import { AsyncCollection, toCollection } from '../shared/utilities/asyncCollection' import { getCodeCatalystSpaceName, getCodeCatalystProjectName, getCodeCatalystDevEnvId } from '../shared/vscode/env' import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../shared/extensions/ssh' -import { ChildProcess } from '../shared/utilities/processUtils' import { isDevenvVscode } from './utils' import { Timeout } from '../shared/utilities/timeoutUtils' import { Commands } from '../shared/vscode/commands2' @@ -28,7 +27,7 @@ import { fileExists } from '../shared/filesystemUtilities' import { CodeCatalystAuthenticationProvider } from './auth' import { ToolkitError } from '../shared/errors' import { Result } from '../shared/utilities/result' -import { VscodeRemoteConnection, ensureDependencies } from '../shared/remoteSession' +import { EnvProvider, VscodeRemoteConnection, createBoundProcess, ensureDependencies } from '../shared/remoteSession' import { SshConfig, sshLogFileLocation } from '../shared/sshConfig' import { fs } from '../shared' @@ -111,28 +110,6 @@ export function createCodeCatalystEnvProvider( } } -type EnvProvider = () => Promise - -/** - * Creates a new {@link ChildProcess} class bound to a specific dev environment. All instances of this - * derived class will have SSM session information injected as environment variables as-needed. - */ -export function createBoundProcess(envProvider: EnvProvider): typeof ChildProcess { - type Run = ChildProcess['run'] - return class SessionBoundProcess extends ChildProcess { - public override async run(...args: Parameters): ReturnType { - const options = args[0] - const envVars = await envProvider() - const spawnOptions = { - ...options?.spawnOptions, - env: { ...envVars, ...options?.spawnOptions?.env }, - } - - return super.run({ ...options, spawnOptions }) - } - } -} - export async function cacheBearerToken(bearerToken: string, devenvId: string): Promise { await fs.writeFile(bearerTokenCacheLocation(devenvId), `${bearerToken}`, 'utf8') } diff --git a/packages/core/src/shared/extensions/ssh.ts b/packages/core/src/shared/extensions/ssh.ts index ff9046b3225..1e75f9921aa 100644 --- a/packages/core/src/shared/extensions/ssh.ts +++ b/packages/core/src/shared/extensions/ssh.ts @@ -8,15 +8,26 @@ import * as path from 'path' import * as nls from 'vscode-nls' import fs from '../fs/fs' import { getLogger } from '../logger' -import { ChildProcess } from '../utilities/processUtils' +import { ChildProcess, ChildProcessResult } from '../utilities/processUtils' import { ArrayConstructor, NonNullObject } from '../utilities/typeConstructors' import { Settings } from '../settings' import { VSCODE_EXTENSION_ID } from '../extensions' +import { SSM } from 'aws-sdk' +import { ErrorInformation, ToolkitError } from '../errors' const localize = nls.loadMessageBundle() export const sshAgentSocketVariable = 'SSH_AUTH_SOCK' +export class SshError extends ToolkitError { + constructor(message: string, options: ErrorInformation) { + super(message, { + ...options, + code: SshError.name, + }) + } +} + export function getSshConfigPath(): string { const sshConfigDir = path.join(fs.getUserHomeDir(), '.ssh') return path.join(sshConfigDir, 'config') @@ -119,6 +130,30 @@ export class RemoteSshSettings extends Settings.define('remote.SSH', remoteSshTy } } +export async function testSshConnection( + ProcessClass: typeof ChildProcess, + hostname: string, + sshPath: string, + user: string, + session: SSM.StartSessionResponse +): Promise { + try { + const env = { SESSION_ID: session.SessionId, STREAM_URL: session.StreamUrl, TOKEN: session.TokenValue } + const result = await new ProcessClass(sshPath, [ + '-T', + `${user}@${hostname}`, + 'echo "test connection succeeded" && exit', + ]).run({ + spawnOptions: { + env, + }, + }) + return result + } catch (error) { + throw new SshError('SSH connection test failed', { cause: error as Error }) + } +} + export async function startVscodeRemote( ProcessClass: typeof ChildProcess, hostname: string, diff --git a/packages/core/src/shared/remoteSession.ts b/packages/core/src/shared/remoteSession.ts index 95c45832fa8..9f51c747de7 100644 --- a/packages/core/src/shared/remoteSession.ts +++ b/packages/core/src/shared/remoteSession.ts @@ -77,7 +77,7 @@ interface DependencyPaths { readonly ssh: string } -type EnvProvider = () => Promise +export type EnvProvider = () => Promise export interface VscodeRemoteConnection { readonly sshPath: string @@ -251,3 +251,23 @@ export async function getDeniedSsmActions(client: IamClient, roleArn: string): P return deniedActions } + +/** + * Creates a new {@link ChildProcess} class bound to a specific remote environment. All instances of this + * derived class will have SSM session information injected as environment variables as-needed. + */ +export function createBoundProcess(envProvider: EnvProvider): typeof ChildProcess { + type Run = ChildProcess['run'] + return class SessionBoundProcess extends ChildProcess { + public override async run(...args: Parameters): ReturnType { + const options = args[0] + const envVars = await envProvider() + const spawnOptions = { + ...options?.spawnOptions, + env: { ...envVars, ...options?.spawnOptions?.env }, + } + + return super.run({ ...options, spawnOptions }) + } + } +} diff --git a/packages/core/src/test/shared/extensions/ssh.test.ts b/packages/core/src/test/shared/extensions/ssh.test.ts index c7abc7095cd..38874e2df68 100644 --- a/packages/core/src/test/shared/extensions/ssh.test.ts +++ b/packages/core/src/test/shared/extensions/ssh.test.ts @@ -4,7 +4,14 @@ */ import * as assert from 'assert' import { ChildProcess } from '../../../shared/utilities/processUtils' -import { startSshAgent } from '../../../shared/extensions/ssh' +import { startSshAgent, testSshConnection } from '../../../shared/extensions/ssh' +import { createBoundProcess } from '../../../shared/remoteSession' +import { createExecutableFile, createTestWorkspaceFolder } from '../../testUtil' +import { WorkspaceFolder } from 'vscode' +import path from 'path' +import { SSM } from 'aws-sdk' +import { fs } from '../../../shared/fs/fs' +import { isWin } from '../../../shared/vscode/env' describe('SSH Agent', function () { it('can start the agent on windows', async function () { @@ -29,3 +36,77 @@ describe('SSH Agent', function () { assert.strictEqual(await getStatus(), 'Running') }) }) + +function echoEnvVarsCmd(varNames: string[]) { + const toShell = (s: string) => (isWin() ? `%${s}%` : `$${s}`) + return `echo "${varNames.map(toShell).join(' ')}"` +} + +/** + * Trim noisy windows ChildProcess result to final line for easier testing. + */ +function assertOutputContains(rawOutput: string, expectedString: string): void | never { + const output = rawOutput.trim().split('\n').at(-1)?.replace('"', '') ?? '' + assert.ok(output.includes(expectedString), `Expected output to contain "${expectedString}", but got "${output}"`) +} + +describe('testSshConnection', function () { + let testWorkspace: WorkspaceFolder + let sshPath: string + + before(async function () { + testWorkspace = await createTestWorkspaceFolder() + sshPath = path.join(testWorkspace.uri.fsPath, `fakeSSH${isWin() ? '.cmd' : ''}`) + }) + + after(async function () { + await fs.delete(testWorkspace.uri.fsPath, { recursive: true, force: true }) + await fs.delete(sshPath, { force: true }) + }) + + it('runs in bound process', async function () { + const envProvider = async () => ({ MY_VAR: 'yes' }) + const process = createBoundProcess(envProvider) + const session = { + SessionId: 'testSession', + StreamUrl: 'testUrl', + TokenValue: 'testToken', + } as SSM.StartSessionResponse + + await createExecutableFile(sshPath, echoEnvVarsCmd(['MY_VAR'])) + const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', session) + assertOutputContains(r.stdout, 'yes') + }) + + it('injects new session into env', async function () { + const oldSession = { + SessionId: 'testSession1', + StreamUrl: 'testUrl1', + TokenValue: 'testToken1', + } as SSM.StartSessionResponse + const newSession = { + SessionId: 'testSession2', + StreamUrl: 'testUrl2', + TokenValue: 'testToken2', + } as SSM.StartSessionResponse + const envProvider = async () => ({ + SESSION_ID: oldSession.SessionId, + STREAM_URL: oldSession.StreamUrl, + TOKEN: oldSession.TokenValue, + }) + const process = createBoundProcess(envProvider) + + await createExecutableFile(sshPath, echoEnvVarsCmd(['SESSION_ID', 'STREAM_URL', 'TOKEN'])) + const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', newSession) + assertOutputContains(r.stdout, `${newSession.SessionId} ${newSession.StreamUrl} ${newSession.TokenValue}`) + }) + + it('passes proper args to the ssh invoke', async function () { + const executableFileContent = isWin() ? `echo "%1 %2"` : `echo "$1 $2"` + const process = createBoundProcess(async () => ({})) + await createExecutableFile(sshPath, executableFileContent) + const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', {} as SSM.StartSessionResponse) + assertOutputContains(r.stdout, '-T') + assertOutputContains(r.stdout, 'test-user@localhost') + }) +}) From 95b777ca3869762d0e81e19c7670fe5f17bb23d9 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 5 Dec 2024 08:18:12 -0800 Subject: [PATCH 028/202] ci: require space at start of // comment #6112 Problem: Inconsistent comment style. Solution: Add a lint rule. --- .eslintrc.js | 16 +- package-lock.json | 214 +++++++++++++++++- package.json | 1 + .../controller/messenger/messengerUtils.ts | 2 +- packages/amazonq/src/extension.ts | 2 +- .../core/resources/js/graphStateMachine.js | 2 +- packages/core/src/amazonq/commons/types.ts | 4 +- .../core/src/amazonq/lsp/lspController.ts | 2 +- packages/core/src/amazonq/lsp/types.ts | 2 +- .../webview/ui/apps/testChatConnector.ts | 2 +- packages/core/src/amazonq/webview/ui/main.ts | 8 +- .../webview/ui/quickActions/generator.ts | 2 +- .../amazonqTest/chat/controller/controller.ts | 20 +- .../chat/controller/messenger/messenger.ts | 4 +- .../controller/messenger/messengerUtils.ts | 2 +- .../src/amazonqTest/chat/session/session.ts | 6 +- .../core/src/amazonqTest/models/constants.ts | 4 +- .../accessanalyzer/vue/iamPolicyChecks.ts | 8 +- .../cloudWatchLogs/timeFilterSubmenu.ts | 2 +- .../iot/commands/attachCertificate.ts | 2 +- .../src/awsService/iot/commands/createCert.ts | 8 +- .../awsService/iot/commands/createPolicy.ts | 4 +- .../iot/commands/createPolicyVersion.ts | 4 +- .../awsService/iot/commands/createThing.ts | 2 +- .../src/awsService/iot/commands/deleteCert.ts | 2 +- .../awsService/iot/commands/deletePolicy.ts | 2 +- .../iot/commands/deletePolicyVersion.ts | 2 +- .../awsService/iot/commands/deleteThing.ts | 2 +- .../src/awsService/iot/commands/detachCert.ts | 2 +- .../iot/explorer/iotCertificateNode.ts | 4 +- .../iot/explorer/iotPolicyFolderNode.ts | 4 +- .../src/awsService/redshift/activation.ts | 2 +- .../redshift/explorer/redshiftNode.ts | 2 +- .../notebook/redshiftNotebookController.ts | 4 +- .../src/awsService/s3/commands/uploadFile.ts | 8 +- .../codewhisperer/commands/basicCommands.ts | 2 +- .../commands/gettingStartedPageCommands.ts | 2 +- .../commands/startTestGeneration.ts | 8 +- .../src/codewhisperer/models/constants.ts | 6 +- .../core/src/codewhisperer/models/model.ts | 2 +- .../service/securityScanHandler.ts | 4 +- .../codewhisperer/service/testGenHandler.ts | 12 +- .../transformationResultsViewProvider.ts | 6 +- .../crossFileContextUtil.ts | 2 +- .../src/codewhisperer/util/telemetryHelper.ts | 2 +- .../core/src/codewhisperer/util/zipUtil.ts | 4 +- .../core/src/codewhisperer/vue/backend.ts | 16 +- .../controllers/chat/messenger/messenger.ts | 2 +- .../editor/context/file/javaImportReader.ts | 6 +- .../commands/downloadSchemaItemCode.ts | 8 +- .../eventSchemas/commands/viewSchemaItem.ts | 2 +- .../providers/schemasDataProvider.ts | 2 +- packages/core/src/extension.ts | 4 +- .../vue/configEditor/samInvokeFrontend.ts | 2 +- packages/core/src/shared/clients/iotClient.ts | 2 +- .../core/src/shared/clients/redshiftClient.ts | 2 +- packages/core/src/shared/constants.ts | 6 +- packages/core/src/shared/env/resolveEnv.ts | 2 +- .../languageServer/languageModelCache.ts | 2 +- .../src/shared/languageServer/utils/runner.ts | 2 +- .../src/shared/logger/sharedFileTransport.ts | 2 +- .../src/shared/sam/debugger/javaSamDebug.ts | 2 +- packages/core/src/shared/sam/deploy.ts | 4 +- packages/core/src/shared/sam/utils.ts | 2 +- .../core/src/shared/utilities/vsCodeUtils.ts | 2 +- ...etStateMachineDefinitionFromCfnTemplate.ts | 4 +- .../accessanalyzer/iamPolicyChecks.test.ts | 2 +- .../commands/downloadSchemaItemCode.test.ts | 14 +- .../commands/searchSchemas.test.ts | 6 +- .../explorer/registryItemNode.test.ts | 2 +- .../core/src/test/fakeExtensionContext.ts | 2 +- packages/core/src/test/globalSetup.test.ts | 2 +- .../lambda/local/debugConfiguration.test.ts | 2 +- .../shared/debug/launchConfiguration.test.ts | 2 +- .../debugger/samDebugConfigProvider.test.ts | 4 +- .../shared/ui/sam/templatePrompter.test.ts | 2 +- .../src/test/shared/wizards/wizard.test.ts | 2 +- .../codewhisperer/referenceTracker.test.ts | 14 +- .../codewhisperer/securityScan.test.ts | 14 +- .../codewhisperer/serviceInvocations.test.ts | 10 +- packages/core/src/testInteg/sam.test.ts | 2 +- .../commands/createNewThreatComposerFile.ts | 2 +- packages/core/types/git.d.ts | 2 +- packages/webpack.base.config.js | 6 +- packages/webpack.vue.config.js | 8 +- packages/webpack.web.config.js | 2 +- 86 files changed, 403 insertions(+), 178 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5d196c59541..a25a9d18003 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,7 @@ module.exports = { mocha: true, es2024: true, }, - plugins: ['@typescript-eslint', 'unicorn', 'header', 'security-node', 'aws-toolkits'], + plugins: ['@typescript-eslint', '@stylistic', 'unicorn', 'header', 'security-node', 'aws-toolkits'], extends: [ 'eslint:recommended', 'plugin:@typescript-eslint/eslint-recommended', @@ -113,6 +113,20 @@ module.exports = { 'no-constant-condition': ['error', { checkLoops: false }], 'no-empty': 'off', + // https://eslint.style/rules/default/spaced-comment + // Require space after // comment. + '@stylistic/spaced-comment': [ + 'error', + 'always', + { + block: { + markers: ['!'], // Allow the /*!…*/ license header. + // exceptions: ['*'], + // balanced: true + }, + }, + ], + // Rules from https://github.com/sindresorhus/eslint-plugin-unicorn // TODO: 'unicorn/no-useless-promise-resolve-reject': 'error', // TODO: 'unicorn/prefer-at': 'error', diff --git a/package-lock.json b/package-lock.json index f79eb31977c..2924d26c889 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "devDependencies": { "@aws-toolkits/telemetry": "^1.0.284", "@playwright/browser-chromium": "^1.43.1", + "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", "@types/vscode-webview": "^1.57.1", @@ -7736,6 +7737,213 @@ "node": ">=16.0.0" } }, + "node_modules/@stylistic/eslint-plugin": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.11.0.tgz", + "integrity": "sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "^8.13.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "estraverse": "^5.3.0", + "picomatch": "^4.0.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": ">=8.40.0" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz", + "integrity": "sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.16.0.tgz", + "integrity": "sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz", + "integrity": "sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/visitor-keys": "8.16.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.16.0.tgz", + "integrity": "sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.16.0", + "@typescript-eslint/types": "8.16.0", + "@typescript-eslint/typescript-estree": "8.16.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz", + "integrity": "sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.16.0", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/espree": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.14.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@stylistic/eslint-plugin/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/@szmarczak/http-timer": { "version": "4.0.6", "license": "MIT", @@ -9046,7 +9254,9 @@ } }, "node_modules/acorn": { - "version": "8.12.0", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, "license": "MIT", "bin": { @@ -20053,7 +20263,7 @@ "aws-ssm-document-language-service": "^1.0.0", "bytes": "^3.1.2", "cross-fetch": "^4.0.0", - "cross-spawn": "^7.0.3", + "cross-spawn": "^7.0.5", "diff": "^5.1.0", "fast-json-patch": "^3.1.1", "glob": "^10.3.10", diff --git a/package.json b/package.json index bc03c2b8395..5e5a67af5ed 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "devDependencies": { "@aws-toolkits/telemetry": "^1.0.284", "@playwright/browser-chromium": "^1.43.1", + "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", "@types/vscode-webview": "^1.57.1", diff --git a/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts index 67351c3eb6e..455a4ebf4af 100644 --- a/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts +++ b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 * */ -//TODO: Refactor the common functionality between Transform, FeatureDev, CWSPRChat, Scan and UTG to a new Folder. +// TODO: Refactor the common functionality between Transform, FeatureDev, CWSPRChat, Scan and UTG to a new Folder. export default class MessengerUtils { static stringToEnumValue = ( diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts index f5cc7274426..a4b53dbf66d 100644 --- a/packages/amazonq/src/extension.ts +++ b/packages/amazonq/src/extension.ts @@ -53,7 +53,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is errors.init(fs.getUsername(), env.isAutomation()) await initializeComputeRegion() - globals.contextPrefix = 'amazonq.' //todo: disconnect from above line + globals.contextPrefix = 'amazonq.' // todo: disconnect from above line // Avoid activation if older toolkit is installed // Amazon Q is only compatible with AWS Toolkit >= 3.0.0 diff --git a/packages/core/resources/js/graphStateMachine.js b/packages/core/resources/js/graphStateMachine.js index d2ec7ca11ab..9ccff2145fa 100644 --- a/packages/core/resources/js/graphStateMachine.js +++ b/packages/core/resources/js/graphStateMachine.js @@ -108,7 +108,7 @@ zoomoutBtn.addEventListener('click', () => { // Message passing from extension to webview. // Capture state machine definition -window.addEventListener('message', event => { +window.addEventListener('message', (event) => { // event.data is object passed in from postMessage from vscode const message = event.data switch (message.command) { diff --git a/packages/core/src/amazonq/commons/types.ts b/packages/core/src/amazonq/commons/types.ts index 1016f5c0669..f5724a13872 100644 --- a/packages/core/src/amazonq/commons/types.ts +++ b/packages/core/src/amazonq/commons/types.ts @@ -4,7 +4,7 @@ */ export enum FollowUpTypes { - //UnitTestGeneration + // UnitTestGeneration ViewDiff = 'ViewDiff', AcceptCode = 'AcceptCode', RejectCode = 'RejectCode', @@ -14,7 +14,7 @@ export enum FollowUpTypes { InstallDependenciesAndContinue = 'InstallDependenciesAndContinue', ContinueBuildAndExecute = 'ContinueBuildAndExecute', ViewCodeDiffAfterIteration = 'ViewCodeDiffAfterIteration', - //FeatureDev + // FeatureDev GenerateCode = 'GenerateCode', InsertCode = 'InsertCode', ProvideFeedbackAndRegenerateCode = 'ProvideFeedbackAndRegenerateCode', diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts index 7a74318dd14..1b948625e76 100644 --- a/packages/core/src/amazonq/lsp/lspController.ts +++ b/packages/core/src/amazonq/lsp/lspController.ts @@ -360,7 +360,7 @@ export class LspController { }) } } catch (error) { - //TODO: use telemetry.run() + // TODO: use telemetry.run() getLogger().error(`LspController: Failed to build index of project`) telemetry.amazonq_indexWorkspace.emit({ duration: performance.now() - start, diff --git a/packages/core/src/amazonq/lsp/types.ts b/packages/core/src/amazonq/lsp/types.ts index fe1df5ed3bc..3af943cb97d 100644 --- a/packages/core/src/amazonq/lsp/types.ts +++ b/packages/core/src/amazonq/lsp/types.ts @@ -66,7 +66,7 @@ export const QueryVectorIndexRequestType: RequestType = new RequestType( diff --git a/packages/core/src/amazonq/webview/ui/apps/testChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/testChatConnector.ts index 3fa53cd97f8..cefc2b8818f 100644 --- a/packages/core/src/amazonq/webview/ui/apps/testChatConnector.ts +++ b/packages/core/src/amazonq/webview/ui/apps/testChatConnector.ts @@ -33,7 +33,7 @@ export interface MessageData { tabID: string type: TestMessageType } -//TODO: Refactor testChatConnector, scanChatConnector and other apps connector files post RIV +// TODO: Refactor testChatConnector, scanChatConnector and other apps connector files post RIV export class Connector extends BaseConnector { override getTabType(): TabType { return 'testgen' diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts index 58511517e7a..43f5c798296 100644 --- a/packages/core/src/amazonq/webview/ui/main.ts +++ b/packages/core/src/amazonq/webview/ui/main.ts @@ -43,7 +43,7 @@ export const createMynahUI = ( let mynahUI: MynahUI // eslint-disable-next-line prefer-const let connector: Connector - //Store the mapping between messageId and messageUserIntent for amazonq_interactWithMessage telemetry + // Store the mapping between messageId and messageUserIntent for amazonq_interactWithMessage telemetry const responseMetadata = new Map() window.addEventListener('error', (e) => { @@ -107,7 +107,7 @@ export const createMynahUI = ( let featureConfigs: Map = tryNewMap(featureConfigsSerialized) function getCodeBlockActions(messageData: any) { - //Show ViewDiff and AcceptDiff for allowedCommands in CWC + // Show ViewDiff and AcceptDiff for allowedCommands in CWC const isEnabled = featureConfigs.get('ViewDiffInChat')?.variation === 'TREATMENT' const tab = tabsStorage.getTab(messageData?.tabID || '') const allowedCommands = [ @@ -133,13 +133,13 @@ export const createMynahUI = ( }, } } - //Show only "Copy" option for codeblocks in Q Test Tab + // Show only "Copy" option for codeblocks in Q Test Tab if (tab?.type === 'testgen') { return { 'insert-to-cursor': undefined, } } - //Default will show "Copy" and "Insert at cursor" for codeblocks + // Default will show "Copy" and "Insert at cursor" for codeblocks return {} } diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts index 2f86f8e2d1c..7020a00d185 100644 --- a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts +++ b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts @@ -39,7 +39,7 @@ export class QuickActionGenerator { return [] } - //TODO: Update acc to UX + // TODO: Update acc to UX const quickActionCommands = [ { groupName: `Q Developer agentic capabilities`, diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 065eeb70297..6149e28ee56 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -433,7 +433,7 @@ export class TestController { session.hasUserPromptSupplied = message.prompt.length > 0 - //displaying user message prompt in Test tab + // displaying user message prompt in Test tab this.messenger.sendMessage(userMessage, tabID, 'prompt') this.messenger.sendChatInputEnabled(tabID, false) this.sessionStorage.getSession().conversationState = ConversationState.IN_PROGRESS @@ -715,7 +715,7 @@ export class TestController { const document = await vscode.workspace.openTextDocument(absolutePath) await vscode.window.showTextDocument(document) // TODO: send the message once again once build is enabled - //this.messenger.sendMessage('Accepted', message.tabID, 'prompt') + // this.messenger.sendMessage('Accepted', message.tabID, 'prompt') telemetry.ui_click.emit({ elementId: 'unitTestGeneration_acceptDiff' }) telemetry.amazonq_utgGenerateTests.emit({ generatedCount: session.numberOfTestsGenerated, @@ -802,7 +802,7 @@ export class TestController { filePath: string ) { try { - //TODO: Write this entire gen response to basiccommands and call here. + // TODO: Write this entire gen response to basiccommands and call here. const editorText = await fs.readFileText(filePath) const triggerPayload = { @@ -836,7 +836,7 @@ export class TestController { } } - //TODO: Check if there are more cases to endSession if yes create a enum or type for step + // TODO: Check if there are more cases to endSession if yes create a enum or type for step private async endSession(data: any, step: FollowUpTypes) { const session = this.sessionStorage.getSession() if (step === FollowUpTypes.RejectCode) { @@ -878,7 +878,7 @@ export class TestController { */ private startInitialBuild(data: any) { - //TODO: Remove the fallback build command after stable version of backend build command. + // TODO: Remove the fallback build command after stable version of backend build command. const userMessage = `Would you like me to help build and execute the test? I will need you to let me know what build command to run if you do.` const followUps: FollowUps = { text: '', @@ -910,7 +910,7 @@ export class TestController { private async checkForInstallationDependencies(data: any) { // const session: Session = this.sessionStorage.getSession() // const listOfInstallationDependencies = session.testGenerationJob?.shortAnswer?.installationDependencies || [] - //MOCK: As there is no installation dependencies in shortAnswer + // MOCK: As there is no installation dependencies in shortAnswer const listOfInstallationDependencies = [''] const installationDependencies = listOfInstallationDependencies.join('\n') @@ -961,7 +961,7 @@ export class TestController { private async startLocalBuildExecution(data: any) { const session: Session = this.sessionStorage.getSession() // const installationDependencies = session.shortAnswer?.installationDependencies ?? [] - //MOCK: ignoring the installation case until backend send response + // MOCK: ignoring the installation case until backend send response const installationDependencies: string[] = [] const buildCommands = session.updatedBuildCommands if (!buildCommands) { @@ -991,7 +991,7 @@ export class TestController { }) const status = await runBuildCommand(installationDependencies) - //TODO: Add separate status for installation dependencies + // TODO: Add separate status for installation dependencies session.buildStatus = status if (status === BuildStatus.FAILURE) { this.messenger.sendBuildProgressMessage({ @@ -1110,7 +1110,7 @@ export class TestController { false ) } - //TODO: Skip this if startTestGenerationProcess timeouts + // TODO: Skip this if startTestGenerationProcess timeouts if (session.generatedFilePath) { await this.showTestCaseSummary(data) } @@ -1297,7 +1297,7 @@ export class TestController { if (session.tabID) { getLogger().debug('Setting input state with tabID: %s', session.tabID) this.messenger.sendChatInputEnabled(session.tabID, true) - this.messenger.sendUpdatePlaceholder(session.tabID, '/test Generate unit tests') //TODO: Change according to the UX + this.messenger.sendUpdatePlaceholder(session.tabID, '/test Generate unit tests') // TODO: Change according to the UX } getLogger().debug( 'Deleting output.log and temp result directory. testGenerationLogsDir: %s', diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts index 6051a9b51ad..e68eb6f9737 100644 --- a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts @@ -177,7 +177,7 @@ export class Messenger { ) } - //To show the response of unsupported languages to the user in the Q-Test tab + // To show the response of unsupported languages to the user in the Q-Test tab public async sendAIResponse( response: GenerateAssistantResponseCommandOutput, session: Session, @@ -308,7 +308,7 @@ export class Messenger { }) } - //To show the Build progress in the chat + // To show the Build progress in the chat public sendBuildProgressMessage(params: SendBuildProgressMessageParams) { const { tabID, diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messengerUtils.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messengerUtils.ts index 647951daef8..9e8fec4594e 100644 --- a/packages/core/src/amazonqTest/chat/controller/messenger/messengerUtils.ts +++ b/packages/core/src/amazonqTest/chat/controller/messenger/messengerUtils.ts @@ -14,7 +14,7 @@ export enum ButtonActions { STOP_BUILD = 'Stop-Build-Process', } -//TODO: Refactor the common functionality between Transform, FeatureDev, CWSPRChat, Scan and UTG to a new Folder. +// TODO: Refactor the common functionality between Transform, FeatureDev, CWSPRChat, Scan and UTG to a new Folder. export default class MessengerUtils { static stringToEnumValue = ( diff --git a/packages/core/src/amazonqTest/chat/session/session.ts b/packages/core/src/amazonqTest/chat/session/session.ts index cd188c10c0f..e0590f2301f 100644 --- a/packages/core/src/amazonqTest/chat/session/session.ts +++ b/packages/core/src/amazonqTest/chat/session/session.ts @@ -28,7 +28,7 @@ export class Session { // A tab may or may not be currently open public tabID: string | undefined - //This is unique per each test generation cycle + // This is unique per each test generation cycle public testGenerationJobGroupName: string | undefined = undefined public listOfTestGenerationJobId: string[] = [] public testGenerationJob: TestGenerationJob | undefined @@ -56,8 +56,8 @@ export class Session { public charsOfCodeAccepted: number = 0 public latencyOfTestGeneration: number = 0 - //TODO: Take values from ShortAnswer or TestGenerationJob - //Build loop + // TODO: Take values from ShortAnswer or TestGenerationJob + // Build loop public buildStatus: BuildStatus = BuildStatus.SUCCESS public updatedBuildCommands: string[] | undefined = undefined public testCoveragePercentage: number = 90 diff --git a/packages/core/src/amazonqTest/models/constants.ts b/packages/core/src/amazonqTest/models/constants.ts index fa0c00d59cc..8370d4d3ca7 100644 --- a/packages/core/src/amazonqTest/models/constants.ts +++ b/packages/core/src/amazonqTest/models/constants.ts @@ -111,12 +111,12 @@ export const testGenBuildProgressMessage = (currentStep: TestGenerationBuildStep ${session.shortAnswer?.testCoverage ? `- Unit test coverage ${session.shortAnswer?.testCoverage}%` : ``} ${icon} Build ${statusText} ${icon} Assertion ${statusText}` - //TODO: Update Assertion % + // TODO: Update Assertion % } return message.trim() } -//TODO: Work on UX to show the build error in the progress message +// TODO: Work on UX to show the build error in the progress message const updateStepStatuses = (currentStep: TestGenerationBuildStep, status?: string) => { for (let step = TestGenerationBuildStep.INSTALL_DEPENDENCIES; step <= currentStep; step++) { const stepStatus: StepStatus = { diff --git a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts index 406b04a6d75..d32b7ba9dd1 100644 --- a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts +++ b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts @@ -588,7 +588,7 @@ export class IamPolicyChecksWebview extends VueWebview { }) } catch (err: any) { if (err.status === 2) { - //CLI responds with a status code of 2 when findings are discovered + // CLI responds with a status code of 2 when findings are discovered const findingsCount = this.handleValidatePolicyCliResponse(err.stdout.toString()) span.record({ findingsCount: findingsCount, @@ -652,7 +652,7 @@ export class IamPolicyChecksWebview extends VueWebview { }) } catch (err: any) { if (err.status === 2) { - //CLI responds with a status code of 2 when findings are discovered + // CLI responds with a status code of 2 when findings are discovered const findingsCount = this.handleCustomPolicyChecksCliResponse(err.stdout.toString()) span.record({ findingsCount: findingsCount, @@ -752,7 +752,7 @@ export async function renderIamPolicyChecks(context: ExtContext): Promise { } } -//Check if Cfn and Tf tools are installed +// Check if Cfn and Tf tools are installed export function arePythonToolsInstalled(): boolean { const logger: Logger = getLogger() let cfnToolInstalled = true diff --git a/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts index 1f4dbc1d28a..0bb3cd9670d 100644 --- a/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts +++ b/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts @@ -38,7 +38,7 @@ export class TimeFilterSubmenu extends Prompter { private get recentTimeItems(): DataQuickPickItem[] { const options: DataQuickPickItem[] = [] - //appromixate 31 days as month length (better to overshoot) + // appromixate 31 days as month length (better to overshoot) options.push({ label: 'All time', data: 0, diff --git a/packages/core/src/awsService/iot/commands/attachCertificate.ts b/packages/core/src/awsService/iot/commands/attachCertificate.ts index ef45917f7a0..c77f1d36d44 100644 --- a/packages/core/src/awsService/iot/commands/attachCertificate.ts +++ b/packages/core/src/awsService/iot/commands/attachCertificate.ts @@ -46,7 +46,7 @@ export async function attachCertificateCommand(node: IotThingNode, promptFun = p getLogger().debug('Attached certificate %O', cert.certificateId) - //Refresh the Thing node + // Refresh the Thing node await node.refreshNode() } diff --git a/packages/core/src/awsService/iot/commands/createCert.ts b/packages/core/src/awsService/iot/commands/createCert.ts index 22db3136831..3f6eae413db 100644 --- a/packages/core/src/awsService/iot/commands/createCert.ts +++ b/packages/core/src/awsService/iot/commands/createCert.ts @@ -14,7 +14,7 @@ import { Iot } from 'aws-sdk' import { fs } from '../../../shared' // eslint-disable-next-line @typescript-eslint/naming-convention -const MODE_RW_R_R = 0o644 //File permission 0644 rw-r--r-- for PEM files. +const MODE_RW_R_R = 0o644 // File permission 0644 rw-r--r-- for PEM files. // eslint-disable-next-line @typescript-eslint/naming-convention const PEM_FILE_ENCODING = 'ascii' @@ -60,10 +60,10 @@ export async function createCertificateCommand( getLogger().info(`Downloaded certificate ${certId}`) void vscode.window.showInformationMessage(localize('AWS.iot.createCert.success', 'Created certificate {0}', certId)) - //Save resources + // Save resources const saveSuccessful = await saveFunc(folderLocation, certId!, certPem, privateKey, publicKey) if (!saveSuccessful) { - //Delete the certificate if the key pair cannot be saved + // Delete the certificate if the key pair cannot be saved try { await node.iot.deleteCertificate({ certificateId: certId! }) } catch (e) { @@ -72,7 +72,7 @@ export async function createCertificateCommand( } } - //Refresh the Certificate Folder node + // Refresh the Certificate Folder node await node.refreshNode() } diff --git a/packages/core/src/awsService/iot/commands/createPolicy.ts b/packages/core/src/awsService/iot/commands/createPolicy.ts index 7a91de4fb5d..ba082811e34 100644 --- a/packages/core/src/awsService/iot/commands/createPolicy.ts +++ b/packages/core/src/awsService/iot/commands/createPolicy.ts @@ -33,7 +33,7 @@ export async function createPolicyCommand(node: IotPolicyFolderNode, getPolicyDo } try { - //Parse to ensure this is a valid JSON + // Parse to ensure this is a valid JSON const policyJSON = JSON.parse(data.toString()) await node.iot.createPolicy({ policyName, policyDocument: JSON.stringify(policyJSON) }) void vscode.window.showInformationMessage( @@ -45,7 +45,7 @@ export async function createPolicyCommand(node: IotPolicyFolderNode, getPolicyDo return } - //Refresh the Policy Folder node + // Refresh the Policy Folder node await node.refreshNode() } diff --git a/packages/core/src/awsService/iot/commands/createPolicyVersion.ts b/packages/core/src/awsService/iot/commands/createPolicyVersion.ts index 979c8d50beb..257626489f6 100644 --- a/packages/core/src/awsService/iot/commands/createPolicyVersion.ts +++ b/packages/core/src/awsService/iot/commands/createPolicyVersion.ts @@ -27,7 +27,7 @@ export async function createPolicyVersionCommand( } try { - //Parse to ensure this is a valid JSON + // Parse to ensure this is a valid JSON const policyJSON = JSON.parse(data.toString()) await node.iot.createPolicyVersion({ policyName, @@ -45,6 +45,6 @@ export async function createPolicyVersionCommand( return } - //Refresh the node + // Refresh the node node.refresh() } diff --git a/packages/core/src/awsService/iot/commands/createThing.ts b/packages/core/src/awsService/iot/commands/createThing.ts index 6981e48f192..2d9b1f11d4e 100644 --- a/packages/core/src/awsService/iot/commands/createThing.ts +++ b/packages/core/src/awsService/iot/commands/createThing.ts @@ -43,7 +43,7 @@ export async function createThingCommand(node: IotThingFolderNode): Promise { void showViewLogsMessage(localize('AWS.iot.deleteThing.error', 'Failed to delete Thing: {0}', thingName)) } - //Refresh the Things Folder node + // Refresh the Things Folder node await node.parent.refreshNode() } diff --git a/packages/core/src/awsService/iot/commands/detachCert.ts b/packages/core/src/awsService/iot/commands/detachCert.ts index 11489fa841d..a8384e34b79 100644 --- a/packages/core/src/awsService/iot/commands/detachCert.ts +++ b/packages/core/src/awsService/iot/commands/detachCert.ts @@ -49,6 +49,6 @@ export async function detachThingCertCommand(node: IotThingCertNode): Promise = Settings.instance ) { - //Show only 8 characters in the explorer instead of the full 64. The entire - //ID can be copied from the context menu or viewed when hovered over. + // Show only 8 characters in the explorer instead of the full 64. The entire + // ID can be copied from the context menu or viewed when hovered over. super(truncate(certificate.id, 8), collapsibleState) this.tooltip = localize( diff --git a/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts b/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts index 8d9e1ce809e..36af63cf495 100644 --- a/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts +++ b/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts @@ -19,10 +19,10 @@ import { IotNode } from './iotNodes' import { Settings } from '../../../shared/settings' import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils' -//Length of certificate ID. The certificate ID is the last segment of the ARN. +// Length of certificate ID. The certificate ID is the last segment of the ARN. const certIdLength = 64 -//Number of digits of the certificate ID to show +// Number of digits of the certificate ID to show const certPreviewLength = 8 /** diff --git a/packages/core/src/awsService/redshift/activation.ts b/packages/core/src/awsService/redshift/activation.ts index 58dea2e0075..e7af970c26a 100644 --- a/packages/core/src/awsService/redshift/activation.ts +++ b/packages/core/src/awsService/redshift/activation.ts @@ -99,7 +99,7 @@ function getNotebookConnectClickedHandler(ctx: ExtContext, redshiftNotebookContr connectionParams = undefined } const edit = new vscode.WorkspaceEdit() - //NotebookEdit is only available for engine version > 1.68.0 + // NotebookEdit is only available for engine version > 1.68.0 const nbEdit = (vscode as any).NotebookEdit.updateNotebookMetadata({ connectionParams: connectionParams, }) diff --git a/packages/core/src/awsService/redshift/explorer/redshiftNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftNode.ts index 52eb470283b..4c245b7f4de 100644 --- a/packages/core/src/awsService/redshift/explorer/redshiftNode.ts +++ b/packages/core/src/awsService/redshift/explorer/redshiftNode.ts @@ -143,7 +143,7 @@ export class RedshiftNode extends AWSTreeNodeBase implements LoadMoreNode { } public async createCluster(clusterName: string): Promise { - //Code for creating redshiftClient cluster + // Code for creating redshiftClient cluster } public [inspect.custom](): string { diff --git a/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts b/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts index 3a0c3ca2d9d..1db972314d3 100644 --- a/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts +++ b/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts @@ -122,13 +122,13 @@ export class RedshiftNotebookController { } let tableHtml = `

Results from ${connectionParams.warehouseIdentifier} - database: ${connectionParams.database}

` - //Adding column headers + // Adding column headers for (const column of columns) { tableHtml += `` } tableHtml += '' - //Adding data rows + // Adding data rows for (const row of records) { tableHtml += '' for (let columnIndex = 0; columnIndex < columns.length; columnIndex++) { diff --git a/packages/core/src/awsService/s3/commands/uploadFile.ts b/packages/core/src/awsService/s3/commands/uploadFile.ts index ca77617af4e..41093a96f2f 100644 --- a/packages/core/src/awsService/s3/commands/uploadFile.ts +++ b/packages/core/src/awsService/s3/commands/uploadFile.ts @@ -111,8 +111,8 @@ export async function uploadFileCommand( const filesToUpload = await getFile(document) if (!filesToUpload || filesToUpload.length === 0) { - //if file is undefined, means the back button was pressed(there is no step before) or no file was selected - //thus break the loop of the 'wizard' + // if file is undefined, means the back button was pressed(there is no step before) or no file was selected + // thus break the loop of the 'wizard' showOutputMessage( localize( 'AWS.message.error.uploadFileCommand.noFileSelected', @@ -232,7 +232,7 @@ async function runBatchUploads(uploadRequests: UploadRequest[], outputChannel = outputChannel ) } - //at least one request failed + // at least one request failed const response = await vscode.window.showErrorMessage( localize( 'AWS.s3.uploadFile.retryPrompt', @@ -325,7 +325,7 @@ async function uploadBatchOfFiles( }) if (uploadResult) { - //this request failed to upload + // this request failed to upload failedRequests.push(uploadResult) } diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts index 8f428419853..00555af5cfe 100644 --- a/packages/core/src/codewhisperer/commands/basicCommands.ts +++ b/packages/core/src/codewhisperer/commands/basicCommands.ts @@ -222,7 +222,7 @@ export const showFileScan = Commands.declare( scanUuid ) } else if (onDemandFileScanState.isRunning()) { - //TODO: Pending with progress bar implementation in the Q chat Panel + // TODO: Pending with progress bar implementation in the Q chat Panel // User intends to stop the scan from Q chat panel. // Cancel only when the file scan state is "Running" await confirmStopSecurityScan( diff --git a/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts index 110a2adf011..5036a9d3b5b 100644 --- a/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts +++ b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts @@ -19,7 +19,7 @@ export class CodeWhispererCommandBackend { } const prompts = AmazonQPromptSettings.instance - //To check the condition If the user has already seen the welcome message + // To check the condition If the user has already seen the welcome message if (!(await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage'))) { telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true }) } diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts index c4f6d06b939..39750a8b3ff 100644 --- a/packages/core/src/codewhisperer/commands/startTestGeneration.ts +++ b/packages/core/src/codewhisperer/commands/startTestGeneration.ts @@ -37,7 +37,7 @@ export async function startTestGenerationProcess( ) { const logger = getLogger() const session = ChatSessionManager.Instance.getSession() - //TODO: Step 0: Initial Test Gen telemetry + // TODO: Step 0: Initial Test Gen telemetry try { logger.verbose(`Starting Test Generation `) logger.verbose(`Tab ID: ${tabID} !== ${session.tabID}`) @@ -118,7 +118,7 @@ export async function startTestGenerationProcess( fileName, initialExecution ) - //TODO: Send status to test summary + // TODO: Send status to test summary if (jobStatus === TestGenerationJobStatus.FAILED) { logger.verbose(`Test generation failed.`) throw new TestGenFailedError() @@ -130,7 +130,7 @@ export async function startTestGenerationProcess( /** * Step 5: Process and show the view diff by getting the results from exportResultsArchive */ - //https://github.com/aws/aws-toolkit-vscode/blob/0164d4145e58ae036ddf3815455ea12a159d491d/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts#L314-L405 + // https://github.com/aws/aws-toolkit-vscode/blob/0164d4145e58ae036ddf3815455ea12a159d491d/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts#L314-L405 await exportResultsArchive( artifactMap.SourceCode, testJob.testGenerationJob.testGenerationJobGroupName, @@ -141,7 +141,7 @@ export async function startTestGenerationProcess( ) } catch (error) { logger.error(`startTestGenerationProcess failed: %O`, error) - //TODO: Send error message to Chat + // TODO: Send error message to Chat testGenState.getChatControllers()?.errorThrown.fire({ tabID: session.tabID, error: error, diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index 7020de28c31..620a292cd81 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -257,9 +257,9 @@ export const codeScanZipExt = '.zip' export const contextTruncationTimeoutSeconds = 10 -export const codeScanJobTimeoutSeconds = 60 * 10 //10 minutes +export const codeScanJobTimeoutSeconds = 60 * 10 // 10 minutes -export const codeFileScanJobTimeoutSeconds = 60 * 10 //10 minutes +export const codeFileScanJobTimeoutSeconds = 60 * 10 // 10 minutes export const codeFixJobTimeoutMs = 60_000 @@ -396,7 +396,7 @@ export const failedToConnectIamIdentityCenter = `Failed to connect to IAM Identi export const stopScanMessage = 'Stop security review? This review will be counted as one complete review towards your monthly security review limits.' -//TODO: Change the Text according to the UX +// TODO: Change the Text according to the UX export const stopScanMessageInChat = 'Review is stopped. Retry reviews by selecting below options' export const showScannedFilesMessage = 'View Code Issues' diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts index ade478ad875..d54370a7102 100644 --- a/packages/core/src/codewhisperer/models/model.ts +++ b/packages/core/src/codewhisperer/models/model.ts @@ -370,7 +370,7 @@ enum TestGenStatus { Running, Cancelling, } -//TODO: Refactor model of /scan and /test +// TODO: Refactor model of /scan and /test export class TestGenState { // Define a constructor for this class private testGenState: TestGenStatus = TestGenStatus.NotStarted diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts index 537638b52c9..d328034d560 100644 --- a/packages/core/src/codewhisperer/service/securityScanHandler.ts +++ b/packages/core/src/codewhisperer/service/securityScanHandler.ts @@ -339,7 +339,7 @@ export function throwIfCancelled(scope: CodeWhispererConstants.CodeAnalysisScope break } } -//TODO: Refactor this +// TODO: Refactor this export async function uploadArtifactToS3( fileName: string, resp: CreateUploadUrlResponse, @@ -376,7 +376,7 @@ export async function uploadArtifactToS3( } } -//TODO: Refactor this +// TODO: Refactor this export function getLoggerForScope(scope?: CodeWhispererConstants.CodeAnalysisScope) { return scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ? getNullLogger() : getLogger() } diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts index 218864ce256..e0027c2ac33 100644 --- a/packages/core/src/codewhisperer/service/testGenHandler.ts +++ b/packages/core/src/codewhisperer/service/testGenHandler.ts @@ -25,9 +25,9 @@ import path from 'path' import { ExportIntent } from '@amzn/codewhisperer-streaming' import { glob } from 'glob' -//TODO: Get TestFileName and Framework and to error message +// TODO: Get TestFileName and Framework and to error message export function throwIfCancelled() { - //TODO: fileName will be '' if user gives propt without opening + // TODO: fileName will be '' if user gives propt without opening if (testGenState.isCancelling()) { throw Error(CodeWhispererConstants.unitTestGenerationCancelMessage) } @@ -146,7 +146,7 @@ export async function pollTestJobStatus( if (shortAnswerString) { const parsedShortAnswer = JSON.parse(shortAnswerString) const shortAnswer: ShortAnswer = JSON.parse(parsedShortAnswer) - //Stop the Unit test generation workflow if IDE receive stopIteration = true + // Stop the Unit test generation workflow if IDE receive stopIteration = true if (shortAnswer.stopIteration === 'true') { session.stopIteration = true throw new TestGenFailedError(shortAnswer.planSummary) @@ -181,7 +181,7 @@ export async function pollTestJobStatus( ChatSessionManager.Instance.getSession().shortAnswer = shortAnswer } if (resp.testGenerationJob?.status !== TestGenerationJobStatus.IN_PROGRESS) { - //This can be FAILED or COMPLETED + // This can be FAILED or COMPLETED status = resp.testGenerationJob?.status as TestGenerationJobStatus logger.verbose(`testgen job status: ${status}`) logger.verbose(`Complete polling test job status.`) @@ -210,7 +210,7 @@ export async function exportResultsArchive( projectPath: string, initialExecution: boolean ) { - //TODO: Make a common Temp folder + // TODO: Make a common Temp folder const pathToArchiveDir = path.join(tempDirPath, 'q-testgen') const archivePathExists = await fs.existsDir(pathToArchiveDir) @@ -239,7 +239,7 @@ export async function exportResultsArchive( projectName, }) - //If User accepts the diff + // If User accepts the diff testGenState.getChatControllers()?.sendUpdatePromptProgress.fire({ tabID: ChatSessionManager.Instance.getSession().tabID, status: 'Completed', diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index fbbe937c0a0..13951f7508a 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -39,7 +39,7 @@ export abstract class ProposedChangeNode { try { this.saveFile() } catch (err) { - //to do: file system-related error handling + // to do: file system-related error handling if (err instanceof Error) { getLogger().error(err.message) } @@ -468,7 +468,7 @@ export class ProposedTransformationExplorer { } else { patchFiles.push(singlePatchFile) } - //Because multiple patches are returned once the ZIP is downloaded, we want to show the first one to start + // Because multiple patches are returned once the ZIP is downloaded, we want to show the first one to start diffModel.parseDiff( patchFiles[0], transformByQState.getProjectPath(), @@ -549,7 +549,7 @@ export class ProposedTransformationExplorer { void vscode.window.showInformationMessage(CodeWhispererConstants.changesAppliedNotificationOneDiff) } - //We do this to ensure that the changesAppliedChatMessage is only sent to user when they accept the first diff.patch + // We do this to ensure that the changesAppliedChatMessage is only sent to user when they accept the first diff.patch transformByQState.getChatControllers()?.transformationFinished.fire({ message: CodeWhispererConstants.changesAppliedChatMessageMultipleDiffs( diffModel.currentPatchIndex, diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index 2a9423e6159..a85bb8e66d5 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -240,7 +240,7 @@ export async function fetchOpentabsContext( function findBestKChunkMatches(chunkInput: Chunk, chunkReferences: Chunk[], k: number): Chunk[] { const chunkContentList = chunkReferences.map((chunk) => chunk.content) - //performBM25Scoring returns the output in a sorted order (descending of scores) + // performBM25Scoring returns the output in a sorted order (descending of scores) const top3: BM25Document[] = new BM25Okapi(chunkContentList).topN(chunkInput.content, crossFileContextConfig.topK) return top3.map((doc) => { diff --git a/packages/core/src/codewhisperer/util/telemetryHelper.ts b/packages/core/src/codewhisperer/util/telemetryHelper.ts index 5176ffee2be..bdb63b45727 100644 --- a/packages/core/src/codewhisperer/util/telemetryHelper.ts +++ b/packages/core/src/codewhisperer/util/telemetryHelper.ts @@ -245,7 +245,7 @@ export class TelemetryHelper { events.push(event) }) - //aggregate suggestion references count + // aggregate suggestion references count const referenceCount = this.getAggregatedSuggestionReferenceCount(events) // aggregate user decision events at requestId level diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index 7678f9dcb12..663a7e85f47 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -450,7 +450,7 @@ export class ZipUtil { } protected async processTestCoverageFiles(targetPath: string) { - //TODO: will be removed post release + // TODO: will be removed post release const coverageFilePatterns = ['**/coverage.xml', '**/coverage.json', '**/coverage.txt'] let files: vscode.Uri[] = [] @@ -616,7 +616,7 @@ export class ZipUtil { throw error } } - //TODO: Refactor this + // TODO: Refactor this public async removeTmpFiles(zipMetadata: ZipMetadata, scope?: CodeWhispererConstants.CodeAnalysisScope) { const logger = getLoggerForScope(scope) logger.verbose(`Cleaning up temporary files...`) diff --git a/packages/core/src/codewhisperer/vue/backend.ts b/packages/core/src/codewhisperer/vue/backend.ts index e2561cad87c..ec1ed818ec0 100644 --- a/packages/core/src/codewhisperer/vue/backend.ts +++ b/packages/core/src/codewhisperer/vue/backend.ts @@ -29,7 +29,7 @@ export class CodeWhispererWebview extends VueWebview { private isFileSaved: boolean = false private getLocalFilePath(fileName: string): string { - //This will store the files in the global storage path of VSCode + // This will store the files in the global storage path of VSCode return path.join(globals.context.globalStorageUri.fsPath, fileName) } @@ -81,22 +81,22 @@ export class CodeWhispererWebview extends VueWebview { } } - //This function returns the OS type of the machine used in Shortcuts and Generate Suggestion Sections + // This function returns the OS type of the machine used in Shortcuts and Generate Suggestion Sections public getOSType(): OSType { return os.platform() === 'darwin' ? 'Mac' : 'RestOfOS' } - //This function opens the Keyboard shortcuts in VSCode + // This function opens the Keyboard shortcuts in VSCode async openShortCuts(): Promise { await vscode.commands.executeCommand('workbench.action.openGlobalKeybindings', 'codewhisperer') } - //This function opens the Feedback CodeWhisperer page in the webview + // This function opens the Feedback CodeWhisperer page in the webview async openFeedBack(): Promise { return submitFeedback(placeholder, 'Amazon Q') } - //------Telemetry------ + // ------Telemetry------ /** This represents the cause for the webview to open, whether a certain button was clicked or it opened automatically */ #codeWhispererSource?: CodeWhispererSource @@ -113,7 +113,7 @@ export class CodeWhispererWebview extends VueWebview { passive: true, }) } - //Telemetry for CodeWhisperer Try Example with two params Language and Task Type + // Telemetry for CodeWhisperer Try Example with two params Language and Task Type emitTryExampleClick(languageSelected: CodewhispererLanguage, taskType: CodewhispererGettingStartedTask) { telemetry.codewhisperer_onboardingClick.emit({ codewhispererLanguage: languageSelected, @@ -121,7 +121,7 @@ export class CodeWhispererWebview extends VueWebview { }) } } -//List of all events that are emitted from the webview of CodeWhisperer +// List of all events that are emitted from the webview of CodeWhisperer export type CodeWhispererUiClick = | 'codewhisperer_Resources_Documentation' | 'codewhisperer_Resources_Feedback' @@ -160,7 +160,7 @@ export async function showCodeWhispererWebview( }), ] const prompts = AmazonQPromptSettings.instance - //To check the condition If the user has already seen the welcome message + // To check the condition If the user has already seen the welcome message if (await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) { telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: true }) } else { diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts index af6a3a2a3ce..6604fd7bb21 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts @@ -91,7 +91,7 @@ export class Messenger { * @returns count of multi-line code blocks in response. */ public async countTotalNumberOfCodeBlocks(message: string): Promise { - //TODO: remove this when moved to server-side. + // TODO: remove this when moved to server-side. if (message === undefined) { return 0 } diff --git a/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts b/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts index 332829868a4..b66a6c44936 100644 --- a/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts +++ b/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts @@ -24,13 +24,13 @@ export function extractContextFromJavaImports(names: any): string[] { if (commonJavaImportsPrefixesRegex.test(importStatement)) { return '' } else if (importStatement.startsWith(awsJavaSdkV1Prefix)) { - //@ts-ignore + // @ts-ignore return javaImport.packages?.at(1) ?? '' } else if (importStatement.startsWith(awsJavaSdkV2Prefix)) { - //@ts-ignore + // @ts-ignore return javaImport.packages?.at(2) ?? '' } else { - //@ts-ignore + // @ts-ignore return javaImport.packages?.at(0) ?? javaImport.organisation ?? javaImport.tld } }) diff --git a/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts index 5077b21c909..3ee5d8c865c 100644 --- a/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts +++ b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts @@ -139,7 +139,7 @@ export class SchemaCodeDownloader { } catch (err) { const error = err as Error if (error.name === 'ResourceNotFound') { - //If the code generation wasn't previously kicked off, do so + // If the code generation wasn't previously kicked off, do so void vscode.window.showInformationMessage( localize( 'AWS.message.info.schemas.downloadCodeBindings.generate', @@ -149,10 +149,10 @@ export class SchemaCodeDownloader { ) await this.generator.generate(request) - //Then, poll for completion + // Then, poll for completion await this.poller.pollForCompletion(request) - //Download generated code bindings + // Download generated code bindings void vscode.window.showInformationMessage( localize( 'AWS.message.info.schemas.downloadCodeBindings.downloading', @@ -294,7 +294,7 @@ export class CodeExtractor { const codeZipFile = path.join(codeZipDir, fileName) const destinationDirectory = request.destinationDirectory.fsPath - //write binary data into a temp zip file in a temp directory + // write binary data into a temp zip file in a temp directory const zipContentsBinary = new Uint8Array(zipContents) const fd = fs.openSync(codeZipFile, 'w') fs.writeSync(fd, zipContentsBinary, 0, zipContentsBinary.byteLength, 0) diff --git a/packages/core/src/eventSchemas/commands/viewSchemaItem.ts b/packages/core/src/eventSchemas/commands/viewSchemaItem.ts index 5ad255e65c6..f3eca0428e5 100644 --- a/packages/core/src/eventSchemas/commands/viewSchemaItem.ts +++ b/packages/core/src/eventSchemas/commands/viewSchemaItem.ts @@ -51,5 +51,5 @@ export async function showSchemaContent( language: 'json', }) const editor = await vscode.window.showTextDocument(newDoc, vscode.ViewColumn.One, false) - await editor.edit((edit) => edit.insert(new vscode.Position(/*line*/ 0, /*character*/ 0), prettySchemaContent)) + await editor.edit((edit) => edit.insert(new vscode.Position(/* line*/ 0, /* character*/ 0), prettySchemaContent)) } diff --git a/packages/core/src/eventSchemas/providers/schemasDataProvider.ts b/packages/core/src/eventSchemas/providers/schemasDataProvider.ts index 23c43c1915f..ec280238183 100644 --- a/packages/core/src/eventSchemas/providers/schemasDataProvider.ts +++ b/packages/core/src/eventSchemas/providers/schemasDataProvider.ts @@ -76,7 +76,7 @@ export class SchemasDataProvider { if (!schemas || schemas.length === 0) { schemas = await toArrayAsync(client.listSchemas(registryName)) const singleItem: registrySchemasMap = { registryName: registryName, schemaList: schemas } - //wizard setup always calls getRegistries method prior to getSchemas, so this shouldn't be undefined + // wizard setup always calls getRegistries method prior to getSchemas, so this shouldn't be undefined if (!registrySchemasMapList) { this.pushRegionDataIntoCache(region, [], [singleItem], credentials) } diff --git a/packages/core/src/extension.ts b/packages/core/src/extension.ts index ef4131c6f26..00fd730b490 100644 --- a/packages/core/src/extension.ts +++ b/packages/core/src/extension.ts @@ -75,7 +75,7 @@ export async function activateCommon( errors.init(fs.getUsername(), isAutomation()) await initializeComputeRegion() - globals.contextPrefix = '' //todo: disconnect supplied argument + globals.contextPrefix = '' // todo: disconnect supplied argument registerCommandErrorHandler((info, error) => { const defaultMessage = localize('AWS.generic.message.error', 'Failed to run command: {0}', info.id) @@ -112,7 +112,7 @@ export async function activateCommon( ) } - //setup globals + // setup globals globals.machineId = await getMachineId() globals.awsContext = new DefaultAwsContext() globals.sdkClientBuilder = new DefaultAWSClientBuilder(globals.awsContext) diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts index 95f0fa9a14f..551be9d09cf 100644 --- a/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts +++ b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts @@ -268,7 +268,7 @@ export default defineComponent({ if (!field) { return undefined } - //Reg ex for a comma with 0 or more whitespace before and/or after + // Reg ex for a comma with 0 or more whitespace before and/or after const re = /\s*,\s*/g return field.trim().split(re) }, diff --git a/packages/core/src/shared/clients/iotClient.ts b/packages/core/src/shared/clients/iotClient.ts index ca91cca7556..a926c5edfd3 100644 --- a/packages/core/src/shared/clients/iotClient.ts +++ b/packages/core/src/shared/clients/iotClient.ts @@ -26,7 +26,7 @@ export type IotPolicy = IotThing export type IotClient = InterfaceNoSymbol const iotServiceArn = 'iot' -//Pattern to extract the certificate ID from the parsed ARN resource. +// Pattern to extract the certificate ID from the parsed ARN resource. const certArnResourcePattern = /cert\/(\w+)/ export interface ListThingCertificatesResponse { diff --git a/packages/core/src/shared/clients/redshiftClient.ts b/packages/core/src/shared/clients/redshiftClient.ts index b2ca65eff8d..a0e98bc405e 100644 --- a/packages/core/src/shared/clients/redshiftClient.ts +++ b/packages/core/src/shared/clients/redshiftClient.ts @@ -31,7 +31,7 @@ export interface ExecuteQueryResponse { executionId: string } -//Type definition for Provisioned and Serverless +// Type definition for Provisioned and Serverless export class DefaultRedshiftClient { public constructor( public readonly regionCode: string, diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts index c72db98c21a..0b095e23df6 100644 --- a/packages/core/src/shared/constants.ts +++ b/packages/core/src/shared/constants.ts @@ -84,12 +84,12 @@ export const samSyncParamUrl = vscode.Uri.parse( 'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-sync.html' ) -//URLs for "sam build" wizard. +// URLs for "sam build" wizard. export const samBuildUrl = vscode.Uri.parse( 'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-building.html' ) -//URLs for "sam deploy" wizard. +// URLs for "sam deploy" wizard. export const samDeployUrl = vscode.Uri.parse( 'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-deploy.html' ) @@ -168,7 +168,7 @@ export const apprunnerCreateServiceDocUrl = { // TODO: update docs to add the file viewer feature export const s3FileViewerHelpUrl = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/s3.html' -//URL for Redshift +// URL for Redshift export const redshiftHelpUrl = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/redshift.html' // URL for Amazon Q diff --git a/packages/core/src/shared/env/resolveEnv.ts b/packages/core/src/shared/env/resolveEnv.ts index 5c6db4bc2c1..2c50169f984 100644 --- a/packages/core/src/shared/env/resolveEnv.ts +++ b/packages/core/src/shared/env/resolveEnv.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -/*--------------------------------------------------------------------------------------------- +/* --------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/packages/core/src/shared/languageServer/languageModelCache.ts b/packages/core/src/shared/languageServer/languageModelCache.ts index dddac1625b2..1e1dd73f045 100644 --- a/packages/core/src/shared/languageServer/languageModelCache.ts +++ b/packages/core/src/shared/languageServer/languageModelCache.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -/*--------------------------------------------------------------------------------------------- +/* --------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/packages/core/src/shared/languageServer/utils/runner.ts b/packages/core/src/shared/languageServer/utils/runner.ts index 51563565d46..8116f4dee1b 100644 --- a/packages/core/src/shared/languageServer/utils/runner.ts +++ b/packages/core/src/shared/languageServer/utils/runner.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -/*--------------------------------------------------------------------------------------------- +/* --------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/packages/core/src/shared/logger/sharedFileTransport.ts b/packages/core/src/shared/logger/sharedFileTransport.ts index e9bf376d8f4..59227812df0 100644 --- a/packages/core/src/shared/logger/sharedFileTransport.ts +++ b/packages/core/src/shared/logger/sharedFileTransport.ts @@ -101,7 +101,7 @@ export class SharedFileTransport extends TransportStream { // Remove the logs that were written to the file from the buffer. // But we have to keep in mind new logs may have been - //asynchronously added to the buffer, so we only remove what we have flushed. + // asynchronously added to the buffer, so we only remove what we have flushed. this.bufferedLogEntries = this.bufferedLogEntries.slice(latestLogIndex + 1) const newText = logMessages.join('\n') + '\n' diff --git a/packages/core/src/shared/sam/debugger/javaSamDebug.ts b/packages/core/src/shared/sam/debugger/javaSamDebug.ts index aa1cbf5fd8b..26ebad889d6 100644 --- a/packages/core/src/shared/sam/debugger/javaSamDebug.ts +++ b/packages/core/src/shared/sam/debugger/javaSamDebug.ts @@ -58,7 +58,7 @@ function getJavaOptionsEnvVar(config: SamLaunchRequestArgs): string { // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L86 return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true` case 'java21': - //https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L96 + // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L96 return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true` default: return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true -Xshare:off` diff --git a/packages/core/src/shared/sam/deploy.ts b/packages/core/src/shared/sam/deploy.ts index 566ba03cb21..6353c46a0e5 100644 --- a/packages/core/src/shared/sam/deploy.ts +++ b/packages/core/src/shared/sam/deploy.ts @@ -335,7 +335,7 @@ export async function runDeploy(arg: any, wizardParams?: DeployParams): Promise< }) try { - //Run SAM build in Terminal + // Run SAM build in Terminal await runInTerminal(buildProcess, 'build') } catch (error) { throw ToolkitError.chain(error, 'Failed to build SAM template', { details: { ...buildFlags } }) @@ -349,7 +349,7 @@ export async function runDeploy(arg: any, wizardParams?: DeployParams): Promise< }), }) - //Run SAM deploy in Terminal + // Run SAM deploy in Terminal const { paramsSource, stackName, region, projectRoot } = params const shouldWriteDeploySamconfigGlobal = paramsSource !== ParamsSource.SamConfig && !!stackName && !!region try { diff --git a/packages/core/src/shared/sam/utils.ts b/packages/core/src/shared/sam/utils.ts index b6da18e9055..99331bba830 100644 --- a/packages/core/src/shared/sam/utils.ts +++ b/packages/core/src/shared/sam/utils.ts @@ -135,7 +135,7 @@ export function throwIfErrorMatches(result: ChildProcessResult, terminal?: vscod export function getTerminalFromError(error: any): vscode.Terminal { return error.details?.['terminal'] as unknown as vscode.Terminal - //return vscode.window.activeTerminal as vscode.Terminal + // return vscode.window.activeTerminal as vscode.Terminal } export enum SamCliErrorTypes { diff --git a/packages/core/src/shared/utilities/vsCodeUtils.ts b/packages/core/src/shared/utilities/vsCodeUtils.ts index 5d14da6d3d2..03229cf104a 100644 --- a/packages/core/src/shared/utilities/vsCodeUtils.ts +++ b/packages/core/src/shared/utilities/vsCodeUtils.ts @@ -179,7 +179,7 @@ export function isUntitledScheme(uri: vscode.Uri): boolean { * Example: `['foo', '**\/bar/'] => "["foo", "bar"]"` */ export function globDirPatterns(dirs: string[]): string[] { - //The patterns themselves are not useful, but with postformating like "**/${pattern}/" they become glob dir patterns + // The patterns themselves are not useful, but with postformating like "**/${pattern}/" they become glob dir patterns return dirs.map((current) => { // Trim all "*" and "/" chars. // Note that the replace() patterns and order is intentionaly so that "**/*foo*/**" yields "*foo*". diff --git a/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts b/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts index 2f665839260..29b2dd817a1 100644 --- a/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts +++ b/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts @@ -25,7 +25,7 @@ export function getStateMachineDefinitionFromCfnTemplate(uniqueIdentifier: strin const matchingKeyList: string[] = [] for (const key of Object.keys(resources)) { - //the resources list always contains 'CDKMetadata' + // the resources list always contains 'CDKMetadata' if (key === 'CDKMetadata') { continue } @@ -37,7 +37,7 @@ export function getStateMachineDefinitionFromCfnTemplate(uniqueIdentifier: strin if (matchingKeyList.length === 0) { return '' } else { - //return minimum length key in matchingKeyList + // return minimum length key in matchingKeyList matchingKey = matchingKeyList.reduce((a, b) => (a.length <= b.length ? a : b)) } diff --git a/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts index 7e99b46ded6..536ec3e224c 100644 --- a/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts +++ b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts @@ -354,7 +354,7 @@ describe('customChecks', function () { await fakePolicyChecksWebview.checkNoNewAccess(documentType, policyType, referenceDocument, cfnParameterPath) - //We do not want to validate the path of the temporary folder, so we check every other field instead of the entire args + // We do not want to validate the path of the temporary folder, so we check every other field instead of the entire args assert(executeCustomPolicyChecksCommandStub.called) const actualCommand = executeCustomPolicyChecksCommandStub.getCalls()[0].args[0] assert.deepStrictEqual(actualCommand.command, 'tf-policy-validator') diff --git a/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts b/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts index e772bab0d92..9b630eed07d 100644 --- a/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts +++ b/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts @@ -470,7 +470,7 @@ describe('CodeExtractor', function () { let zipHandler = createZipFileInTempDirectory(fileName, 'First file content', zipName) zipHandler.extractAllTo(destinationDirectory) - //Create a zip file that clashes with destination content + // Create a zip file that clashes with destination content zipHandler = createZipFileInTempDirectory(fileName, 'Second file content', zipName) const collisionOccured = codeExtractor.checkFileCollisions(zipName, destinationDirectory) @@ -487,7 +487,7 @@ describe('CodeExtractor', function () { let zipHandler = createZipFileInTempDirectory(fileName1, 'First file content', zipName) zipHandler.extractAllTo(destinationDirectory) - //Create a zip file with same directory path but diff fileName + // Create a zip file with same directory path but diff fileName const fileName2 = 'test2.txt' zipHandler = createZipFileInTempDirectory(fileName2, 'Second file content', zipName) @@ -550,7 +550,7 @@ describe('CodeExtractor', function () { assert.ok(await fs.exists(file1Path), `${file1Path} should exist`) assert.ok(await fs.exists(file2Path), `${file2Path} should exist`) - //confirm file contents + // confirm file contents const file1Content = await fs.readFileText(file1Path) const file2Content = await fs.readFileText(file2Path) @@ -569,7 +569,7 @@ describe('CodeExtractor', function () { const zipHandler = createZipFileInTempDirectory(fileName1, expectedFileContent, zipFileName) zipHandler.extractAllTo(destinationDirectory) - //same file name - collision occurs + // same file name - collision occurs const fileName2 = fileName1 const zip = new admZip() zip.addFile(fileName2, Buffer.from('Second file content')) @@ -594,7 +594,7 @@ describe('CodeExtractor', function () { const zipHandler = createZipFileInTempDirectory(fileName1, initialFileContent, zipFileName) zipHandler.extractAllTo(destinationDirectory) - //same file name, different file content - collision occurs + // same file name, different file content - collision occurs const fileName2 = fileName1 const zip = new admZip() const overridenFileContent = 'Replaced file content' @@ -621,7 +621,7 @@ describe('CodeExtractor', function () { const zipHandler = createZipFileInTempDirectory(fileName1, expectedFileContent, zipFileName) zipHandler.extractAllTo(destinationDirectory) - //same file name - collision occurs + // same file name - collision occurs const fileName2 = fileName1 const zip = new admZip() zip.addFile(fileName2, Buffer.from('Second file content')) @@ -640,7 +640,7 @@ describe('CodeExtractor', function () { }) it('should return coreCodeFilePath if it exists inside zip content', async function () { - //grab the title from schemaName + // grab the title from schemaName const title = testSchemaName.split('.').pop() const fileName = title!.concat('.java') diff --git a/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts b/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts index 328a821d35a..089a971a40c 100644 --- a/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts +++ b/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts @@ -116,7 +116,7 @@ describe('Search Schemas', function () { const client = stub(DefaultSchemaClient, { regionCode: 'region-1' }) const displayMessage = `Unable to search registry ${failRegistry}` - //make an api call with non existent registryName - should return empty results + // make an api call with non existent registryName - should return empty results const results = await getSearchListForSingleRegistry(client, failRegistry, 'randomText') assert.strictEqual(results.length, 0, 'should return 0 summaries') @@ -145,7 +145,7 @@ describe('Search Schemas', function () { assert.strictEqual(results.length, 3, 'should return 3 summaries') - //results are unordered, sort for testing purposes + // results are unordered, sort for testing purposes results.sort(function (a, b) { return a.RegistryName > b.RegistryName ? 1 : b.RegistryName > a.RegistryName ? -1 : 0 }) @@ -165,7 +165,7 @@ describe('Search Schemas', function () { assert.strictEqual(results[1].VersionList.length, 1, 'second summary has 1 version') assert.strictEqual(results[2].VersionList.length, 1, 'third summary has 1 version') - //failed registries + // failed registries const errorMessages = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error) assert.strictEqual(errorMessages.length, 2, 'should display 2 error message, 1 per each failed registry') errorMessages[0].assertMessage(displayMessage) diff --git a/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts b/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts index 7153b617266..5fdd61e5c42 100644 --- a/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts +++ b/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts @@ -141,7 +141,7 @@ describe('DefaultRegistryNode', function () { }) it('handles error', async function () { - //typo in the name of the method + // typo in the name of the method class ThrowErrorDefaultSchemaRegistrynNode extends SchemasNode { public constructor() { super(createSchemaClient()) diff --git a/packages/core/src/test/fakeExtensionContext.ts b/packages/core/src/test/fakeExtensionContext.ts index d16bd8a1dd4..8c89302900e 100644 --- a/packages/core/src/test/fakeExtensionContext.ts +++ b/packages/core/src/test/fakeExtensionContext.ts @@ -52,7 +52,7 @@ export class FakeExtensionContext implements vscode.ExtensionContext { public storagePath: string | undefined public logPath: string = '' public extensionUri: vscode.Uri = vscode.Uri.file(this._extensionPath) - public environmentVariableCollection: any //vscode.EnvironmentVariableCollection = {} as vscode.EnvironmentVariableCollection + public environmentVariableCollection: any // vscode.EnvironmentVariableCollection = {} as vscode.EnvironmentVariableCollection public storageUri: vscode.Uri | undefined public logUri: vscode.Uri = vscode.Uri.file('file://fake/log/uri') public extensionMode: vscode.ExtensionMode = vscode.ExtensionMode.Test diff --git a/packages/core/src/test/globalSetup.test.ts b/packages/core/src/test/globalSetup.test.ts index 57a17261338..e33270e0471 100644 --- a/packages/core/src/test/globalSetup.test.ts +++ b/packages/core/src/test/globalSetup.test.ts @@ -26,7 +26,7 @@ import { GlobalState } from '../shared/globalState' import { FeatureConfigProvider } from '../shared/featureConfig' import { mockFeatureConfigsData } from './fake/mockFeatureConfigData' import { fs } from '../shared' -import { promises as nodefs } from 'fs' //eslint-disable-line no-restricted-imports +import { promises as nodefs } from 'fs' // eslint-disable-line no-restricted-imports disableAwsSdkWarning() const testReportDir = join(__dirname, '../../../../../.test-reports') // Root project, not subproject diff --git a/packages/core/src/test/lambda/local/debugConfiguration.test.ts b/packages/core/src/test/lambda/local/debugConfiguration.test.ts index a57651341e6..12192127eeb 100644 --- a/packages/core/src/test/lambda/local/debugConfiguration.test.ts +++ b/packages/core/src/test/lambda/local/debugConfiguration.test.ts @@ -60,7 +60,7 @@ describe('makeCoreCLRDebugConfiguration', function () { templatePath: '/fake/sam/path', samLocalInvokeCommand: new DefaultSamLocalInvokeCommand(), - //debuggerPath?: + // debuggerPath?: invokeTarget: { target: 'code', diff --git a/packages/core/src/test/shared/debug/launchConfiguration.test.ts b/packages/core/src/test/shared/debug/launchConfiguration.test.ts index bc9f37578b9..120e4f12c67 100644 --- a/packages/core/src/test/shared/debug/launchConfiguration.test.ts +++ b/packages/core/src/test/shared/debug/launchConfiguration.test.ts @@ -209,7 +209,7 @@ describe('getReferencedHandlerPaths', function () { const resultSet = await getReferencedHandlerPaths(mockLaunchConfig) const workspaceFolder = mockLaunchConfig.workspaceFolder!.uri.fsPath - //template type handlers, these are all false as we throw all of these out + // template type handlers, these are all false as we throw all of these out assert.strictEqual(resultSet.has('resource'), false) assert.strictEqual(resultSet.has('relativePathGoodTemplate'), false) assert.strictEqual(resultSet.has('relativePathBadTemplate'), false) diff --git a/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts b/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts index 60edb29af07..cf9586c9a28 100644 --- a/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts +++ b/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts @@ -510,8 +510,8 @@ describe('SamDebugConfigurationProvider', async function () { target: TEMPLATE_TARGET_TYPE, templatePath: relPath, logicalId: 'TestResource', - //lambdaHandler: 'sick handles', - //projectRoot: 'root as in beer' + // lambdaHandler: 'sick handles', + // projectRoot: 'root as in beer' }, }) assert.strictEqual(resolved!.name, name) diff --git a/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts b/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts index 0906d14f598..483b4fe8bc6 100644 --- a/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts +++ b/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts @@ -22,7 +22,7 @@ describe('createTemplatePrompter', () => { beforeEach(() => { sandbox = sinon.createSandbox() - //Create a mock instance of CloudFormationTemplateRegistry + // Create a mock instance of CloudFormationTemplateRegistry registry = { items: [ { path: '/path/to/template1.yaml', item: {} } as WatchedItem, diff --git a/packages/core/src/test/shared/wizards/wizard.test.ts b/packages/core/src/test/shared/wizards/wizard.test.ts index 0aee4f66502..04c3ac62fb4 100644 --- a/packages/core/src/test/shared/wizards/wizard.test.ts +++ b/packages/core/src/test/shared/wizards/wizard.test.ts @@ -110,7 +110,7 @@ class TestPrompter extends Prompter { this.acceptedEstimators.push(estimator) } - //----------------------------Test helper methods go below this line----------------------------// + // ----------------------------Test helper methods go below this line----------------------------// public acceptState(state: StateWithCache): this { this.acceptedStates[this.promptCount] = state diff --git a/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts b/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts index f52132dad75..0038795ad89 100644 --- a/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts +++ b/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts @@ -55,14 +55,14 @@ describe('CodeWhisperer service invocation', async function () { beforeEach(function () { void resetCodeWhispererGlobalVariables() RecommendationHandler.instance.clearRecommendations() - //TODO: remove this line (this.skip()) when these tests no longer auto-skipped + // TODO: remove this line (this.skip()) when these tests no longer auto-skipped this.skip() - //valid connection required to run tests + // valid connection required to run tests skipTestIfNoValidConn(validConnection, this) }) it('trigger known to return recs with references returns rec with reference', async function () { - //check that handler is empty before invocation + // check that handler is empty before invocation const requestIdBefore = RecommendationHandler.instance.requestId const sessionIdBefore = session.sessionId const validRecsBefore = RecommendationHandler.instance.isValidResponse() @@ -89,13 +89,13 @@ describe('CodeWhisperer service invocation', async function () { assert.ok(sessionId.length > 0) assert.ok(validRecs) assert.ok(references !== undefined) - //TODO: uncomment this assert when this test is no longer auto-skipped + // TODO: uncomment this assert when this test is no longer auto-skipped // assert.ok(references.length > 0) }) - //This test will fail if user is logged in with IAM identity center + // This test will fail if user is logged in with IAM identity center it('trigger known to return rec with references does not return rec with references when reference tracker setting is off', async function () { - //check that handler is empty before invocation + // check that handler is empty before invocation const requestIdBefore = RecommendationHandler.instance.requestId const sessionIdBefore = session.sessionId const validRecsBefore = RecommendationHandler.instance.isValidResponse() @@ -119,7 +119,7 @@ describe('CodeWhisperer service invocation', async function () { assert.ok(requestId.length > 0) assert.ok(sessionId.length > 0) - //no recs returned because example request returns 1 rec with reference, so no recs returned when references off + // no recs returned because example request returns 1 rec with reference, so no recs returned when references off assert.ok(!validRecs) }) }) diff --git a/packages/core/src/testE2E/codewhisperer/securityScan.test.ts b/packages/core/src/testE2E/codewhisperer/securityScan.test.ts index 7f6fe65e15c..730b9628290 100644 --- a/packages/core/src/testE2E/codewhisperer/securityScan.test.ts +++ b/packages/core/src/testE2E/codewhisperer/securityScan.test.ts @@ -58,7 +58,7 @@ describe('CodeWhisperer security scan', async function () { beforeEach(function () { void resetCodeWhispererGlobalVariables() - //valid connection required to run tests + // valid connection required to run tests skipTestIfNoValidConn(validConnection, this) }) @@ -112,19 +112,19 @@ describe('CodeWhisperer security scan', async function () { } it('codescan request with valid input params and no security issues completes scan and returns no recommendations', async function () { - //set up file and editor + // set up file and editor const appRoot = path.join(workspaceFolder, 'python3.7-plain-sam-app') const appCodePath = path.join(appRoot, 'hello_world', 'app.py') const editor = await openTestFile(appCodePath) - //run security scan + // run security scan const securityJobSetupResult = await securityJobSetup(editor) const artifactMap = securityJobSetupResult.artifactMap const projectPaths = securityJobSetupResult.projectPaths const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT - //get job status and result + // get job status and result const scanJob = await createScanJob( client, artifactMap, @@ -152,7 +152,7 @@ describe('CodeWhisperer security scan', async function () { }) it('codescan request with valid input params and security issues completes scan and returns recommendations', async function () { - //set up file and editor + // set up file and editor tempFolder = await makeTemporaryToolkitFolder() const tempFile = path.join(tempFolder, 'test.py') await testutil.toFile(filePromptWithSecurityIssues, tempFile) @@ -160,7 +160,7 @@ describe('CodeWhisperer security scan', async function () { const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT - //run security scan + // run security scan const securityJobSetupResult = await securityJobSetup(editor) const artifactMap = securityJobSetupResult.artifactMap const projectPaths = securityJobSetupResult.projectPaths @@ -172,7 +172,7 @@ describe('CodeWhisperer security scan', async function () { securityJobSetupResult.codeScanName ) - //get job status and result + // get job status and result const jobStatus = await pollScanJobStatus( client, scanJob.jobId, diff --git a/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts b/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts index 7ea8f2f5e84..d4265d13982 100644 --- a/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts +++ b/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts @@ -38,12 +38,12 @@ describe('CodeWhisperer service invocation', async function () { beforeEach(function () { void resetCodeWhispererGlobalVariables() RecommendationHandler.instance.clearRecommendations() - //valid connection required to run tests + // valid connection required to run tests skipTestIfNoValidConn(validConnection, this) }) it('manual trigger returns valid recommendation response', async function () { - //check that handler is empty before invocation + // check that handler is empty before invocation const requestIdBefore = RecommendationHandler.instance.requestId const sessionIdBefore = session.sessionId const validRecsBefore = RecommendationHandler.instance.isValidResponse() @@ -65,7 +65,7 @@ describe('CodeWhisperer service invocation', async function () { }) it('auto trigger returns valid recommendation response', async function () { - //check that handler is empty before invocation + // check that handler is empty before invocation const requestIdBefore = RecommendationHandler.instance.requestId const sessionIdBefore = session.sessionId const validRecsBefore = RecommendationHandler.instance.isValidResponse() @@ -83,7 +83,7 @@ describe('CodeWhisperer service invocation', async function () { ) await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, client, config) - //wait for 5 seconds to allow time for response to be generated + // wait for 5 seconds to allow time for response to be generated await sleep(5000) const requestId = RecommendationHandler.instance.requestId @@ -100,7 +100,7 @@ describe('CodeWhisperer service invocation', async function () { const appRoot = path.join(workspaceFolder, 'go1-plain-sam-app') const appCodePath = path.join(appRoot, 'hello-world', 'main.go') - //check that handler is empty before invocation + // check that handler is empty before invocation const requestIdBefore = RecommendationHandler.instance.requestId const sessionIdBefore = session.sessionId const validRecsBefore = RecommendationHandler.instance.isValidResponse() diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts index 8a500b405d4..487c2aef1b7 100644 --- a/packages/core/src/testInteg/sam.test.ts +++ b/packages/core/src/testInteg/sam.test.ts @@ -754,7 +754,7 @@ describe('SAM Integration Tests', async function () { const item1 = input.items[2] as DataQuickPickItem const item2 = input.items[4] as DataQuickPickItem const item3 = input.items[7] as DataQuickPickItem - input.acceptItems(item1, item2, item3) //--cached, --parallel, --use-container + input.acceptItems(item1, item2, item3) // --cached, --parallel, --use-container assert.strictEqual(item1.data as string, '--cached') assert.strictEqual(item2.data as string, '--parallel') diff --git a/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts b/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts index 81fddff2c52..dbcf6c29047 100644 --- a/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts +++ b/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts @@ -32,7 +32,7 @@ const createNewThreatComposerFile = async () => { return } - const fileContent = '' //Empty content would be accepted by TC which will save default structure automatically + const fileContent = '' // Empty content would be accepted by TC which will save default structure automatically const filePath = path.join(rootFolder, `${title}.tc.json`) await fs.writeFile(filePath, fileContent) diff --git a/packages/core/types/git.d.ts b/packages/core/types/git.d.ts index 4b0c12cec68..e037dfdac9e 100644 --- a/packages/core/types/git.d.ts +++ b/packages/core/types/git.d.ts @@ -7,7 +7,7 @@ // https://github.com/microsoft/vscode/blob/7ed4699079f647ef53807f511ac87ff06a7b37b5/extensions/git/src/api/git.d.ts // Note that this file should be imported as 'git.d' since it contains enums and thus must be compiled. -/*--------------------------------------------------------------------------------------------- +/* --------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/packages/webpack.base.config.js b/packages/webpack.base.config.js index 7d61588108b..652249e6577 100644 --- a/packages/webpack.base.config.js +++ b/packages/webpack.base.config.js @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -//@ts-check +// @ts-check 'use strict' @@ -20,7 +20,7 @@ const packageJsonFile = path.join(currentDir, 'package.json') const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf8')) const packageId = `${packageJson.publisher}.${packageJson.name}` -//@ts-check +// @ts-check /** @typedef {import('webpack').Configuration} WebpackConfig **/ module.exports = (env = {}, argv = {}) => { @@ -59,7 +59,7 @@ module.exports = (env = {}, argv = {}) => { }, }, node: { - __dirname: false, //preserve the default node.js behavior for __dirname + __dirname: false, // preserve the default node.js behavior for __dirname }, module: { rules: [ diff --git a/packages/webpack.vue.config.js b/packages/webpack.vue.config.js index 00a177fac71..1ca91ceed4d 100644 --- a/packages/webpack.vue.config.js +++ b/packages/webpack.vue.config.js @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -//@ts-check +// @ts-check 'use strict' @@ -14,7 +14,7 @@ const baseConfigFactory = require('./webpack.base.config') const { merge } = require('webpack-merge') const currentDir = process.cwd() -//@ts-check +// @ts-check /** @typedef {import('webpack').Configuration} WebpackConfig **/ /** @@ -22,7 +22,7 @@ const currentDir = process.cwd() * Example: `src/lambda/vue/index.ts` -> `dist/src/lambda/vue/index.js` * @param {string} file */ -const createVueBundleName = file => { +const createVueBundleName = (file) => { return path.relative(currentDir, file).split('.').slice(0, -1).join(path.sep) } @@ -33,7 +33,7 @@ const createVueBundleName = file => { const createVueEntries = (targetPattern = 'index.ts') => { return glob .sync(path.resolve(currentDir, 'src', '**', 'vue', '**', targetPattern).replace(/\\/g, '/')) - .map(f => ({ name: createVueBundleName(f), path: f })) + .map((f) => ({ name: createVueBundleName(f), path: f })) .reduce((a, b) => ((a[b.name] = b.path), a), {}) } diff --git a/packages/webpack.web.config.js b/packages/webpack.web.config.js index 5734481a942..fc6ca86d1d9 100644 --- a/packages/webpack.web.config.js +++ b/packages/webpack.web.config.js @@ -71,7 +71,7 @@ module.exports = (env, argv) => { http: false, // http: require.resolve('stream-http'), https: false, // https: require.resolve('https-browserify'), zlib: false, // zlib: require.resolve('browserify-zlib'), - constants: false, //constants: require.resolve('constants-browserify'), + constants: false, // constants: require.resolve('constants-browserify'), // These do not have a straight forward replacement child_process: false, // Reason for error: 'TypeError: The "original" argument must be of type Function' async_hooks: false, From 7f90d5660736136a2c309f9c240a36c370997755 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:19:51 -0500 Subject: [PATCH 029/202] refactor(ec2): avoid logging somewhat sensitive data (#6149) ## Problem We currently log `STREAM_URL` and `TOKEN` which are used to establish the SSM session. However, these could be used to establish a connection outside the toolkit. ## Solution - Omit these from the logs. - Also add a logging statement to make it easier to find these `connect_script` logs. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/core/resources/ec2_connect | 4 ++-- packages/core/src/awsService/ec2/model.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/resources/ec2_connect b/packages/core/resources/ec2_connect index 518a5e86f58..1fae562899b 100755 --- a/packages/core/resources/ec2_connect +++ b/packages/core/resources/ec2_connect @@ -47,8 +47,8 @@ _main() { _require AWS_SSM_CLI "${AWS_SSM_CLI:-}" _require AWS_REGION "${AWS_REGION:-}" - _require STREAM_URL "${STREAM_URL:-}" - _require TOKEN "${TOKEN:-}" + _require_nolog STREAM_URL "${STREAM_URL:-}" + _require_nolog TOKEN "${TOKEN:-}" _require SESSION_ID "${SESSION_ID:-}" _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}" diff --git a/packages/core/src/awsService/ec2/model.ts b/packages/core/src/awsService/ec2/model.ts index 085bfa0674b..17769ff4575 100644 --- a/packages/core/src/awsService/ec2/model.ts +++ b/packages/core/src/awsService/ec2/model.ts @@ -242,6 +242,7 @@ export class Ec2Connecter implements vscode.Disposable { const ssmSession = await this.startSSMSession(selection.instanceId) const vars = getEc2SsmEnv(selection, ssm, ssmSession) + getLogger().info(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`) const envProvider = async () => { return { [sshAgentSocketVariable]: await startSshAgent(), ...vars } } From 83aac85e7d41381a6388edf15f395f4293d860a6 Mon Sep 17 00:00:00 2001 From: Avi Alpert <131792194+avi-alpert@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:49:08 -0500 Subject: [PATCH 030/202] fix(amazonq): prompt to choose a folder for /doc #6159 ## Problem When a user clicks the "Change folder" button when creating or updating a README, the "Generating answer..." loading text appears, even though there is no answer being generated, since we are waiting for the user to choose a folder. This is an especially confusing UX if the user is connected to an SSH host. ## Solution When the user clicks the "Change folder" button, send a "Choose a folder to continue" message in the chat. --- .../Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json | 4 ++++ packages/core/package.nls.json | 2 ++ .../src/amazonqDoc/controllers/chat/controller.ts | 11 +++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json new file mode 100644 index 00000000000..fe0706a5bd8 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /doc: Prompt user to choose a folder in chat" +} diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index a0a79329f70..e07958a856f 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -374,6 +374,8 @@ "AWS.amazonq.doc.answer.generating": "Generating documentation", "AWS.amazonq.doc.answer.creating": "Okay, I'm creating a README for your project. This may take a few minutes.", "AWS.amazonq.doc.answer.updating": "Okay, I'm updating the README to reflect your code changes. This may take a few minutes.", + "AWS.amazonq.doc.answer.chooseFolder": "Choose a folder to continue.", + "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.", "AWS.amazonq.doc.error.contentLengthError": "Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.readmeTooLarge": "The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.workspaceEmpty": "The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the Amazon Q Developer documentation.", diff --git a/packages/core/src/amazonqDoc/controllers/chat/controller.ts b/packages/core/src/amazonqDoc/controllers/chat/controller.ts index e8ecceff0ca..40fcf037181 100644 --- a/packages/core/src/amazonqDoc/controllers/chat/controller.ts +++ b/packages/core/src/amazonqDoc/controllers/chat/controller.ts @@ -116,10 +116,17 @@ export class DocController { } /** Prompts user to choose a folder in current workspace for README creation/update. - * After user chooses a folder, displays confimraiton message to user with selected path. + * After user chooses a folder, displays confirmation message to user with selected path. * */ private async folderSelector(data: any) { + this.messenger.sendAnswer({ + type: 'answer', + tabID: data.tabID, + message: i18n('AWS.amazonq.doc.answer.chooseFolder'), + disableChatInput: true, + }) + const uri = await createSingleFileDialog({ canSelectFolders: true, canSelectFiles: false, @@ -133,7 +140,7 @@ export class DocController { this.messenger.sendAnswer({ type: 'answer', tabID: data.tabID, - message: 'No folder was selected, please try again.', + message: i18n('AWS.amazonq.doc.error.noFolderSelected'), followUps: retryFollowUps, disableChatInput: true, }) From 11c35ae3ca7af4d0223ad5a6f1ba7bc08bd98467 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:26:17 -0500 Subject: [PATCH 031/202] docs(ec2): add details about `authorized_keys`override (#6157) ## Problem Missing documentation about current behavior of ec2 remote window connect. ## Solution Add some detail to the docs. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- docs/arch_features.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/arch_features.md b/docs/arch_features.md index c76874f7b6e..e697874678d 100644 --- a/docs/arch_features.md +++ b/docs/arch_features.md @@ -43,6 +43,7 @@ For EC2 specifically, there are a few additional steps: 1. If connecting to EC2 instance via remote window, the toolkit generates temporary SSH keys (30 second lifetime), with the public key sent to the remote instance. - Key type is ed25519 if supported, or RSA otherwise. + - This connection will overwrite the `.ssh/authorized_keys` file on the remote machine with each connection. 1. If insufficient permissions are detected on the attached IAM role, toolkit will prompt to add an inline policy with the necessary actions. 1. If SSM sessions remain open after closing the window/terminal, the toolkit will terminate them on-shutdown, or when starting another session to the same instance. From 3f2ee9ef8ee5f75a46e2c21e974e4dd25a7d2a5d Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:26:49 -0500 Subject: [PATCH 032/202] refactor(ec2): pass log level to connect script (#6161) ## Problem We want to only log file paths when in debug mode, but the connect script has no way of determining this. ## Solution - pass log level to connect script. - use it to determine what to log. Example logs: ``` 2024/12/05 15:50:24 ============================================================================== 2024/12/05 15:50:24 LOG_LEVEL=3 2024/12/05 15:50:24 AWS_REGION=us-east-1 2024/12/05 15:50:24 SESSION_ID=... 2024/12/05 15:51:11 ============================================================================== 2024/12/05 15:51:11 LOG_LEVEL=1 2024/12/05 15:51:11 AWS_REGION=us-east-1 2024/12/05 15:51:11 SESSION_ID=... 2024/12/05 15:51:11 AWS_SSM_CLI=.../Amazon/sessionmanagerplugin/bin/session-manager-plugin 2024/12/05 15:51:11 LOG_FILE_LOCATION=/.../ec2.{instanceId}.log 2024/12/05 15:51:55 ============================================================================== 2024/12/05 15:51:55 LOG_LEVEL=2 2024/12/05 15:51:55 AWS_REGION=us-east-1 2024/12/05 15:51:55 SESSION_ID=default-uk9cv4h86y5rdbrzarlkj9opci 2024/12/05 15:51:56 AWS_SSM_CLI=../Amazon/sessionmanagerplugin/bin/session-manager-plugin 2024/12/05 15:51:56 LOG_FILE_LOCATION=/.../ec2.{instanceId}.log ``` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/core/resources/ec2_connect | 18 +++++++++++++----- packages/core/src/awsService/ec2/model.ts | 3 ++- packages/core/src/awsService/ec2/utils.ts | 2 ++ packages/core/src/shared/logger/activation.ts | 7 +++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/core/resources/ec2_connect b/packages/core/resources/ec2_connect index 1fae562899b..06ae8d39686 100755 --- a/packages/core/resources/ec2_connect +++ b/packages/core/resources/ec2_connect @@ -2,7 +2,7 @@ # Usage: # When connecting to a dev environment -# AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… ./ec2_connect +# AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… DEBUG_LOG=… ./ec2_connect set -e set -u @@ -44,13 +44,21 @@ _ec2() { _main() { _log "==============================================================================" - - _require AWS_SSM_CLI "${AWS_SSM_CLI:-}" + _require DEBUG_LOG "${DEBUG_LOG:-}" _require AWS_REGION "${AWS_REGION:-}" + + _require SESSION_ID "${SESSION_ID:-}" _require_nolog STREAM_URL "${STREAM_URL:-}" _require_nolog TOKEN "${TOKEN:-}" - _require SESSION_ID "${SESSION_ID:-}" - _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}" + + # Only log file paths when debug level is enabled. + if [ "${DEBUG_LOG:-}" -eq 1 ]; then + _require AWS_SSM_CLI "${AWS_SSM_CLI:-}" + _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}" + else + _require_nolog AWS_SSM_CLI "${AWS_SSM_CLI:-}" + _require_nolog LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}" + fi _ec2 "$AWS_SSM_CLI" "$AWS_REGION" "$STREAM_URL" "$TOKEN" "$SESSION_ID" } diff --git a/packages/core/src/awsService/ec2/model.ts b/packages/core/src/awsService/ec2/model.ts index 17769ff4575..0c10539b1ca 100644 --- a/packages/core/src/awsService/ec2/model.ts +++ b/packages/core/src/awsService/ec2/model.ts @@ -242,7 +242,8 @@ export class Ec2Connecter implements vscode.Disposable { const ssmSession = await this.startSSMSession(selection.instanceId) const vars = getEc2SsmEnv(selection, ssm, ssmSession) - getLogger().info(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`) + getLogger().debug(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`) + const envProvider = async () => { return { [sshAgentSocketVariable]: await startSshAgent(), ...vars } } diff --git a/packages/core/src/awsService/ec2/utils.ts b/packages/core/src/awsService/ec2/utils.ts index 306887f3270..105d2da06ff 100644 --- a/packages/core/src/awsService/ec2/utils.ts +++ b/packages/core/src/awsService/ec2/utils.ts @@ -8,6 +8,7 @@ import { copyToClipboard } from '../../shared/utilities/messages' import { Ec2Selection } from './prompter' import { sshLogFileLocation } from '../../shared/sshConfig' import { SSM } from 'aws-sdk' +import { getLogger } from '../../shared/logger' export function getIconCode(instance: SafeEc2Instance) { if (instance.LastSeenStatus === 'running') { @@ -42,6 +43,7 @@ export function getEc2SsmEnv( STREAM_URL: session.StreamUrl, SESSION_ID: session.SessionId, TOKEN: session.TokenValue, + DEBUG_LOG: getLogger().logLevelEnabled('debug') ? 1 : 0, }, process.env ) diff --git a/packages/core/src/shared/logger/activation.ts b/packages/core/src/shared/logger/activation.ts index 9cbce46e6fd..9d590b226fd 100644 --- a/packages/core/src/shared/logger/activation.ts +++ b/packages/core/src/shared/logger/activation.ts @@ -13,7 +13,7 @@ import { resolvePath } from '../utilities/pathUtils' import fs from '../../shared/fs/fs' import { isWeb } from '../extensionGlobals' import { getUserAgent } from '../telemetry/util' -import { isBeta } from '../vscode/env' +import { isBeta, isDebugInstance } from '../vscode/env' /** * Activate Logger functionality for the extension. @@ -46,7 +46,10 @@ export async function activate( const newLogLevel = fromVscodeLogLevel(logLevel) mainLogger.setLogLevel(newLogLevel) // Also logs a message. }) - mainLogger.setLogLevel('debug') // HACK: set to "debug" when debugging the extension. + + if (isDebugInstance()) { + mainLogger.setLogLevel('debug') // HACK: set to "debug" when debugging the extension. + } setLogger(mainLogger) From 33b791ef86631e884e1aef232f16cb646b99609a Mon Sep 17 00:00:00 2001 From: Michael Landi Date: Fri, 6 Dec 2024 15:54:33 -0500 Subject: [PATCH 033/202] fix(amazonq): /dev to support upload of nested Dockerfiles #6115 ## Problem Nested `Dockerfile` files were not supported with https://github.com/aws/aws-toolkit-vscode/pull/6107 ## Solution Look at path basename when comparing file to list of well known files. --- ...ug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json | 4 ++++ packages/core/src/shared/filetypes.ts | 13 ++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json b/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json new file mode 100644 index 00000000000..cdddf910441 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /dev not adding Dockerfiles in nested folders" +} diff --git a/packages/core/src/shared/filetypes.ts b/packages/core/src/shared/filetypes.ts index 1e6027bb12b..32a3f575f06 100644 --- a/packages/core/src/shared/filetypes.ts +++ b/packages/core/src/shared/filetypes.ts @@ -348,16 +348,11 @@ export const codefileExtensions = new Set([ '.zig', ]) -// Some well-known code files without an extension -export const wellKnownCodeFiles = new Set(['Dockerfile', 'Dockerfile.build']) +// Code file names without an extension +export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build']) /** Returns true if `filename` is a code file. */ export function isCodeFile(filename: string): boolean { - if (codefileExtensions.has(path.extname(filename).toLowerCase())) { - return true - } else if (wellKnownCodeFiles.has(filename)) { - return true - } else { - return false - } + const ext = path.extname(filename).toLowerCase() + return codefileExtensions.has(ext) || codefileNames.has(path.basename(filename)) } From ba3a388f5e7fa9d34a05c37705813e855a90e8e0 Mon Sep 17 00:00:00 2001 From: Kevin Ding Date: Fri, 6 Dec 2024 15:58:58 -0500 Subject: [PATCH 034/202] fix(amazonq): prompt user to choose a folder in the chat for /doc --- .../Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json | 4 ++++ packages/core/package.nls.json | 2 ++ .../src/amazonqDoc/controllers/chat/controller.ts | 11 +++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json new file mode 100644 index 00000000000..fe0706a5bd8 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /doc: Prompt user to choose a folder in chat" +} diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index a0a79329f70..e07958a856f 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -374,6 +374,8 @@ "AWS.amazonq.doc.answer.generating": "Generating documentation", "AWS.amazonq.doc.answer.creating": "Okay, I'm creating a README for your project. This may take a few minutes.", "AWS.amazonq.doc.answer.updating": "Okay, I'm updating the README to reflect your code changes. This may take a few minutes.", + "AWS.amazonq.doc.answer.chooseFolder": "Choose a folder to continue.", + "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.", "AWS.amazonq.doc.error.contentLengthError": "Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.readmeTooLarge": "The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.workspaceEmpty": "The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the Amazon Q Developer documentation.", diff --git a/packages/core/src/amazonqDoc/controllers/chat/controller.ts b/packages/core/src/amazonqDoc/controllers/chat/controller.ts index e8ecceff0ca..40fcf037181 100644 --- a/packages/core/src/amazonqDoc/controllers/chat/controller.ts +++ b/packages/core/src/amazonqDoc/controllers/chat/controller.ts @@ -116,10 +116,17 @@ export class DocController { } /** Prompts user to choose a folder in current workspace for README creation/update. - * After user chooses a folder, displays confimraiton message to user with selected path. + * After user chooses a folder, displays confirmation message to user with selected path. * */ private async folderSelector(data: any) { + this.messenger.sendAnswer({ + type: 'answer', + tabID: data.tabID, + message: i18n('AWS.amazonq.doc.answer.chooseFolder'), + disableChatInput: true, + }) + const uri = await createSingleFileDialog({ canSelectFolders: true, canSelectFiles: false, @@ -133,7 +140,7 @@ export class DocController { this.messenger.sendAnswer({ type: 'answer', tabID: data.tabID, - message: 'No folder was selected, please try again.', + message: i18n('AWS.amazonq.doc.error.noFolderSelected'), followUps: retryFollowUps, disableChatInput: true, }) From e0c153f5bc0d8582466d5c875679c6aa286f0e48 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Sat, 7 Dec 2024 01:01:12 +0000 Subject: [PATCH 035/202] fix(amazonq): use fsPath for project name #6176 ## Problem Issues reported in chat sometimes does not match issues tree. This is happening because the zip artifact uses workspace name (custom name could be different from fsPath) while git diff output uses fsPath. This causes the findings to come back as two filePaths that end up overwriting each other. ## Solution Update zip to use project name from fsPath instead of `workspaceFolder.name` --- .../Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json | 4 ++++ packages/core/src/codewhisperer/util/zipUtil.ts | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json new file mode 100644 index 00000000000..bbcdd4e40a8 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names" +} diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index 7678f9dcb12..a12f8100c44 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -114,7 +114,9 @@ export class ZipUtil { const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri) if (workspaceFolder) { - const projectName = workspaceFolder.name + // Note: workspaceFolder.name is not the same as the file system folder name, + // use the fsPath value instead + const projectName = path.basename(workspaceFolder.uri.fsPath) const relativePath = vscode.workspace.asRelativePath(uri) const zipEntryPath = this.getZipEntryPath(projectName, relativePath) zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8')) From 9f5bfe4e8a25e4edba206c2483e1d2079c4a7d75 Mon Sep 17 00:00:00 2001 From: invictus <149003065+ashishrp-aws@users.noreply.github.com> Date: Fri, 6 Dec 2024 17:02:52 -0800 Subject: [PATCH 036/202] fix(amazonq): Improved LLM code review for file review #6162 ## Problem - Code diff for file review format has changed in payload to improve LLM based code review accuracy and is dependent on git. ## Solution - We are currently send entire file in diff format and run git commands to extract it. This change will remove git dependency for LLM based code review issues. --- .../Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json | 4 ++++ packages/core/src/codewhisperer/util/zipUtil.ts | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json b/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json new file mode 100644 index 00000000000..c7d24855d6b --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Improved LLM code review for file review." +} diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index a12f8100c44..46fec37cab3 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -122,12 +122,8 @@ export class ZipUtil { zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8')) if (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND) { - await this.processCombinedGitDiff( - zip, - [workspaceFolder.uri.fsPath], - uri.fsPath, - CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND - ) + const gitDiffContent = `+++ b/${path.normalize(zipEntryPath)}` // Sending file path in payload for LLM code review + zip.addFile(ZipConstants.codeDiffFilePath, Buffer.from(gitDiffContent, 'utf-8')) } } else { zip.addFile(uri.fsPath, Buffer.from(content, 'utf-8')) From 5f76b568aee0d26dbc970be9a5e4c71725b3f572 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:04:02 -0500 Subject: [PATCH 037/202] deps(core): update dependencies #6169 ## Problem Express needs to be updated to a newer version to avoid security vulnerabilities ## Solution Update it --- package-lock.json | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bf434177b1..fd8c8b31547 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12134,9 +12134,9 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, "dependencies": { "accepts": "~1.3.8", @@ -12158,7 +12158,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -12173,6 +12173,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/array-flatten": { @@ -12210,9 +12214,10 @@ "license": "MIT" }, "node_modules/express/node_modules/path-to-regexp": { - "version": "0.1.10", - "dev": true, - "license": "MIT" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true }, "node_modules/express/node_modules/statuses": { "version": "2.0.1", From ed15bbc9df1ceac8217cd6fa96c6090fd750e418 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Fri, 6 Dec 2024 17:06:53 -0800 Subject: [PATCH 038/202] telemetry(cwl): LiveTail metrics ## Problem Updating telemetry to accommodate changes in https://github.com/aws/aws-toolkit-common/pull/932 ## Solution Update package version for telemetry. Add validation on the LogStreamFilter submenu's response for filter type. This is needed to allow the type returned from the LogStreamFilterSubmenu to be convertible to the type in the metric definition for filterPattern. In any case, this is a good validation to have since the 'menu' placeholder value isn't valid for starting a LiveTail session anyways. --- package-lock.json | 9 +++++---- package.json | 2 +- .../cloudWatchLogs/commands/tailLogGroup.ts | 13 +++++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index d5cec48a936..92e5e525861 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "vscode-nls-dev": "^4.0.4" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.284", + "@aws-toolkits/telemetry": "^1.0.287", "@playwright/browser-chromium": "^1.43.1", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", @@ -6046,13 +6046,14 @@ } }, "node_modules/@aws-toolkits/telemetry": { - "version": "1.0.284", - "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.284.tgz", - "integrity": "sha512-+3uHmr4St2cw8yuvVZOUY4Recv0wmzendGODCeUPIIUjsjCANF3H7G/qzIKRN3BHCoedcvzA/eSI+l4ENRXtiA==", + "version": "1.0.287", + "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.287.tgz", + "integrity": "sha512-qK2l8Fv5Cvs865ap2evf4ikBREg33/jGw0lgxolqZLdHwm5zm/DkR9vNyqwhDlqDRlSgSlros3Z8zaiSBVRYVQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "ajv": "^6.12.6", + "cross-spawn": "^7.0.6", "fs-extra": "^11.1.0", "lodash": "^4.17.20", "prettier": "^3.3.2", diff --git a/package.json b/package.json index bc03c2b8395..872e525de2c 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.284", + "@aws-toolkits/telemetry": "^1.0.287", "@playwright/browser-chromium": "^1.43.1", "@types/he": "^1.2.3", "@types/vscode": "^1.68.0", diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index b87f7608430..33cda709f25 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -24,12 +24,17 @@ export async function tailLogGroup( codeLensProvider: LiveTailCodeLensProvider, logData?: { regionName: string; groupName: string } ): Promise { - await telemetry.cwlLiveTail_Start.run(async (span) => { + await telemetry.cloudwatchlogs_startLiveTail.run(async (span) => { const wizard = new TailLogGroupWizard(logData) const wizardResponse = await wizard.run() if (!wizardResponse) { throw new CancellationError('user') } + if (wizardResponse.logStreamFilter.type === 'menu' || wizardResponse.logStreamFilter.type === undefined) { + //logstream filter wizard uses type to determine which submenu to show. 'menu' is set when no type is selected + //and to show the 'menu' of selecting a type. This should not be reachable due to the picker logic, but validating in case. + throw new ToolkitError(`Invalid Log Stream filter type: ${wizardResponse.logStreamFilter.type}`) + } const awsCredentials = await globals.awsContext.getCredentials() if (awsCredentials === undefined) { throw new ToolkitError('Failed to start LiveTail session: credentials are undefined.') @@ -67,8 +72,8 @@ export async function tailLogGroup( source: source, result: 'Succeeded', sessionAlreadyStarted: false, - hasLogEventFilterPattern: Boolean(wizardResponse.filterPattern), - logStreamFilterType: wizardResponse.logStreamFilter.type, + hasTextFilter: Boolean(wizardResponse.filterPattern), + filterType: wizardResponse.logStreamFilter.type, }) await handleSessionStream(stream, document, session) } finally { @@ -83,7 +88,7 @@ export function closeSession( source: string, codeLensProvider: LiveTailCodeLensProvider ) { - telemetry.cwlLiveTail_Stop.run((span) => { + telemetry.cloudwatchlogs_stopLiveTail.run((span) => { const session = registry.get(uriToKey(sessionUri)) if (session === undefined) { throw new ToolkitError(`No LiveTail session found for URI: ${uriToKey(sessionUri)}`) From 38850f7c941cc4fbd56e9b9bcb8bd5681c7dbf73 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:11:01 -0500 Subject: [PATCH 039/202] fix(amazonq): update "explore agents" button on hover #6170 ## Problem - explore page has some UI updates ## Solution - improve the "Quick start" buttons on the explore agents page so that it shows amazon q colours on hover --- .../Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json | 4 ++++ packages/core/src/amazonq/webview/ui/walkthrough/agent.ts | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json b/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json new file mode 100644 index 00000000000..e540866201e --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix the quick start buttons on the explore page to show amazon q colours on hover" +} diff --git a/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts b/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts index bb0b4b15896..f4a5add7aa1 100644 --- a/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts +++ b/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts @@ -58,6 +58,7 @@ Implement features or make changes across your workspace, all from a single prom status: 'main', disabled: false, flash: 'once', + fillState: 'hover', icon: MynahIcons.RIGHT_OPEN, id: 'quick-start-featuredev', text: `Quick start with **/dev**`, @@ -88,6 +89,7 @@ Automatically generate unit tests for your active file. status: 'main', disabled: false, flash: 'once', + fillState: 'hover', icon: MynahIcons.RIGHT_OPEN, id: 'quick-start-testgen', text: `Quick start with **/test**`, @@ -122,6 +124,7 @@ Create and update READMEs for better documented code. status: 'main', disabled: false, flash: 'once', + fillState: 'hover', icon: MynahIcons.RIGHT_OPEN, id: 'quick-start-doc', text: `Quick start with **/doc**`, @@ -156,6 +159,7 @@ Review code for issues, then get suggestions to fix your code instantaneously. status: 'main', disabled: false, flash: 'once', + fillState: 'hover', icon: MynahIcons.RIGHT_OPEN, id: 'quick-start-review', text: `Quick start with **/review**`, @@ -186,6 +190,7 @@ Upgrade library and language versions in your codebase. status: 'main', disabled: false, flash: 'once', + fillState: 'hover', icon: MynahIcons.RIGHT_OPEN, id: 'quick-start-gumby', text: `Quick start with **/transform**`, From 226dd6f755b1fb32b764ab1d3379a6090378d610 Mon Sep 17 00:00:00 2001 From: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com> Date: Mon, 9 Dec 2024 05:46:02 -0800 Subject: [PATCH 040/202] telemetry(amazonq): requestId for amazonq_utgGenerateTests event #6181 ## Problem - Missing data if job fails at `StartTestGeneration` API. ## Solution - Adding requestId for `amazonq_utgGenerateTests` event, which helps to debug the reason for job failures from the backend. --- packages/core/src/amazonqTest/chat/controller/controller.ts | 3 +++ .../src/amazonqTest/chat/controller/messenger/messenger.ts | 5 ++++- packages/core/src/amazonqTest/chat/session/session.ts | 1 + packages/core/src/codewhisperer/service/testGenHandler.ts | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index a7938575a9b..64f3e320d21 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -246,6 +246,7 @@ export class TestController { cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call jobGroup: session.testGenerationJobGroupName, + requestId: session.startTestGenerationRequestId, hasUserPromptSupplied: session.hasUserPromptSupplied, isCodeBlockSelected: session.isCodeBlockSelected, buildPayloadBytes: session.srcPayloadSize, @@ -725,6 +726,7 @@ export class TestController { cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0] jobGroup: session.testGenerationJobGroupName, + requestId: session.startTestGenerationRequestId, buildPayloadBytes: session.srcPayloadSize, buildZipFileBytes: session.srcZipFileSize, artifactsUploadDuration: session.artifactsUploadDuration, @@ -848,6 +850,7 @@ export class TestController { cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0] jobGroup: session.testGenerationJobGroupName, + requestId: session.startTestGenerationRequestId, buildPayloadBytes: session.srcPayloadSize, buildZipFileBytes: session.srcZipFileSize, artifactsUploadDuration: session.artifactsUploadDuration, diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts index 6051a9b51ad..ee19b26cf42 100644 --- a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts @@ -187,7 +187,7 @@ export class Messenger { fileName: string ) { let message = '' - const messageId = response.$metadata.requestId ?? '' + let messageId = response.$metadata.requestId ?? '' let codeReference: CodeReference[] = [] if (response.generateAssistantResponseResponse === undefined) { @@ -267,6 +267,7 @@ export class Messenger { } if (requestID !== undefined) { + messageId = requestID message += `\n\nRequest ID: ${requestID}` } this.sendMessage(message.trim(), tabID, 'answer') @@ -282,6 +283,7 @@ export class Messenger { reasonDesc: getTelemetryReasonDesc(CodeWhispererConstants.unitTestGenerationCancelMessage), isSupportedLanguage: false, credentialStartUrl: AuthUtil.instance.startUrl, + requestId: messageId, }) this.dispatcher.sendUpdatePromptProgress( @@ -296,6 +298,7 @@ export class Messenger { result: 'Succeeded', isSupportedLanguage: false, credentialStartUrl: AuthUtil.instance.startUrl, + requestId: messageId, }) this.dispatcher.sendUpdatePromptProgress( new UpdatePromptProgressMessage(tabID, testGenCompletedField) diff --git a/packages/core/src/amazonqTest/chat/session/session.ts b/packages/core/src/amazonqTest/chat/session/session.ts index cd188c10c0f..cc20e0f6286 100644 --- a/packages/core/src/amazonqTest/chat/session/session.ts +++ b/packages/core/src/amazonqTest/chat/session/session.ts @@ -31,6 +31,7 @@ export class Session { //This is unique per each test generation cycle public testGenerationJobGroupName: string | undefined = undefined public listOfTestGenerationJobId: string[] = [] + public startTestGenerationRequestId: string | undefined = undefined public testGenerationJob: TestGenerationJob | undefined // Start Test generation diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts index 218864ce256..7508af5e5cb 100644 --- a/packages/core/src/codewhisperer/service/testGenHandler.ts +++ b/packages/core/src/codewhisperer/service/testGenHandler.ts @@ -94,11 +94,13 @@ export async function createTestJob( logger.debug('target line range end: %O', firstTargetLineRangeList?.end) const resp = await codewhispererClient.codeWhispererClient.startTestGeneration(req).catch((err) => { + ChatSessionManager.Instance.getSession().startTestGenerationRequestId = err.requestId logger.error(`Failed creating test job. Request id: ${err.requestId}`) throw err }) logger.info('Unit test generation request id: %s', resp.$response.requestId) logger.debug('Unit test generation data: %O', resp.$response.data) + ChatSessionManager.Instance.getSession().startTestGenerationRequestId = resp.$response.requestId if (resp.$response.error) { logger.error('Unit test generation error: %O', resp.$response.error) } From aff84c89e162acb41aea51b8cf31f5863090e7ff Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:57:03 -0500 Subject: [PATCH 041/202] test(perf): increase thresholds of perf tests #6185 ## Problem Some of the performance tests have been flaky on CI, and is more noticeable lately with reduction in overall flakiness. ## Solution bump the thresholds up. --- packages/core/src/testInteg/perf/prepareRepoData.test.ts | 2 +- packages/core/src/testInteg/perf/registerNewFiles.test.ts | 2 +- packages/core/src/testInteg/perf/zipcode.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/testInteg/perf/prepareRepoData.test.ts b/packages/core/src/testInteg/perf/prepareRepoData.test.ts index cf5d2bcbe37..18a8481954a 100644 --- a/packages/core/src/testInteg/perf/prepareRepoData.test.ts +++ b/packages/core/src/testInteg/perf/prepareRepoData.test.ts @@ -28,7 +28,7 @@ type setupResult = { function performanceTestWrapper(numFiles: number, fileSize: number) { return performanceTest( getEqualOSTestOptions({ - userCpuUsage: 150, + userCpuUsage: 200, systemCpuUsage: 35, heapTotal: 4, }), diff --git a/packages/core/src/testInteg/perf/registerNewFiles.test.ts b/packages/core/src/testInteg/perf/registerNewFiles.test.ts index 15d1d56889d..6ece10712f1 100644 --- a/packages/core/src/testInteg/perf/registerNewFiles.test.ts +++ b/packages/core/src/testInteg/perf/registerNewFiles.test.ts @@ -30,7 +30,7 @@ function performanceTestWrapper(label: string, numFiles: number, fileSize: numbe const conversationId = 'test-conversation' return performanceTest( getEqualOSTestOptions({ - userCpuUsage: 200, + userCpuUsage: 300, systemCpuUsage: 35, heapTotal: 20, }), diff --git a/packages/core/src/testInteg/perf/zipcode.test.ts b/packages/core/src/testInteg/perf/zipcode.test.ts index b19dffa7332..f5e81086152 100644 --- a/packages/core/src/testInteg/perf/zipcode.test.ts +++ b/packages/core/src/testInteg/perf/zipcode.test.ts @@ -40,7 +40,7 @@ async function setup(numberOfFiles: number, fileSize: number): Promise Date: Mon, 9 Dec 2024 14:40:16 -0500 Subject: [PATCH 042/202] build(jscpd): validate branch name before running CI (#6124) ## Problem ... ## Solution - (title) - Refactor github actions such that JSCPD requires `lint-commits`. - Add step to `lint-commits` that verifies branch name according to rules here: https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags - Note this means that no CI tasks will run on PRs with branches that don't fit naming conventions. --- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/workflows/copyPasteDetection.yml | 86 ------------------------ .github/workflows/lintbranch.js | 67 ++++++++++++++++++ .github/workflows/node.js.yml | 86 ++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 86 deletions(-) delete mode 100644 .github/workflows/copyPasteDetection.yml create mode 100644 .github/workflows/lintbranch.js diff --git a/.github/workflows/copyPasteDetection.yml b/.github/workflows/copyPasteDetection.yml deleted file mode 100644 index ad78e409fca..00000000000 --- a/.github/workflows/copyPasteDetection.yml +++ /dev/null @@ -1,86 +0,0 @@ -# # github actions: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-nodejs -# # setup-node: https://github.com/actions/setup-node - -# name: Copy-Paste Detection - -# on: -# pull_request: -# branches: [master, feature/*, staging] - -# jobs: -# jscpd: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# node-version: [18.x] -# env: -# NODE_OPTIONS: '--max-old-space-size=8192' - -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 - -# - name: Use Node.js ${{ matrix.node-version }} -# uses: actions/setup-node@v4 -# with: -# node-version: ${{ matrix.node-version }} - -# - name: Fetch fork upstream -# run: | -# git remote add forkUpstream https://github.com/${{ github.event.pull_request.head.repo.full_name }} # URL of the fork -# git fetch forkUpstream # Fetch fork - -# - name: Determine base and target branches for comparison. -# run: | -# echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV -# echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV -# - run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt -# - run: | -# npm install -g jscpd - -# - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json" - -# - if: always() -# uses: actions/upload-artifact@v4 -# with: -# name: unfiltered-jscpd-report -# path: ./jscpd-report.json - -# - name: Filter jscpd report for changed files -# run: | -# if [ ! -f ./jscpd-report.json ]; then -# echo "jscpd-report.json not found" -# exit 1 -# fi -# echo "Filtering jscpd report for changed files..." -# CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt) -# echo "Changed files: $CHANGED_FILES" -# jq --argjson changed_files "$CHANGED_FILES" ' -# .duplicates | map(select( -# (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or -# (.secondFile?.name as $sname | $changed_files | any(. == $sname)) -# )) -# ' ./jscpd-report.json > filtered-jscpd-report.json -# cat filtered-jscpd-report.json - -# - name: Check for duplicates -# run: | -# if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then -# echo "filtered_report_exists=true" >> $GITHUB_ENV -# else -# echo "filtered_report_exists=false" >> $GITHUB_ENV -# fi -# - name: upload filtered report (if applicable) -# if: env.filtered_report_exists == 'true' -# uses: actions/upload-artifact@v4 -# with: -# name: filtered-jscpd-report -# path: ./filtered-jscpd-report.json - -# - name: Fail and log found duplicates. -# if: env.filtered_report_exists == 'true' -# run: | -# cat ./filtered-jscpd-report.json -# echo "Duplications found, failing the check." -# exit 1 diff --git a/.github/workflows/lintbranch.js b/.github/workflows/lintbranch.js new file mode 100644 index 00000000000..05fc677dac5 --- /dev/null +++ b/.github/workflows/lintbranch.js @@ -0,0 +1,67 @@ +// Check that branch name conforms to GitHub naming convention: +// https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags + +// To run self-tests, +// node lintbranch.js test +// TODO: deduplicate code from lintbranch.js and lintcommit.js. + +function isValid(branchName) { + const branchNameRegex = /^[a-zA-Z][a-zA-Z0-9._/-]*$/ + + return branchNameRegex.test(branchName) +} + +function run(branchName) { + if (isValid(branchName)) { + console.log(`Branch name "${branchName}" is valid.`) + process.exit(0) + } else { + const helpUrl = + 'https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags' + console.log(`Branch name "${branchName}" is invalid see ${helpUrl} for more information.`) + process.exit(1) + } +} + +function _test() { + const tests = { + 'feature/branch-name': true, + feature_123: true, + 'my-branch': true, + '123invalid-start': false, + '!invalid@start': false, + '': false, + 'another/valid-name134': true, + 'feature/123";id;{echo,Y2F0IC9ldGMvcGFzc3dk}|{base64,-d}|{bash,-i};#': false, + } + + let passed = 0 + let failed = 0 + + for (const [branchName, expected] of Object.entries(tests)) { + const result = isValid(branchName) + if (result === expected) { + console.log(`✅ Test passed for "${branchName}"`) + passed++ + } else { + console.log(`❌ Test failed for "${branchName}" (expected "${expected}", got "${result}")`) + failed++ + } + } + + console.log(`\n${passed} tests passed, ${failed} tests failed`) +} + +function main() { + const mode = process.argv[2] + + if (mode === 'test') { + _test() + } else if (mode === 'run') { + run(process.argv[3]) + } else { + throw new Error(`Unknown mode: ${mode}`) + } +} + +main() diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7a8f5c4323e..d42b6ef76ee 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -32,6 +32,11 @@ jobs: - uses: actions/setup-node@v4 with: node-version: '20' + - name: Check Branch title + env: + BRANCH_NAME: ${{ github.head_ref }} + run: | + node "$GITHUB_WORKSPACE/.github/workflows/lintbranch.js" run "$BRANCH_NAME" - name: Check PR title run: | node "$GITHUB_WORKSPACE/.github/workflows/lintcommit.js" @@ -55,6 +60,87 @@ jobs: - run: npm run testCompile - run: npm run lint + jscpd: + needs: lint-commits + if: ${{ github.event_name == 'pull_request'}} + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [18.x] + env: + NODE_OPTIONS: '--max-old-space-size=8192' + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Fetch fork upstream + env: + REPO_NAME: ${{ github.event.pull_request.head.repo.full_name }} + run: | + git remote add forkUpstream https://github.com/$REPO_NAME # URL of the fork + git fetch forkUpstream # Fetch fork + + - name: Compute git diff + env: + CURRENT_BRANCH: ${{ github.head_ref }} + TARGET_BRANCH: ${{ github.event.pull_request.base.ref }} + run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt + + - run: npm install -g jscpd + + - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json" + + - if: always() + uses: actions/upload-artifact@v4 + with: + name: unfiltered-jscpd-report + path: ./jscpd-report.json + + - name: Filter jscpd report for changed files + run: | + if [ ! -f ./jscpd-report.json ]; then + echo "jscpd-report.json not found" + exit 1 + fi + echo "Filtering jscpd report for changed files..." + CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt) + echo "Changed files: $CHANGED_FILES" + jq --argjson changed_files "$CHANGED_FILES" ' + .duplicates | map(select( + (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or + (.secondFile?.name as $sname | $changed_files | any(. == $sname)) + )) + ' ./jscpd-report.json > filtered-jscpd-report.json + cat filtered-jscpd-report.json + + - name: Check for duplicates + run: | + if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then + echo "filtered_report_exists=true" >> $GITHUB_ENV + else + echo "filtered_report_exists=false" >> $GITHUB_ENV + fi + - name: upload filtered report (if applicable) + if: env.filtered_report_exists == 'true' + uses: actions/upload-artifact@v4 + with: + name: filtered-jscpd-report + path: ./filtered-jscpd-report.json + + - name: Fail and log found duplicates. + if: env.filtered_report_exists == 'true' + run: | + cat ./filtered-jscpd-report.json + echo "Duplications found, failing the check." + exit 1 + macos: needs: lint-commits name: test macOS From 7cefa6740182b21f55ef6e3811bdfd17026019bf Mon Sep 17 00:00:00 2001 From: Vlad <44401081+witness-me@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:26:31 -0800 Subject: [PATCH 043/202] test(stepfunctions): failing integration test after ASL update #6188 ## Problem Integration test for SFN was broken after updating amazon-states-language-service package to 1.13.0 ([relevant PR](https://github.com/aws/aws-toolkit-vscode/pull/6139)) ## Solution Updating integration test to account for the new `QueryLanguage` variable introduced in the new version of the package --- packages/core/src/testInteg/stepFunctions/init.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/testInteg/stepFunctions/init.test.ts b/packages/core/src/testInteg/stepFunctions/init.test.ts index a3b5ca5623f..894fcedb35a 100644 --- a/packages/core/src/testInteg/stepFunctions/init.test.ts +++ b/packages/core/src/testInteg/stepFunctions/init.test.ts @@ -35,7 +35,7 @@ describe('stepFunctions ASL LSP', async function () { )) as vscode.CompletionList assert.deepStrictEqual( result.items.map((item) => item.label), - ['Comment', 'StartAt', 'States', 'TimeoutSeconds', 'Version'] + ['Comment', 'QueryLanguage', 'StartAt', 'States', 'TimeoutSeconds', 'Version'] ) }) }) From 73d6dd694d9c838a42eb14512ee3a742034d2753 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:30:12 -0500 Subject: [PATCH 044/202] build(ci): only validate branch name on pull request (#6190) ## Problem It appears that on `push` events the `head_ref` is an empty string, which is not a valid branch name. ## Solution - Only validate branch names on pull_request events, and use event info since its more consistent. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/workflows/node.js.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index d42b6ef76ee..a7541f39b9c 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -32,9 +32,10 @@ jobs: - uses: actions/setup-node@v4 with: node-version: '20' - - name: Check Branch title + - name: Validate Branch name + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref != ''}} env: - BRANCH_NAME: ${{ github.head_ref }} + BRANCH_NAME: ${{ github.event.pull_request.head.ref }} run: | node "$GITHUB_WORKSPACE/.github/workflows/lintbranch.js" run "$BRANCH_NAME" - name: Check PR title From b80529eaa65b17a58da9949d8b4607f0be033b8a Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:15:36 -0800 Subject: [PATCH 045/202] test(amazonq): more tests for /transform #6183 --- .../test/e2e/amazonq/framework/messenger.ts | 12 +- .../test/e2e/amazonq/transformByQ.test.ts | 347 ++++++++++++++++++ .../chat/controller/controller.ts | 2 +- packages/core/src/amazonqGumby/index.ts | 3 + packages/core/src/auth/utils.ts | 14 +- .../commands/startTransformByQ.ts | 8 +- .../src/codewhisperer/models/constants.ts | 4 + .../transformByQ/transformApiHandler.ts | 14 +- .../commands/transformByQ.test.ts | 46 ++- .../amazonQTransform}/transformByQ.test.ts | 24 +- 10 files changed, 434 insertions(+), 40 deletions(-) create mode 100644 packages/amazonq/test/e2e/amazonq/transformByQ.test.ts rename packages/core/src/{testE2E/amazonqGumby => testInteg/amazonQTransform}/transformByQ.test.ts (77%) diff --git a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts index 353bd3b4a9c..c9953d6dd41 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts @@ -59,6 +59,14 @@ export class Messenger { this.mynahUIProps.onFollowUpClicked(this.tabID, lastChatItem?.messageId ?? '', option[0]) } + clickCustomFormButton(action: { id: string; text?: string; formItemValues?: Record }) { + if (!this.mynahUIProps.onCustomFormAction) { + assert.fail('onCustomFormAction must be defined to use it in the tests') + } + + this.mynahUIProps.onCustomFormAction(this.tabID, action) + } + clickFileActionButton(filePath: string, actionName: string) { if (!this.mynahUIProps.onFileActionClick) { assert.fail('onFileActionClick must be defined to use it in the tests') @@ -173,7 +181,9 @@ export class Messenger { // Do another check just in case the waitUntil time'd out if (!event()) { - assert.fail(`Event has not finished loading in: ${this.waitTimeoutInMs} ms`) + assert.fail( + `Event has not finished loading in: ${waitOverrides ? waitOverrides.waitTimeoutInMs : this.waitTimeoutInMs} ms` + ) } } diff --git a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts new file mode 100644 index 00000000000..8d7543211ba --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts @@ -0,0 +1,347 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { qTestingFramework } from './framework/framework' +import sinon from 'sinon' +import { Messenger } from './framework/messenger' +import { JDKVersion, TransformationType, transformByQState } from 'aws-core-vscode/codewhisperer' +import { GumbyController, startTransformByQ, TabsStorage } from 'aws-core-vscode/amazonqGumby' +import { using, registerAuthHook, TestFolder } from 'aws-core-vscode/test' +import { loginToIdC } from './utils/setup' +import { fs } from 'aws-core-vscode/shared' +import path from 'path' + +describe('Amazon Q Code Transformation', function () { + let framework: qTestingFramework + let tab: Messenger + + before(async function () { + await using(registerAuthHook('amazonq-test-account'), async () => { + await loginToIdC() + }) + }) + + beforeEach(() => { + registerAuthHook('amazonq-test-account') + framework = new qTestingFramework('gumby', true, []) + tab = framework.createTab() + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + describe('Quick action availability', () => { + it('Can invoke /transform when QCT is enabled', async () => { + const command = tab.findCommand('/transform') + if (!command) { + assert.fail('Could not find command') + } + + if (command.length > 1) { + assert.fail('Found too many commands with the name /transform') + } + }) + + it('CANNOT invoke /transform when QCT is NOT enabled', () => { + framework.dispose() + framework = new qTestingFramework('gumby', false, []) + const tab = framework.createTab() + const command = tab.findCommand('/transform') + if (command.length > 0) { + assert.fail('Found command when it should not have been found') + } + }) + }) + + describe('Starting a transformation from chat', () => { + it('Can click through all user input forms for a Java upgrade', async () => { + sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([]) + sinon.stub(GumbyController.prototype, 'validateLanguageUpgradeProjects' as keyof GumbyController).resolves([ + { + name: 'qct-sample-java-8-app-main', + path: '/Users/alias/Desktop/qct-sample-java-8-app-main', + JDKVersion: JDKVersion.JDK8, + }, + ]) + + tab.addChatMessage({ command: '/transform' }) + + // wait for /transform to respond with some intro messages and the first user input form + await tab.waitForEvent(() => tab.getChatItems().length > 3, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const projectForm = tab.getChatItems().pop() + assert.strictEqual(projectForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformLanguageUpgradeProjectForm') + + const projectFormItemValues = { + GumbyTransformLanguageUpgradeProjectForm: '/Users/alias/Desktop/qct-sample-java-8-app-main', + GumbyTransformJdkFromForm: '8', + GumbyTransformJdkToForm: '17', + } + const projectFormValues: Record = { ...projectFormItemValues } + // TODO: instead of stubbing, can we create a tab in qTestingFramework with tabType passed in? + // Mynah-UI updates tab type like this: this.tabsStorage.updateTabTypeFromUnknown(affectedTabId, 'gumby') + sinon + .stub(TabsStorage.prototype, 'getTab') + .returns({ id: tab.tabID, status: 'free', type: 'gumby', isSelected: true }) + tab.clickCustomFormButton({ + id: 'gumbyLanguageUpgradeTransformFormConfirm', + text: 'Confirm', + formItemValues: projectFormValues, + }) + + // 3 additional chat messages (including message with 2nd form) get sent after 1st form submitted; wait for all of them + await tab.waitForEvent(() => tab.getChatItems().length > 6, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const skipTestsForm = tab.getChatItems().pop() + assert.strictEqual(skipTestsForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformSkipTestsForm') + + const skipTestsFormItemValues = { + GumbyTransformSkipTestsForm: 'Run unit tests', + } + const skipTestsFormValues: Record = { ...skipTestsFormItemValues } + tab.clickCustomFormButton({ + id: 'gumbyTransformSkipTestsFormConfirm', + text: 'Confirm', + formItemValues: skipTestsFormValues, + }) + + // 3 additional chat messages (including message with 3rd form) get sent after 2nd form submitted; wait for all of them + await tab.waitForEvent(() => tab.getChatItems().length > 9, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const multipleDiffsForm = tab.getChatItems().pop() + assert.strictEqual( + multipleDiffsForm?.formItems?.[0]?.id ?? undefined, + 'GumbyTransformOneOrMultipleDiffsForm' + ) + + const oneOrMultipleDiffsFormItemValues = { + GumbyTransformOneOrMultipleDiffsForm: 'One diff', + } + const oneOrMultipleDiffsFormValues: Record = { ...oneOrMultipleDiffsFormItemValues } + tab.clickCustomFormButton({ + id: 'gumbyTransformOneOrMultipleDiffsFormConfirm', + text: 'Confirm', + formItemValues: oneOrMultipleDiffsFormValues, + }) + + // 2 additional chat messages (including message with 4th form) get sent after 3rd form submitted; wait for both of them + await tab.waitForEvent(() => tab.getChatItems().length > 11, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const jdkPathPrompt = tab.getChatItems().pop() + assert.strictEqual(jdkPathPrompt?.body?.includes('Enter the path to JDK'), true) + + // 2 additional chat messages get sent after 4th form submitted; wait for both of them + tab.addChatMessage({ prompt: '/dummy/path/to/jdk8' }) + await tab.waitForEvent(() => tab.getChatItems().length > 13, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const jdkPathResponse = tab.getChatItems().pop() + // this 'Sorry' message is OK - just making sure that the UI components are working correctly + assert.strictEqual(jdkPathResponse?.body?.includes("Sorry, I couldn't locate your Java installation"), true) + }) + + it('Can provide metadata file for a SQL conversion', async () => { + sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([ + { + name: 'OracleExample', + path: '/Users/alias/Desktop/OracleExample', + JDKVersion: JDKVersion.JDK17, + }, + ]) + sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([]) + sinon.stub(GumbyController.prototype, 'validateSQLConversionProjects' as keyof GumbyController).resolves([ + { + name: 'OracleExample', + path: '/Users/alias/Desktop/OracleExample', + JDKVersion: JDKVersion.JDK17, + }, + ]) + + tab.addChatMessage({ command: '/transform' }) + + // wait for /transform to respond with some intro messages and the first user input message + await tab.waitForEvent(() => tab.getChatItems().length > 3, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const selectMetadataMessage = tab.getChatItems().pop() + assert.strictEqual( + selectMetadataMessage?.body?.includes('I can convert the embedded SQL') ?? undefined, + true + ) + + // verify that we processed the metadata file + const processMetadataFileStub = sinon.stub( + GumbyController.prototype, + 'processMetadataFile' as keyof GumbyController + ) + tab.clickCustomFormButton({ + id: 'gumbySQLConversionMetadataTransformFormConfirm', + text: 'Select metadata file', + }) + sinon.assert.calledOnce(processMetadataFileStub) + }) + + it('Can choose "language upgrade" when eligible for a Java upgrade AND SQL conversion', async () => { + sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([ + { + name: 'OracleExample', + path: '/Users/alias/Desktop/OracleExample', + JDKVersion: JDKVersion.JDK17, + }, + ]) + sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([ + { + name: 'qct-sample-java-8-app-main', + path: '/Users/alias/Desktop/qct-sample-java-8-app-main', + JDKVersion: JDKVersion.JDK8, + }, + ]) + + tab.addChatMessage({ command: '/transform' }) + + // wait for /transform to respond with some intro messages and a prompt asking user what they want to do + await tab.waitForEvent(() => tab.getChatItems().length > 2, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const prompt = tab.getChatItems().pop() + assert.strictEqual( + prompt?.body?.includes('You can enter "language upgrade" or "sql conversion"') ?? undefined, + true + ) + + // 3 additional chat messages get sent after user enters a choice; wait for all of them + tab.addChatMessage({ prompt: 'language upgrade' }) + await tab.waitForEvent(() => tab.getChatItems().length > 5, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const projectForm = tab.getChatItems().pop() + assert.strictEqual(projectForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformLanguageUpgradeProjectForm') + }) + + it('Can choose "sql conversion" when eligible for a Java upgrade AND SQL conversion', async () => { + sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([ + { + name: 'OracleExample', + path: '/Users/alias/Desktop/OracleExample', + JDKVersion: JDKVersion.JDK17, + }, + ]) + sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([ + { + name: 'qct-sample-java-8-app-main', + path: '/Users/alias/Desktop/qct-sample-java-8-app-main', + JDKVersion: JDKVersion.JDK8, + }, + ]) + + tab.addChatMessage({ command: '/transform' }) + + // wait for /transform to respond with some intro messages and a prompt asking user what they want to do + await tab.waitForEvent(() => tab.getChatItems().length > 2, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const prompt = tab.getChatItems().pop() + assert.strictEqual( + prompt?.body?.includes('You can enter "language upgrade" or "sql conversion"') ?? undefined, + true + ) + + // 3 additional chat messages get sent after user enters a choice; wait for all of them + tab.addChatMessage({ prompt: 'sql conversion' }) + await tab.waitForEvent(() => tab.getChatItems().length > 5, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + const selectMetadataMessage = tab.getChatItems().pop() + assert.strictEqual( + selectMetadataMessage?.body?.includes('I can convert the embedded SQL') ?? undefined, + true + ) + }) + }) + + // TODO: enable when we no longer get throttled on CreateUploadUrl and other APIs + describe.skip('Running a Java upgrade from start to finish', async function () { + let tempDir = '' + let tempFileName = '' + let tempFilePath = '' + + const javaFileContents = `public class MyApp { + public static void main(String[] args) { + Integer temp = new Integer("1234"); + } + }` + + const pomXmlContents = ` + + 4.0.0 + + com.example + basic-java-app + 1.0-SNAPSHOT + + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + + ` + + before(async function () { + tempDir = path.join((await TestFolder.create()).path, 'qct-java-upgrade-test') + tempFileName = 'MyApp.java' + tempFilePath = path.join(tempDir, tempFileName) + await fs.writeFile(tempFilePath, javaFileContents) + tempFileName = 'pom.xml' + tempFilePath = path.join(tempDir, tempFileName) + await fs.writeFile(tempFilePath, pomXmlContents) + }) + + after(async function () { + await fs.delete(tempDir, { recursive: true }) + }) + + it('WHEN transforming a Java 8 project E2E THEN job is successful', async function () { + transformByQState.setTransformationType(TransformationType.LANGUAGE_UPGRADE) + await startTransformByQ.setMaven() + await startTransformByQ.processLanguageUpgradeTransformFormInput(tempDir, JDKVersion.JDK8, JDKVersion.JDK17) + await startTransformByQ.startTransformByQ() + assert.strictEqual(transformByQState.getPolledJobStatus(), 'COMPLETED') + }) + }) +}) diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts index cd00481377a..3df09af40a4 100644 --- a/packages/core/src/amazonqGumby/chat/controller/controller.ts +++ b/packages/core/src/amazonqGumby/chat/controller/controller.ts @@ -56,12 +56,12 @@ import { } from '../../../shared/telemetry/telemetry' import { MetadataResult } from '../../../shared/telemetry/telemetryClient' import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState' -import { getAuthType } from '../../../codewhisperer/service/transformByQ/transformApiHandler' import DependencyVersions from '../../models/dependencies' import { getStringHash } from '../../../shared/utilities/textUtilities' import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler' import AdmZip from 'adm-zip' import { AuthError } from '../../../auth/sso/server' +import { getAuthType } from '../../../auth/utils' // These events can be interactions within the chat, // or elsewhere in the IDE diff --git a/packages/core/src/amazonqGumby/index.ts b/packages/core/src/amazonqGumby/index.ts index 50005c984bb..16f64f7734a 100644 --- a/packages/core/src/amazonqGumby/index.ts +++ b/packages/core/src/amazonqGumby/index.ts @@ -6,4 +6,7 @@ export { activate } from './activation' export { default as DependencyVersions } from './models/dependencies' export { default as MessengerUtils } from './chat/controller/messenger/messengerUtils' +export { GumbyController } from './chat/controller/controller' +export { TabsStorage } from '../amazonq/webview/ui/storages/tabsStorage' +export * as startTransformByQ from '../../src/codewhisperer/commands/startTransformByQ' export * from './errors' diff --git a/packages/core/src/auth/utils.ts b/packages/core/src/auth/utils.ts index ea26dc2a3c3..d160ce4b490 100644 --- a/packages/core/src/auth/utils.ts +++ b/packages/core/src/auth/utils.ts @@ -18,7 +18,7 @@ import { formatError, ToolkitError } from '../shared/errors' import { asString } from './providers/credentials' import { TreeNode } from '../shared/treeview/resourceTreeDataProvider' import { createInputBox } from '../shared/ui/inputPrompter' -import { telemetry } from '../shared/telemetry/telemetry' +import { CredentialSourceId, telemetry } from '../shared/telemetry/telemetry' import { createCommonButtons, createExitButton, createHelpButton, createRefreshButton } from '../shared/ui/buttons' import { getIdeProperties, isAmazonQ, isCloud9 } from '../shared/extensionUtilities' import { addScopes, getDependentAuths } from './secondaryAuth' @@ -45,7 +45,7 @@ import { Commands, placeholder } from '../shared/vscode/commands2' import { Auth } from './auth' import { validateIsNewSsoUrl, validateSsoUrlFormat } from './sso/validation' import { getLogger } from '../shared/logger' -import { isValidAmazonQConnection, isValidCodeWhispererCoreConnection } from '../codewhisperer/util/authUtil' +import { AuthUtil, isValidAmazonQConnection, isValidCodeWhispererCoreConnection } from '../codewhisperer/util/authUtil' import { AuthFormId } from '../login/webview/vue/types' import { extensionVersion } from '../shared/vscode/env' import { ExtStartUpSources } from '../shared/telemetry' @@ -798,3 +798,13 @@ export function initializeCredentialsProviderManager() { manager.addProviderFactory(new SharedCredentialsProviderFactory()) manager.addProviders(new Ec2CredentialsProvider(), new EcsCredentialsProvider(), new EnvVarsCredentialsProvider()) } + +export async function getAuthType() { + let authType: CredentialSourceId | undefined = undefined + if (AuthUtil.instance.isEnterpriseSsoInUse() && AuthUtil.instance.isConnectionValid()) { + authType = 'iamIdentityCenter' + } else if (AuthUtil.instance.isBuilderIdInUse() && AuthUtil.instance.isConnectionValid()) { + authType = 'awsId' + } + return authType +} diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts index d8cb2948f1f..e009616ab97 100644 --- a/packages/core/src/codewhisperer/commands/startTransformByQ.ts +++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts @@ -328,7 +328,9 @@ export async function parseBuildFile() { export async function preTransformationUploadCode() { await vscode.commands.executeCommand('aws.amazonq.transformationHub.focus') - void vscode.window.showInformationMessage(CodeWhispererConstants.jobStartedNotification) + void vscode.window.showInformationMessage(CodeWhispererConstants.jobStartedNotification, { + title: CodeWhispererConstants.jobStartedTitle, + }) let uploadId = '' throwIfCancelled() @@ -848,7 +850,9 @@ export async function postTransformationJob() { } if (transformByQState.isSucceeded()) { - void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification(diffMessage)) + void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification(diffMessage), { + title: CodeWhispererConstants.transformationCompletedTitle, + }) } else if (transformByQState.isPartiallySucceeded()) { void vscode.window .showInformationMessage( diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index e2107be2ae4..bd2245fe3da 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -554,6 +554,8 @@ export const noOngoingJobMessage = 'No ongoing job.' export const nothingToShowMessage = 'Nothing to show' +export const jobStartedTitle = 'Transformation started' + export const jobStartedNotification = 'Amazon Q is transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub.' @@ -636,6 +638,8 @@ export const jobCancelledChatMessage = export const jobCancelledNotification = 'You cancelled the transformation.' +export const transformationCompletedTitle = 'Transformation complete' + export const diffMessage = (multipleDiffs: boolean) => { return multipleDiffs ? 'You can review the diffs to see my proposed changes and accept or reject them. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs.' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts index b5f4b15991a..fb90241ff68 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts @@ -34,14 +34,13 @@ import { import { sleep } from '../../../shared/utilities/timeoutUtils' import AdmZip from 'adm-zip' import globals from '../../../shared/extensionGlobals' -import { CredentialSourceId, telemetry } from '../../../shared/telemetry/telemetry' +import { telemetry } from '../../../shared/telemetry/telemetry' import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState' import { calculateTotalLatency } from '../../../amazonqGumby/telemetry/codeTransformTelemetry' import { MetadataResult } from '../../../shared/telemetry/telemetryClient' import request from '../../../shared/request' import { JobStoppedError, ZipExceedsSizeLimitError } from '../../../amazonqGumby/errors' import { writeLogs } from './transformFileHandler' -import { AuthUtil } from '../../util/authUtil' import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient' import { downloadExportResultArchive } from '../../../shared/utilities/download' import { ExportIntent, TransformationDownloadArtifactType } from '@amzn/codewhisperer-streaming' @@ -49,6 +48,7 @@ import fs from '../../../shared/fs/fs' import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession' import { encodeHTML } from '../../../shared/utilities/textUtilities' import { convertToTimeString } from '../../../shared/datetime' +import { getAuthType } from '../../../auth/utils' export function getSha256(buffer: Buffer) { const hasher = crypto.createHash('sha256') @@ -56,16 +56,6 @@ export function getSha256(buffer: Buffer) { return hasher.digest('base64') } -export async function getAuthType() { - let authType: CredentialSourceId | undefined = undefined - if (AuthUtil.instance.isEnterpriseSsoInUse() && AuthUtil.instance.isConnectionValid()) { - authType = 'iamIdentityCenter' - } else if (AuthUtil.instance.isBuilderIdInUse() && AuthUtil.instance.isConnectionValid()) { - authType = 'awsId' - } - return authType -} - export function throwIfCancelled() { if (transformByQState.isCancelled()) { throw new TransformByQStoppedError() diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts index b294d07b586..b6ff86a94cd 100644 --- a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts +++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts @@ -6,10 +6,11 @@ import assert, { fail } from 'assert' import * as vscode from 'vscode' import * as sinon from 'sinon' -import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities' import { DB, transformByQState, TransformByQStoppedError } from '../../../codewhisperer/models/model' import { + finalizeTransformationJob, parseBuildFile, + setMaven, stopTransformByQ, validateSQLMetadataFile, } from '../../../codewhisperer/commands/startTransformByQ' @@ -40,14 +41,14 @@ import { } from '../../../codewhisperer/service/transformByQ/transformProjectValidationHandler' import { TransformationCandidateProject, ZipManifest } from '../../../codewhisperer/models/model' import globals from '../../../shared/extensionGlobals' -import { fs } from '../../../shared' +import { env, fs } from '../../../shared' import { convertDateToTimestamp, convertToTimeString } from '../../../shared/datetime' describe('transformByQ', function () { let tempDir: string beforeEach(async function () { - tempDir = await makeTemporaryToolkitFolder() + tempDir = (await TestFolder.create()).path transformByQState.setToNotStarted() }) @@ -149,6 +150,22 @@ describe('transformByQ', function () { sinon.assert.calledWithExactly(stopJobStub, { transformationJobId: 'dummyId' }) }) + it('WHEN stopTransformByQ called with job that has already terminated THEN stop API not called', async function () { + const stopJobStub = sinon.stub(codeWhisperer.codeWhispererClient, 'codeModernizerStopCodeTransformation') + transformByQState.setToSucceeded() + await stopTransformByQ('abc-123') + sinon.assert.notCalled(stopJobStub) + }) + + it('WHEN finalizeTransformationJob on failed job THEN error thrown and error message fields are set', async function () { + await assert.rejects(async () => { + await finalizeTransformationJob('FAILED') + }) + assert.notStrictEqual(transformByQState.getJobFailureErrorChatMessage(), undefined) + assert.notStrictEqual(transformByQState.getJobFailureErrorNotification(), undefined) + transformByQState.setJobDefaults() // reset error messages to undefined + }) + it('WHEN polling completed job THEN returns status as completed', async function () { const mockJobResponse = { $response: { @@ -208,6 +225,16 @@ describe('transformByQ', function () { assert.deepStrictEqual(actual, expected) }) + it(`WHEN transforming a project with a Windows Maven executable THEN mavenName set correctly`, async function () { + sinon.stub(env, 'isWin').returns(true) + const tempFileName = 'mvnw.cmd' + const tempFilePath = path.join(tempDir, tempFileName) + await toFile('', tempFilePath) + transformByQState.setProjectPath(tempDir) + await setMaven() + assert.strictEqual(transformByQState.getMavenName(), '.\\mvnw.cmd') + }) + it(`WHEN zip created THEN manifest.json contains test-compile custom build command`, async function () { const tempFileName = `testfile-${globals.clock.Date.now()}.zip` transformByQState.setProjectPath(tempDir) @@ -234,6 +261,19 @@ describe('transformByQ', function () { }) }) + it('WHEN zipCode THEN ZIP contains all expected files and no unexpected files', async function () { + const zipFilePath = path.join(tempDir, 'test.zip') + const zip = new AdmZip() + await fs.writeFile(path.join(tempDir, 'pom.xml'), 'dummy pom.xml') + zip.addLocalFile(path.join(tempDir, 'pom.xml')) + zip.addFile('manifest.json', Buffer.from(JSON.stringify({ version: '1.0' }))) + zip.writeZip(zipFilePath) + const zipFiles = new AdmZip(zipFilePath).getEntries() + const zipFileNames = zipFiles.map((file) => file.name) + assert.strictEqual(zipFileNames.length, 2) // expecting only pom.xml and manifest.json + assert.strictEqual(zipFileNames.includes('pom.xml') && zipFileNames.includes('manifest.json'), true) + }) + it(`WHEN zip created THEN dependencies contains no .sha1 or .repositories files`, async function () { const m2Folders = [ 'com/groupid1/artifactid1/version1', diff --git a/packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts b/packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts similarity index 77% rename from packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts rename to packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts index 1b76e1c9c8f..b191997a236 100644 --- a/packages/core/src/testE2E/amazonqGumby/transformByQ.test.ts +++ b/packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts @@ -10,11 +10,10 @@ import * as codeWhisperer from '../../codewhisperer/client/codewhisperer' import assert from 'assert' import { getSha256, uploadArtifactToS3, zipCode } from '../../codewhisperer/service/transformByQ/transformApiHandler' import request from '../../shared/request' -import AdmZip from 'adm-zip' -import { setValidConnection } from '../util/connection' import { transformByQState, ZipManifest } from '../../codewhisperer/models/model' import globals from '../../shared/extensionGlobals' import { fs } from '../../shared' +import { setValidConnection } from '../../testE2E/util/connection' describe('transformByQ', async function () { let tempDir = '' @@ -35,10 +34,6 @@ describe('transformByQ', async function () { await fs.writeFile(tempFilePath, 'sample content for the test file') transformByQState.setProjectPath(tempDir) const zipCodeResult = await zipCode({ - dependenciesFolder: { - path: tempFilePath, - name: tempFileName, - }, projectPath: tempDir, zipManifest: new ZipManifest(), }) @@ -87,7 +82,7 @@ describe('transformByQ', async function () { ) }) - it('WHEN createUploadUrl THEN URL uses HTTPS and sets 60 second expiration', async function () { + it('WHEN createUploadUrl THEN URL uses HTTPS and sets 30 minute expiration', async function () { const buffer = Buffer.from(await fs.readFileBytes(zippedCodePath)) const sha256 = getSha256(buffer) const response = await codeWhisperer.codeWhispererClient.createUploadUrl({ @@ -96,17 +91,8 @@ describe('transformByQ', async function () { uploadIntent: CodeWhispererConstants.uploadIntent, }) const uploadUrl = response.uploadUrl - const usesHttpsAndExpiresAfter60Seconds = uploadUrl.includes('https') && uploadUrl.includes('X-Amz-Expires=60') - assert.strictEqual(usesHttpsAndExpiresAfter60Seconds, true) - }) - - it('WHEN zipCode THEN ZIP contains all expected files and no unexpected files', async function () { - const zipFiles = new AdmZip(zippedCodePath).getEntries() - const zipFileNames: string[] = [] - zipFiles.forEach((file) => { - zipFileNames.push(file.name) - }) - assert.strictEqual(zipFileNames.length, 2) // expecting only a dummy txt file and a manifest.json - assert.strictEqual(zipFileNames.includes(tempFileName) && zipFileNames.includes('manifest.json'), true) + const usesHttpsAndExpiresAfter30Minutes = + uploadUrl.includes('https') && uploadUrl.includes('X-Amz-Expires=1800') + assert.strictEqual(usesHttpsAndExpiresAfter30Minutes, true) }) }) From 9ab2df055f694476da7e87d30c034b0cea55380f Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 9 Dec 2024 14:54:21 -0800 Subject: [PATCH 046/202] lint --- .../cloudWatchLogs/commands/tailLogGroup.ts | 22 ++++++++--------- .../document/liveTailCodeLensProvider.ts | 2 +- .../document/liveTailDocumentProvider.ts | 2 +- .../registry/liveTailSession.ts | 6 ++--- .../commands/tailLogGroup.test.ts | 24 +++++++++---------- .../registry/liveTailSession.test.ts | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 33cda709f25..4aa1feb272a 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -31,8 +31,8 @@ export async function tailLogGroup( throw new CancellationError('user') } if (wizardResponse.logStreamFilter.type === 'menu' || wizardResponse.logStreamFilter.type === undefined) { - //logstream filter wizard uses type to determine which submenu to show. 'menu' is set when no type is selected - //and to show the 'menu' of selecting a type. This should not be reachable due to the picker logic, but validating in case. + // logstream filter wizard uses type to determine which submenu to show. 'menu' is set when no type is selected + // and to show the 'menu' of selecting a type. This should not be reachable due to the picker logic, but validating in case. throw new ToolkitError(`Invalid Log Stream filter type: ${wizardResponse.logStreamFilter.type}`) } const awsCredentials = await globals.awsContext.getCredentials() @@ -134,8 +134,8 @@ async function handleSessionStream( formatLogEvent(logEvent) ) if (formattedLogEvents.length !== 0) { - //Determine should scroll before adding new lines to doc because adding large - //amount of new lines can push bottom of file out of view before scrolling. + // Determine should scroll before adding new lines to doc because adding large + // amount of new lines can push bottom of file out of view before scrolling. const editorsToScroll = getTextEditorsToScroll(document) await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) editorsToScroll.forEach(scrollTextEditorToBottom) @@ -146,13 +146,13 @@ async function handleSessionStream( } } catch (e) { if (session.isAborted) { - //Expected case. User action cancelled stream (CodeLens, Close Editor, etc.). - //AbortSignal interrupts the LiveTail stream, causing error to be thrown here. - //Can assume that stopLiveTailSession() has already been called - AbortSignal is only - //exposed through that method. + // Expected case. User action cancelled stream (CodeLens, Close Editor, etc.). + // AbortSignal interrupts the LiveTail stream, causing error to be thrown here. + // Can assume that stopLiveTailSession() has already been called - AbortSignal is only + // exposed through that method. getLogger().info(`LiveTail session stopped: ${uriToKey(session.uri)}`) } else { - //Unexpected exception. + // Unexpected exception. session.stopLiveTailSession() throw ToolkitError.chain( e, @@ -178,8 +178,8 @@ function formatLogEvent(logEvent: LiveTailSessionLogEvent): string { return line } -//Auto scroll visible LiveTail session editors if the end-of-file is in view. -//This allows for newly added log events to stay in view. +// Auto scroll visible LiveTail session editors if the end-of-file is in view. +// This allows for newly added log events to stay in view. function getTextEditorsToScroll(document: vscode.TextDocument): vscode.TextEditor[] { return vscode.window.visibleTextEditors.filter((editor) => { if (editor.document !== document) { diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts index 236cd6cad05..dde0ddbbe28 100644 --- a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts @@ -19,7 +19,7 @@ export class LiveTailCodeLensProvider implements vscode.CodeLensProvider { token: vscode.CancellationToken ): vscode.ProviderResult { const uri = document.uri - //if registry does not contain session, it is assumed to have been stopped, thus, hide lenses. + // if registry does not contain session, it is assumed to have been stopped, thus, hide lenses. if (uri.scheme !== cloudwatchLogsLiveTailScheme || !this.registry.has(uriToKey(uri))) { return [] } diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts index fe909579ae3..7d662890dcf 100644 --- a/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts +++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode' export class LiveTailDocumentProvider implements vscode.TextDocumentContentProvider { provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult { - //Content will be written to the document via handling a LiveTail response stream in the TailLogGroup command. + // Content will be written to the document via handling a LiveTail response stream in the TailLogGroup command. return '' } } diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts index 5a61bd13268..87eba4d4079 100644 --- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts +++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts @@ -42,7 +42,7 @@ export class LiveTailSession { private _eventRate: number private _isSampled: boolean - //While session is running, used to update the StatusBar each half second. + // While session is running, used to update the StatusBar each half second. private statusBarUpdateTimer: NodeJS.Timer | undefined static settings = new CloudWatchLogsSettings(Settings.instance) @@ -110,11 +110,11 @@ export class LiveTailSession { } public getLiveTailSessionDuration(): number { - //Never started + // Never started if (this.startTime === undefined) { return 0 } - //Currently running + // Currently running if (this.endTime === undefined) { return globals.clock.Date.now() - this.startTime } diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 2bae9c98d85..f2b085b2f2c 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -56,10 +56,10 @@ describe('TailLogGroup', function () { getSessionUpdateFrame(false, `${testMessage}-2`, startTimestamp + 2000), getSessionUpdateFrame(false, `${testMessage}-3`, startTimestamp + 3000), ] - //Returns the configured update frames and then indefinitely blocks. - //This keeps the stream 'open', simulating an open network stream waiting for new events. - //If the stream were to close, the event listeners in the TailLogGroup command would dispose, - //breaking the 'closes tab closes session' assertions this test makes. + // Returns the configured update frames and then indefinitely blocks. + // This keeps the stream 'open', simulating an open network stream waiting for new events. + // If the stream were to close, the event listeners in the TailLogGroup command would dispose, + // breaking the 'closes tab closes session' assertions this test makes. async function* generator(): AsyncIterable { for (const frame of updateFrames) { yield frame @@ -78,21 +78,21 @@ describe('TailLogGroup', function () { wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () { return getTestWizardResponse() }) - //Set maxLines to 1. + // Set maxLines to 1. cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => { return 1 }) - //The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve. - //Run it in the background and use waitUntil to poll its state. + // The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve. + // Run it in the background and use waitUntil to poll its state. void tailLogGroup(registry, testSource, codeLensProvider, { groupName: testLogGroup, regionName: testRegion, }) await waitUntil(async () => registry.size !== 0, { interval: 100, timeout: 1000 }) - //registry is asserted to have only one entry, so this is assumed to be the session that was - //started in this test. + // registry is asserted to have only one entry, so this is assumed to be the session that was + // started in this test. let sessionUri: vscode.Uri | undefined registry.forEach((session) => (sessionUri = session.uri)) if (sessionUri === undefined) { @@ -104,8 +104,8 @@ describe('TailLogGroup', function () { assert.strictEqual(startLiveTailSessionSpy.calledOnce, true) assert.strictEqual(registry.size, 1) - //Validate writing to the document. - //MaxLines is set to 1, and "testMessage3" is the last event in the stream, its contents should be the only thing in the doc. + // Validate writing to the document. + // MaxLines is set to 1, and "testMessage3" is the last event in the stream, its contents should be the only thing in the doc. const window = getTestWindow() const document = window.activeTextEditor?.document assert.strictEqual(sessionUri.toString(), document?.uri.toString()) @@ -115,7 +115,7 @@ describe('TailLogGroup', function () { ) assert.strictEqual(doesDocumentContainExpectedContent, true) - //Test that closing all tabs the session's document is open in will cause the session to close + // Test that closing all tabs the session's document is open in will cause the session to close let tabs: vscode.Tab[] = [] window.tabGroups.all.forEach((tabGroup) => { tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!)) diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts index 924aa437989..514114750b4 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts @@ -117,7 +117,7 @@ describe('LiveTailSession', async function () { assert.strictEqual(session.isAborted, true) assert.strictEqual(clock.countTimers(), 0) - //Session is stopped; ticking the clock forward should not change the session duration + // Session is stopped; ticking the clock forward should not change the session duration clock.tick(1000) assert.strictEqual(session.getLiveTailSessionDuration(), 1000) }) From 401f24eb5026f9eb479a9f451bcb72333cba0922 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 9 Dec 2024 15:09:21 -0800 Subject: [PATCH 047/202] changelog --- packages/amazonq/.changes/1.32.0.json | 4 ++-- packages/amazonq/CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/amazonq/.changes/1.32.0.json b/packages/amazonq/.changes/1.32.0.json index 5d5a61c848a..cfa6f4796bf 100644 --- a/packages/amazonq/.changes/1.32.0.json +++ b/packages/amazonq/.changes/1.32.0.json @@ -20,7 +20,7 @@ }, { "type": "Feature", - "description": "Enable Free Tier Chat for IAM users" + "description": "Amazon SageMaker Studio: Enable Free Tier Chat for IAM users" } ] -} \ No newline at end of file +} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 4d40556f351..3aed6288cc8 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -58,7 +58,7 @@ - **Bug Fix** Use Sagemaker environment IAM Credentials for Code Completion when they're available - **Bug Fix** Inline: Code completion not working for Sagemaker Pro Tier users. - **Bug Fix** Disable /transform and /dev commands for sagemaker users as they're not supported -- **Feature** Enable Free Tier Chat for IAM users +- **Feature** Amazon SageMaker Studio: Enable Free Tier Chat for IAM users ## 1.31.0 2024-10-29 From 4018c965f36489889b413ee1d292f9d2a9a1e084 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 10 Dec 2024 16:36:06 +0000 Subject: [PATCH 048/202] Release 1.40.0 --- package-lock.json | 4 +- packages/amazonq/.changes/1.40.0.json | 66 +++++++++++++++++++ ...-0c35b577-da17-4132-a0b7-e0d630e73cb9.json | 4 -- ...-0e68107f-cd6c-488d-a457-d765b37a49c3.json | 4 -- ...-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json | 4 -- ...-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json | 4 -- ...-56306583-37cf-4364-ba41-ac69d0ffdf44.json | 4 -- ...-570a8c06-4da6-4585-b589-be1fba2ce20f.json | 4 -- ...-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json | 4 -- ...-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json | 4 -- ...-80f16b7a-440d-4e06-89ad-1454c58ff28f.json | 4 -- ...-bc24902f-4602-491e-9ad8-959eea73d20b.json | 4 -- ...-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json | 4 -- ...-3e91ab38-b708-4fcc-888e-7a532c210a69.json | 4 -- ...-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json | 4 -- ...-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json | 4 -- ...-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json | 4 -- packages/amazonq/CHANGELOG.md | 18 +++++ packages/amazonq/package.json | 2 +- 19 files changed, 87 insertions(+), 63 deletions(-) create mode 100644 packages/amazonq/.changes/1.40.0.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json diff --git a/package-lock.json b/package-lock.json index 7025c981bec..2ff282707ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -20222,7 +20222,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.40.0-SNAPSHOT", + "version": "1.40.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/.changes/1.40.0.json b/packages/amazonq/.changes/1.40.0.json new file mode 100644 index 00000000000..ea251bdd8fe --- /dev/null +++ b/packages/amazonq/.changes/1.40.0.json @@ -0,0 +1,66 @@ +{ + "date": "2024-12-10", + "version": "1.40.0", + "entries": [ + { + "type": "Bug Fix", + "description": "Improved LLM code review for file review." + }, + { + "type": "Bug Fix", + "description": "@workspace is missing from the welcome to q chat tab" + }, + { + "type": "Bug Fix", + "description": "Fix chat syntax highlighting when using several different themes" + }, + { + "type": "Bug Fix", + "description": "Amazon Q /doc: progress bar persists after cancelling README creation" + }, + { + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names" + }, + { + "type": "Bug Fix", + "description": "Amazon Q /doc: Prompt user to choose a folder in chat" + }, + { + "type": "Bug Fix", + "description": "Amazon Q /dev not adding Dockerfiles in nested folders" + }, + { + "type": "Bug Fix", + "description": "Improved Code Fix generation for code review issues" + }, + { + "type": "Bug Fix", + "description": "Fix the quick start buttons on the explore page to show amazon q colours on hover" + }, + { + "type": "Feature", + "description": "Q feature dev: recognize .bms, .pli code files" + }, + { + "type": "Feature", + "description": "Amazon Q Code Transformation: show job ID in Transformation Hub" + }, + { + "type": "Feature", + "description": "UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours" + }, + { + "type": "Feature", + "description": "Add acknowledgement button for amazon q chat disclaimer" + }, + { + "type": "Feature", + "description": "Navigate through prompt history by using the up/down arrows" + }, + { + "type": "Feature", + "description": "Amazon Q: Simplify log channel" + } + ] +} \ No newline at end of file diff --git a/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json b/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json deleted file mode 100644 index c7d24855d6b..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-0c35b577-da17-4132-a0b7-e0d630e73cb9.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Improved LLM code review for file review." -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json b/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json deleted file mode 100644 index 18b94f4225c..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-0e68107f-cd6c-488d-a457-d765b37a49c3.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "@workspace is missing from the welcome to q chat tab" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json b/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json deleted file mode 100644 index 02b38b02eb5..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-17772b9d-7f10-4e16-8b53-0561d6b08f4a.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Fix chat syntax highlighting when using several different themes" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json b/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json deleted file mode 100644 index 85b6ac5c070..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-357cef5f-a2e7-43c4-b4ca-0e89bc8fccd7.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /doc: progress bar persists after cancelling README creation" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json b/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json deleted file mode 100644 index bbcdd4e40a8..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-56306583-37cf-4364-ba41-ac69d0ffdf44.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json b/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json deleted file mode 100644 index fe0706a5bd8..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-570a8c06-4da6-4585-b589-be1fba2ce20f.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /doc: Prompt user to choose a folder in chat" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json b/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json deleted file mode 100644 index cdddf910441..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /dev not adding Dockerfiles in nested folders" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json b/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json deleted file mode 100644 index b79066d4070..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-75ff3f7a-3cfb-491c-9557-ce8c04f54ccc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Improved Code Fix generation for code review issues" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json b/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json deleted file mode 100644 index 0200cbbad42..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-80f16b7a-440d-4e06-89ad-1454c58ff28f.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Q feature dev: recognize .bms, .pli code files" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json b/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json deleted file mode 100644 index e540866201e..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-bc24902f-4602-491e-9ad8-959eea73d20b.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Fix the quick start buttons on the explore page to show amazon q colours on hover" -} diff --git a/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json b/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json deleted file mode 100644 index 7aaf8b7077f..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-2e0fcda2-695f-4646-8ccd-20e9e56647a6.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Amazon Q Code Transformation: show job ID in Transformation Hub" -} diff --git a/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json b/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json deleted file mode 100644 index 5e592eca298..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-3e91ab38-b708-4fcc-888e-7a532c210a69.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours" -} diff --git a/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json b/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json deleted file mode 100644 index 20664e7f542..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-b92f1e8b-78a0-46a6-ba9b-2300c884fcbc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Add acknowledgement button for amazon q chat disclaimer" -} diff --git a/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json b/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json deleted file mode 100644 index 33bc4142322..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-c0fdc8fe-e0e5-422c-a76a-1d7461460e81.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Navigate through prompt history by using the up/down arrows" -} diff --git a/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json b/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json deleted file mode 100644 index c7df441d68b..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-fd23658e-ecc3-4d17-8944-240cbe24a7cc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Amazon Q: Simplify log channel" -} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 3aed6288cc8..12580b159e3 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,21 @@ +## 1.40.0 2024-12-10 + +- **Bug Fix** Improved LLM code review for file review. +- **Bug Fix** @workspace is missing from the welcome to q chat tab +- **Bug Fix** Fix chat syntax highlighting when using several different themes +- **Bug Fix** Amazon Q /doc: progress bar persists after cancelling README creation +- **Bug Fix** Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names +- **Bug Fix** Amazon Q /doc: Prompt user to choose a folder in chat +- **Bug Fix** Amazon Q /dev not adding Dockerfiles in nested folders +- **Bug Fix** Improved Code Fix generation for code review issues +- **Bug Fix** Fix the quick start buttons on the explore page to show amazon q colours on hover +- **Feature** Q feature dev: recognize .bms, .pli code files +- **Feature** Amazon Q Code Transformation: show job ID in Transformation Hub +- **Feature** UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours +- **Feature** Add acknowledgement button for amazon q chat disclaimer +- **Feature** Navigate through prompt history by using the up/down arrows +- **Feature** Amazon Q: Simplify log channel + ## 1.39.0 2024-12-03 - **Feature** Added a getting started page for exploring amazon q agents diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index d41b80b8d3f..49925587230 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.40.0-SNAPSHOT", + "version": "1.40.0", "extensionKind": [ "workspace" ], From 84343f224189334aa793deaeecb249b26ee77add Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 10 Dec 2024 16:36:53 +0000 Subject: [PATCH 049/202] Release 3.38.0 --- package-lock.json | 4 ++-- packages/toolkit/.changes/3.38.0.json | 10 ++++++++++ .../Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json | 4 ---- packages/toolkit/CHANGELOG.md | 4 ++++ packages/toolkit/package.json | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 packages/toolkit/.changes/3.38.0.json delete mode 100644 packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json diff --git a/package-lock.json b/package-lock.json index 7025c981bec..94d65c626df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -20381,7 +20381,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.38.0-SNAPSHOT", + "version": "3.38.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/.changes/3.38.0.json b/packages/toolkit/.changes/3.38.0.json new file mode 100644 index 00000000000..00d492c4add --- /dev/null +++ b/packages/toolkit/.changes/3.38.0.json @@ -0,0 +1,10 @@ +{ + "date": "2024-12-10", + "version": "3.38.0", + "entries": [ + { + "type": "Feature", + "description": "Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/)." + } + ] +} \ No newline at end of file diff --git a/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json b/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json deleted file mode 100644 index 76f458362f4..00000000000 --- a/packages/toolkit/.changes/next-release/Feature-76bb396d-6268-4d24-9373-4c7c0e91cbc4.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/)." -} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 059c9510778..007faa84219 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.38.0 2024-12-10 + +- **Feature** Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/). + ## 3.36.0 2024-11-27 - **Bug Fix** appBuilder refresh feature doesnt work during sync --watch diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 0ea90663c9f..c000e4c97b9 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.38.0-SNAPSHOT", + "version": "3.38.0", "extensionKind": [ "workspace" ], From 694e4d500c0d54c2006f5d5878142c98b92027eb Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 10 Dec 2024 11:51:12 -0800 Subject: [PATCH 050/202] docs(cwl): changelog #6200 --- .../Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json diff --git a/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json b/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json new file mode 100644 index 00000000000..547ae687098 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/)." +} From 2bdc8543016bcc1bcfaf4704cf10918547adf8a0 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 10 Dec 2024 20:07:18 +0000 Subject: [PATCH 051/202] Update version to snapshot version: 1.41.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/amazonq/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ff282707ec..e722d914899 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -20222,7 +20222,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.40.0", + "version": "1.41.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 49925587230..b1faad253f3 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.40.0", + "version": "1.41.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 7aa5c54f6de0f7ca31c8909e580b5ac0b1098273 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 10 Dec 2024 20:07:39 +0000 Subject: [PATCH 052/202] Update version to snapshot version: 3.39.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/toolkit/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 94d65c626df..45ee1cc9392 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -20381,7 +20381,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.38.0", + "version": "3.39.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index c000e4c97b9..ab1fb3c1bed 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.38.0", + "version": "3.39.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 11b5100613ad8b22326a030bcc8d04cde1032a8a Mon Sep 17 00:00:00 2001 From: KevinDing1 <102239785+KevinDing1@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:36:44 -0500 Subject: [PATCH 053/202] telemetry(amazonq): folder level telemetry data undefined issue #6202 ## Problem When users don't choose a different folder during document generation, the current telemetry will log folder level as undefined ## Solution Change the default workspace value to "Entire Workspace" to match the default behavior of the UX flow. --- packages/core/src/amazonqDoc/controllers/docGenerationTask.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/amazonqDoc/controllers/docGenerationTask.ts b/packages/core/src/amazonqDoc/controllers/docGenerationTask.ts index 4fc57ba152c..848de727570 100644 --- a/packages/core/src/amazonqDoc/controllers/docGenerationTask.ts +++ b/packages/core/src/amazonqDoc/controllers/docGenerationTask.ts @@ -20,7 +20,7 @@ export class DocGenerationTask { public interactionType?: DocGenerationInteractionType public userIdentity?: string public numberOfNavigation = 0 - public folderLevel?: DocGenerationFolderLevel + public folderLevel: DocGenerationFolderLevel = 'ENTIRE_WORKSPACE' constructor(conversationId?: string) { this.conversationId = conversationId @@ -57,6 +57,6 @@ export class DocGenerationTask { this.interactionType = undefined this.userIdentity = undefined this.numberOfNavigation = 0 - this.folderLevel = undefined + this.folderLevel = 'ENTIRE_WORKSPACE' } } From 3a5642e2765dd139145d31522091fc7e390b5047 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:38:00 -0800 Subject: [PATCH 054/202] refactor(amazonq): move utils functions to dedicated file (#6165) ## Problem Lots of file utils functions in `startTransformByQ.ts` should be in `transformFileHandler.ts` ## Solution Move them. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: David Hasani --- .../test/e2e/amazonq/transformByQ.test.ts | 4 +- .../chat/controller/controller.ts | 12 +- packages/core/src/amazonqGumby/index.ts | 1 + .../commands/startTransformByQ.ts | 104 +---------------- .../transformByQ/transformFileHandler.ts | 106 +++++++++++++++++- .../commands/transformByQ.test.ts | 13 +-- 6 files changed, 121 insertions(+), 119 deletions(-) diff --git a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts index 8d7543211ba..69fc905c985 100644 --- a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts +++ b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts @@ -8,7 +8,7 @@ import { qTestingFramework } from './framework/framework' import sinon from 'sinon' import { Messenger } from './framework/messenger' import { JDKVersion, TransformationType, transformByQState } from 'aws-core-vscode/codewhisperer' -import { GumbyController, startTransformByQ, TabsStorage } from 'aws-core-vscode/amazonqGumby' +import { GumbyController, setMaven, startTransformByQ, TabsStorage } from 'aws-core-vscode/amazonqGumby' import { using, registerAuthHook, TestFolder } from 'aws-core-vscode/test' import { loginToIdC } from './utils/setup' import { fs } from 'aws-core-vscode/shared' @@ -338,7 +338,7 @@ describe('Amazon Q Code Transformation', function () { it('WHEN transforming a Java 8 project E2E THEN job is successful', async function () { transformByQState.setTransformationType(TransformationType.LANGUAGE_UPGRADE) - await startTransformByQ.setMaven() + await setMaven() await startTransformByQ.processLanguageUpgradeTransformFormInput(tempDir, JDKVersion.JDK8, JDKVersion.JDK17) await startTransformByQ.startTransformByQ() assert.strictEqual(transformByQState.getPolledJobStatus(), 'COMPLETED') diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts index 3df09af40a4..e79ce883e0a 100644 --- a/packages/core/src/amazonqGumby/chat/controller/controller.ts +++ b/packages/core/src/amazonqGumby/chat/controller/controller.ts @@ -20,18 +20,14 @@ import { compileProject, finishHumanInTheLoop, getValidLanguageUpgradeCandidateProjects, - openBuildLogFile, - openHilPomFile, - parseBuildFile, postTransformationJob, processLanguageUpgradeTransformFormInput, processSQLConversionTransformFormInput, startTransformByQ, stopTransformByQ, validateCanCompileProject, - setMaven, getValidSQLConversionCandidateProjects, - validateSQLMetadataFile, + openHilPomFile, } from '../../../codewhisperer/commands/startTransformByQ' import { JDKVersion, TransformationCandidateProject, transformByQState } from '../../../codewhisperer/models/model' import { @@ -61,6 +57,12 @@ import { getStringHash } from '../../../shared/utilities/textUtilities' import { getVersionData } from '../../../codewhisperer/service/transformByQ/transformMavenHandler' import AdmZip from 'adm-zip' import { AuthError } from '../../../auth/sso/server' +import { + setMaven, + openBuildLogFile, + parseBuildFile, + validateSQLMetadataFile, +} from '../../../codewhisperer/service/transformByQ/transformFileHandler' import { getAuthType } from '../../../auth/utils' // These events can be interactions within the chat, diff --git a/packages/core/src/amazonqGumby/index.ts b/packages/core/src/amazonqGumby/index.ts index 16f64f7734a..8c1109f9997 100644 --- a/packages/core/src/amazonqGumby/index.ts +++ b/packages/core/src/amazonqGumby/index.ts @@ -9,4 +9,5 @@ export { default as MessengerUtils } from './chat/controller/messenger/messenger export { GumbyController } from './chat/controller/controller' export { TabsStorage } from '../amazonq/webview/ui/storages/tabsStorage' export * as startTransformByQ from '../../src/codewhisperer/commands/startTransformByQ' +export { setMaven } from '../../src/codewhisperer/service/transformByQ/transformFileHandler' export * from './errors' diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts index e009616ab97..967a9a63218 100644 --- a/packages/core/src/codewhisperer/commands/startTransformByQ.ts +++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts @@ -5,8 +5,6 @@ import * as vscode from 'vscode' import * as fs from 'fs' // eslint-disable-line no-restricted-imports -import * as os from 'os' -import * as xml2js from 'xml2js' import path from 'path' import { getLogger } from '../../shared/logger' import * as CodeWhispererConstants from '../models/constants' @@ -18,7 +16,6 @@ import { FolderInfo, ZipManifest, TransformByQStatus, - DB, TransformationType, TransformationCandidateProject, } from '../models/model' @@ -56,7 +53,6 @@ import { MetadataResult } from '../../shared/telemetry/telemetryClient' import { submitFeedback } from '../../feedback/vue/submitFeedback' import { placeholder } from '../../shared/vscode/commands2' import { - AbsolutePathDetectedError, AlternateDependencyVersionsNotFoundError, JavaHomeNotSetError, JobStartError, @@ -71,6 +67,7 @@ import { getJsonValuesFromManifestFile, highlightPomIssueInProject, parseVersionsListFromPomFile, + setMaven, writeLogs, } from '../service/transformByQ/transformFileHandler' import { sleep } from '../../shared/utilities/timeoutUtils' @@ -81,7 +78,6 @@ import { setContext } from '../../shared/vscode/setContext' import { makeTemporaryToolkitFolder } from '../../shared' import globals from '../../shared/extensionGlobals' import { convertDateToTimestamp } from '../../shared/datetime' -import { isWin } from '../../shared/vscode/env' import { findStringInDirectory } from '../../shared/utilities/workspaceUtils' function getFeedbackCommentData() { @@ -111,63 +107,6 @@ export async function processSQLConversionTransformFormInput(pathToProject: stri // targetJDKVersion defaults to JDK17, the only supported version, which is fine } -export async function validateSQLMetadataFile(fileContents: string, message: any) { - try { - const sctData = await xml2js.parseStringPromise(fileContents) - const dbEntities = sctData['tree']['instances'][0]['ProjectModel'][0]['entities'][0] - const sourceDB = dbEntities['sources'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase() - const targetDB = dbEntities['targets'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase() - const sourceServerName = dbEntities['sources'][0]['DbServer'][0]['$']['name'].trim() - transformByQState.setSourceServerName(sourceServerName) - if (sourceDB !== DB.ORACLE) { - transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-source-db', message.tabID) - return false - } else if (targetDB !== DB.AURORA_POSTGRESQL && targetDB !== DB.RDS_POSTGRESQL) { - transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-target-db', message.tabID) - return false - } - transformByQState.setSourceDB(sourceDB) - transformByQState.setTargetDB(targetDB) - - const serverNodeLocations = - sctData['tree']['instances'][0]['ProjectModel'][0]['relations'][0]['server-node-location'] - const schemaNames = new Set() - serverNodeLocations.forEach((serverNodeLocation: any) => { - const schemaNodes = serverNodeLocation['FullNameNodeInfoList'][0]['nameParts'][0][ - 'FullNameNodeInfo' - ].filter((node: any) => node['$']['typeNode'].toLowerCase() === 'schema') - schemaNodes.forEach((node: any) => { - schemaNames.add(node['$']['nameNode'].toUpperCase()) - }) - }) - transformByQState.setSchemaOptions(schemaNames) // user will choose one of these - getLogger().info( - `CodeTransformation: Parsed .sct file with source DB: ${sourceDB}, target DB: ${targetDB}, source host name: ${sourceServerName}, and schema names: ${Array.from(schemaNames)}` - ) - } catch (err: any) { - getLogger().error('CodeTransformation: Error parsing .sct file. %O', err) - transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('error-parsing-sct-file', message.tabID) - return false - } - return true -} - -export async function setMaven() { - let mavenWrapperExecutableName = isWin() ? 'mvnw.cmd' : 'mvnw' - const mavenWrapperExecutablePath = path.join(transformByQState.getProjectPath(), mavenWrapperExecutableName) - if (fs.existsSync(mavenWrapperExecutablePath)) { - if (mavenWrapperExecutableName === 'mvnw') { - mavenWrapperExecutableName = './mvnw' // add the './' for non-Windows - } else if (mavenWrapperExecutableName === 'mvnw.cmd') { - mavenWrapperExecutableName = '.\\mvnw.cmd' // add the '.\' for Windows - } - transformByQState.setMavenName(mavenWrapperExecutableName) - } else { - transformByQState.setMavenName('mvn') - } - getLogger().info(`CodeTransformation: using Maven ${transformByQState.getMavenName()}`) -} - async function validateJavaHome(): Promise { const versionData = await getVersionData() let javaVersionUsedByMaven = versionData[1] @@ -290,41 +229,6 @@ export async function finalizeTransformByQ(status: string) { } } -export async function parseBuildFile() { - try { - const absolutePaths = ['users/', 'system/', 'volumes/', 'c:\\', 'd:\\'] - const alias = path.basename(os.homedir()) - absolutePaths.push(alias) - const buildFilePath = path.join(transformByQState.getProjectPath(), 'pom.xml') - if (fs.existsSync(buildFilePath)) { - const buildFileContents = fs.readFileSync(buildFilePath).toString().toLowerCase() - const detectedPaths = [] - for (const absolutePath of absolutePaths) { - if (buildFileContents.includes(absolutePath)) { - detectedPaths.push(absolutePath) - } - } - if (detectedPaths.length > 0) { - const warningMessage = CodeWhispererConstants.absolutePathDetectedMessage( - detectedPaths.length, - path.basename(buildFilePath), - detectedPaths.join(', ') - ) - transformByQState.getChatControllers()?.errorThrown.fire({ - error: new AbsolutePathDetectedError(warningMessage), - tabID: ChatSessionManager.Instance.getSession().tabID, - }) - getLogger().info('CodeTransformation: absolute path potentially in build file') - return warningMessage - } - } - } catch (err: any) { - // swallow error - getLogger().error(`CodeTransformation: error scanning for absolute paths, tranformation continuing: ${err}`) - } - return undefined -} - export async function preTransformationUploadCode() { await vscode.commands.executeCommand('aws.amazonq.transformationHub.focus') @@ -499,12 +403,6 @@ export async function openHilPomFile() { ) } -export async function openBuildLogFile() { - const logFilePath = transformByQState.getPreBuildLogFilePath() - const doc = await vscode.workspace.openTextDocument(logFilePath) - await vscode.window.showTextDocument(doc) -} - export async function terminateHILEarly(jobID: string) { // Call resume with "REJECTED" state which will put our service // back into the normal flow and will not trigger HIL again for this step diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts index f6c5e24bed1..516471fc078 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts @@ -8,11 +8,15 @@ import * as path from 'path' import * as os from 'os' import xml2js = require('xml2js') import * as CodeWhispererConstants from '../../models/constants' -import { existsSync, writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports -import { BuildSystem, FolderInfo, transformByQState } from '../../models/model' +import { existsSync, readFileSync, writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports +import { BuildSystem, DB, FolderInfo, transformByQState } from '../../models/model' import { IManifestFile } from '../../../amazonqFeatureDev/models' import fs from '../../../shared/fs/fs' import globals from '../../../shared/extensionGlobals' +import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession' +import { AbsolutePathDetectedError } from '../../../amazonqGumby/errors' +import { getLogger } from '../../../shared/logger' +import { isWin } from '../../../shared/vscode/env' export function getDependenciesFolderInfo(): FolderInfo { const dependencyFolderName = `${CodeWhispererConstants.dependencyFolderName}${globals.clock.Date.now()}` @@ -37,6 +41,104 @@ export async function checkBuildSystem(projectPath: string) { return BuildSystem.Unknown } +export async function parseBuildFile() { + try { + const absolutePaths = ['users/', 'system/', 'volumes/', 'c:\\', 'd:\\'] + const alias = path.basename(os.homedir()) + absolutePaths.push(alias) + const buildFilePath = path.join(transformByQState.getProjectPath(), 'pom.xml') + if (existsSync(buildFilePath)) { + const buildFileContents = readFileSync(buildFilePath).toString().toLowerCase() + const detectedPaths = [] + for (const absolutePath of absolutePaths) { + if (buildFileContents.includes(absolutePath)) { + detectedPaths.push(absolutePath) + } + } + if (detectedPaths.length > 0) { + const warningMessage = CodeWhispererConstants.absolutePathDetectedMessage( + detectedPaths.length, + path.basename(buildFilePath), + detectedPaths.join(', ') + ) + transformByQState.getChatControllers()?.errorThrown.fire({ + error: new AbsolutePathDetectedError(warningMessage), + tabID: ChatSessionManager.Instance.getSession().tabID, + }) + getLogger().info('CodeTransformation: absolute path potentially in build file') + return warningMessage + } + } + } catch (err: any) { + // swallow error + getLogger().error(`CodeTransformation: error scanning for absolute paths, tranformation continuing: ${err}`) + } + return undefined +} + +export async function validateSQLMetadataFile(fileContents: string, message: any) { + try { + const sctData = await xml2js.parseStringPromise(fileContents) + const dbEntities = sctData['tree']['instances'][0]['ProjectModel'][0]['entities'][0] + const sourceDB = dbEntities['sources'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase() + const targetDB = dbEntities['targets'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase() + const sourceServerName = dbEntities['sources'][0]['DbServer'][0]['$']['name'].trim() + transformByQState.setSourceServerName(sourceServerName) + if (sourceDB !== DB.ORACLE) { + transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-source-db', message.tabID) + return false + } else if (targetDB !== DB.AURORA_POSTGRESQL && targetDB !== DB.RDS_POSTGRESQL) { + transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-target-db', message.tabID) + return false + } + transformByQState.setSourceDB(sourceDB) + transformByQState.setTargetDB(targetDB) + + const serverNodeLocations = + sctData['tree']['instances'][0]['ProjectModel'][0]['relations'][0]['server-node-location'] + const schemaNames = new Set() + serverNodeLocations.forEach((serverNodeLocation: any) => { + const schemaNodes = serverNodeLocation['FullNameNodeInfoList'][0]['nameParts'][0][ + 'FullNameNodeInfo' + ].filter((node: any) => node['$']['typeNode'].toLowerCase() === 'schema') + schemaNodes.forEach((node: any) => { + schemaNames.add(node['$']['nameNode'].toUpperCase()) + }) + }) + transformByQState.setSchemaOptions(schemaNames) // user will choose one of these + getLogger().info( + `CodeTransformation: Parsed .sct file with source DB: ${sourceDB}, target DB: ${targetDB}, source host name: ${sourceServerName}, and schema names: ${Array.from(schemaNames)}` + ) + } catch (err: any) { + getLogger().error('CodeTransformation: Error parsing .sct file. %O', err) + transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('error-parsing-sct-file', message.tabID) + return false + } + return true +} + +export async function setMaven() { + let mavenWrapperExecutableName = isWin() ? 'mvnw.cmd' : 'mvnw' + const mavenWrapperExecutablePath = path.join(transformByQState.getProjectPath(), mavenWrapperExecutableName) + if (existsSync(mavenWrapperExecutablePath)) { + if (mavenWrapperExecutableName === 'mvnw') { + mavenWrapperExecutableName = './mvnw' // add the './' for non-Windows + } else if (mavenWrapperExecutableName === 'mvnw.cmd') { + mavenWrapperExecutableName = '.\\mvnw.cmd' // add the '.\' for Windows + } + transformByQState.setMavenName(mavenWrapperExecutableName) + } else { + transformByQState.setMavenName('mvn') + } + getLogger().info(`CodeTransformation: using Maven ${transformByQState.getMavenName()}`) +} + +export async function openBuildLogFile() { + const logFilePath = transformByQState.getPreBuildLogFilePath() + const doc = await vscode.workspace.openTextDocument(logFilePath) + await vscode.window.showTextDocument(doc) +} + export async function createPomCopy( dirname: string, pomFileVirtualFileReference: vscode.Uri, diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts index b6ff86a94cd..68bb795b54c 100644 --- a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts +++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts @@ -7,13 +7,7 @@ import assert, { fail } from 'assert' import * as vscode from 'vscode' import * as sinon from 'sinon' import { DB, transformByQState, TransformByQStoppedError } from '../../../codewhisperer/models/model' -import { - finalizeTransformationJob, - parseBuildFile, - setMaven, - stopTransformByQ, - validateSQLMetadataFile, -} from '../../../codewhisperer/commands/startTransformByQ' +import { stopTransformByQ, finalizeTransformationJob } from '../../../codewhisperer/commands/startTransformByQ' import { HttpResponse } from 'aws-sdk' import * as codeWhisperer from '../../../codewhisperer/client/codewhisperer' import * as CodeWhispererConstants from '../../../codewhisperer/models/constants' @@ -43,6 +37,11 @@ import { TransformationCandidateProject, ZipManifest } from '../../../codewhispe import globals from '../../../shared/extensionGlobals' import { env, fs } from '../../../shared' import { convertDateToTimestamp, convertToTimeString } from '../../../shared/datetime' +import { + setMaven, + parseBuildFile, + validateSQLMetadataFile, +} from '../../../codewhisperer/service/transformByQ/transformFileHandler' describe('transformByQ', function () { let tempDir: string From 70a929556da7fa2fa147d37bfa7997842064220a Mon Sep 17 00:00:00 2001 From: Lei Gao <97199248+leigaol@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:38:38 -0800 Subject: [PATCH 055/202] fix(amazonq): reduce system status poll freq #6199 ## Problem The system status (battery, CPU usage) was polled very frequently. https://github.com/aws/aws-toolkit-vscode/issues/6134 ## Solution Only poll system status (battery, CPU usage) when vector indexing is in progress, this is to make the vector index pause when system load is high to protect system resources. --- .../Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json | 4 ++++ packages/core/src/amazonq/lsp/lspController.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json b/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json new file mode 100644 index 00000000000..ee36eb1703d --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Reduce frequency of system status poll" +} diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts index 1b948625e76..5fed82b7bd9 100644 --- a/packages/core/src/amazonq/lsp/lspController.ts +++ b/packages/core/src/amazonq/lsp/lspController.ts @@ -58,7 +58,7 @@ export interface Manifest { } const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json' // this LSP client in Q extension is only going to work with these LSP server versions -const supportedLspServerVersions = ['0.1.29'] +const supportedLspServerVersions = ['0.1.32'] const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node' From 46e973fede5ca88c84fab14a17fa7665089db4f6 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Tue, 10 Dec 2024 22:32:59 +0000 Subject: [PATCH 056/202] fix(logs): noisy git output in logs #6192 ## Problem Git commands are too noisy; running /review always opens Amazon Q output channel with git command output ## Solution - Output to the Amazon Q Logs channel instead - Make it verbose level so it won't show by default --- .../Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json | 4 ++++ packages/core/src/codewhisperer/util/gitUtil.ts | 7 +++---- packages/core/src/codewhisperer/util/zipUtil.ts | 11 +++++------ 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json b/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json new file mode 100644 index 00000000000..50ef07d3456 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Code Review: Cleaned up output logs when running /review" +} diff --git a/packages/core/src/codewhisperer/util/gitUtil.ts b/packages/core/src/codewhisperer/util/gitUtil.ts index f4a48dbd0cb..752c16ba6bf 100644 --- a/packages/core/src/codewhisperer/util/gitUtil.ts +++ b/packages/core/src/codewhisperer/util/gitUtil.ts @@ -3,8 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { showOutputMessage } from '../../shared/utilities/messages' -import { getLogger, globals, removeAnsi } from '../../shared' +import { getLogger, removeAnsi } from '../../shared' import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils' import { Uri } from 'vscode' @@ -17,10 +16,10 @@ export async function isGitRepo(folder: Uri): Promise { rejectOnErrorCode: true, onStdout: (text) => { output += text - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().verbose(removeAnsi(text)) }, onStderr: (text) => { - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().error(removeAnsi(text)) }, spawnOptions: { cwd: folder.fsPath, diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index 755fb9c3085..19b94a7fcf1 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -22,8 +22,7 @@ import { } from '../models/errors' import { ZipUseCase } from '../models/constants' import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils' -import { showOutputMessage } from '../../shared/utilities/messages' -import { globals, removeAnsi } from '../../shared' +import { removeAnsi } from '../../shared' export interface ZipMetadata { rootDir: string @@ -303,10 +302,10 @@ export class ZipUtil { rejectOnErrorCode: false, onStdout: (text) => { diffContent += text - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().verbose(removeAnsi(text)) }, onStderr: (text) => { - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().error(removeAnsi(text)) }, spawnOptions: { cwd: projectPath, @@ -340,10 +339,10 @@ export class ZipUtil { rejectOnErrorCode: true, onStdout: (text) => { diffContent += text - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().verbose(removeAnsi(text)) }, onStderr: (text) => { - showOutputMessage(removeAnsi(text), globals.outputChannel) + getLogger().error(removeAnsi(text)) }, spawnOptions: { cwd: projectPath, From b3823d474ee44d101b50b849c85ed6171f55193a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 10 Dec 2024 14:40:24 -0800 Subject: [PATCH 057/202] ci: drop codecov "tests" coverage #6204 # Problem: The "tests" codecov target always reports 0%, probably because the test code is ignored. # Solution: The "tests" target is not useful without more configuration, so drop it for now. --- codecov.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/codecov.yml b/codecov.yml index 6da7d75aec2..1e348859f11 100644 --- a/codecov.yml +++ b/codecov.yml @@ -81,11 +81,6 @@ coverage: target: 80 threshold: 5 only_pulls: true - tests: - # Most code in test/ should always be "covered"! - target: 95 - paths: - - '**/test/**' patch: default: # Note: `default` measures the entire project. From d8337a0a9f3dea3cbb82303cc8088d0a359e964d Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:41:54 -0800 Subject: [PATCH 058/202] refactor(amazonq): duplicate code block in test file #6201 ## Problem `jscpd` detected a duplicate code block in a `/transform`-related test file. ## Solution Use a shared variable so as not to duplicate. --- .../commands/transformByQ.test.ts | 176 +++++------------- 1 file changed, 47 insertions(+), 129 deletions(-) diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts index 68bb795b54c..843211eea0d 100644 --- a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts +++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts @@ -45,6 +45,48 @@ import { describe('transformByQ', function () { let tempDir: string + const validSctFile = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ` beforeEach(async function () { tempDir = (await TestFolder.create()).path @@ -400,49 +442,7 @@ describe('transformByQ', function () { }) it(`WHEN validateMetadataFile on fully valid .sct file THEN passes validation`, async function () { - const sampleFileContents = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ` - const isValidMetadata = await validateSQLMetadataFile(sampleFileContents, { tabID: 'abc123' }) + const isValidMetadata = await validateSQLMetadataFile(validSctFile, { tabID: 'abc123' }) assert.strictEqual(isValidMetadata, true) assert.strictEqual(transformByQState.getSourceDB(), DB.ORACLE) assert.strictEqual(transformByQState.getTargetDB(), DB.AURORA_POSTGRESQL) @@ -454,96 +454,14 @@ describe('transformByQ', function () { }) it(`WHEN validateMetadataFile on .sct file with unsupported source DB THEN fails validation`, async function () { - const sampleFileContents = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ` - const isValidMetadata = await validateSQLMetadataFile(sampleFileContents, { tabID: 'abc123' }) + const sctFileWithInvalidSource = validSctFile.replace('oracle', 'not-oracle') + const isValidMetadata = await validateSQLMetadataFile(sctFileWithInvalidSource, { tabID: 'abc123' }) assert.strictEqual(isValidMetadata, false) }) it(`WHEN validateMetadataFile on .sct file with unsupported target DB THEN fails validation`, async function () { - const sampleFileContents = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ` - const isValidMetadata = await validateSQLMetadataFile(sampleFileContents, { tabID: 'abc123' }) + const sctFileWithInvalidTarget = validSctFile.replace('aurora_postgresql', 'not-postgresql') + const isValidMetadata = await validateSQLMetadataFile(sctFileWithInvalidTarget, { tabID: 'abc123' }) assert.strictEqual(isValidMetadata, false) }) }) From b60eba7cae7fa4a70b3b29fbf0ead4fa8ced799f Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Tue, 10 Dec 2024 22:45:22 +0000 Subject: [PATCH 059/202] config(amazonq): code issues collapsed by default #6198 ## Problem Code issues tree view takes up too much space away from chat view ## Solution Set `visibility` to `collapsed` (will only take effect for new installations) --- packages/amazonq/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index b1faad253f3..246f87a3e00 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -210,7 +210,8 @@ "type": "tree", "id": "aws.amazonq.SecurityIssuesTree", "name": "%AWS.amazonq.security%", - "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView" + "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView", + "visibility": "collapsed" }, { "type": "webview", From ef926e43a49901e6ee337bb7cd80da0f9c1c59f3 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Tue, 10 Dec 2024 22:46:15 +0000 Subject: [PATCH 060/202] fix(amazonq): revert disable event handler #6191 ## Problem Applying a fix does not update the position of other issues in the same file. ## Solution Revert disabling event handler on apply fix command --- .../Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json | 4 ++++ .../core/src/codewhisperer/commands/basicCommands.ts | 1 - .../src/codewhisperer/service/securityIssueProvider.ts | 9 --------- 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json b/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json new file mode 100644 index 00000000000..b4e3e303a62 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file." +} diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts index 00555af5cfe..07fd358a990 100644 --- a/packages/core/src/codewhisperer/commands/basicCommands.ts +++ b/packages/core/src/codewhisperer/commands/basicCommands.ts @@ -464,7 +464,6 @@ export const applySecurityFix = Commands.declare( new vscode.Range(document.lineAt(0).range.start, document.lineAt(document.lineCount - 1).range.end), updatedContent ) - SecurityIssueProvider.instance.disableEventHandler() const isApplied = await vscode.workspace.applyEdit(edit) if (isApplied) { void document.save().then((didSave) => { diff --git a/packages/core/src/codewhisperer/service/securityIssueProvider.ts b/packages/core/src/codewhisperer/service/securityIssueProvider.ts index fa60c7c215a..28b84995aea 100644 --- a/packages/core/src/codewhisperer/service/securityIssueProvider.ts +++ b/packages/core/src/codewhisperer/service/securityIssueProvider.ts @@ -12,7 +12,6 @@ export class SecurityIssueProvider { } private _issues: AggregatedCodeScanIssue[] = [] - private _disableEventHandler: boolean = false public get issues() { return this._issues } @@ -21,19 +20,11 @@ export class SecurityIssueProvider { this._issues = issues } - public disableEventHandler() { - this._disableEventHandler = true - } - public handleDocumentChange(event: vscode.TextDocumentChangeEvent) { // handleDocumentChange function may be triggered while testing by our own code generation. if (!event.contentChanges || event.contentChanges.length === 0) { return } - if (this._disableEventHandler) { - this._disableEventHandler = false - return - } const { changedRange, lineOffset } = event.contentChanges.reduce( (acc, change) => ({ changedRange: acc.changedRange.union(change.range), From 5f72ec9fe241c52a0496d9c4e8a1d0e59877f0f2 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Tue, 10 Dec 2024 22:47:27 +0000 Subject: [PATCH 061/202] fix(amazonq): always use projectName in zipEntryPath #6182 ## Problem Projects with a nested folder of the same name does not scan properly. For example if the project name is `foo`, and there exists a folder `foo/foo/` then the zip artifact only contains the inner `foo/` folder. ## Solution Always include the project name in the zip artifact instead of conditionally adding it. --- ...-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json | 4 ++ .../unit/codewhisperer/util/zipUtil.test.ts | 26 ++++++++++ .../core/src/codewhisperer/util/zipUtil.ts | 13 ++--- .../workspaceFolder/workspaceFolder/App.java | 48 +++++++++++++++++++ 4 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json create mode 100644 packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java diff --git a/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json b/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json new file mode 100644 index 00000000000..cce3184a518 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly." +} diff --git a/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts index a4a03a5236a..ee4abafa19a 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts @@ -14,11 +14,13 @@ import { ToolkitError } from 'aws-core-vscode/shared' import { LspClient } from 'aws-core-vscode/amazonq' import { fs } from 'aws-core-vscode/shared' import path from 'path' +import JSZip from 'jszip' describe('zipUtil', function () { const workspaceFolder = getTestWorkspaceFolder() const appRoot = join(workspaceFolder, 'java11-plain-maven-sam-app') const appCodePath = join(appRoot, 'HelloWorldFunction', 'src', 'main', 'java', 'helloworld', 'App.java') + const appCodePathWithRepeatedProjectName = join(workspaceFolder, 'workspaceFolder', 'App.java') describe('getProjectPaths', function () { it('Should return the correct project paths', function () { @@ -112,6 +114,30 @@ describe('zipUtil', function () { ) assert.equal(zipMetadata2.lines, zipMetadata.lines + 1) }) + + it('should handle path with repeated project name for file scan', async function () { + const zipMetadata = await zipUtil.generateZip( + vscode.Uri.file(appCodePathWithRepeatedProjectName), + CodeAnalysisScope.FILE_ON_DEMAND + ) + + const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath) + const zip = await JSZip.loadAsync(zipFileData) + const files = Object.keys(zip.files) + assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java'))) + }) + + it('should handle path with repeated project name for project scan', async function () { + const zipMetadata = await zipUtil.generateZip( + vscode.Uri.file(appCodePathWithRepeatedProjectName), + CodeAnalysisScope.PROJECT + ) + + const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath) + const zip = await JSZip.loadAsync(zipFileData) + const files = Object.keys(zip.files) + assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java'))) + }) }) describe('generateZipTestGen', function () { diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index 19b94a7fcf1..b75a6798ab2 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -140,14 +140,8 @@ export class ZipUtil { return zipFilePath } - protected getZipEntryPath(projectName: string, relativePath: string, useCase?: ZipUseCase) { - // Workspaces with multiple folders have the folder names as the root folder, - // but workspaces with only a single folder don't. So prepend the workspace folder name - // if it is not present. - if (useCase === ZipUseCase.TEST_GENERATION) { - return path.join(projectName, relativePath) - } - return relativePath.split('/').shift() === projectName ? relativePath : path.join(projectName, relativePath) + protected getZipEntryPath(projectName: string, relativePath: string) { + return path.join(projectName, relativePath) } /** @@ -422,7 +416,8 @@ export class ZipUtil { this.getProjectScanPayloadSizeLimitInBytes() ) for (const file of sourceFiles) { - const zipEntryPath = this.getZipEntryPath(file.workspaceFolder.name, file.relativeFilePath, useCase) + const projectName = path.basename(file.workspaceFolder.uri.fsPath) + const zipEntryPath = this.getZipEntryPath(projectName, file.relativeFilePath) if (ZipConstants.knownBinaryFileExts.includes(path.extname(file.fileUri.fsPath))) { if (useCase === ZipUseCase.TEST_GENERATION) { diff --git a/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java b/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java new file mode 100644 index 00000000000..0cbd0f88995 --- /dev/null +++ b/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java @@ -0,0 +1,48 @@ +package helloworld; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; + +/** + * Handler for requests to Lambda function. + */ +public class App implements RequestHandler { + + public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) { + Map headers = new HashMap<>(); + headers.put("Content-Type", "application/json"); + headers.put("X-Custom-Header", "application/json"); + + APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent() + .withHeaders(headers); + try { + final String pageContents = this.getPageContents("https://checkip.amazonaws.com"); + String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents); + + return response + .withStatusCode(200) + .withBody(output); + } catch (IOException e) { + return response + .withBody("{}") + .withStatusCode(500); + } + } + + private String getPageContents(String address) throws IOException{ + URL url = new URL(address); + try(BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()))) { + return br.lines().collect(Collectors.joining(System.lineSeparator())); + } + } +} From 0a40071a76b9db40eb9b7bb315065a5f49f339cf Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:20:59 -0500 Subject: [PATCH 062/202] ci(integ): pull SAM images in "install" phase to avoid timeouts #6179 ## Problem - The SAM tests are flaky, and sometimes fail CI. - SAM file scenarios section includes a ton of copy-pasting. ## Solution The SAM build images can be pulled ahead of time to reduce risk of timeout. To see this working, see the integ test logs below, and notice in the logs that `Fetching public.ecr.aws/sam/build-... Docker container image...`, resolved immediately (likely cached from pre-fetching) whereas before this took 60-90 seconds sometimes. To reduce copy pasting, establish useful defaults, and generate the scenarios based on a few args to avoid copy pasting information. --- buildspec/linuxIntegrationTests.yml | 21 ++ packages/core/src/testInteg/sam.test.ts | 335 +++++++----------------- 2 files changed, 113 insertions(+), 243 deletions(-) diff --git a/buildspec/linuxIntegrationTests.yml b/buildspec/linuxIntegrationTests.yml index 49481c5f8f0..a40606bf8b3 100644 --- a/buildspec/linuxIntegrationTests.yml +++ b/buildspec/linuxIntegrationTests.yml @@ -51,6 +51,27 @@ phases: # Ensure that "docker" group has permissions to the socket. # - chown codebuild-user /var/run/docker.sock - chmod 666 /var/run/docker.sock + # Pull Docker Images for SAM tests + + # Nodejs + - | + docker pull public.ecr.aws/sam/build-nodejs18.x:latest + docker pull public.ecr.aws/sam/build-nodejs20.x:latest + docker pull public.ecr.aws/sam/build-nodejs22.x:latest + # Java + - | + docker pull public.ecr.aws/sam/build-java8.al2:latest + docker pull public.ecr.aws/sam/build-java11:latest + docker pull public.ecr.aws/sam/build-java17:latest + # Python + - | + docker pull public.ecr.aws/sam/build-python3.10:latest + docker pull public.ecr.aws/sam/build-python3.11:latest + docker pull public.ecr.aws/sam/build-python3.12:latest + docker pull public.ecr.aws/sam/build-python3.13:latest + # Dotnet + - | + docker pull public.ecr.aws/sam/build-dotnet6:latest pre_build: commands: diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts index 487c2aef1b7..50e8817f409 100644 --- a/packages/core/src/testInteg/sam.test.ts +++ b/packages/core/src/testInteg/sam.test.ts @@ -46,10 +46,7 @@ const noDebugSessionInterval: number = 100 /** Go can't handle API tests yet */ const skipLanguagesOnApi = ['go'] -interface TestScenario { - displayName: string - runtime: Runtime - baseImage?: string +interface TestScenarioDefaults { path: string debugSessionType: string language: Language @@ -57,251 +54,103 @@ interface TestScenario { /** Minimum vscode version required by the relevant third-party extension. */ vscodeMinimum: string } +type TestScenario = { + displayName: string + runtime: Runtime + baseImage?: string +} & TestScenarioDefaults + +const nodeDefaults = { + path: 'hello-world/app.mjs', + debugSessionType: 'pwa-node', + dependencyManager: 'npm' as DependencyManager, + language: 'javascript' as Language, + vscodeMinimum: '1.50.0', +} +// https://github.com/microsoft/vscode-python/blob/main/package.json +const pythonDefaults = { + path: 'hello_world/app.py', + debugSessionType: 'python', + dependencyManager: 'pip' as DependencyManager, + language: 'python' as Language, + vscodeMinimum: '1.77.0', +} + +const javaDefaults = { + path: 'HelloWorldFunction/src/main/java/helloworld/App.java', + debugSessionType: 'java', + dependencyManager: 'gradle' as DependencyManager, + language: 'java' as Language, + vscodeMinimum: '1.50.0', +} +const dotnetDefaults = { + path: 'src/HelloWorld/Function.cs', + debugSessionType: 'coreclr', + language: 'csharp' as Language, + dependencyManager: 'cli-package' as DependencyManager, + vscodeMinimum: '1.80.0', +} + +const defaults: Record = { + nodejs: nodeDefaults, + java: javaDefaults, + python: pythonDefaults, + dotnet: dotnetDefaults, +} + +function generateScenario( + runtime: Runtime, + version: string, + options: Partial = {}, + fromImage: boolean = false +): TestScenario { + if (fromImage && !options.baseImage) { + throw new Error('baseImage property must be specified when testing from image') + } + const { sourceTag, ...defaultOverride } = options + const source = `(${options.sourceTag ? `${options.sourceTag} ` : ''}${fromImage ? 'Image' : 'ZIP'})` + const fullName = `${runtime}${version}` + return { + runtime: fullName, + displayName: `${fullName} ${source}`, + ...defaults[runtime], + ...defaultOverride, + } +} // When testing additional runtimes, consider pulling the docker container in buildspec\linuxIntegrationTests.yml // to reduce the chance of automated tests timing out. + const scenarios: TestScenario[] = [ // zips - { - runtime: 'nodejs18.x', - displayName: 'nodejs18.x (ZIP)', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'nodejs20.x', - displayName: 'nodejs20.x (ZIP)', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'nodejs22.x', - displayName: 'nodejs22.x (ZIP)', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.10', - displayName: 'python 3.10 (ZIP)', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.77.0', - }, - { - runtime: 'python3.11', - displayName: 'python 3.11 (ZIP)', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.12', - displayName: 'python 3.12 (ZIP)', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.13', - displayName: 'python 3.13 (ZIP)', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - { - runtime: 'dotnet6', - displayName: 'dotnet6 (ZIP)', - path: 'src/HelloWorld/Function.cs', - debugSessionType: 'coreclr', - language: 'csharp', - dependencyManager: 'cli-package', - vscodeMinimum: '1.80.0', - }, - { - runtime: 'java8.al2', - displayName: 'java8.al2 (Maven ZIP)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'maven', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'java11', - displayName: 'java11 (Gradle ZIP)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'gradle', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'java17', - displayName: 'java11 (Gradle ZIP)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'gradle', - vscodeMinimum: '1.50.0', - }, - // { - // runtime: 'go1.x', - // displayName: 'go1.x (ZIP)', - // path: 'hello-world/main.go', - // debugSessionType: 'delve', - // language: 'go', - // dependencyManager: 'mod', - // // https://github.com/golang/vscode-go/blob/master/package.json - // vscodeMinimum: '1.67.0', - // }, - + generateScenario('nodejs', '18.x'), + generateScenario('nodejs', '20.x'), + generateScenario('nodejs', '22.x', { vscodeMinimum: '1.78.0' }), + generateScenario('python', '3.10'), + generateScenario('python', '3.11', { vscodeMinimum: '1.78.0' }), + generateScenario('python', '3.12', { vscodeMinimum: '1.78.0' }), + generateScenario('python', '3.13', { vscodeMinimum: '1.78.0' }), + generateScenario('dotnet', '6'), + generateScenario('java', '8.al2', { sourceTag: 'Maven', dependencyManager: 'maven' }), + generateScenario('java', '11', { sourceTag: 'Gradle' }), + generateScenario('java', '17', { sourceTag: 'Gradle' }), // images - { - runtime: 'nodejs18.x', - displayName: 'nodejs18.x (Image)', - baseImage: 'amazon/nodejs18.x-base', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'nodejs20.x', - displayName: 'nodejs20.x (Image)', - baseImage: 'amazon/nodejs20.x-base', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'nodejs22.x', - displayName: 'nodejs22.x (Image)', - baseImage: 'amazon/nodejs22.x-base', - path: 'hello-world/app.mjs', - debugSessionType: 'pwa-node', - language: 'javascript', - dependencyManager: 'npm', - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.10', - displayName: 'python 3.10 (ZIP)', - baseImage: 'amazon/python3.10-base', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.77.0', - }, - { - runtime: 'python3.11', - displayName: 'python 3.11 (ZIP)', - baseImage: 'amazon/python3.11-base', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.12', - displayName: 'python 3.12 (ZIP)', - baseImage: 'amazon/python3.12-base', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - { - runtime: 'python3.13', - displayName: 'python 3.13 (ZIP)', - baseImage: 'amazon/python3.13-base', - path: 'hello_world/app.py', - debugSessionType: 'python', - language: 'python', - dependencyManager: 'pip', - // https://github.com/microsoft/vscode-python/blob/main/package.json - vscodeMinimum: '1.78.0', - }, - // { - // runtime: 'go1.x', - // displayName: 'go1.x (Image)', - // baseImage: 'amazon/go1.x-base', - // path: 'hello-world/main.go', - // debugSessionType: 'delve', - // language: 'go', - // dependencyManager: 'mod', - // // https://github.com/golang/vscode-go/blob/master/package.json - // vscodeMinimum: '1.67.0', - // }, - { - runtime: 'java8.al2', - displayName: 'java8.al2 (Gradle Image)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - baseImage: 'amazon/java8.al2-base', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'gradle', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'java11', - displayName: 'java11 (Maven Image)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - baseImage: 'amazon/java11-base', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'maven', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'java17', - displayName: 'java17 (Maven Image)', - path: 'HelloWorldFunction/src/main/java/helloworld/App.java', - baseImage: 'amazon/java17-base', - debugSessionType: 'java', - language: 'java', - dependencyManager: 'maven', - vscodeMinimum: '1.50.0', - }, - { - runtime: 'dotnet6', - displayName: 'dotnet6 (Image)', - path: 'src/HelloWorld/Function.cs', - baseImage: 'amazon/dotnet6-base', - debugSessionType: 'coreclr', - language: 'csharp', - dependencyManager: 'cli-package', - vscodeMinimum: '1.80.0', - }, + generateScenario('nodejs', '18.x', { baseImage: 'amazon/nodejs18.x-base' }, true), + generateScenario('nodejs', '20.x', { baseImage: 'amazon/nodejs20.x-base' }, true), + generateScenario('nodejs', '22.x', { baseImage: 'amazon/nodejs22.x-base', vscodeMinimum: '1.78.0' }, true), + generateScenario('python', '3.10', { baseImage: 'amazon/python3.10-base' }, true), + generateScenario('python', '3.11', { baseImage: 'amazon/python3.11-base', vscodeMinimum: '1.78.0' }, true), + generateScenario('python', '3.12', { baseImage: 'amazon/python3.12-base', vscodeMinimum: '1.78.0' }, true), + generateScenario('python', '3.13', { baseImage: 'amazon/python3.13-base', vscodeMinimum: '1.78.0' }, true), + generateScenario('dotnet', '6', { baseImage: 'amazon/dotnet6-base' }, true), + generateScenario( + 'java', + '.al2', + { baseImage: 'amazon/java8.al2-base', sourceTag: 'Maven', dependencyManager: 'maven' }, + true + ), + generateScenario('java', '11', { baseImage: 'amazon/java11-base', sourceTag: 'Gradle' }, true), + generateScenario('java', '17', { baseImage: 'amazon/java17-base', sourceTag: 'Gradle' }, true), ] async function openSamAppFile(applicationPath: string): Promise { From 2af8b45b8e2ba68bf81f7254ddb1bd27a3cbe887 Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:57:52 -0500 Subject: [PATCH 063/202] fix(auth): malformed SSO cache didn't prompt reauth (#6164) ## Problem: When we loaded sso cache from disk, we would only invalidate (leading to a reauth prompt) if the cache file was missing. But if the cache file was present, though its content was malformed, we would incorrectly treat it as recoverable by throwing instead of returning undefined. Users would get stuck in a state where all future api calls would fail, and they'd never get a prompt to reauth to fix their SSO session. ## Solution: If we detect a SyntaxError treat it as non-recoverable, meaning it will trigger a reauth. Also added some code to validate the content of the SSO cache we loaded from disk to ensure it is what we expected. Fixes #6140 --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: nkomonen-amazon --- ...ug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json | 4 ++++ packages/core/src/auth/sso/cache.ts | 9 ++++++++- packages/core/src/shared/regions/regionProvider.ts | 2 +- packages/core/src/shared/utilities/cacheUtils.ts | 13 +++++++++++++ .../core/src/test/credentials/sso/cache.test.ts | 4 +++- .../credentials/sso/ssoAccessTokenProvider.test.ts | 1 + ...ug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json | 4 ++++ 7 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json b/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json new file mode 100644 index 00000000000..4e5bcf2cf8c --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Auth: SSO session was bad, but no reauth prompt given" +} diff --git a/packages/core/src/auth/sso/cache.ts b/packages/core/src/auth/sso/cache.ts index 1c2be980630..56fccb0d63f 100644 --- a/packages/core/src/auth/sso/cache.ts +++ b/packages/core/src/auth/sso/cache.ts @@ -10,11 +10,12 @@ import { getLogger } from '../../shared/logger/logger' import fs from '../../shared/fs/fs' import { createDiskCache, KeyedCache, mapCache } from '../../shared/utilities/cacheUtils' import { stripUndefined } from '../../shared/utilities/collectionUtils' -import { hasProps, selectFrom } from '../../shared/utilities/tsUtils' +import { getMissingProps, hasProps, selectFrom } from '../../shared/utilities/tsUtils' import { SsoToken, ClientRegistration } from './model' import { DevSettings } from '../../shared/settings' import { onceChanged } from '../../shared/utilities/functionUtils' import globals from '../../shared/extensionGlobals' +import { ToolkitError } from '../../shared/errors' interface RegistrationKey { readonly startUrl: string @@ -92,6 +93,12 @@ export function getTokenCache(directory = getCacheDir()): KeyedCache stripUndefined(token) + // Validate data is not missing. + const missingProps = getMissingProps(token, 'accessToken', 'refreshToken') + if (missingProps.length > 0) { + throw new ToolkitError(`SSO cache data unexpectedly missing props: ${JSON.stringify(missingProps)}`) + } + return { token, registration, diff --git a/packages/core/src/shared/regions/regionProvider.ts b/packages/core/src/shared/regions/regionProvider.ts index f7ecb2a64be..fed5919645d 100644 --- a/packages/core/src/shared/regions/regionProvider.ts +++ b/packages/core/src/shared/regions/regionProvider.ts @@ -15,7 +15,7 @@ import { AwsContext } from '../awsContext' import { getIdeProperties, isAmazonQ, isCloud9 } from '../extensionUtilities' import { ResourceFetcher } from '../resourcefetcher/resourcefetcher' import { isSsoConnection } from '../../auth/connection' -import { Auth } from '../../auth' +import { Auth } from '../../auth/auth' export const defaultRegion = 'us-east-1' export const defaultPartition = 'aws' diff --git a/packages/core/src/shared/utilities/cacheUtils.ts b/packages/core/src/shared/utilities/cacheUtils.ts index df2478df2c5..a3ccb5e55f5 100644 --- a/packages/core/src/shared/utilities/cacheUtils.ts +++ b/packages/core/src/shared/utilities/cacheUtils.ts @@ -116,10 +116,23 @@ export function createDiskCache( log('loaded', key) return result } catch (error) { + // Non-recoverable errors mean there is no usable data. + // Recoverable errors mean we can possibly use the data for something like + // an SSO token refresh, or to just retry. + // Returning undefined implies non-recoverable. + + // -- Non-recoverable Errors -- if (isFileNotFoundError(error)) { log('read failed (file not found)', key) return } + if (error instanceof SyntaxError) { + // file content was malformed or empty + log(`read failed (invalid JSON)`, key) + return + } + + // -- Recoverable Errors -- log(`read failed ${error}`, key) throw createDiskCacheError(error, 'LOAD', target, key) } diff --git a/packages/core/src/test/credentials/sso/cache.test.ts b/packages/core/src/test/credentials/sso/cache.test.ts index dce4850bc29..9feac195ac4 100644 --- a/packages/core/src/test/credentials/sso/cache.test.ts +++ b/packages/core/src/test/credentials/sso/cache.test.ts @@ -8,6 +8,7 @@ import * as path from 'path' import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities' import { getRegistrationCache, getTokenCache } from '../../../auth/sso/cache' import { fs } from '../../../shared' +import { SsoToken } from '../../../auth/sso/model' describe('SSO Cache', function () { const region = 'dummyRegion' @@ -26,7 +27,8 @@ describe('SSO Cache', function () { const validToken = { accessToken: 'longstringofrandomcharacters', expiresAt: new Date(Date.now() + hourInMs), - } + refreshToken: 'dummyRefreshToken', + } as SsoToken beforeEach(async function () { testDir = await makeTemporaryToolkitFolder() diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts index b662556e0aa..d284ac4668b 100644 --- a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts +++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts @@ -45,6 +45,7 @@ describe('SsoAccessTokenProvider', function () { return { accessToken: 'dummyAccessToken', expiresAt: new clock.Date(clock.Date.now() + timeDelta), + refreshToken: 'dummyRefreshToken', ...extras, } } diff --git a/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json b/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json new file mode 100644 index 00000000000..4e5bcf2cf8c --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Auth: SSO session was bad, but no reauth prompt given" +} From e63079d3d3af18a3af27914e842d915f307b38b3 Mon Sep 17 00:00:00 2001 From: chungjac Date: Wed, 11 Dec 2024 12:59:40 -0800 Subject: [PATCH 064/202] telemetry(amazonq): cleanup amazonq_utgGenerateTests logic #6212 ## Problem - Repetitive code when emitting amazonq_utgGenerateTests telemetry events - Metric has already been migrated to aws-toolkit-common ## Solution - Created sendTestGenerationToolkitEvent helper to extract common fields - Removed metric override in this repo - Tested and can confirm that metrics are same as previous method --- package-lock.json | 8 +- package.json | 2 +- .../amazonqTest/chat/controller/controller.ts | 110 +++++++------- .../chat/controller/messenger/messenger.ts | 38 +++-- .../src/codewhisperer/util/telemetryHelper.ts | 45 ++++++ .../src/shared/telemetry/vscodeTelemetry.json | 136 ------------------ 6 files changed, 119 insertions(+), 220 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a84022b32f..db823c798b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "vscode-nls-dev": "^4.0.4" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.284", + "@aws-toolkits/telemetry": "^1.0.287", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", @@ -5136,9 +5136,9 @@ } }, "node_modules/@aws-toolkits/telemetry": { - "version": "1.0.285", - "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.285.tgz", - "integrity": "sha512-O5/kbCE9cXF8scL5XmeDjMX9ojmCLvXg6cwcBayTS4URypI6XFat6drmaIF/QoDqxAfnHLHs0zypOdqSWCDr8w==", + "version": "1.0.287", + "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.287.tgz", + "integrity": "sha512-qK2l8Fv5Cvs865ap2evf4ikBREg33/jGw0lgxolqZLdHwm5zm/DkR9vNyqwhDlqDRlSgSlros3Z8zaiSBVRYVQ==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 5e5a67af5ed..20d53676e49 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.284", + "@aws-toolkits/telemetry": "^1.0.287", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 88490315e45..8eb75e38294 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -242,22 +242,20 @@ export class TestController { this.messenger.sendUpdatePromptProgress(data.tabID, null) const session = this.sessionStorage.getSession() const isCancel = data.error.message === unitTestGenerationCancelMessage - telemetry.amazonq_utgGenerateTests.emit({ - cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', - jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call - jobGroup: session.testGenerationJobGroupName, - requestId: session.startTestGenerationRequestId, - hasUserPromptSupplied: session.hasUserPromptSupplied, - isCodeBlockSelected: session.isCodeBlockSelected, - buildPayloadBytes: session.srcPayloadSize, - buildZipFileBytes: session.srcZipFileSize, - artifactsUploadDuration: session.artifactsUploadDuration, - perfClientLatency: performance.now() - session.testGenerationStartTime, - result: isCancel ? 'Cancelled' : 'Failed', - reasonDesc: getTelemetryReasonDesc(data.error), - isSupportedLanguage: true, - credentialStartUrl: AuthUtil.instance.startUrl, - }) + + TelemetryHelper.instance.sendTestGenerationToolkitEvent( + session, + true, + isCancel ? 'Cancelled' : 'Failed', + session.startTestGenerationRequestId, + performance.now() - session.testGenerationStartTime, + getTelemetryReasonDesc(data.error), + session.isCodeBlockSelected, + session.artifactsUploadDuration, + session.srcPayloadSize, + session.srcZipFileSize + ) + if (session.stopIteration) { // Error from Science this.messenger.sendMessage(data.error.message.replaceAll('```', ''), data.tabID, 'answer') @@ -716,27 +714,25 @@ export class TestController { // TODO: send the message once again once build is enabled // this.messenger.sendMessage('Accepted', message.tabID, 'prompt') telemetry.ui_click.emit({ elementId: 'unitTestGeneration_acceptDiff' }) - telemetry.amazonq_utgGenerateTests.emit({ - generatedCount: session.numberOfTestsGenerated, - acceptedCount: session.numberOfTestsGenerated, - generatedCharactersCount: session.charsOfCodeGenerated, - acceptedCharactersCount: session.charsOfCodeAccepted, - generatedLinesCount: session.linesOfCodeGenerated, - acceptedLinesCount: session.linesOfCodeAccepted, - cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', - jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0] - jobGroup: session.testGenerationJobGroupName, - requestId: session.startTestGenerationRequestId, - buildPayloadBytes: session.srcPayloadSize, - buildZipFileBytes: session.srcZipFileSize, - artifactsUploadDuration: session.artifactsUploadDuration, - hasUserPromptSupplied: session.hasUserPromptSupplied, - isCodeBlockSelected: session.isCodeBlockSelected, - perfClientLatency: session.latencyOfTestGeneration, - isSupportedLanguage: true, - credentialStartUrl: AuthUtil.instance.startUrl, - result: 'Succeeded', - }) + + TelemetryHelper.instance.sendTestGenerationToolkitEvent( + session, + true, + 'Succeeded', + session.startTestGenerationRequestId, + session.latencyOfTestGeneration, + undefined, + session.isCodeBlockSelected, + session.artifactsUploadDuration, + session.srcPayloadSize, + session.srcZipFileSize, + session.charsOfCodeAccepted, + session.numberOfTestsGenerated, + session.linesOfCodeAccepted, + session.charsOfCodeGenerated, + session.numberOfTestsGenerated, + session.linesOfCodeGenerated + ) await this.endSession(message, FollowUpTypes.SkipBuildAndFinish) await this.sessionCleanUp() @@ -840,27 +836,25 @@ export class TestController { private async endSession(data: any, step: FollowUpTypes) { const session = this.sessionStorage.getSession() if (step === FollowUpTypes.RejectCode) { - telemetry.amazonq_utgGenerateTests.emit({ - generatedCount: session.numberOfTestsGenerated, - acceptedCount: 0, - generatedCharactersCount: session.charsOfCodeGenerated, - acceptedCharactersCount: 0, - generatedLinesCount: session.linesOfCodeGenerated, - acceptedLinesCount: 0, - cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', - jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0] - jobGroup: session.testGenerationJobGroupName, - requestId: session.startTestGenerationRequestId, - buildPayloadBytes: session.srcPayloadSize, - buildZipFileBytes: session.srcZipFileSize, - artifactsUploadDuration: session.artifactsUploadDuration, - hasUserPromptSupplied: session.hasUserPromptSupplied, - isCodeBlockSelected: session.isCodeBlockSelected, - perfClientLatency: session.latencyOfTestGeneration, - isSupportedLanguage: true, - credentialStartUrl: AuthUtil.instance.startUrl, - result: 'Succeeded', - }) + TelemetryHelper.instance.sendTestGenerationToolkitEvent( + session, + true, + 'Succeeded', + session.startTestGenerationRequestId, + session.latencyOfTestGeneration, + undefined, + session.isCodeBlockSelected, + session.artifactsUploadDuration, + session.srcPayloadSize, + session.srcZipFileSize, + 0, + 0, + 0, + session.charsOfCodeGenerated, + session.numberOfTestsGenerated, + session.linesOfCodeGenerated + ) + telemetry.ui_click.emit({ elementId: 'unitTestGeneration_rejectDiff' }) } diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts index 745cc233154..10b496b69d3 100644 --- a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts @@ -36,9 +36,8 @@ import { CodeReference } from '../../../../amazonq/webview/ui/apps/amazonqCommon import { getHttpStatusCode, getRequestId, getTelemetryReasonDesc, ToolkitError } from '../../../../shared/errors' import { sleep, waitUntil } from '../../../../shared/utilities/timeoutUtils' import { keys } from '../../../../shared/utilities/tsUtils' -import { AuthUtil, testGenState } from '../../../../codewhisperer' +import { TelemetryHelper, testGenState } from '../../../../codewhisperer' import { cancellingProgressField, testGenCompletedField } from '../../../models/constants' -import { telemetry } from '../../../../shared/telemetry/telemetry' export type UnrecoverableErrorType = 'no-project-found' | 'no-open-file-found' | 'invalid-file-type' @@ -275,31 +274,28 @@ export class Messenger { .finally(async () => { if (testGenState.isCancelling()) { this.sendMessage(CodeWhispererConstants.unitTestGenerationCancelMessage, tabID, 'answer') - telemetry.amazonq_utgGenerateTests.emit({ - cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', - hasUserPromptSupplied: session.hasUserPromptSupplied, - perfClientLatency: performance.now() - session.testGenerationStartTime, - result: 'Cancelled', - reasonDesc: getTelemetryReasonDesc(CodeWhispererConstants.unitTestGenerationCancelMessage), - isSupportedLanguage: false, - credentialStartUrl: AuthUtil.instance.startUrl, - requestId: messageId, - }) + TelemetryHelper.instance.sendTestGenerationToolkitEvent( + session, + false, + 'Cancelled', + messageId, + performance.now() - session.testGenerationStartTime, + getTelemetryReasonDesc(CodeWhispererConstants.unitTestGenerationCancelMessage) + ) this.dispatcher.sendUpdatePromptProgress( new UpdatePromptProgressMessage(tabID, cancellingProgressField) ) await sleep(500) } else { - telemetry.amazonq_utgGenerateTests.emit({ - cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', - hasUserPromptSupplied: session.hasUserPromptSupplied, - perfClientLatency: performance.now() - session.testGenerationStartTime, - result: 'Succeeded', - isSupportedLanguage: false, - credentialStartUrl: AuthUtil.instance.startUrl, - requestId: messageId, - }) + TelemetryHelper.instance.sendTestGenerationToolkitEvent( + session, + false, + 'Succeeded', + messageId, + performance.now() - session.testGenerationStartTime + ) + this.dispatcher.sendUpdatePromptProgress( new UpdatePromptProgressMessage(tabID, testGenCompletedField) ) diff --git a/packages/core/src/codewhisperer/util/telemetryHelper.ts b/packages/core/src/codewhisperer/util/telemetryHelper.ts index bdb63b45727..9518aa610fc 100644 --- a/packages/core/src/codewhisperer/util/telemetryHelper.ts +++ b/packages/core/src/codewhisperer/util/telemetryHelper.ts @@ -27,6 +27,7 @@ import { CodeWhispererSupplementalContext } from '../models/model' import { FeatureConfigProvider } from '../../shared/featureConfig' import { CodeScanRemediationsEventType } from '../client/codewhispereruserclient' import { CodeAnalysisScope as CodeAnalysisScopeClientSide } from '../models/constants' +import { Session } from '../../amazonqTest/chat/session/session' export class TelemetryHelper { // Some variables for client component latency @@ -57,6 +58,50 @@ export class TelemetryHelper { return (this.#instance ??= new this()) } + public sendTestGenerationToolkitEvent( + session: Session, + isSupportedLanguage: boolean, + result: 'Succeeded' | 'Failed' | 'Cancelled', + requestId?: string, + perfClientLatency?: number, + reasonDesc?: string, + isCodeBlockSelected?: boolean, + artifactsUploadDuration?: number, + buildPayloadBytes?: number, + buildZipFileBytes?: number, + acceptedCharactersCount?: number, + acceptedCount?: number, + acceptedLinesCount?: number, + generatedCharactersCount?: number, + generatedCount?: number, + generatedLinesCount?: number, + reason?: string + ) { + telemetry.amazonq_utgGenerateTests.emit({ + cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext', + hasUserPromptSupplied: session.hasUserPromptSupplied, + isSupportedLanguage: isSupportedLanguage, + result: result, + artifactsUploadDuration: artifactsUploadDuration, + buildPayloadBytes: buildPayloadBytes, + buildZipFileBytes: buildZipFileBytes, + credentialStartUrl: AuthUtil.instance.startUrl, + acceptedCharactersCount: acceptedCharactersCount, + acceptedCount: acceptedCount, + acceptedLinesCount: acceptedLinesCount, + generatedCharactersCount: generatedCharactersCount, + generatedCount: generatedCount, + generatedLinesCount: generatedLinesCount, + isCodeBlockSelected: isCodeBlockSelected, + jobGroup: session.testGenerationJobGroupName, + jobId: session.listOfTestGenerationJobId[0], + perfClientLatency: perfClientLatency, + requestId: requestId, + reasonDesc: reasonDesc, + reason: reason, + }) + } + public recordServiceInvocationTelemetry( requestId: string, sessionId: string, diff --git a/packages/core/src/shared/telemetry/vscodeTelemetry.json b/packages/core/src/shared/telemetry/vscodeTelemetry.json index 48d5ab88f4c..5e32b249d4f 100644 --- a/packages/core/src/shared/telemetry/vscodeTelemetry.json +++ b/packages/core/src/shared/telemetry/vscodeTelemetry.json @@ -1,20 +1,5 @@ { "types": [ - { - "name": "acceptedCharactersCount", - "type": "int", - "description": "The number of accepted characters" - }, - { - "name": "acceptedCount", - "type": "int", - "description": "The number of accepted cases" - }, - { - "name": "acceptedLinesCount", - "type": "int", - "description": "The number of accepted lines of code" - }, { "name": "amazonGenerateApproachLatency", "type": "double", @@ -296,16 +281,6 @@ "type": "string", "description": "An AWS region." }, - { - "name": "buildPayloadBytes", - "type": "int", - "description": "The uncompressed payload size in bytes of the source files in customer project context" - }, - { - "name": "buildZipFileBytes", - "type": "int", - "description": "The compressed payload size of source files in bytes of customer project context sent" - }, { "name": "connectionState", "type": "string", @@ -380,46 +355,6 @@ "name": "executedCount", "type": "int", "description": "The number of executed operations" - }, - { - "name": "generatedCharactersCount", - "type": "int", - "description": "Number of characters of code generated" - }, - { - "name": "generatedCount", - "type": "int", - "description": "The number of generated cases" - }, - { - "name": "generatedLinesCount", - "type": "int", - "description": "The number of generated lines of code" - }, - { - "name": "hasUserPromptSupplied", - "type": "boolean", - "description": "True if user supplied prompt message as input else false" - }, - { - "name": "isCodeBlockSelected", - "type": "boolean", - "description": "True if user selected code snippet as input else false" - }, - { - "name": "isSupportedLanguage", - "type": "boolean", - "description": "Indicate if the language is supported" - }, - { - "name": "jobGroup", - "type": "string", - "description": "Job group name used in the operation" - }, - { - "name": "jobId", - "type": "string", - "description": "Job id used in the operation" } ], "metrics": [ @@ -1138,77 +1073,6 @@ } ] }, - { - "name": "amazonq_utgGenerateTests", - "description": "Client side invocation of the AmazonQ Unit Test Generation", - "metadata": [ - { - "type": "acceptedCharactersCount", - "required": false - }, - { - "type": "acceptedCount", - "required": false - }, - { - "type": "acceptedLinesCount", - "required": false - }, - { - "type": "artifactsUploadDuration", - "required": false - }, - { - "type": "buildPayloadBytes", - "required": false - }, - { - "type": "buildZipFileBytes", - "required": false - }, - { - "type": "credentialStartUrl", - "required": false - }, - { - "type": "cwsprChatProgrammingLanguage" - }, - { - "type": "generatedCharactersCount", - "required": false - }, - { - "type": "generatedCount", - "required": false - }, - { - "type": "generatedLinesCount", - "required": false - }, - { - "type": "hasUserPromptSupplied" - }, - { - "type": "isCodeBlockSelected", - "required": false - }, - { - "type": "isSupportedLanguage" - }, - { - "type": "jobGroup", - "required": false - }, - { - "type": "jobId", - "required": false - }, - { - "type": "perfClientLatency", - "required": false - } - ] - }, { "name": "ide_editCodeFile", "description": "User opened a code file with the given file extension. Client should DEDUPLICATE this metric (ideally hourly/daily). AWS-specific files should (also) emit `file_editAwsFile`.", From 5bfb867831cb9e8c475de5fb062607f37aa2991b Mon Sep 17 00:00:00 2001 From: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com> Date: Wed, 11 Dec 2024 14:34:08 -0800 Subject: [PATCH 065/202] telemetry(amazonq): Removing session cleanUp before emitting the telemetry event (#6211) ## Problem - If user clicks on Cancel button, IDE do `this.sessionCleanUp()` before emitting the metrics ## Solution - Removed this function `this.sessionCleanUp()` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/core/src/amazonqTest/chat/controller/controller.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 8eb75e38294..79d4d117057 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -315,7 +315,6 @@ export class TestController { case ButtonActions.STOP_TEST_GEN: testGenState.setToCancelling() telemetry.ui_click.emit({ elementId: 'unitTestGeneration_cancelTestGenerationProgress' }) - await this.sessionCleanUp() break case ButtonActions.STOP_BUILD: cancelBuild() From 39c844429dd538af36c071e53b4f128d6ce7b363 Mon Sep 17 00:00:00 2001 From: Avi Alpert <131792194+avi-alpert@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:00:22 -0500 Subject: [PATCH 066/202] test(amazonq): E2E test for /doc (#6215) Add an E2E test for Creating a README using /doc Moved reusable functions out of featureDev.test.ts to shared test framework --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/amazonq/test/e2e/amazonq/doc.test.ts | 113 ++++++++++++++++++ .../test/e2e/amazonq/featureDev.test.ts | 41 +++---- .../test/e2e/amazonq/framework/messenger.ts | 22 ++-- packages/core/package.json | 1 + 4 files changed, 143 insertions(+), 34 deletions(-) create mode 100644 packages/amazonq/test/e2e/amazonq/doc.test.ts diff --git a/packages/amazonq/test/e2e/amazonq/doc.test.ts b/packages/amazonq/test/e2e/amazonq/doc.test.ts new file mode 100644 index 00000000000..78322b63ab0 --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/doc.test.ts @@ -0,0 +1,113 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { qTestingFramework } from './framework/framework' +import sinon from 'sinon' +import { registerAuthHook, using } from 'aws-core-vscode/test' +import { loginToIdC } from './utils/setup' +import { Messenger } from './framework/messenger' +import { FollowUpTypes } from 'aws-core-vscode/amazonq' +import { i18n } from 'aws-core-vscode/shared' +import { docGenerationProgressMessage, DocGenerationStep, Mode } from 'aws-core-vscode/amazonqDoc' + +describe('Amazon Q Doc', async function () { + let framework: qTestingFramework + let tab: Messenger + + before(async function () { + /** + * The tests are getting throttled, only run them on stable for now + * + * TODO: Re-enable for all versions once the backend can handle them + */ + const testVersion = process.env['VSCODE_TEST_VERSION'] + if (testVersion && testVersion !== 'stable') { + this.skip() + } + + await using(registerAuthHook('amazonq-test-account'), async () => { + await loginToIdC() + }) + }) + + beforeEach(() => { + registerAuthHook('amazonq-test-account') + framework = new qTestingFramework('doc', true, []) + tab = framework.createTab() + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + describe('Quick action availability', () => { + it('Shows /doc when doc generation is enabled', async () => { + const command = tab.findCommand('/doc') + if (!command.length) { + assert.fail('Could not find command') + } + + if (command.length > 1) { + assert.fail('Found too many commands with the name /doc') + } + }) + + it('Does NOT show /doc when doc generation is NOT enabled', () => { + // The beforeEach registers a framework which accepts requests. If we don't dispose before building a new one we have duplicate messages + framework.dispose() + framework = new qTestingFramework('doc', false, []) + const tab = framework.createTab() + const command = tab.findCommand('/doc') + if (command.length > 0) { + assert.fail('Found command when it should not have been found') + } + }) + }) + + describe('/doc entry', () => { + beforeEach(async function () { + tab.addChatMessage({ command: '/doc' }) + await tab.waitForChatFinishesLoading() + }) + + it('Checks for initial follow ups', async () => { + await tab.waitForButtons([FollowUpTypes.CreateDocumentation, FollowUpTypes.UpdateDocumentation]) + }) + }) + + describe('Creates a README', () => { + beforeEach(async function () { + tab.addChatMessage({ command: '/doc' }) + await tab.waitForChatFinishesLoading() + }) + + it('Creates a README for root folder', async () => { + await tab.waitForButtons([FollowUpTypes.CreateDocumentation]) + + tab.clickButton(FollowUpTypes.CreateDocumentation) + + await tab.waitForText(i18n('AWS.amazonq.doc.answer.createReadme')) + + await tab.waitForButtons([FollowUpTypes.ProceedFolderSelection]) + + tab.clickButton(FollowUpTypes.ProceedFolderSelection) + + await tab.waitForText(docGenerationProgressMessage(DocGenerationStep.SUMMARIZING_FILES, Mode.CREATE)) + + await tab.waitForText( + `${i18n('AWS.amazonq.doc.answer.readmeCreated')} ${i18n('AWS.amazonq.doc.answer.codeResult')}` + ) + + await tab.waitForButtons([ + FollowUpTypes.AcceptChanges, + FollowUpTypes.MakeChanges, + FollowUpTypes.RejectChanges, + ]) + }) + }) +}) diff --git a/packages/amazonq/test/e2e/amazonq/featureDev.test.ts b/packages/amazonq/test/e2e/amazonq/featureDev.test.ts index 5b830834743..cc1670ced8f 100644 --- a/packages/amazonq/test/e2e/amazonq/featureDev.test.ts +++ b/packages/amazonq/test/e2e/amazonq/featureDev.test.ts @@ -22,22 +22,11 @@ describe('Amazon Q Feature Dev', function () { const fileLevelAcceptPrompt = `${prompt} and add a license, and a contributing file` const tooManyRequestsWaitTime = 100000 - function waitForButtons(buttons: FollowUpTypes[]) { - return tab.waitForEvent(() => { - return buttons.every((value) => tab.hasButton(value)) - }) - } - async function waitForText(text: string) { - await tab.waitForEvent( - () => { - return tab.getChatItems().some((chatItem) => chatItem.body === text) - }, - { - waitIntervalInMs: 250, - waitTimeoutInMs: 2000, - } - ) + await tab.waitForText(text, { + waitIntervalInMs: 250, + waitTimeoutInMs: 2000, + }) } async function iterate(prompt: string) { @@ -201,12 +190,12 @@ describe('Amazon Q Feature Dev', function () { it('Clicks accept code and click new task', async () => { await retryIfRequired(async () => { await Promise.any([ - waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), - waitForButtons([FollowUpTypes.Retry]), + tab.waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), + tab.waitForButtons([FollowUpTypes.Retry]), ]) }) tab.clickButton(FollowUpTypes.InsertCode) - await waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) tab.clickButton(FollowUpTypes.NewTask) await waitForText('What new task would you like to work on?') assert.deepStrictEqual(tab.getChatItems().pop()?.body, 'What new task would you like to work on?') @@ -215,15 +204,15 @@ describe('Amazon Q Feature Dev', function () { it('Iterates on codegen', async () => { await retryIfRequired(async () => { await Promise.any([ - waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), - waitForButtons([FollowUpTypes.Retry]), + tab.waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), + tab.waitForButtons([FollowUpTypes.Retry]), ]) }) tab.clickButton(FollowUpTypes.ProvideFeedbackAndRegenerateCode) await tab.waitForChatFinishesLoading() await iterate(codegenApproachPrompt) tab.clickButton(FollowUpTypes.InsertCode) - await waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) }) }) @@ -240,8 +229,8 @@ describe('Amazon Q Feature Dev', function () { ) await retryIfRequired(async () => { await Promise.any([ - waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), - waitForButtons([FollowUpTypes.Retry]), + tab.waitForButtons([FollowUpTypes.InsertCode, FollowUpTypes.ProvideFeedbackAndRegenerateCode]), + tab.waitForButtons([FollowUpTypes.Retry]), ]) }) }) @@ -271,7 +260,7 @@ describe('Amazon Q Feature Dev', function () { it('disables all action buttons when new task is clicked', async () => { tab.clickButton(FollowUpTypes.InsertCode) - await waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) tab.clickButton(FollowUpTypes.NewTask) await waitForText('What new task would you like to work on?') @@ -283,7 +272,7 @@ describe('Amazon Q Feature Dev', function () { it('disables all action buttons when close session is clicked', async () => { tab.clickButton(FollowUpTypes.InsertCode) - await waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) tab.clickButton(FollowUpTypes.CloseSession) await waitForText( "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow." @@ -335,7 +324,7 @@ describe('Amazon Q Feature Dev', function () { for (const filePath of filePaths) { await clickActionButton(filePath, 'accept-change') } - await waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) assert.ok(tab.hasButton(FollowUpTypes.InsertCode) === false) assert.ok(tab.hasButton(FollowUpTypes.ProvideFeedbackAndRegenerateCode) === false) diff --git a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts index c9953d6dd41..80e68f7481e 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts @@ -52,7 +52,7 @@ export class Messenger { const lastChatItem = this.getChatItems().pop() const option = lastChatItem?.followUp?.options?.filter((option) => option.type === type) - if (!option || option.length > 1) { + if (!option?.length || option.length > 1) { assert.fail('Could not find follow up option') } @@ -153,17 +153,23 @@ export class Messenger { return this.getActionsByFilePath(filePath).some((action) => action.name === actionName) } + async waitForText(text: string, waitOverrides?: MessengerOptions) { + await this.waitForEvent(() => { + return this.getChatItems().some((chatItem) => chatItem.body === text) + }, waitOverrides) + } + + async waitForButtons(buttons: FollowUpTypes[]) { + return this.waitForEvent(() => { + return buttons.every((value) => this.hasButton(value)) + }) + } + async waitForChatFinishesLoading() { return this.waitForEvent(() => this.getStore().loadingChat === false || this.hasButton(FollowUpTypes.Retry)) } - async waitForEvent( - event: () => boolean, - waitOverrides?: { - waitIntervalInMs: number - waitTimeoutInMs: number - } - ) { + async waitForEvent(event: () => boolean, waitOverrides?: MessengerOptions) { /** * Wait until the chat has finished loading. This happens when a backend request * has finished and responded in the chat diff --git a/packages/core/package.json b/packages/core/package.json index 88173eeea15..d65c968f8d1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,6 +20,7 @@ "./auth": "./dist/src/auth/index.js", "./amazonqGumby": "./dist/src/amazonqGumby/index.js", "./amazonqFeatureDev": "./dist/src/amazonqFeatureDev/index.js", + "./amazonqDoc": "./dist/src/amazonqDoc/index.js", "./amazonqScan": "./dist/src/amazonqScan/index.js", "./amazonqTest": "./dist/src/amazonqTest/index.js", "./codewhispererChat": "./dist/src/codewhispererChat/index.js", From 4335e1e1b761653f23a39382e3af71bd0aafaaca Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:44:05 -0500 Subject: [PATCH 067/202] fix(ec2): avoid wiping `authorized_keys` files on each connection (#6197) ## Problem Each EC2 remote vscode connection wipes the remote `.ssh/authorized_keys` file as a preventative measure to leaving stale keys there. However, we can do better by adding comments to the keys we add to this file, then selectively removing those keys on subsequent connections. ## Solution - Whenever we send keys to the instance, use `sed` to wipe all of the keys added by us. - determine keys added by us using a hint comment `#AWSToolkitForVSCode`. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Justin M. Keyes --- docs/arch_features.md | 4 +- packages/core/src/awsService/ec2/model.ts | 93 ++++++++++++---- packages/core/src/shared/vscode/env.ts | 3 + .../src/test/awsService/ec2/model.test.ts | 105 +++++++++++++++++- ...-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json | 4 + 5 files changed, 184 insertions(+), 25 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json diff --git a/docs/arch_features.md b/docs/arch_features.md index e697874678d..7a9c239d584 100644 --- a/docs/arch_features.md +++ b/docs/arch_features.md @@ -41,9 +41,11 @@ For connecting a new VSCode _terminal_, remote connect works like this: For EC2 specifically, there are a few additional steps: +1. Remote window connections are only supported for EC2 instances running a linux based OS such as Amazon Linux or Ubuntu. However, the terminal option is supported by all OS, and will open a Powershell-based terminal for Windows instances. 1. If connecting to EC2 instance via remote window, the toolkit generates temporary SSH keys (30 second lifetime), with the public key sent to the remote instance. - Key type is ed25519 if supported, or RSA otherwise. - - This connection will overwrite the `.ssh/authorized_keys` file on the remote machine with each connection. + - Lines in `.ssh/authorized_keys` marked with the comment `#AWSToolkitForVSCode` will be removed by AWS Toolkit. + - Assumes `.sss/authorized_keys` can be found under `/home/ec2-user/` on Amazon Linux and `/home/ubuntu/` on Ubuntu. 1. If insufficient permissions are detected on the attached IAM role, toolkit will prompt to add an inline policy with the necessary actions. 1. If SSM sessions remain open after closing the window/terminal, the toolkit will terminate them on-shutdown, or when starting another session to the same instance. diff --git a/packages/core/src/awsService/ec2/model.ts b/packages/core/src/awsService/ec2/model.ts index 0c10539b1ca..9a5e13feaef 100644 --- a/packages/core/src/awsService/ec2/model.ts +++ b/packages/core/src/awsService/ec2/model.ts @@ -44,6 +44,12 @@ export interface Ec2RemoteEnv extends VscodeRemoteConnection { ssmSession: SSM.StartSessionResponse } +export type Ec2OS = 'Amazon Linux' | 'Ubuntu' | 'macOS' +interface RemoteUser { + os: Ec2OS + name: string +} + export class Ec2Connecter implements vscode.Disposable { protected ssmClient: SsmClient protected ec2Client: Ec2Client @@ -198,10 +204,16 @@ export class Ec2Connecter implements vscode.Disposable { remoteEnv.SessionProcess, remoteEnv.hostname, remoteEnv.sshPath, - remoteUser, + remoteUser.name, testSession ) - await startVscodeRemote(remoteEnv.SessionProcess, remoteEnv.hostname, '/', remoteEnv.vscPath, remoteUser) + await startVscodeRemote( + remoteEnv.SessionProcess, + remoteEnv.hostname, + '/', + remoteEnv.vscPath, + remoteUser.name + ) } catch (err) { const message = err instanceof SshError ? 'Testing SSH connection to instance failed' : '' this.throwConnectionError(message, selection, err as Error) @@ -210,7 +222,10 @@ export class Ec2Connecter implements vscode.Disposable { } } - public async prepareEc2RemoteEnvWithProgress(selection: Ec2Selection, remoteUser: string): Promise { + public async prepareEc2RemoteEnvWithProgress( + selection: Ec2Selection, + remoteUser: RemoteUser + ): Promise { const timeout = new Timeout(60000) await showMessageWithCancel('AWS: Opening remote connection...', timeout) const remoteEnv = await this.prepareEc2RemoteEnv(selection, remoteUser).finally(() => timeout.cancel()) @@ -223,7 +238,7 @@ export class Ec2Connecter implements vscode.Disposable { return ssmSession } - public async prepareEc2RemoteEnv(selection: Ec2Selection, remoteUser: string): Promise { + public async prepareEc2RemoteEnv(selection: Ec2Selection, remoteUser: RemoteUser): Promise { const logger = this.configureRemoteConnectionLogger(selection.instanceId) const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap() const keyPair = await this.configureSshKeys(selection, remoteUser) @@ -271,38 +286,78 @@ export class Ec2Connecter implements vscode.Disposable { return logger } - public async configureSshKeys(selection: Ec2Selection, remoteUser: string): Promise { + public async configureSshKeys(selection: Ec2Selection, remoteUser: RemoteUser): Promise { const keyPair = await SshKeyPair.getSshKeyPair(`aws-ec2-key`, 30000) await this.sendSshKeyToInstance(selection, keyPair, remoteUser) return keyPair } + /** Removes old key(s) that we added to the remote ~/.ssh/authorized_keys file. */ + public async tryCleanKeys( + instanceId: string, + hintComment: string, + hostOS: Ec2OS, + remoteAuthorizedKeysPath: string + ) { + try { + const deleteExistingKeyCommand = getRemoveLinesCommand(hintComment, hostOS, remoteAuthorizedKeysPath) + await this.sendCommandAndWait(instanceId, deleteExistingKeyCommand) + } catch (e) { + getLogger().warn(`ec2: failed to clean keys: %O`, e) + } + } + + private async sendCommandAndWait(instanceId: string, command: string) { + return await this.ssmClient.sendCommandAndWait(instanceId, 'AWS-RunShellScript', { + commands: [command], + }) + } + public async sendSshKeyToInstance( selection: Ec2Selection, sshKeyPair: SshKeyPair, - remoteUser: string + remoteUser: RemoteUser ): Promise { const sshPubKey = await sshKeyPair.getPublicKey() + const hintComment = '#AWSToolkitForVSCode' - const remoteAuthorizedKeysPaths = `/home/${remoteUser}/.ssh/authorized_keys` - const command = `echo "${sshPubKey}" > ${remoteAuthorizedKeysPaths}` - const documentName = 'AWS-RunShellScript' + const remoteAuthorizedKeysPath = `/home/${remoteUser.name}/.ssh/authorized_keys` - await this.ssmClient.sendCommandAndWait(selection.instanceId, documentName, { - commands: [command], - }) + const appendStr = (s: string) => `echo "${s}" >> ${remoteAuthorizedKeysPath}` + const writeKeyCommand = appendStr([sshPubKey.replace('\n', ''), hintComment].join(' ')) + + await this.tryCleanKeys(selection.instanceId, hintComment, remoteUser.os, remoteAuthorizedKeysPath) + await this.sendCommandAndWait(selection.instanceId, writeKeyCommand) } - public async getRemoteUser(instanceId: string) { - const osName = await this.ssmClient.getTargetPlatformName(instanceId) - if (osName === 'Amazon Linux') { - return 'ec2-user' + public async getRemoteUser(instanceId: string): Promise { + const os = await this.ssmClient.getTargetPlatformName(instanceId) + if (os === 'Amazon Linux') { + return { name: 'ec2-user', os } } - if (osName === 'Ubuntu') { - return 'ubuntu' + if (os === 'Ubuntu') { + return { name: 'ubuntu', os } } - throw new ToolkitError(`Unrecognized OS name ${osName} on instance ${instanceId}`, { code: 'UnknownEc2OS' }) + throw new ToolkitError(`Unrecognized OS name ${os} on instance ${instanceId}`, { code: 'UnknownEc2OS' }) } } + +/** + * Generate bash command (as string) to remove lines containing `pattern`. + * @param pattern pattern for deleted lines. + * @param filepath filepath (as string) to target with the command. + * @returns bash command to remove lines from file. + */ +export function getRemoveLinesCommand(pattern: string, hostOS: Ec2OS, filepath: string): string { + if (pattern.includes('/')) { + throw new ToolkitError(`ec2: cannot match pattern containing '/', given: ${pattern}`) + } + // Linux allows not passing extension to -i, whereas macOS requires zero length extension. + return `sed -i${isLinux(hostOS) ? '' : " ''"} /${pattern}/d ${filepath}` +} + +function isLinux(os: Ec2OS): boolean { + return os === 'Amazon Linux' || os === 'Ubuntu' +} diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts index 18c83ddd8c9..e9c8c1983b1 100644 --- a/packages/core/src/shared/vscode/env.ts +++ b/packages/core/src/shared/vscode/env.ts @@ -149,6 +149,9 @@ export async function isCloudDesktop() { return (await new ChildProcess('/apollo/bin/getmyfabric').run().then((r) => r.exitCode)) === 0 } +export function isMac(): boolean { + return process.platform === 'darwin' +} /** Returns true if OS is Windows. */ export function isWin(): boolean { // if (isWeb()) { diff --git a/packages/core/src/test/awsService/ec2/model.test.ts b/packages/core/src/test/awsService/ec2/model.test.ts index d39de4ba1da..e113332a60d 100644 --- a/packages/core/src/test/awsService/ec2/model.test.ts +++ b/packages/core/src/test/awsService/ec2/model.test.ts @@ -5,7 +5,7 @@ import assert from 'assert' import * as sinon from 'sinon' -import { Ec2Connecter } from '../../../awsService/ec2/model' +import { Ec2Connecter, getRemoveLinesCommand } from '../../../awsService/ec2/model' import { SsmClient } from '../../../shared/clients/ssmClient' import { Ec2Client } from '../../../shared/clients/ec2Client' import { Ec2Selection } from '../../../awsService/ec2/prompter' @@ -15,6 +15,11 @@ import { SshKeyPair } from '../../../awsService/ec2/sshKeyPair' import { DefaultIamClient } from '../../../shared/clients/iamClient' import { assertNoTelemetryMatch, createTestWorkspaceFolder } from '../../testUtil' import { fs } from '../../../shared' +import path from 'path' +import { ChildProcess } from '../../../shared/utilities/processUtils' +import { isMac, isWin } from '../../../shared/vscode/env' +import { inspect } from '../../../shared/utilities/collectionUtils' +import { assertLogsContain } from '../../globalSetup.test' describe('Ec2ConnectClient', function () { let client: Ec2Connecter @@ -140,7 +145,7 @@ describe('Ec2ConnectClient', function () { } const keys = await SshKeyPair.getSshKeyPair('key', 30000) - await client.sendSshKeyToInstance(testSelection, keys, 'test-user') + await client.sendSshKeyToInstance(testSelection, keys, { name: 'test-user', os: 'Amazon Linux' }) sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript') sinon.restore() }) @@ -154,7 +159,7 @@ describe('Ec2ConnectClient', function () { } const testWorkspaceFolder = await createTestWorkspaceFolder() const keys = await SshKeyPair.getSshKeyPair('key', 60000) - await client.sendSshKeyToInstance(testSelection, keys, 'test-user') + await client.sendSshKeyToInstance(testSelection, keys, { name: 'test-user', os: 'Amazon Linux' }) const privKey = await fs.readFileText(keys.getPrivateKeyPath()) assertNoTelemetryMatch(privKey) sinon.restore() @@ -178,13 +183,13 @@ describe('Ec2ConnectClient', function () { it('identifies the user for ubuntu as ubuntu', async function () { getTargetPlatformNameStub.resolves('Ubuntu') const remoteUser = await client.getRemoteUser('testInstance') - assert.strictEqual(remoteUser, 'ubuntu') + assert.strictEqual(remoteUser.name, 'ubuntu') }) it('identifies the user for amazon linux as ec2-user', async function () { getTargetPlatformNameStub.resolves('Amazon Linux') const remoteUser = await client.getRemoteUser('testInstance') - assert.strictEqual(remoteUser, 'ec2-user') + assert.strictEqual(remoteUser.name, 'ec2-user') }) it('throws error when not given known OS', async function () { @@ -197,4 +202,94 @@ describe('Ec2ConnectClient', function () { } }) }) + + describe('tryCleanKeys', async function () { + it('calls the sdk with the proper parameters', async function () { + const sendCommandStub = sinon.stub(SsmClient.prototype, 'sendCommandAndWait') + + const testSelection = { + instanceId: 'test-id', + region: 'test-region', + } + + await client.tryCleanKeys(testSelection.instanceId, 'hint', 'macOS', 'path/to/keys') + sendCommandStub.calledWith(testSelection.instanceId, 'AWS-RunShellScript', { + commands: [getRemoveLinesCommand('hint', 'macOS', 'path/to/keys')], + }) + sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript') + sinon.restore() + }) + + it('logs warning when sdk call fails', async function () { + const sendCommandStub = sinon + .stub(SsmClient.prototype, 'sendCommandAndWait') + .throws(new ToolkitError('error')) + + const testSelection = { + instanceId: 'test-id', + region: 'test-region', + } + + await client.tryCleanKeys(testSelection.instanceId, 'hint', 'macOS', 'path/to/keys') + sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript', { + commands: [getRemoveLinesCommand('hint', 'macOS', 'path/to/keys')], + }) + sinon.restore() + assertLogsContain('failed to clean keys', false, 'warn') + }) + }) +}) + +describe('getRemoveLinesCommand', async function () { + let tempPath: { uri: { fsPath: string } } + + before(async function () { + tempPath = await createTestWorkspaceFolder() + }) + + after(async function () { + await fs.delete(tempPath.uri.fsPath, { recursive: true, force: true }) + }) + + it('removes lines containing pattern', async function () { + if (isWin()) { + this.skip() + } + // For the test, we only need to distinguish mac and linux + const hostOS = isMac() ? 'macOS' : 'Amazon Linux' + const lines = ['line1', 'line2 pattern', 'line3', 'line4 pattern', 'line5', 'line6 pattern', 'line7'] + const expected = ['line1', 'line3', 'line5', 'line7'] + + const lineToStr = (ls: string[]) => ls.join('\n') + '\n' + + const textFile = path.join(tempPath.uri.fsPath, 'test.txt') + const originalContent = lineToStr(lines) + await fs.writeFile(textFile, originalContent) + const [command, ...args] = getRemoveLinesCommand('pattern', hostOS, textFile).split(' ') + const process = new ChildProcess(command, args, { collect: true }) + const result = await process.run() + assert.strictEqual( + result.exitCode, + 0, + `Ran command '${command} ${args.join(' ')}' and failed with result ${inspect(result)}` + ) + + const newContent = await fs.readFileText(textFile) + assert.notStrictEqual(newContent, originalContent) + assert.strictEqual(newContent, lineToStr(expected)) + }) + + it('includes empty extension on macOS only', async function () { + const macCommand = getRemoveLinesCommand('pattern', 'macOS', 'test.txt') + const alCommand = getRemoveLinesCommand('pattern', 'Amazon Linux', 'test.txt') + const ubuntuCommand = getRemoveLinesCommand('pattern', 'Ubuntu', 'test.txt') + + assert.ok(macCommand.includes("''")) + assert.ok(!alCommand.includes("''")) + assert.strictEqual(ubuntuCommand, alCommand) + }) + + it('throws when given invalid pattern', function () { + assert.throws(() => getRemoveLinesCommand('pat/tern', 'macOS', 'test.txt')) + }) }) diff --git a/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json b/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json new file mode 100644 index 00000000000..b5d1767f0bd --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "EC2: avoid overwriting authorized_keys file on remote" +} From b7825d9182e907de4edb503926143d496c869c82 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Thu, 12 Dec 2024 17:58:40 +0000 Subject: [PATCH 068/202] fix(amazonq): diagnostics code is incorrect (#6214) ## Problem Diagnostics in problems panel show findingId as code which doesn't add any value ## Solution Use ruleId instead --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...g Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json | 4 ++++ .../service/diagnosticsProvider.test.ts | 14 ++++++++++++++ .../codewhisperer/service/diagnosticsProvider.ts | 9 +-------- 3 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json b/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json new file mode 100644 index 00000000000..d246629bcd0 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "/review: Diagnostics in the problems panel are mapped to the wrong code" +} diff --git a/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts index 4bf076eb23c..910aadb02b9 100644 --- a/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts @@ -12,6 +12,8 @@ import { removeDiagnostic, disposeSecurityDiagnostic, SecurityDiagnostic, + createSecurityDiagnostic, + codewhispererDiagnosticSourceLabel, } from 'aws-core-vscode/codewhisperer' import { createCodeScanIssue, createMockDocument, createTextDocumentChangeEvent } from 'aws-core-vscode/test' @@ -83,4 +85,16 @@ describe('diagnosticsProvider', function () { assert.strictEqual(actual[1].range.start.line, 5) assert.strictEqual(actual[1].range.end.line, 6) }) + + it('should create securityDiagnostic from codeScanIssue', function () { + const codeScanIssue = createCodeScanIssue() + const securityDiagnostic = createSecurityDiagnostic(codeScanIssue) + assert.strictEqual(securityDiagnostic.findingId, codeScanIssue.findingId) + assert.strictEqual(securityDiagnostic.message, codeScanIssue.title) + assert.strictEqual(securityDiagnostic.range.start.line, codeScanIssue.startLine) + assert.strictEqual(securityDiagnostic.range.end.line, codeScanIssue.endLine) + assert.strictEqual(securityDiagnostic.severity, vscode.DiagnosticSeverity.Warning) + assert.strictEqual(securityDiagnostic.source, codewhispererDiagnosticSourceLabel) + assert.strictEqual(securityDiagnostic.code, codeScanIssue.ruleId) + }) }) diff --git a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts index fb8e6a37d9a..3fcc9cb8b7d 100644 --- a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts +++ b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts @@ -74,14 +74,7 @@ export function createSecurityDiagnostic(securityIssue: CodeScanIssue) { vscode.DiagnosticSeverity.Warning ) securityDiagnostic.source = codewhispererDiagnosticSourceLabel - // const detectorUrl = securityIssue.recommendation.url - securityDiagnostic.code = securityIssue.findingId - // securityDiagnostic.code = detectorUrl - // ? { - // value: securityIssue.detectorId, - // target: vscode.Uri.parse(detectorUrl), - // } - // : securityIssue.detectorId + securityDiagnostic.code = securityIssue.ruleId securityDiagnostic.findingId = securityIssue.findingId return securityDiagnostic } From ce5e05bb2c0846b81f348a246052724bdfdadc26 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Thu, 12 Dec 2024 18:00:13 +0000 Subject: [PATCH 069/202] feat(amazonq): automatically scroll to fix section (#6210) ## Problem Code fix section is not automatically visible after clicking on generate fix inside code issue detail view. ## Solution - Changed the behavior of updating the webview so that it doesn't close/reopen a new panel every time - Added event listeners to trigger UI updates - Added scroll into view functionality --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-65d6b661-7ab8-409d-8af8-918db3e69a2d.json | 4 ++ .../securityIssue/securityIssueWebview.ts | 15 +++++--- .../views/securityIssue/vue/root.vue | 37 ++++++++++++++++++- 3 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json diff --git a/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json b/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json new file mode 100644 index 00000000000..0ef3537fc34 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "/review: Code fix automatically scrolls into view after generation." +} diff --git a/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts b/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts index 0a70d9e8319..7c1c655a937 100644 --- a/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts +++ b/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts @@ -24,6 +24,10 @@ import { ExtContext } from '../../../shared/extensions' export class SecurityIssueWebview extends VueWebview { public static readonly sourcePath: string = 'src/codewhisperer/views/securityIssue/vue/index.js' public readonly id = 'aws.codeWhisperer.securityIssue' + public readonly onChangeIssue = new vscode.EventEmitter() + public readonly onChangeFilePath = new vscode.EventEmitter() + public readonly onChangeGenerateFixLoading = new vscode.EventEmitter() + public readonly onChangeGenerateFixError = new vscode.EventEmitter() private issue: CodeScanIssue | undefined private filePath: string | undefined @@ -40,10 +44,12 @@ export class SecurityIssueWebview extends VueWebview { public setIssue(issue: CodeScanIssue) { this.issue = issue + this.onChangeIssue.fire(issue) } public setFilePath(filePath: string) { this.filePath = filePath + this.onChangeFilePath.fire(filePath) } public applyFix() { @@ -90,6 +96,7 @@ export class SecurityIssueWebview extends VueWebview { public setIsGenerateFixLoading(isGenerateFixLoading: boolean) { this.isGenerateFixLoading = isGenerateFixLoading + this.onChangeGenerateFixLoading.fire(isGenerateFixLoading) } public getIsGenerateFixError() { @@ -98,6 +105,7 @@ export class SecurityIssueWebview extends VueWebview { public setIsGenerateFixError(isGenerateFixError: boolean) { this.isGenerateFixError = isGenerateFixError + this.onChangeGenerateFixError.fire(isGenerateFixError) } public generateFix() { @@ -189,12 +197,7 @@ const Panel = VueWebview.compilePanel(SecurityIssueWebview) let activePanel: InstanceType | undefined export async function showSecurityIssueWebview(ctx: vscode.ExtensionContext, issue: CodeScanIssue, filePath: string) { - const previousPanel = activePanel - const previousId = previousPanel?.server?.getIssue()?.findingId - if (previousPanel && previousId) { - previousPanel.server.closeWebview(previousId) - } - activePanel = new Panel(ctx) + activePanel ??= new Panel(ctx) activePanel.server.setIssue(issue) activePanel.server.setFilePath(filePath) activePanel.server.setIsGenerateFixLoading(false) diff --git a/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue b/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue index a6f01cdbc2a..a086aea3089 100644 --- a/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue +++ b/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue @@ -47,7 +47,10 @@ -
+

Suggested code fix preview

@@ -57,7 +60,7 @@
-
+
@@ -201,6 +204,7 @@ export default defineComponent({ }, created() { this.getData() + this.setupEventListeners() }, beforeMount() { this.getData() @@ -223,6 +227,32 @@ export default defineComponent({ const fixedCode = await client.getFixedCode() this.updateFixedCode(fixedCode) }, + setupEventListeners() { + client.onChangeIssue(async (issue) => { + if (issue) { + this.updateFromIssue(issue) + } + const fixedCode = await client.getFixedCode() + this.updateFixedCode(fixedCode) + this.scrollTo('codeFixActions') + }) + client.onChangeFilePath(async (filePath) => { + const relativePath = await client.getRelativePath() + this.updateRelativePath(relativePath) + + const languageId = await client.getLanguageId() + if (languageId) { + this.updateLanguageId(languageId) + } + }) + client.onChangeGenerateFixLoading((isGenerateFixLoading) => { + this.isGenerateFixLoading = isGenerateFixLoading + this.scrollTo('codeFixSection') + }) + client.onChangeGenerateFixError((isGenerateFixError) => { + this.isGenerateFixError = isGenerateFixError + }) + }, updateRelativePath(relativePath: string) { this.relativePath = relativePath }, @@ -339,6 +369,9 @@ ${this.fixedCode} } return doc.body.innerHTML }, + scrollTo(refName: string) { + this.$nextTick(() => this.$refs?.[refName]?.scrollIntoView({ behavior: 'smooth' })) + }, }, computed: { severityImage() { From 003941ecb93a023e22cc9b71a4b8d3375e87d592 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:39:39 -0500 Subject: [PATCH 070/202] feat(ec2): enable EC2 experiment #6222 ## Problem EC2 is currently hidden behind dev mode. ## Solution Make it an experimental feature that customers can enable. Also, remove some old experiments from settings page description. --- packages/core/package.nls.json | 2 +- packages/core/src/awsexplorer/regionNode.ts | 4 +- .../core/src/shared/settings-toolkit.gen.ts | 3 +- packages/core/src/shared/settings.ts | 4 +- .../core/src/test/shared/settings.test.ts | 6 +-- ...-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json | 4 ++ packages/toolkit/package.json | 53 ++++++++++--------- 7 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index 2f92a23b5ac..f1a83c0c3e4 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -20,7 +20,7 @@ "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.", "AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files", "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.", - "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.\n * `iamPolicyChecks` - Enables IAM Policy Checks feature, allowing users to validate IAM policies against IAM policy grammar, AWS best practices, and specified security standards.", + "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `ec2RemoteConnect` - Allows interfacing with EC2 instances with options to start, stop, and establish remote connections. Remote connections are done over SSM and can be through a terminal or a remote VSCode window.", "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files", "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).", "AWS.configuration.description.awssam.debug.api": "API Gateway configuration", diff --git a/packages/core/src/awsexplorer/regionNode.ts b/packages/core/src/awsexplorer/regionNode.ts index 98fb14c369c..5e6e0b06d52 100644 --- a/packages/core/src/awsexplorer/regionNode.ts +++ b/packages/core/src/awsexplorer/regionNode.ts @@ -29,9 +29,9 @@ import { DefaultSchemaClient } from '../shared/clients/schemaClient' import { getEcsRootNode } from '../awsService/ecs/model' import { compareTreeItems, TreeShim } from '../shared/treeview/utils' import { Ec2ParentNode } from '../awsService/ec2/explorer/ec2ParentNode' -import { DevSettings } from '../shared/settings' import { Ec2Client } from '../shared/clients/ec2Client' import { isCloud9 } from '../shared/extensionUtilities' +import { Experiments } from '../shared/settings' interface ServiceNode { allRegions?: boolean @@ -65,7 +65,7 @@ const serviceCandidates: ServiceNode[] = [ }, { serviceId: 'ec2', - when: () => DevSettings.instance.isDevMode(), + when: () => Experiments.instance.isExperimentEnabled('ec2RemoteConnect'), createFn: (regionCode: string, partitionId: string) => new Ec2ParentNode(regionCode, partitionId, new Ec2Client(regionCode)), }, diff --git a/packages/core/src/shared/settings-toolkit.gen.ts b/packages/core/src/shared/settings-toolkit.gen.ts index ea291352701..66b7ac75ee9 100644 --- a/packages/core/src/shared/settings-toolkit.gen.ts +++ b/packages/core/src/shared/settings-toolkit.gen.ts @@ -41,7 +41,8 @@ export const toolkitSettings = { "ssoCacheError": {} }, "aws.experiments": { - "jsonResourceModification": {} + "jsonResourceModification": {}, + "ec2RemoteConnect": {} }, "aws.resources.enabledResources": {}, "aws.lambda.recentlyUploaded": {}, diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts index 190ed442017..a34ba2f8d2d 100644 --- a/packages/core/src/shared/settings.ts +++ b/packages/core/src/shared/settings.ts @@ -726,12 +726,12 @@ export class Experiments extends Settings.define( 'aws.experiments', toRecord(keys(experiments), () => Boolean) ) { - public async isExperimentEnabled(name: ExperimentName): Promise { + public isExperimentEnabled(name: ExperimentName): boolean { try { return this._getOrThrow(name, false) } catch (error) { this._log(`experiment check for ${name} failed: %s`, error) - await this.reset() + this.reset().catch((e) => getLogger().error(`failed to reset experiment settings: %O`, e)) return false } diff --git a/packages/core/src/test/shared/settings.test.ts b/packages/core/src/test/shared/settings.test.ts index 95e30eecfd6..08a31ff42f2 100644 --- a/packages/core/src/test/shared/settings.test.ts +++ b/packages/core/src/test/shared/settings.test.ts @@ -521,17 +521,17 @@ describe('Experiments', function () { // The `Experiments` class is basically an immutable form of `PromptSettings` it('returns false when the setting is missing', async function () { - assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false) + assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false) }) it('returns false for invalid types', async function () { await sut.update('jsonResourceModification', 'definitely a boolean' as unknown as boolean) - assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false) + assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false) }) it('returns true when the flag is set', async function () { await sut.update('jsonResourceModification', true) - assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), true) + assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), true) }) it('fires events from nested settings', async function () { diff --git a/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json b/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json new file mode 100644 index 00000000000..f8af3be5854 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. " +} diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 311f3d02d36..2949bc31e82 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -240,12 +240,17 @@ "type": "object", "markdownDescription": "%AWS.configuration.description.experiments%", "default": { - "jsonResourceModification": false + "jsonResourceModification": false, + "ec2RemoteConnect": false }, "properties": { "jsonResourceModification": { "type": "boolean", "default": false + }, + "ec2RemoteConnect": { + "type": "boolean", + "default": false } }, "additionalProperties": false @@ -1203,27 +1208,27 @@ }, { "command": "aws.ec2.openRemoteConnection", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.openTerminal", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.linkToLaunch", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.startInstance", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.stopInstance", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.rebootInstance", - "when": "aws.isDevMode" + "when": "config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.dev.openMenu", @@ -1448,62 +1453,67 @@ { "command": "aws.ec2.openTerminal", "group": "0@1", - "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/" + "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.openTerminal", "group": "inline@1", - "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/" + "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.linkToLaunch", "group": "0@1", - "when": "viewItem =~ /^(awsEc2ParentNode)$/" + "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.linkToLaunch", "group": "inline@1", - "when": "viewItem =~ /^(awsEc2ParentNode)$/" + "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.openRemoteConnection", "group": "0@1", - "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/" + "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.openRemoteConnection", "group": "inline@1", - "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/" + "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.startInstance", "group": "0@1", - "when": "viewItem == awsEc2StoppedNode" + "when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.startInstance", "group": "inline@1", - "when": "viewItem == awsEc2StoppedNode" + "when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.stopInstance", "group": "0@1", - "when": "viewItem == awsEc2RunningNode" + "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.stopInstance", "group": "inline@1", - "when": "viewItem == awsEc2RunningNode" + "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.rebootInstance", "group": "0@1", - "when": "viewItem == awsEc2RunningNode" + "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.rebootInstance", "group": "inline@1", - "when": "viewItem == awsEc2RunningNode" + "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect" + }, + { + "command": "aws.ec2.copyInstanceId", + "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/ && config.aws.experiments.ec2RemoteConnect", + "group": "2@0" }, { "command": "aws.ecr.createRepository", @@ -1605,11 +1615,6 @@ "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/", "group": "1@2" }, - { - "command": "aws.ec2.copyInstanceId", - "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/", - "group": "2@0" - }, { "command": "aws.ecr.copyTagUri", "when": "view == aws.explorer && viewItem == awsEcrTagNode", From fc600dc20aef93617148213ed744a4a20a3c7018 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 12 Dec 2024 18:43:28 +0000 Subject: [PATCH 071/202] Release 3.39.0 --- package-lock.json | 4 ++-- packages/toolkit/.changes/3.39.0.json | 22 +++++++++++++++++++ ...-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json | 4 ---- ...-868c7cda-80c1-4947-a498-3792f88622ad.json | 4 ---- ...-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json | 4 ---- ...-eb088612-3f07-4410-86f2-6e91131d3ffe.json | 4 ---- packages/toolkit/CHANGELOG.md | 7 ++++++ packages/toolkit/package.json | 2 +- 8 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 packages/toolkit/.changes/3.39.0.json delete mode 100644 packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json delete mode 100644 packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json delete mode 100644 packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json delete mode 100644 packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json diff --git a/package-lock.json b/package-lock.json index d26459f32e6..22e98756109 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21293,7 +21293,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.39.0-SNAPSHOT", + "version": "3.39.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/.changes/3.39.0.json b/packages/toolkit/.changes/3.39.0.json new file mode 100644 index 00000000000..f10ef838df4 --- /dev/null +++ b/packages/toolkit/.changes/3.39.0.json @@ -0,0 +1,22 @@ +{ + "date": "2024-12-12", + "version": "3.39.0", + "entries": [ + { + "type": "Bug Fix", + "description": "EC2: avoid overwriting authorized_keys file on remote" + }, + { + "type": "Bug Fix", + "description": "Auth: SSO session was bad, but no reauth prompt given" + }, + { + "type": "Feature", + "description": "Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. " + }, + { + "type": "Feature", + "description": "CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/)." + } + ] +} \ No newline at end of file diff --git a/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json b/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json deleted file mode 100644 index b5d1767f0bd..00000000000 --- a/packages/toolkit/.changes/next-release/Bug Fix-641a1ae0-3ad4-48c8-9628-ba739a06c8e5.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "EC2: avoid overwriting authorized_keys file on remote" -} diff --git a/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json b/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json deleted file mode 100644 index 4e5bcf2cf8c..00000000000 --- a/packages/toolkit/.changes/next-release/Bug Fix-868c7cda-80c1-4947-a498-3792f88622ad.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Auth: SSO session was bad, but no reauth prompt given" -} diff --git a/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json b/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json deleted file mode 100644 index f8af3be5854..00000000000 --- a/packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. " -} diff --git a/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json b/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json deleted file mode 100644 index 547ae687098..00000000000 --- a/packages/toolkit/.changes/next-release/Feature-eb088612-3f07-4410-86f2-6e91131d3ffe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/)." -} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 007faa84219..0362b5006c1 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,3 +1,10 @@ +## 3.39.0 2024-12-12 + +- **Bug Fix** EC2: avoid overwriting authorized_keys file on remote +- **Bug Fix** Auth: SSO session was bad, but no reauth prompt given +- **Feature** Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. +- **Feature** CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/). + ## 3.38.0 2024-12-10 - **Feature** Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/). diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 2949bc31e82..c856f6467a9 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.39.0-SNAPSHOT", + "version": "3.39.0", "extensionKind": [ "workspace" ], From 19679e63adf50517e83bf8889aa46361e4b71794 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 12 Dec 2024 20:46:32 +0000 Subject: [PATCH 072/202] Update version to snapshot version: 3.40.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/toolkit/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22e98756109..8fed8f50e90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21293,7 +21293,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.39.0", + "version": "3.40.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index c856f6467a9..da56f2e9470 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.39.0", + "version": "3.40.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 7789d96f5a221b10b7bac00291db99d33f855b5f Mon Sep 17 00:00:00 2001 From: Lei Gao <97199248+leigaol@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:21:10 -0800 Subject: [PATCH 073/202] refactor(amazonq): remove dead code #6218 --- packages/core/src/amazonq/lsp/lspController.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts index 5fed82b7bd9..bb5cc88f5a2 100644 --- a/packages/core/src/amazonq/lsp/lspController.ts +++ b/packages/core/src/amazonq/lsp/lspController.ts @@ -372,9 +372,6 @@ export class LspController { }) } finally { this._isIndexingInProgress = false - const repomapFile = await LspClient.instance.getRepoMapJSON() - // console.log(repomapFile) - getLogger().info(`File path ${repomapFile}`) } } From c45ecfb28216c9aea004ac0284c9b055e363229d Mon Sep 17 00:00:00 2001 From: vicheey Date: Thu, 12 Dec 2024 14:06:07 -0800 Subject: [PATCH 074/202] feat(wizards): support async showWhen(), SkipPrompter backward/forward #6166 ## Problem Wizard framework does not support: - async `showWhen()` provider. - restoring previous state of WizardPrompter in nested wizard when user clicks BACK button. - skipping prompter in backward direction. ## Solution - introduce `NestedWizard` class that uses child wizards as prompters with support for instantiating and restoring child wizards in backward direction. - update wizard state controller to support `ControlSingal.Skip` and add concept of wizard direction. - support async `showWhen()` provider. fix #6094 --- packages/core/src/dev/activation.ts | 4 +- .../core/src/shared/ui/common/skipPrompter.ts | 15 +- .../src/shared/ui/nestedWizardPrompter.ts | 63 +++ packages/core/src/shared/ui/wizardPrompter.ts | 26 +- .../src/shared/wizards/stateController.ts | 21 +- packages/core/src/shared/wizards/wizard.ts | 8 +- .../core/src/shared/wizards/wizardForm.ts | 22 +- .../test/shared/wizards/nestedWizard.test.ts | 446 ++++++++++++++++++ .../src/test/shared/wizards/wizard.test.ts | 4 +- .../test/shared/wizards/wizardTestUtils.ts | 7 +- 10 files changed, 585 insertions(+), 31 deletions(-) create mode 100644 packages/core/src/shared/ui/nestedWizardPrompter.ts create mode 100644 packages/core/src/test/shared/wizards/nestedWizard.test.ts diff --git a/packages/core/src/dev/activation.ts b/packages/core/src/dev/activation.ts index 7f37b0552eb..b4100b191ce 100644 --- a/packages/core/src/dev/activation.ts +++ b/packages/core/src/dev/activation.ts @@ -411,7 +411,7 @@ async function openStorageFromInput() { title: 'Enter a key', }) } else if (target === 'globalsView') { - return new SkipPrompter('') + return new SkipPrompter() } else if (target === 'globals') { // List all globalState keys in the quickpick menu. const items = globalState @@ -483,7 +483,7 @@ async function resetState() { this.form.key.bindPrompter(({ target }) => { if (target && resettableFeatures.some((f) => f.name === target)) { - return new SkipPrompter('') + return new SkipPrompter() } throw new Error('invalid feature target') }) diff --git a/packages/core/src/shared/ui/common/skipPrompter.ts b/packages/core/src/shared/ui/common/skipPrompter.ts index ab638ee7e18..b99b952de0f 100644 --- a/packages/core/src/shared/ui/common/skipPrompter.ts +++ b/packages/core/src/shared/ui/common/skipPrompter.ts @@ -3,24 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { StepEstimator } from '../../wizards/wizard' +import { StepEstimator, WIZARD_SKIP } from '../../wizards/wizard' import { Prompter, PromptResult } from '../prompter' -/** Pseudo-prompter that immediately returns a value (and thus "skips" a step). */ +/** Prompter that returns SKIP control signal to parent wizard */ export class SkipPrompter extends Prompter { - /** - * @param val Value immediately returned by the prompter. - */ - constructor(public readonly val: T) { + constructor() { super() } protected async promptUser(): Promise> { - const promptPromise = new Promise>((resolve) => { - resolve(this.val) - }) - - return await promptPromise + return WIZARD_SKIP } public get recentItem(): any { diff --git a/packages/core/src/shared/ui/nestedWizardPrompter.ts b/packages/core/src/shared/ui/nestedWizardPrompter.ts new file mode 100644 index 00000000000..cb3e91c8747 --- /dev/null +++ b/packages/core/src/shared/ui/nestedWizardPrompter.ts @@ -0,0 +1,63 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import { Wizard, WizardOptions } from '../wizards/wizard' +import { Prompter } from './prompter' +import { WizardPrompter } from './wizardPrompter' +import { createHash } from 'crypto' + +/** + * An abstract class that extends the base Wizard class plus the ability to + * use other wizard classes as prompters + */ +export abstract class NestedWizard extends Wizard { + /** + * Map to store memoized wizard instances using SHA-256 hashed keys + */ + private wizardInstances: Map = new Map() + + public constructor(options?: WizardOptions) { + super(options) + } + + /** + * Creates a prompter for a wizard instance with memoization. + * + * @template TWizard - The type of wizard, must extend Wizard + * @template TState - The type of state managed by the wizard + * + * @param wizardClass - The wizard class constructor + * @param args - Constructor arguments for the wizard instance + * + * @returns A wizard prompter to be used as prompter + * + * @example + * // Create a prompter for SyncWizard + * const prompter = this.createWizardPrompter( + * SyncWizard, + * template.uri, + * syncUrl + * ) + * + * @remarks + * - Instances are memoized using a SHA-256 hash of the wizard class name and arguments + * - The same wizard instance is reused for identical constructor parameters for restoring wizard prompter + * states during back button click event + */ + protected createWizardPrompter, TState>( + wizardClass: new (...args: any[]) => TWizard, + ...args: ConstructorParameters TWizard> + ): Prompter { + const memoizeKey = createHash('sha256') + .update(wizardClass.name + JSON.stringify(args)) + .digest('hex') + + if (!this.wizardInstances.get(memoizeKey)) { + this.wizardInstances.set(memoizeKey, new wizardClass(...args)) + } + + return new WizardPrompter(this.wizardInstances.get(memoizeKey)) as Prompter + } +} diff --git a/packages/core/src/shared/ui/wizardPrompter.ts b/packages/core/src/shared/ui/wizardPrompter.ts index 76256403375..d4a15c881bf 100644 --- a/packages/core/src/shared/ui/wizardPrompter.ts +++ b/packages/core/src/shared/ui/wizardPrompter.ts @@ -3,19 +3,26 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { StepEstimator, Wizard } from '../wizards/wizard' +import _ from 'lodash' +import { StepEstimator, Wizard, WIZARD_BACK, WIZARD_SKIP } from '../wizards/wizard' import { Prompter, PromptResult } from './prompter' /** - * Wraps {@link Wizard} object into its own {@link Prompter}, allowing wizards to use other - * wizards in their flows. + * Wraps {@link Wizard} object into its own {@link Prompter}, allowing wizards to use other wizards in their flows. + * This is meant to be used exclusively in createWizardPrompter() method of {@link NestedWizard} class. + * + * @remarks + * - The WizardPrompter class should never be instantiated with directly. + * - Use createWizardPrompter() method of {@link NestedWizard} when creating a nested wizard prompter for proper state management. + * - See examples: + * - {@link SingleNestedWizard} + * - {@link DoubleNestedWizard} */ export class WizardPrompter extends Prompter { public get recentItem(): any { return undefined } public set recentItem(response: any) {} - private stepOffset: number = 0 private response: T | undefined @@ -51,6 +58,15 @@ export class WizardPrompter extends Prompter { protected async promptUser(): Promise> { this.response = await this.wizard.run() - return this.response + + if (this.response === undefined) { + return WIZARD_BACK as PromptResult + } else if (_.isEmpty(this.response)) { + return WIZARD_SKIP as PromptResult + } + + return { + ...this.response, + } as PromptResult } } diff --git a/packages/core/src/shared/wizards/stateController.ts b/packages/core/src/shared/wizards/stateController.ts index fc84a4ce13f..bac52f7478c 100644 --- a/packages/core/src/shared/wizards/stateController.ts +++ b/packages/core/src/shared/wizards/stateController.ts @@ -9,7 +9,16 @@ export enum ControlSignal { Retry, Exit, Back, - Continue, + Skip, +} + +/** + * Value for indicating current direction of the wizard + * Created mainly to support skipping prompters + */ +export enum Direction { + Forward, + Backward, } export interface StepResult { @@ -39,9 +48,11 @@ export class StateMachineController { private extraSteps = new Map>() private steps: Branch = [] private internalStep: number = 0 + private direction: Direction public constructor(private state: TState = {} as TState) { this.previousStates = [_.cloneDeep(state)] + this.direction = Direction.Forward } public addStep(step: StepFunction): void { @@ -71,12 +82,14 @@ export class StateMachineController { this.state = this.previousStates.pop()! this.internalStep -= 1 + this.direction = Direction.Backward } protected advanceState(nextState: TState): void { this.previousStates.push(this.state) this.state = nextState this.internalStep += 1 + this.direction = Direction.Forward } protected detectCycle(step: StepFunction): TState | undefined { @@ -105,6 +118,12 @@ export class StateMachineController { } if (isMachineResult(result)) { + if (result.controlSignal === ControlSignal.Skip) { + /** + * Depending on current wizard direction, skip signal get converted to forward or backward control signal + */ + result.controlSignal = this.direction === Direction.Forward ? undefined : ControlSignal.Back + } return result } else { return { nextState: result } diff --git a/packages/core/src/shared/wizards/wizard.ts b/packages/core/src/shared/wizards/wizard.ts index d50399535bb..05d45584802 100644 --- a/packages/core/src/shared/wizards/wizard.ts +++ b/packages/core/src/shared/wizards/wizard.ts @@ -46,10 +46,12 @@ export const WIZARD_RETRY = { // eslint-disable-next-line @typescript-eslint/naming-convention export const WIZARD_BACK = { id: WIZARD_CONTROL, type: ControlSignal.Back, toString: () => makeControlString('Back') } // eslint-disable-next-line @typescript-eslint/naming-convention +export const WIZARD_SKIP = { id: WIZARD_CONTROL, type: ControlSignal.Skip, toString: () => makeControlString('Skip') } +// eslint-disable-next-line @typescript-eslint/naming-convention export const WIZARD_EXIT = { id: WIZARD_CONTROL, type: ControlSignal.Exit, toString: () => makeControlString('Exit') } /** Control signals allow for alterations of the normal wizard flow */ -export type WizardControl = typeof WIZARD_RETRY | typeof WIZARD_BACK | typeof WIZARD_EXIT +export type WizardControl = typeof WIZARD_RETRY | typeof WIZARD_BACK | typeof WIZARD_EXIT | typeof WIZARD_SKIP export function isWizardControl(obj: any): obj is WizardControl { return obj !== undefined && obj.id === WIZARD_CONTROL @@ -269,9 +271,7 @@ export class Wizard>> { if (isValidResponse(answer)) { state.stepCache.picked = prompter.recentItem - } - - if (!isValidResponse(answer)) { + } else { delete state.stepCache.stepOffset } diff --git a/packages/core/src/shared/wizards/wizardForm.ts b/packages/core/src/shared/wizards/wizardForm.ts index 23ca89b2273..7d3a55a2635 100644 --- a/packages/core/src/shared/wizards/wizardForm.ts +++ b/packages/core/src/shared/wizards/wizardForm.ts @@ -25,7 +25,7 @@ interface ContextOptions { * in a single resolution step then they will be added in the order in which they were * bound. */ - showWhen?: (state: WizardState) => boolean + showWhen?: (state: WizardState) => boolean | Promise /** * Sets a default value to the target property. This default is applied to the current state * as long as the property has not been set. @@ -135,7 +135,11 @@ export class WizardForm>> { this.formData.set(key, { ...this.formData.get(key), ...element }) } - public canShowProperty(prop: string, state: TState, defaultState: TState = this.applyDefaults(state)): boolean { + public canShowProperty( + prop: string, + state: TState, + defaultState: TState = this.applyDefaults(state) + ): boolean | Promise { const current = _.get(state, prop) const options = this.formData.get(prop) ?? {} @@ -143,8 +147,18 @@ export class WizardForm>> { return false } - if (options.showWhen !== undefined && !options.showWhen(defaultState as WizardState)) { - return false + if (options.showWhen !== undefined) { + const showStatus = options.showWhen(defaultState as WizardState) + if (showStatus instanceof Promise) { + return showStatus + .then((result) => { + return result + }) + .catch(() => { + return false // Default to not showing if there's an error + }) + } + return showStatus } return options.provider !== undefined diff --git a/packages/core/src/test/shared/wizards/nestedWizard.test.ts b/packages/core/src/test/shared/wizards/nestedWizard.test.ts new file mode 100644 index 00000000000..00f79fc06f2 --- /dev/null +++ b/packages/core/src/test/shared/wizards/nestedWizard.test.ts @@ -0,0 +1,446 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +import * as vscode from 'vscode' +import { createCommonButtons } from '../../../shared/ui/buttons' +import { NestedWizard } from '../../../shared/ui/nestedWizardPrompter' +import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter' +import * as assert from 'assert' +import { PrompterTester } from './prompterTester' +import { TestQuickPick } from '../vscode/quickInput' + +interface ChildWizardForm { + childWizardProp1: string + childWizardProp2: string + childWizardProp3: string +} + +interface SingleNestedWizardForm { + singleNestedWizardProp1: string + singleNestedWizardProp2: string + singleNestedWizardNestedProp: any + singleNestedWizardProp3: string +} + +interface DoubleNestedWizardForm { + doubleNestedWizardProp1: string + doubleNestedWizardProp2: string + doubleNestedWizardNestedProp: any + singleNestedWizardConditionalSkipProps: any + doubleNestedWizardProp3: string +} + +export function createTestPrompter(title: string, itemsString: string[]) { + const items: DataQuickPickItem[] = itemsString.map((s) => ({ + label: s, + data: s, + })) + + return createQuickPick(items, { title: title, buttons: createCommonButtons() }) +} + +class ChildWizard extends NestedWizard { + constructor() { + super() + this.form.childWizardProp1.bindPrompter(() => + createTestPrompter('ChildWizard Prompter 1', ['c1p1', '**', '***']) + ) + this.form.childWizardProp2.bindPrompter(() => + createTestPrompter('ChildWizard Prompter 2', ['c2p1', '**', '***']) + ) + this.form.childWizardProp3.bindPrompter(() => + createTestPrompter('ChildWizard Prompter 3', ['c3p1', '**', '***']) + ) + } +} + +class SingleNestedWizard extends NestedWizard { + constructor() { + super() + + this.form.singleNestedWizardProp1.bindPrompter(() => + createTestPrompter('SingleNestedWizard Prompter 1', ['s1p1', '**', '***']) + ) + this.form.singleNestedWizardProp2.bindPrompter(() => + createTestPrompter('SingleNestedWizard Prompter 2', ['s2p1', '**', '***']) + ) + this.form.singleNestedWizardNestedProp.bindPrompter(() => + this.createWizardPrompter(ChildWizard) + ) + this.form.singleNestedWizardProp3.bindPrompter(() => + createTestPrompter('SingleNestedWizard Prompter 3', ['s3p1', '**', '***']) + ) + } +} + +class DoubleNestedWizard extends NestedWizard { + constructor() { + super() + + this.form.doubleNestedWizardProp1.bindPrompter(() => + createTestPrompter('DoubleNestedWizard Prompter 1', ['d1p1', '**', '***']) + ) + this.form.doubleNestedWizardProp2.bindPrompter(() => + createTestPrompter('DoubleNestedWizard Prompter 2', ['d2p1', '**', '***']) + ) + this.form.doubleNestedWizardNestedProp.bindPrompter(() => + this.createWizardPrompter(SingleNestedWizard) + ) + this.form.doubleNestedWizardProp3.bindPrompter(() => + createTestPrompter('DoubleNestedWizard Prompter 3', ['d3p1', '**', '***']) + ) + } +} + +describe('NestedWizard', () => { + it('return the correct output from nested child wizard', async () => { + /** + * SingleNestedWizard + | + +-- Prompter 1 + | + +-- Prompter 2 + | + +-- ChildWizard + | | + | +-- Prompter 1 + | | + | +-- Prompter 2 + | | + | +-- Prompter 3 + | + +-- Prompter 3 + */ + const expectedCallOrders = [ + 'SingleNestedWizard Prompter 1', + 'SingleNestedWizard Prompter 2', + 'ChildWizard Prompter 1', + 'ChildWizard Prompter 2', + 'ChildWizard Prompter 3', + 'SingleNestedWizard Prompter 3', + ] + const expectedOutput = { + singleNestedWizardProp1: 's1p1', + singleNestedWizardProp2: 's2p1', + singleNestedWizardNestedProp: { + childWizardProp1: 'c1p1', + childWizardProp2: 'c2p1', + childWizardProp3: 'c3p1', + }, + singleNestedWizardProp3: 's3p1', + } + + const prompterTester = setupPrompterTester(expectedCallOrders) + + const parentWizard = new SingleNestedWizard() + const result = await parentWizard.run() + assertWizardOutput(prompterTester, expectedCallOrders, result, expectedOutput) + }) + + it('return the correct output from double nested child wizard', async () => { + /** + * DoubleNestedWizard + | + +-- Prompter 1 + | + +-- Prompter 2 + | + +-- SingleNestedWizard + | | + | +-- Prompter 1 + | | + | +-- Prompter 2 + | | + | +-- ChildWizard + | | | + | | +-- Prompter 1 + | | | + | | +-- Prompter 2 + | | | + | | +-- Prompter 3 + | | + | +-- Prompter 3 + | + +-- Prompter 3 + */ + const expectedCallOrders = [ + 'DoubleNestedWizard Prompter 1', + 'DoubleNestedWizard Prompter 2', + 'SingleNestedWizard Prompter 1', + 'SingleNestedWizard Prompter 2', + 'ChildWizard Prompter 1', + 'ChildWizard Prompter 2', + 'ChildWizard Prompter 3', + 'SingleNestedWizard Prompter 3', + 'DoubleNestedWizard Prompter 3', + ] + const expectedOutput = { + doubleNestedWizardProp1: 'd1p1', + doubleNestedWizardProp2: 'd2p1', + doubleNestedWizardNestedProp: { + singleNestedWizardProp1: 's1p1', + singleNestedWizardProp2: 's2p1', + singleNestedWizardNestedProp: { + childWizardProp1: 'c1p1', + childWizardProp2: 'c2p1', + childWizardProp3: 'c3p1', + }, + singleNestedWizardProp3: 's3p1', + }, + doubleNestedWizardProp3: 'd3p1', + } + + const prompterTester = setupPrompterTester(expectedCallOrders) + + const parentWizard = new DoubleNestedWizard() + const result = await parentWizard.run() + + assertWizardOutput(prompterTester, expectedCallOrders, result, expectedOutput) + }) + + it('regenerates child wizard prompters in correct reverse order when going backward (back button)', async () => { + /** + * DoubleNestedWizard + | + +--> Prompter 1 (1) + | + +--> Prompter 2 (2) + | + | SingleNestedWizard + | | + | +--> Prompter 1 (3) + | | + | +--> Prompter 2 (4) + | | + | | ChildWizard + | | | + | | +--> Prompter 1 (5) + | | | + | | +--> Prompter 2 (6) + | | | + | | +--> Prompter 3 (7) + | | | + | | +--> Prompter 2 (8) <-- Back + | | | + | | +--> Prompter 1 (9) <-- Back + | | | + | | +--> Prompter 2 (10) + | | | + | | +--> Prompter 3 (11) + | | + | +--> Prompter 3 (12) + | + +--> Prompter 3 (13) <-- Back + | + | SingleNestedWizard + | | + | +--> Prompter 3 (14) <-- Back + | | + | | ChildWizard + | | | + | | +--> Prompter 3 (15) + | | + | +--> Prompter 3 (16) + | + +--> Prompter 3 (17) + + */ + const expectedCallOrders = [ + 'DoubleNestedWizard Prompter 1', // 1 + 'DoubleNestedWizard Prompter 2', // 2 + 'SingleNestedWizard Prompter 1', // 3 + 'SingleNestedWizard Prompter 2', // 4 + 'ChildWizard Prompter 1', // 5 + 'ChildWizard Prompter 2', // 6 + 'ChildWizard Prompter 3', // 7 (Back button) + 'ChildWizard Prompter 2', // 8 (Back button) + 'ChildWizard Prompter 1', // 9 + 'ChildWizard Prompter 2', // 10 + 'ChildWizard Prompter 3', // 11 + 'SingleNestedWizard Prompter 3', // 12 + 'DoubleNestedWizard Prompter 3', // 13 (Back button) + 'SingleNestedWizard Prompter 3', // 14 (Back button) + 'ChildWizard Prompter 3', // 15 + 'SingleNestedWizard Prompter 3', // 16 + 'DoubleNestedWizard Prompter 3', // 17 + ] + const prompterTester = PrompterTester.init() + .handleQuickPick('DoubleNestedWizard Prompter 1', (quickPick) => { + // 1st + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick('DoubleNestedWizard Prompter 2', (quickPick) => { + // 2nd + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick('SingleNestedWizard Prompter 1', (quickPick) => { + // 3rd + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick('SingleNestedWizard Prompter 2', (quickPick) => { + // 4th + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick('ChildWizard Prompter 1', (quickPick) => { + // 5th + // 9th + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick( + 'ChildWizard Prompter 2', + (() => { + const generator = (function* () { + // 6th + // First call, choose '**' + yield async (picker: TestQuickPick) => { + await picker.untilReady() + assert.strictEqual(picker.items[1].label, '**') + picker.acceptItem(picker.items[1]) + } + // 8th + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.pressButton(vscode.QuickInputButtons.Back) + } + // 10th + // Second call and subsequent call, should restore previously selected option (**) + while (true) { + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[1]) + } + } + })() + + return (picker: TestQuickPick) => { + const next = generator.next().value + return next(picker) + } + })() + ) + .handleQuickPick( + 'ChildWizard Prompter 3', + (() => { + const generator = (function* () { + // 7th + // First call, check Back Button + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.pressButton(vscode.QuickInputButtons.Back) + } + // 11th + // 15th + while (true) { + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[0]) + } + } + })() + + return (picker: TestQuickPick) => { + const next = generator.next().value + return next(picker) + } + })() + ) + .handleQuickPick( + 'SingleNestedWizard Prompter 3', + (() => { + const generator = (function* () { + // 12th + // First call, choose '***' + yield async (picker: TestQuickPick) => { + await picker.untilReady() + assert.strictEqual(picker.items[2].label, '***') + picker.acceptItem(picker.items[2]) + } + // 14th + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.pressButton(vscode.QuickInputButtons.Back) + } + // 16th + // Second call and after should restore previously selected option (**) + while (true) { + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[2]) + } + } + })() + + return (picker: TestQuickPick) => { + const next = generator.next().value + return next(picker) + } + })() + ) + .handleQuickPick( + 'DoubleNestedWizard Prompter 3', + (() => { + const generator = (function* () { + // 13th + // First call, check Back Button + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.pressButton(vscode.QuickInputButtons.Back) + } + // 17th + // Default behavior for any subsequent calls + while (true) { + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[0]) + } + } + })() + + return (picker: TestQuickPick) => { + const next = generator.next().value + return next(picker) + } + })() + ) + .build() + + const parentWizard = new DoubleNestedWizard() + + const result = await parentWizard.run() + + assertWizardOutput(prompterTester, expectedCallOrders, result, { + doubleNestedWizardProp1: 'd1p1', + doubleNestedWizardProp2: 'd2p1', + doubleNestedWizardNestedProp: { + singleNestedWizardProp1: 's1p1', + singleNestedWizardProp2: 's2p1', + singleNestedWizardNestedProp: { + childWizardProp1: 'c1p1', + childWizardProp2: '**', + childWizardProp3: 'c3p1', + }, + singleNestedWizardProp3: '***', + }, + doubleNestedWizardProp3: 'd3p1', + }) + }) +}) + +function setupPrompterTester(titles: string[]) { + const prompterTester = PrompterTester.init() + titles.forEach((title) => { + prompterTester.handleQuickPick(title, (quickPick) => { + quickPick.acceptItem(quickPick.items[0]) + }) + }) + prompterTester.build() + return prompterTester +} + +function assertWizardOutput(prompterTester: PrompterTester, orderedTitle: string[], result: any, output: any) { + assert.deepStrictEqual(result, output) + orderedTitle.forEach((title, index) => { + prompterTester.assertCallOrder(title, index + 1) + }) +} diff --git a/packages/core/src/test/shared/wizards/wizard.test.ts b/packages/core/src/test/shared/wizards/wizard.test.ts index 04c3ac62fb4..188d25767c2 100644 --- a/packages/core/src/test/shared/wizards/wizard.test.ts +++ b/packages/core/src/test/shared/wizards/wizard.test.ts @@ -211,11 +211,11 @@ describe('Wizard', function () { it('binds prompter to (sync AND async) property', async function () { wizard.form.prop1.bindPrompter(() => helloPrompter) - wizard.form.prop3.bindPrompter(async () => new SkipPrompter('helloooo (async)')) + wizard.form.prop3.bindPrompter(async () => new SkipPrompter()) const result = await wizard.run() assert.strictEqual(result?.prop1, 'hello') - assert.strictEqual(result?.prop3, 'helloooo (async)') + assert(!result?.prop3) }) it('initializes state to empty object if not provided', async function () { diff --git a/packages/core/src/test/shared/wizards/wizardTestUtils.ts b/packages/core/src/test/shared/wizards/wizardTestUtils.ts index 5b9f7003b08..76c50f6ae94 100644 --- a/packages/core/src/test/shared/wizards/wizardTestUtils.ts +++ b/packages/core/src/test/shared/wizards/wizardTestUtils.ts @@ -156,8 +156,11 @@ export async function createWizardTester>(wizard: Wizard `No properties of "${propPath}" would be shown` ) case NOT_ASSERT_SHOW: - return () => - failIf(form.canShowProperty(propPath, state), `Property "${propPath}" would be shown`) + return async () => + failIf( + await form.canShowProperty(propPath, state), + `Property "${propPath}" would be shown` + ) case NOT_ASSERT_SHOW_ANY: return assertShowNone(propPath) case ASSERT_VALUE: From 75d1d88667a7a29f7df06a7b32ad134368619046 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:20:11 -0500 Subject: [PATCH 075/202] fix(ec2): unintuitive icon layout #6224 ## Problem EC2 icons are in an awkward order with the link to launch in-between the two connect options. ## Solution https://stackoverflow.com/questions/47613141/how-to-specify-the-order-of-icons-in-an-explorer-view-in-a-vscode-extension. Also update descriptions to fit UX guidelines. --- packages/core/package.nls.json | 4 ++-- packages/toolkit/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index f1a83c0c3e4..cab4f52dcee 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -142,8 +142,8 @@ "AWS.command.refreshAwsExplorer": "Refresh Explorer", "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer", "AWS.command.cdk.help": "View CDK Documentation", - "AWS.command.ec2.openTerminal": "Open terminal to EC2 instance...", - "AWS.command.ec2.openRemoteConnection": "Connect to EC2 instance in New Window...", + "AWS.command.ec2.openTerminal": "Open Terminal to EC2 Instance...", + "AWS.command.ec2.openRemoteConnection": "Connect VS Code to EC2 Instance...", "AWS.command.ec2.startInstance": "Start EC2 Instance", "AWS.command.ec2.linkToLaunch": "Launch EC2 Instance", "AWS.command.ec2.stopInstance": "Stop EC2 Instance", diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index da56f2e9470..0344109e11d 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -1462,12 +1462,12 @@ }, { "command": "aws.ec2.linkToLaunch", - "group": "0@1", + "group": "0@0", "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect" }, { "command": "aws.ec2.linkToLaunch", - "group": "inline@1", + "group": "inline@0", "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect" }, { From d9ba5f1db246cfcff5a5577113293bf5a816d2fa Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 12 Dec 2024 14:53:09 -0800 Subject: [PATCH 076/202] deps(amazonq): update mynah ui #6227 --- package-lock.json | 9 +++++---- .../Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json | 4 ++++ .../Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json | 4 ++++ .../Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json | 4 ++++ packages/core/package.json | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json create mode 100644 packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json diff --git a/package-lock.json b/package-lock.json index 8fed8f50e90..aaa5166cd55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6084,10 +6084,11 @@ } }, "node_modules/@aws/mynah-ui": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.0.tgz", - "integrity": "sha512-hEo9T1FeDoh79xA2nXaz3Le0SJES8YTuAOlleR8UKfbmzyfWzvvgO/yDIQ6dK39NO0cuQw+6XYGlIVDFpKfEkA==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.2.tgz", + "integrity": "sha512-zC/ck/m5nYXRwTs3EoiGNYR0jTfbrnovRloqlD07fmvTt9OpbWLhagg14Jr/+mqoYX3YWpqbLs9U56mqCLwHHQ==", "hasInstallScript": true, + "license": "Apache License 2.0", "dependencies": { "escape-html": "^1.0.3", "just-clone": "^6.2.0", @@ -21163,7 +21164,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.0", + "@aws/mynah-ui": "^4.21.2", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json b/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json new file mode 100644 index 00000000000..be18dd3ad1c --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly" +} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json b/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json new file mode 100644 index 00000000000..ae55b3d109e --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt." +} diff --git a/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json b/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json new file mode 100644 index 00000000000..d8bf9e34158 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Chat: improve font size and line-height in footer (below prompt input field)" +} diff --git a/packages/core/package.json b/packages/core/package.json index d65c968f8d1..a5287d1ee31 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -496,8 +496,8 @@ "dependencies": { "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client", "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming", - "@aws-sdk/client-cloudwatch-logs": "^3.666.0", "@aws-sdk/client-cloudformation": "^3.667.0", + "@aws-sdk/client-cloudwatch-logs": "^3.666.0", "@aws-sdk/client-cognito-identity": "^3.637.0", "@aws-sdk/client-lambda": "^3.637.0", "@aws-sdk/client-sso": "^3.342.0", @@ -508,7 +508,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.0", + "@aws/mynah-ui": "^4.21.2", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", From d6823149e6cd41b1072579f9f972b4ab5aa78a80 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:03:37 -0500 Subject: [PATCH 077/202] build(lint): disallow node process api, favor Toolkit ChildProcess api #6113 ## Problem contributors may use the low-level node `child_process` library, which lacks the instrumentation and robustness of the toolkit `ChildProcess` utility. Example: https://github.com/aws/aws-toolkit-vscode/pull/5925#discussion_r1841277911 ## Solution - add the node `child_process` library as a "banned import" with a message pointing to our `ChildProcess` utility. - Migrate simple cases to use our `ChildProcess`, mark more complex ones as exceptions. ## Future Work - To migrate the existing cases marked as exceptions, we will need to add functionality to our `ChildProcess` api, such as enforcing a `maxBufferSize` on the output. - Additionally, some of the current uses of `child_process` are tied to implementation details in the `child_process` library that make it hard to change without a larger-scale refactor. These cases were marked as exceptions. --- .eslintrc.js | 5 +++ .../scripts/build/generateServiceClient.ts | 2 +- .../core/scripts/test/launchTestUtilities.ts | 2 +- packages/core/src/amazonq/lsp/lspClient.ts | 4 +- .../accessanalyzer/vue/iamPolicyChecks.ts | 42 +++++++++---------- .../commands/startTestGeneration.ts | 2 +- .../transformByQ/transformMavenHandler.ts | 3 +- .../transformProjectValidationHandler.ts | 3 +- .../src/lambda/commands/createNewSamApp.ts | 6 ++- packages/core/src/shared/extensions/git.ts | 2 +- .../src/shared/sam/cli/samCliInvokerUtils.ts | 2 +- .../src/shared/sam/cli/samCliLocalInvoke.ts | 4 +- .../src/shared/sam/debugger/goSamDebug.ts | 15 ++++--- .../core/src/shared/utilities/processUtils.ts | 9 +++- .../test/shared/sam/cli/samCliBuild.test.ts | 2 +- .../test/shared/sam/cli/samCliInit.test.ts | 2 +- .../sam/cli/testSamCliProcessInvoker.ts | 2 +- .../testInteg/shared/extensions/git.test.ts | 2 +- packages/core/src/testLint/testUtils.ts | 2 +- scripts/createRelease.ts | 2 +- scripts/generateNonCodeFiles.ts | 2 +- scripts/newChange.ts | 2 +- scripts/package.ts | 2 +- scripts/prepare.ts | 2 +- 24 files changed, 70 insertions(+), 51 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a25a9d18003..b3e5e39dc9f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -199,6 +199,11 @@ module.exports = { name: 'fs', message: 'Avoid node:fs and use shared/fs/fs.ts when possible.', }, + { + name: 'child_process', + message: + 'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.', + }, ], }, ], diff --git a/packages/core/scripts/build/generateServiceClient.ts b/packages/core/scripts/build/generateServiceClient.ts index c095fe5ed54..4c6fb730b19 100644 --- a/packages/core/scripts/build/generateServiceClient.ts +++ b/packages/core/scripts/build/generateServiceClient.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as proc from 'child_process' +import * as proc from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' diff --git a/packages/core/scripts/test/launchTestUtilities.ts b/packages/core/scripts/test/launchTestUtilities.ts index bf3fd6614b3..92afb769275 100644 --- a/packages/core/scripts/test/launchTestUtilities.ts +++ b/packages/core/scripts/test/launchTestUtilities.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as proc from 'child_process' +import * as proc from 'child_process' // eslint-disable-line no-restricted-imports import packageJson from '../../package.json' import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath } from '@vscode/test-electron' import { join, resolve } from 'path' diff --git a/packages/core/src/amazonq/lsp/lspClient.ts b/packages/core/src/amazonq/lsp/lspClient.ts index 359d8d24256..3969a3313e9 100644 --- a/packages/core/src/amazonq/lsp/lspClient.ts +++ b/packages/core/src/amazonq/lsp/lspClient.ts @@ -10,7 +10,7 @@ import * as vscode from 'vscode' import * as path from 'path' import * as nls from 'vscode-nls' -import * as cp from 'child_process' +import { spawn } from 'child_process' // eslint-disable-line no-restricted-imports import * as crypto from 'crypto' import * as jose from 'jose' @@ -199,7 +199,7 @@ export async function activate(extensionContext: ExtensionContext) { const nodename = process.platform === 'win32' ? 'node.exe' : 'node' - const child = cp.spawn(extensionContext.asAbsolutePath(path.join('resources', nodename)), [ + const child = spawn(extensionContext.asAbsolutePath(path.join('resources', nodename)), [ serverModule, ...debugOptions.execArgv, ]) diff --git a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts index d32b7ba9dd1..da9c0738819 100644 --- a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts +++ b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts @@ -12,7 +12,6 @@ import { VueWebview, VueWebviewPanel } from '../../../webviews/main' import { ExtContext } from '../../../shared/extensions' import { telemetry } from '../../../shared/telemetry/telemetry' import { AccessAnalyzer, SharedIniFileCredentials } from 'aws-sdk' -import { execFileSync } from 'child_process' import { ToolkitError } from '../../../shared/errors' import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities' import { globals } from '../../../shared' @@ -28,6 +27,7 @@ import { } from './constants' import { DefaultS3Client, parseS3Uri } from '../../../shared/clients/s3Client' import { ExpiredTokenException } from '@aws-sdk/client-sso-oidc' +import { ChildProcess } from '../../../shared/utilities/processUtils' const defaultTerraformConfigPath = 'resources/policychecks-tf-default.yaml' // Diagnostics for Custom checks are shared @@ -277,7 +277,7 @@ export class IamPolicyChecksWebview extends VueWebview { '--config', `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`, ] - this.executeValidatePolicyCommand({ + await this.executeValidatePolicyCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -300,7 +300,7 @@ export class IamPolicyChecksWebview extends VueWebview { if (cfnParameterPath !== '') { args.push('--template-configuration-file', `${cfnParameterPath}`) } - this.executeValidatePolicyCommand({ + await this.executeValidatePolicyCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -357,7 +357,7 @@ export class IamPolicyChecksWebview extends VueWebview { '--reference-policy-type', `${policyType}`, ] - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -391,7 +391,7 @@ export class IamPolicyChecksWebview extends VueWebview { if (cfnParameterPath !== '') { args.push('--template-configuration-file', `${cfnParameterPath}`) } - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -454,7 +454,7 @@ export class IamPolicyChecksWebview extends VueWebview { if (resources !== '') { args.push('--resources', `${resources}`) } - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -489,7 +489,7 @@ export class IamPolicyChecksWebview extends VueWebview { if (cfnParameterPath !== '') { args.push('--template-configuration-file', `${cfnParameterPath}`) } - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -525,7 +525,7 @@ export class IamPolicyChecksWebview extends VueWebview { '--config', `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`, ] - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -554,7 +554,7 @@ export class IamPolicyChecksWebview extends VueWebview { if (cfnParameterPath !== '') { args.push('--template-configuration-file', `${cfnParameterPath}`) } - this.executeCustomPolicyChecksCommand({ + await this.executeCustomPolicyChecksCommand({ command, args, cfnParameterPathExists: !!cfnParameterPath, @@ -573,16 +573,16 @@ export class IamPolicyChecksWebview extends VueWebview { } } - public executeValidatePolicyCommand(opts: PolicyCommandOpts & { policyType?: PolicyChecksPolicyType }) { - telemetry.accessanalyzer_iamPolicyChecksValidatePolicy.run((span) => { + public async executeValidatePolicyCommand(opts: PolicyCommandOpts & { policyType?: PolicyChecksPolicyType }) { + await telemetry.accessanalyzer_iamPolicyChecksValidatePolicy.run(async (span) => { try { span.record({ cfnParameterFileUsed: opts.cfnParameterPathExists, documentType: opts.documentType, inputPolicyType: opts.policyType ?? 'None', }) - const resp = execFileSync(opts.command, opts.args) - const findingsCount = this.handleValidatePolicyCliResponse(resp.toString()) + const result = await ChildProcess.run(opts.command, opts.args, { collect: true }) + const findingsCount = this.handleValidatePolicyCliResponse(result.stdout) span.record({ findingsCount: findingsCount, }) @@ -633,10 +633,10 @@ export class IamPolicyChecksWebview extends VueWebview { return findingsCount } - public executeCustomPolicyChecksCommand( + public async executeCustomPolicyChecksCommand( opts: PolicyCommandOpts & { checkType: PolicyChecksCheckType; referencePolicyType?: PolicyChecksPolicyType } ) { - telemetry.accessanalyzer_iamPolicyChecksCustomChecks.run((span) => { + await telemetry.accessanalyzer_iamPolicyChecksCustomChecks.run(async (span) => { try { span.record({ cfnParameterFileUsed: opts.cfnParameterPathExists, @@ -645,8 +645,8 @@ export class IamPolicyChecksWebview extends VueWebview { inputPolicyType: 'None', // Note: This will change once JSON policy language is enabled for Custom policy checks referencePolicyType: opts.referencePolicyType ?? 'None', }) - const resp = execFileSync(opts.command, opts.args) - const findingsCount = this.handleCustomPolicyChecksCliResponse(resp.toString()) + const resp = await ChildProcess.run(opts.command, opts.args) + const findingsCount = this.handleCustomPolicyChecksCliResponse(resp.stdout) span.record({ findingsCount: findingsCount, }) @@ -790,7 +790,7 @@ export async function renderIamPolicyChecks(context: ExtContext): Promise { } // Check if Cfn and Tf tools are installed -export function arePythonToolsInstalled(): boolean { +export async function arePythonToolsInstalled(): Promise { const logger: Logger = getLogger() let cfnToolInstalled = true let tfToolInstalled = true try { - execFileSync('tf-policy-validator') + await ChildProcess.run('tf-policy-validator') } catch (err: any) { if (isProcessNotFoundErr(err.message)) { tfToolInstalled = false @@ -841,7 +841,7 @@ export function arePythonToolsInstalled(): boolean { } } try { - execFileSync('cfn-policy-validator') + await ChildProcess.run('cfn-policy-validator') } catch (err: any) { if (isProcessNotFoundErr(err.message)) { cfnToolInstalled = false diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts index 39750a8b3ff..25264370c37 100644 --- a/packages/core/src/codewhisperer/commands/startTestGeneration.ts +++ b/packages/core/src/codewhisperer/commands/startTestGeneration.ts @@ -17,7 +17,7 @@ import { import path from 'path' import { testGenState } from '..' import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession' -import { ChildProcess, spawn } from 'child_process' +import { ChildProcess, spawn } from 'child_process' // eslint-disable-line no-restricted-imports import { BuildStatus } from '../../amazonqTest/chat/session/session' import { fs } from '../../shared/fs/fs' import { TestGenerationJobStatus } from '../models/constants' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts index 6e0583459d2..8ba8504e436 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts @@ -6,7 +6,8 @@ import * as vscode from 'vscode' import { FolderInfo, transformByQState } from '../../models/model' import { getLogger } from '../../../shared/logger' import * as CodeWhispererConstants from '../../models/constants' -import { spawnSync } from 'child_process' // Consider using ChildProcess once we finalize all spawnSync calls +// Consider using ChildProcess once we finalize all spawnSync calls +import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports import { CodeTransformBuildCommand, telemetry } from '../../../shared/telemetry/telemetry' import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState' import { ToolkitError } from '../../../shared/errors' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts index 143f20af51a..33b4777b28e 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts @@ -6,7 +6,8 @@ import { BuildSystem, JDKVersion, TransformationCandidateProject } from '../../m import { getLogger } from '../../../shared/logger' import * as CodeWhispererConstants from '../../models/constants' import * as vscode from 'vscode' -import { spawnSync } from 'child_process' // Consider using ChildProcess once we finalize all spawnSync calls +// Consider using ChildProcess once we finalize all spawnSync calls +import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports import { NoJavaProjectsFoundError, NoMavenJavaProjectsFoundError, diff --git a/packages/core/src/lambda/commands/createNewSamApp.ts b/packages/core/src/lambda/commands/createNewSamApp.ts index 38e10a2237e..629130dbb2a 100644 --- a/packages/core/src/lambda/commands/createNewSamApp.ts +++ b/packages/core/src/lambda/commands/createNewSamApp.ts @@ -45,7 +45,6 @@ import { isCloud9, getLaunchConfigDocUrl, } from '../../shared/extensionUtilities' -import { execFileSync } from 'child_process' import { checklogs } from '../../shared/localizedText' import globals from '../../shared/extensionGlobals' import { telemetry } from '../../shared/telemetry/telemetry' @@ -53,6 +52,7 @@ import { LambdaArchitecture, Result, Runtime } from '../../shared/telemetry/tele import { getTelemetryReason, getTelemetryResult } from '../../shared/errors' import { openUrl, replaceVscodeVars } from '../../shared/utilities/vsCodeUtils' import { fs } from '../../shared' +import { ChildProcess } from '../../shared/utilities/processUtils' export const samInitTemplateFiles: string[] = ['template.yaml', 'template.yml'] export const samInitReadmeFile: string = 'README.TOOLKIT.md' @@ -218,7 +218,9 @@ export async function createNewSamApplication( // Needs to be done or else gopls won't start if (goRuntimes.includes(createRuntime)) { try { - execFileSync('go', ['mod', 'tidy'], { cwd: path.join(path.dirname(templateUri.fsPath), 'hello-world') }) + await ChildProcess.run('go', ['mod', 'tidy'], { + spawnOptions: { cwd: path.join(path.dirname(templateUri.fsPath), 'hello-world') }, + }) } catch (err) { getLogger().warn( localize( diff --git a/packages/core/src/shared/extensions/git.ts b/packages/core/src/shared/extensions/git.ts index c11a5fe8bd0..32f21a51df3 100644 --- a/packages/core/src/shared/extensions/git.ts +++ b/packages/core/src/shared/extensions/git.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode' import * as GitTypes from '../../../types/git.d' import { SemVer, parse as semverParse } from 'semver' -import { execFile } from 'child_process' +import { execFile } from 'child_process' // eslint-disable-line no-restricted-imports import { promisify } from 'util' import { VSCODE_EXTENSION_ID } from '../extensions' import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities' diff --git a/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts b/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts index 78b74d020ac..e307c15a102 100644 --- a/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts +++ b/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpawnOptions } from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import { getLogger } from '../../logger' import { getUserAgent } from '../../telemetry/util' import { ChildProcessResult, ChildProcessOptions } from '../../utilities/processUtils' diff --git a/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts b/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts index d0bea65b118..9573ffac7e6 100644 --- a/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts +++ b/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as proc from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import { pushIf } from '../../utilities/collectionUtils' import * as nls from 'vscode-nls' import { getLogger, getDebugConsoleLogger, Logger } from '../../logger' @@ -30,7 +30,7 @@ export const waitForDebuggerMessages = { export interface SamLocalInvokeCommandArgs { command: string args: string[] - options?: proc.SpawnOptions + options?: SpawnOptions /** Wait until strings specified in `debuggerAttachCues` appear in the process output. */ waitForCues: boolean timeout?: Timeout diff --git a/packages/core/src/shared/sam/debugger/goSamDebug.ts b/packages/core/src/shared/sam/debugger/goSamDebug.ts index 030f27cd278..567ecaa18cb 100644 --- a/packages/core/src/shared/sam/debugger/goSamDebug.ts +++ b/packages/core/src/shared/sam/debugger/goSamDebug.ts @@ -18,7 +18,7 @@ import { getLogger } from '../../logger' import fs from '../../fs/fs' import { ChildProcess } from '../../utilities/processUtils' import { Timeout } from '../../utilities/timeoutUtils' -import { execFileSync, SpawnOptions } from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import * as nls from 'vscode-nls' import { sleep } from '../../utilities/timeoutUtils' import globals from '../../extensionGlobals' @@ -174,9 +174,11 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom // Go from trying to find the manifest file and uses GOPATH provided below. installOptions.env!['GO111MODULE'] = 'off' - function getDelveVersion(repo: string, silent: boolean): string { + async function getDelveVersion(repo: string, silent: boolean): Promise { try { - return execFileSync('git', ['-C', repo, 'describe', '--tags', '--abbrev=0']).toString().trim() + return ( + await ChildProcess.run('git', ['-C', repo, 'describe', '--tags', '--abbrev=0'], { collect: true }) + ).stdout.trim() } catch (e) { if (!silent) { throw e @@ -187,7 +189,8 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom // It's fine if we can't get the latest Delve version, the Toolkit will use the last built one instead try { - const goPath: string = JSON.parse(execFileSync('go', ['env', '-json']).toString()).GOPATH + const result = await ChildProcess.run('go', ['env', '-json'], { collect: true }) + const goPath: string = JSON.parse(result.stdout).GOPATH let repoPath: string = path.join(goPath, 'src', delveRepo) if (!getDelveVersion(repoPath, true)) { @@ -200,11 +203,11 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom installOptions.env!['GOPATH'] = debuggerPath repoPath = path.join(debuggerPath, 'src', delveRepo) const args = ['get', '-d', `${delveRepo}/cmd/dlv`] - const out = execFileSync('go', args, installOptions as any) + const out = await ChildProcess.run('go', args, { ...(installOptions as any), collect: true }) getLogger().debug('"go %O": %s', args, out) } - delveVersion = getDelveVersion(repoPath, false) + delveVersion = await getDelveVersion(repoPath, false) } catch (e) { getLogger().debug('Failed to get latest Delve version: %O', e as Error) } diff --git a/packages/core/src/shared/utilities/processUtils.ts b/packages/core/src/shared/utilities/processUtils.ts index d19860b787d..2e179da98b8 100644 --- a/packages/core/src/shared/utilities/processUtils.ts +++ b/packages/core/src/shared/utilities/processUtils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as proc from 'child_process' +import * as proc from 'child_process' // eslint-disable-line no-restricted-imports import * as crossSpawn from 'cross-spawn' import * as logger from '../logger' import { Timeout, CancellationError, waitUntil } from './timeoutUtils' @@ -100,6 +100,13 @@ export class ChildProcess { // TODO: allow caller to use the various loggers instead of just the single one this.#log = baseOptions.logging !== 'no' ? logger.getLogger() : logger.getNullLogger() } + public static async run( + command: string, + args: string[] = [], + options?: ChildProcessOptions + ): Promise { + return await new ChildProcess(command, args, options).run() + } // Inspired by 'got' /** diff --git a/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts b/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts index 1433b50addb..2082626c55d 100644 --- a/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts +++ b/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts @@ -4,7 +4,7 @@ */ import assert from 'assert' -import { SpawnOptions } from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import * as path from 'path' import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities' import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils' diff --git a/packages/core/src/test/shared/sam/cli/samCliInit.test.ts b/packages/core/src/test/shared/sam/cli/samCliInit.test.ts index d12799a2e29..9ee8d889368 100644 --- a/packages/core/src/test/shared/sam/cli/samCliInit.test.ts +++ b/packages/core/src/test/shared/sam/cli/samCliInit.test.ts @@ -4,7 +4,7 @@ */ import assert from 'assert' -import { SpawnOptions } from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import { eventBridgeStarterAppTemplate, getSamCliTemplateParameter, diff --git a/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts index c0086c6cf6d..db804ba718d 100644 --- a/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts +++ b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts @@ -4,7 +4,7 @@ */ import assert from 'assert' -import { SpawnOptions } from 'child_process' +import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports import { isError } from 'lodash' import { diff --git a/packages/core/src/testInteg/shared/extensions/git.test.ts b/packages/core/src/testInteg/shared/extensions/git.test.ts index e2a261c3312..04580c77360 100644 --- a/packages/core/src/testInteg/shared/extensions/git.test.ts +++ b/packages/core/src/testInteg/shared/extensions/git.test.ts @@ -10,7 +10,7 @@ import * as GitTypes from '../../../../types/git' import { GitExtension, Repository } from '../../../shared/extensions/git' import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities' import { realpathSync } from 'fs' // eslint-disable-line no-restricted-imports -import { execFileSync } from 'child_process' +import { execFileSync } from 'child_process' // eslint-disable-line no-restricted-imports import { sleep } from '../../../shared/utilities/timeoutUtils' import { getLogger } from '../../../shared/logger/logger' import { getMinVscodeVersion } from '../../../shared/vscode/env' diff --git a/packages/core/src/testLint/testUtils.ts b/packages/core/src/testLint/testUtils.ts index 19e3e141e3d..a960d239945 100644 --- a/packages/core/src/testLint/testUtils.ts +++ b/packages/core/src/testLint/testUtils.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { SpawnSyncOptions, spawnSync } from 'child_process' +import { SpawnSyncOptions, spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports export function runCmd(args: string[], options?: SpawnSyncOptions & { throws?: boolean }) { const result = spawnSync(args[0], args.slice(1), options) diff --git a/scripts/createRelease.ts b/scripts/createRelease.ts index 1dff127071a..29b4fa82816 100644 --- a/scripts/createRelease.ts +++ b/scripts/createRelease.ts @@ -7,7 +7,7 @@ // Generates CHANGELOG.md // -import * as child_process from 'child_process' +import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' diff --git a/scripts/generateNonCodeFiles.ts b/scripts/generateNonCodeFiles.ts index b3896374ebd..059ded8cbde 100644 --- a/scripts/generateNonCodeFiles.ts +++ b/scripts/generateNonCodeFiles.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as child_process from 'child_process' +import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import { marked } from 'marked' import * as path from 'path' diff --git a/scripts/newChange.ts b/scripts/newChange.ts index 99ec53e57e8..7490e68631d 100644 --- a/scripts/newChange.ts +++ b/scripts/newChange.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import * as child_process from 'child_process' +import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import { join } from 'path' import * as readlineSync from 'readline-sync' diff --git a/scripts/package.ts b/scripts/package.ts index eb5d0848a37..84622ac12c0 100644 --- a/scripts/package.ts +++ b/scripts/package.ts @@ -17,7 +17,7 @@ // 3. restore the original package.json // -import * as child_process from 'child_process' +import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' diff --git a/scripts/prepare.ts b/scripts/prepare.ts index f19227c8ca6..34ccd450ec2 100644 --- a/scripts/prepare.ts +++ b/scripts/prepare.ts @@ -13,7 +13,7 @@ // - Runs in the background. To see the output, run with "--foreground-scripts". // -import * as child_process from 'child_process' +import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports /** * Returns true if the current build is running on CI (build server). From 5b5df855b2cc2f12ea8e1298e1ebee5cfe6b598a Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:08:37 -0500 Subject: [PATCH 078/202] test(perf): update thresholds in buildIndex tests (#6228) ## Problem Performance test was reliant on dead code removed in https://github.com/aws/aws-toolkit-vscode/pull/6218 ## Solution - update thresholds to accommodate the change. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/core/src/testInteg/perf/buildIndex.test.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/core/src/testInteg/perf/buildIndex.test.ts b/packages/core/src/testInteg/perf/buildIndex.test.ts index e8c469db4bc..d60de3bdc3a 100644 --- a/packages/core/src/testInteg/perf/buildIndex.test.ts +++ b/packages/core/src/testInteg/perf/buildIndex.test.ts @@ -10,7 +10,7 @@ import assert from 'assert' import { LspClient, LspController } from '../../amazonq' import { LanguageClient, ServerOptions } from 'vscode-languageclient' import { createTestWorkspace } from '../../test/testUtil' -import { BuildIndexRequestType, GetRepomapIndexJSONRequestType, GetUsageRequestType } from '../../amazonq/lsp/types' +import { BuildIndexRequestType, GetUsageRequestType } from '../../amazonq/lsp/types' import { fs, getRandomString } from '../../shared' import { FileSystem } from '../../shared/fs/fs' import { getFsCallsUpperBound } from './utilities' @@ -22,11 +22,10 @@ interface SetupResult { } async function verifyResult(setup: SetupResult) { - // A correct run makes 3 requests, but don't want to make it exact to avoid over-sensitivity to implementation. If we make 10+ something is likely wrong. - assert.ok(setup.clientReqStub.callCount >= 3 && setup.clientReqStub.callCount <= 10) + // A correct run makes 2 requests, but don't want to make it exact to avoid over-sensitivity to implementation. If we make 10+ something is likely wrong. + assert.ok(setup.clientReqStub.callCount >= 2 && setup.clientReqStub.callCount <= 10) assert.ok(setup.clientReqStub.calledWith(BuildIndexRequestType)) assert.ok(setup.clientReqStub.calledWith(GetUsageRequestType)) - assert.ok(setup.clientReqStub.calledWith(GetRepomapIndexJSONRequestType)) assert.strictEqual(getFsCallsUpperBound(setup.fsSpy), 0, 'should not make any fs calls') assert.ok(setup.findFilesSpy.callCount <= 2, 'findFiles should not be called more than twice') From 96ce5ae80a617e947415f4c763f7588ba641bbb4 Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:30:07 -0500 Subject: [PATCH 079/202] fix(auth): SSO failed to get token due to missing 'refreshToken' (#6234) ## Problem: Error users were seeing was: ``` Error: SSO cache data unexpectedly missing props: ["refreshToken"] ``` This was due to a change from a previous PR that assumed the refreshToken was always present in SSO cache. ## Solution: It looks like the refreshToken does not exist for all cases, so some research needs to be done. But for now this reverts the validation that the refreshToken exists. Though it keeps the validation that the accessToken exists since that is always guaranteed. **A temporary workaround should be to sign out/in and things should start working. If not please downgrade 3.38.0 until we release this fix next week.** Fixes #6230 --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: nkomonen-amazon --- packages/core/src/auth/sso/cache.ts | 13 ++++++------- .../core/src/test/credentials/sso/cache.test.ts | 1 - .../credentials/sso/ssoAccessTokenProvider.test.ts | 1 - ...ug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json | 4 ++++ 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json diff --git a/packages/core/src/auth/sso/cache.ts b/packages/core/src/auth/sso/cache.ts index 56fccb0d63f..a9cdfa43ce0 100644 --- a/packages/core/src/auth/sso/cache.ts +++ b/packages/core/src/auth/sso/cache.ts @@ -10,7 +10,7 @@ import { getLogger } from '../../shared/logger/logger' import fs from '../../shared/fs/fs' import { createDiskCache, KeyedCache, mapCache } from '../../shared/utilities/cacheUtils' import { stripUndefined } from '../../shared/utilities/collectionUtils' -import { getMissingProps, hasProps, selectFrom } from '../../shared/utilities/tsUtils' +import { hasProps, selectFrom } from '../../shared/utilities/tsUtils' import { SsoToken, ClientRegistration } from './model' import { DevSettings } from '../../shared/settings' import { onceChanged } from '../../shared/utilities/functionUtils' @@ -79,6 +79,11 @@ export function getTokenCache(directory = getCacheDir()): KeyedCache } function read(data: StoredToken): SsoAccess { + // Validate data is not missing. Since the input data is passed directly from whatever is on disk. + if (!hasProps(data, 'accessToken')) { + throw new ToolkitError(`SSO cache data looks malformed`) + } + const registration = hasProps(data, 'clientId', 'clientSecret', 'registrationExpiresAt') ? { ...selectFrom(data, 'clientId', 'clientSecret', 'scopes', 'startUrl'), @@ -93,12 +98,6 @@ export function getTokenCache(directory = getCacheDir()): KeyedCache stripUndefined(token) - // Validate data is not missing. - const missingProps = getMissingProps(token, 'accessToken', 'refreshToken') - if (missingProps.length > 0) { - throw new ToolkitError(`SSO cache data unexpectedly missing props: ${JSON.stringify(missingProps)}`) - } - return { token, registration, diff --git a/packages/core/src/test/credentials/sso/cache.test.ts b/packages/core/src/test/credentials/sso/cache.test.ts index 9feac195ac4..5222fe9e0fb 100644 --- a/packages/core/src/test/credentials/sso/cache.test.ts +++ b/packages/core/src/test/credentials/sso/cache.test.ts @@ -27,7 +27,6 @@ describe('SSO Cache', function () { const validToken = { accessToken: 'longstringofrandomcharacters', expiresAt: new Date(Date.now() + hourInMs), - refreshToken: 'dummyRefreshToken', } as SsoToken beforeEach(async function () { diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts index d284ac4668b..b662556e0aa 100644 --- a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts +++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts @@ -45,7 +45,6 @@ describe('SsoAccessTokenProvider', function () { return { accessToken: 'dummyAccessToken', expiresAt: new clock.Date(clock.Date.now() + timeDelta), - refreshToken: 'dummyRefreshToken', ...extras, } } diff --git a/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json b/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json new file mode 100644 index 00000000000..28b5d0a26ee --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Auth: SSO failed to missing refreshToken" +} From 0609e5bac8ac3a62e1844e1ed09f82c9913d0cbc Mon Sep 17 00:00:00 2001 From: vicheey Date: Fri, 13 Dec 2024 12:06:58 -0800 Subject: [PATCH 080/202] refactor(wizard): rename NestedWizard, update docs #6229 ref https://github.com/aws/aws-toolkit-vscode/pull/6166#issuecomment-2540112922 --- docs/arch_develop.md | 103 +++++++++++++++++- packages/core/src/shared/ui/wizardPrompter.ts | 4 +- .../compositeWizard.ts} | 8 +- ...dWizard.test.ts => compositWizard.test.ts} | 8 +- 4 files changed, 112 insertions(+), 11 deletions(-) rename packages/core/src/shared/{ui/nestedWizardPrompter.ts => wizards/compositeWizard.ts} (90%) rename packages/core/src/test/shared/wizards/{nestedWizard.test.ts => compositWizard.test.ts} (98%) diff --git a/docs/arch_develop.md b/docs/arch_develop.md index 4880d5493c5..a3ad998d3e1 100644 --- a/docs/arch_develop.md +++ b/docs/arch_develop.md @@ -444,7 +444,7 @@ await tester.result(items[0].data) // Execute the actions, asserting the final r Abstractly, a 'wizard' is a collection of discrete, linear steps (subroutines), where each step can potentially be dependent on prior steps, that results in some final state. Wizards are extremely common in top-level flows such as creating a new resource, deployments, or confirmation messages. For these kinds of flows, we have a shared `Wizard` class that handles the bulk of control flow and state management logic for us. -### Creating a Wizard (Quick Picks) +### 1. `Wizard` Class Create a new wizard by extending the base `Wizard` class, using the template type to specify the shape of the wizard state. All wizards have an internal `form` property that is used to assign @@ -482,6 +482,41 @@ class ExampleWizard extends Wizard { } ``` +### 2. `CompositeWizard` Class + +`CompositeWizard` extends `Wizard` to create and manage a collection of nested/child wizards. + +Extend this class to create a wizard that contains other wizards as part of a prompter flow. +Use `this.createWizardPrompter()` to use a wizard as a prompter in the `CompositeWizard`. + +Example: + +```ts + +// Child wizard +class ChildWizard extends Wizard {...} + + +// Composite wizard +interface SingleNestedWizardForm { + ... + singleNestedWizardNestedProp: string + ... +} + +class SingleNestedWizard extends CompositeWizard { + constructor() { + super() + ... + this.form.singleNestedWizardNestedProp.bindPrompter(() => + this.createWizardPrompter(ChildWizard) + ) + ... + } +} + +``` + ### Executing Wizards can be ran by calling the async `run` method: @@ -495,6 +530,8 @@ Note that all wizards can potentially return `undefined` if the workflow was can ### Testing +#### Using `WizardTester` + Use `createWizardTester` on an instance of a wizard. Tests can then be constructed by asserting both the user-defined and internal state. Using the above `ExampleWizard`: ```ts @@ -505,6 +542,70 @@ tester.foo.applyInput('Hello, world!') // Manipulate 'user' state tester.bar.assertShow() // True since 'foo' has a defined value ``` +#### Using `PrompterTester` + +Use `PrompterTester` to simulate user behavior (click, input and selection) on prompters to test end-to-end flow of a wizard. + +Example: + +```ts +// 1. Register PrompterTester handlers +const prompterTester = PrompterTester.init() + .handleInputBox('Input Prompter title 1', (inputBox) => { + // Register Input Prompter handler + inputBox.acceptValue('my-source-bucket-name') + }) + .handleQuickPick('Quick Pick Prompter title 2', (quickPick) => { + // Register Quick Pick Prompter handler + + // Optional assertion can be added as part of the handler function + assert.strictEqual(quickPick.items.length, 2) + assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults') + assert.strictEqual(quickPick.items[1].label, 'Specify required parameters') + // Choose item + quickPick.acceptItem(quickPick.items[0]) + }) + .handleQuickPick( + 'Quick Pick Prompter with various handler behavior title 3', + (() => { + // Register handler with dynamic behavior + const generator = (function* () { + // First call, choose '**' + yield async (picker: TestQuickPick) => { + await picker.untilReady() + assert.strictEqual(picker.items[1].label, '**') + picker.acceptItem(picker.items[1]) + } + // Second call, choose BACK button + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.pressButton(vscode.QuickInputButtons.Back) + } + // Third and subsequent call + while (true) { + yield async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[1]) + } + } + })() + + return (picker: TestQuickPick) => { + const next = generator.next().value + return next(picker) + } + })() + ) + .build() + +// 2. Run your wizard class +const result = await wizard.run() + +// 3. Assert your tests +prompterTester.assertCallAll() +prompterTester.assertCallOrder('Input Prompter title 1', 1) +``` + ## Module path debugging Node has an environment variable `NODE_DEBUG=module` that helps to debug module imports. This can be helpful on windows, which can load node modules into uppercase or lower case drive letters, depending on the drive letter of the parent module. diff --git a/packages/core/src/shared/ui/wizardPrompter.ts b/packages/core/src/shared/ui/wizardPrompter.ts index d4a15c881bf..64668b7340e 100644 --- a/packages/core/src/shared/ui/wizardPrompter.ts +++ b/packages/core/src/shared/ui/wizardPrompter.ts @@ -9,11 +9,11 @@ import { Prompter, PromptResult } from './prompter' /** * Wraps {@link Wizard} object into its own {@link Prompter}, allowing wizards to use other wizards in their flows. - * This is meant to be used exclusively in createWizardPrompter() method of {@link NestedWizard} class. + * This is meant to be used exclusively in createWizardPrompter() method of {@link CompositeWizard} class. * * @remarks * - The WizardPrompter class should never be instantiated with directly. - * - Use createWizardPrompter() method of {@link NestedWizard} when creating a nested wizard prompter for proper state management. + * - Use createWizardPrompter() method of {@link CompositeWizard} when creating a nested wizard prompter for proper state management. * - See examples: * - {@link SingleNestedWizard} * - {@link DoubleNestedWizard} diff --git a/packages/core/src/shared/ui/nestedWizardPrompter.ts b/packages/core/src/shared/wizards/compositeWizard.ts similarity index 90% rename from packages/core/src/shared/ui/nestedWizardPrompter.ts rename to packages/core/src/shared/wizards/compositeWizard.ts index cb3e91c8747..57bf2b90f6d 100644 --- a/packages/core/src/shared/ui/nestedWizardPrompter.ts +++ b/packages/core/src/shared/wizards/compositeWizard.ts @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Wizard, WizardOptions } from '../wizards/wizard' -import { Prompter } from './prompter' -import { WizardPrompter } from './wizardPrompter' +import { Wizard, WizardOptions } from './wizard' +import { Prompter } from '../ui/prompter' +import { WizardPrompter } from '../ui/wizardPrompter' import { createHash } from 'crypto' /** * An abstract class that extends the base Wizard class plus the ability to * use other wizard classes as prompters */ -export abstract class NestedWizard extends Wizard { +export abstract class CompositeWizard extends Wizard { /** * Map to store memoized wizard instances using SHA-256 hashed keys */ diff --git a/packages/core/src/test/shared/wizards/nestedWizard.test.ts b/packages/core/src/test/shared/wizards/compositWizard.test.ts similarity index 98% rename from packages/core/src/test/shared/wizards/nestedWizard.test.ts rename to packages/core/src/test/shared/wizards/compositWizard.test.ts index 00f79fc06f2..44e074fc96c 100644 --- a/packages/core/src/test/shared/wizards/nestedWizard.test.ts +++ b/packages/core/src/test/shared/wizards/compositWizard.test.ts @@ -4,7 +4,7 @@ */ import * as vscode from 'vscode' import { createCommonButtons } from '../../../shared/ui/buttons' -import { NestedWizard } from '../../../shared/ui/nestedWizardPrompter' +import { CompositeWizard } from '../../../shared/wizards/compositeWizard' import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter' import * as assert from 'assert' import { PrompterTester } from './prompterTester' @@ -40,7 +40,7 @@ export function createTestPrompter(title: string, itemsString: string[]) { return createQuickPick(items, { title: title, buttons: createCommonButtons() }) } -class ChildWizard extends NestedWizard { +class ChildWizard extends CompositeWizard { constructor() { super() this.form.childWizardProp1.bindPrompter(() => @@ -55,7 +55,7 @@ class ChildWizard extends NestedWizard { } } -class SingleNestedWizard extends NestedWizard { +class SingleNestedWizard extends CompositeWizard { constructor() { super() @@ -74,7 +74,7 @@ class SingleNestedWizard extends NestedWizard { } } -class DoubleNestedWizard extends NestedWizard { +class DoubleNestedWizard extends CompositeWizard { constructor() { super() From 4d462e22bb541a39d937d4727349228b98b58473 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:14:13 -0800 Subject: [PATCH 081/202] fix(amazonq): show correct diff after consecutive transformations (#6238) ## Problem If a user runs a transformation, rejects changes, then immediately runs another transformation on the same project (rare, but it happens), we attempt to show the user the old diff (which has already been deleted at this point). ## Solution Reset `patchFiles` before showing the user the patch file. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- .../Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json | 4 ++++ .../core/src/amazonq/webview/ui/quickActions/generator.ts | 2 +- packages/core/src/codewhisperer/models/constants.ts | 2 +- .../service/transformByQ/transformationResultsViewProvider.ts | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json b/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json new file mode 100644 index 00000000000..c105d94c34b --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations" +} diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts index ee7da0e4995..81513a3e143 100644 --- a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts +++ b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts @@ -86,7 +86,7 @@ export class QuickActionGenerator { ? [ { command: '/transform', - description: 'Transform your Java 8, 11, or 17 Maven projects', + description: 'Transform your Java project', icon: MynahIcons.TRANSFORM, }, ] diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index bd2245fe3da..460778db349 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -579,7 +579,7 @@ export const absolutePathDetectedMessage = (numPaths: number, buildFile: string, `I detected ${numPaths} potential absolute file path(s) in your ${buildFile} file: **${listOfPaths}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.` export const selectSQLMetadataFileHelpMessage = - 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Choose the link to Amazon S3 console.\n\nYou can download the metadata file from the {schema-conversion-project}/ directory. For more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).' + 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).' export const invalidMetadataFileUnsupportedSourceDB = 'I can only convert SQL for migrations from an Oracle source database. The provided .sct file indicates another source database for this migration.' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index 13951f7508a..28f7dd81406 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -325,7 +325,7 @@ export class ProposedTransformationExplorer { treeDataProvider: transformDataProvider, }) - const patchFiles: string[] = [] + let patchFiles: string[] = [] let singlePatchFile: string = '' let patchFilesDescriptions: DescriptionContent | undefined = undefined @@ -430,6 +430,7 @@ export class ProposedTransformationExplorer { let deserializeErrorMessage = undefined let pathContainingArchive = '' + patchFiles = [] // reset patchFiles if there was a previous transformation try { // Download and deserialize the zip pathContainingArchive = path.dirname(pathToArchive) From 34bc67e14c3d94a83424ca2822f0c84e8aa893d0 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:14:57 -0500 Subject: [PATCH 082/202] fix(amazonq): improve welcome page opening detection (#6171) ## Problem - the current implementation only opens the first tab as a welcome tab for the next 3 times you open vscode ## Solution - the new implementation shows the welcome tab 3 total times, either when you open a new chat tab or a new vscode window or both --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-49ee4921-044b-48b0-b51c-4e7054e84e6a.json | 4 ++ .../webview/generators/webViewContent.ts | 10 ++-- .../webview/messages/messageDispatcher.ts | 5 ++ .../core/src/amazonq/webview/ui/commands.ts | 1 + packages/core/src/amazonq/webview/ui/main.ts | 55 +++++++++++++++++-- packages/core/src/amazonq/webview/webView.ts | 36 ++---------- 6 files changed, 71 insertions(+), 40 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json b/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json new file mode 100644 index 00000000000..278a38dfdb1 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Improve when the welcome page is shown in amazon q chat" +} diff --git a/packages/core/src/amazonq/webview/generators/webViewContent.ts b/packages/core/src/amazonq/webview/generators/webViewContent.ts index 6b935e83642..ea577574d4c 100644 --- a/packages/core/src/amazonq/webview/generators/webViewContent.ts +++ b/packages/core/src/amazonq/webview/generators/webViewContent.ts @@ -23,7 +23,7 @@ export class WebViewContentGenerator { return JSON.stringify(Array.from(featureConfigs.entries())) } - public async generate(extensionURI: Uri, webView: Webview, showWelcomePage: boolean): Promise { + public async generate(extensionURI: Uri, webView: Webview): Promise { const entrypoint = process.env.WEBPACK_DEVELOPER_SERVER ? 'http: localhost' : 'https: file+.vscode-resources.vscode-cdn.net' @@ -47,14 +47,14 @@ export class WebViewContentGenerator { Amazon Q (Preview) - ${await this.generateJS(extensionURI, webView, showWelcomePage)} + ${await this.generateJS(extensionURI, webView)} ` } - private async generateJS(extensionURI: Uri, webView: Webview, showWelcomePage: boolean): Promise { + private async generateJS(extensionURI: Uri, webView: Webview): Promise { const source = path.join('vue', 'src', 'amazonq', 'webview', 'ui', 'amazonq-ui.js') // Sent to dist/vue folder in webpack. const assetsPath = Uri.joinPath(extensionURI) const javascriptUri = Uri.joinPath(assetsPath, 'dist', source) @@ -80,6 +80,8 @@ export class WebViewContentGenerator { const disabledCommandsString = isSageMaker() ? `['/dev', '/transform']` : '[]' const disclaimerAcknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false) + const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0) + return ` ${cssLinks} @@ -87,7 +89,7 @@ export class WebViewContentGenerator { const init = () => { createMynahUI(acquireVsCodeApi(), ${ (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected' - },${featureConfigsString},${showWelcomePage},${disclaimerAcknowledged},${disabledCommandsString}); + },${featureConfigsString},${welcomeLoadCount},${disclaimerAcknowledged},${disabledCommandsString}); } ` diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts index 95e301a0470..6acc250a25f 100644 --- a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts +++ b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts @@ -74,6 +74,11 @@ export function dispatchWebViewMessagesToApps( globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', true) return } + case 'update-welcome-count': { + const currentLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0) + void globals.globalState.tryUpdate('aws.amazonq.welcomeChatShowCount', currentLoadCount + 1) + return + } } if (msg.type === 'error') { diff --git a/packages/core/src/amazonq/webview/ui/commands.ts b/packages/core/src/amazonq/webview/ui/commands.ts index 643595e3e1f..d668cb5d3b7 100644 --- a/packages/core/src/amazonq/webview/ui/commands.ts +++ b/packages/core/src/amazonq/webview/ui/commands.ts @@ -41,5 +41,6 @@ type MessageCommand = | 'review' | 'open-user-guide' | 'send-telemetry' + | 'update-welcome-count' export type ExtensionMessage = Record & { command: MessageCommand } diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts index 72a458e08ff..78ae17aef95 100644 --- a/packages/core/src/amazonq/webview/ui/main.ts +++ b/packages/core/src/amazonq/webview/ui/main.ts @@ -33,11 +33,17 @@ import { agentWalkthroughDataModel } from './walkthrough/agent' import { createClickTelemetry, createOpenAgentTelemetry } from './telemetry/actions' import { disclaimerAcknowledgeButtonId, disclaimerCard } from './texts/disclaimer' +/** + * The number of welcome chat tabs that can be opened before the NEXT one will become + * a regular chat tab. + */ +const welcomeCountThreshold = 3 + export const createMynahUI = ( ideApi: any, amazonQEnabled: boolean, featureConfigsSerialized: [string, FeatureContext][], - showWelcomePage: boolean, + welcomeCount: number, disclaimerAcknowledged: boolean, disabledCommands?: string[] ) => { @@ -70,11 +76,23 @@ export const createMynahUI = ( }) }, }) + + const showWelcomePage = () => { + return welcomeCount < welcomeCountThreshold + } + + const updateWelcomeCount = () => { + ideApi.postMessage({ + command: 'update-welcome-count', + }) + welcomeCount += 1 + } + // Adding the first tab as CWC tab tabsStorage.addTab({ id: 'tab-1', status: 'free', - type: showWelcomePage ? 'welcome' : 'cwc', + type: showWelcomePage() ? 'welcome' : 'cwc', isSelected: true, }) @@ -541,6 +559,25 @@ export const createMynahUI = ( mynahUI = new MynahUI({ onReady: connector.uiReady, onTabAdd: (tabID: string) => { + /** + * If the next tab opening will cross the welcome count threshold then + * update the next tabs defaults + */ + if (welcomeCount + 1 >= welcomeCountThreshold) { + tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc') + mynahUI?.updateTabDefaults({ + store: { + ...tabDataGenerator.getTabData('cwc', true), + tabHeaderDetails: void 0, + compactMode: false, + tabBackground: false, + }, + }) + } else { + // we haven't reached the welcome count limit yet + updateWelcomeCount() + } + // If featureDev has changed availability inbetween the default store settings and now // make sure to show/hide it accordingly mynahUI.updateStore(tabID, { @@ -812,7 +849,7 @@ export const createMynahUI = ( 'tab-1': { isSelected: true, store: { - ...(showWelcomePage + ...(showWelcomePage() ? welcomeScreenTabData(tabDataGenerator).store : tabDataGenerator.getTabData('cwc', true)), ...(disclaimerCardActive ? { promptInputStickyCard: disclaimerCard } : {}), @@ -820,7 +857,9 @@ export const createMynahUI = ( }, }, defaults: { - store: tabDataGenerator.getTabData('cwc', true), + store: showWelcomePage() + ? welcomeScreenTabData(tabDataGenerator).store + : tabDataGenerator.getTabData('cwc', true), }, config: { maxTabs: 10, @@ -829,6 +868,14 @@ export const createMynahUI = ( }, }) + /** + * Update the welcome count if we've initially shown + * the welcome page + */ + if (showWelcomePage()) { + updateWelcomeCount() + } + followUpsInteractionHandler = new FollowUpInteractionHandler({ mynahUI, connector, diff --git a/packages/core/src/amazonq/webview/webView.ts b/packages/core/src/amazonq/webview/webView.ts index d5488e75f16..50b8477847a 100644 --- a/packages/core/src/amazonq/webview/webView.ts +++ b/packages/core/src/amazonq/webview/webView.ts @@ -22,11 +22,6 @@ import { TabType } from './ui/storages/tabsStorage' import { deactivateInitialViewBadge, shouldShowBadge } from '../util/viewBadgeHandler' import { telemetry } from '../../shared/telemetry/telemetry' import { amazonqMark } from '../../shared/performance/marks' -import { globals } from '../../shared' -import { AuthUtil } from '../../codewhisperer/util/authUtil' - -// The max number of times we should show the welcome to q chat panel before moving them to the regular one -const maxWelcomeWebviewLoads = 3 export class AmazonQChatViewProvider implements WebviewViewProvider { public static readonly viewType = 'aws.AmazonQChatView' @@ -65,33 +60,10 @@ export class AmazonQChatViewProvider implements WebviewViewProvider { dispatchAppsMessagesToWebView(webviewView.webview, this.appsMessagesListener) - /** - * Show the welcome to q chat ${maxWelcomeWebviewLoads} times before showing the normal panel - */ - const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0) - if (welcomeLoadCount < maxWelcomeWebviewLoads) { - webviewView.webview.html = await this.webViewContentGenerator.generate( - this.extensionContext.extensionUri, - webviewView.webview, - true - ) - - /** - * resolveWebviewView gets called even when the user isn't logged in and the auth page is showing. - * We don't want to incremenent the show count until the user has fully logged in and resolveWebviewView - * gets called again - */ - const authenticated = (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected' - if (authenticated) { - await globals.globalState.update('aws.amazonq.welcomeChatShowCount', welcomeLoadCount + 1) - } - } else { - webviewView.webview.html = await this.webViewContentGenerator.generate( - this.extensionContext.extensionUri, - webviewView.webview, - false - ) - } + webviewView.webview.html = await this.webViewContentGenerator.generate( + this.extensionContext.extensionUri, + webviewView.webview + ) performance.mark(amazonqMark.open) From 914bf73e4be4ff6b587e608c58cf1da61d4f9402 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:15:44 -0500 Subject: [PATCH 083/202] test(core): unskip e2e test failures (#6233) ## Problem - For the last 8 months or so we've skipped e2e test results, now they're becoming a lot more crucial and used by other teams ## Solution - remove the skipping --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- buildspec/linuxE2ETests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildspec/linuxE2ETests.yml b/buildspec/linuxE2ETests.yml index e5e984e220b..af3cfe71bde 100644 --- a/buildspec/linuxE2ETests.yml +++ b/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 || true + - xvfb-run npm run testE2E - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}" - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') - CI_BUILD_ID="${CODEBUILD_BUILD_ID}" From f87a94bee5795a3a2a59990ad8f5cc9e00ce78a9 Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:11:49 -0800 Subject: [PATCH 084/202] config(inline-completion): change supplemental context configuration to always use repomap (#6205) ## Problem Remove client side A/B experiment (control, treatment1, treatment2), move it to service side and always assume treatment1 ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../unit/codewhisperer/util/crossFileContextUtil.test.ts | 2 +- .../util/supplementalContext/crossFileContextUtil.ts | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts index 748483a4dc0..d5b9132d580 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts @@ -96,7 +96,7 @@ describe('crossFileContextUtil', function () { assert.strictEqual(actual.supplementalContextItems[3].content.split('\n').length, 50) }) - it('for t2 group, should return global bm25 context and no repomap', async function () { + it.skip('for t2 group, should return global bm25 context and no repomap', async function () { await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false }) const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, { preview: false, diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index a85bb8e66d5..fdfe29bfb9a 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -284,14 +284,8 @@ function getSupplementalContextConfig(languageId: vscode.TextDocument['languageI const group = FeatureConfigProvider.instance.getProjectContextGroup() switch (group) { - case 'control': - return 'opentabs' - - case 't1': + default: return 'codemap' - - case 't2': - return 'bm25' } } From 0371970e0335a395be062b3372e2e689d1b32ead Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:28:05 -0800 Subject: [PATCH 085/202] telemetry(inline-suggestion): fine tune supplemental context strategy telemetry (#6242) ## Problem Current `supplementalContextStrategy ` only reflect what group the user is in, however by doing this it won't help much on our data analysis. What we need is the context strategy being used so that we know how much % of users have repomap or opentabs and how % of users have empty supplemental context etc. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../crossFileContextUtil.ts | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index fdfe29bfb9a..7800ab2a51c 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -18,7 +18,11 @@ import { isTestFile } from './codeParsingUtil' import { getFileDistance } from '../../../shared/filesystemUtilities' import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities' import { getLogger } from '../../../shared/logger/logger' -import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from '../../models/model' +import { + CodeWhispererSupplementalContext, + CodeWhispererSupplementalContextItem, + SupplementalContextStrategy, +} from '../../models/model' import { LspController } from '../../../amazonq/lsp/lspController' import { waitUntil } from '../../../shared/utilities/timeoutUtils' @@ -75,14 +79,18 @@ export async function fetchSupplementalContextForSrc( // opentabs context will use bm25 and users' open tabs to fetch supplemental context if (supplementalContextConfig === 'opentabs') { + const supContext = (await fetchOpentabsContext(editor, cancellationToken)) ?? [] return { - supplementalContextItems: (await fetchOpentabsContext(editor, cancellationToken)) ?? [], - strategy: 'opentabs', + supplementalContextItems: supContext, + strategy: supContext.length === 0 ? 'Empty' : 'opentabs', } } // codemap will use opentabs context plus repomap if it's present if (supplementalContextConfig === 'codemap') { + let strategy: SupplementalContextStrategy = 'Empty' + let hasCodemap: boolean = false + let hasOpentabs: boolean = false const opentabsContextAndCodemap = await waitUntil( async function () { const result: CodeWhispererSupplementalContextItem[] = [] @@ -91,10 +99,12 @@ export async function fetchSupplementalContextForSrc( if (codemap && codemap.length > 0) { result.push(...codemap) + hasCodemap = true } if (opentabsContext && opentabsContext.length > 0) { result.push(...opentabsContext) + hasOpentabs = true } return result @@ -102,9 +112,17 @@ export async function fetchSupplementalContextForSrc( { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false } ) + if (hasCodemap) { + strategy = 'codemap' + } else if (hasOpentabs) { + strategy = 'opentabs' + } else { + strategy = 'Empty' + } + return { supplementalContextItems: opentabsContextAndCodemap ?? [], - strategy: 'codemap', + strategy: strategy, } } @@ -133,9 +151,10 @@ export async function fetchSupplementalContextForSrc( } } + const supContext = opentabsContext ?? [] return { - supplementalContextItems: opentabsContext ?? [], - strategy: 'opentabs', + supplementalContextItems: supContext, + strategy: supContext.length === 0 ? 'Empty' : 'opentabs', } } From 5669e871cab12501564fe2553bc9c1fe2cd2b748 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:31:39 -0800 Subject: [PATCH 086/202] telemetry(amazonq): add jobId to all metrics #6241 ## Problem `jobId` missing in some metrics. ## Solution Add it. --- package-lock.json | 9 ++++----- package.json | 2 +- .../core/src/codewhisperer/commands/startTransformByQ.ts | 6 ++++-- .../transformByQ/transformationResultsViewProvider.ts | 3 +-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index aaa5166cd55..2b12b9235b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "vscode-nls-dev": "^4.0.4" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.287", + "@aws-toolkits/telemetry": "^1.0.289", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", @@ -6047,11 +6047,10 @@ } }, "node_modules/@aws-toolkits/telemetry": { - "version": "1.0.287", - "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.287.tgz", - "integrity": "sha512-qK2l8Fv5Cvs865ap2evf4ikBREg33/jGw0lgxolqZLdHwm5zm/DkR9vNyqwhDlqDRlSgSlros3Z8zaiSBVRYVQ==", + "version": "1.0.289", + "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.289.tgz", + "integrity": "sha512-srzr3JGMprOX2rrUAhribVBrUMfvR6uOhwksaxu63/GMTBjEWjwfcKzpgQzxu1+InmGioBa4zKdKKV/hAaUCmw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "ajv": "^6.12.6", "cross-spawn": "^7.0.6", diff --git a/package.json b/package.json index 20d53676e49..e658a3a916e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present" }, "devDependencies": { - "@aws-toolkits/telemetry": "^1.0.287", + "@aws-toolkits/telemetry": "^1.0.289", "@playwright/browser-chromium": "^1.43.1", "@stylistic/eslint-plugin": "^2.11.0", "@types/he": "^1.2.3", diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts index 967a9a63218..47217fa928d 100644 --- a/packages/core/src/codewhisperer/commands/startTransformByQ.ts +++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts @@ -263,6 +263,7 @@ export async function preTransformationUploadCode() { transformByQState.setPayloadFilePath(payloadFilePath) uploadId = await uploadPayload(payloadFilePath) + telemetry.record({ codeTransformJobId: uploadId }) // uploadId is re-used as jobId }) } catch (err) { const errorMessage = (err as Error).message @@ -735,15 +736,15 @@ export async function postTransformationJob() { const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})` const javaVersionInfoMessage = `${versionInfo[1]} (${transformByQState.getMavenName()})` - // Note: IntelliJ implementation of ResultStatusMessage includes additional metadata such as jobId. telemetry.codeTransform_totalRunTime.emit({ buildSystemVersion: mavenVersionInfoMessage, codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + codeTransformJobId: transformByQState.getJobId(), codeTransformResultStatusMessage: resultStatusMessage, codeTransformRunTimeLatency: durationInMs, codeTransformLocalJavaVersion: javaVersionInfoMessage, result: resultStatusMessage === TransformByQStatus.Succeeded ? MetadataResult.Pass : MetadataResult.Fail, - reason: resultStatusMessage, + reason: `${resultStatusMessage}-${chatMessage}`, }) } @@ -825,6 +826,7 @@ export async function stopTransformByQ(jobId: string) { await telemetry.codeTransform_jobIsCancelledByUser.run(async () => { telemetry.record({ codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + codeTransformJobId: jobId, }) if (transformByQState.isRunning()) { getLogger().info('CodeTransformation: User requested to stop transformation. Stopping transformation.') diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index 28f7dd81406..1f4058a54dc 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -536,9 +536,9 @@ export class ProposedTransformationExplorer { diffModel.saveChanges() telemetry.codeTransform_submitSelection.emit({ codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + codeTransformJobId: transformByQState.getJobId(), userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`, }) - telemetry.ui_click.emit({ elementId: 'transformationHub_acceptChanges' }) if (transformByQState.getMultipleDiffs()) { void vscode.window.showInformationMessage( CodeWhispererConstants.changesAppliedNotificationMultipleDiffs( @@ -596,7 +596,6 @@ export class ProposedTransformationExplorer { vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => { diffModel.rejectChanges() await reset() - telemetry.ui_click.emit({ elementId: 'transformationHub_rejectChanges' }) transformByQState.getChatControllers()?.transformationFinished.fire({ tabID: ChatSessionManager.Instance.getSession().tabID, From 4728b23ce8f4b6b6492375556b44e5fd532736c7 Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Fri, 13 Dec 2024 23:46:21 +0000 Subject: [PATCH 087/202] fix(amazonq): apply fix removes other issues (#6236) ## Problem Apply fix removes other issues in the same file. This is happening because apply fix command will always replace the entire file contents which triggers a document change event that intersects with all issues in the file. ## Solution Look through the diff hunks and apply them in a range. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json | 4 + packages/core/src/codewhisperer/activation.ts | 41 +++++----- .../codewhisperer/commands/basicCommands.ts | 21 ++++-- .../service/securityIssueProvider.ts | 32 ++++---- .../commands/basicCommands.test.ts | 75 +++++++++++++++++++ 5 files changed, 134 insertions(+), 39 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json b/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json new file mode 100644 index 00000000000..a78cb474d17 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "/review: Apply fix removes other issues in the same file." +} diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts index 0ed50296da4..4034c6397f4 100644 --- a/packages/core/src/codewhisperer/activation.ts +++ b/packages/core/src/codewhisperer/activation.ts @@ -670,27 +670,28 @@ export async function activate(context: ExtContext): Promise { function setSubscriptionsForCodeIssues() { context.extensionContext.subscriptions.push( vscode.workspace.onDidChangeTextDocument(async (e) => { - // verify the document is something with a finding - for (const issue of SecurityIssueProvider.instance.issues) { - if (issue.filePath === e.document.uri.fsPath) { - disposeSecurityDiagnostic(e) - - SecurityIssueProvider.instance.handleDocumentChange(e) - SecurityIssueTreeViewProvider.instance.refresh() - await syncSecurityIssueWebview(context) - - toggleIssuesVisibility((issue, filePath) => - filePath !== e.document.uri.fsPath - ? issue.visible - : !detectCommentAboveLine( - e.document, - issue.startLine, - CodeWhispererConstants.amazonqIgnoreNextLine - ) - ) - break - } + if (e.document.uri.scheme !== 'file') { + return } + const diagnostics = securityScanRender.securityDiagnosticCollection?.get(e.document.uri) + if (!diagnostics || diagnostics.length === 0) { + return + } + disposeSecurityDiagnostic(e) + + SecurityIssueProvider.instance.handleDocumentChange(e) + SecurityIssueTreeViewProvider.instance.refresh() + await syncSecurityIssueWebview(context) + + toggleIssuesVisibility((issue, filePath) => + filePath !== e.document.uri.fsPath + ? issue.visible + : !detectCommentAboveLine( + e.document, + issue.startLine, + CodeWhispererConstants.amazonqIgnoreNextLine + ) + ) }) ) } diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts index 07fd358a990..8ec54d02a2a 100644 --- a/packages/core/src/codewhisperer/commands/basicCommands.ts +++ b/packages/core/src/codewhisperer/commands/basicCommands.ts @@ -66,6 +66,7 @@ import { cancel, confirm } from '../../shared' import { startCodeFixGeneration } from './startCodeFixGeneration' import { DefaultAmazonQAppInitContext } from '../../amazonq/apps/initContext' import path from 'path' +import { parsePatch } from 'diff' const MessageTimeOut = 5_000 @@ -459,11 +460,21 @@ export const applySecurityFix = Commands.declare( } const edit = new vscode.WorkspaceEdit() - edit.replace( - document.uri, - new vscode.Range(document.lineAt(0).range.start, document.lineAt(document.lineCount - 1).range.end), - updatedContent - ) + const diffs = parsePatch(suggestedFix.code) + for (const diff of diffs) { + for (const hunk of [...diff.hunks].reverse()) { + const startLine = document.lineAt(hunk.oldStart - 1) + const endLine = document.lineAt(hunk.oldStart - 1 + hunk.oldLines - 1) + const range = new vscode.Range(startLine.range.start, endLine.range.end) + + const newText = updatedContent + .split('\n') + .slice(hunk.newStart - 1, hunk.newStart - 1 + hunk.newLines) + .join('\n') + + edit.replace(document.uri, range, newText) + } + } const isApplied = await vscode.workspace.applyEdit(edit) if (isApplied) { void document.save().then((didSave) => { diff --git a/packages/core/src/codewhisperer/service/securityIssueProvider.ts b/packages/core/src/codewhisperer/service/securityIssueProvider.ts index 28b84995aea..edd93de8433 100644 --- a/packages/core/src/codewhisperer/service/securityIssueProvider.ts +++ b/packages/core/src/codewhisperer/service/securityIssueProvider.ts @@ -4,7 +4,7 @@ */ import * as vscode from 'vscode' -import { AggregatedCodeScanIssue, CodeScanIssue, SuggestedFix } from '../models/model' +import { AggregatedCodeScanIssue, CodeScanIssue, CodeScansState, SuggestedFix } from '../models/model' export class SecurityIssueProvider { static #instance: SecurityIssueProvider public static get instance() { @@ -25,13 +25,15 @@ export class SecurityIssueProvider { if (!event.contentChanges || event.contentChanges.length === 0) { return } - const { changedRange, lineOffset } = event.contentChanges.reduce( + const { changedRange, changedText, lineOffset } = event.contentChanges.reduce( (acc, change) => ({ changedRange: acc.changedRange.union(change.range), + changedText: acc.changedText + change.text, lineOffset: acc.lineOffset + this._getLineOffset(change.range, change.text), }), { changedRange: event.contentChanges[0].range, + changedText: '', lineOffset: 0, } ) @@ -43,18 +45,20 @@ export class SecurityIssueProvider { return { ...group, issues: group.issues - .filter( - (issue) => - // Filter out any modified issues - !changedRange.intersection( - new vscode.Range( - issue.startLine, - event.document.lineAt(issue.startLine)?.range.start.character ?? 0, - issue.endLine, - event.document.lineAt(issue.endLine)?.range.end.character ?? 0 - ) - ) - ) + .filter((issue) => { + const range = new vscode.Range( + issue.startLine, + event.document.lineAt(issue.startLine)?.range.start.character ?? 0, + issue.endLine, + event.document.lineAt(issue.endLine - 1)?.range.end.character ?? 0 + ) + const intersection = changedRange.intersection(range) + return !( + intersection && + (/\S/.test(changedText) || changedText === '') && + !CodeScansState.instance.isScansEnabled() + ) + }) .map((issue) => { if (issue.startLine < changedRange.end.line) { return issue diff --git a/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts index de3aa1ea96e..997b24b78f4 100644 --- a/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts +++ b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts @@ -672,6 +672,81 @@ describe('CodeWhisperer-basicCommands', function () { reasonDesc: 'Failed to apply edit to the workspace.', }) }) + + it('should apply the edit at the correct range', async function () { + const fileName = 'sample.py' + const textDocumentMock = createMockDocument( + `from flask import app + + +@app.route('/') +def execute_input_noncompliant(): + from flask import request + module_version = request.args.get("module_version") + # Noncompliant: executes unsanitized inputs. + exec("import urllib%s as urllib" % module_version) +# {/fact} + + +# {fact rule=code-injection@v1.0 defects=0} +from flask import app + + +@app.route('/') +def execute_input_compliant(): + from flask import request + module_version = request.args.get("module_version") + # Compliant: executes sanitized inputs. + exec("import urllib%d as urllib" % int(module_version)) +# {/fact}`, + fileName + ) + openTextDocumentMock.resolves(textDocumentMock) + sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock) + + sandbox.stub(vscode.WorkspaceEdit.prototype, 'replace').value(replaceMock) + applyEditMock.resolves(true) + sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock) + sandbox.stub(diagnosticsProvider, 'removeDiagnostic').value(removeDiagnosticMock) + sandbox.stub(SecurityIssueProvider.instance, 'removeIssue').value(removeIssueMock) + sandbox.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock) + + targetCommand = testCommand(applySecurityFix) + codeScanIssue.suggestedFixes = [ + { + code: `@@ -6,4 +6,5 @@ + from flask import request + module_version = request.args.get("module_version") + # Noncompliant: executes unsanitized inputs. +- exec("import urllib%d as urllib" % int(module_version)) ++ __import__("urllib" + module_version) ++#import importlib`, + description: 'dummy', + }, + ] + await targetCommand.execute(codeScanIssue, fileName, 'webview') + assert.ok( + replaceMock.calledOnceWith( + textDocumentMock.uri, + new vscode.Range(5, 0, 8, 54), + ` from flask import request + module_version = request.args.get("module_version") + # Noncompliant: executes unsanitized inputs. + __import__("urllib" + module_version) +#import importlib` + ) + ) + assert.ok(applyEditMock.calledOnce) + assert.ok(removeDiagnosticMock.calledOnceWith(textDocumentMock.uri, codeScanIssue)) + assert.ok(removeIssueMock.calledOnce) + + assertTelemetry('codewhisperer_codeScanIssueApplyFix', { + detectorId: codeScanIssue.detectorId, + findingId: codeScanIssue.findingId, + component: 'webview', + result: 'Succeeded', + }) + }) }) // describe('generateFix', function () { From a4c34439b8abbda55a59a4e2332ae16aead55d0a Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:03:01 -0500 Subject: [PATCH 088/202] test(techdebt): snooze deadline #6250 ## Problem Techdebt test is failing CI. This is unlikely to be addressed atm. ## Solution - Delay until 2025. --- packages/core/src/test/techdebt.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/test/techdebt.test.ts b/packages/core/src/test/techdebt.test.ts index 1ff61739b4a..0e423c41684 100644 --- a/packages/core/src/test/techdebt.test.ts +++ b/packages/core/src/test/techdebt.test.ts @@ -46,6 +46,6 @@ describe('tech debt', function () { // Monitor telemtry to determine removal or snooze // toolkit_showNotification.id = sessionSeparation // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst - fixByDate('2024-12-15', 'Remove the edge case code from the commit that this test is a part of.') + fixByDate('2025-01-06', 'Remove the edge case code from the commit that this test is a part of.') }) }) From 525181b88a5bad13a5c0efa963de1ee0d45f60bc Mon Sep 17 00:00:00 2001 From: vicheey Date: Mon, 16 Dec 2024 11:25:21 -0800 Subject: [PATCH 089/202] fix(lambda): template parameter prompter not available from all entrypoints #6240 ## Problem SAM CLI guided deploy support template parameter override for both sync and deploy command. However, the AppBuilder wizard UI only support this feature for SAM deploy trigger from SAM template context menu or AppBuilder project node menu button. ## Solution - Implement nested wizard for template parameter for both sync and deploy action for all entry points. - Refactor DeployWizard class for consistency with SyncWizard class - Add unit test for validating correct backward flow and state restoration for both wizard. --- .../wizards/templateParametersWizard.ts | 62 +++ packages/core/src/shared/sam/deploy.ts | 304 ++++-------- packages/core/src/shared/sam/sync.ts | 160 ++++-- packages/core/src/shared/ui/wizardPrompter.ts | 4 + .../wizards/deployTypeWizard.test.ts | 10 +- .../core/src/test/shared/sam/deploy.test.ts | 341 +++++++++++-- .../core/src/test/shared/sam/sync.test.ts | 454 ++++++++++++++---- .../src/test/shared/wizards/prompterTester.ts | 43 ++ ...-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json | 4 + 9 files changed, 987 insertions(+), 395 deletions(-) create mode 100644 packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json diff --git a/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts new file mode 100644 index 00000000000..75c80c4eda9 --- /dev/null +++ b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts @@ -0,0 +1,62 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as vscode from 'vscode' +import { Wizard } from '../../../shared/wizards/wizard' +import { createExitPrompter } from '../../../shared/ui/common/exitPrompter' +import * as CloudFormation from '../../../shared/cloudformation/cloudformation' +import { createInputBox } from '../../../shared/ui/inputPrompter' +import { createCommonButtons } from '../../../shared/ui/buttons' +import { getRecentResponse, updateRecentResponse } from '../../../shared/sam/utils' +import { getParameters } from '../../../lambda/config/parameterUtils' + +export interface TemplateParametersForm { + [key: string]: any +} + +export class TemplateParametersWizard extends Wizard { + template: vscode.Uri + preloadedTemplate: CloudFormation.Template | undefined + samTemplateParameters: Map | undefined + samCommandUrl: vscode.Uri + commandMementoRootKey: string + + public constructor(template: vscode.Uri, samCommandUrl: vscode.Uri, commandMementoRootKey: string) { + super({ exitPrompterProvider: createExitPrompter }) + this.template = template + this.samCommandUrl = samCommandUrl + this.commandMementoRootKey = commandMementoRootKey + } + + public override async init(): Promise { + this.samTemplateParameters = await getParameters(this.template) + this.preloadedTemplate = await CloudFormation.load(this.template.fsPath) + const samTemplateNames = new Set(this.samTemplateParameters?.keys() ?? []) + + samTemplateNames.forEach((name) => { + if (this.preloadedTemplate) { + const defaultValue = this.preloadedTemplate.Parameters + ? (this.preloadedTemplate.Parameters[name]?.Default as string) + : undefined + this.form[name].bindPrompter(() => + this.createParamPromptProvider(name, defaultValue).transform(async (item) => { + await updateRecentResponse(this.commandMementoRootKey, this.template.fsPath, name, item) + return item + }) + ) + } + }) + + return this + } + + createParamPromptProvider(name: string, defaultValue: string | undefined) { + return createInputBox({ + title: `Specify SAM Template parameter value for ${name}`, + buttons: createCommonButtons(this.samCommandUrl), + value: getRecentResponse(this.commandMementoRootKey, this.template.fsPath, name) ?? defaultValue, + }) + } +} diff --git a/packages/core/src/shared/sam/deploy.ts b/packages/core/src/shared/sam/deploy.ts index 6353c46a0e5..a88e071f617 100644 --- a/packages/core/src/shared/sam/deploy.ts +++ b/packages/core/src/shared/sam/deploy.ts @@ -4,41 +4,38 @@ */ import * as vscode from 'vscode' +import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase' +import { TreeNode, isTreeNode } from '../treeview/resourceTreeDataProvider' import { ToolkitError, globals } from '../../shared' -import * as CloudFormation from '../../shared/cloudformation/cloudformation' -import { getParameters } from '../../lambda/config/parameterUtils' import { DefaultCloudFormationClient } from '../clients/cloudFormationClient' import { DefaultS3Client } from '../clients/s3Client' import { samDeployUrl } from '../constants' import { getSpawnEnv } from '../env/resolveEnv' import { CloudFormationTemplateRegistry } from '../fs/templateRegistry' import { telemetry } from '../telemetry' -import { createCommonButtons } from '../ui/buttons' import { createExitPrompter } from '../ui/common/exitPrompter' import { createRegionPrompter } from '../ui/common/region' -import { createInputBox } from '../ui/inputPrompter' import { ChildProcess } from '../utilities/processUtils' import { CancellationError } from '../utilities/timeoutUtils' -import { Wizard } from '../wizards/wizard' import { addTelemetryEnvVar } from './cli/samCliInvokerUtils' import { validateSamDeployConfig, SamConfig, writeSamconfigGlobal } from './config' import { BucketSource, createBucketSourcePrompter, createBucketNamePrompter } from '../ui/sam/bucketPrompter' import { createStackPrompter } from '../ui/sam/stackPrompter' import { TemplateItem, createTemplatePrompter } from '../ui/sam/templatePrompter' import { createDeployParamsSourcePrompter, ParamsSource } from '../ui/sam/paramsSourcePrompter' -import { - getErrorCode, - getProjectRoot, - getSamCliPathAndVersion, - getSource, - getRecentResponse, - updateRecentResponse, -} from './utils' +import { getErrorCode, getProjectRoot, getSamCliPathAndVersion, getSource, updateRecentResponse } from './utils' import { runInTerminal } from './processTerminal' +import { + TemplateParametersForm, + TemplateParametersWizard, +} from '../../awsService/appBuilder/wizards/templateParametersWizard' +import { getParameters } from '../../lambda/config/parameterUtils' +import { CompositeWizard } from '../wizards/compositeWizard' export interface DeployParams { readonly paramsSource: ParamsSource readonly template: TemplateItem + readonly templateParameters: any readonly region: string readonly stackName: string readonly bucketSource: BucketSource @@ -48,230 +45,120 @@ export interface DeployParams { [key: string]: any } -const deployMementoRootKey = 'samcli.deploy.params' - -function getRecentDeployParams(identifier: string, key: string): string | undefined { - return getRecentResponse(deployMementoRootKey, identifier, key) +export enum SamDeployEntryPoints { + SamTemplateFile, + RegionNodeContextMenu, + AppBuilderNodeButton, + CommandPalette, } -function createParamPromptProvider(name: string, defaultValue: string | undefined, templateFsPath: string = 'default') { - return createInputBox({ - title: `Specify SAM parameter value for ${name}`, - buttons: createCommonButtons(samDeployUrl), - value: getRecentDeployParams(templateFsPath, name) ?? defaultValue, - }) +function getDeployEntryPoint(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined) { + if (arg instanceof vscode.Uri) { + return SamDeployEntryPoints.SamTemplateFile + } else if (arg instanceof AWSTreeNodeBase) { + return SamDeployEntryPoints.RegionNodeContextMenu + } else if (isTreeNode(arg)) { + return SamDeployEntryPoints.AppBuilderNodeButton + } else { + return SamDeployEntryPoints.CommandPalette + } } +const deployMementoRootKey = 'samcli.deploy.params' type DeployResult = { isSuccess: boolean } -export class DeployWizard extends Wizard { +export class DeployWizard extends CompositeWizard { registry: CloudFormationTemplateRegistry state: Partial arg: any - samTemplateParameters: Map | undefined - preloadedTemplate: CloudFormation.Template | undefined public constructor( state: Partial, registry: CloudFormationTemplateRegistry, arg?: any, - samTemplateParameters?: Map, - preloadedTemplate?: CloudFormation.Template, shouldPromptExit: boolean = true ) { super({ initState: state, exitPrompterProvider: shouldPromptExit ? createExitPrompter : undefined }) this.registry = registry this.state = state this.arg = arg - this.samTemplateParameters = samTemplateParameters - this.preloadedTemplate = preloadedTemplate - if (this.arg && this.arg.path) { - // "Deploy" command was invoked on a template.yaml file. - const templateUri = this.arg as vscode.Uri - const templateItem = { uri: templateUri, data: {} } as TemplateItem - const projectRootFolder = getProjectRoot(templateItem) - - this.addParameterPromptersIfApplicable(templateUri) + } - this.form.template.setDefault(templateItem) - this.form.projectRoot.setDefault(() => projectRootFolder) - this.form.paramsSource.bindPrompter(async () => - createDeployParamsSourcePrompter(await validateSamDeployConfig(projectRootFolder)) - ) + public override async init(): Promise { + this.form.template.bindPrompter(() => createTemplatePrompter(this.registry, deployMementoRootKey, samDeployUrl)) - this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.stackName.bindPrompter( - ({ region }) => - createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - } - ) - this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.bucketName.bindPrompter( - ({ region }) => - createBucketNamePrompter(new DefaultS3Client(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided, - } - ) - } else if (this.arg && this.arg.regionCode) { - // "Deploy" command was invoked on a regionNode. - this.form.template.bindPrompter(() => - createTemplatePrompter(this.registry, deployMementoRootKey, samDeployUrl) - ) - this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template)) - this.form.paramsSource.bindPrompter(async ({ projectRoot }) => { - const existValidSamConfig: boolean | undefined = await validateSamDeployConfig(projectRoot) - return createDeployParamsSourcePrompter(existValidSamConfig) - }) - this.form.region.setDefault(() => this.arg.regionCode) - this.form.stackName.bindPrompter( - ({ region }) => - createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - } - ) - this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.bucketName.bindPrompter( - ({ region }) => - createBucketNamePrompter(new DefaultS3Client(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided, - } - ) - } else if (this.arg && this.arg.getTreeItem().resourceUri) { - // "Deploy" command was invoked on a TreeNode on the AppBuilder. - const templateUri = this.arg.getTreeItem().resourceUri as vscode.Uri - const templateItem = { uri: templateUri, data: {} } as TemplateItem - const projectRootFolder = getProjectRoot(templateItem) + this.form.templateParameters.bindPrompter( + async ({ template }) => + this.createWizardPrompter( + TemplateParametersWizard, + template!.uri, + samDeployUrl, + deployMementoRootKey + ), + { + showWhen: async ({ template }) => { + const samTemplateParameters = await getParameters(template!.uri) + return !!samTemplateParameters && samTemplateParameters.size > 0 + }, + } + ) - this.addParameterPromptersIfApplicable(templateUri) - this.form.template.setDefault(templateItem) - this.form.paramsSource.bindPrompter(async () => - createDeployParamsSourcePrompter(await validateSamDeployConfig(projectRootFolder)) - ) + this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template)) - this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.stackName.bindPrompter( - ({ region }) => - createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - } - ) - this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.bucketName.bindPrompter( - ({ region }) => - createBucketNamePrompter(new DefaultS3Client(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided, - } - ) - this.form.projectRoot.setDefault(() => getProjectRoot(templateItem)) - } else { - // "Deploy" command was invoked on the command palette. - this.form.template.bindPrompter(() => - createTemplatePrompter(this.registry, deployMementoRootKey, samDeployUrl) - ) - this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template)) - this.form.paramsSource.bindPrompter(async ({ projectRoot }) => { - const existValidSamConfig: boolean | undefined = await validateSamDeployConfig(projectRoot) - return createDeployParamsSourcePrompter(existValidSamConfig) - }) - this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.stackName.bindPrompter( - ({ region }) => - createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ paramsSource }) => - paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - } - ) - this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), { + this.form.paramsSource.bindPrompter(async ({ projectRoot }) => + createDeployParamsSourcePrompter(await validateSamDeployConfig(projectRoot)) + ) + this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), { + showWhen: ({ paramsSource }) => + paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, + }) + this.form.stackName.bindPrompter( + ({ region }) => + createStackPrompter(new DefaultCloudFormationClient(region!), deployMementoRootKey, samDeployUrl), + { showWhen: ({ paramsSource }) => paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, - }) - this.form.bucketName.bindPrompter( - ({ region }) => - createBucketNamePrompter(new DefaultS3Client(region!), deployMementoRootKey, samDeployUrl), - { - showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided, - } - ) - } - - return this - } - - /** - * Parse the template for parameters and add prompters for them if applicable. - * @param templateUri the uri of the template - */ - addParameterPromptersIfApplicable(templateUri: vscode.Uri) { - if (!this.samTemplateParameters || this.samTemplateParameters.size === 0) { - return - } - const parameterNames = new Set(this.samTemplateParameters.keys()) - parameterNames.forEach((name) => { - if (this.preloadedTemplate) { - const defaultValue = this.preloadedTemplate.Parameters - ? (this.preloadedTemplate.Parameters[name]?.Default as string) - : undefined - this.form[name].bindPrompter(() => createParamPromptProvider(name, defaultValue, templateUri.fsPath)) } + ) + this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), { + showWhen: ({ paramsSource }) => + paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, }) + this.form.bucketName.bindPrompter( + ({ region }) => createBucketNamePrompter(new DefaultS3Client(region!), deployMementoRootKey, samDeployUrl), + { + showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided, + } + ) + + return this } } export async function getDeployWizard(arg?: any, shouldPromptExit?: boolean): Promise { - let samTemplateParameters = new Map() - let preloadedTemplate: CloudFormation.Template | undefined - if (arg && arg.path) { - // "Deploy" command was invoked on a template.yaml file. - const templateUri = arg as vscode.Uri - samTemplateParameters = await getParameters(templateUri) - preloadedTemplate = await CloudFormation.load(templateUri.fsPath) - } else if (arg && arg.regionCode) { - // region node, do nothing - } else if (arg && arg.getTreeItem().resourceUri) { - const templateUri = arg.getTreeItem().resourceUri as vscode.Uri - samTemplateParameters = await getParameters(templateUri) - preloadedTemplate = await CloudFormation.load(templateUri.fsPath) + let initState: Partial + let templateUri: vscode.Uri + const entryPoint = getDeployEntryPoint(arg) + + switch (entryPoint) { + case SamDeployEntryPoints.SamTemplateFile: + initState = { template: { uri: arg as vscode.Uri, data: {} } as TemplateItem } + break + case SamDeployEntryPoints.RegionNodeContextMenu: + initState = { region: arg.regionCode } + break + case SamDeployEntryPoints.AppBuilderNodeButton: + templateUri = arg.getTreeItem().resourceUri as vscode.Uri + initState = { template: { uri: templateUri, data: {} } as TemplateItem } + break + case SamDeployEntryPoints.CommandPalette: + default: + initState = {} + break } - const deployParams: Partial = {} - const wizard = new DeployWizard( - deployParams, - await globals.templateRegistry, - arg, - samTemplateParameters, - preloadedTemplate, - shouldPromptExit - ) + const wizard = new DeployWizard(initState, await globals.templateRegistry, arg, shouldPromptExit) return wizard } @@ -308,14 +195,13 @@ export async function runDeploy(arg: any, wizardParams?: DeployParams): Promise< deployFlags.push('--save-params') } - const samTemplateParameters = await getParameters(params.template.uri) - if (samTemplateParameters.size > 0) { - const parameterNames = new Set(samTemplateParameters.keys()) + if (!!params.templateParameters && Object.entries(params.templateParameters).length > 0) { + const templateParameters = new Map(Object.entries(params.templateParameters)) const paramsToSet: string[] = [] - for (const name of parameterNames) { - if (params[name]) { - await updateRecentResponse(deployMementoRootKey, params.template.uri.fsPath, name, params[name]) - paramsToSet.push(`ParameterKey=${name},ParameterValue=${params[name]}`) + for (const [key, value] of templateParameters.entries()) { + if (value) { + await updateRecentResponse(deployMementoRootKey, params.template.uri.fsPath, key, value) + paramsToSet.push(`ParameterKey=${key},ParameterValue=${value}`) } } paramsToSet.length > 0 && deployFlags.push('--parameter-overrides', paramsToSet.join(' ')) diff --git a/packages/core/src/shared/sam/sync.ts b/packages/core/src/shared/sam/sync.ts index 9f4bdc6ab07..14e40840fa8 100644 --- a/packages/core/src/shared/sam/sync.ts +++ b/packages/core/src/shared/sam/sync.ts @@ -9,7 +9,6 @@ import * as vscode from 'vscode' import * as path from 'path' import * as localizedText from '../localizedText' import { DefaultS3Client } from '../clients/s3Client' -import { Wizard } from '../wizards/wizard' import { DataQuickPickItem, createMultiPick, createQuickPick } from '../ui/pickerPrompter' import { DefaultCloudFormationClient } from '../clients/cloudFormationClient' import * as CloudFormation from '../cloudformation/cloudformation' @@ -28,14 +27,14 @@ import { createExitPrompter } from '../ui/common/exitPrompter' import { getConfigFileUri, SamConfig, validateSamSyncConfig, writeSamconfigGlobal } from './config' import { cast, Optional } from '../utilities/typeConstructors' import { pushIf, toRecord } from '../utilities/collectionUtils' -import { getOverriddenParameters } from '../../lambda/config/parameterUtils' +import { getParameters } from '../../lambda/config/parameterUtils' import { addTelemetryEnvVar } from './cli/samCliInvokerUtils' import { samSyncParamUrl, samSyncUrl, samUpgradeUrl } from '../constants' import { openUrl } from '../utilities/vsCodeUtils' import { showOnce } from '../utilities/messages' import { IamConnection } from '../../auth/connection' import { CloudFormationTemplateRegistry } from '../fs/templateRegistry' -import { TreeNode } from '../treeview/resourceTreeDataProvider' +import { isTreeNode, TreeNode } from '../treeview/resourceTreeDataProvider' import { getSpawnEnv } from '../env/resolveEnv' import { getProjectRoot, @@ -52,6 +51,11 @@ import { ParamsSource, createSyncParamsSourcePrompter } from '../ui/sam/paramsSo import { createEcrPrompter } from '../ui/sam/ecrPrompter' import { BucketSource, createBucketNamePrompter, createBucketSourcePrompter } from '../ui/sam/bucketPrompter' import { runInTerminal } from './processTerminal' +import { + TemplateParametersForm, + TemplateParametersWizard, +} from '../../awsService/appBuilder/wizards/templateParametersWizard' +import { CompositeWizard } from '../wizards/compositeWizard' export interface SyncParams { readonly paramsSource: ParamsSource @@ -59,6 +63,7 @@ export interface SyncParams { readonly deployType: 'infra' | 'code' readonly projectRoot: vscode.Uri readonly template: TemplateItem + readonly templateParameters: any readonly stackName: string readonly bucketSource: BucketSource readonly bucketName: string @@ -147,7 +152,30 @@ export const syncFlagItems: DataQuickPickItem[] = [ }, ] -export class SyncWizard extends Wizard { +export enum SamSyncEntryPoints { + SamTemplateFile, + SamConfigFile, + RegionNodeContextMenu, + AppBuilderNodeButton, + CommandPalette, +} + +function getSyncEntryPoint(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined) { + if (arg instanceof vscode.Uri) { + if (arg.path.endsWith('samconfig.toml')) { + return SamSyncEntryPoints.SamConfigFile + } + return SamSyncEntryPoints.SamTemplateFile + } else if (arg instanceof AWSTreeNodeBase) { + return SamSyncEntryPoints.RegionNodeContextMenu + } else if (isTreeNode(arg)) { + return SamSyncEntryPoints.AppBuilderNodeButton + } else { + return SamSyncEntryPoints.CommandPalette + } +} + +export class SyncWizard extends CompositeWizard { registry: CloudFormationTemplateRegistry public constructor( state: Pick & Partial, @@ -156,17 +184,38 @@ export class SyncWizard extends Wizard { ) { super({ initState: state, exitPrompterProvider: shouldPromptExit ? createExitPrompter : undefined }) this.registry = registry + } + + public override async init(): Promise { this.form.template.bindPrompter(() => createTemplatePrompter(this.registry, syncMementoRootKey, samSyncUrl)) + this.form.templateParameters.bindPrompter( + async ({ template }) => + this.createWizardPrompter( + TemplateParametersWizard, + template!.uri, + samSyncUrl, + syncMementoRootKey + ), + { + showWhen: async ({ template }) => { + const samTemplateParameters = await getParameters(template!.uri) + return !!samTemplateParameters && samTemplateParameters.size > 0 + }, + } + ) + this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template)) this.form.paramsSource.bindPrompter(async ({ projectRoot }) => { const existValidSamConfig: boolean | undefined = await validateSamSyncConfig(projectRoot) return createSyncParamsSourcePrompter(existValidSamConfig) }) + this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), { showWhen: ({ paramsSource }) => paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, }) + this.form.stackName.bindPrompter( ({ region }) => createStackPrompter(new DefaultCloudFormationClient(region!), syncMementoRootKey, samSyncUrl), @@ -210,6 +259,7 @@ export class SyncWizard extends Wizard { paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave, } ) + return this } } @@ -296,30 +346,22 @@ export async function saveAndBindArgs(args: SyncParams): Promise<{ readonly boun return { boundArgs } } -async function loadLegacyParameterOverrides(template: TemplateItem) { - try { - const params = await getOverriddenParameters(template.uri) - if (!params) { - return - } - - return [...params.entries()].map(([k, v]) => `${k}=${v}`) - } catch (err) { - getLogger().warn(`sam: unable to load legacy parameter overrides: %s`, err) - } -} - export async function runSamSync(args: SyncParams) { telemetry.record({ lambdaPackageType: args.ecrRepoUri !== undefined ? 'Image' : 'Zip' }) const { path: samCliPath, parsedVersion } = await getSamCliPathAndVersion() const { boundArgs } = await saveAndBindArgs(args) - const overrides = await loadLegacyParameterOverrides(args.template) - if (overrides !== undefined) { - // Leaving this out of the definitions file as this is _very_ niche and specific to the - // implementation. Plus we would have to redefine `sam_sync` to add it. - telemetry.record({ isUsingTemplatesJson: true } as any) - boundArgs.push('--parameter-overrides', ...overrides) + + if (!!args.templateParameters && Object.entries(args.templateParameters).length > 0) { + const templateParameters = new Map(Object.entries(args.templateParameters)) + const paramsToSet: string[] = [] + for (const [key, value] of templateParameters.entries()) { + if (value) { + await updateRecentResponse(syncMementoRootKey, args.template.uri.fsPath, key, value) + paramsToSet.push(`ParameterKey=${key},ParameterValue=${value}`) + } + } + paramsToSet.length > 0 && boundArgs.push('--parameter-overrides', paramsToSet.join(' ')) } // '--no-watch' was not added until https://github.com/aws/aws-sam-cli/releases/tag/v1.77.0 @@ -431,21 +473,30 @@ export async function prepareSyncParams( ): Promise> { // Skip creating dependency layers by default for backwards compat const baseParams: Partial = { skipDependencyLayer: true } + const entryPoint = getSyncEntryPoint(arg) - if (arg instanceof AWSTreeNodeBase) { - // "Deploy" command was invoked on a regionNode. - return { ...baseParams, region: arg.regionCode } - } else if (arg instanceof vscode.Uri) { - if (arg.path.endsWith('samconfig.toml')) { - // "Deploy" command was invoked on a samconfig.toml file. - // TODO: add step to verify samconfig content to skip param source prompter - const config = await SamConfig.fromConfigFileUri(arg) + switch (entryPoint) { + case SamSyncEntryPoints.SamTemplateFile: { + const entryPointArg = arg as vscode.Uri + const template = { + uri: entryPointArg, + data: await CloudFormation.load(entryPointArg.fsPath, validate), + } + + return { + ...baseParams, + template: template, + projectRoot: getProjectRootUri(template.uri), + } + } + case SamSyncEntryPoints.SamConfigFile: { + const config = await SamConfig.fromConfigFileUri(arg as vscode.Uri) const params = getSyncParamsFromConfig(config) const projectRoot = vscode.Uri.joinPath(config.location, '..') const templateUri = params.templatePath ? vscode.Uri.file(path.resolve(projectRoot.fsPath, params.templatePath)) : undefined - const template = templateUri + const samConfigFileTemplate = templateUri ? { uri: templateUri, data: await CloudFormation.load(templateUri.fsPath), @@ -454,29 +505,38 @@ export async function prepareSyncParams( // Always use the dependency layer if the user specified to do so const skipDependencyLayer = !config.getCommandParam('sync', 'dependency_layer') - return { ...baseParams, ...params, template, projectRoot, skipDependencyLayer } as SyncParams + return { + ...baseParams, + ...params, + template: samConfigFileTemplate, + projectRoot, + skipDependencyLayer, + } as SyncParams } - - // "Deploy" command was invoked on a template.yaml file. - const template = { - uri: arg, - data: await CloudFormation.load(arg.fsPath, validate), + case SamSyncEntryPoints.RegionNodeContextMenu: { + const entryPointArg = arg as AWSTreeNodeBase + return { ...baseParams, region: entryPointArg.regionCode } } - - return { ...baseParams, template, projectRoot: getProjectRootUri(template.uri) } - } else if (arg && arg.getTreeItem()) { - // "Deploy" command was invoked on a TreeNode on the AppBuilder. - const templateUri = (arg.getTreeItem() as vscode.TreeItem).resourceUri - if (templateUri) { - const template = { - uri: templateUri, - data: await CloudFormation.load(templateUri.fsPath, validate), + case SamSyncEntryPoints.AppBuilderNodeButton: { + const entryPointArg = arg as TreeNode + const templateUri = (entryPointArg.getTreeItem() as vscode.TreeItem).resourceUri + if (templateUri) { + const template = { + uri: templateUri, + data: await CloudFormation.load(templateUri.fsPath, validate), + } + return { + ...baseParams, + template, + projectRoot: getProjectRootUri(templateUri), + } } - return { ...baseParams, template, projectRoot: getProjectRootUri(template.uri) } + return baseParams } + case SamSyncEntryPoints.CommandPalette: + default: + return baseParams } - - return baseParams } export type SamSyncResult = { diff --git a/packages/core/src/shared/ui/wizardPrompter.ts b/packages/core/src/shared/ui/wizardPrompter.ts index 64668b7340e..c9173e738ba 100644 --- a/packages/core/src/shared/ui/wizardPrompter.ts +++ b/packages/core/src/shared/ui/wizardPrompter.ts @@ -18,6 +18,9 @@ import { Prompter, PromptResult } from './prompter' * - {@link SingleNestedWizard} * - {@link DoubleNestedWizard} */ + +// eslint-disable-next-line @typescript-eslint/naming-convention +export const WIZARD_PROMPTER = 'WIZARD_PROMPTER' export class WizardPrompter extends Prompter { public get recentItem(): any { return undefined @@ -56,6 +59,7 @@ export class WizardPrompter extends Prompter { } } + // eslint-disable-next-line @typescript-eslint/naming-convention protected async promptUser(): Promise> { this.response = await this.wizard.run() diff --git a/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts b/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts index a75c7c8b9a2..8b26cedb1ef 100644 --- a/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts +++ b/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts @@ -63,10 +63,10 @@ describe('DeployTypeWizard', function () { assert.strictEqual(picker.items.length, 2) picker.acceptItem(picker.items[1]) }) - .handleInputBox('Specify SAM parameter value for SourceBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { inputBox.acceptValue('my-source-bucket-name') }) - .handleInputBox('Specify SAM parameter value for DestinationBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { inputBox.acceptValue('my-destination-bucket-name') }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { @@ -98,6 +98,12 @@ describe('DeployTypeWizard', function () { assert.strictEqual(picker.items.length, 2) picker.acceptItem(picker.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() diff --git a/packages/core/src/test/shared/sam/deploy.test.ts b/packages/core/src/test/shared/sam/deploy.test.ts index 5e1d22297a7..c38c6eb8731 100644 --- a/packages/core/src/test/shared/sam/deploy.test.ts +++ b/packages/core/src/test/shared/sam/deploy.test.ts @@ -15,7 +15,7 @@ import assert from 'assert' import { getTestWindow } from '../vscode/window' import { DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient' import { intoCollection } from '../../../shared/utilities/collectionUtils' -import { PrompterTester } from '../wizards/prompterTester' +import { clickBackButton, createPromptHandler, PrompterTester } from '../wizards/prompterTester' import { RegionNode } from '../../../awsexplorer/regionNode' import { createTestRegionProvider } from '../regions/testUtil' import { DefaultS3Client } from '../../../shared/clients/s3Client' @@ -33,6 +33,7 @@ import { CancellationError } from '../../../shared/utilities/timeoutUtils' import { TemplateItem } from '../../../shared/ui/sam/templatePrompter' import { ParamsSource } from '../../../shared/ui/sam/paramsSourcePrompter' import { BucketSource } from '../../../shared/ui/sam/bucketPrompter' +import { TestInputBox, TestQuickPick } from '../vscode/quickInput' describe('SAM DeployWizard', async function () { let sandbox: sinon.SinonSandbox @@ -89,10 +90,10 @@ describe('SAM DeployWizard', async function () { await testFolder.write('samconfig.toml', samconfigInvalidData) const prompterTester = PrompterTester.init() - .handleInputBox('Specify SAM parameter value for SourceBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { inputBox.acceptValue('my-source-bucket-name') }) - .handleInputBox('Specify SAM parameter value for DestinationBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { inputBox.acceptValue('my-destination-bucket-name') }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { @@ -129,8 +130,8 @@ describe('SAM DeployWizard', async function () { const parameters = await (await getDeployWizard(templateFile)).run() assert(parameters) - assert.strictEqual(parameters.SourceBucketName, 'my-source-bucket-name') - assert.strictEqual(parameters.DestinationBucketName, 'my-destination-bucket-name') + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) @@ -160,10 +161,10 @@ describe('SAM DeployWizard', async function () { await testFolder.write('samconfig.toml', samconfigCompleteData) const prompterTester = PrompterTester.init() - .handleInputBox('Specify SAM parameter value for SourceBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { inputBox.acceptValue('my-source-bucket-name') }) - .handleInputBox('Specify SAM parameter value for DestinationBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { inputBox.acceptValue('my-destination-bucket-name') }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { @@ -181,8 +182,8 @@ describe('SAM DeployWizard', async function () { const parameters = await (await getDeployWizard(templateFile)).run() assert(parameters) - assert.strictEqual(parameters.SourceBucketName, 'my-source-bucket-name') - assert.strictEqual(parameters.DestinationBucketName, 'my-destination-bucket-name') + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) @@ -232,6 +233,12 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() @@ -269,11 +276,13 @@ describe('SAM DeployWizard', async function () { const parameters = await (await getDeployWizard(regionNode)).run() assert(parameters) - // assert.strictEqual(parameters.SourceBucketName, 'my-source-bucket-name') - // assert.strictEqual(parameters.DestinationBucketName, 'my-destination-bucket-name') + // assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + // assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.paramsSource, 1) assert.strictEqual(parameters.region, 'us-west-2') assert.strictEqual(parameters.stackName, 'stack1') @@ -306,6 +315,12 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() @@ -324,6 +339,8 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.paramsSource, 2) assert.strictEqual(parameters.region, 'us-west-2') assert(!parameters.stackName) @@ -361,10 +378,10 @@ describe('SAM DeployWizard', async function () { */ const prompterTester = PrompterTester.init() - .handleInputBox('Specify SAM parameter value for SourceBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { inputBox.acceptValue('my-source-bucket-name') }) - .handleInputBox('Specify SAM parameter value for DestinationBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { inputBox.acceptValue('my-destination-bucket-name') }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { @@ -400,8 +417,8 @@ describe('SAM DeployWizard', async function () { const parameters = await (await getDeployWizard(appNode)).run() assert(parameters) - assert.strictEqual(parameters.SourceBucketName, 'my-source-bucket-name') - assert.strictEqual(parameters.DestinationBucketName, 'my-destination-bucket-name') + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) @@ -432,10 +449,10 @@ describe('SAM DeployWizard', async function () { await testFolder.write('samconfig.toml', samconfigCompleteData) const prompterTester = PrompterTester.init() - .handleInputBox('Specify SAM parameter value for SourceBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { inputBox.acceptValue('my-source-bucket-name') }) - .handleInputBox('Specify SAM parameter value for DestinationBucketName', (inputBox) => { + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { inputBox.acceptValue('my-destination-bucket-name') }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { @@ -453,8 +470,8 @@ describe('SAM DeployWizard', async function () { const parameters = await (await getDeployWizard(appNode)).run() assert(parameters) - assert.strictEqual(parameters.SourceBucketName, 'my-source-bucket-name') - assert.strictEqual(parameters.DestinationBucketName, 'my-destination-bucket-name') + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) @@ -495,6 +512,12 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() @@ -539,6 +562,8 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.paramsSource, 1) assert.strictEqual(parameters.region, 'us-west-2') assert.strictEqual(parameters.stackName, 'stack3') @@ -547,6 +572,240 @@ describe('SAM DeployWizard', async function () { prompterTester.assertCallAll() }) + it('happy path without/invalid samconfig.toml with backward click', async () => { + /** + * Selection: + * - SourceBucketName : [Skip?] undefined + * - DestinationBucketName : [Skip?] undefined + * + * - template : [Select] template/yaml set + * - projectRoot : [Skip] automatically set + * - paramsSource : [Select] 2. ('Specify required parameters') + * - region : [Skip] automatically set from region node 'us-west-2' + * - stackName : [Select] 3. 'stack3' + * - bucketSource : [Select] 2. ('Specify an S3 bucket') + * - bucketName : [Select] 3. 'stack-3-bucket' + */ + + // Create a second project folder to simulate multiple project in 1 workspace + const testFolder2 = await TestFolder.create() + const templateFile2 = vscode.Uri.file(await testFolder2.write('template.yaml', validTemplateData)) + await (await globals.templateRegistry).addItem(templateFile2) + + const prompterTester = PrompterTester.init() + .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => { + // Need sometime to wait for the template to search for template file + await quickPick.untilReady() + assert.strictEqual(quickPick.items.length, 2) + assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) + quickPick.acceptItem(quickPick.items[0]) + }) + .handleInputBox( + 'Specify SAM Template parameter value for SourceBucketName', + (() => { + return createPromptHandler({ + default: async (inputBox: TestInputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }, + numbered: [ + { + order: [2], + handler: clickBackButton, + }, + { + order: [1], + handler: async (inputBox: TestInputBox) => { + inputBox.acceptValue('my-source-bucket-name-not-final') + }, + }, + ], + }) + })() + ) + .handleInputBox( + 'Specify SAM Template parameter value for DestinationBucketName', + (() => { + return createPromptHandler({ + default: async (inputBox: TestInputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }, + numbered: [ + { + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Specify parameter source for deploy', + (() => { + return createPromptHandler({ + default: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + assert.strictEqual(quickPick.items.length, 2) + assert.strictEqual(quickPick.items[1].label, 'Specify required parameters') + quickPick.acceptItem(quickPick.items[1]) + }, + numbered: [ + { + order: [1], + handler: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + quickPick.acceptItem(quickPick.items[0]) + }, + }, + { + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Select a region', + (() => { + return createPromptHandler({ + default: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0] + quickPick.acceptItem(select || quickPick.items[0]) + }, + numbered: [ + { + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Select a CloudFormation Stack', + (() => { + return createPromptHandler({ + default: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + assert.strictEqual(quickPick.items[2].label, 'stack3') + quickPick.acceptItem(quickPick.items[2]) + }, + numbered: [ + { + order: [1], + handler: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + assert.strictEqual(quickPick.items[0].label, 'stack1') + quickPick.acceptItem(quickPick.items[0]) + }, + }, + { + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Specify S3 bucket for deployment artifacts', + (() => { + return createPromptHandler({ + default: async (quickPick: TestQuickPick) => { + await quickPick.untilReady() + assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket') + quickPick.acceptItem(quickPick.items[1]) + }, + numbered: [ + { + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Select an S3 Bucket', + (() => { + return createPromptHandler({ + default: async (picker: TestQuickPick) => { + await picker.untilReady() + assert.strictEqual(picker.items[2].label, 'stack-3-bucket') + picker.acceptItem(picker.items[2]) + }, + numbered: [ + { + order: [1], + handler: clickBackButton, + }, + ], + }) + })() + ) + .build() + + const parameters = await (await getDeployWizard()).run() + assert(parameters) + + const expectedCallOrder = [ + 'Select a SAM/CloudFormation Template', + 'Specify SAM Template parameter value for SourceBucketName', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify parameter source for deploy', + 'Select a region', + 'Select a CloudFormation Stack', + 'Specify S3 bucket for deployment artifacts', + 'Select an S3 Bucket', + 'Specify S3 bucket for deployment artifacts', + 'Select a CloudFormation Stack', + 'Select a region', + 'Specify parameter source for deploy', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify SAM Template parameter value for SourceBucketName', + 'Select a SAM/CloudFormation Template', + 'Specify SAM Template parameter value for SourceBucketName', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify parameter source for deploy', + 'Select a region', + 'Select a CloudFormation Stack', + 'Specify S3 bucket for deployment artifacts', + 'Select an S3 Bucket', + ] + + assert.deepStrictEqual( + { + ...parameters, + template: { uri: { fsPath: parameters.template.uri.fsPath } }, + projectRoot: { fsPath: parameters.projectRoot.fsPath }, + }, + { + template: { + uri: { + fsPath: templateFile.fsPath, + }, + }, + projectRoot: { + fsPath: projectRoot.fsPath, + }, + templateParameters: { + SourceBucketName: 'my-source-bucket-name', + DestinationBucketName: 'my-destination-bucket-name', + }, + paramsSource: 1, + region: 'us-west-2', + stackName: 'stack3', + bucketSource: 1, + bucketName: 'stack-3-bucket', + } + ) + + expectedCallOrder.forEach((title, index) => { + prompterTester.assertCallOrder(title, index + 1) + }) + }) + it('happy path with samconfig.toml', async () => { /** * Selection: @@ -579,6 +838,12 @@ describe('SAM DeployWizard', async function () { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for deploy', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() @@ -593,6 +858,8 @@ describe('SAM DeployWizard', async function () { assert(parameters) assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name') + assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name') assert.strictEqual(parameters.paramsSource, 2) assert(!parameters.region) assert(!parameters.stackName) @@ -663,8 +930,10 @@ describe('SAM Deploy', () => { // Mock result from DeployWizard; the Wizard is already tested separately mockDeployParams = { paramsSource: ParamsSource.SamConfig, - SourceBucketName: 'my-source-bucket-name', - DestinationBucketName: 'my-destination-bucket-name', + templateParameters: { + SourceBucketName: 'my-source-bucket-name', + DestinationBucketName: 'my-destination-bucket-name', + }, region: undefined, stackName: undefined, bucketName: undefined, @@ -710,8 +979,8 @@ describe('SAM Deploy', () => { '--config-file', `${samconfigFile}`, '--parameter-overrides', - `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + - `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, + `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` + + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`, ], { spawnOptions: { @@ -739,8 +1008,10 @@ describe('SAM Deploy', () => { // Mock result from DeployWizard; the Wizard is already tested separately mockDeployParams = { paramsSource: ParamsSource.SamConfig, - SourceBucketName: 'my-source-bucket-name', - DestinationBucketName: 'my-destination-bucket-name', + templateParameters: { + SourceBucketName: 'my-source-bucket-name', + DestinationBucketName: 'my-destination-bucket-name', + }, // Simulate entry from region node when region ('us-east-1') differ from 'us-west-2' in samconfig.toml region: 'us-east-1', stackName: undefined, @@ -786,8 +1057,8 @@ describe('SAM Deploy', () => { '--config-file', `${samconfigFile}`, '--parameter-overrides', - `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + - `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, + `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` + + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`, ], { spawnOptions: { @@ -815,8 +1086,10 @@ describe('SAM Deploy', () => { // Mock result from DeployWizard; the Wizard is already tested separately mockDeployParams = { paramsSource: ParamsSource.SpecifyAndSave, - SourceBucketName: 'my-source-bucket-name', - DestinationBucketName: 'my-destination-bucket-name', + templateParameters: { + SourceBucketName: 'my-source-bucket-name', + DestinationBucketName: 'my-destination-bucket-name', + }, region: 'us-east-1', stackName: 'stack1', bucketName: undefined, @@ -864,8 +1137,8 @@ describe('SAM Deploy', () => { 'CAPABILITY_NAMED_IAM', '--save-params', '--parameter-overrides', - `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + - `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, + `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` + + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`, ], { spawnOptions: { @@ -899,8 +1172,10 @@ describe('SAM Deploy', () => { beforeEach(async () => { mockDeployParams = { paramsSource: ParamsSource.SpecifyAndSave, - SourceBucketName: 'my-source-bucket-name', - DestinationBucketName: 'my-destination-bucket-name', + templateParameters: { + SourceBucketName: 'my-source-bucket-name', + DestinationBucketName: 'my-destination-bucket-name', + }, region: 'us-east-1', stackName: 'stack1', bucketName: undefined, diff --git a/packages/core/src/test/shared/sam/sync.test.ts b/packages/core/src/test/shared/sam/sync.test.ts index 960019dd60e..627cee964f6 100644 --- a/packages/core/src/test/shared/sam/sync.test.ts +++ b/packages/core/src/test/shared/sam/sync.test.ts @@ -61,12 +61,13 @@ import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegis import { samconfigCompleteData, samconfigInvalidData, validTemplateData } from '../../shared/sam/samTestUtils' import { assertTelemetry, assertTelemetryCurried } from '../../testUtil' -import { PrompterTester } from '../wizards/prompterTester' +import { clickBackButton, createPromptHandler, PrompterTester } from '../wizards/prompterTester' import { createTestRegionProvider } from '../regions/testUtil' import { ToolkitPromptSettings } from '../../../shared/settings' import { DefaultEcrClient } from '../../../shared/clients/ecrClient' import assert from 'assert' import { BucketSource } from '../../../shared/ui/sam/bucketPrompter' +import { TestInputBox, TestQuickPick } from '../vscode/quickInput' describe('SAM SyncWizard', async function () { const createTester = async (params?: Partial) => @@ -168,6 +169,10 @@ describe('SAM SyncWizard', async () => { * Selection: * - template : [Skip] automatically set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 1. ('Specify required parameters and save as defaults') * - region : [Select] 'us-west-2' * - stackName : [Select] 1. 'stack1' @@ -180,6 +185,12 @@ describe('SAM SyncWizard', async () => { await testFolder.write('samconfig.toml', samconfigInvalidData) const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -248,6 +259,10 @@ describe('SAM SyncWizard', async () => { * Selection: * - template : [Skip] automatically set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 3. ('Use default values from samconfig') * - region : [Skip] null; will use 'us-west-2' from samconfig * - stackName : [Skip] null; will use 'project-1' from samconfig @@ -260,6 +275,12 @@ describe('SAM SyncWizard', async () => { await testFolder.write('samconfig.toml', samconfigCompleteData) const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (quickPick) => { // Need time to check samconfig.toml file and generate options await quickPick.untilReady() @@ -305,6 +326,10 @@ describe('SAM SyncWizard', async () => { * Selection: * - template : [Skip] automatically set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 2. ('Specify required parameters') * - region : [Select] 'us-west-2' * - stackName : [Select] 2. 'stack2' @@ -314,6 +339,12 @@ describe('SAM SyncWizard', async () => { */ const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -387,6 +418,10 @@ describe('SAM SyncWizard', async () => { * Selection: * - template : [Skip] automatically set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 3. ('Use default values from samconfig') * - region : [Skip] null; will use value from samconfig file * - stackName : [Skip] null; will use value from samconfig file @@ -399,6 +434,12 @@ describe('SAM SyncWizard', async () => { await testFolder.write('samconfig.toml', samconfigCompleteData) const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -445,6 +486,10 @@ describe('SAM SyncWizard', async () => { * Selection: * - template : [Select] template/yaml set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 2. ('Specify required parameters') * - region : [Skip] automatically set from region node 'us-west-2' * - stackName : [Select] 2. 'stack2' @@ -460,6 +505,12 @@ describe('SAM SyncWizard', async () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -547,6 +598,12 @@ describe('SAM SyncWizard', async () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -597,6 +654,12 @@ describe('SAM SyncWizard', async () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -628,7 +691,12 @@ describe('SAM SyncWizard', async () => { const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', '')) /** * Selection: + * - template : [Skip] automatically set * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * * - paramsSource : [Select] 1. ('Specify required parameters and save as defaults') * - region : [Select] 'us-west-2' * - stackName : [Select] 2. 'stack2' @@ -644,6 +712,12 @@ describe('SAM SyncWizard', async () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -710,142 +784,282 @@ describe('SAM SyncWizard', async () => { assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--watch"]') prompterTester.assertCallAll() }) - }) - describe('entry: command palette', () => { - it('happy path with invalid samconfig.toml', async () => { - /** - * Selection: - * - template : [Select] template/yaml set - * - projectRoot : [Skip] automatically set - * - paramsSource : [Select] 1. ('Specify required parameters and save as defaults') - * - region : [Select] 'us-west-2' - * - stackName : [Select] 3. 'stack3' - * - bucketName : [select] 3. stack-3-bucket - * - syncFlags : [Select] all - */ + it('happy path with empty samconfig.toml with backward click', async () => { + // generate samconfig.toml in temporary test folder + const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', '')) - const prompterTester = PrompterTester.init() + const prompterTester = PrompterTester.init({ handlerTimeout: 300000 }) .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => { // Need sometime to wait for the template to search for template file + // 1st await quickPick.untilReady() - assert.strictEqual(quickPick.items.length, 1) - assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) - .handleQuickPick('Specify parameter source for sync', async (picker) => { - // Need time to check samconfig.toml file and generate options - await picker.untilReady() - - assert.strictEqual(picker.items.length, 2) - assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults') - assert.strictEqual(picker.items[1].label, 'Specify required parameters') - picker.acceptItem(picker.items[0]) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', async (inputBox) => { + // 2nd + // 6th + await inputBox.untilReady() + inputBox.acceptValue('my-source-bucket-name') }) + .handleInputBox( + 'Specify SAM Template parameter value for DestinationBucketName', + (() => { + return createPromptHandler({ + // 3rd + // 7th + // 9th + default: async (input: TestInputBox) => { + await input.untilReady() + input.acceptValue('my-destination-bucket-name') + }, + numbered: [ + { + // 5th + order: [2], + handler: clickBackButton, + }, + ], + }) + })() + ) + .handleQuickPick( + 'Specify parameter source for sync', + (() => { + return createPromptHandler({ + // 10th + default: async (picker: TestQuickPick) => { + await picker.untilReady() + picker.acceptItem(picker.items[1]) + }, + numbered: [ + { + // 4th + // 8th + order: [1, 2], + handler: clickBackButton, + }, + ], + }) + })() + ) .handleQuickPick('Select a region', (quickPick) => { + // 11th const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0] quickPick.acceptItem(select || quickPick.items[0]) }) - .handleQuickPick('Select a CloudFormation Stack', async (picker) => { - await picker.untilReady() - assert.strictEqual(picker.items.length, 3) - assert.strictEqual(picker.items[0].label, 'stack1') - assert.strictEqual(picker.items[1].label, 'stack2') - assert.strictEqual(picker.items[2].label, 'stack3') - picker.acceptItem(picker.items[2]) + .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => { + await quickPick.untilReady() + assert.strictEqual(quickPick.items[1].label, 'stack2') + quickPick.acceptItem(quickPick.items[1]) }) .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => { await picker.untilReady() - assert.strictEqual(picker.items.length, 2) - assert.deepStrictEqual(picker.items[0], { - label: 'Create a SAM CLI managed S3 bucket', - data: BucketSource.SamCliManaged, - }) - assert.deepStrictEqual(picker.items[1], { - label: 'Specify an S3 bucket', - data: BucketSource.UserProvided, - }) - picker.acceptItem(picker.items[0]) + picker.acceptItem(picker.items[1]) + }) + .handleQuickPick('Select an S3 Bucket', async (picker) => { + await picker.untilReady() + assert.strictEqual(picker.items[1].label, 'stack-2-bucket') + picker.acceptItem(picker.items[1]) }) .handleQuickPick('Specify parameters for sync', async (picker) => { await picker.untilReady() - assert.strictEqual(picker.items.length, 9) const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0] const useContainer = picker.items.filter((item) => item.label === 'Use container')[0] - picker.acceptItems(dependencyLayer, useContainer) + const watch = picker.items.filter((item) => item.label === 'Watch')[0] + picker.acceptItems(dependencyLayer, useContainer, watch) }) .build() - const parameters = await (await getSyncWizard('infra', undefined, false, false)).run() - + const parameters = await (await getSyncWizard('infra', samconfigFile, false, false)).run() assert(parameters) - assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) - assert.strictEqual(parameters.paramsSource, ParamsSource.SpecifyAndSave) + assert.strictEqual(parameters.paramsSource, ParamsSource.Specify) assert.strictEqual(parameters.region, 'us-west-2') - assert.strictEqual(parameters.stackName, 'stack3') - assert.strictEqual(parameters.bucketSource, BucketSource.SamCliManaged) - assert(!parameters.bucketName) + assert.strictEqual(parameters.stackName, 'stack2') + assert.strictEqual(parameters.bucketSource, BucketSource.UserProvided) + assert.strictEqual(parameters.bucketName, 'stack-2-bucket') assert.strictEqual(parameters.deployType, 'infra') assert.strictEqual(parameters.skipDependencyLayer, true) - assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]') + assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--watch"]') prompterTester.assertCallAll() + const expectedCallOrder = [ + 'Select a SAM/CloudFormation Template', + 'Specify SAM Template parameter value for SourceBucketName', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify parameter source for sync', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify SAM Template parameter value for SourceBucketName', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify parameter source for sync', + 'Specify SAM Template parameter value for DestinationBucketName', + 'Specify parameter source for sync', + 'Select a region', + 'Select a CloudFormation Stack', + 'Specify S3 bucket for deployment artifacts', + 'Select an S3 Bucket', + 'Specify parameters for sync', + ] + expectedCallOrder.forEach((title, index) => { + prompterTester.assertCallOrder(title, index + 1) + }) }) - it('happy path with valid samconfig.toml', async () => { - /** - * Selection: - * - template : [Select] template.yaml - * - projectRoot : [Skip] automatically set - * - paramsSource : [Select] 3. ('Use default values from samconfig') - * - region : [Skip] automatically set from region node 'us-west-2' - * - stackName : [Skip] null; will use value from samconfig file - * - bucketName : [Skip] automatically set for bucketSource option 1 - * - syncFlags : [Skip] null; will use flags from samconfig - */ - - // generate samconfig.toml in temporary test folder - await testFolder.write('samconfig.toml', samconfigCompleteData) - - const prompterTester = PrompterTester.init() - .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => { - // Need sometime to wait for the template to search for template file - await quickPick.untilReady() - assert.strictEqual(quickPick.items.length, 1) - assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) - quickPick.acceptItem(quickPick.items[0]) - }) - .handleQuickPick('Specify parameter source for sync', async (picker) => { - // Need time to check samconfig.toml file and generate options - await picker.untilReady() - - assert.strictEqual(picker.items.length, 3) - assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults') - assert.strictEqual(picker.items[1].label, 'Specify required parameters') - assert.strictEqual(picker.items[2].label, 'Use default values from samconfig') - picker.acceptItem(picker.items[2]) - }) - .build() - - const parameters = await (await getSyncWizard('infra', undefined, false, false)).run() - - assert(parameters) + describe('entry: command palette', () => { + it('happy path with invalid samconfig.toml', async () => { + /** + * Selection: + * - template : [Select] template/yaml set + * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * + * - paramsSource : [Select] 1. ('Specify required parameters and save as defaults') + * - region : [Select] 'us-west-2' + * - stackName : [Select] 3. 'stack3' + * - bucketName : [select] 3. stack-3-bucket + * - syncFlags : [Select] all + */ + + const prompterTester = PrompterTester.init() + .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => { + // Need sometime to wait for the template to search for template file + await quickPick.untilReady() + assert.strictEqual(quickPick.items.length, 1) + assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) + quickPick.acceptItem(quickPick.items[0]) + }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) + .handleQuickPick('Specify parameter source for sync', async (picker) => { + // Need time to check samconfig.toml file and generate options + await picker.untilReady() + + assert.strictEqual(picker.items.length, 2) + assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults') + assert.strictEqual(picker.items[1].label, 'Specify required parameters') + picker.acceptItem(picker.items[0]) + }) + .handleQuickPick('Select a region', (quickPick) => { + const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0] + quickPick.acceptItem(select || quickPick.items[0]) + }) + .handleQuickPick('Select a CloudFormation Stack', async (picker) => { + await picker.untilReady() + assert.strictEqual(picker.items.length, 3) + assert.strictEqual(picker.items[0].label, 'stack1') + assert.strictEqual(picker.items[1].label, 'stack2') + assert.strictEqual(picker.items[2].label, 'stack3') + picker.acceptItem(picker.items[2]) + }) + .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => { + await picker.untilReady() + assert.strictEqual(picker.items.length, 2) + assert.deepStrictEqual(picker.items[0], { + label: 'Create a SAM CLI managed S3 bucket', + data: BucketSource.SamCliManaged, + }) + assert.deepStrictEqual(picker.items[1], { + label: 'Specify an S3 bucket', + data: BucketSource.UserProvided, + }) + picker.acceptItem(picker.items[0]) + }) + .handleQuickPick('Specify parameters for sync', async (picker) => { + await picker.untilReady() + assert.strictEqual(picker.items.length, 9) + const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0] + const useContainer = picker.items.filter((item) => item.label === 'Use container')[0] + picker.acceptItems(dependencyLayer, useContainer) + }) + .build() + + const parameters = await (await getSyncWizard('infra', undefined, false, false)).run() + + assert(parameters) + + assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) + assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.paramsSource, ParamsSource.SpecifyAndSave) + assert.strictEqual(parameters.region, 'us-west-2') + assert.strictEqual(parameters.stackName, 'stack3') + assert.strictEqual(parameters.bucketSource, BucketSource.SamCliManaged) + assert(!parameters.bucketName) + assert.strictEqual(parameters.deployType, 'infra') + assert.strictEqual(parameters.skipDependencyLayer, true) + assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]') + prompterTester.assertCallAll() + }) - assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) - assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) - assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig) - assert.strictEqual(parameters.deployType, 'infra') - assert(!parameters.region) - assert(!parameters.stackName) - assert(!parameters.bucketSource) - assert(!parameters.syncFlags) - assert.strictEqual(parameters.skipDependencyLayer, true) - prompterTester.assertCallAll() + it('happy path with valid samconfig.toml', async () => { + /** + * Selection: + * - template : [Select] template.yaml + * - projectRoot : [Skip] automatically set + * + * - SourceBucketName : [Select] prefill value + * - DestinationBucketName : [Select] prefill value + * + * - paramsSource : [Select] 3. ('Use default values from samconfig') + * - region : [Skip] automatically set from region node 'us-west-2' + * - stackName : [Skip] null; will use value from samconfig file + * - bucketName : [Skip] automatically set for bucketSource option 1 + * - syncFlags : [Skip] null; will use flags from samconfig + */ + + // generate samconfig.toml in temporary test folder + await testFolder.write('samconfig.toml', samconfigCompleteData) + + const prompterTester = PrompterTester.init() + .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => { + // Need sometime to wait for the template to search for template file + await quickPick.untilReady() + assert.strictEqual(quickPick.items.length, 1) + assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) + quickPick.acceptItem(quickPick.items[0]) + }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) + .handleQuickPick('Specify parameter source for sync', async (picker) => { + // Need time to check samconfig.toml file and generate options + await picker.untilReady() + + assert.strictEqual(picker.items.length, 3) + assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults') + assert.strictEqual(picker.items[1].label, 'Specify required parameters') + assert.strictEqual(picker.items[2].label, 'Use default values from samconfig') + picker.acceptItem(picker.items[2]) + }) + .build() + + const parameters = await (await getSyncWizard('infra', undefined, false, false)).run() + + assert(parameters) + + assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath) + assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath) + assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig) + assert.strictEqual(parameters.deployType, 'infra') + assert(!parameters.region) + assert(!parameters.stackName) + assert(!parameters.bucketSource) + assert(!parameters.syncFlags) + assert.strictEqual(parameters.skipDependencyLayer, true) + prompterTester.assertCallAll() + }) }) }) }) - describe('SAM runSync', () => { let sandbox: sinon.SinonSandbox let testFolder: TestFolder @@ -948,6 +1162,12 @@ describe('SAM runSync', () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -1004,6 +1224,8 @@ describe('SAM runSync', () => { 'us-west-2', '--no-dependency-layer', '--save-params', + '--parameter-overrides', + 'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name', '--dependency-layer', '--use-container', ], @@ -1038,6 +1260,12 @@ describe('SAM runSync', () => { assert.strictEqual(quickPick.items[0].label, templateFile.fsPath) quickPick.acceptItem(quickPick.items[0]) }) + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -1087,6 +1315,8 @@ describe('SAM runSync', () => { 'us-west-2', '--no-dependency-layer', '--save-params', + '--parameter-overrides', + 'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name', '--dependency-layer', '--use-container', '--watch', @@ -1117,6 +1347,12 @@ describe('SAM runSync', () => { it('[entry: template file] specify flag should instantiate correct process in terminal', async () => { const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -1170,6 +1406,8 @@ describe('SAM runSync', () => { '--region', 'us-west-2', '--no-dependency-layer', + '--parameter-overrides', + 'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name', '--dependency-layer', '--use-container', ], @@ -1207,6 +1445,12 @@ describe('SAM runSync', () => { const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigCompleteData)) const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() @@ -1228,6 +1472,8 @@ describe('SAM runSync', () => { '--no-dependency-layer', '--config-file', `${samconfigFile.fsPath}`, + '--parameter-overrides', + 'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name', ], { spawnOptions: { @@ -1309,6 +1555,12 @@ describe('SAM runSync', () => { getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'OK')?.select()) const prompterTester = PrompterTester.init() + .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => { + inputBox.acceptValue('my-source-bucket-name') + }) + .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => { + inputBox.acceptValue('my-destination-bucket-name') + }) .handleQuickPick('Specify parameter source for sync', async (picker) => { // Need time to check samconfig.toml file and generate options await picker.untilReady() diff --git a/packages/core/src/test/shared/wizards/prompterTester.ts b/packages/core/src/test/shared/wizards/prompterTester.ts index 04169830648..0fbe93f084a 100644 --- a/packages/core/src/test/shared/wizards/prompterTester.ts +++ b/packages/core/src/test/shared/wizards/prompterTester.ts @@ -4,6 +4,7 @@ */ import assert from 'assert' +import * as vscode from 'vscode' import { TestInputBox, TestQuickPick } from '../vscode/quickInput' import { getTestWindow, TestWindow } from '../vscode/window' import { waitUntil } from '../../../shared/utilities/timeoutUtils' @@ -132,3 +133,45 @@ export class PrompterTester { throw assert.fail(`Unexpected prompter titled: "${input.title}"`) } } + +export function createPromptHandler(config: { + default: (input: T) => Promise + numbered?: Array<{ + order: number[] + handler: (input: T) => Promise + }> +}) { + const generator = (function* () { + let currentIteration = 0 + const handlersMap = new Map() + + // Setup handlers map + config.numbered?.forEach((item) => { + item.order.forEach((orderNum) => { + handlersMap.set(orderNum, item.handler) + }) + }) + + while (true) { + currentIteration++ + const handler = handlersMap.get(currentIteration) + + if (handler) { + yield handler + } else { + yield config.default + } + } + })() + + // Return a function that advances the generator and executes the handler + return (picker: T) => { + const next = generator.next().value + return next(picker) + } +} + +export async function clickBackButton(input: TestQuickPick | TestInputBox) { + await input.untilReady() + input.pressButton(vscode.QuickInputButtons.Back) +} diff --git a/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json b/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json new file mode 100644 index 00000000000..d906da4d593 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "AppBuilder : Support template parameters override for SAM deploy and sync for all entry points" +} From ad524668241d62425c55658c2bd1fc385e0634d3 Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:39:42 -0800 Subject: [PATCH 090/202] fix(inline-suggestion): replace vscode.cancellation with waitUntil for timeout (#6256) ## Problem related issue: https://github.com/aws/aws-toolkit-vscode/issues/6079, https://github.com/aws/aws-toolkit-vscode/issues/6252 caller ``` function main () { // init vscode cancellation token const cancellationToken setTimeout(100, () => { cancellationToken.cancel() }) highlevelWrapperFetchSupplementalContext(editor, cancellationToken) } ``` ``` export function highlevelWrapperFetchSupplementalContext(editor, cancellationToken) { const supplementalContext = waitUntil(100, () => { // here always timeout and throw TimeoutException const opentabs = await fetchOpenTabsContext(...) const projectContext = await fetchProjectContext() const result = [] if (projectContext not empty) { // push project context } if (opentabs not empty) {} // push openttabs }) return result } async function fetchOpenTabsContext(editor, cancellationToken) { .... // VSC api call } async function fetchProjectContext() { .... // LSP call } ``` After investigation, it looks like mix use of `vscode.CancellationToken` and `waitUntil()` will likely cause cancellation token to be cancelled prematurely (might be because another layer of waitUntil will run the fetchOpenTabsContext asynchronously thus causing it to timeout prematurely) therefore `fetchOpebtabsContext(..)` will return null in this case and hence causing test cases failing. Therefore, the issue here is actually not the test case itself and they're failing due to race condition ## Solution remove usage of cancellation token and only use waitUntil for timeout purpose ## Functional testing retrieved sup context as expected ### Case 1: repomap is available (there are local imports) ``` 2024-12-16 13:10:15.616 [debug] CodeWhispererSupplementalContext: isUtg: false, isProcessTimeout: false, contentsLength: 14436, latency: 16.67179101705551 strategy: codemap Chunk 0: Path: q-inline Length: 10209 Score: 0 Chunk 1: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/service/serviceContainer.ts Length: 1486 Score: 22.60257328587725 Chunk 2: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/tracker/lineTracker.ts Length: 1649 Score: 19.106700952807103 Chunk 3: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/tracker/lineTracker.ts Length: 1092 Score: 10.334690655691002 ``` ### Case 2: No repomap, should fallback to opentabs only ![image](https://github.com/user-attachments/assets/f59c11cf-0e34-40b8-8162-34b4d057673f) ``` 2024-12-16 13:11:29.738 [debug] CodeWhispererSupplementalContext: isUtg: false, isProcessTimeout: false, contentsLength: 5046, latency: 16.311500012874603 strategy: opentabs Chunk 0: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/tracker/lineTracker.ts Length: 1564 Score: 0 Chunk 1: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/tracker/lineTracker.ts Length: 1649 Score: 0 Chunk 2: Path: /Volumes/workplace/ide/aws-toolkit-vscode-staging/packages/core/src/codewhisperer/tracker/lineTracker.ts Length: 1833 Score: 0 ``` --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-9575c7da-3e49-4051-ba29-6b292d3e399a.json | 4 ++ .../util/crossFileContextUtil.test.ts | 20 ++++++++-- .../util/supplemetalContextUtil.test.ts | 13 ++++++- .../crossFileContextUtil.ts | 37 +++++-------------- 4 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json b/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json new file mode 100644 index 00000000000..1042c97d259 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities" +} diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts index d5b9132d580..5203159eb58 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts @@ -44,7 +44,7 @@ describe('crossFileContextUtil', function () { sinon.restore() }) - it('for control group, should return opentabs context where there will be 3 chunks and each chunk should contains 50 lines', async function () { + it.skip('for control group, should return opentabs context where there will be 3 chunks and each chunk should contains 50 lines', async function () { sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control') await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false }) const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, { @@ -61,7 +61,7 @@ describe('crossFileContextUtil', function () { assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50) }) - it.skip('for t1 group, should return repomap + opentabs context', async function () { + it('for t1 group, should return repomap + opentabs context', async function () { await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false }) const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, { preview: false, @@ -312,7 +312,9 @@ describe('crossFileContextUtil', function () { }) describe('full support', function () { - const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx'] + // TODO: fix it + // const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx'] + const fileExtLists = ['java'] before(async function () { this.timeout(60000) @@ -328,8 +330,18 @@ describe('crossFileContextUtil', function () { }) fileExtLists.forEach((fileExt) => { - it('should be non empty', async function () { + it(`supplemental context for file ${fileExt} should be non empty`, async function () { sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control') + sinon + .stub(LspController.instance, 'queryInlineProjectContext') + .withArgs(sinon.match.any, sinon.match.any, 'codemap') + .resolves([ + { + content: 'foo', + score: 0, + filePath: 'q-inline', + }, + ]) const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder) await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false }) await toTextEditor('content-3', `file-3.${fileExt}`, tempFolder, { preview: false }) diff --git a/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts index 25f3ce1a585..6c5c3d23478 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts @@ -10,6 +10,7 @@ import * as crossFile from 'aws-core-vscode/codewhisperer' import { TestFolder, assertTabCount } from 'aws-core-vscode/test' import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer' import { toTextEditor } from 'aws-core-vscode/test' +import { LspController } from 'aws-core-vscode/amazonq' describe('supplementalContextUtil', function () { let testFolder: TestFolder @@ -31,6 +32,16 @@ describe('supplementalContextUtil', function () { describe('fetchSupplementalContext', function () { describe('openTabsContext', function () { it('opentabContext should include chunks if non empty', async function () { + sinon + .stub(LspController.instance, 'queryInlineProjectContext') + .withArgs(sinon.match.any, sinon.match.any, 'codemap') + .resolves([ + { + content: 'foo', + score: 0, + filePath: 'q-inline', + }, + ]) await toTextEditor('class Foo', 'Foo.java', testFolder.path, { preview: false }) await toTextEditor('class Bar', 'Bar.java', testFolder.path, { preview: false }) await toTextEditor('class Baz', 'Baz.java', testFolder.path, { preview: false }) @@ -42,7 +53,7 @@ describe('supplementalContextUtil', function () { await assertTabCount(4) const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken) - assert.ok(actual?.supplementalContextItems.length === 3) + assert.ok(actual?.supplementalContextItems.length === 4) }) it('opentabsContext should filter out empty chunks', async function () { diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index 7800ab2a51c..a4b8aa5fba1 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -7,13 +7,7 @@ import * as vscode from 'vscode' import { FeatureConfigProvider, fs } from '../../../shared' import path = require('path') import { BM25Document, BM25Okapi } from './rankBm25' -import { ToolkitError } from '../../../shared/errors' -import { - crossFileContextConfig, - supplementalContextTimeoutInMs, - supplemetalContextFetchingTimeoutMsg, -} from '../../models/constants' -import { CancellationError } from '../../../shared/utilities/timeoutUtils' +import { crossFileContextConfig, supplementalContextTimeoutInMs } from '../../models/constants' import { isTestFile } from './codeParsingUtil' import { getFileDistance } from '../../../shared/filesystemUtilities' import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities' @@ -77,9 +71,17 @@ export async function fetchSupplementalContextForSrc( return undefined } + // fallback to opentabs if projectContext timeout + const opentabsContextPromise = waitUntil( + async function () { + return await fetchOpentabsContext(editor, cancellationToken) + }, + { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false } + ) + // opentabs context will use bm25 and users' open tabs to fetch supplemental context if (supplementalContextConfig === 'opentabs') { - const supContext = (await fetchOpentabsContext(editor, cancellationToken)) ?? [] + const supContext = (await opentabsContextPromise) ?? [] return { supplementalContextItems: supContext, strategy: supContext.length === 0 ? 'Empty' : 'opentabs', @@ -126,14 +128,6 @@ export async function fetchSupplementalContextForSrc( } } - // fallback to opentabs if projectContext timeout for 'default' | 'bm25' - const opentabsContextPromise = waitUntil( - async function () { - return await fetchOpentabsContext(editor, cancellationToken) - }, - { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false } - ) - // global bm25 without repomap if (supplementalContextConfig === 'bm25') { const projectBM25Promise = waitUntil( @@ -207,14 +201,12 @@ export async function fetchOpentabsContext( // Step 1: Get relevant cross files to refer const relevantCrossFilePaths = await getCrossFileCandidates(editor) - throwIfCancelled(cancellationToken) // Step 2: Split files to chunks with upper bound on chunkCount // We restrict the total number of chunks to improve on latency. // Chunk linking is required as we want to pass the next chunk value for matched chunk. let chunkList: Chunk[] = [] for (const relevantFile of relevantCrossFilePaths) { - throwIfCancelled(cancellationToken) const chunks: Chunk[] = await splitFileToChunks(relevantFile, crossFileContextConfig.numberOfLinesEachChunk) const linkedChunks = linkChunks(chunks) chunkList.push(...linkedChunks) @@ -230,14 +222,11 @@ export async function fetchOpentabsContext( // and Find Best K chunks w.r.t input chunk using BM25 const inputChunk: Chunk = getInputChunk(editor) const bestChunks: Chunk[] = findBestKChunkMatches(inputChunk, chunkList, crossFileContextConfig.topK) - throwIfCancelled(cancellationToken) // Step 4: Transform best chunks to supplemental contexts const supplementalContexts: CodeWhispererSupplementalContextItem[] = [] let totalLength = 0 for (const chunk of bestChunks) { - throwIfCancelled(cancellationToken) - totalLength += chunk.nextContent.length if (totalLength > crossFileContextConfig.maximumTotalLength) { @@ -390,9 +379,3 @@ export async function getCrossFileCandidates(editor: vscode.TextEditor): Promise return fileToDistance.file }) } - -function throwIfCancelled(token: vscode.CancellationToken): void | never { - if (token.isCancellationRequested) { - throw new ToolkitError(supplemetalContextFetchingTimeoutMsg, { cause: new CancellationError('timeout') }) - } -} From 32c7b7624cefdeea3f8d60f95dcbf80deb1d5aaa Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:47:11 -0500 Subject: [PATCH 091/202] test(perf): increase cpu threshold (#6249) ## Problem https://github.com/aws/aws-toolkit-vscode/issues/6225 - Didn't think 400% could be exceeded, but this one is especially volatile. Sometimes it barely spikes, and sometimes it goes crazy. ## Solution - Increase to 500% --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/core/src/testInteg/perf/getFileSha384.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/testInteg/perf/getFileSha384.test.ts b/packages/core/src/testInteg/perf/getFileSha384.test.ts index c7768a3cdd1..4f12fbfeeb8 100644 --- a/packages/core/src/testInteg/perf/getFileSha384.test.ts +++ b/packages/core/src/testInteg/perf/getFileSha384.test.ts @@ -20,7 +20,7 @@ interface SetupResult { function performanceTestWrapper(label: string, fileSize: number) { return performanceTest( getEqualOSTestOptions({ - userCpuUsage: 400, + userCpuUsage: 500, systemCpuUsage: 35, heapTotal: 4, }), From 75eb516bf3f8b857459d7a363574e94171b9b639 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:53:44 -0500 Subject: [PATCH 092/202] test(core): supress Failure to parse stylesheet message from e2e test logs (#6263) ## Problem - JSDOM logs non-critical CSS parsing errors during E2E tests. These warnings occur when mynah-ui loads SCSS files in [main.ts](https://github.com/aws/mynah-ui/blob/8058f86ed370f5268ba6e0993b2436dca0e09b30/src/main.ts#L37). These errors appear the test logs but they do not affect test functionality or results. ## Solution - Suppress the errors --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../test/e2e/amazonq/framework/jsdomInjector.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts index f5d2d1c2770..ce8309c1039 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts @@ -3,15 +3,24 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { JSDOM } from 'jsdom' +import { JSDOM, VirtualConsole } from 'jsdom' +/** + * JSDOM is used to help hoist MynahUI to running in a node environment vs in the browser (which is what it's made for) + */ export function injectJSDOM() { - /** - * JSDOM is used to help hoist MynahUI to running in a node environment vs in the browser (which is what it's made for) - */ + const virtualConsole = new VirtualConsole() + virtualConsole.on('error', (error) => { + // JSDOM can't load scss from mynah UI, just skip it + if (!error.includes('Could not parse CSS stylesheet')) { + console.error(error) + } + }) + const dom = new JSDOM(undefined, { pretendToBeVisual: true, includeNodeLocations: true, + virtualConsole, }) global.window = dom.window as unknown as Window & typeof globalThis global.document = dom.window.document From 17dbcd35d93a099856781604cc6095af5b3bca81 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 17 Dec 2024 18:57:07 +0000 Subject: [PATCH 093/202] Release 1.41.0 --- package-lock.json | 4 +- packages/amazonq/.changes/1.41.0.json | 62 +++++++++++++++++++ ...-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json | 4 -- ...-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json | 4 -- ...-49ee4921-044b-48b0-b51c-4e7054e84e6a.json | 4 -- ...-53ead65f-187e-47d9-9432-a48200b604d6.json | 4 -- ...-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json | 4 -- ...-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json | 4 -- ...-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json | 4 -- ...-9575c7da-3e49-4051-ba29-6b292d3e399a.json | 4 -- ...-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json | 4 -- ...-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json | 4 -- ...-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json | 4 -- ...-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json | 4 -- ...-65d6b661-7ab8-409d-8af8-918db3e69a2d.json | 4 -- ...-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json | 4 -- packages/amazonq/CHANGELOG.md | 17 +++++ packages/amazonq/package.json | 2 +- 18 files changed, 82 insertions(+), 59 deletions(-) create mode 100644 packages/amazonq/.changes/1.41.0.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json diff --git a/package-lock.json b/package-lock.json index 2b12b9235b8..9b809084fab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21133,7 +21133,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.41.0-SNAPSHOT", + "version": "1.41.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/.changes/1.41.0.json b/packages/amazonq/.changes/1.41.0.json new file mode 100644 index 00000000000..d0ca09cb476 --- /dev/null +++ b/packages/amazonq/.changes/1.41.0.json @@ -0,0 +1,62 @@ +{ + "date": "2024-12-17", + "version": "1.41.0", + "entries": [ + { + "type": "Bug Fix", + "description": "/review: Apply fix removes other issues in the same file." + }, + { + "type": "Bug Fix", + "description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations" + }, + { + "type": "Bug Fix", + "description": "Improve when the welcome page is shown in amazon q chat" + }, + { + "type": "Bug Fix", + "description": "Code Review: Cleaned up output logs when running /review" + }, + { + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file." + }, + { + "type": "Bug Fix", + "description": "Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly" + }, + { + "type": "Bug Fix", + "description": "/review: Diagnostics in the problems panel are mapped to the wrong code" + }, + { + "type": "Bug Fix", + "description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities" + }, + { + "type": "Bug Fix", + "description": "Auth: SSO session was bad, but no reauth prompt given" + }, + { + "type": "Bug Fix", + "description": "Reduce frequency of system status poll" + }, + { + "type": "Bug Fix", + "description": "Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt." + }, + { + "type": "Bug Fix", + "description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly." + }, + { + "type": "Feature", + "description": "/review: Code fix automatically scrolls into view after generation." + }, + { + "type": "Feature", + "description": "Chat: improve font size and line-height in footer (below prompt input field)" + } + ] +} \ No newline at end of file diff --git a/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json b/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json deleted file mode 100644 index a78cb474d17..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "/review: Apply fix removes other issues in the same file." -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json b/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json deleted file mode 100644 index c105d94c34b..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json b/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json deleted file mode 100644 index 278a38dfdb1..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Improve when the welcome page is shown in amazon q chat" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json b/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json deleted file mode 100644 index 50ef07d3456..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-53ead65f-187e-47d9-9432-a48200b604d6.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Code Review: Cleaned up output logs when running /review" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json b/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json deleted file mode 100644 index b4e3e303a62..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-64bec56a-f152-4345-b036-0c5ddb0ce5a2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file." -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json b/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json deleted file mode 100644 index be18dd3ad1c..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-82132c4a-d74a-43d6-a93f-c65bac24d9fa.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json b/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json deleted file mode 100644 index d246629bcd0..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-8331f6fe-6955-4a49-91ac-e4ca3fbe4165.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "/review: Diagnostics in the problems panel are mapped to the wrong code" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json b/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json deleted file mode 100644 index 1042c97d259..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-9575c7da-3e49-4051-ba29-6b292d3e399a.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json b/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json deleted file mode 100644 index 4e5bcf2cf8c..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-a243e8d5-b494-46a1-9ec0-c8c6af3cbf35.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Auth: SSO session was bad, but no reauth prompt given" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json b/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json deleted file mode 100644 index ee36eb1703d..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-c685f18f-0c30-49a0-b4d8-e4eab0cf3bc6.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Reduce frequency of system status poll" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json b/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json deleted file mode 100644 index ae55b3d109e..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-c79529d6-7df0-4c7a-bb41-60ff4f6600e2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt." -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json b/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json deleted file mode 100644 index cce3184a518..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-d5c39800-ce37-4f6c-be23-9cc4035d0cef.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly." -} diff --git a/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json b/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json deleted file mode 100644 index 0ef3537fc34..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-65d6b661-7ab8-409d-8af8-918db3e69a2d.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "/review: Code fix automatically scrolls into view after generation." -} diff --git a/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json b/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json deleted file mode 100644 index d8bf9e34158..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-df165695-1b62-4e7e-b5e8-8ae42504b2fc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Chat: improve font size and line-height in footer (below prompt input field)" -} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 12580b159e3..a53d213ef43 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,20 @@ +## 1.41.0 2024-12-17 + +- **Bug Fix** /review: Apply fix removes other issues in the same file. +- **Bug Fix** Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations +- **Bug Fix** Improve when the welcome page is shown in amazon q chat +- **Bug Fix** Code Review: Cleaned up output logs when running /review +- **Bug Fix** Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file. +- **Bug Fix** Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly +- **Bug Fix** /review: Diagnostics in the problems panel are mapped to the wrong code +- **Bug Fix** Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities +- **Bug Fix** Auth: SSO session was bad, but no reauth prompt given +- **Bug Fix** Reduce frequency of system status poll +- **Bug Fix** Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt. +- **Bug Fix** Code Review: Fixed a bug where projects with repeated path names did not scan properly. +- **Feature** /review: Code fix automatically scrolls into view after generation. +- **Feature** Chat: improve font size and line-height in footer (below prompt input field) + ## 1.40.0 2024-12-10 - **Bug Fix** Improved LLM code review for file review. diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 246f87a3e00..29b30dbba02 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.41.0-SNAPSHOT", + "version": "1.41.0", "extensionKind": [ "workspace" ], From f556380ba69511c8c2276f85d1da86e0fc786f0e Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 17 Dec 2024 18:57:10 +0000 Subject: [PATCH 094/202] Release 3.40.0 --- package-lock.json | 4 ++-- packages/toolkit/.changes/3.40.0.json | 14 ++++++++++++++ ...g Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json | 4 ---- ...g Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json | 4 ---- packages/toolkit/CHANGELOG.md | 5 +++++ packages/toolkit/package.json | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 packages/toolkit/.changes/3.40.0.json delete mode 100644 packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json delete mode 100644 packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json diff --git a/package-lock.json b/package-lock.json index 2b12b9235b8..4f7af339038 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21293,7 +21293,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.40.0-SNAPSHOT", + "version": "3.40.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/.changes/3.40.0.json b/packages/toolkit/.changes/3.40.0.json new file mode 100644 index 00000000000..526c5d6578e --- /dev/null +++ b/packages/toolkit/.changes/3.40.0.json @@ -0,0 +1,14 @@ +{ + "date": "2024-12-17", + "version": "3.40.0", + "entries": [ + { + "type": "Bug Fix", + "description": "Auth: SSO failed to missing refreshToken" + }, + { + "type": "Bug Fix", + "description": "AppBuilder : Support template parameters override for SAM deploy and sync for all entry points" + } + ] +} \ No newline at end of file diff --git a/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json b/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json deleted file mode 100644 index 28b5d0a26ee..00000000000 --- a/packages/toolkit/.changes/next-release/Bug Fix-7cb802f6-498a-4442-ae88-399eaec1d9a5.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Auth: SSO failed to missing refreshToken" -} diff --git a/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json b/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json deleted file mode 100644 index d906da4d593..00000000000 --- a/packages/toolkit/.changes/next-release/Bug Fix-bbd8c658-8ffa-4a1d-b9f1-9c81c3122b75.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "AppBuilder : Support template parameters override for SAM deploy and sync for all entry points" -} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 0362b5006c1..24ccbedfe5e 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.40.0 2024-12-17 + +- **Bug Fix** Auth: SSO failed to missing refreshToken +- **Bug Fix** AppBuilder : Support template parameters override for SAM deploy and sync for all entry points + ## 3.39.0 2024-12-12 - **Bug Fix** EC2: avoid overwriting authorized_keys file on remote diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 0344109e11d..68a581b94ea 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.40.0-SNAPSHOT", + "version": "3.40.0", "extensionKind": [ "workspace" ], From 39327fb66d717256cb26aad89deaa087f8a147a4 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 17 Dec 2024 19:38:14 +0000 Subject: [PATCH 095/202] Update version to snapshot version: 3.41.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/toolkit/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f7af339038..11a16a75485 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21293,7 +21293,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.40.0", + "version": "3.41.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 68a581b94ea..18a660102d2 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.40.0", + "version": "3.41.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 08ce24225108ad8401d2ef2ddfa18bedfea6fbea Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 17 Dec 2024 19:38:20 +0000 Subject: [PATCH 096/202] Update version to snapshot version: 1.42.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/amazonq/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b809084fab..05ff3945c8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21133,7 +21133,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.41.0", + "version": "1.42.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 29b30dbba02..9e144c171a3 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.41.0", + "version": "1.42.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 7084800ff2f648fd4d052e44ef69f25f2e15edac Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:34:01 -0800 Subject: [PATCH 097/202] test(inline-suggestion): crossFileContextUtil.test using real clock and test timeouts #6258 ## Problem ref #6252 Test is using real system clock, it's likely to timeout due to heavy computation in an undeterministic way. ## Solution Use fake clock. --- .../util/crossFileContextUtil.test.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts index 5203159eb58..75825232d7c 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts @@ -4,10 +4,11 @@ */ import assert from 'assert' +import * as FakeTimers from '@sinonjs/fake-timers' import * as vscode from 'vscode' import * as sinon from 'sinon' import * as crossFile from 'aws-core-vscode/codewhisperer' -import { aStringWithLineCount, createMockTextEditor } from 'aws-core-vscode/test' +import { aStringWithLineCount, createMockTextEditor, installFakeClock } from 'aws-core-vscode/test' import { FeatureConfigProvider, crossFileContextConfig } from 'aws-core-vscode/codewhisperer' import { assertTabCount, @@ -30,6 +31,15 @@ describe('crossFileContextUtil', function () { } let mockEditor: vscode.TextEditor + let clock: FakeTimers.InstalledClock + + before(function () { + clock = installFakeClock() + }) + + after(function () { + clock.uninstall() + }) afterEach(function () { sinon.restore() @@ -312,9 +322,7 @@ describe('crossFileContextUtil', function () { }) describe('full support', function () { - // TODO: fix it - // const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx'] - const fileExtLists = ['java'] + const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx'] before(async function () { this.timeout(60000) From b085dd99d7b63e423a77678802903d0a4413d57b Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:35:42 -0800 Subject: [PATCH 098/202] fix(amazonq): allow postgresql as target DB #6259 ## Problem `RDS_POSTGRESQL` should be spelled as `POSTGRESQL` ## Solution Fix spelling --- .../Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json | 4 ++++ packages/core/src/codewhisperer/models/model.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json b/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json new file mode 100644 index 00000000000..f81d5e31a14 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions" +} diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts index d54370a7102..8e8e58d5fea 100644 --- a/packages/core/src/codewhisperer/models/model.ts +++ b/packages/core/src/codewhisperer/models/model.ts @@ -606,7 +606,7 @@ export enum JDKVersion { export enum DB { ORACLE = 'ORACLE', - RDS_POSTGRESQL = 'RDS_POSTGRESQL', + RDS_POSTGRESQL = 'POSTGRESQL', AURORA_POSTGRESQL = 'AURORA_POSTGRESQL', OTHER = 'OTHER', } From 04a5b68b668deb091e3143af2562bb30c6cbb784 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:38:50 -0500 Subject: [PATCH 099/202] refactor(settings): non-async isPromptEnabled() #6255 ## Problem There is no real reason this needs to be async. It is also now inconsistent with `isExperimentEnabled`. ## Solution Make non-async and add logged error if the promise rejects. --- .../core/src/auth/sso/ssoAccessTokenProvider.ts | 2 +- .../apprunner/commands/pauseService.ts | 2 +- .../apprunner/wizards/deploymentButton.ts | 2 +- packages/core/src/awsService/ecs/commands.ts | 4 ++-- .../core/src/awsService/s3/fileViewerManager.ts | 2 +- packages/core/src/codecatalyst/activation.ts | 2 +- .../commands/gettingStartedPageCommands.ts | 2 +- packages/core/src/codewhisperer/util/authUtil.ts | 2 +- packages/core/src/codewhisperer/vue/backend.ts | 2 +- packages/core/src/shared/awsContextCommands.ts | 2 +- packages/core/src/shared/extensionStartup.ts | 2 +- packages/core/src/shared/sam/activation.ts | 2 +- packages/core/src/shared/sam/sync.ts | 2 +- packages/core/src/shared/settings.ts | 16 ++++++++-------- packages/core/src/shared/utilities/messages.ts | 2 +- packages/core/src/test/shared/settings.test.ts | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/core/src/auth/sso/ssoAccessTokenProvider.ts b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts index bf9c620c2f3..6639e9f3832 100644 --- a/packages/core/src/auth/sso/ssoAccessTokenProvider.ts +++ b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts @@ -808,7 +808,7 @@ class DiskCacheErrorMessage { : ToolkitPromptSettings.instance // We know 'ssoCacheError' is in all extension prompt settings - if (await promptSettings.isPromptEnabled('ssoCacheError')) { + if (promptSettings.isPromptEnabled('ssoCacheError')) { const result = await showMessage() if (result === dontShow) { await promptSettings.disablePrompt('ssoCacheError') diff --git a/packages/core/src/awsService/apprunner/commands/pauseService.ts b/packages/core/src/awsService/apprunner/commands/pauseService.ts index a1f3bac54c9..b2cbdee1cae 100644 --- a/packages/core/src/awsService/apprunner/commands/pauseService.ts +++ b/packages/core/src/awsService/apprunner/commands/pauseService.ts @@ -18,7 +18,7 @@ export async function pauseService(node: AppRunnerServiceNode): Promise { try { const prompts = ToolkitPromptSettings.instance - const shouldNotify = await prompts.isPromptEnabled('apprunnerNotifyPause') + const shouldNotify = prompts.isPromptEnabled('apprunnerNotifyPause') const notifyPrompt = localize( 'aws.apprunner.pauseService.notify', 'Your service will be unavailable while paused. ' + diff --git a/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts b/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts index 24a98895970..dee77c05e97 100644 --- a/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts +++ b/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts @@ -32,7 +32,7 @@ function makeDeployButtons() { async function showDeploymentCostNotification(): Promise { const settings = ToolkitPromptSettings.instance - if (await settings.isPromptEnabled('apprunnerNotifyPricing')) { + if (settings.isPromptEnabled('apprunnerNotifyPricing')) { const notice = localize( 'aws.apprunner.createService.priceNotice.message', 'App Runner automatic deployments incur an additional cost.' diff --git a/packages/core/src/awsService/ecs/commands.ts b/packages/core/src/awsService/ecs/commands.ts index 5845793e7b2..acf3daa8047 100644 --- a/packages/core/src/awsService/ecs/commands.ts +++ b/packages/core/src/awsService/ecs/commands.ts @@ -32,7 +32,7 @@ async function runCommandWizard( const wizard = new CommandWizard( container, - await ToolkitPromptSettings.instance.isPromptEnabled('ecsRunCommand'), + ToolkitPromptSettings.instance.isPromptEnabled('ecsRunCommand'), command ) const response = await wizard.run() @@ -75,7 +75,7 @@ export async function toggleExecuteCommandFlag( 'Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\n Continue?' ) - if (await settings.isPromptEnabled(prompt)) { + if (settings.isPromptEnabled(prompt)) { const choice = await window.showWarningMessage(warningMessage, yes, yesDontAskAgain, no) if (choice === undefined || choice === no) { throw new CancellationError('user') diff --git a/packages/core/src/awsService/s3/fileViewerManager.ts b/packages/core/src/awsService/s3/fileViewerManager.ts index 336737b027e..d800a3bfeee 100644 --- a/packages/core/src/awsService/s3/fileViewerManager.ts +++ b/packages/core/src/awsService/s3/fileViewerManager.ts @@ -346,7 +346,7 @@ export class S3FileViewerManager { } private async showEditNotification(): Promise { - if (!(await this.settings.isPromptEnabled(promptOnEditKey))) { + if (!this.settings.isPromptEnabled(promptOnEditKey)) { return } diff --git a/packages/core/src/codecatalyst/activation.ts b/packages/core/src/codecatalyst/activation.ts index 812766f5687..4a2385559f4 100644 --- a/packages/core/src/codecatalyst/activation.ts +++ b/packages/core/src/codecatalyst/activation.ts @@ -128,7 +128,7 @@ export async function activate(ctx: ExtContext): Promise { await showReadmeFileOnFirstLoad(ctx.extensionContext.workspaceState) const settings = ToolkitPromptSettings.instance - if (await settings.isPromptEnabled('remoteConnected')) { + if (settings.isPromptEnabled('remoteConnected')) { const message = localize( 'AWS.codecatalyst.connectedMessage', 'Welcome to your Amazon CodeCatalyst Dev Environment. For more options and information, view Dev Environment settings ({0} Extension > CodeCatalyst).', diff --git a/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts index 5036a9d3b5b..ab7c8e00afc 100644 --- a/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts +++ b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts @@ -20,7 +20,7 @@ export class CodeWhispererCommandBackend { const prompts = AmazonQPromptSettings.instance // To check the condition If the user has already seen the welcome message - if (!(await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage'))) { + if (!prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) { telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true }) } return showCodeWhispererWebview(this.extContext, source) diff --git a/packages/core/src/codewhisperer/util/authUtil.ts b/packages/core/src/codewhisperer/util/authUtil.ts index ed2dfd66e6c..afb15aff133 100644 --- a/packages/core/src/codewhisperer/util/authUtil.ts +++ b/packages/core/src/codewhisperer/util/authUtil.ts @@ -366,7 +366,7 @@ export class AuthUtil { public async notifySessionConfiguration() { const suppressId = 'amazonQSessionConfigurationMessage' const settings = AmazonQPromptSettings.instance - const shouldShow = await settings.isPromptEnabled(suppressId) + const shouldShow = settings.isPromptEnabled(suppressId) if (!shouldShow) { return } diff --git a/packages/core/src/codewhisperer/vue/backend.ts b/packages/core/src/codewhisperer/vue/backend.ts index ec1ed818ec0..e4baecadc18 100644 --- a/packages/core/src/codewhisperer/vue/backend.ts +++ b/packages/core/src/codewhisperer/vue/backend.ts @@ -161,7 +161,7 @@ export async function showCodeWhispererWebview( ] const prompts = AmazonQPromptSettings.instance // To check the condition If the user has already seen the welcome message - if (await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) { + if (prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) { telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: true }) } else { telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: false }) diff --git a/packages/core/src/shared/awsContextCommands.ts b/packages/core/src/shared/awsContextCommands.ts index b2016dd33c2..aaf439b3f02 100644 --- a/packages/core/src/shared/awsContextCommands.ts +++ b/packages/core/src/shared/awsContextCommands.ts @@ -65,7 +65,7 @@ export class AwsContextCommands { await this.editCredentials() if ( credentialsFiles.length === 0 && - (await ToolkitPromptSettings.instance.isPromptEnabled('createCredentialsProfile')) && + ToolkitPromptSettings.instance.isPromptEnabled('createCredentialsProfile') && (await this.promptCredentialsSetup()) ) { await this.onCommandCreateCredentialsProfile() diff --git a/packages/core/src/shared/extensionStartup.ts b/packages/core/src/shared/extensionStartup.ts index f4ed00e9543..fd5aab755e7 100644 --- a/packages/core/src/shared/extensionStartup.ts +++ b/packages/core/src/shared/extensionStartup.ts @@ -24,7 +24,7 @@ const localize = nls.loadMessageBundle() */ export async function maybeShowMinVscodeWarning(minVscode: string) { const settings = isAmazonQ() ? AmazonQPromptSettings.instance : ToolkitPromptSettings.instance - if (!(await settings.isPromptEnabled('minIdeVersion'))) { + if (!settings.isPromptEnabled('minIdeVersion')) { return } const updateButton = `Update ${vscode.env.appName}` diff --git a/packages/core/src/shared/sam/activation.ts b/packages/core/src/shared/sam/activation.ts index a19c9ff4acb..3f398968b19 100644 --- a/packages/core/src/shared/sam/activation.ts +++ b/packages/core/src/shared/sam/activation.ts @@ -323,7 +323,7 @@ async function createYamlExtensionPrompt(): Promise { // Show this only in VSCode since other VSCode-like IDEs (e.g. Theia) may // not have a marketplace or contain the YAML plugin. if ( - (await settings.isPromptEnabled('yamlExtPrompt')) && + settings.isPromptEnabled('yamlExtPrompt') && getIdeType() === 'vscode' && !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml) ) { diff --git a/packages/core/src/shared/sam/sync.ts b/packages/core/src/shared/sam/sync.ts index 14e40840fa8..8c983ba67ad 100644 --- a/packages/core/src/shared/sam/sync.ts +++ b/packages/core/src/shared/sam/sync.ts @@ -580,7 +580,7 @@ async function updateSyncRecentResponse(region: string, key: string, value: stri } export async function confirmDevStack() { - const canPrompt = await ToolkitPromptSettings.instance.isPromptEnabled('samcliConfirmDevStack') + const canPrompt = ToolkitPromptSettings.instance.isPromptEnabled('samcliConfirmDevStack') if (!canPrompt) { return } diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts index a34ba2f8d2d..258daa99b5c 100644 --- a/packages/core/src/shared/settings.ts +++ b/packages/core/src/shared/settings.ts @@ -600,7 +600,7 @@ export function fromExtensionManifest { + public isPromptEnabled(promptName: toolkitPromptName): boolean { try { return !this._getOrThrow(promptName, false) } catch (e) { this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message) - await this.reset() + this.reset().catch((e) => getLogger().error(`failed to reset prompt settings: %O`, (e as Error).message)) return true } } public async disablePrompt(promptName: toolkitPromptName): Promise { - if (await this.isPromptEnabled(promptName)) { + if (this.isPromptEnabled(promptName)) { await this.update(promptName, true) } } @@ -660,19 +660,19 @@ export class AmazonQPromptSettings ) implements PromptSettings { - public async isPromptEnabled(promptName: amazonQPromptName): Promise { + public isPromptEnabled(promptName: amazonQPromptName): boolean { try { return !this._getOrThrow(promptName, false) } catch (e) { this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message) - await this.reset() + this.reset().catch((e) => getLogger().error(`isPromptEnabled: reset() failed: %O`, (e as Error).message)) return true } } public async disablePrompt(promptName: amazonQPromptName): Promise { - if (await this.isPromptEnabled(promptName)) { + if (this.isPromptEnabled(promptName)) { await this.update(promptName, true) } } @@ -692,7 +692,7 @@ export class AmazonQPromptSettings type AllPromptNames = amazonQPromptName | toolkitPromptName export interface PromptSettings { - isPromptEnabled(promptName: AllPromptNames): Promise + isPromptEnabled(promptName: AllPromptNames): boolean disablePrompt(promptName: AllPromptNames): Promise } diff --git a/packages/core/src/shared/utilities/messages.ts b/packages/core/src/shared/utilities/messages.ts index 1812909321c..a961e983745 100644 --- a/packages/core/src/shared/utilities/messages.ts +++ b/packages/core/src/shared/utilities/messages.ts @@ -194,7 +194,7 @@ export async function showReauthenticateMessage({ reauthFunc: () => Promise source?: string }) { - const shouldShow = await settings.isPromptEnabled(suppressId as any) + const shouldShow = settings.isPromptEnabled(suppressId as any) if (!shouldShow) { return } diff --git a/packages/core/src/test/shared/settings.test.ts b/packages/core/src/test/shared/settings.test.ts index 08a31ff42f2..5d485489138 100644 --- a/packages/core/src/test/shared/settings.test.ts +++ b/packages/core/src/test/shared/settings.test.ts @@ -498,7 +498,7 @@ describe('PromptSetting', function () { it(scenario.desc, async () => { await settings.update(promptSettingKey, scenario.testValue) const before = settings.get(promptSettingKey, Object, {}) - const result = await sut.isPromptEnabled(promptName) + const result = sut.isPromptEnabled(promptName) assert.deepStrictEqual(result, scenario.expected) assert.deepStrictEqual( From 4ddea6854c731548caace760f7d14b737a264dc9 Mon Sep 17 00:00:00 2001 From: Keegan Irby Date: Tue, 17 Dec 2024 13:32:30 -0800 Subject: [PATCH 100/202] test(cwl): Fix TailLogGroup test not disposing its event listeners #6267 ## Problem Currently, the TailLogGroup tests are passing, but emitting noisy errors in the CI logs: ``` <...> No LiveTail session found for URI: test-region:test-log-group:all: Error: No LiveTail session found for URI: test-region:test-log-group:all at D:\a\aws-toolkit-vscode\aws-toolkit-vscode\packages\core\src\awsService\cloudWatchLogs\commands\tailLogGroup.ts:94:19 at AsyncLocalStorage.run (node:async_hooks:346:14) <...> ``` The cause for this, is that the event listener for closing the tailing session when Editor tabs close in TailLogGroup is not being disposed of. Disposal happens [here](https://github.com/aws/aws-toolkit-vscode/blob/master/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts#L80). However, currently the "mock response stream" in the test blocks indefinitely on an [un-resolvable promise](https://github.com/aws/aws-toolkit-vscode/blob/master/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts#L67). So the test ends, and this finally block never triggers. ## Solution Instead of using an un-resolving promise to keep the mock responseStream open, use an AbortController. When the tests no longer need the functionality of the disposables, the test can fire the AbortController. This causes the stream to exit exceptionally, which triggers the `finally` block in TailLogGroup and runs disposal. This stops the event listeners from running after the test is completed, and has eliminated the noisy logs. I have tested this by running `npm run test` from the CLI. --- .../commands/tailLogGroup.test.ts | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index f2b085b2f2c..44b18f8ea12 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -56,15 +56,21 @@ describe('TailLogGroup', function () { getSessionUpdateFrame(false, `${testMessage}-2`, startTimestamp + 2000), getSessionUpdateFrame(false, `${testMessage}-3`, startTimestamp + 3000), ] - // Returns the configured update frames and then indefinitely blocks. + // Returns the configured update frames and then blocks until an AbortController is signaled. // This keeps the stream 'open', simulating an open network stream waiting for new events. // If the stream were to close, the event listeners in the TailLogGroup command would dispose, // breaking the 'closes tab closes session' assertions this test makes. - async function* generator(): AsyncIterable { + const controller = new AbortController() + const p = new Promise((resolve, reject) => { + controller.signal.addEventListener('abort', () => { + reject() + }) + }) + async function* generator() { for (const frame of updateFrames) { yield frame } - await new Promise(() => {}) + await p } startLiveTailSessionSpy = sandbox @@ -84,10 +90,14 @@ describe('TailLogGroup', function () { }) // The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve. - // Run it in the background and use waitUntil to poll its state. + // Run it in the background and use waitUntil to poll its state. Due to the test setup, we expect this to throw + // after the abortController is fired at the end of the test. void tailLogGroup(registry, testSource, codeLensProvider, { groupName: testLogGroup, regionName: testRegion, + }).catch((e) => { + const err = e as Error + assert.strictEqual(err.message.startsWith('Unexpected on-stream exception while tailing session:'), true) }) await waitUntil(async () => registry.size !== 0, { interval: 100, timeout: 1000 }) @@ -121,6 +131,11 @@ describe('TailLogGroup', function () { tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!)) }) await Promise.all(tabs.map((tab) => window.tabGroups.close(tab))) + + // Before the test ends, signal the abort controller, interrupting the mock response stream. This + // causes `handleSessionStream` in TailLogGroup to throw, triggering the disposables to dispose. + controller.abort() + assert.strictEqual(registry.size, 0) assert.strictEqual(stopLiveTailSessionSpy.calledOnce, true) }) From a3fdfcadc6e67cc112e6f14a01fae851fb2f5f6a Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:34:56 -0800 Subject: [PATCH 101/202] test(inline-suggestion): supplementalContextUtil.test failure #6269 fix #6266 --- .../util/supplemetalContextUtil.test.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts index 6c5c3d23478..051ac65bee1 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts @@ -4,22 +4,32 @@ */ import assert from 'assert' +import * as FakeTimers from '@sinonjs/fake-timers' import * as vscode from 'vscode' import * as sinon from 'sinon' import * as crossFile from 'aws-core-vscode/codewhisperer' -import { TestFolder, assertTabCount } from 'aws-core-vscode/test' +import { TestFolder, assertTabCount, installFakeClock } from 'aws-core-vscode/test' import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer' import { toTextEditor } from 'aws-core-vscode/test' import { LspController } from 'aws-core-vscode/amazonq' describe('supplementalContextUtil', function () { let testFolder: TestFolder + let clock: FakeTimers.InstalledClock const fakeCancellationToken: vscode.CancellationToken = { isCancellationRequested: false, onCancellationRequested: sinon.spy(), } + before(function () { + clock = installFakeClock() + }) + + after(function () { + clock.uninstall() + }) + beforeEach(async function () { testFolder = await TestFolder.create() sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control') From ee2ac96df6ba4c8f0ed5577edbad7cc1f81d6460 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:46:41 -0800 Subject: [PATCH 102/202] fix(amazonq): increase GetTransformation maxRetries #6220 ## Problem Customers that experience transient network issues are unable to view their transformation results when the `GetTransformation` API fails after the default of 3 retries. ## Solution Increase retries to 8. --- packages/core/src/codewhisperer/client/codewhisperer.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts index c5a89b36e0c..02f8a5f2f52 100644 --- a/packages/core/src/codewhisperer/client/codewhisperer.ts +++ b/packages/core/src/codewhisperer/client/codewhisperer.ts @@ -132,7 +132,7 @@ export class DefaultCodeWhispererClient { )) as CodeWhispererClient } - async createUserSdkClient(): Promise { + async createUserSdkClient(maxRetries?: number): Promise { const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled() session.setFetchCredentialStart() const bearerToken = await AuthUtil.instance.getBearerToken() @@ -144,6 +144,7 @@ export class DefaultCodeWhispererClient { apiConfig: userApiConfig, region: cwsprConfig.region, endpoint: cwsprConfig.endpoint, + maxRetries: maxRetries, credentials: new Credentials({ accessKeyId: 'xxx', secretAccessKey: 'xxx' }), onRequestSetup: [ (req) => { @@ -293,7 +294,8 @@ export class DefaultCodeWhispererClient { public async codeModernizerGetCodeTransformation( request: CodeWhispererUserClient.GetTransformationRequest ): Promise> { - return (await this.createUserSdkClient()).getTransformation(request).promise() + // instead of the default of 3 retries, use 8 retries for this API which is polled every 5 seconds + return (await this.createUserSdkClient(8)).getTransformation(request).promise() } /** From 6650cb9f90a1034a97b9bad3767b497ec1c0ef9f Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:24:55 -0800 Subject: [PATCH 103/202] fix(amazonq): retry S3 upload (#6246) ## Problem S3 upload sometimes fails due to transient issues. ## Solution Add up to 3 retries. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: David Hasani --- ...-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json | 4 + .../chat/controller/messenger/messenger.ts | 2 +- .../controller/messenger/messengerUtils.ts | 24 +---- .../src/codewhisperer/models/constants.ts | 2 +- .../transformByQ/transformApiHandler.ts | 39 ++++++-- .../transformProjectValidationHandler.ts | 73 +------------- .../commands/transformByQ.test.ts | 94 +++++++++++++++++++ 7 files changed, 137 insertions(+), 101 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json b/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json new file mode 100644 index 00000000000..2f917f23204 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q Code Transformation: retry project upload up to 3 times" +} diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts index b120aae986b..3d947b8caff 100644 --- a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts @@ -252,7 +252,7 @@ export class Messenger { this.dispatcher.sendAsyncEventProgress( new AsyncEventProgressMessage(tabID, { inProgress: true, - message: MessengerUtils.createLanguageUpgradeConfirmationPrompt(detectedJavaVersions), + message: CodeWhispererConstants.projectPromptChatMessage, }) ) diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts index a7b15810312..1eeef162d34 100644 --- a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts +++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts @@ -69,30 +69,8 @@ export default class MessengerUtils { } } - static createLanguageUpgradeConfirmationPrompt = (detectedJavaVersions: Array): string => { - let javaVersionString = 'Java project' - const uniqueJavaOptions = new Set(detectedJavaVersions) - - if (detectedJavaVersions.length > 1) { - // this means there is a Java version whose version we weren't able to determine - if (uniqueJavaOptions.has(undefined)) { - javaVersionString = 'Java projects' - } else { - javaVersionString = `Java ${Array.from(uniqueJavaOptions).join(' & ')} projects` - } - } else if (detectedJavaVersions.length === 1) { - if (!uniqueJavaOptions.has(undefined)) { - javaVersionString = `Java ${detectedJavaVersions[0]!.toString()} project` - } - } - - return CodeWhispererConstants.projectPromptChatMessage.replace('JAVA_VERSION_HERE', javaVersionString) - } - static createAvailableDependencyVersionString = (versions: DependencyVersions): string => { - let message = `I found ${versions.length} other dependency versions that are more recent than the dependency in your code that's causing an error: ${versions.currentVersion}. - -` + let message = `I found ${versions.length} other dependency versions that are more recent than the dependency in your code that's causing an error: ${versions.currentVersion}.` if (versions.majorVersions !== undefined && versions.majorVersions.length > 0) { message = message.concat( diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index 460778db349..96e4c3438f0 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -747,7 +747,7 @@ export const cleanInstallErrorNotification = `Amazon Q could not run the Maven c export const enterJavaHomeChatMessage = 'Enter the path to JDK ' export const projectPromptChatMessage = - 'I can upgrade your JAVA_VERSION_HERE. To start the transformation, I need some information from you. Choose the project you want to upgrade and the target code version to upgrade to. Then, choose Confirm.' + 'I can upgrade your Java project. To start the transformation, I need some information from you. Choose the project you want to upgrade and the target code version to upgrade to. Then, choose Confirm.' export const windowsJavaHomeHelpChatMessage = 'To find the JDK path, run the following commands in a new terminal: `cd "C:/Program Files/Java"` and then `dir`. If you see your JDK version, run `cd ` and then `cd` to show the path.' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts index fb90241ff68..b6f3eda36ce 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts @@ -103,18 +103,45 @@ export async function uploadArtifactToS3( try { const uploadFileByteSize = (await nodefs.promises.stat(fileName)).size getLogger().info( - `Uploading project artifact at %s with checksum %s using uploadId: %s and size %s kB`, + `CodeTransformation: Uploading project artifact at %s with checksum %s using uploadId: %s and size %s kB`, fileName, sha256, resp.uploadId, Math.round(uploadFileByteSize / 1000) ) - const response = await request.fetch('PUT', resp.uploadUrl, { - body: buffer, - headers: getHeadersObj(sha256, resp.kmsKeyArn), - }).response - getLogger().info(`CodeTransformation: Status from S3 Upload = ${response.status}`) + let response = undefined + /* The existing S3 client has built-in retries but it requires the bucket name, so until + * CreateUploadUrl can be modified to return the S3 bucket name, manually implement retries. + * Alternatively, when waitUntil supports a fixed number of retries and retriableCodes, use that. + */ + const retriableCodes = [408, 429, 500, 502, 503, 504] + for (let i = 0; i < 4; i++) { + try { + response = await request.fetch('PUT', resp.uploadUrl, { + body: buffer, + headers: getHeadersObj(sha256, resp.kmsKeyArn), + }).response + getLogger().info(`CodeTransformation: upload to S3 status on attempt ${i + 1}/4 = ${response.status}`) + if (response.status === 200) { + break + } + throw new Error('Upload failed') + } catch (e: any) { + if (response && !retriableCodes.includes(response.status)) { + throw new Error(`Upload failed with status code = ${response.status}; did not automatically retry`) + } + if (i !== 3) { + await sleep(1000 * Math.pow(2, i)) + } + } + } + if (!response || response.status !== 200) { + const uploadFailedError = `Upload failed after up to 4 attempts with status code = ${response?.status ?? 'unavailable'}` + getLogger().error(`CodeTransformation: ${uploadFailedError}`) + throw new Error(uploadFailedError) + } + getLogger().info('CodeTransformation: Upload to S3 succeeded') } catch (e: any) { let errorMessage = `The upload failed due to: ${(e as Error).message}. For more information, see the [Amazon Q documentation](${CodeWhispererConstants.codeTransformTroubleshootUploadError})` if (errorMessage.includes('Request has expired')) { diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts index 33b4777b28e..ebc2caeda4c 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts @@ -2,12 +2,8 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import { BuildSystem, JDKVersion, TransformationCandidateProject } from '../../models/model' -import { getLogger } from '../../../shared/logger' -import * as CodeWhispererConstants from '../../models/constants' +import { BuildSystem, TransformationCandidateProject } from '../../models/model' import * as vscode from 'vscode' -// Consider using ChildProcess once we finalize all spawnSync calls -import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports import { NoJavaProjectsFoundError, NoMavenJavaProjectsFoundError, @@ -70,72 +66,9 @@ async function getMavenJavaProjects(javaProjects: TransformationCandidateProject return mavenJavaProjects } -async function getProjectsValidToTransform(mavenJavaProjects: TransformationCandidateProject[]) { - const projectsValidToTransform: TransformationCandidateProject[] = [] - for (const project of mavenJavaProjects) { - let detectedJavaVersion = undefined - const projectPath = project.path - const compiledJavaFiles = await vscode.workspace.findFiles( - new vscode.RelativePattern(projectPath!, '**/*.class'), - '**/node_modules/**', - 1 - ) - if (compiledJavaFiles.length > 0) { - const classFilePath = `${compiledJavaFiles[0].fsPath}` - const baseCommand = 'javap' - const args = ['-v', classFilePath] - const spawnResult = spawnSync(baseCommand, args, { shell: false, encoding: 'utf-8' }) - if (spawnResult.status !== 0) { - let errorLog = '' - errorLog += spawnResult.error ? JSON.stringify(spawnResult.error) : '' - errorLog += `${spawnResult.stderr}\n${spawnResult.stdout}` - getLogger().error(`CodeTransformation: Error in running javap command = ${errorLog}`) - let errorReason = '' - if (spawnResult.stdout) { - errorReason = 'JavapExecutionError' - } else { - errorReason = 'JavapSpawnError' - } - if (spawnResult.error) { - const errorCode = (spawnResult.error as any).code ?? 'UNKNOWN' - errorReason += `-${errorCode}` - } - getLogger().error( - `CodeTransformation: Error in running javap command = ${errorReason}, log = ${errorLog}` - ) - } else { - const majorVersionIndex = spawnResult.stdout.indexOf('major version: ') - const javaVersion = spawnResult.stdout.slice(majorVersionIndex + 15, majorVersionIndex + 17).trim() - if (javaVersion === CodeWhispererConstants.JDK8VersionNumber) { - detectedJavaVersion = JDKVersion.JDK8 - } else if (javaVersion === CodeWhispererConstants.JDK11VersionNumber) { - detectedJavaVersion = JDKVersion.JDK11 - } else { - detectedJavaVersion = JDKVersion.UNSUPPORTED - } - } - } - - // detectedJavaVersion will be undefined if there are no .class files or if javap errors out, otherwise it will be JDK8, JDK11, or UNSUPPORTED - project.JDKVersion = detectedJavaVersion - projectsValidToTransform.push(project) - } - return projectsValidToTransform -} - -/* - * This function filters all open projects by first searching for a .java file and then searching for a pom.xml file in all projects. - * It also tries to detect the Java version of each project by running "javap" on a .class file of each project. - * As long as the project contains a .java file and a pom.xml file, the project is still considered valid for transformation, - * and we allow the user to specify the Java version. - */ +// This function filters all open projects by first searching for a .java file and then searching for a pom.xml file in all projects. export async function validateOpenProjects(projects: TransformationCandidateProject[]) { const javaProjects = await getJavaProjects(projects) - const mavenJavaProjects = await getMavenJavaProjects(javaProjects) - - // These projects we know must contain a pom.xml and a .java file - const projectsValidToTransform = await getProjectsValidToTransform(mavenJavaProjects) - - return projectsValidToTransform + return mavenJavaProjects } diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts index 843211eea0d..016ebf1682a 100644 --- a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts +++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts @@ -42,8 +42,12 @@ import { parseBuildFile, validateSQLMetadataFile, } from '../../../codewhisperer/service/transformByQ/transformFileHandler' +import { uploadArtifactToS3 } from '../../../codewhisperer/indexNode' +import request from '../../../shared/request' +import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports describe('transformByQ', function () { + let fetchStub: sinon.SinonStub let tempDir: string const validSctFile = ` @@ -91,6 +95,10 @@ describe('transformByQ', function () { beforeEach(async function () { tempDir = (await TestFolder.create()).path transformByQState.setToNotStarted() + fetchStub = sinon.stub(request, 'fetch') + // use Partial to avoid having to mock all 25 fields in the response; only care about 'size' + const mockStats: Partial = { size: 1000 } + sinon.stub(nodefs.promises, 'stat').resolves(mockStats as nodefs.Stats) }) afterEach(async function () { @@ -464,4 +472,90 @@ describe('transformByQ', function () { const isValidMetadata = await validateSQLMetadataFile(sctFileWithInvalidTarget, { tabID: 'abc123' }) assert.strictEqual(isValidMetadata, false) }) + + it('should successfully upload on first attempt', async () => { + const successResponse = { + ok: true, + status: 200, + text: () => Promise.resolve('Success'), + } + fetchStub.returns({ response: Promise.resolve(successResponse) }) + await uploadArtifactToS3( + 'test.zip', + { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' }, + 'sha256', + Buffer.from('test') + ) + sinon.assert.calledOnce(fetchStub) + }) + + it('should retry upload on retriable error and succeed', async () => { + const failedResponse = { + ok: false, + status: 503, + text: () => Promise.resolve('Service Unavailable'), + } + const successResponse = { + ok: true, + status: 200, + text: () => Promise.resolve('Success'), + } + fetchStub.onFirstCall().returns({ response: Promise.resolve(failedResponse) }) + fetchStub.onSecondCall().returns({ response: Promise.resolve(successResponse) }) + await uploadArtifactToS3( + 'test.zip', + { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' }, + 'sha256', + Buffer.from('test') + ) + sinon.assert.calledTwice(fetchStub) + }) + + it('should throw error after 4 failed upload attempts', async () => { + const failedResponse = { + ok: false, + status: 500, + text: () => Promise.resolve('Internal Server Error'), + } + fetchStub.returns({ response: Promise.resolve(failedResponse) }) + const expectedMessage = + 'The upload failed due to: Upload failed after up to 4 attempts with status code = 500. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)' + await assert.rejects( + uploadArtifactToS3( + 'test.zip', + { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' }, + 'sha256', + Buffer.from('test') + ), + { + name: 'Error', + message: expectedMessage, + } + ) + sinon.assert.callCount(fetchStub, 4) + }) + + it('should not retry upload on non-retriable error', async () => { + const failedResponse = { + ok: false, + status: 400, + text: () => Promise.resolve('Bad Request'), + } + fetchStub.onFirstCall().returns({ response: Promise.resolve(failedResponse) }) + const expectedMessage = + 'The upload failed due to: Upload failed with status code = 400; did not automatically retry. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)' + await assert.rejects( + uploadArtifactToS3( + 'test.zip', + { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' }, + 'sha256', + Buffer.from('test') + ), + { + name: 'Error', + message: expectedMessage, + } + ) + sinon.assert.calledOnce(fetchStub) + }) }) From cfa53f1984c323d6d58ce76ae71539e7ebf48e1c Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 17 Dec 2024 15:20:32 -0800 Subject: [PATCH 104/202] docs: mention EC2 --- README.md | 3 ++- packages/toolkit/README.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c53bfa121f7..bd9f82fa04d 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,11 @@ AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemde - Connect with [IAM credentials](https://docs.aws.amazon.com/sdkref/latest/guide/access-users.html), [IAM Identity Center (SSO)](https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html), or [AWS Builder ID](https://docs.aws.amazon.com/signin/latest/userguide/differences-aws_builder_id.html) +- Connect VSCode to your EC2 instances - Connect to your [CodeCatalyst](https://codecatalyst.aws/) Dev Environments - Debug your Lambda functions using [SAM CLI](https://github.com/aws/aws-sam-cli) - Check and autocomplete code in SAM/CFN (CloudFormation) `template.yaml` files -- `Open Terminal` on your ECS tasks +- `Open Terminal` on your EC2 instances or ECS tasks - `Search Log Group` on your CloudWatch logs - Browse your AWS resources diff --git a/packages/toolkit/README.md b/packages/toolkit/README.md index d0e4f60e66b..410100d6fd8 100644 --- a/packages/toolkit/README.md +++ b/packages/toolkit/README.md @@ -71,6 +71,7 @@ Unified software development service to quickly build and deliver applications o ## More features +- **EC2** - `Connect VS Code` or `Open Terminal` to EC2 instances - **Redshift** - view database objects and run SQL queries in a notebook interface - **Step Functions** - work with asl files and render state machine visuals - **CloudFormation** - view CloudFormation stacks From 8708c529e75d9518fcb3a778b22daa8b1a77cecd Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:51:42 -0500 Subject: [PATCH 105/202] test(codecatalyst): only fail test if message is >1 minute off #6265 ## Problem fix https://github.com/aws/aws-toolkit-vscode/issues/6213 ## Solution - The important part of this test is that the message comes after being inactive. If the message comes slightly early/late, that is okay. If it doesn't come at all, then we have problems and should fail. - Pass test if message comes within a minute of expected. --- packages/core/src/testInteg/codecatalyst/devEnv.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/core/src/testInteg/codecatalyst/devEnv.test.ts b/packages/core/src/testInteg/codecatalyst/devEnv.test.ts index 1faed565ccb..2da7c4c0adc 100644 --- a/packages/core/src/testInteg/codecatalyst/devEnv.test.ts +++ b/packages/core/src/testInteg/codecatalyst/devEnv.test.ts @@ -141,7 +141,12 @@ describe('InactivityMessage', function () { message: expectedMessages[i][0], minute: expectedMessages[i][1], } - assert.deepStrictEqual(actualMessages[i], expected) + assert.deepStrictEqual(actualMessages[i].message, expected.message) + // Avoid flakiness in the timing by looking within a minute rather than exact. + assert.ok( + Math.abs(actualMessages[i].minute - expected.minute) <= 1, + `Expected to be within 60 seconds of minute ${expected.minute}, but instead was at minute ${actualMessages[i].minute}` + ) } } From ab937e4dd854175afb490a75cc3c73796521edc0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 18 Dec 2024 12:37:44 -0800 Subject: [PATCH 106/202] ci: editing PR description re-triggers all GitHub Actions #6274 Problem: Since 6dcbfc705d4df, the `lint-commits` job runs whenever the PR *description* is edited, which then re-runs all the other GHA jobs. This is because it listens to the `edited` event, which triggers whenever the PR is edited in any way (very noisy). Solution: There is no way to avoid rerunning all the CI jobs if they are dependent on `lint-commits`. Instead, revert 6dcbfc705d4df and document that re-opening the PR will force CI to re-run, if needed, after fixing a PR title. --- .github/PULL_REQUEST_TEMPLATE.md | 3 +-- .github/workflows/lintcommit.js | 1 + .github/workflows/node.js.yml | 12 ++++-------- .github/workflows/notification.yml | 11 +++-------- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 929388bc246..3b891b24003 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,5 +8,4 @@ - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - -License: I confirm that my contribution is made under the terms of the Apache 2.0 license. +- License: I confirm that my contribution is made under the terms of the Apache 2.0 license. diff --git a/.github/workflows/lintcommit.js b/.github/workflows/lintcommit.js index 9e3f8b40406..4f329223eef 100644 --- a/.github/workflows/lintcommit.js +++ b/.github/workflows/lintcommit.js @@ -130,6 +130,7 @@ Invalid pull request title: \`${title}\` * scope: lowercase, <30 chars * subject: must be <100 chars * documentation: https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title +* Hint: *close and re-open the PR* to re-trigger CI (after fixing the PR title). ` : `Pull request title matches the [expected format](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title).` diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index a7541f39b9c..1c5299c8a2e 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -7,15 +7,10 @@ on: push: branches: [master, staging] pull_request: - branches: [master, feature/*, staging] - # Default = opened + synchronize + reopened. - # We also want "edited" so that lint-commits runs when PR title is updated. + # By default, CI will trigger on opened/synchronize/reopened event types. # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request - types: - - edited - - opened - - reopened - - synchronize + # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR. + branches: [master, feature/*, staging] # Cancel old jobs when a pull request is updated. concurrency: @@ -24,6 +19,7 @@ concurrency: jobs: lint-commits: + # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR. runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/notification.yml b/.github/workflows/notification.yml index ea37b04e0d5..17f0327e5c1 100644 --- a/.github/workflows/notification.yml +++ b/.github/workflows/notification.yml @@ -6,15 +6,10 @@ name: Notifications on: # `pull_request_target` (as opposed to `pull_request`) gives permissions to comment on PRs. pull_request_target: - branches: [master, feature/*, staging] - # Default = opened + synchronize + reopened. - # We also want "edited" so that changelog notifications runs when PR title is updated. + # By default, CI will trigger on opened/synchronize/reopened event types. # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request - types: - - edited - - opened - - reopened - - synchronize + # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR. + branches: [master, feature/*, staging] # Cancel old jobs when a pull request is updated. concurrency: From 08c7a3285d7665328e8ac1438fb8783bed855f3d Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Wed, 18 Dec 2024 20:43:52 +0000 Subject: [PATCH 107/202] fix(amazonq): code block extends beyond margins #6253 ## Problem Code block extends beyond margins followed by the rest of the document. ## Solution Remove css styles --- .../Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json | 4 ++++ packages/core/resources/css/securityIssue.css | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json b/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json new file mode 100644 index 00000000000..bc80e2916c3 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "/review: Code block extends beyond page margins in code issue detail view" +} diff --git a/packages/core/resources/css/securityIssue.css b/packages/core/resources/css/securityIssue.css index e102f5bc0f6..d766ccd8fe2 100644 --- a/packages/core/resources/css/securityIssue.css +++ b/packages/core/resources/css/securityIssue.css @@ -586,11 +586,6 @@ pre.error { } } -.code-block { - max-width: fit-content; - min-width: 500px; -} - .code-block pre { border-radius: 3px 3px 0 0; } From df7a3b696c969abd3f71a0113cf36686f943765e Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:23:48 -0500 Subject: [PATCH 108/202] deps(amazonq): update mynah ui to 4.21.3 (#6276) ## Problem - mynah ui 4.21.3 contains a fix needed for tests: https://github.com/aws/mynah-ui/releases/tag/v4.21.3 ## Solution - update to it. No public facing changes are needed --- package-lock.json | 9 ++++----- packages/core/package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b13a028558..8a549622f37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6083,11 +6083,10 @@ } }, "node_modules/@aws/mynah-ui": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.2.tgz", - "integrity": "sha512-zC/ck/m5nYXRwTs3EoiGNYR0jTfbrnovRloqlD07fmvTt9OpbWLhagg14Jr/+mqoYX3YWpqbLs9U56mqCLwHHQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.3.tgz", + "integrity": "sha512-iHFGmLg8fZgoqiHHDP94m6+ZmBsIiP7NBte/WId3iv+1344+Sipm/nNoZlczx5mIV1qhD+r/IZKG4c9Er4sHuA==", "hasInstallScript": true, - "license": "Apache License 2.0", "dependencies": { "escape-html": "^1.0.3", "just-clone": "^6.2.0", @@ -21163,7 +21162,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.2", + "@aws/mynah-ui": "^4.21.3", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/core/package.json b/packages/core/package.json index a5287d1ee31..23aef282444 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -508,7 +508,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.2", + "@aws/mynah-ui": "^4.21.3", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", From c449b0d08e38bfdb602e0cf0fb50b8d643084a13 Mon Sep 17 00:00:00 2001 From: siakmun-aws Date: Thu, 19 Dec 2024 15:12:33 -0800 Subject: [PATCH 109/202] telemetry(amazonq): send metric data in `onCodeGeneration` #6226 ## Problem This is a part of the task to implement client side alarms in order to track success rate for the client. ## Solution - Emit metric data telemetry on success/failure. --- .../amazonqFeatureDev/client/featureDev.ts | 12 +- .../controllers/chat/controller.ts | 29 ++- .../src/amazonqFeatureDev/session/session.ts | 19 ++ packages/core/src/amazonqFeatureDev/types.ts | 12 ++ .../controllers/chat/controller.test.ts | 184 +++++++++++++++--- 5 files changed, 224 insertions(+), 32 deletions(-) diff --git a/packages/core/src/amazonqFeatureDev/client/featureDev.ts b/packages/core/src/amazonqFeatureDev/client/featureDev.ts index 947949d48a9..ceef0b616e7 100644 --- a/packages/core/src/amazonqFeatureDev/client/featureDev.ts +++ b/packages/core/src/amazonqFeatureDev/client/featureDev.ts @@ -25,7 +25,12 @@ import { createCodeWhispererChatStreamingClient } from '../../shared/clients/cod import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util' import { extensionVersion } from '../../shared/vscode/env' import apiConfig = require('./codewhispererruntime-2022-11-11.json') -import { FeatureDevCodeAcceptanceEvent, FeatureDevCodeGenerationEvent, TelemetryEvent } from './featuredevproxyclient' +import { + FeatureDevCodeAcceptanceEvent, + FeatureDevCodeGenerationEvent, + MetricData, + TelemetryEvent, +} from './featuredevproxyclient' // Re-enable once BE is able to handle retries. const writeAPIRetryOptions = { @@ -299,6 +304,11 @@ export class FeatureDevClient { await this.sendFeatureDevEvent('featureDevCodeAcceptanceEvent', event) } + public async sendMetricData(event: MetricData) { + getLogger().debug(`featureDevCodeGenerationMetricData: dimensions: ${event.dimensions}`) + await this.sendFeatureDevEvent('metricData', event) + } + public async sendFeatureDevEvent( eventName: T, event: NonNullable diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts index 6fcf89239a1..f24ddb4e923 100644 --- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts +++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts @@ -30,7 +30,7 @@ import { import { codeGenRetryLimit, defaultRetryLimit } from '../../limits' import { Session } from '../../session/session' import { featureDevScheme, featureName } from '../../constants' -import { DeletedFileInfo, DevPhase, type NewFileInfo } from '../../types' +import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types' import { AuthUtil } from '../../../codewhisperer/util/authUtil' import { AuthController } from '../../../amazonq/auth/controller' import { getLogger } from '../../../shared/logger' @@ -413,6 +413,7 @@ export class FeatureDevController { canBeVoted: true, }) this.messenger.sendUpdatePlaceholder(tabID, i18n('AWS.amazonq.featureDev.pillText.generatingCode')) + await session.sendMetricDataTelemetry(MetricDataOperationName.StartCodeGeneration, MetricDataResult.Success) await session.send(message) const filePaths = session.state.filePaths ?? [] const deletedFiles = session.state.deletedFiles ?? [] @@ -486,6 +487,31 @@ export class FeatureDevController { await session.sendLinesOfCodeGeneratedTelemetry() } this.messenger.sendUpdatePlaceholder(tabID, i18n('AWS.amazonq.featureDev.pillText.selectOption')) + } catch (err: any) { + getLogger().error(`${featureName}: Error during code generation: ${err}`) + + let result: string + switch (err.constructor.name) { + case FeatureDevServiceError.name: + if (err.code === 'EmptyPatchException') { + result = MetricDataResult.LlmFailure + } else if (err.code === 'GuardrailsException' || err.code === 'ThrottlingException') { + result = MetricDataResult.Error + } else { + result = MetricDataResult.Fault + } + break + case PromptRefusalException.name: + case NoChangeRequiredException.name: + result = MetricDataResult.Error + break + default: + result = MetricDataResult.Fault + break + } + + await session.sendMetricDataTelemetry(MetricDataOperationName.EndCodeGeneration, result) + throw err } finally { // Finish processing the event @@ -517,6 +543,7 @@ export class FeatureDevController { } } } + await session.sendMetricDataTelemetry(MetricDataOperationName.EndCodeGeneration, MetricDataResult.Success) } private sendUpdateCodeMessage(tabID: string) { diff --git a/packages/core/src/amazonqFeatureDev/session/session.ts b/packages/core/src/amazonqFeatureDev/session/session.ts index d8db2d1b833..0f6d13bc0e9 100644 --- a/packages/core/src/amazonqFeatureDev/session/session.ts +++ b/packages/core/src/amazonqFeatureDev/session/session.ts @@ -285,6 +285,25 @@ export class Session { return { leftPath, rightPath, ...diff } } + public async sendMetricDataTelemetry(operationName: string, result: string) { + await this.proxyClient.sendMetricData({ + metricName: 'Operation', + metricValue: 1, + timestamp: new Date(), + product: 'FeatureDev', + dimensions: [ + { + name: 'operationName', + value: operationName, + }, + { + name: 'result', + value: result, + }, + ], + }) + } + public async sendLinesOfCodeGeneratedTelemetry() { let charactersOfCodeGenerated = 0 let linesOfCodeGenerated = 0 diff --git a/packages/core/src/amazonqFeatureDev/types.ts b/packages/core/src/amazonqFeatureDev/types.ts index 9c1a86643a2..0bf0c8550de 100644 --- a/packages/core/src/amazonqFeatureDev/types.ts +++ b/packages/core/src/amazonqFeatureDev/types.ts @@ -115,3 +115,15 @@ export interface UpdateFilesPathsParams { messageId: string disableFileActions?: boolean } + +export enum MetricDataOperationName { + StartCodeGeneration = 'StartCodeGeneration', + EndCodeGeneration = 'EndCodeGeneration', +} + +export enum MetricDataResult { + Success = 'Success', + Fault = 'Fault', + Error = 'Error', + LlmFailure = 'LLMFailure', +} diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts index efc5b51bd39..4c2639a553f 100644 --- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts +++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts @@ -9,7 +9,13 @@ import * as path from 'path' import sinon from 'sinon' import { waitUntil } from '../../../../shared/utilities/timeoutUtils' import { ControllerSetup, createController, createSession, generateVirtualMemoryUri } from '../../utils' -import { CurrentWsFolders, DeletedFileInfo, NewFileInfo } from '../../../../amazonqFeatureDev/types' +import { + CurrentWsFolders, + DeletedFileInfo, + MetricDataOperationName, + MetricDataResult, + NewFileInfo, +} from '../../../../amazonqFeatureDev/types' import { Session } from '../../../../amazonqFeatureDev/session/session' import { Prompter } from '../../../../shared/ui/prompter' import { assertTelemetry, toFile } from '../../../testUtil' @@ -36,6 +42,7 @@ import { AuthUtil } from '../../../../codewhisperer' import { featureDevScheme, featureName, messageWithConversationId } from '../../../../amazonqFeatureDev' import { i18n } from '../../../../shared/i18n-helper' import { FollowUpTypes } from '../../../../amazonq/commons/types' +import { ToolkitError } from '../../../../shared' let mockGetCodeGeneration: sinon.SinonStub describe('Controller', () => { @@ -395,7 +402,47 @@ describe('Controller', () => { }) describe('processUserChatMessage', function () { - async function fireChatMessage() { + // TODO: fix disablePreviousFileList error + const runs = [ + { name: 'ContentLengthError', error: new ContentLengthError() }, + { + name: 'MonthlyConversationLimitError', + error: new MonthlyConversationLimitError('Service Quota Exceeded'), + }, + { + name: 'FeatureDevServiceErrorGuardrailsException', + error: new FeatureDevServiceError( + i18n('AWS.amazonq.featureDev.error.codeGen.default'), + 'GuardrailsException' + ), + }, + { + name: 'FeatureDevServiceErrorEmptyPatchException', + error: new FeatureDevServiceError( + i18n('AWS.amazonq.featureDev.error.throttling'), + 'EmptyPatchException' + ), + }, + { + name: 'FeatureDevServiceErrorThrottlingException', + error: new FeatureDevServiceError( + i18n('AWS.amazonq.featureDev.error.codeGen.default'), + 'ThrottlingException' + ), + }, + { name: 'UploadCodeError', error: new UploadCodeError('403: Forbiden') }, + { name: 'UserMessageNotFoundError', error: new UserMessageNotFoundError() }, + { name: 'TabIdNotFoundError', error: new TabIdNotFoundError() }, + { name: 'PrepareRepoFailedError', error: new PrepareRepoFailedError() }, + { name: 'PromptRefusalException', error: new PromptRefusalException() }, + { name: 'ZipFileError', error: new ZipFileError() }, + { name: 'CodeIterationLimitError', error: new CodeIterationLimitError() }, + { name: 'UploadURLExpired', error: new UploadURLExpired() }, + { name: 'NoChangeRequiredException', error: new NoChangeRequiredException() }, + { name: 'default', error: new ToolkitError('Default', { code: 'Default' }) }, + ] + + async function fireChatMessage(session: Session) { const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(session) controllerSetup.emitters.processHumanChatMessage.fire({ @@ -410,44 +457,121 @@ describe('Controller', () => { }, {}) } - describe('processErrorChatMessage', function () { - // TODO: fix disablePreviousFileList error - const runs = [ - { name: 'ContentLengthError', error: new ContentLengthError() }, - { - name: 'MonthlyConversationLimitError', - error: new MonthlyConversationLimitError('Service Quota Exceeded'), - }, - { - name: 'FeatureDevServiceError', - error: new FeatureDevServiceError( - i18n('AWS.amazonq.featureDev.error.codeGen.default'), - 'GuardrailsException' - ), - }, - { name: 'UploadCodeError', error: new UploadCodeError('403: Forbiden') }, - { name: 'UserMessageNotFoundError', error: new UserMessageNotFoundError() }, - { name: 'TabIdNotFoundError', error: new TabIdNotFoundError() }, - { name: 'PrepareRepoFailedError', error: new PrepareRepoFailedError() }, - { name: 'PromptRefusalException', error: new PromptRefusalException() }, - { name: 'ZipFileError', error: new ZipFileError() }, - { name: 'CodeIterationLimitError', error: new CodeIterationLimitError() }, - { name: 'UploadURLExpired', error: new UploadURLExpired() }, - { name: 'NoChangeRequiredException', error: new NoChangeRequiredException() }, - { name: 'default', error: new Error() }, - ] + describe('onCodeGeneration', function () { + let session: any + let sendMetricDataTelemetrySpy: sinon.SinonStub + + const errorResultMapping = new Map([ + ['EmptyPatchException', MetricDataResult.LlmFailure], + [PromptRefusalException.name, MetricDataResult.Error], + [NoChangeRequiredException.name, MetricDataResult.Error], + ]) + + function getMetricResult(error: ToolkitError): MetricDataResult { + if (error instanceof FeatureDevServiceError && error.code) { + return errorResultMapping.get(error.code) ?? MetricDataResult.Error + } + return errorResultMapping.get(error.constructor.name) ?? MetricDataResult.Fault + } + + async function createCodeGenState() { + mockGetCodeGeneration = sinon.stub().resolves({ codeGenerationStatus: { status: 'Complete' } }) + + const workspaceFolders = [controllerSetup.workspaceFolder] as CurrentWsFolders + const testConfig = { + conversationId: conversationID, + proxyClient: { + createConversation: () => sinon.stub(), + createUploadUrl: () => sinon.stub(), + generatePlan: () => sinon.stub(), + startCodeGeneration: () => sinon.stub(), + getCodeGeneration: () => mockGetCodeGeneration(), + exportResultArchive: () => sinon.stub(), + } as unknown as FeatureDevClient, + workspaceRoots: [''], + uploadId: uploadID, + workspaceFolders, + } + + const codeGenState = new CodeGenState(testConfig, getFilePaths(controllerSetup), [], [], tabID, 0, {}) + const newSession = await createSession({ + messenger: controllerSetup.messenger, + sessionState: codeGenState, + conversationID, + tabID, + uploadID, + scheme: featureDevScheme, + }) + return newSession + } + + async function verifyException(error: ToolkitError) { + sinon.stub(session, 'send').throws(error) + + await fireChatMessage(session) + await verifyMetricsCalled() + assert.ok( + sendMetricDataTelemetrySpy.calledWith( + MetricDataOperationName.StartCodeGeneration, + MetricDataResult.Success + ) + ) + const metricResult = getMetricResult(error) + assert.ok( + sendMetricDataTelemetrySpy.calledWith(MetricDataOperationName.EndCodeGeneration, metricResult) + ) + } + + async function verifyMetricsCalled() { + await waitUntil(() => Promise.resolve(sendMetricDataTelemetrySpy.callCount >= 2), {}) + } + + beforeEach(async () => { + session = await createCodeGenState() + sinon.stub(session, 'preloader').resolves() + sendMetricDataTelemetrySpy = sinon.stub(session, 'sendMetricDataTelemetry') + }) + + it('sends success operation telemetry', async () => { + sinon.stub(session, 'send').resolves() + sinon.stub(session, 'sendLinesOfCodeGeneratedTelemetry').resolves() // Avoid sending extra telemetry + await fireChatMessage(session) + await verifyMetricsCalled() + + assert.ok( + sendMetricDataTelemetrySpy.calledWith( + MetricDataOperationName.StartCodeGeneration, + MetricDataResult.Success + ) + ) + assert.ok( + sendMetricDataTelemetrySpy.calledWith( + MetricDataOperationName.EndCodeGeneration, + MetricDataResult.Success + ) + ) + }) + + runs.forEach(({ name, error }) => { + it(`sends failure operation telemetry on ${name}`, async () => { + await verifyException(error) + }) + }) + }) + + describe('processErrorChatMessage', function () { function createTestErrorMessage(message: string) { return createUserFacingErrorMessage(`${featureName} request failed: ${message}`) } - async function verifyException(error: Error) { + async function verifyException(error: ToolkitError) { sinon.stub(session, 'preloader').throws(error) const sendAnswerSpy = sinon.stub(controllerSetup.messenger, 'sendAnswer') const sendErrorMessageSpy = sinon.stub(controllerSetup.messenger, 'sendErrorMessage') const sendMonthlyLimitErrorSpy = sinon.stub(controllerSetup.messenger, 'sendMonthlyLimitError') - await fireChatMessage() + await fireChatMessage(session) switch (error.constructor.name) { case ContentLengthError.name: From 9f9ff90f86eb9aa2c70d041a42015f2c3b429a4f Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:07:44 -0500 Subject: [PATCH 110/202] test(amazonq): welcome page and explore agents page tests (#6232) ## Problem We have no tests for the welcome page and explore agents page ## Solution Add them --- packages/amazonq/test/e2e/amazonq/assert.ts | 30 ++++++ .../amazonq/test/e2e/amazonq/explore.test.ts | 45 ++++++++ .../test/e2e/amazonq/framework/framework.ts | 32 +++++- .../test/e2e/amazonq/framework/messenger.ts | 26 ++++- .../amazonq/test/e2e/amazonq/welcome.test.ts | 101 ++++++++++++++++++ packages/core/src/amazonq/index.ts | 3 +- 6 files changed, 227 insertions(+), 10 deletions(-) create mode 100644 packages/amazonq/test/e2e/amazonq/assert.ts create mode 100644 packages/amazonq/test/e2e/amazonq/explore.test.ts create mode 100644 packages/amazonq/test/e2e/amazonq/welcome.test.ts diff --git a/packages/amazonq/test/e2e/amazonq/assert.ts b/packages/amazonq/test/e2e/amazonq/assert.ts new file mode 100644 index 00000000000..7bc7bb2c22e --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/assert.ts @@ -0,0 +1,30 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { Messenger } from './framework/messenger' + +export function assertQuickActions(tab: Messenger, commands: string[]) { + const commandGroup = tab + .getCommands() + .map((groups) => groups.commands) + .flat() + if (!commandGroup) { + assert.fail(`Could not find commands for ${tab.tabID}`) + } + + const commandNames = commandGroup.map((cmd) => cmd.command) + + const missingCommands = [] + for (const command of commands) { + if (!commandNames.includes(command)) { + missingCommands.push(command) + } + } + + if (missingCommands.length > 0) { + assert.fail(`Could not find commands: ${missingCommands.join(', ')} for ${tab.tabID}`) + } +} diff --git a/packages/amazonq/test/e2e/amazonq/explore.test.ts b/packages/amazonq/test/e2e/amazonq/explore.test.ts new file mode 100644 index 00000000000..6833849617d --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/explore.test.ts @@ -0,0 +1,45 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import sinon from 'sinon' +import { qTestingFramework } from './framework/framework' +import { Messenger } from './framework/messenger' + +describe('Amazon Q Explore page', function () { + let framework: qTestingFramework + let tab: Messenger + + beforeEach(() => { + framework = new qTestingFramework('agentWalkthrough', true, [], 0) + const welcomeTab = framework.getTabs()[0] + welcomeTab.clickInBodyButton('explore') + + // Find the new explore tab + const exploreTab = framework.findTab('Explore') + if (!exploreTab) { + assert.fail('Explore tab not found') + } + tab = exploreTab + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + // TODO refactor page objects so we can associate clicking user guides with actual urls + // TODO test that clicking quick start changes the tab title, etc + it('should have correct button IDs', async () => { + const features = ['featuredev', 'testgen', 'doc', 'review', 'gumby'] + + features.forEach((feature, index) => { + const buttons = (tab.getStore().chatItems ?? [])[index].buttons ?? [] + assert.deepStrictEqual(buttons[0].id, `user-guide-${feature}`) + assert.deepStrictEqual(buttons[1].id, `quick-start-${feature}`) + }) + }) +}) diff --git a/packages/amazonq/test/e2e/amazonq/framework/framework.ts b/packages/amazonq/test/e2e/amazonq/framework/framework.ts index b65e8b184f7..b39dbe4314b 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/framework.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/framework.ts @@ -8,6 +8,7 @@ import { injectJSDOM } from './jsdomInjector' // This needs to be ran before all other imports so that mynah ui gets loaded inside of jsdom injectJSDOM() +import assert from 'assert' import * as vscode from 'vscode' import { MynahUI, MynahUIProps } from '@aws/mynah-ui' import { DefaultAmazonQAppInitContext, TabType, createMynahUI } from 'aws-core-vscode/amazonq' @@ -24,7 +25,12 @@ export class qTestingFramework { lastEventId: string = '' - constructor(featureName: TabType, amazonQEnabled: boolean, featureConfigsSerialized: [string, FeatureContext][]) { + constructor( + featureName: TabType, + amazonQEnabled: boolean, + featureConfigsSerialized: [string, FeatureContext][], + welcomeCount = 0 + ) { /** * Instantiate the UI and override the postMessage to publish using the app message * publishers directly. @@ -44,7 +50,8 @@ export class qTestingFramework { }, }, amazonQEnabled, - featureConfigsSerialized + featureConfigsSerialized, + welcomeCount ) this.mynahUI = ui.mynahUI this.mynahUIProps = (this.mynahUI as any).props @@ -79,18 +86,35 @@ export class qTestingFramework { * functionality against a specific tab */ public createTab(options?: MessengerOptions) { - const newTabID = this.mynahUI.updateStore('', {}) + const oldTabs = Object.keys(this.mynahUI.getAllTabs()) + + // simulate pressing the new tab button + ;(document.querySelectorAll('.mynah-nav-tabs-wrapper > button.mynah-button')[0] as HTMLButtonElement).click() + const newTabs = Object.keys(this.mynahUI.getAllTabs()) + + const newTabID = newTabs.find((tab) => !oldTabs.includes(tab)) if (!newTabID) { - throw new Error('Could not create tab id') + assert.fail('Could not find new tab') } + return new Messenger(newTabID, this.mynahUIProps, this.mynahUI, options) } + public getTabs() { + const tabs = this.mynahUI.getAllTabs() + return Object.entries(tabs).map(([tabId]) => new Messenger(tabId, this.mynahUIProps, this.mynahUI)) + } + + public findTab(title: string) { + return Object.values(this.getTabs()).find((tab) => tab.getStore().tabTitle === title) + } + public removeTab(tabId: string) { this.mynahUI.removeTab(tabId, this.lastEventId) } public dispose() { vscode.Disposable.from(...this.disposables).dispose() + this.mynahUI.destroy() } } diff --git a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts index 80e68f7481e..0aa363d2e3d 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts @@ -51,12 +51,28 @@ export class Messenger { } const lastChatItem = this.getChatItems().pop() - const option = lastChatItem?.followUp?.options?.filter((option) => option.type === type) - if (!option?.length || option.length > 1) { - assert.fail('Could not find follow up option') + const followupOption = lastChatItem?.followUp?.options?.filter((option) => option.type === type) + if (followupOption && followupOption.length > 0) { + this.mynahUIProps.onFollowUpClicked(this.tabID, lastChatItem?.messageId ?? '', followupOption[0]) + return } - this.mynahUIProps.onFollowUpClicked(this.tabID, lastChatItem?.messageId ?? '', option[0]) + assert.fail(`Could not find a button with id ${type} on tabID: ${this.tabID}`) + } + + clickInBodyButton(type: string) { + if (!this.mynahUIProps.onInBodyButtonClicked) { + assert.fail('onInBodyButtonClicked must be defined to use it in the tests') + } + + const lastChatItem = this.getChatItems().pop() + const followupButton = lastChatItem?.buttons?.filter((option) => option.id === type) + if (followupButton && followupButton.length > 0) { + this.mynahUIProps.onInBodyButtonClicked(this.tabID, lastChatItem?.messageId ?? '', followupButton[0]) + return + } + + assert.fail(`Could not find a button with id ${type} on tabID: ${this.tabID}`) } clickCustomFormButton(action: { id: string; text?: string; formItemValues?: Record }) { @@ -193,7 +209,7 @@ export class Messenger { } } - private getStore(): MynahUIDataModel { + getStore(): MynahUIDataModel { const store = this.mynahUI.getAllTabs()[this.tabID].store if (!store) { assert.fail(`${this.tabID} does not have a store`) diff --git a/packages/amazonq/test/e2e/amazonq/welcome.test.ts b/packages/amazonq/test/e2e/amazonq/welcome.test.ts new file mode 100644 index 00000000000..1e15d13381a --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/welcome.test.ts @@ -0,0 +1,101 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { qTestingFramework } from './framework/framework' +import sinon from 'sinon' +import { Messenger } from './framework/messenger' +import { MynahUIDataModel } from '@aws/mynah-ui' +import { assertQuickActions } from './assert' + +describe('Amazon Q Welcome page', function () { + let framework: qTestingFramework + let tab: Messenger + let store: MynahUIDataModel + + const availableCommands = ['/dev', '/test', '/review', '/doc', '/transform'] + + beforeEach(() => { + framework = new qTestingFramework('welcome', true, [], 0) + tab = framework.getTabs()[0] // use the default tab that gets created + store = tab.getStore() + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => { + assertQuickActions(tab, availableCommands) + }) + + it('Shows @workspace', async () => { + assert.deepStrictEqual( + store.contextCommands + ?.map((x) => x.commands) + .flat() + .map((x) => x.command), + ['@workspace'] + ) + }) + + describe('shows 3 times', async () => { + it('new tabs', () => { + framework.createTab() + framework.createTab() + framework.createTab() + framework.createTab() + + let welcomeCount = 0 + framework.getTabs().forEach((tab) => { + if (tab.getStore().tabTitle === 'Welcome to Q') { + welcomeCount++ + } + }) + // 3 welcome tabs + assert.deepStrictEqual(welcomeCount, 3) + + // 2 normal tabs + assert.deepStrictEqual(framework.getTabs().length - welcomeCount, 2) + }) + + it('new windows', () => { + // check the initial window + assert.deepStrictEqual(store.tabTitle, 'Welcome to Q') + framework.dispose() + + // check when theres already been two welcome tabs shown + framework = new qTestingFramework('welcome', true, [], 2) + const secondStore = framework.getTabs()[0].getStore() + assert.deepStrictEqual(secondStore.tabTitle, 'Welcome to Q') + framework.dispose() + + // check when theres already been three welcome tabs shown + framework = new qTestingFramework('welcome', true, [], 3) + const thirdStore = framework.getTabs()[0].getStore() + assert.deepStrictEqual(thirdStore.tabTitle, 'Chat') + framework.dispose() + }) + }) + + describe('Welcome actions', () => { + it('explore', () => { + tab.clickInBodyButton('explore') + + // explore opens in a new tab + const exploreTabStore = framework.findTab('Explore')?.getStore() + assert.strictEqual(exploreTabStore?.tabTitle, 'Explore') + }) + + it('quick-start', async () => { + tab.clickInBodyButton('quick-start') + + // clicking quick start opens in the current tab and changes the compact mode + assert.deepStrictEqual(tab.getStore().compactMode, false) + }) + }) +}) diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts index 5bd20e4dfd0..584042a8462 100644 --- a/packages/core/src/amazonq/index.ts +++ b/packages/core/src/amazonq/index.ts @@ -55,11 +55,12 @@ export function createMynahUI( ideApi: any, amazonQEnabled: boolean, featureConfigsSerialized: [string, FeatureContext][], + welcomeCount: number, disabledCommands?: string[] ) { if (typeof window !== 'undefined') { const mynahUI = require('./webview/ui/main') - return mynahUI.createMynahUI(ideApi, amazonQEnabled, featureConfigsSerialized, true, disabledCommands) + return mynahUI.createMynahUI(ideApi, amazonQEnabled, featureConfigsSerialized, welcomeCount, disabledCommands) } throw new Error('Not implemented for node') } From f98308c0863604247d891f474db0b64fefa3537a Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:23:49 -0500 Subject: [PATCH 111/202] config(packagejson): update fonts (#6283) ## Problem Fonts are out of sync for the toolkits ## Solution Update and commit the font changes --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: nkomonen-amazon --- packages/toolkit/package.json | 134 ++++++++++++++++++++++------------ 1 file changed, 88 insertions(+), 46 deletions(-) diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 18a660102d2..b93cd063334 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -4037,327 +4037,369 @@ "fontCharacter": "\\f1ac" } }, - "aws-amazonq-transform-arrow-dark": { + "aws-amazonq-severity-critical": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1ad" } }, - "aws-amazonq-transform-arrow-light": { + "aws-amazonq-severity-high": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1ae" } }, - "aws-amazonq-transform-default-dark": { + "aws-amazonq-severity-info": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1af" } }, - "aws-amazonq-transform-default-light": { + "aws-amazonq-severity-low": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b0" } }, - "aws-amazonq-transform-dependencies-dark": { + "aws-amazonq-severity-medium": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b1" } }, - "aws-amazonq-transform-dependencies-light": { + "aws-amazonq-transform-arrow-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b2" } }, - "aws-amazonq-transform-file-dark": { + "aws-amazonq-transform-arrow-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b3" } }, - "aws-amazonq-transform-file-light": { + "aws-amazonq-transform-default-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b4" } }, - "aws-amazonq-transform-logo": { + "aws-amazonq-transform-default-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b5" } }, - "aws-amazonq-transform-step-into-dark": { + "aws-amazonq-transform-dependencies-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b6" } }, - "aws-amazonq-transform-step-into-light": { + "aws-amazonq-transform-dependencies-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b7" } }, - "aws-amazonq-transform-variables-dark": { + "aws-amazonq-transform-file-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b8" } }, - "aws-amazonq-transform-variables-light": { + "aws-amazonq-transform-file-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1b9" } }, - "aws-applicationcomposer-icon": { + "aws-amazonq-transform-landing-page-icon": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1ba" } }, - "aws-applicationcomposer-icon-dark": { + "aws-amazonq-transform-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1bb" } }, - "aws-apprunner-service": { + "aws-amazonq-transform-step-into-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1bc" } }, - "aws-cdk-logo": { + "aws-amazonq-transform-step-into-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1bd" } }, - "aws-cloudformation-stack": { + "aws-amazonq-transform-variables-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1be" } }, - "aws-cloudwatch-log-group": { + "aws-amazonq-transform-variables-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1bf" } }, - "aws-codecatalyst-logo": { + "aws-applicationcomposer-icon": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c0" } }, - "aws-codewhisperer-icon-black": { + "aws-applicationcomposer-icon-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c1" } }, - "aws-codewhisperer-icon-white": { + "aws-apprunner-service": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c2" } }, - "aws-codewhisperer-learn": { + "aws-cdk-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c3" } }, - "aws-ecr-registry": { + "aws-cloudformation-stack": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c4" } }, - "aws-ecs-cluster": { + "aws-cloudwatch-log-group": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c5" } }, - "aws-ecs-container": { + "aws-codecatalyst-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c6" } }, - "aws-ecs-service": { + "aws-codewhisperer-icon-black": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c7" } }, - "aws-generic-attach-file": { + "aws-codewhisperer-icon-white": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c8" } }, - "aws-iot-certificate": { + "aws-codewhisperer-learn": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1c9" } }, - "aws-iot-policy": { + "aws-ecr-registry": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1ca" } }, - "aws-iot-thing": { + "aws-ecs-cluster": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1cb" } }, - "aws-lambda-function": { + "aws-ecs-container": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1cc" } }, - "aws-mynah-MynahIconBlack": { + "aws-ecs-service": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1cd" } }, - "aws-mynah-MynahIconWhite": { + "aws-generic-attach-file": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1ce" } }, - "aws-mynah-logo": { + "aws-iot-certificate": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1cf" } }, - "aws-redshift-cluster": { + "aws-iot-policy": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d0" } }, - "aws-redshift-cluster-connected": { + "aws-iot-thing": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d1" } }, - "aws-redshift-database": { + "aws-lambda-function": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d2" } }, - "aws-redshift-redshift-cluster-connected": { + "aws-mynah-MynahIconBlack": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d3" } }, - "aws-redshift-schema": { + "aws-mynah-MynahIconWhite": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d4" } }, - "aws-redshift-table": { + "aws-mynah-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d5" } }, - "aws-s3-bucket": { + "aws-redshift-cluster": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d6" } }, - "aws-s3-create-bucket": { + "aws-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d7" } }, - "aws-schemas-registry": { + "aws-redshift-database": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d8" } }, - "aws-schemas-schema": { + "aws-redshift-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d9" } }, - "aws-stepfunctions-preview": { + "aws-redshift-schema": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1da" } + }, + "aws-redshift-table": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1db" + } + }, + "aws-s3-bucket": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1dc" + } + }, + "aws-s3-create-bucket": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1dd" + } + }, + "aws-schemas-registry": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1de" + } + }, + "aws-schemas-schema": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1df" + } + }, + "aws-stepfunctions-preview": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e0" + } } }, "notebooks": [ From 745306dea2017948b8a3da1350f43d627d62c47a Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:22:27 -0500 Subject: [PATCH 112/202] ci(jscpd): check changed lines only, to avoid false positives #5950 ## Problem The `jscpd` check checks changed *files*. So duplicate code may be reported on lines outside of the actual changes (in the same file), which may be considered false positives. ## Solution - Only report "clones" (duplicate code) on actually changed lines. - Refactor the action to simplify the bash scripting. - Add tests for `filterDuplicates.ts`. --- .github/workflows/filterDuplicates.js | 279 ++++++++++++++++++++++++++ .github/workflows/node.js.yml | 41 +--- .github/workflows/test/test_diff.txt | 185 +++++++++++++++++ 3 files changed, 467 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/filterDuplicates.js create mode 100644 .github/workflows/test/test_diff.txt diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js new file mode 100644 index 00000000000..0284ea20654 --- /dev/null +++ b/.github/workflows/filterDuplicates.js @@ -0,0 +1,279 @@ +/** + * Filters the report produced by jscpd to only include clones that involve changes from the given git diff. + * If the filtered report is non-empty, i.e. there exists a clone in the changes, + * the program exits with an error and logs the filtered report to console. + * + * Usage: + * node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] + * + * Tests: + * node filterDuplicates.js test + */ + +const fs = require('fs/promises') +const path = require('path') + +function parseDiffFilePath(filePathLine) { + return filePathLine.split(' ')[2].split('/').slice(1).join('/') +} + +function parseDiffRange(rangeLine) { + const [_fromRange, toRange] = rangeLine.split(' ').slice(1, 3) + const [startLine, numLines] = toRange.slice(1).split(',').map(Number) + const range = [startLine, startLine + numLines] + return range +} + +async function parseDiff(diffPath) { + const diff = await fs.readFile(diffPath, 'utf8') + const lines = diff.split('\n') + let currentFile = null + let currentFileChanges = [] + const fileChanges = new Map() + + for (const line of lines) { + if (line.startsWith('diff')) { + if (currentFile) { + fileChanges.set(currentFile, currentFileChanges) + } + currentFile = parseDiffFilePath(line) + currentFileChanges = [] + } + if (line.startsWith('@@')) { + currentFileChanges.push(parseDiffRange(line)) + } + } + + fileChanges.set(currentFile, currentFileChanges) + + return fileChanges +} + +function doesOverlap(range1, range2) { + const [start1, end1] = range1 + const [start2, end2] = range2 + return ( + (start1 >= start2 && start1 <= end2) || (end1 >= start2 && end1 <= end2) || (start2 >= start1 && end2 <= end1) + ) +} + +function isCloneInChanges(changes, cloneInstance) { + const fileName = cloneInstance.name + const cloneStart = cloneInstance.start + const cloneEnd = cloneInstance.end + const lineChangeRanges = changes.get(fileName) + + if (!lineChangeRanges) { + return false + } + + return lineChangeRanges.some((range) => doesOverlap([cloneStart, cloneEnd], range)) +} + +function isInChanges(changes, dupe) { + return isCloneInChanges(changes, dupe.firstFile) || isCloneInChanges(changes, dupe.secondFile) +} + +function filterDuplicates(report, changes) { + duplicates = [] + for (const dupe of report.duplicates) { + if (isInChanges(changes, dupe)) { + duplicates.push(dupe) + } + } + return duplicates +} + +async function run() { + const rawDiffPath = process.argv[3] + const jscpdReportPath = process.argv[4] + const changes = await parseDiff(rawDiffPath) + const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8')) + const filteredDuplicates = filterDuplicates(jscpdReport, changes) + + console.log('%s files changes', changes.size) + console.log('%s duplicates found', filteredDuplicates.length) + if (filteredDuplicates.length > 0) { + console.log(filteredDuplicates) + process.exit(1) + } +} + +/** + * Mini-test Suite + */ +console.log(__dirname) +const testDiffFile = path.resolve(__dirname, 'test/test_diff.txt') +let testCounter = 0 +function assertEqual(actual, expected) { + if (actual !== expected) { + throw new Error(`Expected ${expected} but got ${actual}`) + } + testCounter += 1 +} + +async function test() { + test_parseDiffFilePath() + test_parseDiffRange() + test_doesOverlap() + await test_parseDiff() + await test_isCloneInChanges() + await test_isInChanges() + await test_filterDuplicates() + console.log('All tests passed (%s)', testCounter) +} + +function test_parseDiffFilePath() { + assertEqual( + parseDiffFilePath( + 'diff --git a/.github/workflows/copyPasteDetection.yml b/.github/workflows/copyPasteDetection.yml' + ), + '.github/workflows/copyPasteDetection.yml' + ) + assertEqual( + parseDiffFilePath('diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js'), + '.github/workflows/filterDuplicates.js' + ) +} + +function test_parseDiffRange() { + assertEqual(parseDiffRange('@@ -1,4 +1,4 @@').join(','), '1,5') + assertEqual(parseDiffRange('@@ -10,4 +10,4 @@').join(','), '10,14') + assertEqual(parseDiffRange('@@ -10,4 +10,5 @@').join(','), '10,15') +} + +function test_doesOverlap() { + assertEqual(doesOverlap([1, 5], [2, 4]), true) + assertEqual(doesOverlap([2, 3], [2, 4]), true) + assertEqual(doesOverlap([2, 3], [1, 4]), true) + assertEqual(doesOverlap([1, 5], [5, 6]), true) + assertEqual(doesOverlap([1, 5], [6, 7]), false) + assertEqual(doesOverlap([6, 7], [1, 5]), false) + assertEqual(doesOverlap([2, 5], [4, 5]), true) +} + +async function test_parseDiff() { + const changes = await parseDiff(testDiffFile) + assertEqual(changes.size, 2) + assertEqual(changes.get('.github/workflows/copyPasteDetection.yml').length, 1) + assertEqual(changes.get('.github/workflows/filterDuplicates.js').length, 1) + assertEqual(changes.get('.github/workflows/filterDuplicates.js')[0].join(','), '1,86') + assertEqual(changes.get('.github/workflows/copyPasteDetection.yml')[0].join(','), '26,73') +} + +async function test_isCloneInChanges() { + const changes = await parseDiff(testDiffFile) + assertEqual( + isCloneInChanges(changes, { + name: '.github/workflows/filterDuplicates.js', + start: 1, + end: 86, + }), + true + ) + assertEqual( + isCloneInChanges(changes, { + name: '.github/workflows/filterDuplicates.js', + start: 80, + end: 95, + }), + true + ) + assertEqual( + isCloneInChanges(changes, { + name: '.github/workflows/filterDuplicates.js', + start: 87, + end: 95, + }), + false + ) + assertEqual( + isCloneInChanges(changes, { + name: 'some-fake-file', + start: 1, + end: 100, + }), + false + ) +} + +async function test_isInChanges() { + const changes = await parseDiff(testDiffFile) + const dupe = { + firstFile: { + name: '.github/workflows/filterDuplicates.js', + start: 1, + end: 86, + }, + secondFile: { + name: '.github/workflows/filterDuplicates.js', + start: 80, + end: 95, + }, + } + assertEqual(isInChanges(changes, dupe), true) + dupe.secondFile.start = 87 + assertEqual(isInChanges(changes, dupe), true) + dupe.firstFile.name = 'some-fake-file' + assertEqual(isInChanges(changes, dupe), false) +} + +async function test_filterDuplicates() { + assertEqual( + filterDuplicates( + { + duplicates: [ + { + firstFile: { + name: '.github/workflows/filterDuplicates.js', + start: 1, + end: 86, + }, + secondFile: { + name: '.github/workflows/filterDuplicates.js', + start: 80, + end: 95, + }, + }, + ], + }, + await parseDiff(testDiffFile) + ).length, + 1 + ) + assertEqual( + filterDuplicates( + { + duplicates: [ + { + firstFile: { + name: 'some-other-file', + start: 1, + end: 86, + }, + secondFile: { + name: '.github/workflows/filterDuplicates.js', + start: 90, + end: 95, + }, + }, + ], + }, + await parseDiff(testDiffFile) + ).length, + 0 + ) +} + +async function main() { + const mode = process.argv[2] + if (mode === 'run') { + await run() + } else if (mode === 'test') { + await test() + } else { + throw new Error('Invalid mode') + } +} + +void main() diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1c5299c8a2e..04a289eded9 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -88,7 +88,7 @@ jobs: env: CURRENT_BRANCH: ${{ github.head_ref }} TARGET_BRANCH: ${{ github.event.pull_request.base.ref }} - run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt + run: git diff origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt - run: npm install -g jscpd @@ -100,43 +100,8 @@ jobs: name: unfiltered-jscpd-report path: ./jscpd-report.json - - name: Filter jscpd report for changed files - run: | - if [ ! -f ./jscpd-report.json ]; then - echo "jscpd-report.json not found" - exit 1 - fi - echo "Filtering jscpd report for changed files..." - CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt) - echo "Changed files: $CHANGED_FILES" - jq --argjson changed_files "$CHANGED_FILES" ' - .duplicates | map(select( - (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or - (.secondFile?.name as $sname | $changed_files | any(. == $sname)) - )) - ' ./jscpd-report.json > filtered-jscpd-report.json - cat filtered-jscpd-report.json - - - name: Check for duplicates - run: | - if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then - echo "filtered_report_exists=true" >> $GITHUB_ENV - else - echo "filtered_report_exists=false" >> $GITHUB_ENV - fi - - name: upload filtered report (if applicable) - if: env.filtered_report_exists == 'true' - uses: actions/upload-artifact@v4 - with: - name: filtered-jscpd-report - path: ./filtered-jscpd-report.json - - - name: Fail and log found duplicates. - if: env.filtered_report_exists == 'true' - run: | - cat ./filtered-jscpd-report.json - echo "Duplications found, failing the check." - exit 1 + - name: Check for Duplicates + run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json macos: needs: lint-commits diff --git a/.github/workflows/test/test_diff.txt b/.github/workflows/test/test_diff.txt new file mode 100644 index 00000000000..9614e902a5e --- /dev/null +++ b/.github/workflows/test/test_diff.txt @@ -0,0 +1,185 @@ +diff --git a/.github/workflows/copyPasteDetection.yml b/.github/workflows/copyPasteDetection.yml +index 793337de5..746b3cecd 100644 +--- a/.github/workflows/copyPasteDetection.yml ++++ b/.github/workflows/copyPasteDetection.yml +@@ -26,61 +26,47 @@ jobs: + with: + node-version: ${{ matrix.node-version }} + ++ - name: Determine if local ++ run: echo "IS_LOCAL=false" >> $GITHUB_ENV ++ + - name: Fetch fork upstream ++ if: ${{ env.IS_LOCAL == 'false' }} + run: | + git remote add forkUpstream https://github.com/${{ github.event.pull_request.head.repo.full_name }} # URL of the fork + git fetch forkUpstream # Fetch fork + + - name: Determine base and target branches for comparison. + run: | +- echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV +- echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV +- - run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt +- - run: | +- npm install -g jscpd ++ if [[ $IS_LOCAL == 'false' ]]; then ++ echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV ++ echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV ++ else ++ echo "CURRENT_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV ++ echo "TARGET_BRANCH=master" >> $GITHUB_ENV ++ fi ++ ++ - name: Print base and target branches for comparison. ++ run: | ++ echo "CURRENT_BRANCH=$CURRENT_BRANCH" ++ echo "TARGET_BRANCH=$TARGET_BRANCH" ++ ++ - name: Compare target and current branches. ++ run: | ++ if [[ $IS_LOCAL == 'false' ]]; then ++ git diff origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt ++ else ++ git diff origin/$TARGET_BRANCH $CURRENT_BRANCH > diff_output.txt ++ fi ++ ++ - run: npm install -g jscpd + + - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json" + +- - if: always() ++ - if: ${{ env.IS_LOCAL == 'false' }} + uses: actions/upload-artifact@v4 + with: + name: unfiltered-jscpd-report + path: ./jscpd-report.json + +- - name: Filter jscpd report for changed files +- run: | +- if [ ! -f ./jscpd-report.json ]; then +- echo "jscpd-report.json not found" +- exit 1 +- fi +- echo "Filtering jscpd report for changed files..." +- CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt) +- echo "Changed files: $CHANGED_FILES" +- jq --argjson changed_files "$CHANGED_FILES" ' +- .duplicates | map(select( +- (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or +- (.secondFile?.name as $sname | $changed_files | any(. == $sname)) +- )) +- ' ./jscpd-report.json > filtered-jscpd-report.json +- cat filtered-jscpd-report.json +- + - name: Check for duplicates +- run: | +- if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then +- echo "filtered_report_exists=true" >> $GITHUB_ENV +- else +- echo "filtered_report_exists=false" >> $GITHUB_ENV +- fi +- - name: upload filtered report (if applicable) +- if: env.filtered_report_exists == 'true' +- uses: actions/upload-artifact@v4 +- with: +- name: filtered-jscpd-report +- path: ./filtered-jscpd-report.json +- +- - name: Fail and log found duplicates. +- if: env.filtered_report_exists == 'true' +- run: | +- cat ./filtered-jscpd-report.json +- echo "Duplications found, failing the check." +- exit 1 ++ run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" diff_output.txt jscpd-report.json +diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js +new file mode 100644 +index 000000000..b2f1e913e +--- /dev/null ++++ b/.github/workflows/filterDuplicates.js +@@ -0,0 +1,85 @@ ++const fs = require('fs/promises') ++ ++function parseDiffFilePath(filePathLine) { ++ return filePathLine.split(' ')[2].split('/').slice(1).join('/') ++} ++ ++function parseDiffRange(rangeLine) { ++ const [_fromRange, toRange] = rangeLine.split(' ').slice(1, 3) ++ const [startLine, numLines] = toRange.slice(1).split(',').map(Number) ++ const range = [startLine, startLine + numLines] ++ return range ++} ++ ++async function parseDiff(diffPath) { ++ const diff = await fs.readFile(diffPath, 'utf8') ++ const lines = diff.split('\n') ++ let currentFile = null ++ let currentFileChanges = [] ++ const fileChanges = new Map() ++ ++ for (const line of lines) { ++ if (line.startsWith('diff')) { ++ if (currentFile) { ++ fileChanges.set(currentFile, currentFileChanges) ++ } ++ currentFile = parseDiffFilePath(line) ++ currentFileChanges = [] ++ } ++ if (line.startsWith('@@')) { ++ currentFileChanges.push(parseDiffRange(line)) ++ } ++ } ++ ++ return fileChanges ++} ++ ++function doesOverlap(range1, range2) { ++ const [start1, end1] = range1 ++ const [start2, end2] = range2 ++ return (start1 >= start2 && start1 <= end2) || (end1 >= start2 && end1 <= end2) ++} ++ ++function isCloneInChanges(changes, cloneInstance) { ++ const fileName = cloneInstance.name ++ const cloneStart = cloneInstance.start ++ const cloneEnd = cloneInstance.end ++ const lineChangeRanges = changes.get(fileName) ++ ++ if (!lineChangeRanges) { ++ return false ++ } ++ ++ return lineChangeRanges.some((range) => doesOverlap([cloneStart, cloneEnd], range)) ++} ++ ++function isInChanges(changes, dupe) { ++ return isCloneInChanges(changes, dupe.firstFile) || isCloneInChanges(changes, dupe.secondFile) ++} ++ ++function filterDuplicates(report, changes) { ++ duplicates = [] ++ for (const dupe of report.duplicates) { ++ if (isInChanges(changes, dupe)) { ++ duplicates.push(dupe) ++ } ++ } ++ return duplicates ++} ++ ++async function main() { ++ const rawDiffPath = process.argv[2] ++ const jscpdReportPath = process.argv[3] ++ const changes = await parseDiff(rawDiffPath) ++ const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8')) ++ const filteredDuplicates = filterDuplicates(jscpdReport, changes) ++ ++ console.log(filteredDuplicates) ++ console.log('%s files changes', changes.size) ++ console.log('%s duplicates found', filteredDuplicates.length) ++ if (filteredDuplicates.length > 0) { ++ process.exit(1) ++ } ++} ++ ++void main() From 5ef59ca27869dd915ff48b126ce1320f317866d7 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:29:29 -0500 Subject: [PATCH 113/202] build(lint): enable `no-array-for-each` #6281 ## Problem Many bugs, and confusing behavior stem from developers using an async function within a forEach. This is almost always not desired. Additionally, `forEach` can lead to bloated implementations when other methods like `some`, `find`, `reduce`, or `flatMap` are more applicable. According to https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/no-array-for-each.md It is also faster with `for ... of`. ## Solution - Add lint rule: https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/no-array-for-each.md - Migrate existing cases with `eslint CLI --fix` (75% of cases). - For remaining cases, mark as exception. --- .eslintrc.js | 2 + .../controller/inlineChatController.ts | 4 +- .../src/inlineChat/output/computeDiff.ts | 7 +- .../amazonq/test/e2e/amazonq/explore.test.ts | 4 +- .../amazonq/test/e2e/amazonq/welcome.test.ts | 4 +- .../service/keyStrokeHandler.test.ts | 4 +- .../util/crossFileContextUtil.test.ts | 16 ++--- .../codewhisperer/util/editorContext.test.ts | 4 +- .../util/runtimeLanguageContext.test.ts | 12 ++-- .../util/securityScanLanguageContext.test.ts | 4 +- packages/amazonq/test/web/testRunner.ts | 1 + .../scripts/build/generateServiceClient.ts | 8 +-- packages/core/scripts/lint/testLint.ts | 4 +- .../commons/controllers/contentController.ts | 4 +- packages/core/src/amazonq/commons/diff.ts | 4 +- .../core/src/amazonq/lsp/lspController.ts | 34 ++++----- packages/core/src/amazonq/webview/ui/main.ts | 4 +- .../webview/ui/quickActions/handler.ts | 8 +-- packages/core/src/amazonqDoc/app.ts | 4 +- packages/core/src/amazonqFeatureDev/app.ts | 4 +- .../chat/controller/messenger/messenger.ts | 12 ++-- .../amazonqTest/chat/controller/controller.ts | 8 +-- .../applicationcomposer/composerWebview.ts | 4 +- .../src/auth/credentials/sharedCredentials.ts | 4 +- .../core/src/auth/credentials/validation.ts | 6 +- packages/core/src/auth/sso/cache.ts | 4 +- packages/core/src/auth/sso/server.ts | 4 +- .../accessanalyzer/vue/iamPolicyChecks.ts | 6 ++ .../appBuilder/explorer/detectSamProjects.ts | 4 +- .../wizards/templateParametersWizard.ts | 4 +- .../src/awsService/apprunner/activation.ts | 4 +- .../apprunner/explorer/apprunnerNode.ts | 2 + .../cdk/explorer/detectCdkProjects.ts | 4 +- .../cloudWatchLogs/commands/tailLogGroup.ts | 15 ++-- .../document/logStreamsCodeLensProvider.ts | 4 +- .../core/src/awsService/ec2/activation.ts | 1 + .../awsService/ec2/remoteSessionManager.ts | 1 + packages/core/src/awsexplorer/toolView.ts | 4 +- packages/core/src/codecatalyst/explorer.ts | 4 +- .../codecatalyst/wizards/devenvSettings.ts | 4 +- packages/core/src/codewhisperer/activation.ts | 4 +- .../src/codewhisperer/client/codewhisperer.ts | 8 +-- .../codewhisperer/commands/basicCommands.ts | 72 ++++++++++--------- .../service/completionProvider.ts | 4 +- .../service/diagnosticsProvider.ts | 54 +++++++------- .../service/importAdderProvider.ts | 1 + .../service/recommendationHandler.ts | 24 +++---- .../service/securityScanHandler.ts | 16 ++--- .../transformByQ/transformApiHandler.ts | 19 +++-- .../transformByQ/transformFileHandler.ts | 2 + .../transformationResultsViewProvider.ts | 12 ++-- .../codewhispererCodeCoverageTracker.ts | 4 +- .../core/src/codewhisperer/util/authUtil.ts | 4 +- .../codewhisperer/util/closingBracketUtil.ts | 4 +- .../codewhisperer/util/customizationUtil.ts | 10 +-- .../src/codewhisperer/util/editorContext.ts | 4 +- .../src/codewhisperer/util/licenseUtil.ts | 10 +-- .../util/supplementalContext/rankBm25.ts | 38 +++++----- .../src/codewhisperer/util/telemetryHelper.ts | 4 +- .../core/src/codewhisperer/util/zipUtil.ts | 9 ++- .../views/securityPanelViewProvider.ts | 37 +++++----- .../controllers/chat/chatRequest/converter.ts | 30 ++++---- .../controllers/chat/controller.ts | 4 +- .../src/codewhispererChat/editor/codelens.ts | 4 +- .../editor/context/file/fileExtractor.ts | 10 +-- .../storages/triggerEvents.ts | 1 + .../commands/downloadSchemaItemCode.ts | 4 +- .../src/eventSchemas/vue/searchSchemas.ts | 4 +- packages/core/src/extensionNode.ts | 21 +++--- .../src/lambda/commands/createNewSamApp.ts | 4 +- .../vue/configEditor/samInvokeFrontend.ts | 4 +- .../src/lambda/wizards/samDeployWizard.ts | 4 +- .../webview/vue/toolkit/backend_toolkit.ts | 4 +- packages/core/src/shared/awsClientBuilder.ts | 4 +- .../core/src/shared/codelens/codeLensUtils.ts | 4 +- .../src/shared/codelens/goCodeLensProvider.ts | 1 + .../defaultCredentialSelectionDataProvider.ts | 8 +-- .../core/src/shared/extensionUtilities.ts | 12 ++-- packages/core/src/shared/extensions/git.ts | 21 ++++-- packages/core/src/shared/featureConfig.ts | 17 ++--- .../shared/multiStepInputFlowController.ts | 8 ++- .../core/src/shared/regions/regionProvider.ts | 16 ++--- packages/core/src/shared/remoteSession.ts | 4 +- .../src/shared/sam/debugger/csharpSamDebug.ts | 4 +- .../treeview/resourceTreeDataProvider.ts | 18 ++++- .../shared/typescriptLambdaHandlerSearch.ts | 8 +-- packages/core/src/shared/ui/input.ts | 4 +- packages/core/src/shared/ui/inputPrompter.ts | 4 +- packages/core/src/shared/ui/picker.ts | 4 +- packages/core/src/shared/ui/pickerPrompter.ts | 4 +- .../src/shared/utilities/collectionUtils.ts | 4 +- .../core/src/shared/utilities/diffUtils.ts | 1 + .../src/shared/utilities/editorUtilities.ts | 8 +-- .../src/shared/utilities/streamUtilities.ts | 4 +- packages/core/src/shared/vscode/commands2.ts | 12 ++-- packages/core/src/shared/wizards/wizard.ts | 12 ++-- .../core/src/shared/wizards/wizardForm.ts | 8 +-- .../ssmDocument/commands/openDocumentItem.ts | 4 +- .../commands/updateDocumentVersion.ts | 4 +- .../ssmDocument/explorer/registryItemNode.ts | 4 +- .../core/src/stepFunctions/asl/aslServer.ts | 5 +- .../visualizeStateMachine/aslVisualization.ts | 4 +- .../controllers/chat/controller.test.ts | 8 +-- .../accessanalyzer/iamPolicyChecks.test.ts | 8 +-- .../explorer/apiGatewayNodes.test.ts | 4 +- .../commands/tailLogGroup.test.ts | 8 ++- .../explorer/cloudWatchLogsNode.test.ts | 8 ++- .../ec2/explorer/ec2ParentNode.test.ts | 5 +- .../src/test/awsService/ecr/utils.test.ts | 4 +- .../s3/commands/createFolder.test.ts | 4 +- .../s3/util/validateBucketName.test.ts | 8 +-- .../commands/transformByQ.test.ts | 8 +-- .../codewhispererChat/editor/codelens.test.ts | 1 + .../sharedCredentialsProvider.test.ts | 4 +- .../sso/ssoAccessTokenProvider.test.ts | 1 + .../core/src/test/credentials/utils.test.ts | 12 ++-- .../explorer/moreResourcesNode.test.ts | 8 +-- .../explorer/resourceTypeNode.test.ts | 16 +++-- .../model/schemaCodeGenUtils.test.ts | 4 +- .../commands/submitFeedbackListener.test.ts | 4 +- .../lambda/commands/listSamResources.test.ts | 1 + .../explorer/cloudFormationNodes.test.ts | 12 ++-- .../test/lambda/explorer/lambdaNodes.test.ts | 8 +-- .../lambda/models/samLambdaRuntime.test.ts | 16 ++--- .../test/lambda/models/samTemplates.test.ts | 4 +- .../test/lambda/vue/samInvokeBackend.test.ts | 8 +-- .../src/test/notifications/rendering.test.ts | 4 +- .../explorer/nodes/deployedNode.test.ts | 4 +- .../explorer/nodes/propertyNode.test.ts | 4 +- .../codelens/csharpCodeLensProvider.test.ts | 4 +- .../codelens/javaCodeLensProvider.test.ts | 4 +- .../codelens/pythonCodeLensProvider.test.ts | 8 +-- .../src/test/shared/crashMonitoring.test.ts | 10 ++- .../credentials/userCredentialsUtils.test.ts | 4 +- packages/core/src/test/shared/errors.test.ts | 4 +- packages/core/src/test/shared/fs/fs.test.ts | 10 +-- .../core/src/test/shared/globalState.test.ts | 8 +-- .../shared/logger/consoleLogLogger.test.ts | 4 +- .../test/shared/logger/toolkitLogger.test.ts | 12 ++-- .../test/shared/sam/cli/samCliInfo.test.ts | 4 +- .../cli/samCliValidationNotification.test.ts | 4 +- .../shared/sam/cli/samCliValidator.test.ts | 12 ++-- .../sam/cli/testSamCliProcessInvoker.ts | 4 +- .../core/src/test/shared/sam/deploy.test.ts | 4 +- .../core/src/test/shared/sam/samTestUtils.ts | 4 +- .../core/src/test/shared/sam/sync.test.ts | 8 +-- .../core/src/test/shared/sam/utils.test.ts | 8 +-- .../core/src/test/shared/settings.test.ts | 16 ++--- .../test/shared/telemetry/activation.test.ts | 4 +- .../src/test/shared/telemetry/util.test.ts | 8 +-- .../src/test/shared/ui/inputPrompter.test.ts | 4 +- .../src/test/shared/ui/pickerPrompter.test.ts | 4 +- .../shared/ui/prompters/regionSubmenu.test.ts | 4 +- .../shared/utilities/asyncCollection.test.ts | 8 ++- .../shared/utilities/textUtilities.test.ts | 8 +-- .../core/src/test/shared/vscode/env.test.ts | 4 +- .../core/src/test/shared/vscode/quickInput.ts | 16 +++-- .../core/src/test/shared/vscode/window.ts | 1 + .../shared/wizards/compositWizard.test.ts | 8 +-- .../src/test/shared/wizards/prompterTester.ts | 12 ++-- .../src/test/shared/wizards/wizard.test.ts | 24 +++++-- .../explorer/documentTypeNode.test.ts | 4 +- .../explorer/registryItemNode.test.ts | 4 +- .../explorer/ssmDocumentNode.test.ts | 4 +- .../util/validateDocumentName.test.ts | 8 +-- .../explorer/stepFunctionNodes.test.ts | 4 +- packages/core/src/test/testRunner.ts | 8 ++- packages/core/src/test/testUtil.ts | 6 +- .../src/testE2E/codecatalyst/client.test.ts | 4 +- .../appBuilder/sidebar/appBuilderNode.test.ts | 4 +- .../testInteg/appBuilder/walkthrough.test.ts | 4 +- packages/core/src/testInteg/sam.test.ts | 4 +- .../shared/utilities/workspaceUtils.test.ts | 4 +- packages/core/src/testLint/gitSecrets.test.ts | 8 +-- .../threatComposer/threatComposerEditor.ts | 4 +- packages/core/src/webviews/client.ts | 4 +- packages/core/src/webviews/mixins/saveData.ts | 8 +-- packages/toolkit/src/api.ts | 1 + .../lib/rules/no-incorrect-once-usage.ts | 13 ++-- .../rules/no-string-exec-for-child-process.ts | 4 +- 180 files changed, 777 insertions(+), 616 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b3e5e39dc9f..c7fc4cd9c13 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -158,6 +158,8 @@ module.exports = { 'unicorn/prefer-reflect-apply': 'error', 'unicorn/prefer-string-trim-start-end': 'error', 'unicorn/prefer-type-error': 'error', + // Discourage `.forEach` because it can lead to accidental, incorrect use of async callbacks. + 'unicorn/no-array-for-each': 'error', 'security-node/detect-child-process': 'error', 'header/header': [ diff --git a/packages/amazonq/src/inlineChat/controller/inlineChatController.ts b/packages/amazonq/src/inlineChat/controller/inlineChatController.ts index ce0df6a0878..4ffa6e1e1de 100644 --- a/packages/amazonq/src/inlineChat/controller/inlineChatController.ts +++ b/packages/amazonq/src/inlineChat/controller/inlineChatController.ts @@ -156,7 +156,9 @@ export class InlineChatController { } private async reset() { - this.listeners.forEach((listener) => listener.dispose()) + for (const listener of this.listeners) { + listener.dispose() + } this.listeners = [] this.task = undefined diff --git a/packages/amazonq/src/inlineChat/output/computeDiff.ts b/packages/amazonq/src/inlineChat/output/computeDiff.ts index 9b599b2eff3..a17a7914cf6 100644 --- a/packages/amazonq/src/inlineChat/output/computeDiff.ts +++ b/packages/amazonq/src/inlineChat/output/computeDiff.ts @@ -2,7 +2,7 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import { type LinesOptions, diffLines, Change } from 'diff' +import { type LinesOptions, diffLines } from 'diff' import * as vscode from 'vscode' import { InlineTask, TextDiff } from '../controller/inlineTask' @@ -24,8 +24,7 @@ export function computeDiff(response: string, inlineTask: InlineTask, isPartialD const textDiff: TextDiff[] = [] let startLine = selectedRange.start.line - - diffs.forEach((part: Change) => { + for (const part of diffs) { const count = part.count ?? 0 if (part.removed) { if (part.value !== '\n') { @@ -49,7 +48,7 @@ export function computeDiff(response: string, inlineTask: InlineTask, isPartialD } } startLine += count - }) + } inlineTask.diff = textDiff return textDiff } diff --git a/packages/amazonq/test/e2e/amazonq/explore.test.ts b/packages/amazonq/test/e2e/amazonq/explore.test.ts index 6833849617d..970d93d00bb 100644 --- a/packages/amazonq/test/e2e/amazonq/explore.test.ts +++ b/packages/amazonq/test/e2e/amazonq/explore.test.ts @@ -36,10 +36,10 @@ describe('Amazon Q Explore page', function () { it('should have correct button IDs', async () => { const features = ['featuredev', 'testgen', 'doc', 'review', 'gumby'] - features.forEach((feature, index) => { + for (const [index, feature] of features.entries()) { const buttons = (tab.getStore().chatItems ?? [])[index].buttons ?? [] assert.deepStrictEqual(buttons[0].id, `user-guide-${feature}`) assert.deepStrictEqual(buttons[1].id, `quick-start-${feature}`) - }) + } }) }) diff --git a/packages/amazonq/test/e2e/amazonq/welcome.test.ts b/packages/amazonq/test/e2e/amazonq/welcome.test.ts index 1e15d13381a..59ba7e728f2 100644 --- a/packages/amazonq/test/e2e/amazonq/welcome.test.ts +++ b/packages/amazonq/test/e2e/amazonq/welcome.test.ts @@ -51,11 +51,11 @@ describe('Amazon Q Welcome page', function () { framework.createTab() let welcomeCount = 0 - framework.getTabs().forEach((tab) => { + for (const tab of framework.getTabs()) { if (tab.getStore().tabTitle === 'Welcome to Q') { welcomeCount++ } - }) + } // 3 welcome tabs assert.deepStrictEqual(welcomeCount, 3) diff --git a/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts index 075dc769b0e..4b6a5291f22 100644 --- a/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts @@ -212,7 +212,7 @@ describe('keyStrokeHandler', function () { ['function suggestedByIntelliSense():', DocumentChangedSource.Unknown], ] - cases.forEach((tuple) => { + for (const tuple of cases) { const input = tuple[0] const expected = tuple[1] it(`test input ${input} should return ${expected}`, function () { @@ -221,7 +221,7 @@ describe('keyStrokeHandler', function () { ).checkChangeSource() assert.strictEqual(actual, expected) }) - }) + } function createFakeDocumentChangeEvent(str: string): ReadonlyArray { return [ diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts index 75825232d7c..8f54a43bf52 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts @@ -251,11 +251,11 @@ describe('crossFileContextUtil', function () { const actual = await crossFile.getCrossFileCandidates(editor) assert.ok(actual.length === 5) - actual.forEach((actualFile, index) => { + for (const [index, actualFile] of actual.entries()) { const expectedFile = path.join(tempFolder, expectedFilePaths[index]) assert.strictEqual(normalize(expectedFile), normalize(actualFile)) assert.ok(areEqual(tempFolder, actualFile, expectedFile)) - }) + } }) }) @@ -274,7 +274,7 @@ describe('crossFileContextUtil', function () { await closeAllEditors() }) - fileExtLists.forEach((fileExt) => { + for (const fileExt of fileExtLists) { it('should be empty if userGroup is control', async function () { const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder) await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false }) @@ -287,7 +287,7 @@ describe('crossFileContextUtil', function () { assert.ok(actual && actual.supplementalContextItems.length === 0) }) - }) + } }) describe.skip('partial support - crossfile group', function () { @@ -305,7 +305,7 @@ describe('crossFileContextUtil', function () { await closeAllEditors() }) - fileExtLists.forEach((fileExt) => { + for (const fileExt of fileExtLists) { it('should be non empty if usergroup is Crossfile', async function () { const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder) await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false }) @@ -318,7 +318,7 @@ describe('crossFileContextUtil', function () { assert.ok(actual && actual.supplementalContextItems.length !== 0) }) - }) + } }) describe('full support', function () { @@ -337,7 +337,7 @@ describe('crossFileContextUtil', function () { await closeAllEditors() }) - fileExtLists.forEach((fileExt) => { + for (const fileExt of fileExtLists) { it(`supplemental context for file ${fileExt} should be non empty`, async function () { sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control') sinon @@ -361,7 +361,7 @@ describe('crossFileContextUtil', function () { assert.ok(actual && actual.supplementalContextItems.length !== 0) }) - }) + } }) describe('splitFileToChunks', function () { diff --git a/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts index 22be4199375..d5085e4db0c 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts @@ -95,12 +95,12 @@ describe('editorContext', function () { ['c', 'c'], ]) - languageToExtension.forEach((extension, language) => { + for (const [language, extension] of languageToExtension.entries()) { const editor = createMockTextEditor('', 'test.ipynb', language, 1, 17) const actual = EditorContext.getFileRelativePath(editor) const expected = 'test.' + extension assert.strictEqual(actual, expected) - }) + } }) it('Should return relative path', async function () { diff --git a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts index 653505d6cf9..9cf61920861 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts @@ -52,7 +52,7 @@ describe('runtimeLanguageContext', function () { await resetCodeWhispererGlobalVariables() }) - cases.forEach((tuple) => { + for (const tuple of cases) { const languageId = tuple[0] const expected = tuple[1] @@ -60,7 +60,7 @@ describe('runtimeLanguageContext', function () { const actual = languageContext.isLanguageSupported(languageId) assert.strictEqual(actual, expected) }) - }) + } describe('test isLanguageSupported with document as the argument', function () { const cases: [string, boolean][] = [ @@ -105,7 +105,7 @@ describe('runtimeLanguageContext', function () { ['helloFoo.foo', false], ] - cases.forEach((tuple) => { + for (const tuple of cases) { const fileName = tuple[0] const expected = tuple[1] @@ -114,7 +114,7 @@ describe('runtimeLanguageContext', function () { const actual = languageContext.isLanguageSupported(doc) assert.strictEqual(actual, expected) }) - }) + } }) }) @@ -148,14 +148,14 @@ describe('runtimeLanguageContext', function () { [undefined, 'plaintext'], ] - cases.forEach((tuple) => { + for (const tuple of cases) { const vscLanguageId = tuple[0] const expectedCwsprLanguageId = tuple[1] it(`given vscLanguage ${vscLanguageId} should return ${expectedCwsprLanguageId}`, function () { const result = runtimeLanguageContext.getLanguageContext(vscLanguageId) assert.strictEqual(result.language as string, expectedCwsprLanguageId) }) - }) + } }) describe('normalizeLanguage', function () { diff --git a/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts index cb0a51fdad8..e1d2cf91189 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts @@ -51,7 +51,7 @@ describe('securityScanLanguageContext', function () { await resetCodeWhispererGlobalVariables() }) - cases.forEach((tuple) => { + for (const tuple of cases) { const languageId = tuple[0] const expected = tuple[1] @@ -59,7 +59,7 @@ describe('securityScanLanguageContext', function () { const actual = languageContext.isLanguageSupported(languageId) assert.strictEqual(actual, expected) }) - }) + } }) describe('normalizeLanguage', function () { diff --git a/packages/amazonq/test/web/testRunner.ts b/packages/amazonq/test/web/testRunner.ts index a2c8f8e90cc..1d0726be98b 100644 --- a/packages/amazonq/test/web/testRunner.ts +++ b/packages/amazonq/test/web/testRunner.ts @@ -35,6 +35,7 @@ function setupMocha() { function gatherTestFiles() { // Bundles all files in the current directory matching `*.test` + // eslint-disable-next-line unicorn/no-array-for-each const importAll = (r: __WebpackModuleApi.RequireContext) => r.keys().forEach(r) importAll(require.context('.', true, /\.test$/)) } diff --git a/packages/core/scripts/build/generateServiceClient.ts b/packages/core/scripts/build/generateServiceClient.ts index 4c6fb730b19..7ef217be21b 100644 --- a/packages/core/scripts/build/generateServiceClient.ts +++ b/packages/core/scripts/build/generateServiceClient.ts @@ -106,7 +106,7 @@ async function insertServiceClientsIntoJsSdk( jsSdkPath: string, serviceClientDefinitions: ServiceClientDefinition[] ): Promise { - serviceClientDefinitions.forEach((serviceClientDefinition) => { + for (const serviceClientDefinition of serviceClientDefinitions) { const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath) // Copy the Service Json into the JS SDK for generation @@ -116,7 +116,7 @@ async function insertServiceClientsIntoJsSdk( `${serviceClientDefinition.serviceName.toLowerCase()}-${apiVersion}.normal.json` ) nodefs.copyFileSync(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath) - }) + } const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json') await patchServicesIntoApiMetadata( @@ -151,9 +151,9 @@ async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceName const apiMetadataJson = nodefs.readFileSync(apiMetadataPath).toString() const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata - serviceNames.forEach((serviceName) => { + for (const serviceName of serviceNames) { apiMetadata[serviceName.toLowerCase()] = { name: serviceName } - }) + } nodefs.writeFileSync(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4)) } diff --git a/packages/core/scripts/lint/testLint.ts b/packages/core/scripts/lint/testLint.ts index 43bafb6ae00..d215e57f675 100644 --- a/packages/core/scripts/lint/testLint.ts +++ b/packages/core/scripts/lint/testLint.ts @@ -12,9 +12,9 @@ void (async () => { const mocha = new Mocha() const testFiles = await glob('dist/src/testLint/**/*.test.js') - testFiles.forEach((file) => { + for (const file of testFiles) { mocha.addFile(file) - }) + } mocha.run((failures) => { const exitCode = failures ? 1 : 0 diff --git a/packages/core/src/amazonq/commons/controllers/contentController.ts b/packages/core/src/amazonq/commons/controllers/contentController.ts index 0af3b317025..cdf19fe86b4 100644 --- a/packages/core/src/amazonq/commons/controllers/contentController.ts +++ b/packages/core/src/amazonq/commons/controllers/contentController.ts @@ -50,13 +50,13 @@ export class EditorContentController { indent = ' '.repeat(indent.length - indent.trimStart().length) } let textWithIndent = '' - text.split('\n').forEach((line, index) => { + for (const [index, line] of text.split('\n').entries()) { if (index === 0) { textWithIndent += line } else { textWithIndent += '\n' + indent + line } - }) + } editor .edit((editBuilder) => { editBuilder.insert(cursorStart, textWithIndent) diff --git a/packages/core/src/amazonq/commons/diff.ts b/packages/core/src/amazonq/commons/diff.ts index beb45d88096..ed6642b9192 100644 --- a/packages/core/src/amazonq/commons/diff.ts +++ b/packages/core/src/amazonq/commons/diff.ts @@ -46,7 +46,7 @@ export async function computeDiff(leftPath: string, rightPath: string, tabId: st let charsRemoved = 0 let linesAdded = 0 let linesRemoved = 0 - changes.forEach((change) => { + for (const change of changes) { const lines = change.value.split('\n') const charCount = lines.reduce((sum, line) => sum + line.length, 0) const lineCount = change.count ?? lines.length - 1 // ignoring end-of-file empty line @@ -57,6 +57,6 @@ export async function computeDiff(leftPath: string, rightPath: string, tabId: st charsRemoved += charCount linesRemoved += lineCount } - }) + } return { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } } diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts index bb5cc88f5a2..d3f8960d1fc 100644 --- a/packages/core/src/amazonq/lsp/lspController.ts +++ b/packages/core/src/amazonq/lsp/lspController.ts @@ -280,23 +280,25 @@ export class LspController { async query(s: string): Promise { const chunks: Chunk[] | undefined = await LspClient.instance.queryVectorIndex(s) const resp: RelevantTextDocument[] = [] - chunks?.forEach((chunk) => { - const text = chunk.context ? chunk.context : chunk.content - if (chunk.programmingLanguage && chunk.programmingLanguage !== 'unknown') { - resp.push({ - text: text, - relativeFilePath: chunk.relativePath ? chunk.relativePath : path.basename(chunk.filePath), - programmingLanguage: { - languageName: chunk.programmingLanguage, - }, - }) - } else { - resp.push({ - text: text, - relativeFilePath: chunk.relativePath ? chunk.relativePath : path.basename(chunk.filePath), - }) + if (chunks) { + for (const chunk of chunks) { + const text = chunk.context ? chunk.context : chunk.content + if (chunk.programmingLanguage && chunk.programmingLanguage !== 'unknown') { + resp.push({ + text: text, + relativeFilePath: chunk.relativePath ? chunk.relativePath : path.basename(chunk.filePath), + programmingLanguage: { + languageName: chunk.programmingLanguage, + }, + }) + } else { + resp.push({ + text: text, + relativeFilePath: chunk.relativePath ? chunk.relativePath : path.basename(chunk.filePath), + }) + } } - }) + } return resp } diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts index 78ae17aef95..d056871bda2 100644 --- a/packages/core/src/amazonq/webview/ui/main.ts +++ b/packages/core/src/amazonq/webview/ui/main.ts @@ -663,10 +663,10 @@ export const createMynahUI = ( ideApi.postMessage(createClickTelemetry('amazonq-disclaimer-acknowledge-button')) // remove all disclaimer cards from all tabs - Object.keys(mynahUI.getAllTabs()).forEach((storeTabKey) => { + for (const storeTabKey of Object.keys(mynahUI.getAllTabs())) { // eslint-disable-next-line unicorn/no-null mynahUI.updateStore(storeTabKey, { promptInputStickyCard: null }) - }) + } return } case 'quick-start': { diff --git a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts index 78ef3d0e7ec..221fb4e53b6 100644 --- a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts +++ b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts @@ -109,11 +109,11 @@ export class QuickActionHandler { } let scanTabId: string | undefined = undefined - this.tabsStorage.getTabs().forEach((tab) => { + for (const tab of this.tabsStorage.getTabs()) { if (tab.type === 'review') { scanTabId = tab.id } - }) + } if (scanTabId !== undefined) { this.mynahUI.selectTab(scanTabId, eventId || '') @@ -292,11 +292,11 @@ export class QuickActionHandler { let gumbyTabId: string | undefined = undefined - this.tabsStorage.getTabs().forEach((tab) => { + for (const tab of this.tabsStorage.getTabs()) { if (tab.type === 'gumby') { gumbyTabId = tab.id } - }) + } if (gumbyTabId !== undefined) { this.mynahUI.selectTab(gumbyTabId, eventId || '') diff --git a/packages/core/src/amazonqDoc/app.ts b/packages/core/src/amazonqDoc/app.ts index 4aba1b9e9bc..1847da2e168 100644 --- a/packages/core/src/amazonqDoc/app.ts +++ b/packages/core/src/amazonqDoc/app.ts @@ -89,7 +89,9 @@ export function init(appContext: AmazonQAppInitContext) { authenticatingSessionIDs = authenticatingSessions.map((session: any) => session.tabID) // We've already authenticated these sessions - authenticatingSessions.forEach((session: any) => (session.isAuthenticating = false)) + for (const session of authenticatingSessions) { + session.isAuthenticating = false + } } messenger.sendAuthenticationUpdate(authenticated, authenticatingSessionIDs) diff --git a/packages/core/src/amazonqFeatureDev/app.ts b/packages/core/src/amazonqFeatureDev/app.ts index 99164f417be..a72851e8ac7 100644 --- a/packages/core/src/amazonqFeatureDev/app.ts +++ b/packages/core/src/amazonqFeatureDev/app.ts @@ -95,7 +95,9 @@ export function init(appContext: AmazonQAppInitContext) { authenticatingSessionIDs = authenticatingSessions.map((session) => session.tabID) // We've already authenticated these sessions - authenticatingSessions.forEach((session) => (session.isAuthenticating = false)) + for (const session of authenticatingSessions) { + session.isAuthenticating = false + } } messenger.sendAuthenticationUpdate(authenticated, authenticatingSessionIDs) diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts index 3d947b8caff..5ee48f0e824 100644 --- a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts @@ -197,13 +197,13 @@ export class Messenger { const projectFormOptions: { value: any; label: string }[] = [] const detectedJavaVersions = new Array() - projects.forEach((candidateProject) => { + for (const candidateProject of projects) { projectFormOptions.push({ value: candidateProject.path, label: candidateProject.name, }) detectedJavaVersions.push(candidateProject.JDKVersion) - }) + } const formItems: ChatItemFormItem[] = [] formItems.push({ @@ -279,12 +279,12 @@ export class Messenger { public async sendSQLConversionProjectPrompt(projects: TransformationCandidateProject[], tabID: string) { const projectFormOptions: { value: any; label: string }[] = [] - projects.forEach((candidateProject) => { + for (const candidateProject of projects) { projectFormOptions.push({ value: candidateProject.path, label: candidateProject.name, }) - }) + } const formItems: ChatItemFormItem[] = [] formItems.push({ @@ -661,12 +661,12 @@ ${codeSnippet} const valueFormOptions: { value: any; label: string }[] = [] - versions.allVersions.forEach((version) => { + for (const version of versions.allVersions) { valueFormOptions.push({ value: version, label: version, }) - }) + } const formItems: ChatItemFormItem[] = [] formItems.push({ diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 79d4d117057..8c99e7a2dcb 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -667,7 +667,7 @@ export class TestController { const fileName = path.basename(session.generatedFilePath) const time = new Date().toLocaleString() // TODO: this is duplicated in basicCommands.ts for scan (codewhisperer). Fix this later. - session.references.forEach((reference) => { + for (const reference of session.references) { getLogger().debug('Processing reference: %O', reference) // Log values for debugging getLogger().debug('updatedContent: %s', updatedContent) @@ -702,7 +702,7 @@ export class TestController { '
' getLogger().debug('Adding reference log: %s', referenceLog) ReferenceLogViewProvider.instance.addReferenceLog(referenceLog) - }) + } // TODO: see if there's a better way to check if active file is a diff if (vscode.window.tabGroups.activeTabGroup.activeTab?.label.includes(amazonQTabSuffix)) { @@ -1241,7 +1241,7 @@ export class TestController { groupName ) if (session.listOfTestGenerationJobId.length && groupName) { - session.listOfTestGenerationJobId.forEach((id) => { + for (const id of session.listOfTestGenerationJobId) { if (id === session.acceptedJobId) { TelemetryHelper.instance.sendTestGenerationEvent( groupName, @@ -1267,7 +1267,7 @@ export class TestController { 0 ) } - }) + } } session.listOfTestGenerationJobId = [] session.testGenerationJobGroupName = undefined diff --git a/packages/core/src/applicationcomposer/composerWebview.ts b/packages/core/src/applicationcomposer/composerWebview.ts index 94493091c3a..f43775df3c7 100644 --- a/packages/core/src/applicationcomposer/composerWebview.ts +++ b/packages/core/src/applicationcomposer/composerWebview.ts @@ -104,9 +104,9 @@ export class ApplicationComposer { } this.isPanelDisposed = true this.onVisualizationDisposeEmitter.fire() - this.disposables.forEach((disposable) => { + for (const disposable of this.disposables) { disposable.dispose() - }) + } this.onVisualizationDisposeEmitter.dispose() } diff --git a/packages/core/src/auth/credentials/sharedCredentials.ts b/packages/core/src/auth/credentials/sharedCredentials.ts index 1b7ea038653..b78c0d53251 100644 --- a/packages/core/src/auth/credentials/sharedCredentials.ts +++ b/packages/core/src/auth/credentials/sharedCredentials.ts @@ -176,7 +176,7 @@ export function mergeAndValidateSections(data: BaseSection[]): ParseResult { export function parseIni(iniData: string, source: vscode.Uri): BaseSection[] { const sections = [] as BaseSection[] const lines = iniData.split(/\r?\n/).map((l) => l.split(/(^|\s)[;#]/)[0]) // remove comments - lines.forEach((line, lineNumber) => { + for (const [lineNumber, line] of lines.entries()) { const section = line.match(/^\s*\[([^\[\]]+)]\s*$/) const currentSection: BaseSection | undefined = sections[sections.length - 1] if (section) { @@ -195,7 +195,7 @@ export function parseIni(iniData: string, source: vscode.Uri): BaseSection[] { }) } } - }) + } return sections } diff --git a/packages/core/src/auth/credentials/validation.ts b/packages/core/src/auth/credentials/validation.ts index e1bee0b8c08..a82eb26a36a 100644 --- a/packages/core/src/auth/credentials/validation.ts +++ b/packages/core/src/auth/credentials/validation.ts @@ -36,12 +36,12 @@ export function getCredentialsErrors( validateFunc: GetCredentialError = getCredentialError ): CredentialsErrors | undefined { const errors: CredentialsData = {} - Object.entries(data).forEach(([key, value]) => { + for (const [key, value] of Object.entries(data)) { if (!isCredentialsKey(key)) { - return + continue } errors[key] = validateFunc(key, value) - }) + } const hasErrors = Object.values(errors).some(Boolean) if (!hasErrors) { diff --git a/packages/core/src/auth/sso/cache.ts b/packages/core/src/auth/sso/cache.ts index a9cdfa43ce0..7d43c07da35 100644 --- a/packages/core/src/auth/sso/cache.ts +++ b/packages/core/src/auth/sso/cache.ts @@ -149,7 +149,9 @@ function getRegistrationCacheFile(ssoCacheDir: string, key: RegistrationKey): st const hash = (startUrl: string, scopes: string[]) => { const shasum = crypto.createHash('sha256') shasum.update(startUrl) - scopes.forEach((s) => shasum.update(s)) + for (const s of scopes) { + shasum.update(s) + } return shasum.digest('hex') } diff --git a/packages/core/src/auth/sso/server.ts b/packages/core/src/auth/sso/server.ts index 7c95b5ce016..cf25c1456d5 100644 --- a/packages/core/src/auth/sso/server.ts +++ b/packages/core/src/auth/sso/server.ts @@ -163,9 +163,9 @@ export class AuthSSOServer { getLogger().debug('AuthSSOServer: Attempting to close server.') - this.connections.forEach((connection) => { + for (const connection of this.connections) { connection.destroy() - }) + } this.server.close((err) => { if (err) { diff --git a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts index da9c0738819..f6cc5e8cf18 100644 --- a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts +++ b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts @@ -203,6 +203,7 @@ export class IamPolicyChecksWebview extends VueWebview { span.record({ findingsCount: data.findings.length, }) + // eslint-disable-next-line unicorn/no-array-for-each data.findings.forEach((finding: AccessAnalyzer.ValidatePolicyFinding) => { const message = `${finding.findingType}: ${finding.issueCode} - ${finding.findingDetails} Learn more: ${finding.learnMoreLink}` if ((finding.findingType as ValidatePolicyFindingType) === 'ERROR') { @@ -616,10 +617,12 @@ export class IamPolicyChecksWebview extends VueWebview { getResultCssColor('Success'), ]) } else { + // eslint-disable-next-line unicorn/no-array-for-each jsonOutput.BlockingFindings.forEach((finding: any) => { this.pushValidatePolicyDiagnostic(diagnostics, finding, true) findingsCount++ }) + // eslint-disable-next-line unicorn/no-array-for-each jsonOutput.NonBlockingFindings.forEach((finding: any) => { this.pushValidatePolicyDiagnostic(diagnostics, finding, false) findingsCount++ @@ -682,11 +685,13 @@ export class IamPolicyChecksWebview extends VueWebview { getResultCssColor('Success'), ]) } else { + // eslint-disable-next-line unicorn/no-array-for-each jsonOutput.BlockingFindings.forEach((finding: any) => { this.pushCustomCheckDiagnostic(diagnostics, finding, true) errorMessage = getCheckNoNewAccessErrorMessage(finding) findingsCount++ }) + // eslint-disable-next-line unicorn/no-array-for-each jsonOutput.NonBlockingFindings.forEach((finding: any) => { this.pushCustomCheckDiagnostic(diagnostics, finding, false) findingsCount++ @@ -724,6 +729,7 @@ export class IamPolicyChecksWebview extends VueWebview { : finding.message const message = `${finding.findingType}: ${findingMessage} - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName}` if (finding.details.reasons) { + // eslint-disable-next-line unicorn/no-array-for-each finding.details.reasons.forEach((reason: any) => { diagnostics.push( new vscode.Diagnostic( diff --git a/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts b/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts index cb179d94f0d..f17bec9213a 100644 --- a/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts +++ b/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts @@ -21,7 +21,9 @@ export async function detectSamProjects(): Promise { [] ) - projects.forEach((p) => results.set(p.samTemplateUri.toString(), p)) + for (const p of projects) { + results.set(p.samTemplateUri.toString(), p) + } return Array.from(results.values()) } diff --git a/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts index 75c80c4eda9..9641562d6f0 100644 --- a/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts +++ b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts @@ -35,7 +35,7 @@ export class TemplateParametersWizard extends Wizard { this.preloadedTemplate = await CloudFormation.load(this.template.fsPath) const samTemplateNames = new Set(this.samTemplateParameters?.keys() ?? []) - samTemplateNames.forEach((name) => { + for (const name of samTemplateNames) { if (this.preloadedTemplate) { const defaultValue = this.preloadedTemplate.Parameters ? (this.preloadedTemplate.Parameters[name]?.Default as string) @@ -47,7 +47,7 @@ export class TemplateParametersWizard extends Wizard { }) ) } - }) + } return this } diff --git a/packages/core/src/awsService/apprunner/activation.ts b/packages/core/src/awsService/apprunner/activation.ts index 14cfb167f75..5b907d2b968 100644 --- a/packages/core/src/awsService/apprunner/activation.ts +++ b/packages/core/src/awsService/apprunner/activation.ts @@ -79,7 +79,7 @@ commandMap.set(['aws.apprunner.deleteService', deleteServiceFailed], deleteServi * Activates App Runner */ export async function activate(context: ExtContext): Promise { - commandMap.forEach((command, tuple) => { + for (const [tuple, command] of commandMap.entries()) { context.extensionContext.subscriptions.push( Commands.register(tuple[0], async (...args: any) => { try { @@ -90,5 +90,5 @@ export async function activate(context: ExtContext): Promise { } }) ) - }) + } } diff --git a/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts b/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts index 889f94a51cc..a2eabbe6d2d 100644 --- a/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts +++ b/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts @@ -58,6 +58,7 @@ export class AppRunnerNode extends AWSTreeNodeBase { while (true) { const next = await iterator.next() + // eslint-disable-next-line unicorn/no-array-for-each next.value.ServiceSummaryList.forEach((summary: AppRunner.Service) => services.push(summary)) if (next.done) { @@ -87,6 +88,7 @@ export class AppRunnerNode extends AWSTreeNodeBase { }) ) + // eslint-disable-next-line unicorn/no-array-for-each deletedNodeArns.forEach(this.deleteNode.bind(this)) } diff --git a/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts b/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts index 9a3fd363d1a..55f47f5938f 100644 --- a/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts +++ b/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts @@ -21,7 +21,9 @@ export async function detectCdkProjects( [] ) - projects.forEach((p) => results.set(p.cdkJsonUri.toString(), p)) + for (const p of projects) { + results.set(p.cdkJsonUri.toString(), p) + } return Array.from(results.values()) } diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts index 4aa1feb272a..c584a6147ce 100644 --- a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts +++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts @@ -77,7 +77,9 @@ export async function tailLogGroup( }) await handleSessionStream(stream, document, session) } finally { - disposables.forEach((disposable) => disposable.dispose()) + for (const disposable of disposables) { + disposable.dispose() + } } }) } @@ -138,6 +140,7 @@ async function handleSessionStream( // amount of new lines can push bottom of file out of view before scrolling. const editorsToScroll = getTextEditorsToScroll(document) await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines) + // eslint-disable-next-line unicorn/no-array-for-each editorsToScroll.forEach(scrollTextEditorToBottom) } session.eventRate = eventRate(event.sessionUpdate) @@ -200,9 +203,10 @@ async function updateTextDocumentWithNewLogEvents( maxLines: number ) { const edit = new vscode.WorkspaceEdit() - formattedLogEvents.forEach((formattedLogEvent) => + for (const formattedLogEvent of formattedLogEvents) { edit.insert(document.uri, new vscode.Position(document.lineCount, 0), formattedLogEvent) - ) + } + if (document.lineCount + formattedLogEvents.length > maxLines) { trimOldestLines(formattedLogEvents.length, maxLines, document, edit) } @@ -270,14 +274,15 @@ function closeSessionWhenAllEditorsClosed( function isLiveTailSessionOpenInAnyTab(liveTailSession: LiveTailSession) { let isOpen = false + // eslint-disable-next-line unicorn/no-array-for-each vscode.window.tabGroups.all.forEach(async (tabGroup) => { - tabGroup.tabs.forEach((tab) => { + for (const tab of tabGroup.tabs) { if (tab.input instanceof vscode.TabInputText) { if (liveTailSession.uri.toString() === tab.input.uri.toString()) { isOpen = true } } - }) + } }) return isOpen } diff --git a/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts index 9870ff009d2..9c6409d7318 100644 --- a/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts +++ b/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts @@ -50,9 +50,9 @@ export class LogStreamCodeLensProvider implements vscode.CodeLensProvider { const linesToGenerateCodeLens = await this.getStartingLineOfEachStreamId(document) // Create a code lens at the start of each Log Stream in the document - linesToGenerateCodeLens.forEach((idWithLine) => { + for (const idWithLine of linesToGenerateCodeLens) { codelenses.push(this.createLogStreamCodeLens(logGroupInfo, idWithLine)) - }) + } return codelenses } diff --git a/packages/core/src/awsService/ec2/activation.ts b/packages/core/src/awsService/ec2/activation.ts index f8881af8347..18660732754 100644 --- a/packages/core/src/awsService/ec2/activation.ts +++ b/packages/core/src/awsService/ec2/activation.ts @@ -83,5 +83,6 @@ export async function activate(ctx: ExtContext): Promise { } export async function deactivate(): Promise { + // eslint-disable-next-line unicorn/no-array-for-each connectionManagers.forEach(async (manager) => await manager.dispose()) } diff --git a/packages/core/src/awsService/ec2/remoteSessionManager.ts b/packages/core/src/awsService/ec2/remoteSessionManager.ts index 4c1843aabdb..4c5c8a665b8 100644 --- a/packages/core/src/awsService/ec2/remoteSessionManager.ts +++ b/packages/core/src/awsService/ec2/remoteSessionManager.ts @@ -31,6 +31,7 @@ export class Ec2SessionTracker extends Map implem } public async dispose(): Promise { + // eslint-disable-next-line unicorn/no-array-for-each this.forEach(async (_sessionId, instanceId) => await this.disconnectEnv(instanceId)) } diff --git a/packages/core/src/awsexplorer/toolView.ts b/packages/core/src/awsexplorer/toolView.ts index 6153e8a1ab3..e3417f25521 100644 --- a/packages/core/src/awsexplorer/toolView.ts +++ b/packages/core/src/awsexplorer/toolView.ts @@ -30,13 +30,13 @@ export function createToolView(viewNode: ToolView): vscode.TreeView { // Cloud9 will only refresh when refreshing the entire tree if (isCloud9()) { - viewNode.nodes.forEach((node) => { + for (const node of viewNode.nodes) { // Refreshes are delayed to guard against excessive calls to `getTreeItem` and `getChildren` // The 10ms delay is arbitrary. A single event loop may be good enough in many scenarios. const refresh = debounce(() => treeDataProvider.refresh(node), 10) node.onDidChangeTreeItem?.(() => refresh()) node.onDidChangeChildren?.(() => refresh()) - }) + } } return view diff --git a/packages/core/src/codecatalyst/explorer.ts b/packages/core/src/codecatalyst/explorer.ts index da41ceede27..a2239d41d89 100644 --- a/packages/core/src/codecatalyst/explorer.ts +++ b/packages/core/src/codecatalyst/explorer.ts @@ -141,7 +141,9 @@ export class CodeCatalystRootNode implements TreeNode { this.addRefreshEmitter(() => this.onDidChangeEmitter.fire()) this.authProvider.onDidChange(() => { - this.refreshEmitters.forEach((fire) => fire()) + for (const fire of this.refreshEmitters) { + fire() + } }) } diff --git a/packages/core/src/codecatalyst/wizards/devenvSettings.ts b/packages/core/src/codecatalyst/wizards/devenvSettings.ts index 590b936bfb2..676b65fb74c 100644 --- a/packages/core/src/codecatalyst/wizards/devenvSettings.ts +++ b/packages/core/src/codecatalyst/wizards/devenvSettings.ts @@ -50,7 +50,9 @@ export function getInstanceDescription(type: InstanceType): InstanceDescription export function getAllInstanceDescriptions(): { [key: string]: InstanceDescription } { const desc: { [key: string]: InstanceDescription } = {} - entries(devenvOptions.instanceType).forEach(([k]) => (desc[k] = getInstanceDescription(k))) + for (const [k] of entries(devenvOptions.instanceType)) { + desc[k] = getInstanceDescription(k) + } return desc } diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts index 4034c6397f4..474d8d68121 100644 --- a/packages/core/src/codewhisperer/activation.ts +++ b/packages/core/src/codewhisperer/activation.ts @@ -721,7 +721,9 @@ function toggleIssuesVisibility(visibleCondition: (issue: CodeScanIssue, filePat issues: group.issues.map((issue) => ({ ...issue, visible: visibleCondition(issue, group.filePath) })), })) securityScanRender.securityDiagnosticCollection?.clear() - updatedIssues.forEach((issue) => updateSecurityDiagnosticCollection(issue)) + for (const issue of updatedIssues) { + updateSecurityDiagnosticCollection(issue) + } SecurityIssueProvider.instance.issues = updatedIssues SecurityIssueTreeViewProvider.instance.refresh() } diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts index 02f8a5f2f52..69ec6ad1b34 100644 --- a/packages/core/src/codewhisperer/client/codewhisperer.ts +++ b/packages/core/src/codewhisperer/client/codewhisperer.ts @@ -232,14 +232,14 @@ export class DefaultCodeWhispererClient { .promise() .then((resps) => { let logStr = 'amazonq: listAvailableCustomizations API request:' - resps.forEach((resp) => { + for (const resp of resps) { const requestId = resp.$response.requestId logStr += `\n${indent('RequestID: ', 4)}${requestId},\n${indent('Customizations:', 4)}` - resp.customizations.forEach((c, index) => { + for (const [index, c] of resp.customizations.entries()) { const entry = `${index.toString().padStart(2, '0')}: ${c.name?.trim()}` logStr += `\n${indent(entry, 8)}` - }) - }) + } + } getLogger().debug(logStr) return resps }) diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts index 8ec54d02a2a..999c2c53ac5 100644 --- a/packages/core/src/codewhisperer/commands/basicCommands.ts +++ b/packages/core/src/codewhisperer/commands/basicCommands.ts @@ -489,42 +489,44 @@ export const applySecurityFix = Commands.declare( const fileName = path.basename(targetFilePath) const time = new Date().toLocaleString() // TODO: this is duplicated in controller.ts for test. Fix this later. - suggestedFix.references?.forEach((reference) => { - getLogger().debug('Processing reference: %O', reference) - // Log values for debugging - getLogger().debug('suggested fix code: %s', suggestedFix.code) - getLogger().debug('updated content: %s', updatedContent) - getLogger().debug( - 'start: %d, end: %d', - reference.recommendationContentSpan?.start, - reference.recommendationContentSpan?.end - ) - // given a start and end index, figure out which line number they belong to when splitting a string on /n characters - const getLineNumber = (content: string, index: number): number => { - const lines = content.slice(0, index).split('\n') - return lines.length + if (suggestedFix.references) { + for (const reference of suggestedFix.references) { + getLogger().debug('Processing reference: %O', reference) + // Log values for debugging + getLogger().debug('suggested fix code: %s', suggestedFix.code) + getLogger().debug('updated content: %s', updatedContent) + getLogger().debug( + 'start: %d, end: %d', + reference.recommendationContentSpan?.start, + reference.recommendationContentSpan?.end + ) + // given a start and end index, figure out which line number they belong to when splitting a string on /n characters + const getLineNumber = (content: string, index: number): number => { + const lines = content.slice(0, index).split('\n') + return lines.length + } + const startLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.start!) + const endLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.end!) + getLogger().debug('startLine: %d, endLine: %d', startLine, endLine) + const code = updatedContent.slice( + reference.recommendationContentSpan?.start, + reference.recommendationContentSpan?.end + ) + getLogger().debug('Extracted code slice: %s', code) + const referenceLog = + `[${time}] Accepted recommendation ` + + CodeWhispererConstants.referenceLogText( + `
${code}
`, + reference.licenseName!, + reference.repository!, + fileName, + startLine === endLine ? `(line at ${startLine})` : `(lines from ${startLine} to ${endLine})` + ) + + '
' + getLogger().debug('Adding reference log: %s', referenceLog) + ReferenceLogViewProvider.instance.addReferenceLog(referenceLog) } - const startLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.start!) - const endLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.end!) - getLogger().debug('startLine: %d, endLine: %d', startLine, endLine) - const code = updatedContent.slice( - reference.recommendationContentSpan?.start, - reference.recommendationContentSpan?.end - ) - getLogger().debug('Extracted code slice: %s', code) - const referenceLog = - `[${time}] Accepted recommendation ` + - CodeWhispererConstants.referenceLogText( - `
${code}
`, - reference.licenseName!, - reference.repository!, - fileName, - startLine === endLine ? `(line at ${startLine})` : `(lines from ${startLine} to ${endLine})` - ) + - '
' - getLogger().debug('Adding reference log: %s', referenceLog) - ReferenceLogViewProvider.instance.addReferenceLog(referenceLog) - }) + } removeDiagnostic(document.uri, targetIssue) SecurityIssueProvider.instance.removeIssue(document.uri, targetIssue) diff --git a/packages/core/src/codewhisperer/service/completionProvider.ts b/packages/core/src/codewhisperer/service/completionProvider.ts index 10b90372cb4..226d04dec2b 100644 --- a/packages/core/src/codewhisperer/service/completionProvider.ts +++ b/packages/core/src/codewhisperer/service/completionProvider.ts @@ -16,10 +16,10 @@ import path from 'path' */ export function getCompletionItems(document: vscode.TextDocument, position: vscode.Position) { const completionItems: vscode.CompletionItem[] = [] - session.recommendations.forEach((recommendation, index) => { + for (const [index, recommendation] of session.recommendations.entries()) { completionItems.push(getCompletionItem(document, position, recommendation, index)) session.setSuggestionState(index, 'Showed') - }) + } return completionItems } diff --git a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts index 3fcc9cb8b7d..65afc885073 100644 --- a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts +++ b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts @@ -35,10 +35,10 @@ export function initSecurityScanRender( } else if (scope === CodeAnalysisScope.PROJECT) { securityScanRender.securityDiagnosticCollection?.clear() } - securityRecommendationList.forEach((securityRecommendation) => { + for (const securityRecommendation of securityRecommendationList) { updateSecurityDiagnosticCollection(securityRecommendation) updateSecurityIssuesForProviders(securityRecommendation) - }) + } securityScanRender.initialized = true } @@ -58,11 +58,9 @@ export function updateSecurityDiagnosticCollection(securityRecommendation: Aggre const securityDiagnostics: vscode.Diagnostic[] = vscode.languages .getDiagnostics(uri) .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel) - securityRecommendation.issues - .filter((securityIssue) => securityIssue.visible) - .forEach((securityIssue) => { - securityDiagnostics.push(createSecurityDiagnostic(securityIssue)) - }) + for (const securityIssue of securityRecommendation.issues.filter((securityIssue) => securityIssue.visible)) { + securityDiagnostics.push(createSecurityDiagnostic(securityIssue)) + } securityDiagnosticCollection.set(uri, securityDiagnostics) } @@ -108,27 +106,29 @@ export function disposeSecurityDiagnostic(event: vscode.TextDocumentChangeEvent) } ) - currentSecurityDiagnostics?.forEach((issue) => { - const intersection = changedRange.intersection(issue.range) - if ( - issue.severity === vscode.DiagnosticSeverity.Warning && - intersection && - (/\S/.test(changedText) || changedText === '') && - !CodeScansState.instance.isScansEnabled() - ) { - issue.severity = vscode.DiagnosticSeverity.Information - issue.message = 'Re-scan to validate the fix: ' + issue.message - issue.range = new vscode.Range(intersection.start, intersection.start) - } else if (issue.range.start.line >= changedRange.end.line) { - issue.range = new vscode.Range( - issue.range.start.line + lineOffset, - issue.range.start.character, - issue.range.end.line + lineOffset, - issue.range.end.character - ) + if (currentSecurityDiagnostics) { + for (const issue of currentSecurityDiagnostics) { + const intersection = changedRange.intersection(issue.range) + if ( + issue.severity === vscode.DiagnosticSeverity.Warning && + intersection && + (/\S/.test(changedText) || changedText === '') && + !CodeScansState.instance.isScansEnabled() + ) { + issue.severity = vscode.DiagnosticSeverity.Information + issue.message = 'Re-scan to validate the fix: ' + issue.message + issue.range = new vscode.Range(intersection.start, intersection.start) + } else if (issue.range.start.line >= changedRange.end.line) { + issue.range = new vscode.Range( + issue.range.start.line + lineOffset, + issue.range.start.character, + issue.range.end.line + lineOffset, + issue.range.end.character + ) + } + newSecurityDiagnostics.push(issue) } - newSecurityDiagnostics.push(issue) - }) + } securityScanRender.securityDiagnosticCollection?.set(uri, newSecurityDiagnostics) } diff --git a/packages/core/src/codewhisperer/service/importAdderProvider.ts b/packages/core/src/codewhisperer/service/importAdderProvider.ts index de16365713e..717373148c4 100644 --- a/packages/core/src/codewhisperer/service/importAdderProvider.ts +++ b/packages/core/src/codewhisperer/service/importAdderProvider.ts @@ -55,6 +55,7 @@ export class ImportAdderProvider implements vscode.CodeLensProvider { ) { const line = findLineToInsertImportStatement(editor, firstLineOfRecommendation) let mergedStatements = `` + // eslint-disable-next-line unicorn/no-array-for-each r.mostRelevantMissingImports?.forEach(async (i) => { // trust service response that this to-be-added import is necessary if (i.statement) { diff --git a/packages/core/src/codewhisperer/service/recommendationHandler.ts b/packages/core/src/codewhisperer/service/recommendationHandler.ts index bbcd177a03b..57accdfe44f 100644 --- a/packages/core/src/codewhisperer/service/recommendationHandler.ts +++ b/packages/core/src/codewhisperer/service/recommendationHandler.ts @@ -309,10 +309,10 @@ export class RecommendationHandler { 4, true ).trimStart() - recommendations.forEach((item, index) => { + for (const [index, item] of recommendations.entries()) { msg += `\n ${index.toString().padStart(2, '0')}: ${indent(item.content, 8, true).trim()}` session.requestIdList.push(requestId) - }) + } getLogger().debug(msg) if (invocationResult === 'Succeeded') { CodeWhispererCodeCoverageTracker.getTracker(session.language)?.incrementServiceInvocationCount() @@ -368,7 +368,7 @@ export class RecommendationHandler { TelemetryHelper.instance.setTypeAheadLength(typedPrefix.length) // mark suggestions that does not match typeahead when arrival as Discard // these suggestions can be marked as Showed if typeahead can be removed with new inline API - recommendations.forEach((r, i) => { + for (const [i, r] of recommendations.entries()) { const recommendationIndex = i + session.recommendations.length if ( !r.content.startsWith(typedPrefix) && @@ -377,7 +377,7 @@ export class RecommendationHandler { session.setSuggestionState(recommendationIndex, 'Discard') } session.setCompletionType(recommendationIndex, r) - }) + } session.recommendations = pagination ? session.recommendations.concat(recommendations) : recommendations if (isInlineCompletionEnabled() && this.hasAtLeastOneValidSuggestion(typedPrefix)) { this._onDidReceiveRecommendation.fire() @@ -472,9 +472,9 @@ export class RecommendationHandler { } reportDiscardedUserDecisions() { - session.recommendations.forEach((r, i) => { + for (const [i, _] of session.recommendations.entries()) { session.setSuggestionState(i, 'Discard') - }) + } this.reportUserDecisions(-1) } @@ -526,9 +526,9 @@ export class RecommendationHandler { // do not show recommendation if cursor is before invocation position // also mark as Discard if (editor.selection.active.isBefore(session.startPos)) { - session.recommendations.forEach((r, i) => { + for (const [i, _] of session.recommendations.entries()) { session.setSuggestionState(i, 'Discard') - }) + } reject() return false } @@ -544,9 +544,9 @@ export class RecommendationHandler { ) ) if (!session.recommendations[0].content.startsWith(typedPrefix.trimStart())) { - session.recommendations.forEach((r, i) => { + for (const [i, _] of session.recommendations.entries()) { session.setSuggestionState(i, 'Discard') - }) + } reject() return false } @@ -668,9 +668,9 @@ export class RecommendationHandler { editor.selection.active.isBefore(session.startPos) || editor.document.uri.fsPath !== this.documentUri?.fsPath ) { - session.recommendations.forEach((r, i) => { + for (const [i, _] of session.recommendations.entries()) { session.setSuggestionState(i, 'Discard') - }) + } this.reportUserDecisions(-1) } else if (session.recommendations.length > 0) { await this.showRecommendation(0, true) diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts index d328034d560..ba70e558733 100644 --- a/packages/core/src/codewhisperer/service/securityScanHandler.ts +++ b/packages/core/src/codewhisperer/service/securityScanHandler.ts @@ -68,13 +68,13 @@ export async function listScanResults( return resp.codeAnalysisFindings }) .promise() - issues.forEach((issue) => { + for (const issue of issues) { mapToAggregatedList(codeScanIssueMap, issue, editor, scope) - }) - codeScanIssueMap.forEach((issues, key) => { + } + for (const [key, issues] of codeScanIssueMap.entries()) { // Project path example: /Users/username/project // Key example: project/src/main/java/com/example/App.java - projectPaths.forEach((projectPath) => { + for (const projectPath of projectPaths) { // We need to remove the project path from the key to get the absolute path to the file // Do not use .. in between because there could be multiple project paths in the same parent dir. const filePath = path.join(projectPath, key.split('/').slice(1).join('/')) @@ -85,7 +85,7 @@ export async function listScanResults( } aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue) } - }) + } const maybeAbsolutePath = `/${key}` if (existsSync(maybeAbsolutePath) && statSync(maybeAbsolutePath).isFile()) { const aggregatedCodeScanIssue: AggregatedCodeScanIssue = { @@ -94,7 +94,7 @@ export async function listScanResults( } aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue) } - }) + } return aggregatedCodeScanIssueList } @@ -158,7 +158,7 @@ export function mapToAggregatedList( return true }) - filteredIssues.forEach((issue) => { + for (const issue of filteredIssues) { const filePath = issue.filePath if (codeScanIssueMap.has(filePath)) { if (!isExistingIssue(issue, codeScanIssueMap)) { @@ -169,7 +169,7 @@ export function mapToAggregatedList( } else { codeScanIssueMap.set(filePath, [issue]) } - }) + } } function isDuplicateIssue(issueA: RawCodeScanIssue, issueB: RawCodeScanIssue) { diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts index b6f3eda36ce..cbf6bf92710 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts @@ -359,9 +359,9 @@ export async function zipCode( }, } // TO-DO: later consider making this add to path.join(zipManifest.dependenciesRoot, 'qct-sct-metadata', entry.entryName) so that it's more organized - metadataZip - .getEntries() - .forEach((entry) => zip.addFile(path.join(zipManifest.dependenciesRoot, entry.name), entry.getData())) + for (const entry of metadataZip.getEntries()) { + zip.addFile(path.join(zipManifest.dependenciesRoot, entry.name), entry.getData()) + } const sqlMetadataSize = (await nodefs.promises.stat(transformByQState.getMetadataPathSQL())).size getLogger().info(`CodeTransformation: SQL metadata file size = ${sqlMetadataSize}`) } @@ -514,15 +514,19 @@ export function addTableMarkdown(plan: string, stepId: string, tableMapping: { [ const table = JSON.parse(tableObj) plan += `\n\n\n${table.name}\n|` const columns = table.columnNames + // eslint-disable-next-line unicorn/no-array-for-each columns.forEach((columnName: string) => { plan += ` ${getFormattedString(columnName)} |` }) plan += '\n|' + // eslint-disable-next-line unicorn/no-array-for-each columns.forEach((_: any) => { plan += '-----|' }) + // eslint-disable-next-line unicorn/no-array-for-each table.rows.forEach((row: any) => { plan += '\n|' + // eslint-disable-next-line unicorn/no-array-for-each columns.forEach((columnName: string) => { if (columnName === 'relativePath') { plan += ` [${row[columnName]}](${row[columnName]}) |` // add MD link only for files @@ -537,11 +541,11 @@ export function addTableMarkdown(plan: string, stepId: string, tableMapping: { [ export function getTableMapping(stepZeroProgressUpdates: ProgressUpdates) { const map: { [key: string]: string } = {} - stepZeroProgressUpdates.forEach((update) => { + for (const update of stepZeroProgressUpdates) { // description should never be undefined since even if no data we show an empty table // but just in case, empty string allows us to skip this table without errors when rendering map[update.name] = update.description ?? '' - }) + } return map } @@ -551,6 +555,7 @@ export function getJobStatisticsHtml(jobStatistics: any) { return htmlString } htmlString += `
` + // eslint-disable-next-line unicorn/no-array-for-each jobStatistics.forEach((stat: { name: string; value: string }) => { htmlString += `

${CodeWhispererConstants.planHeaderMessage}

${CodeWhispererConstants.planDisclaimerMessage} Read more.

` - response.transformationPlan.transformationSteps.slice(1).forEach((step) => { + for (const step of response.transformationPlan.transformationSteps.slice(1)) { plan += `

${step.name}

Scroll to top

${step.description}

` plan = addTableMarkdown(plan, step.id, tableMapping) plan += `

` - }) + } plan += `

` plan += `

Appendix
Scroll to top


` plan = addTableMarkdown(plan, '-1', tableMapping) // ID of '-1' reserved for appendix table diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts index 516471fc078..767869d0310 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts @@ -97,10 +97,12 @@ export async function validateSQLMetadataFile(fileContents: string, message: any const serverNodeLocations = sctData['tree']['instances'][0]['ProjectModel'][0]['relations'][0]['server-node-location'] const schemaNames = new Set() + // eslint-disable-next-line unicorn/no-array-for-each serverNodeLocations.forEach((serverNodeLocation: any) => { const schemaNodes = serverNodeLocation['FullNameNodeInfoList'][0]['nameParts'][0][ 'FullNameNodeInfo' ].filter((node: any) => node['$']['typeNode'].toLowerCase() === 'schema') + // eslint-disable-next-line unicorn/no-array-for-each schemaNodes.forEach((node: any) => { schemaNames.add(node['$']['nameNode'].toUpperCase()) }) diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index 1f4058a54dc..b41e8b7793c 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -145,7 +145,7 @@ export class DiffModel { public copyProject(pathToWorkspace: string, changedFiles: ParsedDiff[]) { const pathToTmpSrcDir = path.join(os.tmpdir(), `project-copy-${Date.now()}`) fs.mkdirSync(pathToTmpSrcDir) - changedFiles.forEach((file) => { + for (const file of changedFiles) { const pathToTmpFile = path.join(pathToTmpSrcDir, file.oldFileName!.substring(2)) // use mkdirsSync to create parent directories in pathToTmpFile too fs.mkdirSync(path.dirname(pathToTmpFile), { recursive: true }) @@ -154,7 +154,7 @@ export class DiffModel { if (fs.existsSync(pathToOldFile)) { fs.copyFileSync(pathToOldFile, pathToTmpFile) } - }) + } return pathToTmpSrcDir } @@ -243,11 +243,11 @@ export class DiffModel { } public saveChanges() { - this.patchFileNodes.forEach((patchFileNode) => { - patchFileNode.children.forEach((changeNode) => { + for (const patchFileNode of this.patchFileNodes) { + for (const changeNode of patchFileNode.children) { changeNode.saveChange() - }) - }) + } + } } public rejectChanges() { diff --git a/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts b/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts index 925609ce185..d0ad76c26da 100644 --- a/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts +++ b/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts @@ -104,12 +104,12 @@ export class CodeWhispererCodeCoverageTracker { // the accepted characters after calculating user modification let unmodifiedAcceptedTokens = 0 for (const filename in this._acceptedTokens) { - this._acceptedTokens[filename].forEach((v) => { + for (const v of this._acceptedTokens[filename]) { if (filename in this._totalTokens && this._totalTokens[filename] >= v.accepted) { unmodifiedAcceptedTokens += v.accepted acceptedTokens += v.text.length } - }) + } } const percentCount = ((acceptedTokens / totalTokens) * 100).toFixed(2) const percentage = Math.round(parseInt(percentCount)) diff --git a/packages/core/src/codewhisperer/util/authUtil.ts b/packages/core/src/codewhisperer/util/authUtil.ts index afb15aff133..53c33c2ed4e 100644 --- a/packages/core/src/codewhisperer/util/authUtil.ts +++ b/packages/core/src/codewhisperer/util/authUtil.ts @@ -457,7 +457,9 @@ export class AuthUtil { state[Features.codewhispererCore] = AuthStates.connected } if (isValidAmazonQConnection(conn)) { - Object.values(Features).forEach((v) => (state[v as Feature] = AuthStates.connected)) + for (const v of Object.values(Features)) { + state[v as Feature] = AuthStates.connected + } } } diff --git a/packages/core/src/codewhisperer/util/closingBracketUtil.ts b/packages/core/src/codewhisperer/util/closingBracketUtil.ts index 4273094b58a..b9511349e9c 100644 --- a/packages/core/src/codewhisperer/util/closingBracketUtil.ts +++ b/packages/core/src/codewhisperer/util/closingBracketUtil.ts @@ -111,13 +111,13 @@ const removeBracketsFromRightContext = async ( } else { await editor.edit( (editBuilder) => { - idxToRemove.forEach((idx) => { + for (const idx of idxToRemove) { const range = new vscode.Range( editor.document.positionAt(offset + idx), editor.document.positionAt(offset + idx + 1) ) editBuilder.delete(range) - }) + } }, { undoStopAfter: false, undoStopBefore: false } ) diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts index cfaf68b1afd..d2b14cb5247 100644 --- a/packages/core/src/codewhisperer/util/customizationUtil.ts +++ b/packages/core/src/codewhisperer/util/customizationUtil.ts @@ -328,11 +328,11 @@ export const selectCustomization = async (customization: Customization) => { export const getAvailableCustomizationsList = async () => { const items: Customization[] = [] const response = await codeWhispererClient.listAvailableCustomizations() - response - .map((listAvailableCustomizationsResponse) => listAvailableCustomizationsResponse.customizations) - .forEach((customizations) => { - items.push(...customizations) - }) + for (const customizations of response.map( + (listAvailableCustomizationsResponse) => listAvailableCustomizationsResponse.customizations + )) { + items.push(...customizations) + } return items } diff --git a/packages/core/src/codewhisperer/util/editorContext.ts b/packages/core/src/codewhisperer/util/editorContext.ts index 4b58cb4f848..99a15fd1f02 100644 --- a/packages/core/src/codewhisperer/util/editorContext.ts +++ b/packages/core/src/codewhisperer/util/editorContext.ts @@ -216,7 +216,7 @@ function logSupplementalContext(supplementalContext: CodeWhispererSupplementalCo true ).trimStart() - supplementalContext.supplementalContextItems.forEach((context, index) => { + for (const [index, context] of supplementalContext.supplementalContextItems.entries()) { logString += indent(`\nChunk ${index}:\n`, 4, true) logString += indent( `Path: ${context.filePath} @@ -225,7 +225,7 @@ function logSupplementalContext(supplementalContext: CodeWhispererSupplementalCo 8, true ) - }) + } getLogger().debug(logString) } diff --git a/packages/core/src/codewhisperer/util/licenseUtil.ts b/packages/core/src/codewhisperer/util/licenseUtil.ts index 3a49adc6b4a..d21cd093e12 100644 --- a/packages/core/src/codewhisperer/util/licenseUtil.ts +++ b/packages/core/src/codewhisperer/util/licenseUtil.ts @@ -471,11 +471,13 @@ export class LicenseUtil { public static getUniqueLicenseNames(references: References | undefined): Set { const n = new Set() - references?.forEach((r) => { - if (r.licenseName) { - n.add(r.licenseName) + if (references) { + for (const r of references) { + if (r.licenseName) { + n.add(r.licenseName) + } } - }) + } return n } } diff --git a/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts b/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts index 3e00013c9cf..a2c77e0b10f 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts @@ -31,24 +31,22 @@ export abstract class BM25 { this.corpusSize = corpus.length let numDoc = 0 - corpus - .map((document) => { - return tokenizer(document) - }) - .forEach((document) => { - this.docLen.push(document.length) - numDoc += document.length - - const frequencies = new Map() - document.forEach((word) => { - frequencies.set(word, (frequencies.get(word) || 0) + 1) - }) - this.docFreqs.push(frequencies) - - frequencies.forEach((freq, word) => { - this.nd.set(word, (this.nd.get(word) || 0) + 1) - }) - }) + for (const document of corpus.map((document) => { + return tokenizer(document) + })) { + this.docLen.push(document.length) + numDoc += document.length + + const frequencies = new Map() + for (const word of document) { + frequencies.set(word, (frequencies.get(word) || 0) + 1) + } + this.docFreqs.push(frequencies) + + for (const [word, _] of frequencies.entries()) { + this.nd.set(word, (this.nd.get(word) || 0) + 1) + } + } this.avgdl = numDoc / this.corpusSize @@ -96,14 +94,14 @@ export class BM25Okapi extends BM25 { const queryWords = defaultTokenizer(query) return this.docFreqs.map((docFreq, index) => { let score = 0 - queryWords.forEach((queryWord, _) => { + for (const [_, queryWord] of queryWords.entries()) { const queryWordFreqForDocument = docFreq.get(queryWord) || 0 const numerator = (this.idf.get(queryWord) || 0.0) * queryWordFreqForDocument * (this.k1 + 1) const denominator = queryWordFreqForDocument + this.k1 * (1 - this.b + (this.b * this.docLen[index]) / this.avgdl) score += numerator / denominator - }) + } return { content: this.corpus[index], diff --git a/packages/core/src/codewhisperer/util/telemetryHelper.ts b/packages/core/src/codewhisperer/util/telemetryHelper.ts index 9518aa610fc..6505e248f28 100644 --- a/packages/core/src/codewhisperer/util/telemetryHelper.ts +++ b/packages/core/src/codewhisperer/util/telemetryHelper.ts @@ -257,7 +257,7 @@ export class TelemetryHelper { ) { const events: CodewhispererUserDecision[] = [] // emit user decision telemetry - recommendations.forEach((_elem, i) => { + for (const [i, _elem] of recommendations.entries()) { let uniqueSuggestionReferences: string | undefined = undefined const uniqueLicenseSet = LicenseUtil.getUniqueLicenseNames(_elem.references) if (uniqueLicenseSet.size > 0) { @@ -288,7 +288,7 @@ export class TelemetryHelper { } telemetry.codewhisperer_userDecision.emit(event) events.push(event) - }) + } // aggregate suggestion references count const referenceCount = this.getAggregatedSuggestionReferenceCount(events) diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts index b75a6798ab2..ab938aeb643 100644 --- a/packages/core/src/codewhisperer/util/zipUtil.ts +++ b/packages/core/src/codewhisperer/util/zipUtil.ts @@ -433,12 +433,11 @@ export class ZipUtil { } protected processOtherFiles(zip: admZip, languageCount: Map) { - vscode.workspace.textDocuments + for (const document of vscode.workspace.textDocuments .filter((document) => document.uri.scheme === 'file') - .filter((document) => vscode.workspace.getWorkspaceFolder(document.uri) === undefined) - .forEach((document) => - this.processTextFile(zip, document.uri, document.getText(), languageCount, document.uri.fsPath) - ) + .filter((document) => vscode.workspace.getWorkspaceFolder(document.uri) === undefined)) { + this.processTextFile(zip, document.uri, document.getText(), languageCount, document.uri.fsPath) + } } protected async processTestCoverageFiles(targetPath: string) { diff --git a/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts b/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts index d02eea155eb..5f3b6cece70 100644 --- a/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts +++ b/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts @@ -88,9 +88,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { this.packageName } found ${total} issues

` ) - this.panelSets.forEach((panelSet, index) => { + for (const [index, panelSet] of this.panelSets.entries()) { this.addLine(panelSet, index) - }) + } this.update() if (editor) { this.setDecoration(editor, editor.document.uri) @@ -111,20 +111,20 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { this.dynamicLog.push( `
` ) - panelSet.items.forEach((item) => { + for (const item of panelSet.items) { if (item.severity === vscode.DiagnosticSeverity.Warning) { this.dynamicLog.push(`${this.addClickableWarningItem(item)}`) } else { this.dynamicLog.push(`${this.addClickableInfoItem(item)}`) } - }) + } this.dynamicLog.push(`
`) } private persistLines() { - this.panelSets.forEach((panelSet, index) => { + for (const [index, panelSet] of this.panelSets.entries()) { this.persistLine(panelSet, index) - }) + } } private persistLine(panelSet: SecurityPanelSet, index: number) { @@ -134,13 +134,13 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { this.persistLog.push( `
` ) - panelSet.items.forEach((item) => { + for (const item of panelSet.items) { if (item.severity === vscode.DiagnosticSeverity.Warning) { this.persistLog.push(`${this.addUnclickableWarningItem(item)}`) } else { this.persistLog.push(`${this.addUnclickableInfoItem(item)}`) } - }) + } this.persistLog.push(`
`) } @@ -171,13 +171,13 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { } private createPanelSets(securityRecommendationCollection: AggregatedCodeScanIssue[]) { - securityRecommendationCollection.forEach((securityRecommendation) => { + for (const securityRecommendation of securityRecommendationCollection) { const panelSet: SecurityPanelSet = { path: securityRecommendation.filePath, uri: vscode.Uri.parse(securityRecommendation.filePath), items: [], } - securityRecommendation.issues.forEach((issue) => { + for (const issue of securityRecommendation.issues) { panelSet.items.push({ path: securityRecommendation.filePath, range: new vscode.Range(issue.startLine, 0, issue.endLine, 0), @@ -189,9 +189,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { hoverMessage: issue.comment, }, }) - }) + } this.panelSets.push(panelSet) - }) + } } private getHtml(webview: vscode.Webview): string { @@ -232,15 +232,15 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { public setDecoration(editor: vscode.TextEditor, uri: vscode.Uri) { editor.setDecorations(this.getDecorator(), []) const rangesToRend: vscode.DecorationOptions[] = [] - this.panelSets.forEach((panelSet) => { + for (const panelSet of this.panelSets) { if (panelSet.uri.fsPath === uri.fsPath) { - panelSet.items.forEach((item) => { + for (const item of panelSet.items) { if (item.severity === vscode.DiagnosticSeverity.Warning) { rangesToRend.push(item.decoration) } - }) + } } - }) + } if (rangesToRend.length > 0) { editor.setDecorations(this.getDecorator(), rangesToRend) } @@ -261,6 +261,7 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { const changedText = event.contentChanges[0].text const lineOffset = this.getLineOffset(changedRange, changedText) + // eslint-disable-next-line unicorn/no-array-for-each currentPanelSet.items.forEach((item, index, items) => { const intersection = changedRange.intersection(item.range) if ( @@ -282,9 +283,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider { }) this.panelSets[index] = currentPanelSet this.dynamicLog = [] - this.panelSets.forEach((panelSet, index) => { + for (const [index, panelSet] of this.panelSets.entries()) { this.addLine(panelSet, index) - }) + } this.update() if (editor) { this.setDecoration(editor, editor.document.uri) diff --git a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts index 9ff56523379..a3236f7d402 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts @@ -43,22 +43,24 @@ export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { c if (triggerPayload.filePath !== undefined && triggerPayload.filePath !== '') { const documentSymbolFqns: DocumentSymbol[] = [] - triggerPayload.codeQuery?.fullyQualifiedNames?.used?.forEach((fqn) => { - const elem = { - name: fqn.symbol?.join('.') ?? '', - type: SymbolType.USAGE, - source: fqn.source?.join('.'), - } + if (triggerPayload.codeQuery?.fullyQualifiedNames?.used) { + for (const fqn of triggerPayload.codeQuery.fullyQualifiedNames.used) { + const elem = { + name: fqn.symbol?.join('.') ?? '', + type: SymbolType.USAGE, + source: fqn.source?.join('.'), + } - if ( - elem.name.length >= fqnNameSizeDownLimit && - elem.name.length < fqnNameSizeUpLimit && - (elem.source === undefined || - (elem.source.length >= fqnNameSizeDownLimit && elem.source.length < fqnNameSizeUpLimit)) - ) { - documentSymbolFqns.push(elem) + if ( + elem.name.length >= fqnNameSizeDownLimit && + elem.name.length < fqnNameSizeUpLimit && + (elem.source === undefined || + (elem.source.length >= fqnNameSizeDownLimit && elem.source.length < fqnNameSizeUpLimit)) + ) { + documentSymbolFqns.push(elem) + } } - }) + } let programmingLanguage if ( diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts index 6a1d388c05d..57b45d414c1 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts @@ -632,11 +632,11 @@ export class ChatController { if (CodeWhispererSettings.instance.isLocalIndexEnabled()) { const start = performance.now() triggerPayload.relevantTextDocuments = await LspController.instance.query(triggerPayload.message) - triggerPayload.relevantTextDocuments.forEach((doc) => { + for (const doc of triggerPayload.relevantTextDocuments) { getLogger().info( `amazonq: Using workspace files ${doc.relativeFilePath}, content(partial): ${doc.text?.substring(0, 200)}` ) - }) + } triggerPayload.projectContextQueryLatencyMs = performance.now() - start } else { this.messenger.sendOpenSettingsMessage(triggerID, tabID) diff --git a/packages/core/src/codewhispererChat/editor/codelens.ts b/packages/core/src/codewhispererChat/editor/codelens.ts index 651853a78cf..4df72d776d6 100644 --- a/packages/core/src/codewhispererChat/editor/codelens.ts +++ b/packages/core/src/codewhispererChat/editor/codelens.ts @@ -151,7 +151,9 @@ export class TryChatCodeLensProvider implements vscode.CodeLensProvider { dispose() { globals.globalState.tryUpdate('aws.amazonq.showTryChatCodeLens', false) TryChatCodeLensProvider.providerDisposable?.dispose() - this.disposables.forEach((d) => d.dispose()) + for (const d of this.disposables) { + d.dispose() + } } } diff --git a/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts b/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts index e9f0220dfd7..7606fe0708c 100644 --- a/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts +++ b/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts @@ -41,11 +41,11 @@ export class FileContextExtractor { if (languageId !== undefined) { const imports = await readImports(file.getText(), languageId) - imports - .filter(function (elem, index, self) { - return index === self.indexOf(elem) && elem !== languageId - }) - .forEach((importKey) => should.add(importKey)) + for (const importKey of imports.filter(function (elem, index, self) { + return index === self.indexOf(elem) && elem !== languageId + })) { + should.add(importKey) + } } return { diff --git a/packages/core/src/codewhispererChat/storages/triggerEvents.ts b/packages/core/src/codewhispererChat/storages/triggerEvents.ts index d30ebf48939..1bbf08b6de9 100644 --- a/packages/core/src/codewhispererChat/storages/triggerEvents.ts +++ b/packages/core/src/codewhispererChat/storages/triggerEvents.ts @@ -30,6 +30,7 @@ export class TriggerEventsStorage { public removeTabEvents(tabID: string) { const events = this.triggerEventsByTabID.get(tabID) ?? [] + // eslint-disable-next-line unicorn/no-array-for-each events.forEach((event: TriggerEvent) => { this.triggerEvents.delete(event.id) }) diff --git a/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts index 3ee5d8c865c..6c6ec818444 100644 --- a/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts +++ b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts @@ -328,7 +328,7 @@ export class CodeExtractor { const zipEntries = zip.getEntries() const detectedCollisions: string[] = [] - zipEntries.forEach(function (zipEntry) { + for (const zipEntry of zipEntries) { if (zipEntry.isDirectory) { // Ignore directories because those can/will merged } else { @@ -337,7 +337,7 @@ export class CodeExtractor { detectedCollisions.push(intendedDestinationPath) } } - }) + } if (detectedCollisions.length > 0) { this.writeToOutputChannel(detectedCollisions) diff --git a/packages/core/src/eventSchemas/vue/searchSchemas.ts b/packages/core/src/eventSchemas/vue/searchSchemas.ts index 32f04e954c8..a5dcb55527d 100644 --- a/packages/core/src/eventSchemas/vue/searchSchemas.ts +++ b/packages/core/src/eventSchemas/vue/searchSchemas.ts @@ -151,7 +151,9 @@ export async function getRegistryNames(node: RegistryItemNode | SchemasNode, cli if (node instanceof SchemasNode) { try { const registries = await toArrayAsync(listRegistryItems(client)) - registries.forEach((element) => registryNames.push(element.RegistryName!)) + for (const element of registries) { + registryNames.push(element.RegistryName!) + } } catch (err) { const error = err as Error getLogger().error(error) diff --git a/packages/core/src/extensionNode.ts b/packages/core/src/extensionNode.ts index b6d4a599ce1..480e409f5d8 100644 --- a/packages/core/src/extensionNode.ts +++ b/packages/core/src/extensionNode.ts @@ -85,10 +85,9 @@ export async function activate(context: vscode.ExtensionContext) { const toolkitEnvDetails = getExtEnvironmentDetails() // Splits environment details by new line, filter removes the empty string - toolkitEnvDetails - .split(/\r?\n/) - .filter(Boolean) - .forEach((line) => getLogger().info(line)) + for (const line of toolkitEnvDetails.split(/\r?\n/).filter(Boolean)) { + getLogger().info(line) + } globals.awsContextCommands = new AwsContextCommands(globals.regionProvider, Auth.instance) globals.schemaService = new SchemaService() @@ -343,17 +342,23 @@ async function getAuthState(): Promise> { const enabledScopes: Set = new Set() if (Auth.instance.hasConnections) { authStatus = 'expired' - ;(await Auth.instance.listConnections()).forEach((conn) => { + for (const conn of await Auth.instance.listConnections()) { const state = Auth.instance.getConnectionState(conn) if (state === 'valid') { authStatus = 'connected' } - getAuthFormIdsFromConnection(conn).forEach((id) => enabledConnections.add(id)) + for (const id of getAuthFormIdsFromConnection(conn)) { + enabledConnections.add(id) + } if (isSsoConnection(conn)) { - conn.scopes?.forEach((s) => enabledScopes.add(s)) + if (conn.scopes) { + for (const s of conn.scopes) { + enabledScopes.add(s) + } + } } - }) + } } // There may be other SSO connections in toolkit, but there is no use case for diff --git a/packages/core/src/lambda/commands/createNewSamApp.ts b/packages/core/src/lambda/commands/createNewSamApp.ts index 629130dbb2a..e60e60c31ed 100644 --- a/packages/core/src/lambda/commands/createNewSamApp.ts +++ b/packages/core/src/lambda/commands/createNewSamApp.ts @@ -417,12 +417,12 @@ export async function addInitialLaunchConfiguration( // optional for ZIP-lambdas but required for Image-lambdas if (runtime !== undefined) { - filtered.forEach((configuration) => { + for (const configuration of filtered) { if (!configuration.lambda) { configuration.lambda = {} } configuration.lambda.runtime = runtime - }) + } } await launchConfiguration.addDebugConfigurations(filtered) diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts index 551be9d09cf..c266abb8a4b 100644 --- a/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts +++ b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts @@ -448,9 +448,9 @@ export default defineComponent({ }, clearForm() { const init = initData() - Object.keys(init).forEach((k) => { + for (const k of Object.keys(init)) { ;(this as any)[k] = init[k as keyof typeof init] - }) + } }, }, }) diff --git a/packages/core/src/lambda/wizards/samDeployWizard.ts b/packages/core/src/lambda/wizards/samDeployWizard.ts index a45e07b0b74..98047b75db1 100644 --- a/packages/core/src/lambda/wizards/samDeployWizard.ts +++ b/packages/core/src/lambda/wizards/samDeployWizard.ts @@ -946,11 +946,11 @@ async function getTemplateChoices(...workspaceFolders: vscode.Uri[]): Promise = new Map() const labelCounts: Map = new Map() - templateUris.forEach((uri) => { + for (const uri of templateUris) { const label = SamTemplateQuickPickItem.getLabel(uri) uriToLabel.set(uri, label) labelCounts.set(label, 1 + (labelCounts.get(label) || 0)) - }) + } return Array.from(uriToLabel, ([uri, label]) => { const showWorkspaceFolderDetails: boolean = (labelCounts.get(label) || 0) > 1 diff --git a/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts b/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts index 06f39603bb0..b50fe563745 100644 --- a/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts +++ b/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts @@ -134,7 +134,7 @@ export class ToolkitLoginWebview extends CommonAuthWebview { */ async fetchConnections(): Promise { const connections: AwsConnection[] = [] - Auth.instance.declaredConnections.forEach((conn) => { + for (const conn of Auth.instance.declaredConnections) { // No need to display Builder ID as an existing connection, // users can just select the Builder ID login option and it would have the same effect. if (conn.startUrl !== builderIdStartUrl) { @@ -143,7 +143,7 @@ export class ToolkitLoginWebview extends CommonAuthWebview { startUrl: conn.startUrl, } as AwsConnection) } - }) + } return connections } diff --git a/packages/core/src/shared/awsClientBuilder.ts b/packages/core/src/shared/awsClientBuilder.ts index 25ef698b27a..bdec40957cb 100644 --- a/packages/core/src/shared/awsClientBuilder.ts +++ b/packages/core/src/shared/awsClientBuilder.ts @@ -171,7 +171,9 @@ export class DefaultAWSClientBuilder implements AWSClientBuilder { service.setupRequestListeners = (request: Request) => { originalSetup(request) - listeners.forEach((l) => l(request as AWS.Request & RequestExtras)) + for (const l of listeners) { + l(request as AWS.Request & RequestExtras) + } } return service diff --git a/packages/core/src/shared/codelens/codeLensUtils.ts b/packages/core/src/shared/codelens/codeLensUtils.ts index ef2e0f6c526..5eb0c08fafe 100644 --- a/packages/core/src/shared/codelens/codeLensUtils.ts +++ b/packages/core/src/shared/codelens/codeLensUtils.ts @@ -230,7 +230,7 @@ export async function pickAddSamDebugConfiguration( const templateItemsMap = new Map() const templateItems: vscode.QuickPickItem[] = [] - templateConfigs.forEach((templateConfig) => { + for (const templateConfig of templateConfigs) { const label = `${ getWorkspaceRelativePath(templateConfig.rootUri.fsPath)?.relativePath ?? templateConfig.rootUri.fsPath }:${templateConfig.resourceName}` @@ -246,7 +246,7 @@ export async function pickAddSamDebugConfiguration( templateItems.push({ label: label }) templateItemsMap.set(label, templateConfig) } - }) + } const noTemplate = localize('AWS.pickDebugConfig.noTemplate', 'No Template') const picker = createQuickPick({ diff --git a/packages/core/src/shared/codelens/goCodeLensProvider.ts b/packages/core/src/shared/codelens/goCodeLensProvider.ts index 26683f2f349..3d3bf1c1942 100644 --- a/packages/core/src/shared/codelens/goCodeLensProvider.ts +++ b/packages/core/src/shared/codelens/goCodeLensProvider.ts @@ -126,6 +126,7 @@ function parseTypes(params: string): string[] { const paramParts = params.split(',') // Names of parameters must either be all present or all absent: https://golang.org/ref/spec#Function_types + // eslint-disable-next-line unicorn/no-array-for-each paramParts.forEach((element: string, i: number) => { const parts: string[] = element.trim().split(/\s+/) const type: string = parts.length > 1 ? parts[1].trim() : parts[0].trim() diff --git a/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts b/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts index 1683a14d598..08339136ce8 100644 --- a/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts +++ b/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts @@ -185,7 +185,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti const orderedProfiles: ProfileEntry[] = this.getOrderedProfiles() const selectionList: vscode.QuickPickItem[] = [] - orderedProfiles.forEach((profile) => { + for (const profile of orderedProfiles) { const selectionItem: vscode.QuickPickItem = { label: profile.profileName } if (profile.isRecentlyUsed) { @@ -193,7 +193,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti } selectionList.push(selectionItem) - }) + } return selectionList } @@ -209,10 +209,10 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti const orderedNames = new Set() // Add MRU entries first - mostRecentProfileNames.forEach((profileName) => { + for (const profileName of mostRecentProfileNames) { orderedProfiles.push({ profileName: profileName, isRecentlyUsed: true }) orderedNames.add(profileName) - }) + } // Add default if it hasn't been, and is an existing profile name const defaultProfileName = DefaultCredentialSelectionDataProvider.defaultCredentialsProfileName diff --git a/packages/core/src/shared/extensionUtilities.ts b/packages/core/src/shared/extensionUtilities.ts index 1b30c22bbc8..4d758182205 100644 --- a/packages/core/src/shared/extensionUtilities.ts +++ b/packages/core/src/shared/extensionUtilities.ts @@ -379,13 +379,13 @@ export class UserActivity implements vscode.Disposable { ) if (customEvents) { - customEvents.forEach((event) => + for (const event of customEvents) { this.register( event(() => { throttledEmit(event) }) ) - ) + } } else { this.registerAllEvents(throttledEmit) } @@ -409,13 +409,13 @@ export class UserActivity implements vscode.Disposable { vscode.window.onDidChangeTextEditorViewColumn, ] - activityEvents.forEach((event) => + for (const event of activityEvents) { this.register( event(() => { throttledEmit(event) }) ) - ) + } // // Events with special cases: @@ -478,6 +478,8 @@ export class UserActivity implements vscode.Disposable { } dispose() { - this.disposables.forEach((d) => d.dispose()) + for (const d of this.disposables) { + d.dispose() + } } } diff --git a/packages/core/src/shared/extensions/git.ts b/packages/core/src/shared/extensions/git.ts index 32f21a51df3..6a13a749480 100644 --- a/packages/core/src/shared/extensions/git.ts +++ b/packages/core/src/shared/extensions/git.ts @@ -209,7 +209,11 @@ export class GitExtension { public async getRemotes(): Promise { const api = await this.validateApi('git: api is disabled, returning empty array of remotes') const remotes: GitTypes.Remote[] = [] - api?.repositories.forEach((repo) => remotes.push(...repo.state.remotes)) + if (api) { + for (const repo of api.repositories) { + remotes.push(...repo.state.remotes) + } + } return remotes } @@ -237,7 +241,7 @@ export class GitExtension { .map((repo) => repo.state.remotes.filter((other) => other.fetchUrl === remote.fetchUrl)) .reduce((a, b) => a.concat(b), []) - api.repositories.forEach((repo) => + for (const repo of api.repositories) { branches.push( ...repo.state.refs.filter( (ref: GitTypes.Ref) => @@ -246,7 +250,7 @@ export class GitExtension { remotes.some((remote) => remote.name === ref.remote) ) ) - ) + } getLogger().debug(`git: found ${branches.length} branches from local repositories`) @@ -289,18 +293,21 @@ export class GitExtension { if (!api) { return config } else if (repository) { - ;(await repository.getConfigs()).forEach(({ key, value }) => (config[key] = value)) + for (const { key, value } of await repository.getConfigs()) { + config[key] = value + } } else { const { stdout } = await this.execFileAsync(api.git.path, ['config', '--list', `--global`]).catch((err) => { getLogger().verbose(`git: failed to read config: %s`, err) return { stdout: '' } }) - stdout + for (const [k, v] of stdout .toString() .split(/\r?\n/) - .map((l) => l.split('=')) - .forEach(([k, v]) => (config[k] = v)) + .map((l) => l.split('='))) { + config[k] = v + } } return config diff --git a/packages/core/src/shared/featureConfig.ts b/packages/core/src/shared/featureConfig.ts index 4097cfbab28..73eea42bbf3 100644 --- a/packages/core/src/shared/featureConfig.ts +++ b/packages/core/src/shared/featureConfig.ts @@ -106,7 +106,7 @@ export class FeatureConfigProvider { const response = await this.listFeatureEvaluations() // Overwrite feature configs from server response - response.featureEvaluations.forEach((evaluation) => { + for (const evaluation of response.featureEvaluations) { this.featureConfigs.set( evaluation.feature, new FeatureContext(evaluation.feature, evaluation.variation, evaluation.value) @@ -119,7 +119,7 @@ export class FeatureConfigProvider { featureValue: JSON.stringify(evaluation.value), }) }) - }) + } getLogger().info('AB Testing Cohort Assignments %O', response.featureEvaluations) const customizationArnOverride = this.featureConfigs.get(Features.customizationArnOverride)?.value @@ -133,14 +133,11 @@ export class FeatureConfigProvider { try { const items: Customization[] = [] const response = await client.listAvailableCustomizations() - response - .map( - (listAvailableCustomizationsResponse) => - listAvailableCustomizationsResponse.customizations - ) - .forEach((customizations) => { - items.push(...customizations) - }) + for (const customizations of response.map( + (listAvailableCustomizationsResponse) => listAvailableCustomizationsResponse.customizations + )) { + items.push(...customizations) + } availableCustomizations = items.map((c) => c.arn) } catch (e) { getLogger().debug('amazonq: Failed to list available customizations') diff --git a/packages/core/src/shared/multiStepInputFlowController.ts b/packages/core/src/shared/multiStepInputFlowController.ts index ce95ba1e480..96d66e4a2f2 100644 --- a/packages/core/src/shared/multiStepInputFlowController.ts +++ b/packages/core/src/shared/multiStepInputFlowController.ts @@ -91,7 +91,9 @@ export class MultiStepInputFlowController { this.current.show() }) } finally { - disposables.forEach((d) => d.dispose() as void) + for (const d of disposables) { + d.dispose() as void + } } } @@ -164,7 +166,9 @@ export class MultiStepInputFlowController { this.current.show() }) } finally { - disposables.forEach((d) => d.dispose() as void) + for (const d of disposables) { + d.dispose() as void + } } } diff --git a/packages/core/src/shared/regions/regionProvider.ts b/packages/core/src/shared/regions/regionProvider.ts index fed5919645d..c9c010a250a 100644 --- a/packages/core/src/shared/regions/regionProvider.ts +++ b/packages/core/src/shared/regions/regionProvider.ts @@ -128,26 +128,26 @@ export class RegionProvider { private loadFromEndpoints(endpoints: Endpoints) { this.regionData.clear() - endpoints.partitions.forEach((partition) => { - partition.regions.forEach((region) => + for (const partition of endpoints.partitions) { + for (const region of partition.regions) { this.regionData.set(region.id, { dnsSuffix: partition.dnsSuffix, partitionId: partition.id, region: region, serviceIds: [], }) - ) + } - partition.services.forEach((service) => { - service.endpoints.forEach((endpoint) => { + for (const service of partition.services) { + for (const endpoint of service.endpoints) { const regionData = this.regionData.get(endpoint.regionId) if (regionData) { regionData.serviceIds.push(service.id) } - }) - }) - }) + } + } + } this.onDidChangeEmitter.fire() } diff --git a/packages/core/src/shared/remoteSession.ts b/packages/core/src/shared/remoteSession.ts index 9f51c747de7..abe5d981a84 100644 --- a/packages/core/src/shared/remoteSession.ts +++ b/packages/core/src/shared/remoteSession.ts @@ -167,11 +167,11 @@ export async function handleMissingTool(tools: Err) { missing ) - tools.err().forEach((d) => { + for (const d of tools.err()) { if (d.reason) { getLogger().error(`codecatalyst: failed to get tool "${d.name}": ${d.reason}`) } - }) + } return Result.err( new ToolkitError(msg, { diff --git a/packages/core/src/shared/sam/debugger/csharpSamDebug.ts b/packages/core/src/shared/sam/debugger/csharpSamDebug.ts index 496c8514f07..d502d72bbdf 100644 --- a/packages/core/src/shared/sam/debugger/csharpSamDebug.ts +++ b/packages/core/src/shared/sam/debugger/csharpSamDebug.ts @@ -255,10 +255,10 @@ export async function makeDotnetDebugConfiguration( } // we could safely leave this entry in, but might as well give the user full control if they're specifying mappings delete config.sourceFileMap['/build'] - config.lambda.pathMappings.forEach((mapping) => { + for (const mapping of config.lambda.pathMappings) { // this looks weird because we're mapping the PDB path to the local workspace config.sourceFileMap[mapping.remoteRoot] = mapping.localRoot - }) + } } return { diff --git a/packages/core/src/shared/treeview/resourceTreeDataProvider.ts b/packages/core/src/shared/treeview/resourceTreeDataProvider.ts index e7c6f39cf8c..6920d18f7d6 100644 --- a/packages/core/src/shared/treeview/resourceTreeDataProvider.ts +++ b/packages/core/src/shared/treeview/resourceTreeDataProvider.ts @@ -101,7 +101,11 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider this.clear(n)) + if (this.children.has(element.id)) { + for (const n of this.children.get(element.id)!) { + this.clear(n) + } + } } } @@ -144,7 +148,11 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider this.clear(c)) + if (children) { + for (const c of children) { + this.clear(c) + } + } } private insert(id: string, resource: TreeNode): TreeNode { @@ -154,7 +162,11 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider { - this.children.get(node.id)?.forEach((n) => this.clear(n)) + if (this.children.has(node.id)) { + for (const n of this.children.get(node.id)!) { + this.clear(n) + } + } this.children.delete(node.id) this.onDidChangeTreeDataEmitter.fire(node) }) diff --git a/packages/core/src/shared/typescriptLambdaHandlerSearch.ts b/packages/core/src/shared/typescriptLambdaHandlerSearch.ts index 57e17f58ec4..88e313ce776 100644 --- a/packages/core/src/shared/typescriptLambdaHandlerSearch.ts +++ b/packages/core/src/shared/typescriptLambdaHandlerSearch.ts @@ -164,7 +164,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch { private findCandidateHandlersInExportDecls(): RootlessLambdaHandlerCandidate[] { const handlers: RootlessLambdaHandlerCandidate[] = [] - this._candidateExportDeclarations.forEach((exportDeclaration) => { + for (const exportDeclaration of this._candidateExportDeclarations) { if (exportDeclaration.exportClause) { exportDeclaration.exportClause.forEachChild((clause) => { if (ts.isExportSpecifier(clause)) { @@ -180,7 +180,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch { } }) } - }) + } return handlers } @@ -191,7 +191,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch { private findCandidateHandlersInExportedFunctions(): RootlessLambdaHandlerCandidate[] { const handlers: RootlessLambdaHandlerCandidate[] = [] - this._candidateExportNodes.forEach((exportNode) => { + for (const exportNode of this._candidateExportNodes) { if ( ts.isFunctionLike(exportNode) && TypescriptLambdaHandlerSearch.isFunctionLambdaHandlerCandidate(exportNode) && @@ -218,7 +218,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch { } }) } - }) + } return handlers } diff --git a/packages/core/src/shared/ui/input.ts b/packages/core/src/shared/ui/input.ts index cd093007b03..4f252fdf8e5 100644 --- a/packages/core/src/shared/ui/input.ts +++ b/packages/core/src/shared/ui/input.ts @@ -127,7 +127,9 @@ export async function promptUser({ return response } finally { - disposables.forEach((d) => d.dispose() as void) + for (const d of disposables) { + d.dispose() as void + } inputBox.hide() } } diff --git a/packages/core/src/shared/ui/inputPrompter.ts b/packages/core/src/shared/ui/inputPrompter.ts index 48095abf964..ad2fa2ac2c8 100644 --- a/packages/core/src/shared/ui/inputPrompter.ts +++ b/packages/core/src/shared/ui/inputPrompter.ts @@ -115,7 +115,9 @@ export class InputBoxPrompter extends Prompter { * @param validate Validator function. */ public setValidation(validate: ValidateFn): void { - this.validateEvents.forEach((d) => d.dispose()) + for (const d of this.validateEvents) { + d.dispose() + } this.validateEvents = [] this.inputBox.onDidChangeValue( diff --git a/packages/core/src/shared/ui/picker.ts b/packages/core/src/shared/ui/picker.ts index ed0eacf35c6..6a801cdf6ab 100644 --- a/packages/core/src/shared/ui/picker.ts +++ b/packages/core/src/shared/ui/picker.ts @@ -135,7 +135,9 @@ export async function promptUser({ return response } finally { - disposables.forEach((d) => d.dispose() as void) + for (const d of disposables) { + d.dispose() as void + } picker.hide() } } diff --git a/packages/core/src/shared/ui/pickerPrompter.ts b/packages/core/src/shared/ui/pickerPrompter.ts index 6c9b1baaeb4..daa65246fed 100644 --- a/packages/core/src/shared/ui/pickerPrompter.ts +++ b/packages/core/src/shared/ui/pickerPrompter.ts @@ -248,7 +248,9 @@ function acceptItems(picker: DataQuickPick, resolve: (items: DataQuickPick return } - picker.selectedItems.forEach((item) => (item.onClick !== undefined ? item.onClick() : undefined)) + for (const item of picker.selectedItems) { + item.onClick !== undefined ? item.onClick() : undefined + } if (picker.selectedItems.some((item) => item.invalidSelection)) { return diff --git a/packages/core/src/shared/utilities/collectionUtils.ts b/packages/core/src/shared/utilities/collectionUtils.ts index 3776d7fac7b..f723e0096cc 100644 --- a/packages/core/src/shared/utilities/collectionUtils.ts +++ b/packages/core/src/shared/utilities/collectionUtils.ts @@ -346,13 +346,13 @@ export function inspect(obj: any, opt?: { depth: number }): string { export function stripUndefined>( obj: T ): asserts obj is { [P in keyof T]-?: NonNullable } { - Object.keys(obj).forEach((key) => { + for (const key of Object.keys(obj)) { if (obj[key] === undefined) { delete obj[key] } else if (typeof obj[key] === 'object') { stripUndefined(obj[key]) } - }) + } } export function isAsyncIterable(obj: any): obj is AsyncIterable { diff --git a/packages/core/src/shared/utilities/diffUtils.ts b/packages/core/src/shared/utilities/diffUtils.ts index 46292b07ef1..81e0af69000 100644 --- a/packages/core/src/shared/utilities/diffUtils.ts +++ b/packages/core/src/shared/utilities/diffUtils.ts @@ -136,6 +136,7 @@ export function getDiffCharsAndLines( ignoreNewlineAtEof: true, } as LinesOptions) + // eslint-disable-next-line unicorn/no-array-for-each diffs.forEach((part: Change) => { if (part.added) { addedChars += part.value.length diff --git a/packages/core/src/shared/utilities/editorUtilities.ts b/packages/core/src/shared/utilities/editorUtilities.ts index 2528dda1a76..4b70bef00c0 100644 --- a/packages/core/src/shared/utilities/editorUtilities.ts +++ b/packages/core/src/shared/utilities/editorUtilities.ts @@ -36,11 +36,11 @@ export async function getOpenFilesInWindow( try { const tabArrays = vscode.window.tabGroups.all - tabArrays.forEach((tabArray) => { - tabArray.tabs.forEach((tab) => { + for (const tabArray of tabArrays) { + for (const tab of tabArray.tabs) { filesOpenedInEditor.push((tab.input as any).uri.fsPath) - }) - }) + } + } } catch (e) { // Older versions of VSC do not have the tab API } diff --git a/packages/core/src/shared/utilities/streamUtilities.ts b/packages/core/src/shared/utilities/streamUtilities.ts index 5d734ac72a1..0b7d74fca5f 100644 --- a/packages/core/src/shared/utilities/streamUtilities.ts +++ b/packages/core/src/shared/utilities/streamUtilities.ts @@ -44,7 +44,9 @@ class BufferWriter { public write(chunk: Buffer) { const buffer = this.buffer if (Buffer.isBuffer(buffer)) { - chunk.forEach((byte) => (this.offset = buffer.writeUInt8(byte, this.offset))) + for (const byte of chunk) { + this.offset = buffer.writeUInt8(byte, this.offset) + } } else { buffer.push(...chunk) this.offset += chunk.length diff --git a/packages/core/src/shared/vscode/commands2.ts b/packages/core/src/shared/vscode/commands2.ts index 527862faebb..342acfdfbac 100644 --- a/packages/core/src/shared/vscode/commands2.ts +++ b/packages/core/src/shared/vscode/commands2.ts @@ -523,7 +523,7 @@ function handleBadCompositeKey(data: { id: string; args: any[]; compositeKey: Co return // nothing to do since no key } - Object.entries(compositeKey).forEach(([index, field]) => { + for (const [index, field] of Object.entries(compositeKey)) { const indexAsInt = parseInt(index) const arg = args[indexAsInt] if (field === 'source' && arg === undefined) { @@ -540,7 +540,7 @@ function handleBadCompositeKey(data: { id: string; args: any[]; compositeKey: Co getLogger().error('Commands/Telemetry: "%s" executed with invalid "source" type: "%O"', id, args) args[indexAsInt] = unsetSource } - }) + } } /** @@ -555,11 +555,11 @@ function findFieldsToAddToMetric(args: any[], compositeKey: CompositeKey): { [fi const sortedIndexesWithValue = indexesWithValue.sort((a, b) => a - b) const result: { [field in MetricField]?: any } = {} - sortedIndexesWithValue.forEach((i) => { + for (const i of sortedIndexesWithValue) { const fieldName: MetricField = compositeKey[i] const fieldValue = args[i] result[fieldName] = fieldValue - }) + } return result } @@ -639,7 +639,9 @@ export class TelemetryDebounceInfo { }) const hasher = crypto.createHash('sha256') - hashableObjects.forEach((o) => hasher.update(o)) + for (const o of hashableObjects) { + hasher.update(o) + } return hasher.digest('hex') } } diff --git a/packages/core/src/shared/wizards/wizard.ts b/packages/core/src/shared/wizards/wizard.ts index 05d45584802..f472e982813 100644 --- a/packages/core/src/shared/wizards/wizard.ts +++ b/packages/core/src/shared/wizards/wizard.ts @@ -154,12 +154,12 @@ export class Wizard>> { public async init?(): Promise private assignSteps(): void { - this._form.properties.forEach((prop) => { + for (const prop of this._form.properties) { const provider = this._form.getPrompterProvider(prop) if (!this.boundSteps.has(prop) && provider !== undefined) { this.boundSteps.set(prop, this.createBoundStep(prop, provider)) } - }) + } } public async run(): Promise { @@ -170,9 +170,9 @@ export class Wizard>> { } this.assignSteps() - this.resolveNextSteps((this.options.initState ?? {}) as TState).forEach((step) => + for (const step of this.resolveNextSteps((this.options.initState ?? {}) as TState)) { this.stateController.addStep(step) - ) + } const outputState = await this.stateController.run() @@ -238,14 +238,14 @@ export class Wizard>> { protected resolveNextSteps(state: TState): Branch { const nextSteps: Branch = [] const defaultState = this._form.applyDefaults(state) - this.boundSteps.forEach((step, targetProp) => { + for (const [targetProp, step] of this.boundSteps.entries()) { if ( this._form.canShowProperty(targetProp, state, defaultState) && !this.stateController.containsStep(step) ) { nextSteps.push(step) } - }) + } return nextSteps } diff --git a/packages/core/src/shared/wizards/wizardForm.ts b/packages/core/src/shared/wizards/wizardForm.ts index 7d3a55a2635..e4933bb1acf 100644 --- a/packages/core/src/shared/wizards/wizardForm.ts +++ b/packages/core/src/shared/wizards/wizardForm.ts @@ -110,7 +110,7 @@ export class WizardForm>> { public applyDefaults(state: TState): TState { const defaultState = _.cloneDeep(state) - this.formData.forEach((opt, targetProp) => { + for (const [targetProp, opt] of this.formData.entries()) { const current = _.get(state, targetProp) if (!isAssigned(current) && opt.setDefault !== undefined && !checkParent(targetProp, state, opt)) { @@ -119,7 +119,7 @@ export class WizardForm>> { _.set(defaultState, targetProp, defaultValue) } } - }) + } return defaultState } @@ -212,10 +212,10 @@ export class WizardForm>> { private createApplyFormMethod>(prop: string): ApplyBoundForm { return (form: WizardForm, options?: ContextOptions) => { - form.formData.forEach((element, key) => { + for (const [key, element] of form.formData.entries()) { // TODO: use an assert here to ensure that no elements are rewritten this.applyElement(`${prop}.${key}`, this.convertElement(prop, element, options)) - }) + } } } diff --git a/packages/core/src/ssmDocument/commands/openDocumentItem.ts b/packages/core/src/ssmDocument/commands/openDocumentItem.ts index c794e56ff71..9b6793b76d0 100644 --- a/packages/core/src/ssmDocument/commands/openDocumentItem.ts +++ b/packages/core/src/ssmDocument/commands/openDocumentItem.ts @@ -68,14 +68,14 @@ export async function openDocumentItemYaml(node: DocumentItemNode, awsContext: A async function promptUserforDocumentVersion(versions: SSM.Types.DocumentVersionInfo[]): Promise { // Prompt user to pick document version const quickPickItems: vscode.QuickPickItem[] = [] - versions.forEach((version) => { + for (const version of versions) { if (version.DocumentVersion) { quickPickItems.push({ label: version.DocumentVersion, description: `${version.IsDefaultVersion ? 'Default' : ''}`, }) } - }) + } if (quickPickItems.length > 1) { const versionPick = picker.createQuickPick({ diff --git a/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts b/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts index 576f38a3e75..92e788bcb89 100644 --- a/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts +++ b/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts @@ -79,14 +79,14 @@ export async function updateDocumentVersion(node: DocumentItemNodeWriteable, aws async function promptUserforDocumentVersion(versions: SSM.Types.DocumentVersionInfo[]): Promise { // Prompt user to pick document version const quickPickItems: vscode.QuickPickItem[] = [] - versions.forEach((version) => { + for (const version of versions) { if (version.DocumentVersion) { quickPickItems.push({ label: version.DocumentVersion, description: `${version.IsDefaultVersion ? 'Default' : ''}`, }) } - }) + } if (quickPickItems.length > 1) { const versionPick = picker.createQuickPick({ diff --git a/packages/core/src/ssmDocument/explorer/registryItemNode.ts b/packages/core/src/ssmDocument/explorer/registryItemNode.ts index c4eeac02a9c..d5ca928f88f 100644 --- a/packages/core/src/ssmDocument/explorer/registryItemNode.ts +++ b/packages/core/src/ssmDocument/explorer/registryItemNode.ts @@ -98,9 +98,9 @@ export class RegistryItemNode extends AWSTreeNodeBase { const documents = new Map() const docs = await this.getDocumentByOwner(this.client) - docs.forEach((doc) => { + for (const doc of docs) { documents.set(doc.Name!, doc) - }) + } if (this.registryName === userRegistryName) { updateInPlace( diff --git a/packages/core/src/stepFunctions/asl/aslServer.ts b/packages/core/src/stepFunctions/asl/aslServer.ts index 6ec961ba9d1..8da1363969c 100644 --- a/packages/core/src/stepFunctions/asl/aslServer.ts +++ b/packages/core/src/stepFunctions/asl/aslServer.ts @@ -317,12 +317,13 @@ function validateTextDocument(textDocument: TextDocument, callback?: (diagnostic connection.onDidChangeWatchedFiles((change) => { // Monitored files have changed in VSCode let hasChanges = false - change.changes.forEach((c) => { + for (const c of change.changes) { if (getLanguageService('asl').resetSchema(c.uri)) { hasChanges = true } - }) + } if (hasChanges) { + // eslint-disable-next-line unicorn/no-array-for-each documents.all().forEach(triggerValidation) } }) diff --git a/packages/core/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts b/packages/core/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts index 301bd493834..56467343d15 100644 --- a/packages/core/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts +++ b/packages/core/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts @@ -188,9 +188,9 @@ export class AslVisualization { this.isPanelDisposed = true debouncedUpdate.cancel() this.onVisualizationDisposeEmitter.fire() - this.disposables.forEach((disposable) => { + for (const disposable of this.disposables) { disposable.dispose() - }) + } this.onVisualizationDisposeEmitter.dispose() } diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts index 4c2639a553f..44cfe17eb1f 100644 --- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts +++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts @@ -553,11 +553,11 @@ describe('Controller', () => { ) }) - runs.forEach(({ name, error }) => { + for (const { name, error } of runs) { it(`sends failure operation telemetry on ${name}`, async () => { await verifyException(error) }) - }) + } }) describe('processErrorChatMessage', function () { @@ -639,11 +639,11 @@ describe('Controller', () => { } } - runs.forEach((run) => { + for (const run of runs) { it(`should handle ${run.name}`, async function () { await verifyException(run.error) }) - }) + } }) }) diff --git a/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts index 536ec3e224c..37c6d0fe649 100644 --- a/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts +++ b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts @@ -695,14 +695,14 @@ describe('customChecks', function () { fakePolicyChecksWebview.pushCustomCheckDiagnostic(diagnostics, finding, isBlocking) assert.strictEqual(diagnostics.length, 2) // One diagnostic per reason - diagnostics.forEach((diagnostic, index) => { + for (const [index, diagnostic] of diagnostics.entries()) { assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0)) assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Error) assert.strictEqual( diagnostic.message, `${finding.findingType}: Test message with reference document - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName} - Reason ${index + 1}` ) - }) + } assert(customPolicyDiagnosticSetStub.calledOnce) }) @@ -722,14 +722,14 @@ describe('customChecks', function () { fakePolicyChecksWebview.pushCustomCheckDiagnostic(diagnostics, finding, isBlocking) assert.strictEqual(diagnostics.length, 2) // One diagnostic per reason - diagnostics.forEach((diagnostic, index) => { + for (const [index, diagnostic] of diagnostics.entries()) { assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0)) assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Warning) assert.strictEqual( diagnostic.message, `WARNING: Another test message - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName} - Reason ${index === 0 ? 'A' : 'B'}` ) - }) + } assert(customPolicyDiagnosticSetStub.calledOnce) }) diff --git a/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts index 81b79b6587d..cf5bf5f648b 100644 --- a/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts +++ b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts @@ -65,7 +65,9 @@ describe('ApiGatewayNode', function () { assert.strictEqual(childNodes.length, apiNames.length, 'Unexpected child count') - childNodes.forEach((node) => assert.ok(node instanceof RestApiNode, 'Expected child node to be RestApiNode')) + for (const node of childNodes) { + assert.ok(node instanceof RestApiNode, 'Expected child node to be RestApiNode') + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts index 44b18f8ea12..bd4b3b4b66b 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts @@ -104,7 +104,9 @@ describe('TailLogGroup', function () { // registry is asserted to have only one entry, so this is assumed to be the session that was // started in this test. let sessionUri: vscode.Uri | undefined - registry.forEach((session) => (sessionUri = session.uri)) + for (const [_, session] of registry) { + sessionUri = session.uri + } if (sessionUri === undefined) { throw Error } @@ -127,9 +129,9 @@ describe('TailLogGroup', function () { // Test that closing all tabs the session's document is open in will cause the session to close let tabs: vscode.Tab[] = [] - window.tabGroups.all.forEach((tabGroup) => { + for (const tabGroup of window.tabGroups.all) { tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!)) - }) + } await Promise.all(tabs.map((tab) => window.tabGroups.close(tab))) // Before the test ends, signal the abort controller, interrupting the mock response stream. This diff --git a/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts index 0bffe4a72f9..ac2ebffded8 100644 --- a/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts +++ b/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts @@ -49,19 +49,21 @@ describe('CloudWatchLogsNode', function () { assert.strictEqual(childNodes.length, logGroupNames.length, 'Unexpected child count') - childNodes.forEach((node) => assert.ok(node instanceof LogGroupNode, 'Expected child node to be LogGroupNode')) + for (const node of childNodes) { + assert.ok(node instanceof LogGroupNode, 'Expected child node to be LogGroupNode') + } }) it('has child nodes with CloudWatch Log contextValue', async function () { const childNodes = await testNode.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, contextValueCloudwatchLog, 'expected the node to have a CloudWatch Log contextValue' ) - ) + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts b/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts index 67d801a4ea4..274272c3729 100644 --- a/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts +++ b/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts @@ -93,9 +93,10 @@ describe('ec2ParentNode', function () { assert.strictEqual(childNodes.length, instances.length, 'Unexpected child count') - childNodes.forEach((node) => + for (const node of childNodes) { assert.ok(node instanceof Ec2InstanceNode, 'Expected child node to be Ec2InstanceNode') - ) + } + getInstanceStub.restore() }) diff --git a/packages/core/src/test/awsService/ecr/utils.test.ts b/packages/core/src/test/awsService/ecr/utils.test.ts index 22c5cf2f8dc..6d0feee0db9 100644 --- a/packages/core/src/test/awsService/ecr/utils.test.ts +++ b/packages/core/src/test/awsService/ecr/utils.test.ts @@ -21,9 +21,9 @@ describe('createRepositoryCommand', function () { }) it('Validates repository name against large regex the service uses', function () { - ;['abc--a', 'abc//a', 'abc__a', 'abc-', 'abc/', 'abc_'].forEach((item) => + for (const item of ['abc--a', 'abc//a', 'abc__a', 'abc-', 'abc/', 'abc_']) { assert.strictEqual(validateRepositoryName(item), 'Invalid repository name') - ) + } }) it('Allows lowercase names with slashes, underscores, and dashes', function () { diff --git a/packages/core/src/test/awsService/s3/commands/createFolder.test.ts b/packages/core/src/test/awsService/s3/commands/createFolder.test.ts index f64ddaf1f2a..36b13e861aa 100644 --- a/packages/core/src/test/awsService/s3/commands/createFolder.test.ts +++ b/packages/core/src/test/awsService/s3/commands/createFolder.test.ts @@ -75,7 +75,7 @@ describe('createFolderCommand', function () { sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node) }) - invalidFolderNames.forEach((invalid) => { + for (const invalid of invalidFolderNames) { it(`warns '${invalid.error}' when folder name is '${invalid.folderName}'`, async () => { getTestWindow().onDidShowInputBox((input) => { input.acceptValue(invalid.folderName) @@ -84,5 +84,5 @@ describe('createFolderCommand', function () { }) await assert.rejects(() => createFolderCommand(node)) }) - }) + } }) diff --git a/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts b/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts index ec07224c1d8..f1331f06633 100644 --- a/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts +++ b/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts @@ -26,13 +26,13 @@ describe('validateBucketName', function () { assert.strictEqual(validateBucketName('v.4.l1d.buc.ket-n4.m3'), undefined) }) - invalidErrors.forEach((invalid) => { + for (const invalid of invalidErrors) { describe(invalid.error, () => { - invalid.bucketNames.forEach((bucketName) => { + for (const bucketName of invalid.bucketNames) { it(bucketName, () => { assert.strictEqual(validateBucketName(bucketName), invalid.error) }) - }) + } }) - }) + } }) diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts index 016ebf1682a..0e1e326b6c5 100644 --- a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts +++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts @@ -372,9 +372,9 @@ describe('transformByQ', function () { // Each dependency version folder contains each expected file, thus we multiply const expectedNumberOfDependencyFiles = m2Folders.length * expectedFilesAfterClean.length assert.strictEqual(expectedNumberOfDependencyFiles, dependenciesToUpload.length) - dependenciesToUpload.forEach((dependency) => { + for (const dependency of dependenciesToUpload) { assert(expectedFilesAfterClean.includes(dependency.name)) - }) + } }) }) @@ -456,9 +456,9 @@ describe('transformByQ', function () { assert.strictEqual(transformByQState.getTargetDB(), DB.AURORA_POSTGRESQL) assert.strictEqual(transformByQState.getSourceServerName(), 'sample.rds.amazonaws.com') const expectedSchemaOptions = ['SCHEMA1', 'SCHEMA2', 'SCHEMA3'] - expectedSchemaOptions.forEach((schema) => { + for (const schema of expectedSchemaOptions) { assert(transformByQState.getSchemaOptions().has(schema)) - }) + } }) it(`WHEN validateMetadataFile on .sct file with unsupported source DB THEN fails validation`, async function () { diff --git a/packages/core/src/test/codewhispererChat/editor/codelens.test.ts b/packages/core/src/test/codewhispererChat/editor/codelens.test.ts index 855985218da..52243027ebf 100644 --- a/packages/core/src/test/codewhispererChat/editor/codelens.test.ts +++ b/packages/core/src/test/codewhispererChat/editor/codelens.test.ts @@ -163,6 +163,7 @@ describe('TryChatCodeLensProvider', () => { TryMoreExState.id, ] + // eslint-disable-next-line unicorn/no-array-for-each lineAnnotationControllerStates.forEach((id: string) => { it(`id - ${id}`, async () => { await globals.globalState.update(inlinehintKey, id) diff --git a/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts index e76472f83e1..8e266cc11d3 100644 --- a/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts +++ b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts @@ -463,5 +463,7 @@ describe('SharedCredentialsProvider', async function () { function assertSubstringsInText(text: string | undefined, ...substrings: string[]) { assert.ok(text) - substrings.forEach((substring) => assert.notStrictEqual(text!.indexOf(substring), -1)) + for (const substring of substrings) { + assert.notStrictEqual(text!.indexOf(substring), -1) + } } diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts index b662556e0aa..f552e8d08c8 100644 --- a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts +++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts @@ -226,6 +226,7 @@ describe('SsoAccessTokenProvider', function () { // combinations of args for createToken() const args: CreateTokenArgs[] = [{ isReAuth: true }, { isReAuth: false }] + // eslint-disable-next-line unicorn/no-array-for-each args.forEach((args) => { it(`runs the full SSO flow with args: ${JSON.stringify(args)}`, async function () { const { token, registration } = setupFlow() diff --git a/packages/core/src/test/credentials/utils.test.ts b/packages/core/src/test/credentials/utils.test.ts index a90a3fc7bcf..7fc06aef897 100644 --- a/packages/core/src/test/credentials/utils.test.ts +++ b/packages/core/src/test/credentials/utils.test.ts @@ -106,13 +106,13 @@ describe('connection exists funcs', function () { }) const allCases = [...anyCases, ...cwIdcCases] - allCases.forEach((args) => { + for (const args of allCases) { it(`ssoExists() returns '${args.expected}' when kind '${args.kind}' given [${args.connections .map((c) => c.label) .join(', ')}]`, async function () { assert.strictEqual(await hasSso(args.kind, async () => args.connections), args.expected) }) - }) + } }) describe('builderIdExists()', function () { @@ -136,13 +136,13 @@ describe('connection exists funcs', function () { const allCases = [...cwBuilderIdCases, ...ccBuilderIdCases] - allCases.forEach((args) => { + for (const args of allCases) { it(`builderIdExists() returns '${args.expected}' when kind '${args.kind}' given [${args.connections .map((c) => c.label) .join(', ')}]`, async function () { assert.strictEqual(await hasBuilderId(args.kind, async () => args.connections), args.expected) }) - }) + } }) describe('credentialExists()', function () { @@ -153,7 +153,7 @@ describe('connection exists funcs', function () { [allConnections.filter((c) => c !== iamConnection), false], ] - cases.forEach((args) => { + for (const args of cases) { it(`credentialExists() returns '${args[1]}' given [${args[0] .map((c) => c.label) .join(', ')}]`, async function () { @@ -162,6 +162,6 @@ describe('connection exists funcs', function () { assert.strictEqual(await hasIamCredentials(async () => connections), expected) }) - }) + } }) }) diff --git a/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts b/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts index 5e6b3c380b8..4719c0e87db 100644 --- a/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts +++ b/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts @@ -61,21 +61,21 @@ describe('ResourcesNode', function () { assert.strictEqual(childNodes.length, resourceTypes.length, 'Unexpected child count') - childNodes.forEach((node) => + for (const node of childNodes) { assert.ok(node instanceof ResourceTypeNode, 'Expected child node to be ResourceTypeNode') - ) + } }) it('has child nodes with ResourceTypeNode contextValue', async function () { const childNodes = await testNode.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue?.endsWith('ResourceTypeNode'), true, 'expected the node to have a resourceTypeNode contextValue' ) - ) + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts index 7312f519339..2c69cb7a9c0 100644 --- a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts +++ b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts @@ -57,45 +57,47 @@ describe('ResourceTypeNode', function () { assert.strictEqual(childNodes.length, resourceIdentifiers.length, 'Unexpected child count') - childNodes.forEach((node) => assert.ok(node instanceof ResourceNode, 'Expected child node to be ResourceNode')) + for (const node of childNodes) { + assert.ok(node instanceof ResourceNode, 'Expected child node to be ResourceNode') + } }) it('has child nodes with all operations contextValue when unknown operations', async function () { const childNodes = await testNode.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, 'CreatableDeletableUpdatableResourceNode', 'expected the node to have a ResourceNode contextValue' ) - ) + } }) it('has child nodes with ResourceNode contextValue including single supported operation', async function () { testNode = generateTestNode(cloudControl, ['CREATE']) const childNodes = await testNode.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, 'CreatableResourceNode', 'expected the node to have a CreatableResourceNode contextValue' ) - ) + } }) it('has child nodes with ResourceNode contextValue including multiple supported operations', async function () { testNode = generateTestNode(cloudControl, ['CREATE', 'DELETE']) const childNodes = await testNode.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, 'CreatableDeletableResourceNode', 'expected the node to have a CreatableDeletableResourceNode contextValue' ) - ) + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts b/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts index 60e39480c79..619bb24b717 100644 --- a/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts +++ b/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts @@ -56,13 +56,13 @@ describe('SchemaCodeGenUtils', async function () { ] describe('buildSchemaPackageName', async function () { - testScenarios.forEach((test) => { + for (const test of testScenarios) { it(test.scenario, async () => { const codeGen = new SchemaCodeGenUtils() const result = codeGen.buildSchemaPackageName(test.input) assert.strictEqual(result, test.expectedResult, 'Invalid package name returned') }) - }) + } }) }) diff --git a/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts b/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts index a4a88e1703a..176e12974ea 100644 --- a/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts +++ b/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts @@ -25,7 +25,7 @@ describe('submitFeedbackListener', function () { { productName: 'Amazon Q', expectedError: 'Expected failure' }, { productName: 'AWS Toolkit', expectedError: 'Expected failure' }, ] - testCases.forEach(({ productName, expectedError }) => { + for (const { productName, expectedError } of testCases) { it(`submits ${productName} feedback, disposes, and shows message on success`, async function () { const postStub = sinon.stub() mockTelemetry.postFeedback = postStub @@ -47,5 +47,5 @@ describe('submitFeedbackListener', function () { const result = await webview.submit(message) assert.strictEqual(result, expectedError) }) - }) + } }) diff --git a/packages/core/src/test/lambda/commands/listSamResources.test.ts b/packages/core/src/test/lambda/commands/listSamResources.test.ts index 37a7d227f10..428a04316eb 100644 --- a/packages/core/src/test/lambda/commands/listSamResources.test.ts +++ b/packages/core/src/test/lambda/commands/listSamResources.test.ts @@ -62,6 +62,7 @@ describe('listSamResources', () => { { name: 'stringify array', value: '[]' }, { name: 'array object', value: [] }, ] + // eslint-disable-next-line unicorn/no-array-for-each testcases.forEach(async ({ name, value }) => { it(`returns empty array given SAM CLI return ${name} given any issue`, async () => { runSamCliListResourceStub.resolves(value) diff --git a/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts b/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts index bcc65e10781..2eac7d75ecc 100644 --- a/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts +++ b/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts @@ -107,9 +107,9 @@ describe('CloudFormationStackNode', function () { assert.strictEqual(childNodes.length, 2, 'Unexpected child count') - childNodes.forEach((node) => + for (const node of childNodes) { assert.ok(node instanceof LambdaFunctionNode, 'Expected child node to be LambdaFunctionNode') - ) + } }) it('has child nodes with CloudFormation contextValue', async function () { @@ -121,13 +121,13 @@ describe('CloudFormationStackNode', function () { const node = generateTestNode({ lambdaClient, cloudFormationClient }) const childNodes = await node.getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, contextValueCloudformationLambdaFunction, 'expected the node to have a CloudFormation contextValue' ) - ) + } }) it('only includes functions which are in a CloudFormation stack', async function () { @@ -163,9 +163,9 @@ describe('CloudFormationNode', function () { const cloudFormationNode = new CloudFormationNode(regionCode, client) const children = await cloudFormationNode.getChildren() - children.forEach((node) => + for (const node of children) { assert.ok(node instanceof CloudFormationStackNode, 'Expected child node to be CloudFormationStackNode') - ) + } }) it('has sorted child nodes', async function () { diff --git a/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts b/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts index c77230a0f49..ba494680911 100644 --- a/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts +++ b/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts @@ -39,21 +39,21 @@ describe('LambdaNode', function () { assert.strictEqual(childNodes.length, 2, 'Unexpected child count') - childNodes.forEach((node) => + for (const node of childNodes) { assert.ok(node instanceof LambdaFunctionNode, 'Expected child node to be LambdaFunctionNode') - ) + } }) it('has child nodes with Lambda Function contextValue', async function () { const childNodes = await createNode('f1', 'f2').getChildren() - childNodes.forEach((node) => + for (const node of childNodes) { assert.strictEqual( node.contextValue, contextValueLambdaFunction, 'expected the node to have a CloudFormation contextValue' ) - ) + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts b/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts index 0bfe1acefe0..f47cc3fe06b 100644 --- a/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts +++ b/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts @@ -27,7 +27,7 @@ describe('compareSamLambdaRuntime', async function () { { lowerRuntime: 'nodejs14.x (Image)', higherRuntime: 'nodejs16.x' }, ] - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(`${scenario.lowerRuntime} < ${scenario.higherRuntime}`, () => { assert.ok(compareSamLambdaRuntime(scenario.lowerRuntime, scenario.higherRuntime) < 0) }) @@ -35,14 +35,14 @@ describe('compareSamLambdaRuntime', async function () { it(`${scenario.higherRuntime} > ${scenario.lowerRuntime}`, () => { assert.ok(compareSamLambdaRuntime(scenario.higherRuntime, scenario.lowerRuntime) > 0) }) - }) + } }) describe('getDependencyManager', function () { it('all runtimes are handled', function () { - samZipLambdaRuntimes.forEach((runtime) => { + for (const runtime of samZipLambdaRuntimes) { assert.ok(getDependencyManager(runtime)) - }) + } }) it('throws on deprecated runtimes', function () { assert.throws(() => getDependencyManager('nodejs')) @@ -57,9 +57,9 @@ describe('getFamily', function () { assert.strictEqual(getFamily('foo'), RuntimeFamily.Unknown) }) it('handles all known runtimes', function () { - samZipLambdaRuntimes.forEach((runtime) => { + for (const runtime of samZipLambdaRuntimes) { assert.notStrictEqual(getFamily(runtime), RuntimeFamily.Unknown) - }) + } }) it('throws on deprecated runtimes', function () { assert.throws(() => getFamily('nodejs')) @@ -158,12 +158,12 @@ describe('getNodeMajorVersion()', () => { }) describe('extracts a version from existing runtimes', function () { - nodeJsRuntimes.forEach((versionString) => { + for (const versionString of nodeJsRuntimes) { it(`extracts from runtime: "${versionString}"`, () => { const version = getNodeMajorVersion(versionString) assert(version !== undefined) assert(0 < version && version < 999) }) - }) + } }) }) diff --git a/packages/core/src/test/lambda/models/samTemplates.test.ts b/packages/core/src/test/lambda/models/samTemplates.test.ts index f8ceb68bbe0..e9105adf0b6 100644 --- a/packages/core/src/test/lambda/models/samTemplates.test.ts +++ b/packages/core/src/test/lambda/models/samTemplates.test.ts @@ -128,9 +128,9 @@ describe('getSamCliTemplateParameter', function () { describe('getTemplateDescription', async function () { it('all templates are handled', async function () { - validTemplateOptions.forEach((template) => { + for (const template of validTemplateOptions) { // Checking that call does not throw getTemplateDescription(template) - }) + } }) }) diff --git a/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts b/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts index 4651eda1c13..89a9272df30 100644 --- a/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts +++ b/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts @@ -94,7 +94,7 @@ describe('SamInvokeWebview', () => { const tempFolder = await makeTemporaryToolkitFolder() const testCases = [{ input: vscode.Uri.file(path.join(tempFolder, 'file.txt')), expected: 'file.txt' }] - testCases.forEach(({ input, expected }) => { + for (const { input, expected } of testCases) { const result = samInvokeWebview.getFileName(input.fsPath) assert.strictEqual(result, expected, `getFileName("${input}") should return "${expected}"`) @@ -105,7 +105,7 @@ describe('SamInvokeWebview', () => { nodeResult, `getFileName result should match Node's path.basename for "${input}"` ) - }) + } await fs.delete(tempFolder, { recursive: true }) }) }) @@ -396,7 +396,7 @@ describe('SamInvokeWebview', () => { const tempFolder = await makeTemporaryToolkitFolder() const testCases = [{ input: vscode.Uri.file(path.join(tempFolder, 'file.txt')), expected: 'file.txt' }] - testCases.forEach(({ input, expected }) => { + for (const { input, expected } of testCases) { const result = samInvokeWebview.getFileName(input.fsPath) assert.strictEqual(result, expected, `getFileName("${input}") should return "${expected}"`) @@ -407,7 +407,7 @@ describe('SamInvokeWebview', () => { nodeResult, `getFileName result should match Node's path.basename for "${input}"` ) - }) + } await fs.delete(tempFolder, { recursive: true }) }) it('prompts the user for a file and returns the selected file', async () => { diff --git a/packages/core/src/test/notifications/rendering.test.ts b/packages/core/src/test/notifications/rendering.test.ts index ccda76195a2..684ef97b4d2 100644 --- a/packages/core/src/test/notifications/rendering.test.ts +++ b/packages/core/src/test/notifications/rendering.test.ts @@ -65,12 +65,12 @@ describe('Notifications Rendering', function () { testWindow.onDidShowMessage((message) => { const expectedButtons = notification.uiRenderInstructions.actions?.map((actions) => actions.displayText['en-US']) ?? [] - expectedButtons.forEach((buttonText) => { + for (const buttonText of expectedButtons) { assert.ok( message.items.some((item) => item.title === buttonText), `Button "${buttonText}" is missing` ) - }) + } }) await panelNode.onReceiveNotifications([notification]) diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts index e7ee29f41da..4917979fe1f 100644 --- a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts +++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts @@ -298,9 +298,9 @@ describe('generateDeployedNode', () => { name?: string description?: string } - Object.entries(options).forEach(([key, value]) => { + for (const [key, value] of Object.entries(options)) { value !== undefined && Object.defineProperty(mockNode, key, { value, writable: true }) - }) + } return mockNode } diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts index 66515add392..8de0f71f50b 100644 --- a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts +++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts @@ -105,11 +105,11 @@ describe('PropertyNode', () => { { key: 'baz', value: 42 }, ] assert.strictEqual(nodes.length, expectedNodes.length) - nodes.forEach((node, index) => { + for (const [index, node] of nodes.entries()) { assert(node instanceof PropertyNode) assert.strictEqual(node.id, expectedNodes[index].key) assert.strictEqual(node.resource, expectedNodes[index].value) - }) + } }) }) }) diff --git a/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts index 26d3ee7a78b..86db6f54796 100644 --- a/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts +++ b/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts @@ -145,7 +145,7 @@ describe('isPublicMethodSymbol', async function () { }, ] - validPublicMethodTests.forEach((test) => { + for (const test of validPublicMethodTests) { const sampleMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol( 'FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)', '', @@ -164,7 +164,7 @@ describe('isPublicMethodSymbol', async function () { const isPublic = isValidLambdaHandler(doc, sampleMethodSymbol) assert.strictEqual(isPublic, true, 'Expected symbol to be a public method') }) - }) + } it('returns false for a symbol that is not a method', async function () { const symbol = new vscode.DocumentSymbol( diff --git a/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts index 12480997f9b..f7d42d516b6 100644 --- a/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts +++ b/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts @@ -210,7 +210,7 @@ describe('javaCodeLensProvider', () => { }, ] - validPublicMethodTests.forEach((test) => { + for (const test of validPublicMethodTests) { const sampleMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol( 'FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)', '', @@ -236,7 +236,7 @@ describe('javaCodeLensProvider', () => { const isValid = isValidLambdaHandler(doc, sampleMethodSymbol) assert.strictEqual(isValid, true, 'Expected symbol to be a valid method') }) - }) + } it('returns false for a symbol that is not a method', async function () { const symbol = new vscode.DocumentSymbol( diff --git a/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts index 5894d7259ff..f96d75e123a 100644 --- a/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts +++ b/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts @@ -24,7 +24,7 @@ describe('pythonCodeLensProvider', async function () { }, ] - testScenarios.forEach((test) => { + for (const test of testScenarios) { it(`Returns cased-drive variants for windows platforms: ${test.situation}`, async () => { const variants = getLocalRootVariants(test.inputText) assert.ok(variants) @@ -32,7 +32,7 @@ describe('pythonCodeLensProvider', async function () { assert.strictEqual(variants[0], test.asLower, 'Unexpected variant text') assert.strictEqual(variants[1], test.asUpper, 'Unexpected variant text') }) - }) + } it('Returns the same string for network location - windows', async function () { const variants = getLocalRootVariants('//share/src/code.js') @@ -63,14 +63,14 @@ describe('pythonCodeLensProvider', async function () { }, ] - testScenarios.forEach((test) => { + for (const test of testScenarios) { it(`Returns the same string for non-windows platforms: ${test.situation}`, async () => { const variants = getLocalRootVariants(test.inputText) assert.ok(variants) assert.strictEqual(variants.length, 1, 'Only expected one variant') assert.strictEqual(variants[0], test.inputText, 'Unexpected variant text') }) - }) + } } }) }) diff --git a/packages/core/src/test/shared/crashMonitoring.test.ts b/packages/core/src/test/shared/crashMonitoring.test.ts index c06b8b167a1..85ea33dfcf7 100644 --- a/packages/core/src/test/shared/crashMonitoring.test.ts +++ b/packages/core/src/test/shared/crashMonitoring.test.ts @@ -84,7 +84,11 @@ export const crashMonitoringTest = async () => { afterEach(async function () { // clean up all running instances - spawnedExtensions?.forEach((e) => e.crash()) + if (spawnedExtensions) { + for (const e of spawnedExtensions) { + void e.crash() + } + } sandbox.restore() }) @@ -255,13 +259,13 @@ export const crashMonitoringTest = async () => { expectedExts.sort((a, b) => a.metadata.sessionId.localeCompare(b.metadata.sessionId)) deduplicatedSessionEnds.sort((a, b) => a.proxiedSessionId!.localeCompare(b.proxiedSessionId!)) - expectedExts.forEach((ext, i) => { + for (const [i, ext] of expectedExts.entries()) { partialDeepCompare(deduplicatedSessionEnds[i], { result: 'Failed', proxiedSessionId: ext.metadata.sessionId, reason: 'ExtHostCrashed', }) - }) + } } function deduplicate(array: T[], predicate: (a: T, b: T) => boolean): T[] { diff --git a/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts index eaeb9bc571d..664eb454fd6 100644 --- a/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts +++ b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts @@ -156,13 +156,13 @@ describe('UserCredentialsUtils', function () { async function createCredentialsFile(filename: string, profileNames: string[]): Promise { let fileContents = '' - profileNames.forEach((profileName) => { + for (const profileName of profileNames) { fileContents += `[${profileName}] aws_access_key_id = FAKEKEY aws_SecRet_aCCess_key = FAKESECRET REGION = us-weast-3 ` - }) + } await fs.writeFile(filename, fileContents) } diff --git a/packages/core/src/test/shared/errors.test.ts b/packages/core/src/test/shared/errors.test.ts index 428a32c13ee..32d18186912 100644 --- a/packages/core/src/test/shared/errors.test.ts +++ b/packages/core/src/test/shared/errors.test.ts @@ -367,12 +367,12 @@ describe('resolveErrorMessageToDisplay()', function () { }) // Sanity check specific errors are resolved as expected - prioritiziedAwsErrors.forEach((error) => { + for (const error of prioritiziedAwsErrors) { it(`resolves ${error.code} message when provided directly`, function () { const message = resolveErrorMessageToDisplay(error, defaultMessage) assert.strictEqual(message, `${defaultMessage}: ${awsErrorMessage}`) }) - }) + } it('gets default message if no error is given', function () { const message = resolveErrorMessageToDisplay(undefined, defaultMessage) diff --git a/packages/core/src/test/shared/fs/fs.test.ts b/packages/core/src/test/shared/fs/fs.test.ts index 5fa4428559f..ad8d8777462 100644 --- a/packages/core/src/test/shared/fs/fs.test.ts +++ b/packages/core/src/test/shared/fs/fs.test.ts @@ -69,13 +69,13 @@ describe('FileSystem', function () { describe('writeFile()', function () { const opts: { atomic: boolean }[] = [{ atomic: false }, { atomic: true }] - opts.forEach((opt) => { + for (const opt of opts) { it(`writes a file (atomic: ${opt.atomic})`, async function () { const filePath = testFolder.pathFrom('myFileName') await fs.writeFile(filePath, 'MyContent', opt) assert.strictEqual(readFileSync(filePath, 'utf-8'), 'MyContent') }) - }) + } it('writes a file with encoded text', async function () { const filePath = testFolder.pathFrom('myFileName') @@ -100,7 +100,7 @@ describe('FileSystem', function () { { vsc: true, node: false }, { vsc: true, node: true }, ] - throwCombinations.forEach((throws) => { + for (const throws of throwCombinations) { it(`still writes a file if one of the atomic write methods fails: ${JSON.stringify(throws)}`, async function () { if (throws.vsc) { sandbox.stub(fs, 'rename').throws(new Error('Test Error Message VSC')) @@ -134,7 +134,7 @@ describe('FileSystem', function () { testutil.assertTelemetry('ide_fileSystem', expectedTelemetry) } }) - }) + } it('throws when existing file + no permission', async function () { if (isWin()) { @@ -218,6 +218,7 @@ describe('FileSystem', function () { describe('mkdir()', function () { const paths = ['a', 'a/b', 'a/b/c', 'a/b/c/d/'] + // eslint-disable-next-line unicorn/no-array-for-each paths.forEach(async function (p) { it(`creates folder: '${p}'`, async function () { const dirPath = testFolder.pathFrom(p) @@ -226,6 +227,7 @@ describe('FileSystem', function () { }) }) + // eslint-disable-next-line unicorn/no-array-for-each paths.forEach(async function (p) { it(`creates folder but uses the "fs" module if in Cloud9: '${p}'`, async function () { sandbox.stub(extensionUtilities, 'isCloud9').returns(true) diff --git a/packages/core/src/test/shared/globalState.test.ts b/packages/core/src/test/shared/globalState.test.ts index 6788abc50e9..d632b745051 100644 --- a/packages/core/src/test/shared/globalState.test.ts +++ b/packages/core/src/test/shared/globalState.test.ts @@ -33,24 +33,24 @@ describe('GlobalState', function () { ] describe('get()', function () { - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await globalState.update(testKey, scenario.testValue) const actualValue = globalState.get(testKey) assert.deepStrictEqual(actualValue, scenario.testValue) }) - }) + } }) describe('update()', function () { - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await globalState.update(testKey, scenario.testValue) const savedValue = globalState.get(testKey) assert.deepStrictEqual(savedValue, scenario.testValue) }) - }) + } }) it('getStrict()', async () => { diff --git a/packages/core/src/test/shared/logger/consoleLogLogger.test.ts b/packages/core/src/test/shared/logger/consoleLogLogger.test.ts index d66790514e0..3a2f323d8d4 100644 --- a/packages/core/src/test/shared/logger/consoleLogLogger.test.ts +++ b/packages/core/src/test/shared/logger/consoleLogLogger.test.ts @@ -20,7 +20,7 @@ describe('ConsoleLogTransport', async function () { }) const allLevels = Object.keys(Levels) as Level[] - allLevels.forEach((level) => { + for (const level of allLevels) { it(`logs to console with level: '${level}'`, async function () { const untilLogged = instance.log({ level, message: 'myMessage', [MESSAGE]: 'myMessageFormatted' }, next) await untilLogged @@ -28,7 +28,7 @@ describe('ConsoleLogTransport', async function () { assert.strictEqual(fakeConsole[level].getCall(0).args[0], 'myMessageFormatted') assert.strictEqual(next.callCount, 1) }) - }) + } it(`logs to the default if non-supported log level provided`, async function () { const untilLogged = instance.log( diff --git a/packages/core/src/test/shared/logger/toolkitLogger.test.ts b/packages/core/src/test/shared/logger/toolkitLogger.test.ts index b8ced878c7a..80545f1c006 100644 --- a/packages/core/src/test/shared/logger/toolkitLogger.test.ts +++ b/packages/core/src/test/shared/logger/toolkitLogger.test.ts @@ -179,7 +179,7 @@ describe('ToolkitLogger', function () { await checkFile(testLogger, tempLogPath, [loggedVerboseEntry], [nonLoggedVerboseEntry]) }) - happyLogScenarios.forEach((scenario) => { + for (const scenario of happyLogScenarios) { it(scenario.name, async () => { const msg = `message for ${scenario.name} arg1 %s, arg2 %O` const args = [42, ['a', 'b']] @@ -191,7 +191,7 @@ describe('ToolkitLogger', function () { await checkFile(testLogger, tempLogPath, [expectedMsg]) }) - }) + } }) describe('logs to an OutputChannel', async function () { @@ -257,7 +257,7 @@ describe('ToolkitLogger', function () { assertLogsContain('This is a test message', true, 'verbose') }) - happyLogScenarios.forEach((scenario) => { + for (const scenario of happyLogScenarios) { it(scenario.name, async () => { const message = `message for ${scenario.name}` testLogger = new ToolkitLogger('debug') @@ -269,7 +269,7 @@ describe('ToolkitLogger', function () { assert.ok((await waitForMessage).includes(message), 'Expected error message to be logged') }) - }) + } // Logger writes to OutputChannel in async manner. async function waitForLoggedTextByCount(entries: number): Promise { @@ -351,7 +351,9 @@ describe('ToolkitLogger', function () { } await checkFile(testLogger, tempLogPath, expected, unexpected) - idMap.forEach((msg, id) => assert.ok(testLogger.getLogById(id, tempLogPath)?.includes(msg))) + for (const [id, msg] of idMap.entries()) { + assert.ok(testLogger.getLogById(id, tempLogPath)?.includes(msg)) + } }) it('can find log from multiple files', async function () { diff --git a/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts b/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts index 1fb4dc6d268..dc27ad4ed89 100644 --- a/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts +++ b/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts @@ -35,10 +35,10 @@ describe('SamCliInfoInvocation', async function () { }) it('converts non-response to undefined', async function () { - ;['qwerty', '{"version": "1.2.3"} you have no new email messages'].forEach((output) => { + for (const output of ['qwerty', '{"version": "1.2.3"} you have no new email messages']) { const response = new TestSamCliInfoCommand('').convertOutput(output) assert.strictEqual(response, undefined, `Expected text to not parse: ${output}`) - }) + } }) }) diff --git a/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts b/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts index 78943dca218..3156e2afb1e 100644 --- a/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts +++ b/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts @@ -65,7 +65,7 @@ describe('getInvalidSamMsg', async function () { }, ] - versionValidationTestScenarios.forEach((test) => { + for (const test of versionValidationTestScenarios) { it(`handles InvalidSamCliVersionError - ${test.situation}`, async () => { const validatorResult: SamCliVersionValidatorResult = { version: '1.2.3', @@ -92,7 +92,7 @@ describe('getInvalidSamMsg', async function () { } ) }) - }) + } it('handles Unexpected input', async function () { getInvalidSamMsg( diff --git a/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts b/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts index f5cb05a7dbd..15c1a57a139 100644 --- a/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts +++ b/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts @@ -69,7 +69,7 @@ describe('DefaultSamCliValidator', async function () { ] as const describe('detectValidSamCli', async function () { - scenarios.forEach((test) => { + for (const test of scenarios) { it(`found SAM CLI, ${test.situation}`, async () => { const validatorContext = new TestSamCliValidatorContext(test.version) validatorContext.mockSamLocation = 'somesamclipath' @@ -80,7 +80,7 @@ describe('DefaultSamCliValidator', async function () { assert.strictEqual(actual.versionValidation?.version, test.version) assert.strictEqual(actual.versionValidation?.validation, test.expected) }) - }) + } it('SAM CLI not found', async function () { const validatorContext = new TestSamCliValidatorContext('') @@ -93,7 +93,7 @@ describe('DefaultSamCliValidator', async function () { }) describe('getVersionValidatorResult', async function () { - scenarios.forEach((test) => { + for (const test of scenarios) { it(test.situation, async () => { const validatorContext = new TestSamCliValidatorContext(test.version) const samCliValidator = new DefaultSamCliValidator(validatorContext) @@ -102,15 +102,15 @@ describe('DefaultSamCliValidator', async function () { assert.strictEqual(actual.version, test.version) assert.strictEqual(actual.validation, test.expected) }) - }) + } }) describe('validateSamCliVersion', async function () { - scenarios.forEach((test) => { + for (const test of scenarios) { it(test.situation, async () => { const validation = DefaultSamCliValidator.validateSamCliVersion(test.version) assert.strictEqual(validation, test.expected) }) - }) + } }) }) diff --git a/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts index db804ba718d..8528b0c6189 100644 --- a/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts +++ b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts @@ -103,7 +103,7 @@ export async function assertLogContainsBadExitInformation( .getLoggedEntries() .filter((x) => !isError(x)) .join('\n') - expectedTexts.forEach((expectedText) => { + for (const expectedText of expectedTexts) { assert.ok(logText.includes(expectedText.text), expectedText.verifyMessage) - }) + } } diff --git a/packages/core/src/test/shared/sam/deploy.test.ts b/packages/core/src/test/shared/sam/deploy.test.ts index c38c6eb8731..7a8cf0ed807 100644 --- a/packages/core/src/test/shared/sam/deploy.test.ts +++ b/packages/core/src/test/shared/sam/deploy.test.ts @@ -801,9 +801,9 @@ describe('SAM DeployWizard', async function () { } ) - expectedCallOrder.forEach((title, index) => { + for (const [index, title] of expectedCallOrder.entries()) { prompterTester.assertCallOrder(title, index + 1) - }) + } }) it('happy path with samconfig.toml', async () => { diff --git a/packages/core/src/test/shared/sam/samTestUtils.ts b/packages/core/src/test/shared/sam/samTestUtils.ts index 16520c0ca95..61b67446f5b 100644 --- a/packages/core/src/test/shared/sam/samTestUtils.ts +++ b/packages/core/src/test/shared/sam/samTestUtils.ts @@ -72,9 +72,9 @@ export function generateSamconfigData(data: { for (const [operation, parameters] of Object.entries(data)) { if (parameters && parameters.length > 0) { result.push('', `[default.${operation}.parameters]`) - parameters.forEach(({ key, value }) => { + for (const { key, value } of parameters) { value && result.push(`${key} = "${value}"`) - }) + } } } diff --git a/packages/core/src/test/shared/sam/sync.test.ts b/packages/core/src/test/shared/sam/sync.test.ts index 627cee964f6..acb74619171 100644 --- a/packages/core/src/test/shared/sam/sync.test.ts +++ b/packages/core/src/test/shared/sam/sync.test.ts @@ -901,9 +901,9 @@ describe('SAM SyncWizard', async () => { 'Select an S3 Bucket', 'Specify parameters for sync', ] - expectedCallOrder.forEach((title, index) => { + for (const [index, title] of expectedCallOrder.entries()) { prompterTester.assertCallOrder(title, index + 1) - }) + } }) describe('entry: command palette', () => { @@ -2160,7 +2160,7 @@ describe('SAM sync helper functions', () => { }, ] - testCases.forEach(({ name, response }) => { + for (const { name, response } of testCases) { it(`should handle ${name}`, async () => { createRepositoryStub.resolves(response) @@ -2169,7 +2169,7 @@ describe('SAM sync helper functions', () => { assert(!result) assert(createRepositoryStub.calledOnceWith(repoName)) }) - }) + } }) }) }) diff --git a/packages/core/src/test/shared/sam/utils.test.ts b/packages/core/src/test/shared/sam/utils.test.ts index 590db5a9a81..991e6644471 100644 --- a/packages/core/src/test/shared/sam/utils.test.ts +++ b/packages/core/src/test/shared/sam/utils.test.ts @@ -68,11 +68,11 @@ describe('SAM utils', async function () { expected: undefined, }, ] - testScenarios.forEach((scenario) => { + for (const scenario of testScenarios) { it(`returns Source for ${scenario.name}`, async () => { assert.strictEqual(getSource(scenario.value), scenario.expected) }) - }) + } }) describe('checks if it is DotNet', async function () { @@ -159,12 +159,12 @@ describe('SAM utils', async function () { sandbox.restore() }) - testScenarios.forEach((scenario) => { + for (const scenario of testScenarios) { it(`returns isDotNetRuntime for ${scenario.name}`, async () => { const response = await isDotnetRuntime(noUri, scenario.template) assert.strictEqual(response, scenario.expected) }) - }) + } }) describe('getSamCliPathAndVersion', async function () { diff --git a/packages/core/src/test/shared/settings.test.ts b/packages/core/src/test/shared/settings.test.ts index 5d485489138..da68ada2cde 100644 --- a/packages/core/src/test/shared/settings.test.ts +++ b/packages/core/src/test/shared/settings.test.ts @@ -79,14 +79,14 @@ describe('Settings', function () { settings = vscode.workspace.getConfiguration() }) - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await settings.update(settingKey, scenario.testValue, settingsTarget) const actualValue = sut.get(settingKey) assert.deepStrictEqual(actualValue, scenario.testValue) }) - }) + } it('failure modes', async () => { // @@ -112,7 +112,7 @@ describe('Settings', function () { }) describe('update', function () { - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await sut.update(settingKey, scenario.testValue) @@ -122,7 +122,7 @@ describe('Settings', function () { assert.deepStrictEqual(savedValue, scenario.testValue) }) - }) + } it('shows message on failure', async () => { // TODO: could avoid sinon if we can force vscode to use a dummy settings.json file. @@ -452,7 +452,7 @@ describe('PromptSetting', function () { desc: 'suppresses prompt', }, ] - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { const defaultSetting = settings.get(promptSettingKey, Object) await settings.update(promptSettingKey, scenario.testValue) @@ -461,7 +461,7 @@ describe('PromptSetting', function () { const expected = { ...defaultSetting, ...scenario.expected } assert.deepStrictEqual(actual, expected) }) - }) + } }) describe('isPromptEnabled', async function () { @@ -494,7 +494,7 @@ describe('PromptSetting', function () { }, ] - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await settings.update(promptSettingKey, scenario.testValue) const before = settings.get(promptSettingKey, Object, {}) @@ -506,7 +506,7 @@ describe('PromptSetting', function () { { ...before, ...scenario.promptAfter } ) }) - }) + } }) }) diff --git a/packages/core/src/test/shared/telemetry/activation.test.ts b/packages/core/src/test/shared/telemetry/activation.test.ts index f7643046358..a277cb0b042 100644 --- a/packages/core/src/test/shared/telemetry/activation.test.ts +++ b/packages/core/src/test/shared/telemetry/activation.test.ts @@ -59,10 +59,10 @@ describe('hasUserSeenTelemetryNotice', async function () { { currentState: 9999, expectedHasSeen: true, desc: 'seen a future version' }, ] - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await globals.globalState.update('awsTelemetryNoticeVersionAck', scenario.currentState) assert.strictEqual(hasUserSeenTelemetryNotice(), scenario.expectedHasSeen) }) - }) + } }) diff --git a/packages/core/src/test/shared/telemetry/util.test.ts b/packages/core/src/test/shared/telemetry/util.test.ts index 627ad58f5e7..4c19e924585 100644 --- a/packages/core/src/test/shared/telemetry/util.test.ts +++ b/packages/core/src/test/shared/telemetry/util.test.ts @@ -83,17 +83,17 @@ describe('TelemetryConfig', function () { ] describe('isTelemetryEnabled', function () { - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, async () => { await settings.update(settingKey, scenario.initialSettingValue) assert.strictEqual(sut.isEnabled(), scenario.expectedIsEnabledValue) }) - }) + } }) describe('sanitizeTelemetrySetting', function () { - scenarios.forEach((scenario) => { + for (const scenario of scenarios) { it(scenario.desc, () => { const tryConvert = () => { try { @@ -105,7 +105,7 @@ describe('TelemetryConfig', function () { assert.deepStrictEqual(tryConvert(), scenario.expectedSanitizedValue) }) - }) + } }) }) diff --git a/packages/core/src/test/shared/ui/inputPrompter.test.ts b/packages/core/src/test/shared/ui/inputPrompter.test.ts index 2f8c64d3cd8..fdf8dbb1600 100644 --- a/packages/core/src/test/shared/ui/inputPrompter.test.ts +++ b/packages/core/src/test/shared/ui/inputPrompter.test.ts @@ -21,9 +21,9 @@ describe('createInputBox', function () { const prompter = createInputBox() const inputBox = prompter.inputBox - Object.keys(defaultInputboxOptions).forEach((key) => { + for (const key of Object.keys(defaultInputboxOptions)) { assert.strictEqual(inputBox[key as keyof vscode.InputBox], (defaultInputboxOptions as any)[key]) - }) + } }) }) diff --git a/packages/core/src/test/shared/ui/pickerPrompter.test.ts b/packages/core/src/test/shared/ui/pickerPrompter.test.ts index 67cd56c5d61..cbf2a7ae3af 100644 --- a/packages/core/src/test/shared/ui/pickerPrompter.test.ts +++ b/packages/core/src/test/shared/ui/pickerPrompter.test.ts @@ -31,12 +31,12 @@ describe('createQuickPick', function () { const prompter = createQuickPick([]) const picker = prompter.quickPick - Object.keys(picker).forEach((key) => { + for (const key of Object.keys(picker)) { const defaultValue = (defaultQuickpickOptions as Record)[key] if (defaultValue !== undefined) { assert.strictEqual(picker[key as keyof vscode.QuickPick], defaultValue) } - }) + } }) it('creates a new prompter with options', async function () { diff --git a/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts b/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts index 4687ec10d5f..00a9dd7eeb3 100644 --- a/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts +++ b/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts @@ -89,7 +89,9 @@ describe('regionSubmenu', function () { submenuPrompter.activePrompter!.onDidChangeBusy((b: boolean) => { if (!b) { const itemsAfterLabels = submenuPrompter.activePrompter!.quickPick.items.map((i) => i.label) - region2Data.forEach((item) => assert(itemsAfterLabels.includes(item))) + for (const item of region2Data) { + assert(itemsAfterLabels.includes(item)) + } assert.notStrictEqual(itemsBeforeLabels, itemsAfterLabels) } }) diff --git a/packages/core/src/test/shared/utilities/asyncCollection.test.ts b/packages/core/src/test/shared/utilities/asyncCollection.test.ts index 5272026b97c..ee10a1ad4bd 100644 --- a/packages/core/src/test/shared/utilities/asyncCollection.test.ts +++ b/packages/core/src/test/shared/utilities/asyncCollection.test.ts @@ -52,12 +52,16 @@ describe('AsyncCollection', function () { it('can turn into a map using property key', async function () { const map = await toCollection(genItem).toMap('name') - items.forEach((v) => assert.strictEqual(map.get(v.name), v)) + for (const v of items) { + assert.strictEqual(map.get(v.name), v) + } }) it('can turn into a map using function', async function () { const map = await toCollection(genItem).toMap((i) => i.data.toString()) - items.forEach((v) => assert.strictEqual(map.get(v.data.toString()), v)) + for (const v of items) { + assert.strictEqual(map.get(v.data.toString()), v) + } }) it('can map', async function () { diff --git a/packages/core/src/test/shared/utilities/textUtilities.test.ts b/packages/core/src/test/shared/utilities/textUtilities.test.ts index 8a62de243df..0ea0e14377b 100644 --- a/packages/core/src/test/shared/utilities/textUtilities.test.ts +++ b/packages/core/src/test/shared/utilities/textUtilities.test.ts @@ -141,11 +141,11 @@ describe('sanitizeFilename', function () { { input: 'foo.txt', output: 'foo.txt', case: 'keeps dot' }, { input: 'züb', output: 'züb', case: 'keeps special chars' }, ] - cases.forEach((testCase) => { + for (const testCase of cases) { it(testCase.case, function () { assert.strictEqual(sanitizeFilename(testCase.input, testCase.replaceString), testCase.output) }) - }) + } }) describe('undefinedIfEmpty', function () { @@ -157,9 +157,9 @@ describe('undefinedIfEmpty', function () { { input: ' foo ', output: ' foo ', case: 'return original str without trim' }, ] - cases.forEach((testCases) => { + for (const testCases of cases) { it(testCases.case, function () { assert.strictEqual(undefinedIfEmpty(testCases.input), testCases.output) }) - }) + } }) diff --git a/packages/core/src/test/shared/vscode/env.test.ts b/packages/core/src/test/shared/vscode/env.test.ts index bc1c1dde9dc..ef81bdf05ab 100644 --- a/packages/core/src/test/shared/vscode/env.test.ts +++ b/packages/core/src/test/shared/vscode/env.test.ts @@ -35,7 +35,9 @@ describe('env', function () { const envVars: string[] = [] afterEach(() => { - envVars.forEach((v) => delete process.env[v]) + for (const v of envVars) { + delete process.env[v] + } envVars.length = 0 }) diff --git a/packages/core/src/test/shared/vscode/quickInput.ts b/packages/core/src/test/shared/vscode/quickInput.ts index 8d1e702eb5d..1601485fc1d 100644 --- a/packages/core/src/test/shared/vscode/quickInput.ts +++ b/packages/core/src/test/shared/vscode/quickInput.ts @@ -107,11 +107,11 @@ function assertItems(actual: T[], expected: Item return throwError('Picker had different number of items', actual, expected) } - actual.forEach((actualItem, index) => { + for (const [index, actualItem] of actual.entries()) { if (!matchItem(actualItem, expected[index])) { throwError(`Unexpected item found at index ${index}`, actual, expected[index]) } - }) + } } function assertItemButtons(actual: T[], expected: ItemButtonMatcher[]): void { @@ -119,11 +119,11 @@ function assertItemButtons(actual: T[], expec return throwError('Item had different number of buttons', actual, expected) } - actual.forEach((actualItem, index) => { + for (const [index, actualItem] of actual.entries()) { if (!matchItemButton(actualItem, expected[index])) { throwError(`Unexpected item button found at index ${index}`, actual, expected[index]) } - }) + } } function findButtonOrThrow( @@ -338,7 +338,9 @@ export function createTestQuickPick(picker: vsco const emitters = toRecord(pickerEvents, () => new vscode.EventEmitter()) const triggers = toRecord(pickerEvents, (k) => emitters[k].fire.bind(emitters[k])) const extraEmitters = createExtraEmitters() - keys(emitters).forEach((key) => picker[key](triggers[key])) + for (const key of keys(emitters)) { + picker[key](triggers[key]) + } const state = { visible: false } const tester = new PickerTester(picker, emitters, extraEmitters) @@ -439,7 +441,9 @@ export function createTestInputBox(inputBox: vscode.InputBox): TestInputBox { const triggers = toRecord(inputEvents, (k) => emitters[k].fire.bind(emitters[k])) const extraEmitters = createExtraEmitters() - keys(emitters).forEach((key) => inputBox[key](triggers[key])) + for (const key of keys(emitters)) { + inputBox[key](triggers[key]) + } const state = { visible: false } const tester = new InputBoxTester(inputBox, emitters, extraEmitters) diff --git a/packages/core/src/test/shared/vscode/window.ts b/packages/core/src/test/shared/vscode/window.ts index 971ae78c4ba..c01cae66ded 100644 --- a/packages/core/src/test/shared/vscode/window.ts +++ b/packages/core/src/test/shared/vscode/window.ts @@ -196,6 +196,7 @@ export function createTestWindow(workspace = vscode.workspace): Window & TestWin const picker = createQuickPick() const onDidSelectItem = options?.onDidSelectItem?.bind(options) if (onDidSelectItem) { + // eslint-disable-next-line unicorn/no-array-for-each picker.onDidChangeSelection((items) => items.forEach(onDidSelectItem)) } diff --git a/packages/core/src/test/shared/wizards/compositWizard.test.ts b/packages/core/src/test/shared/wizards/compositWizard.test.ts index 44e074fc96c..e148a3deea1 100644 --- a/packages/core/src/test/shared/wizards/compositWizard.test.ts +++ b/packages/core/src/test/shared/wizards/compositWizard.test.ts @@ -429,18 +429,18 @@ describe('NestedWizard', () => { function setupPrompterTester(titles: string[]) { const prompterTester = PrompterTester.init() - titles.forEach((title) => { + for (const title of titles) { prompterTester.handleQuickPick(title, (quickPick) => { quickPick.acceptItem(quickPick.items[0]) }) - }) + } prompterTester.build() return prompterTester } function assertWizardOutput(prompterTester: PrompterTester, orderedTitle: string[], result: any, output: any) { assert.deepStrictEqual(result, output) - orderedTitle.forEach((title, index) => { + for (const [index, title] of orderedTitle.entries()) { prompterTester.assertCallOrder(title, index + 1) - }) + } } diff --git a/packages/core/src/test/shared/wizards/prompterTester.ts b/packages/core/src/test/shared/wizards/prompterTester.ts index 0fbe93f084a..e859816039e 100644 --- a/packages/core/src/test/shared/wizards/prompterTester.ts +++ b/packages/core/src/test/shared/wizards/prompterTester.ts @@ -146,11 +146,13 @@ export function createPromptHandler(config: { const handlersMap = new Map() // Setup handlers map - config.numbered?.forEach((item) => { - item.order.forEach((orderNum) => { - handlersMap.set(orderNum, item.handler) - }) - }) + if (config.numbered) { + for (const item of config.numbered) { + for (const orderNum of item.order) { + handlersMap.set(orderNum, item.handler) + } + } + } while (true) { currentIteration++ diff --git a/packages/core/src/test/shared/wizards/wizard.test.ts b/packages/core/src/test/shared/wizards/wizard.test.ts index 188d25767c2..2e93ac2fa03 100644 --- a/packages/core/src/test/shared/wizards/wizard.test.ts +++ b/packages/core/src/test/shared/wizards/wizard.test.ts @@ -160,12 +160,20 @@ class TestPrompter extends Prompter { public assertStepEstimate(input: T, expected: number): AssertStepMethods { return { - onCall: (...order: number[]) => order.forEach((i) => this.checkEstimate(input, expected, i)), + onCall: (...order: number[]) => { + for (const i of order) { + this.checkEstimate(input, expected, i) + } + }, onFirstCall: () => this.checkEstimate(input, expected, 1), onSecondCall: () => this.checkEstimate(input, expected, 2), onThirdCall: () => this.checkEstimate(input, expected, 3), onFourthCall: () => this.checkEstimate(input, expected, 4), - onEveryCall: () => this.acceptedStates.forEach((_, i) => this.checkEstimate(input, expected, i + 1)), + onEveryCall: () => { + for (const [i, _] of this.acceptedStates.entries()) { + this.checkEstimate(input, expected, i + 1) + } + }, } as AssertStepMethods } @@ -185,12 +193,20 @@ class TestPrompter extends Prompter { /** Check if the prompter was given the expected steps */ public assertSteps(current: number, total: number): AssertStepMethods { return { - onCall: (...order: number[]) => order.forEach((i) => this.checkSteps([current, total], i)), + onCall: (...order: number[]) => { + for (const i of order) { + this.checkSteps([current, total], i) + } + }, onFirstCall: () => this.checkSteps([current, total], 1), onSecondCall: () => this.checkSteps([current, total], 2), onThirdCall: () => this.checkSteps([current, total], 3), onFourthCall: () => this.checkSteps([current, total], 4), - onEveryCall: () => this.acceptedSteps.forEach((_, i) => this.checkSteps([current, total], i + 1)), + onEveryCall: () => { + for (const [i, _] of this.acceptedSteps.entries()) { + this.checkSteps([current, total], i + 1) + } + }, } as AssertStepMethods } diff --git a/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts b/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts index ee031d5841d..771dff9a5dd 100644 --- a/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts +++ b/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts @@ -29,9 +29,9 @@ describe('DocumentTypeNode', function () { const childNodes = await testNode.getChildren() assert.strictEqual(childNodes.length, expectedChildNodeNames.length) - childNodes.forEach((child, index) => { + for (const [index, child] of childNodes.entries()) { assert.strictEqual(child.label, expectedChildNodeNames[index]) - }) + } }) it('handles error', async function () { diff --git a/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts b/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts index 203c8e2af8b..2c44bc45315 100644 --- a/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts +++ b/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts @@ -53,9 +53,9 @@ describe('RegistryItemNode', function () { const expectedNodeNames = [`${owner}doc`] assert.strictEqual(childNode.length, expectedNodeNames.length) - childNode.forEach((node, index) => { + for (const [index, node] of childNode.entries()) { assert.strictEqual(node.label, expectedNodeNames[index]) - }) + } }) ) }) diff --git a/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts b/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts index b815980c6be..29eb906b7a8 100644 --- a/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts +++ b/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts @@ -16,9 +16,9 @@ describe('SsmDocumentNode', function () { assert.strictEqual(childNodes.length, expectedChildNodeNames.length, 'Unexpected child node length') - childNodes.forEach((node, index) => { + for (const [index, node] of childNodes.entries()) { assert.ok(node instanceof DocumentTypeNode, 'Expected child node to be RegistryItemNode') assert.strictEqual(node.label, expectedChildNodeNames[index]) - }) + } }) }) diff --git a/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts b/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts index 32af415ecde..7aee7f61641 100644 --- a/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts +++ b/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts @@ -26,13 +26,13 @@ describe('validateDocumenttName', function () { assert.strictEqual(validateDocumentName('Aaaaa'), undefined) }) - invalidErrors.forEach((invalid) => { + for (const invalid of invalidErrors) { describe(invalid.error, () => { - invalid.documentNames.forEach((documentName) => { + for (const documentName of invalid.documentNames) { it(documentName, () => { assert.strictEqual(validateDocumentName(documentName), invalid.error) }) - }) + } }) - }) + } }) diff --git a/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts b/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts index e6b534f5117..0f6df30e3e7 100644 --- a/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts +++ b/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts @@ -52,14 +52,14 @@ describe('StepFunctionsNode', function () { assert.strictEqual(childNodes.length, 2, 'Unexpected child count') - childNodes.forEach((node) => { + for (const node of childNodes) { assert.ok(node instanceof StateMachineNode, 'Expected child node to be StateMachineNode') assert.strictEqual( node.contextValue, contextValueStateMachine, 'expected the node to have a State Machine contextValue' ) - }) + } }) it('sorts child nodes', async function () { diff --git a/packages/core/src/test/testRunner.ts b/packages/core/src/test/testRunner.ts index 7a90977587c..dfd8071d8bc 100644 --- a/packages/core/src/test/testRunner.ts +++ b/packages/core/src/test/testRunner.ts @@ -97,7 +97,7 @@ export async function runTests( // The `require` option for Mocha isn't working for some reason (maybe user error?) // So instead we are loading the modules ourselves and registering the relevant hooks - initTests.forEach((relativePath) => { + for (const relativePath of initTests) { const fullPath = path.join(dist, relativePath).replace('.ts', '.js') if (!fs.exists(fullPath)) { console.error(`error: missing ${fullPath}`) @@ -114,10 +114,12 @@ export async function runTests( if (pluginFile.mochaHooks) { mocha.rootHooks(pluginFile.mochaHooks) } - }) + } function runMocha(files: string[]): Promise { - files.forEach((f) => mocha.addFile(path.resolve(dist, f))) + for (const f of files) { + mocha.addFile(path.resolve(dist, f)) + } return new Promise((resolve, reject) => { mocha.run((failures) => { if (failures > 0) { diff --git a/packages/core/src/test/testUtil.ts b/packages/core/src/test/testUtil.ts index eac5ffc2a2b..d5b9cc324c2 100644 --- a/packages/core/src/test/testUtil.ts +++ b/packages/core/src/test/testUtil.ts @@ -344,9 +344,9 @@ export function assertTelemetry( const passive = expectedCopy?.passive delete expectedCopy['passive'] - Object.keys(expectedCopy).forEach( - (k) => ((expectedCopy as any)[k] = (expectedCopy as Record)[k]?.toString()) - ) + for (const k of Object.keys(expectedCopy)) { + ;(expectedCopy as any)[k] = (expectedCopy as Record)[k]?.toString() + } const msg = `telemetry metric ${i + 1} (of ${ expectedList.length diff --git a/packages/core/src/testE2E/codecatalyst/client.test.ts b/packages/core/src/testE2E/codecatalyst/client.test.ts index b6db9cbdd8f..242f0f64086 100644 --- a/packages/core/src/testE2E/codecatalyst/client.test.ts +++ b/packages/core/src/testE2E/codecatalyst/client.test.ts @@ -344,9 +344,9 @@ describe('Test how this codebase uses the CodeCatalyst API', function () { if (remainingDevEnvs.length > 0) { // Dev Envs may still be returned if they are still in the process of being deleted. // Just ensure they are in the process or fully deleted. - remainingDevEnvs.forEach((devEnv) => { + for (const devEnv of remainingDevEnvs) { assert.ok(['DELETING', 'DELETED'].includes(devEnv.status), 'Dev Env was not successfully deleted') - }) + } } }) diff --git a/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts b/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts index f644ada53da..c18f28b47d2 100644 --- a/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts +++ b/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts @@ -110,7 +110,7 @@ describe('Application Builder', async () => { const expectedStackName = await samConfig.getCommandParam('global', 'stack_name') const expectedRegion = await samConfig.getCommandParam('global', 'region') - appBuilderTestAppResourceNodes.forEach((node) => { + for (const node of appBuilderTestAppResourceNodes) { if (node instanceof ResourceNode) { assert.strictEqual(node.resource.region, expectedRegion) assert.strictEqual(node.resource.stackName, expectedStackName) @@ -119,7 +119,7 @@ describe('Application Builder', async () => { } else { assert.fail('Node is not an instance of ResourceNode') } - }) + } // Validate Lambda resource node const lambdaResourceNode = getResourceNodeByType( diff --git a/packages/core/src/testInteg/appBuilder/walkthrough.test.ts b/packages/core/src/testInteg/appBuilder/walkthrough.test.ts index 79b76a09a24..a8097101b1e 100644 --- a/packages/core/src/testInteg/appBuilder/walkthrough.test.ts +++ b/packages/core/src/testInteg/appBuilder/walkthrough.test.ts @@ -10,7 +10,7 @@ describe('Walkthrough pattern URL exists', function () { const serverlessLandOwner = 'aws-samples' const serverlessLandRepo = 'serverless-patterns' - appMap.forEach((app, key) => { + for (const [key, app] of appMap.entries()) { it(`Walkthrough pattern URL exists for ${key}`, async function () { const url = `https://github.com/${serverlessLandOwner}/${serverlessLandRepo}/releases/latest/download/${app.asset}` const response = await fetch(url, { @@ -19,5 +19,5 @@ describe('Walkthrough pattern URL exists', function () { // ignore if too frequent assert.ok(response.status === 200 || response.status === 429) }) - }) + } }) diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts index 50e8817f409..e2eeb3b751c 100644 --- a/packages/core/src/testInteg/sam.test.ts +++ b/packages/core/src/testInteg/sam.test.ts @@ -396,7 +396,9 @@ describe('SAM Integration Tests', async function () { }) afterEach(async function () { - testDisposables.forEach((d) => d.dispose()) + for (const d of testDisposables) { + d.dispose() + } await stopDebugger(undefined) }) diff --git a/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts index e6bbb3bd83a..d64d3a81d6c 100644 --- a/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts +++ b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts @@ -107,7 +107,7 @@ describe('workspaceUtils', () => { globals.codelensRootRegistry.dispose() }) - testScenarios.forEach((test) => { + for (const test of testScenarios) { it(test.scenario, async () => { filesToDelete = test.filesToUse for (const file of test.filesToUse) { @@ -125,7 +125,7 @@ describe('workspaceUtils', () => { assert.strictEqual(projectFile, test.expectedResult) } }) - }) + } }) describe('getWorkspaceRelativePath', function () { diff --git a/packages/core/src/testLint/gitSecrets.test.ts b/packages/core/src/testLint/gitSecrets.test.ts index deea710018a..fce29585d1c 100644 --- a/packages/core/src/testLint/gitSecrets.test.ts +++ b/packages/core/src/testLint/gitSecrets.test.ts @@ -25,19 +25,19 @@ describe('git-secrets', function () { function setAllowListPatterns(gitSecrets: string) { const allowListPatterns: string[] = ['"accountId": "123456789012"'] - allowListPatterns.forEach((pattern) => { + for (const pattern of allowListPatterns) { // Returns non-zero exit code if pattern already exists runCmd([gitSecrets, '--add', '--allowed', pattern], { cwd: toolkitProjectDir, throws: false }) - }) + } } function setDenyListPatterns(gitSecrets: string) { const denyListPatterns: string[] = [] - denyListPatterns.forEach((pattern) => { + for (const pattern of denyListPatterns) { // Returns non-zero exit code if pattern already exists runCmd([gitSecrets, '--add', pattern], { cwd: toolkitProjectDir, throws: false }) - }) + } } function setupTestFixturesDir(toolkitProjectDir: string) { diff --git a/packages/core/src/threatComposer/threatComposerEditor.ts b/packages/core/src/threatComposer/threatComposerEditor.ts index 8312113e16b..7bab20ca1a2 100644 --- a/packages/core/src/threatComposer/threatComposerEditor.ts +++ b/packages/core/src/threatComposer/threatComposerEditor.ts @@ -186,9 +186,9 @@ export class ThreatComposerEditor { this.isPanelDisposed = true contextObject.loaderNotification?.promiseResolve() this.onVisualizationDisposeEmitter.fire() - this.disposables.forEach((disposable) => { + for (const disposable of this.disposables) { disposable.dispose() - }) + } this.onVisualizationDisposeEmitter.dispose() }) } diff --git a/packages/core/src/webviews/client.ts b/packages/core/src/webviews/client.ts index 6125e738dac..e68935cf658 100644 --- a/packages/core/src/webviews/client.ts +++ b/packages/core/src/webviews/client.ts @@ -68,7 +68,9 @@ export class WebviewClientFactory { const { command } = event.data if (command === '$clear') { vscode.setState({}) - this.messageListeners.forEach((listener) => this.removeListener(listener)) + for (const listener of this.messageListeners) { + this.removeListener(listener) + } window.dispatchEvent(remountEvent) } }) diff --git a/packages/core/src/webviews/mixins/saveData.ts b/packages/core/src/webviews/mixins/saveData.ts index e5cacf3e0b7..da0fdd8923d 100644 --- a/packages/core/src/webviews/mixins/saveData.ts +++ b/packages/core/src/webviews/mixins/saveData.ts @@ -45,11 +45,11 @@ const saveData: Vue.ComponentOptionsMixin = { _unids.add(unid) const old = state[unid] ?? {} - Object.keys(this.$data).forEach((k) => { + for (const k of Object.keys(this.$data)) { this.$data[k] = old[k] ?? this.$data[k] - }) + } - Object.keys(this.$data).forEach((k) => { + for (const k of Object.keys(this.$data)) { this.$watch( k, (v: unknown) => { @@ -61,7 +61,7 @@ const saveData: Vue.ComponentOptionsMixin = { }, { deep: true } ) - }) + } }, } diff --git a/packages/toolkit/src/api.ts b/packages/toolkit/src/api.ts index 1cead54d6a5..9c9bb1f7a85 100644 --- a/packages/toolkit/src/api.ts +++ b/packages/toolkit/src/api.ts @@ -21,6 +21,7 @@ export const awsToolkitApi = { getLogger().debug(`listConnections: extension ${extensionId}`) const connections = await Auth.instance.listConnections() const exposedConnections: AwsConnection[] = [] + // eslint-disable-next-line unicorn/no-array-for-each connections.forEach((x: Connection) => { if (x.type === 'sso') { const connState = Auth.instance.getConnectionState(x) diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts index 9a8a4853af7..a41dfd784fa 100644 --- a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts +++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts @@ -115,7 +115,7 @@ export default ESLintUtils.RuleCreator.withoutDocs({ return } - node.declarations.forEach((declaration) => { + for (const declaration of node.declarations) { if ( declaration.init?.type === AST_NODE_TYPES.CallExpression && declaration.id.type === AST_NODE_TYPES.Identifier && @@ -134,11 +134,11 @@ export default ESLintUtils.RuleCreator.withoutDocs({ // Check if it is being referenced multiple times // TODO: expand to check if it is being referenced inside nested scopes only? (currently checks current scope as well) if (refs.length > 1) { - return + continue } // Check if it is being referenced once, but inside a loop. - refs.forEach((ref) => { + for (const ref of refs) { let currNode: TSESTree.Node | undefined = ref.identifier while (currNode && currNode !== scope.block) { @@ -154,18 +154,19 @@ export default ESLintUtils.RuleCreator.withoutDocs({ } currNode = currNode.parent } - }) + } } // If the variable is somehow not assigned? or only used once and not in a loop. if (variable === undefined || !isUsedInLoopScope) { - return context.report({ + context.report({ node: declaration.init.callee, messageId: 'notReusableErr', }) + continue } } - }) + } }, } }, diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts index 769b1157cfa..7313ceed61e 100644 --- a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts +++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts @@ -45,7 +45,7 @@ export default ESLintUtils.RuleCreator.withoutDocs({ ImportDeclaration(node: TSESTree.ImportDeclaration) { // Detect imports for child_process if (node.source.value === 'child_process') { - node.specifiers.forEach((specifier) => { + for (const specifier of node.specifiers) { if (specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier) { // Detect the name of the import, e.g. "proc" from "import * as proc from child_process" libImportName = specifier.local.name @@ -59,7 +59,7 @@ export default ESLintUtils.RuleCreator.withoutDocs({ messageId: 'errMsg', }) } - }) + } } }, CallExpression(node: TSESTree.CallExpression) { From 0cff8e05e76c2b34b7bf36013f8705ce0242cb3b Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 31 Dec 2024 08:44:56 -0800 Subject: [PATCH 114/202] telemetry(amazonq): add metric for transformation type (#6284) ## Problem Be able to tell when a language upgrade vs sql conversion happens. ## Solution Add metric. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: David Hasani --- .../chat/controller/controller.ts | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts index e79ce883e0a..56b551f18af 100644 --- a/packages/core/src/amazonqGumby/chat/controller/controller.ts +++ b/packages/core/src/amazonqGumby/chat/controller/controller.ts @@ -269,29 +269,41 @@ export class GumbyController { } private async handleLanguageUpgrade(message: any) { - try { - await this.beginTransformation(message) - const validProjects = await this.validateLanguageUpgradeProjects(message) - if (validProjects.length > 0) { - this.sessionStorage.getSession().updateCandidateProjects(validProjects) - await this.messenger.sendLanguageUpgradeProjectPrompt(validProjects, message.tabID) - } - } catch (err: any) { - getLogger().error(`Error handling language upgrade: ${err}`) - } + await telemetry.codeTransform_submitSelection + .run(async () => { + telemetry.record({ + codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + userChoice: 'language upgrade', + }) + await this.beginTransformation(message) + const validProjects = await this.validateLanguageUpgradeProjects(message) + if (validProjects.length > 0) { + this.sessionStorage.getSession().updateCandidateProjects(validProjects) + await this.messenger.sendLanguageUpgradeProjectPrompt(validProjects, message.tabID) + } + }) + .catch((err) => { + getLogger().error(`Error handling language upgrade: ${err}`) + }) } private async handleSQLConversion(message: any) { - try { - await this.beginTransformation(message) - const validProjects = await this.validateSQLConversionProjects(message) - if (validProjects.length > 0) { - this.sessionStorage.getSession().updateCandidateProjects(validProjects) - await this.messenger.sendSelectSQLMetadataFileMessage(message.tabID) - } - } catch (err: any) { - getLogger().error(`Error handling SQL conversion: ${err}`) - } + await telemetry.codeTransform_submitSelection + .run(async () => { + telemetry.record({ + codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + userChoice: 'sql conversion', + }) + await this.beginTransformation(message) + const validProjects = await this.validateSQLConversionProjects(message) + if (validProjects.length > 0) { + this.sessionStorage.getSession().updateCandidateProjects(validProjects) + await this.messenger.sendSelectSQLMetadataFileMessage(message.tabID) + } + }) + .catch((err) => { + getLogger().error(`Error handling SQL conversion: ${err}`) + }) } private async validateLanguageUpgradeProjects(message: any) { From 653b849cbad43c9ed86498b20f7a6c2a861a78b4 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:16:26 -0800 Subject: [PATCH 115/202] fix(amazonq): use correct doc link (#6297) ## Problem Not using correct documentation link. ## Solution Update it. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- .../Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json | 4 ++++ packages/core/src/codewhisperer/models/constants.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json b/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json new file mode 100644 index 00000000000..12d125040f2 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "/transform: use correct documentation link in SQL conversion help message" +} diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index 96e4c3438f0..70128101679 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -579,7 +579,7 @@ export const absolutePathDetectedMessage = (numPaths: number, buildFile: string, `I detected ${numPaths} potential absolute file path(s) in your ${buildFile} file: **${listOfPaths}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.` export const selectSQLMetadataFileHelpMessage = - 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).' + 'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-embedded-sql.html).' export const invalidMetadataFileUnsupportedSourceDB = 'I can only convert SQL for migrations from an Oracle source database. The provided .sct file indicates another source database for this migration.' From 060b0a09563b23a1fef00fc87471f9e3f78697d0 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:34:58 -0800 Subject: [PATCH 116/202] fix(amazonq): increase maxRetries for GetPlan (#6298) ## Problem We previously increased the maxRetries for GetTransformationJob from 3 to 8 since it's polled every 5 seconds; we should do the same for GetTransformationPlan since it too is polled every 5 seconds. ## Solution Increase maxRetries from 3 to 8. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- packages/core/src/codewhisperer/client/codewhisperer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts index 69ec6ad1b34..7a869a68372 100644 --- a/packages/core/src/codewhisperer/client/codewhisperer.ts +++ b/packages/core/src/codewhisperer/client/codewhisperer.ts @@ -318,7 +318,8 @@ export class DefaultCodeWhispererClient { public async codeModernizerGetCodeTransformationPlan( request: CodeWhispererUserClient.GetTransformationPlanRequest ): Promise> { - return (await this.createUserSdkClient()).getTransformationPlan(request).promise() + // instead of the default of 3 retries, use 8 retries for this API which is polled every 5 seconds + return (await this.createUserSdkClient(8)).getTransformationPlan(request).promise() } public async startCodeFixJob( From c153b0285a6a70dd42527f394ea8240df741e7c8 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 31 Dec 2024 11:26:03 -0800 Subject: [PATCH 117/202] feat(amazonq): "View Summary" button in chat #6270 ## Problem A "View summary" button was missing in the chat, which made it difficult for users to re-open their transformation summary once they closed it. ## Solution Add the button. --- ...-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json | 4 +++ .../test/e2e/amazonq/transformByQ.test.ts | 28 ++++++++++++++++++- .../chat/controller/controller.ts | 4 ++- .../chat/controller/messenger/messenger.ts | 19 ++++++++++--- .../controller/messenger/messengerUtils.ts | 1 + .../commands/startTransformByQ.ts | 5 ++-- .../src/codewhisperer/models/constants.ts | 6 ++-- .../transformationResultsViewProvider.ts | 3 +- 8 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json diff --git a/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json b/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json new file mode 100644 index 00000000000..cd8bab12485 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Amazon Q Code Transformation: add view summary button in chat" +} diff --git a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts index 69fc905c985..b28368e1e7f 100644 --- a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts +++ b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts @@ -7,7 +7,12 @@ import assert from 'assert' import { qTestingFramework } from './framework/framework' import sinon from 'sinon' import { Messenger } from './framework/messenger' -import { JDKVersion, TransformationType, transformByQState } from 'aws-core-vscode/codewhisperer' +import { + CodeWhispererConstants, + JDKVersion, + TransformationType, + transformByQState, +} from 'aws-core-vscode/codewhisperer' import { GumbyController, setMaven, startTransformByQ, TabsStorage } from 'aws-core-vscode/amazonqGumby' import { using, registerAuthHook, TestFolder } from 'aws-core-vscode/test' import { loginToIdC } from './utils/setup' @@ -153,6 +158,27 @@ describe('Amazon Q Code Transformation', function () { const jdkPathResponse = tab.getChatItems().pop() // this 'Sorry' message is OK - just making sure that the UI components are working correctly assert.strictEqual(jdkPathResponse?.body?.includes("Sorry, I couldn't locate your Java installation"), true) + + const tmpDir = (await TestFolder.create()).path + + transformByQState.setSummaryFilePath(path.join(tmpDir, 'summary.md')) + + transformByQState + .getChatMessenger() + ?.sendJobFinishedMessage(tab.tabID, CodeWhispererConstants.viewProposedChangesChatMessage) + + tab.clickCustomFormButton({ + id: 'gumbyViewSummary', + text: 'View summary', + }) + + await tab.waitForEvent(() => tab.getChatItems().length > 14, { + waitTimeoutInMs: 5000, + waitIntervalInMs: 1000, + }) + + const viewSummaryChatItem = tab.getChatItems().pop() + assert.strictEqual(viewSummaryChatItem?.body?.includes('view a summary'), true) }) it('Can provide metadata file for a SQL conversion', async () => { diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts index 56b551f18af..c8e256f2ddb 100644 --- a/packages/core/src/amazonqGumby/chat/controller/controller.ts +++ b/packages/core/src/amazonqGumby/chat/controller/controller.ts @@ -395,7 +395,9 @@ export class GumbyController { break case ButtonActions.VIEW_TRANSFORMATION_HUB: await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB, CancelActionPositions.Chat) - this.messenger.sendJobSubmittedMessage(message.tabID) + break + case ButtonActions.VIEW_SUMMARY: + await vscode.commands.executeCommand('aws.amazonq.transformationHub.summary.reveal') break case ButtonActions.STOP_TRANSFORMATION_JOB: await stopTransformByQ(transformByQState.getJobId()) diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts index 5ee48f0e824..a586756cb61 100644 --- a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts +++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts @@ -243,8 +243,8 @@ export class Messenger { mandatory: true, options: [ { - value: JDKVersion.JDK17.toString(), - label: JDKVersion.JDK17.toString(), + value: JDKVersion.JDK17, + label: JDKVersion.JDK17, }, ], }) @@ -376,19 +376,20 @@ export class Messenger { ) { const buttons: ChatItemButton[] = [] + // don't show these buttons when server build fails if (!disableJobActions) { - // Note: buttons can only be clicked once. - // To get around this, we remove the card after it's clicked and then resubmit the message. buttons.push({ keepCardAfterClick: true, text: CodeWhispererConstants.openTransformationHubButtonText, id: ButtonActions.VIEW_TRANSFORMATION_HUB, + disabled: false, // allow button to be re-clicked }) buttons.push({ keepCardAfterClick: true, text: CodeWhispererConstants.stopTransformationButtonText, id: ButtonActions.STOP_TRANSFORMATION_JOB, + disabled: false, }) } @@ -514,6 +515,16 @@ export class Messenger { keepCardAfterClick: false, text: CodeWhispererConstants.startTransformationButtonText, id: ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW, + disabled: false, + }) + } + + if (transformByQState.getSummaryFilePath()) { + buttons.push({ + keepCardAfterClick: true, + text: CodeWhispererConstants.viewSummaryButtonText, + id: ButtonActions.VIEW_SUMMARY, + disabled: false, }) } diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts index 1eeef162d34..3d3c18959d3 100644 --- a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts +++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts @@ -13,6 +13,7 @@ import DependencyVersions from '../../../models/dependencies' export enum ButtonActions { STOP_TRANSFORMATION_JOB = 'gumbyStopTransformationJob', VIEW_TRANSFORMATION_HUB = 'gumbyViewTransformationHub', + VIEW_SUMMARY = 'gumbyViewSummary', CONFIRM_LANGUAGE_UPGRADE_TRANSFORMATION_FORM = 'gumbyLanguageUpgradeTransformFormConfirm', CONFIRM_SQL_CONVERSION_TRANSFORMATION_FORM = 'gumbySQLConversionTransformFormConfirm', CANCEL_TRANSFORMATION_FORM = 'gumbyTransformFormCancel', // shared between Language Upgrade & SQL Conversion diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts index 47217fa928d..b00ae4a6afb 100644 --- a/packages/core/src/codewhisperer/commands/startTransformByQ.ts +++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts @@ -8,6 +8,7 @@ import * as fs from 'fs' // eslint-disable-line no-restricted-imports import path from 'path' import { getLogger } from '../../shared/logger' import * as CodeWhispererConstants from '../models/constants' +import * as localizedText from '../../shared/localizedText' import { transformByQState, StepProgress, @@ -233,7 +234,7 @@ export async function preTransformationUploadCode() { await vscode.commands.executeCommand('aws.amazonq.transformationHub.focus') void vscode.window.showInformationMessage(CodeWhispererConstants.jobStartedNotification, { - title: CodeWhispererConstants.jobStartedTitle, + title: localizedText.ok, }) let uploadId = '' @@ -750,7 +751,7 @@ export async function postTransformationJob() { if (transformByQState.isSucceeded()) { void vscode.window.showInformationMessage(CodeWhispererConstants.jobCompletedNotification(diffMessage), { - title: CodeWhispererConstants.transformationCompletedTitle, + title: localizedText.ok, }) } else if (transformByQState.isPartiallySucceeded()) { void vscode.window diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index 70128101679..469e11e1fd2 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -554,8 +554,6 @@ export const noOngoingJobMessage = 'No ongoing job.' export const nothingToShowMessage = 'Nothing to show' -export const jobStartedTitle = 'Transformation started' - export const jobStartedNotification = 'Amazon Q is transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub.' @@ -563,6 +561,8 @@ export const openTransformationHubButtonText = 'Open Transformation Hub' export const startTransformationButtonText = 'Start a new transformation' +export const viewSummaryButtonText = 'View summary' + export const stopTransformationButtonText = 'Stop transformation' export const checkingForProjectsChatMessage = 'Checking for eligible projects...' @@ -638,8 +638,6 @@ export const jobCancelledChatMessage = export const jobCancelledNotification = 'You cancelled the transformation.' -export const transformationCompletedTitle = 'Transformation complete' - export const diffMessage = (multipleDiffs: boolean) => { return multipleDiffs ? 'You can review the diffs to see my proposed changes and accept or reject them. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs.' diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index b41e8b7793c..19bb7e0ab0d 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -365,12 +365,11 @@ export class ProposedTransformationExplorer { }) vscode.commands.registerCommand('aws.amazonq.transformationHub.summary.reveal', async () => { - if (transformByQState.getSummaryFilePath() !== '') { + if (fs.existsSync(transformByQState.getSummaryFilePath())) { await vscode.commands.executeCommand( 'markdown.showPreview', vscode.Uri.file(transformByQState.getSummaryFilePath()) ) - telemetry.ui_click.emit({ elementId: 'transformationHub_viewSummary' }) } }) From 7e788c5dad428636a2abb1e5b24927c905e576df Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Mon, 6 Jan 2025 07:45:18 -0800 Subject: [PATCH 118/202] telemetry(amazonq): use run() instead of emit() #6302 --- .../chat/controller/controller.ts | 20 ++++----- .../transformationResultsViewProvider.ts | 45 +++++++------------ 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts index c8e256f2ddb..bd13a2d9a95 100644 --- a/packages/core/src/amazonqGumby/chat/controller/controller.ts +++ b/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: diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts index 19bb7e0ab0d..43c6a1cc08b 100644 --- a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts +++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts @@ -21,7 +21,6 @@ import { ExportResultArchiveStructure, downloadExportResultArchive } from '../.. import { getLogger } from '../../../shared/logger' import { telemetry } from '../../../shared/telemetry/telemetry' import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState' -import { MetadataResult } from '../../../shared/telemetry/telemetryClient' import * as CodeWhispererConstants from '../../models/constants' import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient' import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession' @@ -532,11 +531,13 @@ export class ProposedTransformationExplorer { }) vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.acceptChanges', async () => { - diffModel.saveChanges() - telemetry.codeTransform_submitSelection.emit({ - codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), - codeTransformJobId: transformByQState.getJobId(), - userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`, + telemetry.codeTransform_submitSelection.run(() => { + diffModel.saveChanges() + telemetry.record({ + codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + codeTransformJobId: transformByQState.getJobId(), + userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`, + }) }) if (transformByQState.getMultipleDiffs()) { void vscode.window.showInformationMessage( @@ -580,35 +581,21 @@ export class ProposedTransformationExplorer { // All patches have been applied, reset the state await reset() } - - telemetry.codeTransform_viewArtifact.emit({ - codeTransformArtifactType: 'ClientInstructions', - codeTransformVCSViewerSrcComponents: 'toastNotification', - codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), - codeTransformJobId: transformByQState.getJobId(), - codeTransformStatus: transformByQState.getStatus(), - userChoice: 'Submit', - result: MetadataResult.Pass, - }) }) vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => { - diffModel.rejectChanges() - await reset() - + await telemetry.codeTransform_submitSelection.run(async () => { + diffModel.rejectChanges() + await reset() + telemetry.record({ + codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), + codeTransformJobId: transformByQState.getJobId(), + userChoice: 'rejectChanges', + }) + }) transformByQState.getChatControllers()?.transformationFinished.fire({ tabID: ChatSessionManager.Instance.getSession().tabID, }) - - telemetry.codeTransform_viewArtifact.emit({ - codeTransformArtifactType: 'ClientInstructions', - codeTransformVCSViewerSrcComponents: 'toastNotification', - codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(), - codeTransformJobId: transformByQState.getJobId(), - codeTransformStatus: transformByQState.getStatus(), - userChoice: 'Cancel', - result: MetadataResult.Pass, - }) }) } } From 42c89006eb116803a80266c80f20e42d13a9df2a Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:32:20 -0500 Subject: [PATCH 119/202] test(core): merge all package test reports (#6261) ## Problem - CI test reporting only captures the last package's results - Running `npm run testE2E` only preserves toolkit's report.xml, losing other package results ## Solution - Generate individual report.xml files per subproject - Consolidate all existing package reports into root .test-reports/report.xml - This is done in the buildspecs themselves rather than directly in the package.json (the original approach to solve this problem) because mac/linux and windows have two different ways of getting the last error code, resulting in a complicated package.json for something thats only needed in our codebuilds --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- buildspec/linuxE2ETests.yml | 2 +- buildspec/linuxIntegrationTests.yml | 2 +- buildspec/linuxTests.yml | 2 +- package.json | 3 +- packages/core/src/test/testRunner.ts | 3 +- scripts/mergeReports.ts | 71 ++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 scripts/mergeReports.ts diff --git a/buildspec/linuxE2ETests.yml b/buildspec/linuxE2ETests.yml index af3cfe71bde..def6dfd1cd0 100644 --- a/buildspec/linuxE2ETests.yml +++ b/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}" diff --git a/buildspec/linuxIntegrationTests.yml b/buildspec/linuxIntegrationTests.yml index a40606bf8b3..dacab125b89 100644 --- a/buildspec/linuxIntegrationTests.yml +++ b/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}" diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml index d8fff088c2f..900b720e61a 100644 --- a/buildspec/linuxTests.yml +++ b/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' } diff --git a/package.json b/package.json index e658a3a916e..cb669449f9d 100644 --- a/package.json +++ b/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", diff --git a/packages/core/src/test/testRunner.ts b/packages/core/src/test/testRunner.ts index dfd8071d8bc..815397ae155 100644 --- a/packages/core/src/test/testRunner.ts +++ b/packages/core/src/test/testRunner.ts @@ -65,7 +65,8 @@ export async function runTests( } const root = getRoot() - const outputFile = path.resolve(root, '../../', '.test-reports', 'report.xml') + // output the report to the individual package + const outputFile = path.resolve(root, '.test-reports', 'report.xml') const colorOutput = !process.env['AWS_TOOLKIT_TEST_NO_COLOR'] // Create the mocha test diff --git a/scripts/mergeReports.ts b/scripts/mergeReports.ts new file mode 100644 index 00000000000..08b9dd6cd23 --- /dev/null +++ b/scripts/mergeReports.ts @@ -0,0 +1,71 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as fs from 'fs' +import * as path from 'path' +import * as xml2js from 'xml2js' + +/** + * Merge all of the packages/ test reports into a single directory + */ +async function mergeReports() { + console.log('Merging test reports') + + const packagesDir = `${__dirname}/../packages` + + // Get all packages/* directories + const packageDirs = fs.readdirSync(packagesDir).map((dir) => path.join(packagesDir, dir)) + + // Find report.xml files in .test-reports subdirectories + const testReports = packageDirs + .map((dir) => `${dir}/.test-reports/report.xml`) + .filter((file) => fs.existsSync(file)) + + const mergedReport = { + testsuites: { + testsuite: [], + }, + } + + // Collect all test reports into a single merged test report object + for (const file of testReports) { + const content = fs.readFileSync(file) + const result: { testsuites: { testsuite: [] } } = await xml2js.parseStringPromise(content) + if (result.testsuites && result.testsuites.testsuite) { + mergedReport.testsuites.testsuite.push(...result.testsuites.testsuite) + } + } + + const builder = new xml2js.Builder() + const xml = builder.buildObject(mergedReport) + + /** + * Create the new test reports directory and write the test report + */ + const reportsDir = path.join(__dirname, '..', '.test-reports') + + // Create reports directory if it doesn't exist + if (!fs.existsSync(reportsDir)) { + fs.mkdirSync(reportsDir, { recursive: true }) + } + + fs.writeFileSync(`${reportsDir}/report.xml`, xml) + + const exitCodeArg = process.argv[2] + if (exitCodeArg) { + /** + * Retrieves the exit code from the previous test run execution. + * + * This allows us to: + * 1. Merge and upload test reports regardless of the test execution status + * 2. Preserve the original test run exit code + * 3. Report the test status back to CI + */ + const exitCode = parseInt(exitCodeArg || '0', 10) + process.exit(exitCode) + } +} + +mergeReports() From 3d9077264f9d40d7e80383c3c1e5a4fd5e2181a9 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 6 Jan 2025 09:49:42 -0800 Subject: [PATCH 120/202] test(techdebt): snooze deadline --- packages/core/src/test/techdebt.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/test/techdebt.test.ts b/packages/core/src/test/techdebt.test.ts index 0e423c41684..caa9a977b62 100644 --- a/packages/core/src/test/techdebt.test.ts +++ b/packages/core/src/test/techdebt.test.ts @@ -46,6 +46,6 @@ describe('tech debt', function () { // Monitor telemtry to determine removal or snooze // toolkit_showNotification.id = sessionSeparation // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst - fixByDate('2025-01-06', 'Remove the edge case code from the commit that this test is a part of.') + fixByDate('2025-06-06', 'Remove the edge case code from the commit that this test is a part of.') }) }) From e69246771e8861fcb1b49d27a978863391d21abe Mon Sep 17 00:00:00 2001 From: Maxim Hayes Date: Fri, 3 Jan 2025 13:39:20 -0600 Subject: [PATCH 121/202] revert: amazon q standalone special handling Removes code that should no longer be necessary anymore. - Remove autoinstall Amazon Q if you were a CodeWhisperer user on 2.x versions of toolkit - The prompt to install Amazon Q will still appear, if you don't have it. It has been slightly reworded. - If Amazon Q is installed, then you uninstall, it you will not see the prompt again in toolkit (previously you could). - Remove settings migrations from codewhisperer settings - Remove amazon Q telemetry enabled setting being initialized by the value from toolkit. We are still getting hits in telemetry for people getting auto install (172 in last 2 months). However, they are mostly on old versions. Let's simplyify our codebase by removing support for these dated codepaths. --- ...-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json | 4 + .../src/amazonq/explorer/amazonQTreeNode.ts | 7 +- packages/core/src/codewhisperer/activation.ts | 3 - .../core/src/codewhisperer/util/authUtil.ts | 24 ------ .../util/codewhispererSettings.ts | 18 +---- packages/core/src/extensionNode.ts | 75 +++++++++---------- .../core/src/shared/telemetry/activation.ts | 1 - packages/core/src/shared/telemetry/util.ts | 12 +-- ...-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json | 4 + 9 files changed, 47 insertions(+), 101 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json create mode 100644 packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json diff --git a/packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json b/packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json new file mode 100644 index 00000000000..720817d707a --- /dev/null +++ b/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." +} diff --git a/packages/core/src/amazonq/explorer/amazonQTreeNode.ts b/packages/core/src/amazonq/explorer/amazonQTreeNode.ts index 4ea7970e84b..bbfd1bc1ff2 100644 --- a/packages/core/src/amazonq/explorer/amazonQTreeNode.ts +++ b/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 } diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts index 474d8d68121..4ea655fc4da 100644 --- a/packages/core/src/codewhisperer/activation.ts +++ b/packages/core/src/codewhisperer/activation.ts @@ -106,9 +106,6 @@ export async function activate(context: ExtContext): Promise { localize = nls.loadMessageBundle() const codewhispererSettings = CodeWhispererSettings.instance - // Import old CodeWhisperer settings into Amazon Q - await CodeWhispererSettings.instance.importSettings() - // initialize AuthUtil earlier to make sure it can listen to connection change events. const auth = AuthUtil.instance auth.initCodeWhispererHooks() diff --git a/packages/core/src/codewhisperer/util/authUtil.ts b/packages/core/src/codewhisperer/util/authUtil.ts index 53c33c2ed4e..461f262d34d 100644 --- a/packages/core/src/codewhisperer/util/authUtil.ts +++ b/packages/core/src/codewhisperer/util/authUtil.ts @@ -501,30 +501,6 @@ export class AuthUtil { } } -/** - * Returns true if an SSO connection with AmazonQ and CodeWhisperer scopes are found, - * even if the connection is expired. - * - * Note: This function will become irrelevant if/when the Amazon Q view tree is removed - * from the toolkit. - */ -export function isPreviousQUser() { - const auth = AuthUtil.instance - - if (!auth.isConnected() || !isSsoConnection(auth.conn)) { - return false - } - const missingScopes = - (auth.isEnterpriseSsoInUse() && !hasScopes(auth.conn, amazonQScopes)) || - !hasScopes(auth.conn, codeWhispererChatScopes) - - if (missingScopes) { - return false - } - - return true -} - export type FeatureAuthState = { [feature in Feature]: AuthState } export type Feature = (typeof Features)[keyof typeof Features] export type AuthState = (typeof AuthStates)[keyof typeof AuthStates] diff --git a/packages/core/src/codewhisperer/util/codewhispererSettings.ts b/packages/core/src/codewhisperer/util/codewhispererSettings.ts index 32ae9cd0307..2bf2f657867 100644 --- a/packages/core/src/codewhisperer/util/codewhispererSettings.ts +++ b/packages/core/src/codewhisperer/util/codewhispererSettings.ts @@ -2,7 +2,7 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -import { fromExtensionManifest, migrateSetting } from '../../shared/settings' +import { fromExtensionManifest } from '../../shared/settings' import { ArrayConstructor } from '../../shared/utilities/typeConstructors' const description = { @@ -17,22 +17,6 @@ const description = { } export class CodeWhispererSettings extends fromExtensionManifest('amazonQ', description) { - // TODO: Remove after a few releases - public async importSettings() { - await migrateSetting( - { key: 'aws.codeWhisperer.includeSuggestionsWithCodeReferences', type: Boolean }, - { key: 'amazonQ.showInlineCodeSuggestionsWithCodeReferences' } - ) - await migrateSetting( - { key: 'aws.codeWhisperer.importRecommendation', type: Boolean }, - { key: 'amazonQ.importRecommendationForInlineCodeSuggestions' } - ) - await migrateSetting( - { key: 'aws.codeWhisperer.shareCodeWhispererContentWithAWS', type: Boolean }, - { key: 'amazonQ.shareContentWithAWS' } - ) - } - public isSuggestionsWithCodeReferencesEnabled(): boolean { return this.get(`showInlineCodeSuggestionsWithCodeReferences`, false) } diff --git a/packages/core/src/extensionNode.ts b/packages/core/src/extensionNode.ts index 480e409f5d8..d0275f0274f 100644 --- a/packages/core/src/extensionNode.ts +++ b/packages/core/src/extensionNode.ts @@ -51,7 +51,7 @@ import { getTelemetryMetadataForConn } from './auth/connection' import { registerSubmitFeedback } from './feedback/vue/submitFeedback' import { activateCommon, deactivateCommon } from './extension' import { learnMoreAmazonQCommand, qExtensionPageCommand, dismissQTree } from './amazonq/explorer/amazonQChildrenNodes' -import { AuthUtil, codeWhispererCoreScopes, isPreviousQUser } from './codewhisperer/util/authUtil' +import { AuthUtil, codeWhispererCoreScopes } from './codewhisperer/util/authUtil' import { installAmazonQExtension } from './codewhisperer/commands/basicCommands' import { isExtensionInstalled, VSCODE_EXTENSION_ID } from './shared/utilities' import { ExtensionUse, getAuthFormIdsFromConnection, initializeCredentialsProviderManager } from './auth/utils' @@ -272,52 +272,47 @@ export async function deactivate() { async function handleAmazonQInstall() { const dismissedInstall = globals.globalState.get('aws.toolkit.amazonqInstall.dismissed') - if (isExtensionInstalled(VSCODE_EXTENSION_ID.amazonq) || dismissedInstall) { + if (dismissedInstall) { + return + } + + if (isExtensionInstalled(VSCODE_EXTENSION_ID.amazonq)) { + await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true) return } await telemetry.toolkit_showNotification.run(async () => { - if (isPreviousQUser()) { - await installAmazonQExtension.execute() - telemetry.record({ id: 'amazonQStandaloneInstalled' }) - void vscode.window.showInformationMessage( - "Amazon Q is now its own extension.\n\nWe've auto-installed it for you with all the same features and settings from CodeWhisperer and Amazon Q chat." + telemetry.record({ id: 'amazonQStandaloneChange' }) + void vscode.window + .showInformationMessage( + 'Try Amazon Q, a generative AI assistant, with chat and code suggestions.', + 'Install', + 'Learn More' ) - await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true) - } else { - telemetry.record({ id: 'amazonQStandaloneChange' }) - void vscode.window - .showInformationMessage( - 'Amazon Q has moved to its own extension.' + - '\nInstall it to use Amazon Q, a generative AI assistant, with chat and code suggestions.', - 'Install', - 'Learn More' - ) - .then(async (resp) => { - await telemetry.toolkit_invokeAction.run(async () => { - telemetry.record({ - source: ExtensionUse.instance.isFirstUse() - ? ExtStartUpSources.firstStartUp - : ExtStartUpSources.none, - }) - - if (resp === 'Learn More') { - // Clicking learn more will open the q extension page - telemetry.record({ action: 'learnMore' }) - await qExtensionPageCommand.execute() - return - } - - if (resp === 'Install') { - telemetry.record({ action: 'installAmazonQ' }) - await installAmazonQExtension.execute() - } else { - telemetry.record({ action: 'dismissQNotification' }) - } - await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true) + .then(async (resp) => { + await telemetry.toolkit_invokeAction.run(async () => { + telemetry.record({ + source: ExtensionUse.instance.isFirstUse() + ? ExtStartUpSources.firstStartUp + : ExtStartUpSources.none, }) + + if (resp === 'Learn More') { + // Clicking learn more will open the q extension page + telemetry.record({ action: 'learnMore' }) + await qExtensionPageCommand.execute() + return + } + + if (resp === 'Install') { + telemetry.record({ action: 'installAmazonQ' }) + await installAmazonQExtension.execute() + } else { + telemetry.record({ action: 'dismissQNotification' }) + } + await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true) }) - } + }) }) } diff --git a/packages/core/src/shared/telemetry/activation.ts b/packages/core/src/shared/telemetry/activation.ts index e9fa6b4c2b1..5b1ba3e5a56 100644 --- a/packages/core/src/shared/telemetry/activation.ts +++ b/packages/core/src/shared/telemetry/activation.ts @@ -40,7 +40,6 @@ export async function activate( productName: AWSProduct ) { const config = new TelemetryConfig(settings) - await config.initAmazonQSetting() // TODO: Remove after a few releases. DefaultTelemetryClient.productName = productName globals.telemetry = await DefaultTelemetryService.create(awsContext, getComputeRegion()) diff --git a/packages/core/src/shared/telemetry/util.ts b/packages/core/src/shared/telemetry/util.ts index 67a2d460dd8..a81dd8fc12d 100644 --- a/packages/core/src/shared/telemetry/util.ts +++ b/packages/core/src/shared/telemetry/util.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode' import { env, version } from 'vscode' import * as os from 'os' import { getLogger } from '../logger' -import { fromExtensionManifest, migrateSetting, Settings } from '../settings' +import { fromExtensionManifest, Settings } from '../settings' import { memoize, once } from '../utilities/functionUtils' import { isInDevEnv, @@ -65,16 +65,6 @@ export class TelemetryConfig { public isEnabled(): boolean { return (isAmazonQ() ? this.amazonQConfig : this.toolkitConfig).get(`telemetry`, true) } - - public async initAmazonQSetting() { - if (!isAmazonQ() || globals.globalState.tryGet('amazonq.telemetry.migrated', Boolean, false)) { - return - } - // aws.telemetry isn't deprecated, we are just initializing amazonQ.telemetry with its value. - // This is also why we need to check that we only try this migration once. - await migrateSetting({ key: 'aws.telemetry', type: Boolean }, { key: 'amazonQ.telemetry' }) - await globals.globalState.update('amazonq.telemetry.migrated', true) - } } export function convertLegacy(value: unknown): boolean { diff --git a/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json b/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json new file mode 100644 index 00000000000..d49140750c8 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json @@ -0,0 +1,4 @@ +{ + "type": "Removal", + "description": "Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions." +} From 611b286ea46651f8b641eae1971dd2c98222d1b6 Mon Sep 17 00:00:00 2001 From: Maxim Hayes Date: Fri, 3 Jan 2025 13:50:11 -0600 Subject: [PATCH 122/202] revert(toolkit): Q <--> Toolkit auth separation notification Removes the prompt shown in Toolkit that Amazon Q no longer shares connections with it. Some time has passed, active users should have been informed by now. We are still getting telemetry hits indicating that this is being used though. NOTE: Does not revert or remove any separation logic itself. We continue to have separate sessions and also remove any connections in either extension that are extra or don't match the required scopes for that extension. That logic helps us catch auth edge cases. --- packages/core/src/auth/auth.ts | 73 ------------------- packages/core/src/codecatalyst/activation.ts | 2 - packages/core/src/extensionNode.ts | 12 +-- packages/core/src/shared/globalState.ts | 2 - packages/core/src/test/techdebt.test.ts | 11 +-- ...-6703e62b-3835-402b-b187-b327c58f425b.json | 4 + 6 files changed, 7 insertions(+), 97 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json diff --git a/packages/core/src/auth/auth.ts b/packages/core/src/auth/auth.ts index 3335f8ab333..5203735e05a 100644 --- a/packages/core/src/auth/auth.ts +++ b/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('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()) - } -} diff --git a/packages/core/src/codecatalyst/activation.ts b/packages/core/src/codecatalyst/activation.ts index 4a2385559f4..3e47dd53879 100644 --- a/packages/core/src/codecatalyst/activation.ts +++ b/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 { }) await authProvider.secondaryAuth.forgetConnection() - await SessionSeparationPrompt.instance.showForCommand('aws.codecatalyst.manageConnections') }) }, { emit: false, functionId: { name: 'activate', class: 'CodeCatalyst' } } diff --git a/packages/core/src/extensionNode.ts b/packages/core/src/extensionNode.ts index d0275f0274f..0c53cc89975 100644 --- a/packages/core/src/extensionNode.ts +++ b/packages/core/src/extensionNode.ts @@ -46,12 +46,12 @@ import globals from './shared/extensionGlobals' import { Experiments, Settings, showSettingsFailedMsg } from './shared/settings' import { isReleaseVersion } from './shared/vscode/env' import { AuthStatus, AuthUserState, telemetry } from './shared/telemetry/telemetry' -import { Auth, SessionSeparationPrompt } from './auth/auth' +import { Auth } from './auth/auth' import { getTelemetryMetadataForConn } from './auth/connection' import { registerSubmitFeedback } from './feedback/vue/submitFeedback' import { activateCommon, deactivateCommon } from './extension' import { learnMoreAmazonQCommand, qExtensionPageCommand, dismissQTree } from './amazonq/explorer/amazonQChildrenNodes' -import { AuthUtil, codeWhispererCoreScopes } from './codewhisperer/util/authUtil' +import { codeWhispererCoreScopes } from './codewhisperer/util/authUtil' import { installAmazonQExtension } from './codewhisperer/commands/basicCommands' import { isExtensionInstalled, VSCODE_EXTENSION_ID } from './shared/utilities' import { ExtensionUse, getAuthFormIdsFromConnection, initializeCredentialsProviderManager } from './auth/utils' @@ -139,16 +139,8 @@ export async function activate(context: vscode.ExtensionContext) { conn.scopes ) await Auth.instance.forgetConnection(conn) - await SessionSeparationPrompt.instance.showForCommand('aws.toolkit.auth.manageConnections') } } - - // Display last prompt if connections were forgotten in prior sessions - // but the user did not interact or sign in again. Useful in case the user misses it the first time. - await SessionSeparationPrompt.instance.showAnyPreviousPrompt() - - // MUST restore CW/Q auth so that we can see if this user is already a Q user. - await AuthUtil.instance.restore() }, { emit: false, functionId: { name: 'activate', class: 'ExtensionNodeCore' } } ) diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts index 5cce9ff6f84..5662c3e608e 100644 --- a/packages/core/src/shared/globalState.ts +++ b/packages/core/src/shared/globalState.ts @@ -44,8 +44,6 @@ export type globalKey = | 'aws.toolkit.amazonq.dismissed' | 'aws.toolkit.amazonqInstall.dismissed' | 'aws.amazonq.workspaceIndexToggleOn' - | 'aws.toolkit.separationPromptCommand' - | 'aws.toolkit.separationPromptDismissed' // Deprecated/legacy names. New keys should start with "aws.". | '#sessionCreationDates' // Legacy name from `ssoAccessTokenProvider.ts`. | 'CODECATALYST_RECONNECT' diff --git a/packages/core/src/test/techdebt.test.ts b/packages/core/src/test/techdebt.test.ts index caa9a977b62..69e557100f7 100644 --- a/packages/core/src/test/techdebt.test.ts +++ b/packages/core/src/test/techdebt.test.ts @@ -10,6 +10,7 @@ import * as env from '../shared/vscode/env' // Checks project config and dependencies, to remind us to remove old things // when possible. describe('tech debt', function () { + // @ts-ignore function fixByDate(date: string, msg: string) { const now = Date.now() const cutoffDate = Date.parse(date) @@ -38,14 +39,4 @@ describe('tech debt', function () { // This is relevant for the use of `fs.cpSync` in the copyFiles scripts. assert.ok(semver.lt(minNodejs, '18.0.0'), 'with node18+, we can remove the dependency on @types/node@18') }) - - it('remove separate sessions login edge cases', async function () { - // src/auth/auth.ts:SessionSeparationPrompt - // forgetConnection() function and calls - - // Monitor telemtry to determine removal or snooze - // toolkit_showNotification.id = sessionSeparation - // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst - fixByDate('2025-06-06', 'Remove the edge case code from the commit that this test is a part of.') - }) }) diff --git a/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json b/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json new file mode 100644 index 00000000000..7cb1f436b51 --- /dev/null +++ b/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json @@ -0,0 +1,4 @@ +{ + "type": "Removal", + "description": "Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions." +} From e9e296597fe7d3b7ca8945be531403a4d1e9790b Mon Sep 17 00:00:00 2001 From: Tai Lai Date: Mon, 6 Jan 2025 20:23:33 +0000 Subject: [PATCH 123/202] test(amazonq): generateZipTestGen is unreliable (#6290) ## Problem Flaky test `generateZipTestGen` sometimes fails with ``` 1) zipUtil generateZipTestGen Should generate zip for test generation successfully: Error: done() called multiple times in test of file /Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/amazonq/dist/test/unit/codewhisperer/util/zipUtil.test.js; in addition, done() received error: EntryNotFound (FileSystemError): Error: ENOENT: no such file or directory, scandir '/test/zip/utgRequiredArtifactsDir' at Function.e (/private/tmp/.vscode-test/vscode-darwin-arm64-1.83.0/Visual Studio Code.app/Contents/Resources/app/out/vs/workbench/api/node/extensionHostProcess.js:127:26740) at Object.readDirectory (/private/tmp/.vscode-test/vscode-darwin-arm64-1.83.0/Visual Studio Code.app/Contents/Resources/app/out/vs/workbench/api/node/extensionHostProcess.js:127:24744) at async processDirectory (/Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/core/src/codewhisperer/util/zipUtil.ts:190:29) at async ZipUtil.processMetadataDir (/Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/core/src/codewhisperer/util/zipUtil.ts:212:9) at async ZipUtil.zipProject (/Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/core/src/codewhisperer/util/zipUtil.ts:230:13) at async ZipUtil.generateZipTestGen (/Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/core/src/codewhisperer/util/zipUtil.ts:602:41) at async Context. (/Users/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts:159:28) { code: 'FileNotFound' ``` Issue: https://github.com/aws/aws-toolkit-vscode/issues/6160 ## Solution Based on the error, the test is trying to readdir on a mock dirpath even though the entire `zipProject` method should be stubbed. This can be confirmed by commenting out the following line: https://github.com/aws/aws-toolkit-vscode/blob/aa332da854c9d17ba258b459c622500911b1b0d9/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts#L135 which will give the same error ``` Error: ENOENT: no such file or directory, scandir '/test/zip/utgRequiredArtifactsDir' ``` So instead of stubbing which seems to be unreliable, we can let the test actually create the zip file. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../unit/codewhisperer/util/zipUtil.test.ts | 123 +++++------------- 1 file changed, 34 insertions(+), 89 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts index ee4abafa19a..4729d65d416 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/zipUtil.test.ts +++ b/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 - 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') }) }) }) From 0ca35b8dba676a8d7e470e9358d02564ed8db7e5 Mon Sep 17 00:00:00 2001 From: Hamed Soleimani Date: Tue, 7 Jan 2025 11:43:26 -0800 Subject: [PATCH 124/202] feat(amazonq): Include mvn, gradle files in repo archives #6300 ## Problem mvn and gradle files are not included in repo archives for Q. ## Solution Add them to the `isCodeFile()` condition. --- ...-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json | 4 +++ packages/core/src/shared/filetypes.ts | 4 ++- .../core/src/test/shared/filetypes.test.ts | 25 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json b/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json new file mode 100644 index 00000000000..54780e9339e --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q can update mvn and gradle build files" +} diff --git a/packages/core/src/shared/filetypes.ts b/packages/core/src/shared/filetypes.ts index 61287cb11bc..212bb58ebe2 100644 --- a/packages/core/src/shared/filetypes.ts +++ b/packages/core/src/shared/filetypes.ts @@ -173,6 +173,7 @@ export const codefileExtensions = new Set([ '.cljs', '.cls', '.cmake', + '.cmd', '.cob', '.cobra', '.coffee', @@ -274,6 +275,7 @@ export const codefileExtensions = new Set([ '.pp', '.pro', '.prolog', + '.properties', '.ps1', '.psd1', '.psm1', @@ -351,7 +353,7 @@ export const codefileExtensions = new Set([ ]) // Code file names without an extension -export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build']) +export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build', 'gradlew', 'mvnw']) /** Returns true if `filename` is a code file. */ export function isCodeFile(filename: string): boolean { diff --git a/packages/core/src/test/shared/filetypes.test.ts b/packages/core/src/test/shared/filetypes.test.ts index a83fbbbee8f..26e12631419 100644 --- a/packages/core/src/test/shared/filetypes.test.ts +++ b/packages/core/src/test/shared/filetypes.test.ts @@ -13,6 +13,7 @@ import * as workspaceUtils from '../../shared/utilities/workspaceUtils' import { toArrayAsync } from '../../shared/utilities/collectionUtils' import { waitUntil } from '../../shared/utilities/timeoutUtils' import { mapMetadata } from '../../shared/telemetry/telemetryLogger' +import { isCodeFile } from '../../shared/filetypes' async function getMetrics(n: number, metricName: string, timeout = 1000) { return await waitUntil( @@ -148,3 +149,27 @@ describe('file_editAwsFile telemetry', function () { // assert.strictEqual(r?.length, 1, 'emitted file_editAwsFile too many times') }) }) + +describe('isCodeFile', () => { + it('returns true for code files', function () { + const codeFiles = [ + 'test.py', + 'test.js', + 'Dockerfile', + 'gradlew', + 'mvnw', + 'build.gradle', + 'gradle/wrapper/gradle-wrapper.properties', + ] + for (const codeFilePath of codeFiles) { + assert.strictEqual(isCodeFile(codeFilePath), true) + } + }) + + it('returns false for other files', function () { + const codeFiles = ['compiled.exe', 'random_file'] + for (const filePath of codeFiles) { + assert.strictEqual(isCodeFile(filePath), false) + } + }) +}) From d939f2be435fea8523c6a3d18c5165388f0648dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Jurre=20de=20Ruiter?= <62119716+Jurredr@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:56:04 +0100 Subject: [PATCH 125/202] deps(amazonq): bump mynahui to 4.21.4 #6313 Bump MynahUI to version 4.21.4 from 4.21.2. This includes two bug fixes and one feature, as described by the changelog commits and by the [MynahUI release notes](https://github.com/aws/mynah-ui/releases). --- package-lock.json | 26 +++++++------------ ...-8434a098-361d-4e8d-9de4-c616da38ccbf.json | 4 +++ ...-acf80397-e84d-430e-b7e2-fec67736338b.json | 4 +++ ...-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json | 4 +++ packages/core/package.json | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json create mode 100644 packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json diff --git a/package-lock.json b/package-lock.json index 8a549622f37..4843aa9edec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6083,23 +6083,23 @@ } }, "node_modules/@aws/mynah-ui": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.3.tgz", - "integrity": "sha512-iHFGmLg8fZgoqiHHDP94m6+ZmBsIiP7NBte/WId3iv+1344+Sipm/nNoZlczx5mIV1qhD+r/IZKG4c9Er4sHuA==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.4.tgz", + "integrity": "sha512-sYeQHJ8yEQQQsre1soXQFebbqZFcXerIxJ/d9kg/YzZUauCirW7v/0f/kHs9y7xYkYGa8y3exV6b6e4+juO1DQ==", "hasInstallScript": true, "dependencies": { "escape-html": "^1.0.3", + "highlight.js": "^11.11.0", "just-clone": "^6.2.0", "marked": "^14.1.0", - "prismjs": "1.29.0", "sanitize-html": "^2.12.1", "unescape-html": "^1.1.0" }, "peerDependencies": { "escape-html": "^1.0.3", + "highlight.js": "^11.11.0", "just-clone": "^6.2.0", - "marked": "^12.0.2", - "prismjs": "1.29.0", + "marked": "^14.1.0", "sanitize-html": "^2.12.1", "unescape-html": "^1.1.0" } @@ -14102,8 +14102,9 @@ } }, "node_modules/highlight.js": { - "version": "11.9.0", - "license": "BSD-3-Clause", + "version": "11.11.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz", + "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==", "engines": { "node": ">=12.0.0" } @@ -17332,13 +17333,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/prismjs": { - "version": "1.29.0", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/private": { "version": "0.1.8", "dev": true, @@ -21162,7 +21156,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.3", + "@aws/mynah-ui": "^4.21.4", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json b/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json new file mode 100644 index 00000000000..ce875ea0f40 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix context menu displaying when typing @, even though input is disallowed" +} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json b/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json new file mode 100644 index 00000000000..9510e49cf6b --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Up/down history navigation only triggering on first/last line of prompt input" +} diff --git a/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json b/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json new file mode 100644 index 00000000000..1a1e0ee4a11 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Amazon Q: new code syntax highlighter for improved accuracy" +} diff --git a/packages/core/package.json b/packages/core/package.json index 23aef282444..5f5e59bfa13 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -508,7 +508,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.3", + "@aws/mynah-ui": "^4.21.4", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", From 5e1a94bd8a8882dadc7954e9c11b26230b5b6199 Mon Sep 17 00:00:00 2001 From: Neil Kulkarni <60868290+neilk-aws@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:24:50 -0800 Subject: [PATCH 126/202] fix(amazonq): skip including deleted files for FeatureDev context #6312 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem When zipping context for /dev, customer build processes (file watchers, etc.) may delete build artifacts we’ve already enumerated but have not added to the archive. As a best practice, customers should `.gitignore` these types of files, but in the event they don't, this has the potential to block /dev from running. ## Solution Skip affected files, which are not found when adding to zip context for Feature Dev. --- ...-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json | 4 +++ .../core/src/amazonqFeatureDev/util/files.ts | 25 ++++++++++++++++--- packages/core/src/shared/errors.ts | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json b/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json new file mode 100644 index 00000000000..6684a90d129 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /dev: Fix issue when files are deleted while preparing context" +} diff --git a/packages/core/src/amazonqFeatureDev/util/files.ts b/packages/core/src/amazonqFeatureDev/util/files.ts index 1b83bdbe2b5..8258d7fe179 100644 --- a/packages/core/src/amazonqFeatureDev/util/files.ts +++ b/packages/core/src/amazonqFeatureDev/util/files.ts @@ -13,7 +13,7 @@ import { getLogger } from '../../shared/logger/logger' import { maxFileSizeBytes } from '../limits' import { createHash } from 'crypto' import { CurrentWsFolders } from '../types' -import { ToolkitError } from '../../shared/errors' +import { hasCode, ToolkitError } from '../../shared/errors' import { AmazonqCreateUpload, Span, telemetry as amznTelemetry } from '../../shared/telemetry/telemetry' import { TelemetryHelper } from './telemetryHelper' import { maxRepoSizeBytes } from '../constants' @@ -39,7 +39,16 @@ export async function prepareRepoData( const ignoredExtensionMap = new Map() for (const file of files) { - const fileSize = (await fs.stat(file.fileUri)).size + let fileSize + try { + fileSize = (await fs.stat(file.fileUri)).size + } catch (error) { + if (hasCode(error) && error.code === 'ENOENT') { + // No-op: Skip if file does not exist + continue + } + throw error + } const isCodeFile_ = isCodeFile(file.relativeFilePath) if (fileSize >= maxFileSizeBytes || !isCodeFile_) { @@ -58,7 +67,17 @@ export async function prepareRepoData( totalBytes += fileSize const zipFolderPath = path.dirname(file.zipFilePath) - zip.addLocalFile(file.fileUri.fsPath, zipFolderPath) + + try { + zip.addLocalFile(file.fileUri.fsPath, zipFolderPath) + } catch (error) { + if (error instanceof Error && error.message.includes('File not found')) { + // No-op: Skip if file was deleted or does not exist + // Reference: https://github.com/cthackers/adm-zip/blob/1cd32f7e0ad3c540142a76609bb538a5cda2292f/adm-zip.js#L296-L321 + continue + } + throw error + } } const iterator = ignoredExtensionMap.entries() diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts index 95cebb03111..54841b7622f 100644 --- a/packages/core/src/shared/errors.ts +++ b/packages/core/src/shared/errors.ts @@ -599,7 +599,7 @@ export function isAwsError(error: unknown): error is AWSError & { error_descript return error instanceof Error && hasCode(error) && hasTime(error) } -function hasCode(error: T): error is T & { code: string } { +export function hasCode(error: T): error is T & { code: string } { return typeof (error as { code?: unknown }).code === 'string' } From 76027b65bae30ce59909bd458911a5237d12734e Mon Sep 17 00:00:00 2001 From: Ashish Reddy Podduturi Date: Wed, 8 Jan 2025 11:23:33 -0800 Subject: [PATCH 127/202] fix for /test for files outside of workspace. --- .../amazonqTest/chat/controller/controller.ts | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 8c99e7a2dcb..e2eff490ca5 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -439,16 +439,24 @@ export class TestController { const language = await this.getLanguageForFilePath(filePath) session.fileLanguage = language + const workspaceFolder = vscode.workspace.getWorkspaceFolder(fileEditorToTest.document.uri) /* For Re:Invent 2024 we are supporting only java and python for unit test generation, rest of the languages shows the similar experience as CWC */ - if (language !== 'java' && language !== 'python') { - const unsupportedLanguage = language.charAt(0).toUpperCase() + language.slice(1) - let unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 While ${unsupportedLanguage} is not supported, I will generate a suggestion below. ` - // handle the case when language is undefined - if (!unsupportedLanguage) { - unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 I will still generate a suggestion below. ` + if (!['java', 'python'].includes(language) || workspaceFolder == undefined) { + let unsupportedMessage: string + const unsupportedLanguage = language ? language.charAt(0).toUpperCase() + language.slice(1) : '' + if (!workspaceFolder) { + // File is outside of workspace + unsupportedMessage = `⚠External File Detected: ${fileName} is outside of workspace scope.
 However, I can still help you create unit tests for ${fileName} here.` + } else { + // File is in workspace, check language support + if (unsupportedLanguage) { + unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 While ${unsupportedLanguage} is not supported, I will generate a suggestion below.` + } else { + unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 I will still generate a suggestion below.` + } } this.messenger.sendMessage(unsupportedMessage, tabID, 'answer') await this.onCodeGeneration(session, message.prompt, tabID, fileName, filePath) From eb7ed3e471c8b799e536dce796d5f40af4ca41a7 Mon Sep 17 00:00:00 2001 From: Ashish Reddy Podduturi Date: Wed, 8 Jan 2025 11:29:39 -0800 Subject: [PATCH 128/202] Added changelog --- .../Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json b/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json new file mode 100644 index 00000000000..7a89a4cee67 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope." +} From 64a9589edf636d58491ff3e97519ff9e3525dc44 Mon Sep 17 00:00:00 2001 From: invictus <149003065+ashishrp-aws@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:48:16 -0800 Subject: [PATCH 129/202] Update controller.ts --- packages/core/src/amazonqTest/chat/controller/controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index e2eff490ca5..b4119fc8e6a 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -449,7 +449,7 @@ export class TestController { const unsupportedLanguage = language ? language.charAt(0).toUpperCase() + language.slice(1) : '' if (!workspaceFolder) { // File is outside of workspace - unsupportedMessage = `⚠External File Detected: ${fileName} is outside of workspace scope.
 However, I can still help you create unit tests for ${fileName} here.` + unsupportedMessage = `⚠I can't generate tests for because ${fileName} is outside of workspace scope.
 I can still provide examples, instructions and code suggestions.` } else { // File is in workspace, check language support if (unsupportedLanguage) { From 0b4dc1a5a3e69d6f01c54f2a5f0f6362970205e8 Mon Sep 17 00:00:00 2001 From: invictus <149003065+ashishrp-aws@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:54:06 -0800 Subject: [PATCH 130/202] Update packages/core/src/amazonqTest/chat/controller/controller.ts Co-authored-by: Maxim Hayes <149123719+hayemaxi@users.noreply.github.com> --- .../core/src/amazonqTest/chat/controller/controller.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index b4119fc8e6a..fb901491a16 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -450,13 +450,10 @@ export class TestController { if (!workspaceFolder) { // File is outside of workspace unsupportedMessage = `⚠I can't generate tests for because ${fileName} is outside of workspace scope.
 I can still provide examples, instructions and code suggestions.` + } else if (unsupportedLanguage) { + unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 While ${unsupportedLanguage} is not supported, I will generate a suggestion below.` } else { - // File is in workspace, check language support - if (unsupportedLanguage) { - unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 While ${unsupportedLanguage} is not supported, I will generate a suggestion below.` - } else { - unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 I will still generate a suggestion below.` - } + unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 I will still generate a suggestion below.` } this.messenger.sendMessage(unsupportedMessage, tabID, 'answer') await this.onCodeGeneration(session, message.prompt, tabID, fileName, filePath) From d9f70939ce0783a14d8ce3628cda1d4bae60c0bd Mon Sep 17 00:00:00 2001 From: Ashish Reddy Podduturi Date: Wed, 8 Jan 2025 13:21:16 -0800 Subject: [PATCH 131/202] Fix in chat message --- packages/core/src/amazonqTest/chat/controller/controller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index fb901491a16..35e234cc01a 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -444,12 +444,12 @@ export class TestController { /* For Re:Invent 2024 we are supporting only java and python for unit test generation, rest of the languages shows the similar experience as CWC */ - if (!['java', 'python'].includes(language) || workspaceFolder == undefined) { + if (!['java', 'python'].includes(language) || workspaceFolder === undefined) { let unsupportedMessage: string const unsupportedLanguage = language ? language.charAt(0).toUpperCase() + language.slice(1) : '' if (!workspaceFolder) { // File is outside of workspace - unsupportedMessage = `⚠I can't generate tests for because ${fileName} is outside of workspace scope.
 I can still provide examples, instructions and code suggestions.` + unsupportedMessage = `⚠I can't generate tests for ${fileName} because the file is outside of workspace scope.
 I can still provide examples, instructions and code suggestions.` } else if (unsupportedLanguage) { unsupportedMessage = `⚠I'm sorry, but /test only supports Python and Java
 While ${unsupportedLanguage} is not supported, I will generate a suggestion below.` } else { From 02f6d0bf817253f8eaf1ad6f13c333d2562f0a9c Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Wed, 8 Jan 2025 20:14:20 -0500 Subject: [PATCH 132/202] fix(auth): debounce getToken() function (#6282) ## Problem: The Identity team noticed a large spike in token refreshes for specific users. One user would trigger refresh over 50 times within a few seconds. Ticket: `P180886632` ## Solution: The telemetry showed that `getChatAuthState()` was being called many times in a short period. This eventually triggered the token refresh logic many times, if the token was expired. The solution is to add a debounce to `getToken()` which calls the refresh logic. - `debounce()` only accepts functions without any args, the refresh logic requires args - `getToken()` will also load from disk is the token is not expired, so debouncing here saves disk I/O as well. The current debounce interval is 100 milliseconds, which based on telemetry should be enough to capture the barrage of calls. With some manual testing it does not feel like UX is impacted in any noticeable way. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: nkomonen-amazon --- .../src/auth/sso/ssoAccessTokenProvider.ts | 15 +++++++- .../sharedCredentialsProvider.test.ts | 9 ----- .../sso/ssoAccessTokenProvider.test.ts | 37 ++++++++++++------- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/packages/core/src/auth/sso/ssoAccessTokenProvider.ts b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts index 6639e9f3832..d0c8af56c3f 100644 --- a/packages/core/src/auth/sso/ssoAccessTokenProvider.ts +++ b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts @@ -33,7 +33,7 @@ import { randomUUID } from '../../shared/crypto' import { getExtRuntimeContext } from '../../shared/vscode/env' import { showInputBox } from '../../shared/ui/inputPrompter' import { AmazonQPromptSettings, DevSettings, PromptSettings, ToolkitPromptSettings } from '../../shared/settings' -import { onceChanged } from '../../shared/utilities/functionUtils' +import { debounce, onceChanged } from '../../shared/utilities/functionUtils' import { NestedMap } from '../../shared/utilities/map' import { asStringifiedStack } from '../../shared/telemetry/spans' import { showViewLogsMessage } from '../../shared/utilities/messages' @@ -97,7 +97,20 @@ export abstract class SsoAccessTokenProvider { this.reAuthState.set(this.profile, { reAuthReason: `invalidate():${reason}` }) } + /** + * Sometimes we get many calls at once and this + * can trigger redundant disk reads, or token refreshes. + * We debounce to avoid this. + * + * NOTE: The property {@link getTokenDebounced()} does not work with being stubbed for tests, so + * this redundant function was created to work around that. + */ public async getToken(): Promise { + return this.getTokenDebounced() + } + private getTokenDebounced = debounce(() => this._getToken(), 50) + /** Exposed for testing purposes only */ + public async _getToken(): Promise { const data = await this.cache.token.load(this.tokenCacheKey) SsoAccessTokenProvider.logIfChanged( indent( diff --git a/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts index 8e266cc11d3..9f12d7c6c64 100644 --- a/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts +++ b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts @@ -4,13 +4,11 @@ */ import assert from 'assert' -import * as FakeTimers from '@sinonjs/fake-timers' import * as sinon from 'sinon' import { SharedCredentialsProvider } from '../../../auth/providers/sharedCredentialsProvider' import { stripUndefined } from '../../../shared/utilities/collectionUtils' import * as process from '@aws-sdk/credential-provider-process' import { ParsedIniData } from '@smithy/shared-ini-file-loader' -import { installFakeClock } from '../../testUtil' import { SsoClient } from '../../../auth/sso/clients' import { stub } from '../../utilities/stubber' import { SsoAccessTokenProvider } from '../../../auth/sso/ssoAccessTokenProvider' @@ -19,20 +17,13 @@ import { createTestSections } from '../testUtil' const missingPropertiesFragment = 'missing properties' describe('SharedCredentialsProvider', async function () { - let clock: FakeTimers.InstalledClock let sandbox: sinon.SinonSandbox before(function () { sandbox = sinon.createSandbox() - clock = installFakeClock() - }) - - after(function () { - clock.uninstall() }) afterEach(function () { - clock.reset() sandbox.restore() }) diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts index f552e8d08c8..6536095cd59 100644 --- a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts +++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts @@ -27,6 +27,7 @@ import { ToolkitError } from '../../../shared/errors' import * as fs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' import { Stub, stub } from '../../utilities/stubber' +import { globals } from '../../../shared' const hourInMs = 3600000 @@ -37,14 +38,14 @@ describe('SsoAccessTokenProvider', function () { let oidcClient: Stub let sut: SsoAccessTokenProvider let cache: ReturnType - let clock: FakeTimers.InstalledClock + let clock: FakeTimers.InstalledClock | undefined let tempDir: string let reAuthState: TestReAuthState function createToken(timeDelta: number, extras: Partial = {}) { return { accessToken: 'dummyAccessToken', - expiresAt: new clock.Date(clock.Date.now() + timeDelta), + expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta), ...extras, } } @@ -54,7 +55,7 @@ describe('SsoAccessTokenProvider', function () { scopes: [], clientId: 'dummyClientId', clientSecret: 'dummyClientSecret', - expiresAt: new clock.Date(clock.Date.now() + timeDelta), + expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta), startUrl, ...extras, } @@ -66,7 +67,7 @@ describe('SsoAccessTokenProvider', function () { deviceCode: 'dummyCode', userCode: 'dummyUserCode', verificationUri: 'dummyLink', - expiresAt: new clock.Date(clock.Date.now() + timeDelta), + expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta), } } @@ -77,14 +78,6 @@ describe('SsoAccessTokenProvider', function () { return cacheDir } - before(function () { - clock = installFakeClock() - }) - - after(function () { - clock.uninstall() - }) - beforeEach(async function () { oidcClient = stub(OidcClient) tempDir = await makeTemporaryTokenCacheFolder() @@ -95,7 +88,7 @@ describe('SsoAccessTokenProvider', function () { afterEach(async function () { sinon.restore() - clock.reset() + clock?.uninstall() await tryRemoveFolder(tempDir) }) @@ -163,6 +156,20 @@ describe('SsoAccessTokenProvider', function () { assert.strictEqual(cachedToken, undefined) }) + it('concurrent calls are debounced', async function () { + const validToken = createToken(hourInMs) + await cache.token.save(startUrl, { region, startUrl, token: validToken }) + const actualGetToken = sinon.spy(sut, '_getToken') + + const result = await Promise.all([sut.getToken(), sut.getToken(), sut.getToken()]) + + // Subsequent other calls were debounced so this was only called once + assert.strictEqual(actualGetToken.callCount, 1) + for (const r of result) { + assert.deepStrictEqual(r, validToken) + } + }) + describe('Exceptions', function () { it('drops expired tokens if failure was a client-fault', async function () { const exception = new UnauthorizedClientException({ message: '', $metadata: {} }) @@ -267,6 +274,7 @@ describe('SsoAccessTokenProvider', function () { }) it(`emits session duration between logins of the same startUrl`, async function () { + clock = installFakeClock() setupFlow() stubOpen() @@ -311,6 +319,7 @@ describe('SsoAccessTokenProvider', function () { }) it('respects the device authorization expiration time', async function () { + clock = installFakeClock() setupFlow() stubOpen() const exception = new AuthorizationPendingException({ message: '', $metadata: {} }) @@ -352,7 +361,7 @@ describe('SsoAccessTokenProvider', function () { const registration = { clientId: 'myExpiredClientId', clientSecret: 'myExpiredClientSecret', - expiresAt: new clock.Date(clock.Date.now() - 1), // expired date + expiresAt: new globals.clock.Date(globals.clock.Date.now() - 1), // expired date startUrl: key.startUrl, } await cache.registration.save(key, registration) From 09772be2e2685399efa34627945816360a7c8ded Mon Sep 17 00:00:00 2001 From: Avi Alpert Date: Thu, 9 Jan 2025 12:54:00 -0500 Subject: [PATCH 133/202] fix(amazonq): update messaging for /doc --- ...Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json | 4 ++++ packages/core/package.nls.json | 7 +++++-- packages/core/src/amazonqDoc/constants.ts | 12 ++++++------ .../src/amazonqDoc/controllers/chat/controller.ts | 8 +++----- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json b/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json new file mode 100644 index 00000000000..db05e633033 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /doc: Improve button text phrasing" +} diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index cab4f52dcee..024a2a3cc9f 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -373,8 +373,8 @@ "AWS.amazonq.doc.answer.scanning": "Scanning source files", "AWS.amazonq.doc.answer.summarizing": "Summarizing source files", "AWS.amazonq.doc.answer.generating": "Generating documentation", - "AWS.amazonq.doc.answer.creating": "Okay, I'm creating a README for your project. This may take a few minutes.", - "AWS.amazonq.doc.answer.updating": "Okay, I'm updating the README to reflect your code changes. This may take a few minutes.", + "AWS.amazonq.doc.answer.creating": "Okay, I'm creating a README for your project. This might take a few minutes.", + "AWS.amazonq.doc.answer.updating": "Okay, I'm updating the README. This might take a few minutes.", "AWS.amazonq.doc.answer.chooseFolder": "Choose a folder to continue.", "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.", "AWS.amazonq.doc.error.contentLengthError": "Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the Amazon Q Developer documentation.", @@ -387,6 +387,9 @@ "AWS.amazonq.doc.error.promptRefusal": "I'm sorry, I can't generate documentation for this folder. Please make sure your message and code files comply with the Please make sure your message and code files comply with the AWS Responsible AI Policy.", "AWS.amazonq.doc.placeholder.editReadme": "Describe documentation changes", "AWS.amazonq.doc.pillText.closeSession": "End session", + "AWS.amazonq.doc.pillText.newTask": "Start a new documentation task", + "AWS.amazonq.doc.pillText.update": "Update README to reflect code", + "AWS.amazonq.doc.pillText.makeChange": "Make a specific change", "AWS.amazonq.inline.invokeChat": "Inline chat", "AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough", "AWS.toolkit.lambda.walkthrough.title": "Get started building your application", diff --git a/packages/core/src/amazonqDoc/constants.ts b/packages/core/src/amazonqDoc/constants.ts index ab872bd93e5..5d1d938c940 100644 --- a/packages/core/src/amazonqDoc/constants.ts +++ b/packages/core/src/amazonqDoc/constants.ts @@ -93,15 +93,15 @@ export const FolderSelectorFollowUps = [ ] export const SynchronizeDocumentation = { - pillText: 'Update README with recent code changes', - prompt: 'Update README with recent code changes', - type: 'SynchronizeDocumentation', + pillText: i18n('AWS.amazonq.doc.pillText.update'), + prompt: i18n('AWS.amazonq.doc.pillText.update'), + type: FollowUpTypes.SynchronizeDocumentation, } export const EditDocumentation = { - pillText: 'Make a specific change', - prompt: 'Make a specific change', - type: 'EditDocumentation', + pillText: i18n('AWS.amazonq.doc.pillText.makeChange'), + prompt: i18n('AWS.amazonq.doc.pillText.makeChange'), + type: FollowUpTypes.EditDocumentation, } export enum Mode { diff --git a/packages/core/src/amazonqDoc/controllers/chat/controller.ts b/packages/core/src/amazonqDoc/controllers/chat/controller.ts index 40fcf037181..da1103babf9 100644 --- a/packages/core/src/amazonqDoc/controllers/chat/controller.ts +++ b/packages/core/src/amazonqDoc/controllers/chat/controller.ts @@ -307,7 +307,7 @@ export class DocController { message: 'Your changes have been discarded.', followUps: [ { - pillText: i18n('AWS.amazonq.featureDev.pillText.newTask'), + pillText: i18n('AWS.amazonq.doc.pillText.newTask'), type: FollowUpTypes.NewTask, status: 'info', }, @@ -706,14 +706,12 @@ export class DocController { tabID: message.tabID, followUps: [ { - pillText: 'Start a new documentation task', - prompt: 'Start a new documentation task', + pillText: i18n('AWS.amazonq.doc.pillText.newTask'), type: FollowUpTypes.NewTask, status: 'info', }, { - pillText: 'End session', - prompt: 'End session', + pillText: i18n('AWS.amazonq.doc.pillText.closeSession'), type: FollowUpTypes.CloseSession, status: 'info', }, From 4eb6dbc07f299f90b161170ab4e19ff4240d36b8 Mon Sep 17 00:00:00 2001 From: Kevin Ding Date: Thu, 9 Jan 2025 14:01:17 -0500 Subject: [PATCH 134/202] chore: remove unused telemetry of /doc --- .../amazonqDoc/controllers/chat/controller.ts | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/packages/core/src/amazonqDoc/controllers/chat/controller.ts b/packages/core/src/amazonqDoc/controllers/chat/controller.ts index 40fcf037181..91cccd47abc 100644 --- a/packages/core/src/amazonqDoc/controllers/chat/controller.ts +++ b/packages/core/src/amazonqDoc/controllers/chat/controller.ts @@ -20,7 +20,6 @@ import { getLogger } from '../../../shared/logger' import { Session } from '../../session/session' import { i18n } from '../../../shared/i18n-helper' -import { telemetry } from '../../../shared/telemetry' import path from 'path' import { createSingleFileDialog } from '../../../shared/ui/common/openDialog' import { MynahIcons } from '@aws/mynah-ui' @@ -187,12 +186,6 @@ export class DocController { const codeGenerationId: string = message.messageId const zipFilePath: string = message.filePath const session = await this.sessionStorage.getSession(tabId) - telemetry.amazonq_isReviewedChanges.emit({ - amazonqConversationId: session.conversationId, - enabled: true, - result: 'Succeeded', - credentialStartUrl: AuthUtil.instance.startUrl, - }) const workspacePrefixMapping = getWorkspaceFoldersByPrefixes(session.config.workspaceFolders) const pathInfos = getPathsFromZipFilePath(zipFilePath, workspacePrefixMapping, session.config.workspaceFolders) @@ -357,7 +350,6 @@ export class DocController { } private async fileClicked(message: any) { - // TODO: add Telemetry here const tabId: string = message.tabID const messageId = message.messageId const filePathToUpdate: string = message.filePath @@ -397,12 +389,6 @@ export class DocController { private async newTask(message: any) { // Old session for the tab is ending, delete it so we can create a new one for the message id this.docGenerationTask = new DocGenerationTask() - const session = await this.sessionStorage.getSession(message.tabID) - telemetry.amazonq_endChat.emit({ - amazonqConversationId: session.conversationId, - amazonqEndOfTheConversationLatency: performance.now() - session.telemetry.sessionStartTime, - result: 'Succeeded', - }) this.sessionStorage.deleteSession(message.tabID) // Re-run the opening flow, where we check auth + create a session @@ -419,14 +405,7 @@ export class DocController { this.messenger.sendUpdatePlaceholder(message.tabID, i18n('AWS.amazonq.featureDev.placeholder.sessionClosed')) this.messenger.sendChatInputEnabled(message.tabID, false) - const session = await this.sessionStorage.getSession(message.tabID) this.docGenerationTask.reset() - - telemetry.amazonq_endChat.emit({ - amazonqConversationId: session.conversationId, - amazonqEndOfTheConversationLatency: performance.now() - session.telemetry.sessionStartTime, - result: 'Succeeded', - }) } private processErrorChatMessage = (err: any, message: any, session: Session | undefined) => { @@ -492,7 +471,6 @@ export class DocController { } private async stopResponse(message: any) { - telemetry.ui_click.emit({ elementId: 'amazonq_stopCodeGeneration' }) this.messenger.sendAnswer({ message: i18n('AWS.amazonq.featureDev.pillText.stoppingCodeGeneration'), type: 'answer-part', @@ -679,18 +657,6 @@ export class DocController { try { session = await this.sessionStorage.getSession(message.tabID) - const acceptedFiles = (paths?: { rejected: boolean }[]) => (paths || []).filter((i) => !i.rejected).length - - const amazonqNumberOfFilesAccepted = - acceptedFiles(session.state.filePaths) + acceptedFiles(session.state.deletedFiles) - - telemetry.amazonq_isAcceptedCodeChanges.emit({ - credentialStartUrl: AuthUtil.instance.startUrl, - amazonqConversationId: session.conversationId, - amazonqNumberOfFilesAccepted, - enabled: true, - result: 'Succeeded', - }) await session.insertChanges() const readmePath = findReadmePath(session.state.filePaths) From cddd8704b341eb8bc384dbd768a873b5cc048131 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 9 Jan 2025 20:07:16 +0000 Subject: [PATCH 135/202] Release 3.41.0 --- package-lock.json | 4 ++-- packages/toolkit/.changes/3.41.0.json | 14 ++++++++++++++ ...moval-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json | 4 ---- ...moval-6703e62b-3835-402b-b187-b327c58f425b.json | 4 ---- packages/toolkit/CHANGELOG.md | 5 +++++ packages/toolkit/package.json | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 packages/toolkit/.changes/3.41.0.json delete mode 100644 packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json delete mode 100644 packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json diff --git a/package-lock.json b/package-lock.json index 4843aa9edec..bd84fb96732 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21286,7 +21286,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.41.0-SNAPSHOT", + "version": "3.41.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/.changes/3.41.0.json b/packages/toolkit/.changes/3.41.0.json new file mode 100644 index 00000000000..029c2753563 --- /dev/null +++ b/packages/toolkit/.changes/3.41.0.json @@ -0,0 +1,14 @@ +{ + "date": "2025-01-09", + "version": "3.41.0", + "entries": [ + { + "type": "Removal", + "description": "Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions." + }, + { + "type": "Removal", + "description": "Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions." + } + ] +} \ No newline at end of file diff --git a/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json b/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json deleted file mode 100644 index d49140750c8..00000000000 --- a/packages/toolkit/.changes/next-release/Removal-1c5617ae-50c9-4de1-a191-a2d57dce5bd7.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Removal", - "description": "Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions." -} diff --git a/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json b/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json deleted file mode 100644 index 7cb1f436b51..00000000000 --- a/packages/toolkit/.changes/next-release/Removal-6703e62b-3835-402b-b187-b327c58f425b.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Removal", - "description": "Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions." -} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 24ccbedfe5e..82d89b566cf 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.41.0 2025-01-09 + +- **Removal** Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions. +- **Removal** Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions. + ## 3.40.0 2024-12-17 - **Bug Fix** Auth: SSO failed to missing refreshToken diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index b93cd063334..63e7ac1749b 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.41.0-SNAPSHOT", + "version": "3.41.0", "extensionKind": [ "workspace" ], From fd7c97ddb5f06901fa8a5b95155db403b931acea Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 9 Jan 2025 20:07:47 +0000 Subject: [PATCH 136/202] Release 1.42.0 --- package-lock.json | 4 +- packages/amazonq/.changes/1.42.0.json | 58 +++++++++++++++++++ ...-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json | 4 -- ...-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json | 4 -- ...-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json | 4 -- ...-8434a098-361d-4e8d-9de4-c616da38ccbf.json | 4 -- ...-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json | 4 -- ...-99919167-cb02-4bb1-846a-949a55b37130.json | 4 -- ...-acf80397-e84d-430e-b7e2-fec67736338b.json | 4 -- ...-b071ef14-0566-4efa-9a16-43362b87639f.json | 4 -- ...-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json | 4 -- ...-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json | 4 -- ...-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json | 4 -- ...-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json | 4 -- ...-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json | 4 -- packages/amazonq/CHANGELOG.md | 16 +++++ packages/amazonq/package.json | 2 +- 17 files changed, 77 insertions(+), 55 deletions(-) create mode 100644 packages/amazonq/.changes/1.42.0.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json delete mode 100644 packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json diff --git a/package-lock.json b/package-lock.json index 4843aa9edec..0fcb4b50956 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21126,7 +21126,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.42.0-SNAPSHOT", + "version": "1.42.0", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/.changes/1.42.0.json b/packages/amazonq/.changes/1.42.0.json new file mode 100644 index 00000000000..7327ed0c9c4 --- /dev/null +++ b/packages/amazonq/.changes/1.42.0.json @@ -0,0 +1,58 @@ +{ + "date": "2025-01-09", + "version": "1.42.0", + "entries": [ + { + "type": "Bug Fix", + "description": "Amazon Q /doc: Improve button text phrasing" + }, + { + "type": "Bug Fix", + "description": "Amazon Q /dev: Fix issue when files are deleted while preparing context" + }, + { + "type": "Bug Fix", + "description": "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions" + }, + { + "type": "Bug Fix", + "description": "Fix context menu displaying when typing @, even though input is disallowed" + }, + { + "type": "Bug Fix", + "description": "Amazon Q can update mvn and gradle build files" + }, + { + "type": "Bug Fix", + "description": "/transform: use correct documentation link in SQL conversion help message" + }, + { + "type": "Bug Fix", + "description": "Up/down history navigation only triggering on first/last line of prompt input" + }, + { + "type": "Bug Fix", + "description": "Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope." + }, + { + "type": "Bug Fix", + "description": "/review: Code block extends beyond page margins in code issue detail view" + }, + { + "type": "Bug Fix", + "description": "Amazon Q Code Transformation: retry project upload up to 3 times" + }, + { + "type": "Feature", + "description": "Amazon Q Code Transformation: add view summary button in chat" + }, + { + "type": "Feature", + "description": "Amazon Q: new code syntax highlighter for improved accuracy" + }, + { + "type": "Removal", + "description": "Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit." + } + ] +} \ No newline at end of file diff --git a/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json b/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json deleted file mode 100644 index db05e633033..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-21e0fd75-299f-4f16-8fd6-ef6211ddd06b.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /doc: Improve button text phrasing" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json b/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json deleted file mode 100644 index 6684a90d129..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /dev: Fix issue when files are deleted while preparing context" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json b/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json deleted file mode 100644 index f81d5e31a14..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json b/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json deleted file mode 100644 index ce875ea0f40..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Fix context menu displaying when typing @, even though input is disallowed" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json b/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json deleted file mode 100644 index 54780e9339e..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q can update mvn and gradle build files" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json b/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json deleted file mode 100644 index 12d125040f2..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-99919167-cb02-4bb1-846a-949a55b37130.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "/transform: use correct documentation link in SQL conversion help message" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json b/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json deleted file mode 100644 index 9510e49cf6b..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Up/down history navigation only triggering on first/last line of prompt input" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json b/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json deleted file mode 100644 index 7a89a4cee67..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-b071ef14-0566-4efa-9a16-43362b87639f.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope." -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json b/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json deleted file mode 100644 index bc80e2916c3..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-c0428af9-a9e5-4f7f-a4f3-9cfe4ea851c9.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "/review: Code block extends beyond page margins in code issue detail view" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json b/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json deleted file mode 100644 index 2f917f23204..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-f7bb3f35-1b43-4604-b3bd-c2e7f1b65083.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Amazon Q Code Transformation: retry project upload up to 3 times" -} diff --git a/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json b/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json deleted file mode 100644 index cd8bab12485..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-1e7f3af5-7c94-4c60-8909-a61c0b06e02e.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Amazon Q Code Transformation: add view summary button in chat" -} diff --git a/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json b/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json deleted file mode 100644 index 1a1e0ee4a11..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-6e3400cd-def4-4a63-b344-fd7ffa7fa509.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Amazon Q: new code syntax highlighter for improved accuracy" -} diff --git a/packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json b/packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json deleted file mode 100644 index 720817d707a..00000000000 --- a/packages/amazonq/.changes/next-release/Removal-aa696d15-306f-4af5-aa4b-ab48c44f0a5e.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Removal", - "description": "Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit." -} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index a53d213ef43..9cfaa7fe04f 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,19 @@ +## 1.42.0 2025-01-09 + +- **Bug Fix** Amazon Q /doc: Improve button text phrasing +- **Bug Fix** Amazon Q /dev: Fix issue when files are deleted while preparing context +- **Bug Fix** Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions +- **Bug Fix** Fix context menu displaying when typing @, even though input is disallowed +- **Bug Fix** Amazon Q can update mvn and gradle build files +- **Bug Fix** /transform: use correct documentation link in SQL conversion help message +- **Bug Fix** Up/down history navigation only triggering on first/last line of prompt input +- **Bug Fix** Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope. +- **Bug Fix** /review: Code block extends beyond page margins in code issue detail view +- **Bug Fix** Amazon Q Code Transformation: retry project upload up to 3 times +- **Feature** Amazon Q Code Transformation: add view summary button in chat +- **Feature** Amazon Q: new code syntax highlighter for improved accuracy +- **Removal** Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit. + ## 1.41.0 2024-12-17 - **Bug Fix** /review: Apply fix removes other issues in the same file. diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 9e144c171a3..76bccc6b3bb 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.42.0-SNAPSHOT", + "version": "1.42.0", "extensionKind": [ "workspace" ], From 033fbce0f113e75d3c3df019f471f0dc976cee9e Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 9 Jan 2025 21:07:05 +0000 Subject: [PATCH 137/202] Update version to snapshot version: 3.42.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/toolkit/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd84fb96732..87def634d98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21286,7 +21286,7 @@ }, "packages/toolkit": { "name": "aws-toolkit-vscode", - "version": "3.41.0", + "version": "3.42.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 63e7ac1749b..6341a576c77 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -2,7 +2,7 @@ "name": "aws-toolkit-vscode", "displayName": "AWS Toolkit", "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.", - "version": "3.41.0", + "version": "3.42.0-SNAPSHOT", "extensionKind": [ "workspace" ], From d6b835a3b40749e222646b12c296c2d4ad825ea5 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Thu, 9 Jan 2025 21:07:53 +0000 Subject: [PATCH 138/202] Update version to snapshot version: 1.43.0-SNAPSHOT --- package-lock.json | 4 ++-- packages/amazonq/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fcb4b50956..89bc131455a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "prettier": "^3.3.3", "prettier-plugin-sh": "^0.14.0", "pretty-quick": "^4.0.0", - "ts-node": "^10.9.2", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", @@ -21126,7 +21126,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.42.0", + "version": "1.43.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 76bccc6b3bb..caad3f85306 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -2,7 +2,7 @@ "name": "amazon-q-vscode", "displayName": "Amazon Q", "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI", - "version": "1.42.0", + "version": "1.43.0-SNAPSHOT", "extensionKind": [ "workspace" ], From 4465d163cbb69ddef7145ebc149366fe7811cbea Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:39:26 -0800 Subject: [PATCH 139/202] telemetry(inline-suggestion): Fix incorrect clientComponentLatency@preprocessLatency (#6320) ## Problem t1: user trigger inline suggestion either automatically or manually t2: start building request with editor context t3: done building request t4: call service API PreprocessLatency is supposed to denote `t3 - t1`, whereas current implementation isn't which has been using `codewhispererPreprocessingLatency: session.fetchCredentialStartTime - session.invokeSuggestionStartTime,` ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../util/telemetryHelper.test.ts | 42 ++++++++++++++ .../service/recommendationHandler.ts | 2 + .../util/codeWhispererSession.ts | 1 + .../src/codewhisperer/util/telemetryHelper.ts | 55 ++++++++++++------- 4 files changed, 81 insertions(+), 19 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts b/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts index d6190a6c0fd..e042b1d43a2 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts @@ -11,6 +11,7 @@ import { CodewhispererSuggestionState, CodewhispererUserDecision, } from 'aws-core-vscode/shared' +import sinon from 'sinon' // TODO: improve and move the following test utils to codewhisperer/testUtils.ts function aUserDecision( @@ -38,6 +39,47 @@ function aCompletion(): Completion { } describe('telemetryHelper', function () { + describe('clientComponentLatency', function () { + let sut: TelemetryHelper + + beforeEach(function () { + sut = new TelemetryHelper() + }) + + afterEach(function () { + sinon.restore() + }) + + it('resetClientComponentLatencyTime should reset state variables', function () { + session.invokeSuggestionStartTime = 100 + session.preprocessEndTime = 200 + session.sdkApiCallStartTime = 300 + session.fetchCredentialStartTime = 400 + session.firstSuggestionShowTime = 500 + + sut.setSdkApiCallEndTime() + sut.setAllPaginationEndTime() + sut.setFirstResponseRequestId('aFakeRequestId') + + sut.resetClientComponentLatencyTime() + + assert.strictEqual(session.invokeSuggestionStartTime, 0) + assert.strictEqual(session.preprocessEndTime, 0) + assert.strictEqual(session.sdkApiCallStartTime, 0) + assert.strictEqual(session.fetchCredentialStartTime, 0) + assert.strictEqual(session.firstSuggestionShowTime, 0) + assert.strictEqual(sut.sdkApiCallEndTime, 0) + assert.strictEqual(sut.allPaginationEndTime, 0) + assert.strictEqual(sut.firstResponseRequestId, '') + }) + + it('setInvocationSuggestionStartTime should call resetClientComponentLatencyTime', function () { + const resetStub = sinon.stub(sut, 'resetClientComponentLatencyTime') + sut.setInvokeSuggestionStartTime() + assert.ok(resetStub.calledOnce) + }) + }) + describe('aggregateUserDecisionByRequest', function () { let sut: TelemetryHelper diff --git a/packages/core/src/codewhisperer/service/recommendationHandler.ts b/packages/core/src/codewhisperer/service/recommendationHandler.ts index 57accdfe44f..72e130a5bed 100644 --- a/packages/core/src/codewhisperer/service/recommendationHandler.ts +++ b/packages/core/src/codewhisperer/service/recommendationHandler.ts @@ -207,6 +207,8 @@ export class RecommendationHandler { session.requestContext = await EditorContext.buildGenerateRecommendationRequest(editor as vscode.TextEditor) } const request = session.requestContext.request + // record preprocessing end time + TelemetryHelper.instance.setPreprocessEndTime() // set start pos for non pagination call or first pagination call if (!pagination || (pagination && page === 0)) { diff --git a/packages/core/src/codewhisperer/util/codeWhispererSession.ts b/packages/core/src/codewhisperer/util/codeWhispererSession.ts index e5daae22d17..042cd947124 100644 --- a/packages/core/src/codewhisperer/util/codeWhispererSession.ts +++ b/packages/core/src/codewhisperer/util/codeWhispererSession.ts @@ -41,6 +41,7 @@ class CodeWhispererSession { fetchCredentialStartTime = 0 sdkApiCallStartTime = 0 invokeSuggestionStartTime = 0 + preprocessEndTime = 0 timeToFirstRecommendation = 0 firstSuggestionShowTime = 0 perceivedLatency = 0 diff --git a/packages/core/src/codewhisperer/util/telemetryHelper.ts b/packages/core/src/codewhisperer/util/telemetryHelper.ts index 6505e248f28..a34deb0cdca 100644 --- a/packages/core/src/codewhisperer/util/telemetryHelper.ts +++ b/packages/core/src/codewhisperer/util/telemetryHelper.ts @@ -31,9 +31,18 @@ import { Session } from '../../amazonqTest/chat/session/session' export class TelemetryHelper { // Some variables for client component latency - private sdkApiCallEndTime = 0 - private allPaginationEndTime = 0 - private firstResponseRequestId = '' + private _sdkApiCallEndTime = 0 + get sdkApiCallEndTime(): number { + return this._sdkApiCallEndTime + } + private _allPaginationEndTime = 0 + get allPaginationEndTime(): number { + return this._allPaginationEndTime + } + private _firstResponseRequestId = '' + get firstResponseRequestId(): string { + return this._firstResponseRequestId + } // variables for user trigger decision // these will be cleared after a invocation session private sessionDecisions: CodewhispererUserTriggerDecision[] = [] @@ -582,12 +591,20 @@ export class TelemetryHelper { public resetClientComponentLatencyTime() { session.invokeSuggestionStartTime = 0 + session.preprocessEndTime = 0 session.sdkApiCallStartTime = 0 - this.sdkApiCallEndTime = 0 + this._sdkApiCallEndTime = 0 session.fetchCredentialStartTime = 0 session.firstSuggestionShowTime = 0 - this.allPaginationEndTime = 0 - this.firstResponseRequestId = '' + this._allPaginationEndTime = 0 + this._firstResponseRequestId = '' + } + + public setPreprocessEndTime() { + if (session.preprocessEndTime !== 0) { + getLogger().warn(`inline completion preprocessEndTime has been set and not reset correctly`) + } + session.preprocessEndTime = performance.now() } /** This method is assumed to be invoked first at the start of execution **/ @@ -597,46 +614,46 @@ export class TelemetryHelper { } public setSdkApiCallEndTime() { - if (this.sdkApiCallEndTime === 0 && session.sdkApiCallStartTime !== 0) { - this.sdkApiCallEndTime = performance.now() + if (this._sdkApiCallEndTime === 0 && session.sdkApiCallStartTime !== 0) { + this._sdkApiCallEndTime = performance.now() } } public setAllPaginationEndTime() { - if (this.allPaginationEndTime === 0 && this.sdkApiCallEndTime !== 0) { - this.allPaginationEndTime = performance.now() + if (this._allPaginationEndTime === 0 && this._sdkApiCallEndTime !== 0) { + this._allPaginationEndTime = performance.now() } } public setFirstSuggestionShowTime() { - if (session.firstSuggestionShowTime === 0 && this.sdkApiCallEndTime !== 0) { + if (session.firstSuggestionShowTime === 0 && this._sdkApiCallEndTime !== 0) { session.firstSuggestionShowTime = performance.now() } } public setFirstResponseRequestId(requestId: string) { - if (this.firstResponseRequestId === '') { - this.firstResponseRequestId = requestId + if (this._firstResponseRequestId === '') { + this._firstResponseRequestId = requestId } } // report client component latency after all pagination call finish // and at least one suggestion is shown to the user public tryRecordClientComponentLatency() { - if (session.firstSuggestionShowTime === 0 || this.allPaginationEndTime === 0) { + if (session.firstSuggestionShowTime === 0 || this._allPaginationEndTime === 0) { return } telemetry.codewhisperer_clientComponentLatency.emit({ - codewhispererAllCompletionsLatency: this.allPaginationEndTime - session.sdkApiCallStartTime, + codewhispererAllCompletionsLatency: this._allPaginationEndTime - session.sdkApiCallStartTime, codewhispererCompletionType: 'Line', codewhispererCredentialFetchingLatency: session.sdkApiCallStartTime - session.fetchCredentialStartTime, codewhispererCustomizationArn: getSelectedCustomization().arn, codewhispererEndToEndLatency: session.firstSuggestionShowTime - session.invokeSuggestionStartTime, - codewhispererFirstCompletionLatency: this.sdkApiCallEndTime - session.sdkApiCallStartTime, + codewhispererFirstCompletionLatency: this._sdkApiCallEndTime - session.sdkApiCallStartTime, codewhispererLanguage: session.language, - codewhispererPostprocessingLatency: session.firstSuggestionShowTime - this.sdkApiCallEndTime, - codewhispererPreprocessingLatency: session.fetchCredentialStartTime - session.invokeSuggestionStartTime, - codewhispererRequestId: this.firstResponseRequestId, + codewhispererPostprocessingLatency: session.firstSuggestionShowTime - this._sdkApiCallEndTime, + codewhispererPreprocessingLatency: session.preprocessEndTime - session.invokeSuggestionStartTime, + codewhispererRequestId: this._firstResponseRequestId, codewhispererSessionId: session.sessionId, codewhispererTriggerType: session.triggerType, credentialStartUrl: AuthUtil.instance.startUrl, From e6c3101e8950acea5158407b7099d66a26663a8c Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:44:57 -0800 Subject: [PATCH 140/202] refactor(amazonq): remove unused strings (#6329) ## Problem Have 2 unused strings ## Solution Remove them --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- packages/core/src/codewhisperer/models/constants.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index 469e11e1fd2..d012c46c244 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -731,11 +731,6 @@ export const linkToDocsHome = 'https://docs.aws.amazon.com/amazonq/latest/aws-bu export const linkToBillingInfo = 'https://aws.amazon.com/q/developer/pricing/' -export const linkToUploadZipTooLarge = - 'https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/troubleshooting-code-transformation.html#project-size-limit' - -export const linkToDownloadZipTooLarge = '' - export const dependencyFolderName = 'transformation_dependencies_temp_' export const cleanInstallErrorChatMessage = `Sorry, I couldn\'t run the Maven clean install command to build your project. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootMvnFailure}).` From 427dc155fa32d54ee67fa7848affdb522bd74016 Mon Sep 17 00:00:00 2001 From: Jacob Chung Date: Mon, 13 Jan 2025 10:03:27 -0800 Subject: [PATCH 141/202] numberOfTestsGenerated is correctly emitted as 0 --- .../core/src/codewhisperer/commands/startTestGeneration.ts | 1 + packages/core/src/codewhisperer/service/testGenHandler.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts index 25264370c37..3b0f41ab1d6 100644 --- a/packages/core/src/codewhisperer/commands/startTestGeneration.ts +++ b/packages/core/src/codewhisperer/commands/startTestGeneration.ts @@ -120,6 +120,7 @@ export async function startTestGenerationProcess( ) // TODO: Send status to test summary if (jobStatus === TestGenerationJobStatus.FAILED) { + session.numberOfTestsGenerated = 0 logger.verbose(`Test generation failed.`) throw new TestGenFailedError() } diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts index 36f5b5b1d63..203dcd8eb03 100644 --- a/packages/core/src/codewhisperer/service/testGenHandler.ts +++ b/packages/core/src/codewhisperer/service/testGenHandler.ts @@ -222,6 +222,8 @@ export async function exportResultsArchive( await fs.mkdir(pathToArchiveDir) let downloadErrorMessage = undefined + + const session = ChatSessionManager.Instance.getSession() try { const pathToArchive = path.join(pathToArchiveDir, 'QTestGeneration.zip') // Download and deserialize the zip @@ -248,6 +250,7 @@ export async function exportResultsArchive( }) } } catch (e) { + session.numberOfTestsGenerated = 0 downloadErrorMessage = (e as Error).message getLogger().error(`Unit Test Generation: ExportResultArchive error = ${downloadErrorMessage}`) throw new Error('Error downloading test generation result artifacts: ' + downloadErrorMessage) From c2674577056118345c37bbbe756427c54a24b192 Mon Sep 17 00:00:00 2001 From: Sam Fink Date: Mon, 13 Jan 2025 11:00:31 -0800 Subject: [PATCH 142/202] fix(amazonq): Prevent customization override if user has manually selected a customization ## Problem If a user was part of an AB group with a customization override, they could only ever use the customization from the override regardless of personal choice. ## Solution Changes the logic for when a customization will be overridden if the user is part of an AB group that has a customization override. With this change, if the user has manually selected a customization, it will not be overridden by the AB customization. --- ...-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json | 4 + packages/core/src/codewhisperer/index.ts | 3 +- .../codewhisperer/util/customizationUtil.ts | 35 ++++--- .../test/amazonq/customizationUtil.test.ts | 94 +++++++++++++++++++ 4 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json create mode 100644 packages/core/src/test/amazonq/customizationUtil.test.ts diff --git a/packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json b/packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json new file mode 100644 index 00000000000..3f2f6330b2f --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "User-selected customizations are sometimes not being persisted." +} diff --git a/packages/core/src/codewhisperer/index.ts b/packages/core/src/codewhisperer/index.ts index 54a1c508322..235da682ec9 100644 --- a/packages/core/src/codewhisperer/index.ts +++ b/packages/core/src/codewhisperer/index.ts @@ -26,6 +26,7 @@ export type { SendTelemetryEventResponse, TelemetryEvent, InlineChatEvent, + Customization, } from './client/codewhispereruserclient.d.ts' export type { default as CodeWhispererUserClient } from './client/codewhispereruserclient.d.ts' export { SecurityPanelViewProvider } from './views/securityPanelViewProvider' @@ -98,6 +99,6 @@ export * as diagnosticsProvider from './service/diagnosticsProvider' export * from './ui/codeWhispererNodes' export { SecurityScanError } from '../codewhisperer/models/errors' export * as CodeWhispererConstants from '../codewhisperer/models/constants' -export { getSelectedCustomization } from './util/customizationUtil' +export { getSelectedCustomization, setSelectedCustomization, baseCustomization } from './util/customizationUtil' export { Container } from './service/serviceContainer' export * from './util/gitUtil' diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts index d2b14cb5247..e87d17cfdb3 100644 --- a/packages/core/src/codewhisperer/util/customizationUtil.ts +++ b/packages/core/src/codewhisperer/util/customizationUtil.ts @@ -91,6 +91,12 @@ export const baseCustomization = { ), } +/** + * Gets the customization that should be used for user requests. If a user has manually selected + * a customization, always respect that choice. If not, check if the user is part of an AB + * group assigned a specific customization. If so, use that customization. If not, use the + * base customization. + */ export const getSelectedCustomization = (): Customization => { if ( !AuthUtil.instance.isCustomizationFeatureEnabled || @@ -105,21 +111,22 @@ export const getSelectedCustomization = (): Customization => { Object, {} ) - const result = selectedCustomizationArr[AuthUtil.instance.conn.label] || baseCustomization - - // A/B case - const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride) - const arnOverride = customizationFeature?.value.stringValue - const customizationOverrideName = customizationFeature?.variation - if (arnOverride === undefined || arnOverride === '') { - return result + const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label] + + if (selectedCustomization && selectedCustomization.name !== baseCustomization.name) { + return selectedCustomization } else { - // A trick to prioritize arn from A/B over user's currently selected(for request and telemetry) - // but still shows customization info of user's currently selected. - return { - arn: arnOverride, - name: customizationOverrideName, - description: result.description, + const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride) + const arnOverride = customizationFeature?.value.stringValue + const customizationOverrideName = customizationFeature?.variation + if (arnOverride === undefined) { + return baseCustomization + } else { + return { + arn: arnOverride, + name: customizationOverrideName, + description: baseCustomization.description, + } } } } diff --git a/packages/core/src/test/amazonq/customizationUtil.test.ts b/packages/core/src/test/amazonq/customizationUtil.test.ts new file mode 100644 index 00000000000..1c2e5de7e29 --- /dev/null +++ b/packages/core/src/test/amazonq/customizationUtil.test.ts @@ -0,0 +1,94 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as sinon from 'sinon' +import assert from 'assert' +import { tryRegister } from '../testUtil' +import { + amazonQScopes, + AuthUtil, + baseCustomization, + Customization, + FeatureConfigProvider, + getSelectedCustomization, + refreshStatusBar, + setSelectedCustomization, +} from '../../codewhisperer' +import { FeatureContext, globals } from '../../shared' +import { resetCodeWhispererGlobalVariables } from '../codewhisperer/testUtil' +import { createSsoProfile, createTestAuth } from '../credentials/testUtil' +import { SsoConnection } from '../../auth' + +const enterpriseSsoStartUrl = 'https://enterprise.awsapps.com/start' + +describe('CodeWhisperer-customizationUtils', function () { + let auth: ReturnType + let ssoConn: SsoConnection + let featureCustomization: FeatureContext + + before(async function () { + createTestAuth(globals.globalState) + tryRegister(refreshStatusBar) + }) + + beforeEach(async function () { + auth = createTestAuth(globals.globalState) + ssoConn = await auth.createInvalidSsoConnection( + createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes }) + ) + featureCustomization = { + name: 'featureCustomizationName', + value: { + stringValue: 'featureCustomizationArn', + }, + variation: 'featureCustomizationName', + } + sinon.stub(FeatureConfigProvider, 'getFeature').returns(featureCustomization) + + sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false) + sinon.stub(AuthUtil.instance, 'isConnected').returns(true) + sinon.stub(AuthUtil.instance, 'isCustomizationFeatureEnabled').value(true) + sinon.stub(AuthUtil.instance, 'conn').value(ssoConn) + + await resetCodeWhispererGlobalVariables() + }) + + afterEach(function () { + sinon.restore() + }) + + it('Returns baseCustomization when not SSO', async function () { + sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(false) + const customization = getSelectedCustomization() + + assert.strictEqual(customization.name, baseCustomization.name) + }) + + it('Returns selectedCustomization when customization manually selected', async function () { + sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(true) + + const selectedCustomization: Customization = { + arn: 'selectedCustomizationArn', + name: 'selectedCustomizationName', + description: 'selectedCustomizationDescription', + } + + await setSelectedCustomization(selectedCustomization) + + const actualCustomization = getSelectedCustomization() + + assert.strictEqual(actualCustomization.name, selectedCustomization.name) + }) + + it('Returns AB customization', async function () { + sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(true) + + await setSelectedCustomization(baseCustomization) + + const returnedCustomization = getSelectedCustomization() + + assert.strictEqual(returnedCustomization.name, featureCustomization.name) + }) +}) From c9b4746845a6cd8688b078922c153621960cb347 Mon Sep 17 00:00:00 2001 From: Avi Alpert <131792194+avi-alpert@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:17:33 -0500 Subject: [PATCH 143/202] fix(amazonq): add error message for README update too large (#6347) ## Problem If a request to update a README results in an updated README that exceeds the size limit, a generic "I'm sorry, I ran into an issue updating your README" error is displayed. ## Solution Display a more specific error message when an updated README Exceeds the size limit --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json | 4 ++++ packages/core/package.nls.json | 1 + packages/core/src/amazonqDoc/errors.ts | 8 ++++++++ packages/core/src/amazonqDoc/session/sessionState.ts | 4 ++++ 4 files changed, 17 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json diff --git a/packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json b/packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json new file mode 100644 index 00000000000..7e1d6e86caa --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "feat(amazonq): Add error message for updated README too large" +} diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json index 024a2a3cc9f..d0e31cbcb33 100644 --- a/packages/core/package.nls.json +++ b/packages/core/package.nls.json @@ -379,6 +379,7 @@ "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.", "AWS.amazonq.doc.error.contentLengthError": "Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.readmeTooLarge": "The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the Amazon Q Developer documentation.", + "AWS.amazonq.doc.error.readmeUpdateTooLarge": "The updated README is too large. Try reducing the size of your README, or asking for a smaller update. For more information on quotas, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.workspaceEmpty": "The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.promptTooVague": "I need more information to make changes to your README. Try providing some of the following details:\n- Which sections you want to modify\n- The content you want to add or remove\n- Specific issues that need correcting\n\nFor more information on prompt best practices, see the Amazon Q Developer documentation.", "AWS.amazonq.doc.error.promptUnrelated": "These changes don't seem related to documentation. Try describing your changes again, using the following best practices:\n- Changes should relate to how project functionality is reflected in the README\n- Content you refer to should be available in your codebase\n\n For more information on prompt best practices, see the Amazon Q Developer documentation.", diff --git a/packages/core/src/amazonqDoc/errors.ts b/packages/core/src/amazonqDoc/errors.ts index fb918ec7c53..d9794f16327 100644 --- a/packages/core/src/amazonqDoc/errors.ts +++ b/packages/core/src/amazonqDoc/errors.ts @@ -20,6 +20,14 @@ export class ReadmeTooLargeError extends ToolkitError { } } +export class ReadmeUpdateTooLargeError extends ToolkitError { + constructor() { + super(i18n('AWS.amazonq.doc.error.readmeUpdateTooLarge'), { + code: ReadmeUpdateTooLargeError.name, + }) + } +} + export class WorkspaceEmptyError extends ToolkitError { constructor() { super(i18n('AWS.amazonq.doc.error.workspaceEmpty'), { diff --git a/packages/core/src/amazonqDoc/session/sessionState.ts b/packages/core/src/amazonqDoc/session/sessionState.ts index 03e234a9429..b3404c7998a 100644 --- a/packages/core/src/amazonqDoc/session/sessionState.ts +++ b/packages/core/src/amazonqDoc/session/sessionState.ts @@ -45,6 +45,7 @@ import { PromptTooVagueError, PromptUnrelatedError, ReadmeTooLargeError, + ReadmeUpdateTooLargeError, WorkspaceEmptyError, } from '../errors' import { DocMessenger } from '../messenger' @@ -149,6 +150,9 @@ abstract class CodeGenBase { case codegenResult.codeGenerationStatusDetail?.includes('README_TOO_LARGE'): { throw new ReadmeTooLargeError() } + case codegenResult.codeGenerationStatusDetail?.includes('README_UPDATE_TOO_LARGE'): { + throw new ReadmeUpdateTooLargeError() + } case codegenResult.codeGenerationStatusDetail?.includes('WORKSPACE_TOO_LARGE'): { throw new ContentLengthError() } From 9b0590ca439af463f8d520931817c3bb99451342 Mon Sep 17 00:00:00 2001 From: Maxim Hayes <149123719+hayemaxi@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:15:28 -0500 Subject: [PATCH 144/202] revert: Q new user view badge handler (#6350) Reverts [259ca31](https://github.com/aws/aws-toolkit-vscode/commit/259ca31b827690ee3d96e4b44550ac8e4045b0c6#diff-53367fa008dcbcfc4cc4e6a9c97bae43ea889adfdec82209a996e7228cdf2c72) Its purpose was to nudge inline completion users to the new chat feature. The codepath is now no longer possible in new versions. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/amazonq/package.json | 5 -- packages/amazonq/src/app/chat/activation.ts | 1 - packages/core/src/amazonq/index.ts | 1 - .../core/src/amazonq/util/viewBadgeHandler.ts | 83 ------------------- packages/core/src/amazonq/webview/webView.ts | 16 ---- packages/core/src/shared/globalState.ts | 1 - 6 files changed, 107 deletions(-) delete mode 100644 packages/core/src/amazonq/util/viewBadgeHandler.ts diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index caad3f85306..8981ba83502 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -218,11 +218,6 @@ "id": "aws.AmazonQChatView", "name": "%AWS.amazonq.chat%", "when": "!aws.isWebExtHost && !aws.amazonq.showLoginView" - }, - { - "id": "aws.AmazonQNeverShowBadge", - "name": "", - "when": "false" } ], "aws-codewhisperer-reference-log": [ diff --git a/packages/amazonq/src/app/chat/activation.ts b/packages/amazonq/src/app/chat/activation.ts index f7b3f9a0fa5..49205c75c7d 100644 --- a/packages/amazonq/src/app/chat/activation.ts +++ b/packages/amazonq/src/app/chat/activation.ts @@ -61,7 +61,6 @@ export async function activate(context: ExtensionContext) { void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl)) }) - await amazonq.activateBadge() void setupLsp() void setupAuthNotification() } diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts index 584042a8462..cd4ec424365 100644 --- a/packages/core/src/amazonq/index.ts +++ b/packages/core/src/amazonq/index.ts @@ -24,7 +24,6 @@ export { init as featureDevChatAppInit } from '../amazonqFeatureDev/app' export { init as gumbyChatAppInit } from '../amazonqGumby/app' export { init as testChatAppInit } from '../amazonqTest/app' export { init as docChatAppInit } from '../amazonqDoc/app' -export { activateBadge } from './util/viewBadgeHandler' export { amazonQHelpUrl } from '../shared/constants' export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu' export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands' diff --git a/packages/core/src/amazonq/util/viewBadgeHandler.ts b/packages/core/src/amazonq/util/viewBadgeHandler.ts deleted file mode 100644 index 3d066b18472..00000000000 --- a/packages/core/src/amazonq/util/viewBadgeHandler.ts +++ /dev/null @@ -1,83 +0,0 @@ -/*! - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -import { window, TreeItem, TreeView, ViewBadge } from 'vscode' -import { getLogger } from '../../shared/logger' -import globals from '../../shared/extensionGlobals' -import { AuthUtil } from '../../codewhisperer/util/authUtil' - -let badgeHelperView: TreeView | undefined - -/** - * invisible view meant exclusively to handle the view badge, note declaration has `"when": false`. - * webviews can provide a badge (you can hack it to show strings!), BUT: - * webview views can't show badges until they are loaded, - * so our best option is to use a do-nothing tree view and show a '1' - */ -export async function activateBadge() { - badgeHelperView = window.createTreeView('aws.AmazonQNeverShowBadge', { - treeDataProvider: { - getChildren: () => [], - getTreeItem: () => new TreeItem(''), - }, - }) - await showInitialViewBadge() -} - -/** - * Changes the view badge for the hidden view connected to the Amazon Q view - * @param badge ViewBadge to show, or undefined to blank the badge - */ -export function changeViewBadge(badge?: ViewBadge) { - if (badgeHelperView) { - badgeHelperView.badge = badge - } else { - getLogger().error('Attempted to call changeViewBadge before badgeHelperView set.') - } -} - -/** - * Removes the view badge from the badge helper view and prevents it from showing up ever again - */ -export function deactivateInitialViewBadge() { - globals.globalState.tryUpdate('hasAlreadyOpenedAmazonQ', true) - changeViewBadge() -} - -/** - * Show users a '1' badge on the Amazon Q icon if {@link shouldShowBadge} is true. - * - * This is intended to target users who are already using CWSPR and - * are autoupdating to a version of the extension with Q, - * since they may not know it exists otherwise. - */ -async function showInitialViewBadge() { - if (await shouldShowBadge()) { - changeViewBadge({ - value: 1, - tooltip: '', - }) - } -} - -/** - * Determines if a user should see an attract badge to entice them to use Amazon Q - * Shows a badge on the Amazon Q View Container IF: - * * the user has never, ever clicked into Amazon Q - * * The user has codewhispererCore auth and not codewhispererChat auth - * - * @returns True if the badge should be shown, false otherwise - */ -export async function shouldShowBadge(): Promise { - const hasAlreadyShown = globals.globalState.get('hasAlreadyOpenedAmazonQ') - if (!hasAlreadyShown) { - const state = await AuthUtil.instance.getChatAuthState() - if (state.codewhispererCore === 'connected' && state.codewhispererChat !== 'connected') { - return true - } - } - - return false -} diff --git a/packages/core/src/amazonq/webview/webView.ts b/packages/core/src/amazonq/webview/webView.ts index 50b8477847a..74f60cbf67b 100644 --- a/packages/core/src/amazonq/webview/webView.ts +++ b/packages/core/src/amazonq/webview/webView.ts @@ -19,8 +19,6 @@ import { dispatchAppsMessagesToWebView, dispatchWebViewMessagesToApps } from './ import { MessageListener } from '../messages/messageListener' import { MessagePublisher } from '../messages/messagePublisher' import { TabType } from './ui/storages/tabsStorage' -import { deactivateInitialViewBadge, shouldShowBadge } from '../util/viewBadgeHandler' -import { telemetry } from '../../shared/telemetry/telemetry' import { amazonqMark } from '../../shared/performance/marks' export class AmazonQChatViewProvider implements WebviewViewProvider { @@ -66,19 +64,5 @@ export class AmazonQChatViewProvider implements WebviewViewProvider { ) performance.mark(amazonqMark.open) - - // badge is shown, emit telemetry for first time an existing, unscoped user tries Q - // note: this will fire on any not-properly-scoped Q entry. - // this means we can't tie it directly to the badge although it is hinted at - if (await shouldShowBadge()) { - telemetry.ui_click.emit({ - elementId: 'amazonq_tryAmazonQ', - passive: false, - }) - } - // if a user EVER enters Q, we should never show the badge again. - // the webview view only loads if the user clicks the view container, - // so we can essentially use this as a guarantee that a user has entered Q. - deactivateInitialViewBadge() } } diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts index 5662c3e608e..645929b918f 100644 --- a/packages/core/src/shared/globalState.ts +++ b/packages/core/src/shared/globalState.ts @@ -58,7 +58,6 @@ export type globalKey = | 'dev.beta' | 'globalsMostRecentVersion' | 'gumby.wasQCodeTransformationUsed' - | 'hasAlreadyOpenedAmazonQ' | 'isExtensionFirstUse' | 'lastExtensionVersion' | 'lastSelectedRegion' From 17b2e6a89b12f389b05a58f4b833be4ee48f772f Mon Sep 17 00:00:00 2001 From: Jacob Chung Date: Mon, 13 Jan 2025 17:21:43 -0800 Subject: [PATCH 145/202] remove redundant sessions varaible --- packages/core/src/codewhisperer/service/testGenHandler.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts index 203dcd8eb03..ee2de612b77 100644 --- a/packages/core/src/codewhisperer/service/testGenHandler.ts +++ b/packages/core/src/codewhisperer/service/testGenHandler.ts @@ -231,7 +231,6 @@ export async function exportResultsArchive( const zip = new AdmZip(pathToArchive) zip.extractAllTo(pathToArchiveDir, true) - const session = ChatSessionManager.Instance.getSession() const testFilePathFromResponse = session?.shortAnswer?.testFilePath const testFilePath = testFilePathFromResponse ? testFilePathFromResponse.split('/').slice(1).join('/') // remove the project name From 39473b7dbc4278cb8d34bfc2618f97baae77e10d Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:07:08 -0500 Subject: [PATCH 146/202] fix(e2e): failing Auth Lambda (#6334) ## Problem The CC tests are failing in the auth lambda step, saying that the `user_code` value is not a string ## Solution See code for solution NOTE: This part is now fixed, but the auth lambda itself has its own separate issue that needs to first be fixed --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: nkomonen-amazon --- packages/core/src/test/setupUtil.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/core/src/test/setupUtil.ts b/packages/core/src/test/setupUtil.ts index f158d67ad55..538af7daa06 100644 --- a/packages/core/src/test/setupUtil.ts +++ b/packages/core/src/test/setupUtil.ts @@ -223,12 +223,16 @@ export function registerAuthHook(secret: string, lambdaId = process.env['AUTH_UT const openStub = patchObject(vscode.env, 'openExternal', async (target) => { try { - const url = new URL(target.toString(true)) - const userCode = url.searchParams.get('user_code') + // Latest eg: 'https://nkomonen.awsapps.com/start/#/device?user_code=JXZC-NVRK' + const urlString = target.toString(true) - // TODO: Update this to just be the full URL if the authorizer lambda ever - // supports the verification URI with user code embedded (VerificationUriComplete). - const verificationUri = url.origin + // Drop the user_code parameter since the auth lambda does not support it yet, and keeping it + // would trigger a slightly different UI flow which breaks the automation. + // TODO: If the auth lambda supports user_code in the parameters then we can skip this step + const verificationUri = urlString.split('?')[0] + + const params = urlString.split('?')[1] + const userCode = new URLSearchParams(params).get('user_code') await invokeLambda(lambdaId, { secret, From fe0eee85c8beabafdbef2eba03405cfbd7035ef9 Mon Sep 17 00:00:00 2001 From: Muzaffer Aydin Date: Tue, 14 Jan 2025 09:41:41 -0800 Subject: [PATCH 147/202] fix(wizard): wizard remains in "not ready" state if a custom init() was provided #6339 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem The wizard remained in a "not ready" state if a custom `init()` was provided, requiring manual toggles in the test code. ## Solution - Wrap the user’s init() with a small decorator that sets _ready = true. - Remove the manual toggles in wizardTestUtils.ts, letting the wizard handle readiness on its own. --- packages/core/src/shared/wizards/wizard.ts | 15 +++++++++++---- .../src/test/shared/wizards/wizardTestUtils.ts | 2 -- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/core/src/shared/wizards/wizard.ts b/packages/core/src/shared/wizards/wizard.ts index f472e982813..26e32b623ec 100644 --- a/packages/core/src/shared/wizards/wizard.ts +++ b/packages/core/src/shared/wizards/wizard.ts @@ -94,7 +94,7 @@ export class Wizard>> { private assertReady() { // Check for `false` explicity so that the base-class constructor can access `this._form`. // We want to guard against confusion when implementing a subclass, not this base-class. - if (this._ready === false && this.init) { + if (this._ready === false) { throw Error('run() (or init()) must be called immediately after creating the Wizard') } } @@ -113,7 +113,7 @@ export class Wizard>> { return this._stepOffset[1] + this.stateController.totalSteps } - public get _form() { + protected get _form() { this.assertReady() return this.__form } @@ -136,7 +136,7 @@ export class Wizard>> { this._estimator = estimator } - public constructor(private readonly options: WizardOptions = {}) { + public constructor(protected readonly options: WizardOptions = {}) { this.stateController = new StateMachineController(options.initState as TState) this.__form = options.initForm ?? new WizardForm() this._exitStep = @@ -144,6 +144,14 @@ export class Wizard>> { // Subclass constructor logic should live in `init()`, if it exists. this._ready = !this.init + + if (typeof this.init === 'function') { + const _init = this.init.bind(this) + this.init = () => { + this._ready = true + return _init() + } + } } /** @@ -166,7 +174,6 @@ export class Wizard>> { if (!this._ready && this.init) { this._ready = true // Let init() use `this._form`. await this.init() - delete this.init } this.assignSteps() diff --git a/packages/core/src/test/shared/wizards/wizardTestUtils.ts b/packages/core/src/test/shared/wizards/wizardTestUtils.ts index 76c50f6ae94..8430278a4c6 100644 --- a/packages/core/src/test/shared/wizards/wizardTestUtils.ts +++ b/packages/core/src/test/shared/wizards/wizardTestUtils.ts @@ -65,9 +65,7 @@ function failIf(cond: boolean, message?: string): void { export async function createWizardTester>(wizard: Wizard | WizardForm): Promise> { if (wizard instanceof Wizard && wizard.init) { // Ensure that init() was called. Needed because createWizardTester() does not call run(). - ;(wizard as any)._ready = true await wizard.init() - delete wizard.init } const form = wizard instanceof Wizard ? wizard.boundForm : wizard From a43ad2bfc01f808e3eebaa1e7c08299723707416 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:42:13 -0800 Subject: [PATCH 148/202] fix(amazonq): broaden search strings (#6357) ## Problem We search for 4 strings to indicate/infer Oracle SQL is present, including `oracle.jdbc.OracleDriver`, but legacy software can instead contain `oracle.jdbc.driver.OracleDriver`. ## Solution Broaden/loosen the validation/search. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- .../core/src/codewhisperer/commands/startTransformByQ.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts index b00ae4a6afb..154b8c07dcf 100644 --- a/packages/core/src/codewhisperer/commands/startTransformByQ.ts +++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts @@ -654,14 +654,14 @@ export async function getValidSQLConversionCandidateProjects() { let resultLog = '' for (const project of javaProjects) { // as long as at least one of these strings is found, project contains embedded SQL statements - const searchStrings = ['oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@', 'jdbc:oracle:oci:@', 'jdbc:odbc:'] + const searchStrings = ['oracle.jdbc.', 'jdbc:oracle:', 'jdbc:odbc:'] for (const str of searchStrings) { const spawnResult = await findStringInDirectory(str, project.path) // just for telemetry purposes if (spawnResult.error || spawnResult.stderr) { - resultLog += `search failed: ${JSON.stringify(spawnResult)}` + resultLog += `search error: ${JSON.stringify(spawnResult)}--` } else { - resultLog += `search succeeded: ${spawnResult.exitCode}` + resultLog += `search complete (exit code: ${spawnResult.exitCode})--` } getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${resultLog}`) if (spawnResult.exitCode === 0) { From 3ed322ebe6cf55e89c4b49253c1245c928657347 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:42:52 -0800 Subject: [PATCH 149/202] fix(amazonq): add link to docs (#6355) ## Problem Link to docs could be helpful in this intro message. ## Solution Add it. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani --- packages/core/src/codewhisperer/models/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index d012c46c244..f19a3cb6349 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -501,7 +501,7 @@ export const codeTransformLocThreshold = 100000 export const jobStartedChatMessage = 'I am starting to transform your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub. If I run into any issues, I might pause the transformation to get input from you on how to proceed.' -export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17, or upgrade Java 17 code with up to date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".` +export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17, or upgrade Java 17 code with up to date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS. [Learn more](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-embedded-sql.html).\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".` export const chooseTransformationObjectivePlaceholder = 'Enter "language upgrade" or "sql conversion"' From b66b01a932a2a5b5d4551105b9c09bab91bc0d3c Mon Sep 17 00:00:00 2001 From: Jacob Chung Date: Mon, 13 Jan 2025 15:40:51 -0800 Subject: [PATCH 150/202] add message after accept/reject action --- .../Bug Fix-b6d52b75-69e6-47bb-939b-5ddede03f977.json | 4 ++++ packages/core/src/amazonqTest/chat/controller/controller.ts | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-b6d52b75-69e6-47bb-939b-5ddede03f977.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b6d52b75-69e6-47bb-939b-5ddede03f977.json b/packages/amazonq/.changes/next-release/Bug Fix-b6d52b75-69e6-47bb-939b-5ddede03f977.json new file mode 100644 index 00000000000..8772b9bf10d --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-b6d52b75-69e6-47bb-939b-5ddede03f977.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon Q /test: Unit test generation completed message shows after accept/reject action" +} diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 35e234cc01a..9e6dcfaff0b 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -717,6 +717,9 @@ export class TestController { await vscode.window.showTextDocument(document) // TODO: send the message once again once build is enabled // this.messenger.sendMessage('Accepted', message.tabID, 'prompt') + + this.messenger.sendMessage('Unit test generation completed', message.tabID, 'answer') + telemetry.ui_click.emit({ elementId: 'unitTestGeneration_acceptDiff' }) TelemetryHelper.instance.sendTestGenerationToolkitEvent( @@ -840,6 +843,8 @@ export class TestController { private async endSession(data: any, step: FollowUpTypes) { const session = this.sessionStorage.getSession() if (step === FollowUpTypes.RejectCode) { + this.messenger.sendMessage('Unit test generation completed.', data.tabID, 'answer') + TelemetryHelper.instance.sendTestGenerationToolkitEvent( session, true, From d2cde47d08971c48789f1c1eb105a32f656d58fa Mon Sep 17 00:00:00 2001 From: Lei Gao <97199248+leigaol@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:54:59 -0800 Subject: [PATCH 151/202] fix(amazonq): max 20k char for inline supplementalContext (#6366) ## Problem In some rare cases, the total supplementalContext length exceeds 20k character. With recent service side changes, we need to make sure the total supplementalContext length do not exceed 20k in any situation. ## Solution Make sure the total supplementalContext length do not exceed 20k in any situation. Drop when necessary. This is not customer facing so no change log is attached. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-72b26a2d-3647-4d07-b0ef-92238e3f0050.json | 4 ++++ .../util/crossFileContextUtil.test.ts | 19 +++++++++++-------- .../src/codewhisperer/models/constants.ts | 1 + .../crossFileContextUtil.ts | 19 ++++++++++++++++--- .../core/src/test/codewhisperer/testUtil.ts | 9 +++++++++ 5 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-72b26a2d-3647-4d07-b0ef-92238e3f0050.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-72b26a2d-3647-4d07-b0ef-92238e3f0050.json b/packages/amazonq/.changes/next-release/Bug Fix-72b26a2d-3647-4d07-b0ef-92238e3f0050.json new file mode 100644 index 00000000000..900d0953d11 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-72b26a2d-3647-4d07-b0ef-92238e3f0050.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Fix inline completion supplementalContext length exceeding maximum in certain cases" +} diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts index 8f54a43bf52..91e26e36111 100644 --- a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts @@ -8,7 +8,12 @@ import * as FakeTimers from '@sinonjs/fake-timers' import * as vscode from 'vscode' import * as sinon from 'sinon' import * as crossFile from 'aws-core-vscode/codewhisperer' -import { aStringWithLineCount, createMockTextEditor, installFakeClock } from 'aws-core-vscode/test' +import { + aLongStringWithLineCount, + aStringWithLineCount, + createMockTextEditor, + installFakeClock, +} from 'aws-core-vscode/test' import { FeatureConfigProvider, crossFileContextConfig } from 'aws-core-vscode/codewhisperer' import { assertTabCount, @@ -71,8 +76,8 @@ describe('crossFileContextUtil', function () { assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50) }) - it('for t1 group, should return repomap + opentabs context', async function () { - await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false }) + it('for t1 group, should return repomap + opentabs context, should not exceed 20k total length', async function () { + await toTextEditor(aLongStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false }) const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, { preview: false, }) @@ -85,7 +90,7 @@ describe('crossFileContextUtil', function () { .withArgs(sinon.match.any, sinon.match.any, 'codemap') .resolves([ { - content: 'foo', + content: 'foo'.repeat(3000), score: 0, filePath: 'q-inline', }, @@ -93,17 +98,15 @@ describe('crossFileContextUtil', function () { const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken) assert.ok(actual) - assert.strictEqual(actual.supplementalContextItems.length, 4) + assert.strictEqual(actual.supplementalContextItems.length, 3) assert.strictEqual(actual?.strategy, 'codemap') assert.deepEqual(actual?.supplementalContextItems[0], { - content: 'foo', + content: 'foo'.repeat(3000), score: 0, filePath: 'q-inline', }) - assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50) assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50) - assert.strictEqual(actual.supplementalContextItems[3].content.split('\n').length, 50) }) it.skip('for t2 group, should return global bm25 context and no repomap', async function () { diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts index f19a3cb6349..d0b75b204db 100644 --- a/packages/core/src/codewhisperer/models/constants.ts +++ b/packages/core/src/codewhisperer/models/constants.ts @@ -84,6 +84,7 @@ export const lineBreakWin = '\r\n' export const supplementalContextTimeoutInMs = 100 +export const supplementalContextMaxTotalLength = 20480 /** * Ux of recommendations */ diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index a4b8aa5fba1..41a0504099e 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -7,7 +7,11 @@ import * as vscode from 'vscode' import { FeatureConfigProvider, fs } from '../../../shared' import path = require('path') import { BM25Document, BM25Okapi } from './rankBm25' -import { crossFileContextConfig, supplementalContextTimeoutInMs } from '../../models/constants' +import { + crossFileContextConfig, + supplementalContextTimeoutInMs, + supplementalContextMaxTotalLength, +} from '../../models/constants' import { isTestFile } from './codeParsingUtil' import { getFileDistance } from '../../../shared/filesystemUtilities' import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities' @@ -99,13 +103,22 @@ export async function fetchSupplementalContextForSrc( const opentabsContext = await fetchOpentabsContext(editor, cancellationToken) const codemap = await fetchProjectContext(editor, 'codemap') + function addToResult(items: CodeWhispererSupplementalContextItem[]) { + for (const item of items) { + const curLen = result.reduce((acc, i) => acc + i.content.length, 0) + if (curLen + item.content.length < supplementalContextMaxTotalLength) { + result.push(item) + } + } + } + if (codemap && codemap.length > 0) { - result.push(...codemap) + addToResult(codemap) hasCodemap = true } if (opentabsContext && opentabsContext.length > 0) { - result.push(...opentabsContext) + addToResult(opentabsContext) hasOpentabs = true } diff --git a/packages/core/src/test/codewhisperer/testUtil.ts b/packages/core/src/test/codewhisperer/testUtil.ts index 2bda1b08bc5..027087a86b6 100644 --- a/packages/core/src/test/codewhisperer/testUtil.ts +++ b/packages/core/src/test/codewhisperer/testUtil.ts @@ -329,3 +329,12 @@ export function aStringWithLineCount(lineCount: number, start: number = 0): stri return s.trimEnd() } + +export function aLongStringWithLineCount(lineCount: number, start: number = 0): string { + let s = '' + for (let i = start; i < start + lineCount; i++) { + s += `a`.repeat(100) + `line${i}\n` + } + + return s.trimEnd() +} From 613bf5f7d86d5d990eb0ec03a7803312e89f414b Mon Sep 17 00:00:00 2001 From: Sam Fink Date: Tue, 14 Jan 2025 13:22:22 -0800 Subject: [PATCH 152/202] feat(amazonq): capability to send new context commands to AB groups (#6239) ## Problem When working on new features available to AB groups, the new action are not easily discoverable to users ## Solution Add the ability to send a new command that will appear when a user types @ in the chat window --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- ...-37eb706c-57a1-4751-888d-220b2f68ee4d.json | 4 +++ .../amazonq/test/e2e/amazonq/welcome.test.ts | 14 ++++++-- packages/core/src/amazonq/webview/ui/main.ts | 9 +++-- .../src/amazonq/webview/ui/tabs/generator.ts | 36 +++++++++++++++++-- 4 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Feature-37eb706c-57a1-4751-888d-220b2f68ee4d.json diff --git a/packages/amazonq/.changes/next-release/Feature-37eb706c-57a1-4751-888d-220b2f68ee4d.json b/packages/amazonq/.changes/next-release/Feature-37eb706c-57a1-4751-888d-220b2f68ee4d.json new file mode 100644 index 00000000000..b055e2175c3 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-37eb706c-57a1-4751-888d-220b2f68ee4d.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Adds capability to send new context commands to AB groups" +} diff --git a/packages/amazonq/test/e2e/amazonq/welcome.test.ts b/packages/amazonq/test/e2e/amazonq/welcome.test.ts index 59ba7e728f2..3f9929cf062 100644 --- a/packages/amazonq/test/e2e/amazonq/welcome.test.ts +++ b/packages/amazonq/test/e2e/amazonq/welcome.test.ts @@ -9,6 +9,7 @@ import sinon from 'sinon' import { Messenger } from './framework/messenger' import { MynahUIDataModel } from '@aws/mynah-ui' import { assertQuickActions } from './assert' +import { FeatureContext } from 'aws-core-vscode/shared' describe('Amazon Q Welcome page', function () { let framework: qTestingFramework @@ -17,8 +18,15 @@ describe('Amazon Q Welcome page', function () { const availableCommands = ['/dev', '/test', '/review', '/doc', '/transform'] + const highlightCommand: FeatureContext = { + name: 'highlightCommand', + value: { + stringValue: '@highlight', + }, + variation: 'highlight command desc', + } beforeEach(() => { - framework = new qTestingFramework('welcome', true, [], 0) + framework = new qTestingFramework('welcome', true, [['highlightCommand', highlightCommand]], 0) tab = framework.getTabs()[0] // use the default tab that gets created store = tab.getStore() }) @@ -33,13 +41,13 @@ describe('Amazon Q Welcome page', function () { assertQuickActions(tab, availableCommands) }) - it('Shows @workspace', async () => { + it('Shows context commands', async () => { assert.deepStrictEqual( store.contextCommands ?.map((x) => x.commands) .flat() .map((x) => x.command), - ['@workspace'] + ['@workspace', '@highlight'] ) }) diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts index d056871bda2..c535409ca78 100644 --- a/packages/core/src/amazonq/webview/ui/main.ts +++ b/packages/core/src/amazonq/webview/ui/main.ts @@ -106,6 +106,10 @@ export const createMynahUI = ( let isDocEnabled = amazonQEnabled + let featureConfigs: Map = tryNewMap(featureConfigsSerialized) + + const highlightCommand = featureConfigs.get('highlightCommand') + let tabDataGenerator = new TabDataGenerator({ isFeatureDevEnabled, isGumbyEnabled, @@ -113,6 +117,7 @@ export const createMynahUI = ( isTestEnabled, isDocEnabled, disabledCommands, + commandHighlight: highlightCommand, }) // eslint-disable-next-line prefer-const @@ -124,9 +129,6 @@ export const createMynahUI = ( // eslint-disable-next-line prefer-const let messageController: MessageController - // @ts-ignore - let featureConfigs: Map = tryNewMap(featureConfigsSerialized) - function getCodeBlockActions(messageData: any) { // Show ViewDiff and AcceptDiff for allowedCommands in CWC const isEnabled = featureConfigs.get('ViewDiffInChat')?.variation === 'TREATMENT' @@ -199,6 +201,7 @@ export const createMynahUI = ( isTestEnabled, isDocEnabled, disabledCommands, + commandHighlight: highlightCommand, }) featureConfigs = tryNewMap(featureConfigsSerialized) diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts index b3263218c1d..a6d31e715df 100644 --- a/packages/core/src/amazonq/webview/ui/tabs/generator.ts +++ b/packages/core/src/amazonq/webview/ui/tabs/generator.ts @@ -3,12 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { ChatItemType, MynahUIDataModel } from '@aws/mynah-ui' +import { ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/mynah-ui' import { TabType } from '../storages/tabsStorage' import { FollowUpGenerator } from '../followUps/generator' import { QuickActionGenerator } from '../quickActions/generator' import { TabTypeDataMap } from './constants' import { agentWalkthroughDataModel } from '../walkthrough/agent' +import { FeatureContext } from '../../../../shared' export interface TabDataGeneratorProps { isFeatureDevEnabled: boolean @@ -17,11 +18,13 @@ export interface TabDataGeneratorProps { isTestEnabled: boolean isDocEnabled: boolean disabledCommands?: string[] + commandHighlight?: FeatureContext } export class TabDataGenerator { private followUpsGenerator: FollowUpGenerator public quickActionsGenerator: QuickActionGenerator + private highlightCommand?: FeatureContext constructor(props: TabDataGeneratorProps) { this.followUpsGenerator = new FollowUpGenerator() @@ -33,6 +36,7 @@ export class TabDataGenerator { isDocEnabled: props.isDocEnabled, disableCommands: props.disabledCommands, }) + this.highlightCommand = props.commandHighlight } public getTabData(tabType: TabType, needWelcomeMessages: boolean, taskName?: string): MynahUIDataModel { @@ -50,7 +54,7 @@ export class TabDataGenerator { 'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).', quickActionCommands: this.quickActionsGenerator.generateForTab(tabType), promptInputPlaceholder: TabTypeDataMap[tabType].placeholder, - contextCommands: TabTypeDataMap[tabType].contextCommands, + contextCommands: this.getContextCommands(tabType), chatItems: needWelcomeMessages ? [ { @@ -66,4 +70,32 @@ export class TabDataGenerator { } return tabData } + + private getContextCommands(tabType: TabType): QuickActionCommandGroup[] | undefined { + if (tabType === 'agentWalkthrough' || tabType === 'welcome') { + return + } + + const commandName = this.highlightCommand?.value.stringValue + if (commandName === undefined || commandName === '') { + return TabTypeDataMap[tabType].contextCommands + } else { + const commandHighlight: QuickActionCommandGroup = { + groupName: 'Additional Commands', + commands: [ + { + command: commandName, + description: this.highlightCommand?.variation, + }, + ], + } + + const contextCommands = TabTypeDataMap[tabType].contextCommands + if (contextCommands === undefined) { + return [commandHighlight] + } else { + return [...contextCommands, commandHighlight] + } + } + } } From 7c0b90e93275d458a5f5a560d9dfbb04f9f6471e Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:28:05 -0800 Subject: [PATCH 153/202] feat(inline completion): enhance inline completion context fetching (#6356) ## Problem corresponding JB change https://github.com/aws/aws-toolkit-jetbrains/pull/5256 (vscode logics has been implemented) ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .../Feature-d0329e3d-65bd-4987-b87c-ee11b86de399.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Feature-d0329e3d-65bd-4987-b87c-ee11b86de399.json diff --git a/packages/amazonq/.changes/next-release/Feature-d0329e3d-65bd-4987-b87c-ee11b86de399.json b/packages/amazonq/.changes/next-release/Feature-d0329e3d-65bd-4987-b87c-ee11b86de399.json new file mode 100644 index 00000000000..c8fd74b134e --- /dev/null +++ b/packages/amazonq/.changes/next-release/Feature-d0329e3d-65bd-4987-b87c-ee11b86de399.json @@ -0,0 +1,4 @@ +{ + "type": "Feature", + "description": "Enhance Q inline completion context fetching for better suggestion quality" +} From 5962a674cf2bd6c4e7345c01baea5c006dda3902 Mon Sep 17 00:00:00 2001 From: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:06:09 -0800 Subject: [PATCH 154/202] refactor(inline suggestion): camel case supplemental context strategy ids #6369 house cleaning and unify naming pattern of this field corresponding JB commit https://github.com/aws/aws-toolkit-jetbrains/pull/5256/commits/39bc048f2f437213bd25f7b4d32d53cbca9c9988 --- .../service/recommendationHandler.test.ts | 2 +- packages/core/src/codewhisperer/models/model.ts | 4 ++-- .../util/supplementalContext/crossFileContextUtil.ts | 8 ++++---- .../supplementalContext/supplementalContextUtil.ts | 2 +- .../util/supplementalContext/utgUtils.ts | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts index 4bc10329f81..d8855796df0 100644 --- a/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts +++ b/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts @@ -125,7 +125,7 @@ describe('recommendationHandler', function () { supplementalContextItems: [], contentsLength: 100, latency: 0, - strategy: 'Empty', + strategy: 'empty', }) sinon.stub(performance, 'now').returns(0.0) session.startPos = new vscode.Position(1, 0) diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts index 8e8e58d5fea..c9b3ca7c51a 100644 --- a/packages/core/src/codewhisperer/models/model.ts +++ b/packages/core/src/codewhisperer/models/model.ts @@ -47,11 +47,11 @@ export const vsCodeState: VsCodeState = { isFreeTierLimitReached: false, } -export type UtgStrategy = 'ByName' | 'ByContent' +export type UtgStrategy = 'byName' | 'byContent' export type CrossFileStrategy = 'opentabs' | 'codemap' | 'bm25' | 'default' -export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'Empty' +export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'empty' export type PatchInfo = { name: string diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts index 41a0504099e..f4688e2b5a9 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts @@ -88,13 +88,13 @@ export async function fetchSupplementalContextForSrc( const supContext = (await opentabsContextPromise) ?? [] return { supplementalContextItems: supContext, - strategy: supContext.length === 0 ? 'Empty' : 'opentabs', + strategy: supContext.length === 0 ? 'empty' : 'opentabs', } } // codemap will use opentabs context plus repomap if it's present if (supplementalContextConfig === 'codemap') { - let strategy: SupplementalContextStrategy = 'Empty' + let strategy: SupplementalContextStrategy = 'empty' let hasCodemap: boolean = false let hasOpentabs: boolean = false const opentabsContextAndCodemap = await waitUntil( @@ -132,7 +132,7 @@ export async function fetchSupplementalContextForSrc( } else if (hasOpentabs) { strategy = 'opentabs' } else { - strategy = 'Empty' + strategy = 'empty' } return { @@ -161,7 +161,7 @@ export async function fetchSupplementalContextForSrc( const supContext = opentabsContext ?? [] return { supplementalContextItems: supContext, - strategy: supContext.length === 0 ? 'Empty' : 'opentabs', + strategy: supContext.length === 0 ? 'empty' : 'opentabs', } } diff --git a/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts index 5cb7c2bfb83..03f9d59b3f2 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts @@ -58,7 +58,7 @@ export async function fetchSupplementalContext( supplementalContextItems: [], contentsLength: 0, latency: performance.now() - timesBeforeFetching, - strategy: 'Empty', + strategy: 'empty', } } else { getLogger().error( diff --git a/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts b/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts index 63c29dc1c9a..a39a48183b0 100644 --- a/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts +++ b/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts @@ -54,7 +54,7 @@ export async function fetchSupplementalContextForTest( const shouldProceed = shouldFetchUtgContext(editor.document.languageId) if (!shouldProceed) { - return shouldProceed === undefined ? undefined : { supplementalContextItems: [], strategy: 'Empty' } + return shouldProceed === undefined ? undefined : { supplementalContextItems: [], strategy: 'empty' } } const languageConfig = utgLanguageConfigs[editor.document.languageId] @@ -69,10 +69,10 @@ export async function fetchSupplementalContextForTest( return { supplementalContextItems: await generateSupplementalContextFromFocalFile( crossSourceFile, - 'ByName', + 'byName', cancellationToken ), - strategy: 'ByName', + strategy: 'byName', } } throwIfCancelled(cancellationToken) @@ -84,10 +84,10 @@ export async function fetchSupplementalContextForTest( return { supplementalContextItems: await generateSupplementalContextFromFocalFile( crossSourceFile, - 'ByContent', + 'byContent', cancellationToken ), - strategy: 'ByContent', + strategy: 'byContent', } } @@ -95,7 +95,7 @@ export async function fetchSupplementalContextForTest( getLogger().debug(`CodeWhisperer failed to fetch utg context`) return { supplementalContextItems: [], - strategy: 'Empty', + strategy: 'empty', } } From e5d4538b4d98152f5291d1cb2136abd6e4a33a03 Mon Sep 17 00:00:00 2001 From: Jacob Chung Date: Tue, 14 Jan 2025 14:33:35 -0800 Subject: [PATCH 155/202] message now only in endSession --- .../core/src/amazonqTest/chat/controller/controller.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts index 9e6dcfaff0b..57d4d231d07 100644 --- a/packages/core/src/amazonqTest/chat/controller/controller.ts +++ b/packages/core/src/amazonqTest/chat/controller/controller.ts @@ -717,9 +717,6 @@ export class TestController { await vscode.window.showTextDocument(document) // TODO: send the message once again once build is enabled // this.messenger.sendMessage('Accepted', message.tabID, 'prompt') - - this.messenger.sendMessage('Unit test generation completed', message.tabID, 'answer') - telemetry.ui_click.emit({ elementId: 'unitTestGeneration_acceptDiff' }) TelemetryHelper.instance.sendTestGenerationToolkitEvent( @@ -841,10 +838,10 @@ export class TestController { // TODO: Check if there are more cases to endSession if yes create a enum or type for step private async endSession(data: any, step: FollowUpTypes) { + this.messenger.sendMessage('Unit test generation completed.', data.tabID, 'answer') + const session = this.sessionStorage.getSession() if (step === FollowUpTypes.RejectCode) { - this.messenger.sendMessage('Unit test generation completed.', data.tabID, 'answer') - TelemetryHelper.instance.sendTestGenerationToolkitEvent( session, true, From c6d3c12f8924c726b1501a5b8ae08ec859d5f801 Mon Sep 17 00:00:00 2001 From: Maxim Hayes <149123719+hayemaxi@users.noreply.github.com> Date: Tue, 14 Jan 2025 18:53:01 -0500 Subject: [PATCH 156/202] fix(dev): Q developer menu opening wrong auth state #6351 It's opening the toolkit global state value instead. --- packages/core/src/dev/activation.ts | 2 +- packages/core/src/shared/utilities/mementos.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/src/dev/activation.ts b/packages/core/src/dev/activation.ts index b4100b191ce..41af4d2d5fb 100644 --- a/packages/core/src/dev/activation.ts +++ b/packages/core/src/dev/activation.ts @@ -334,7 +334,7 @@ class ObjectEditor { return this.openState(targetContext.secrets, key) case 'auth': // Auth memento is determined in a different way - return this.openState(getEnvironmentSpecificMemento(), key) + return this.openState(getEnvironmentSpecificMemento(globalState), key) } } diff --git a/packages/core/src/shared/utilities/mementos.ts b/packages/core/src/shared/utilities/mementos.ts index 88814414046..0e5e6a27618 100644 --- a/packages/core/src/shared/utilities/mementos.ts +++ b/packages/core/src/shared/utilities/mementos.ts @@ -37,19 +37,19 @@ export function partition(memento: vscode.Memento, key: string): vscode.Memento * with the local globalState. We want certain functionality to be isolated to * the remote instance. */ -export function getEnvironmentSpecificMemento(): vscode.Memento { +export function getEnvironmentSpecificMemento(globalState?: vscode.Memento): vscode.Memento { if (!vscode.env.remoteName) { // local compute: no further partitioning - return globals.globalState + return globalState ?? globals.globalState } const devEnvId = getCodeCatalystDevEnvId() if (devEnvId !== undefined) { // dev env: partition to dev env ID (compute backend might not always be the same) - return partition(globals.globalState, devEnvId) + return partition(globalState ?? globals.globalState, devEnvId) } // remote env: keeps a shared "global state" for all workspaces that report the same machine ID - return partition(globals.globalState, globals.machineId) + return partition(globalState ?? globals.globalState, globals.machineId) } From 63fafe32011320af9f6c6a1b9984a42ea04c61a3 Mon Sep 17 00:00:00 2001 From: Muzaffer Aydin Date: Tue, 14 Jan 2025 16:01:30 -0800 Subject: [PATCH 157/202] build: normalize filepath slashes, eol consistency #6353 ## Problem - Tests were failing or behaving inconsistently on different operating systems due to improper file path normalization. - End-of-line (EOL) conflicts were causing unnecessary formatting diffs in collaborative workflows. ## Solution - Updated the testFile variable in the test runner to normalize paths by replacing backslashes (\) with forward slashes, ensuring cross-platform compatibility. - Added the Prettier rule 'prettier/prettier': ['error', { endOfLine: 'auto' }] to align EOL behavior with the host environment, avoiding platform-specific conflicts. --- .eslintrc.js | 2 ++ packages/core/src/test/testRunner.ts | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index c7fc4cd9c13..4eb0399f631 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -209,5 +209,7 @@ module.exports = { ], }, ], + + 'prettier/prettier': ['error', { endOfLine: 'auto' }], }, } diff --git a/packages/core/src/test/testRunner.ts b/packages/core/src/test/testRunner.ts index 815397ae155..7078a785a89 100644 --- a/packages/core/src/test/testRunner.ts +++ b/packages/core/src/test/testRunner.ts @@ -84,7 +84,8 @@ export async function runTests( }) const dist = path.resolve(root, 'dist') - const testFile = process.env['TEST_FILE']?.replace('.ts', '.js') + const rawTestFile = process.env['TEST_FILE'] + const testFile = rawTestFile?.replace(/\\/g, '/').replace('.ts', '.js') let testFilePath: string | undefined if (testFile?.includes('../core/')) { testFilePath = path.resolve(root, testFile.replace('../core/', '../core/dist/')) From 2b047ac9c7bf1b45b5a0049813850440c02f0a4c Mon Sep 17 00:00:00 2001 From: siakmun-aws Date: Tue, 14 Jan 2025 17:25:31 -0800 Subject: [PATCH 158/202] fix(amazonq): use server-side data to decide remaining code generations #6370 ## Problem Previously remaining code generation iterations are always displayed. ## Solution Only display when it goes down to 2 or less. --- ...-ef93f909-3aa5-4e62-a4fc-850376161d24.json | 4 + .../controllers/chat/controller.ts | 36 ++++---- .../amazonqFeatureDev/session/sessionState.ts | 15 +++- .../controllers/chat/controller.test.ts | 40 +++++++++ packages/toolkit/package.json | 83 +++++++++---------- 5 files changed, 116 insertions(+), 62 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-ef93f909-3aa5-4e62-a4fc-850376161d24.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-ef93f909-3aa5-4e62-a4fc-850376161d24.json b/packages/amazonq/.changes/next-release/Bug Fix-ef93f909-3aa5-4e62-a4fc-850376161d24.json new file mode 100644 index 00000000000..82b2eb42199 --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-ef93f909-3aa5-4e62-a4fc-850376161d24.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Amazon q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining" +} diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts index f24ddb4e923..9ad24069f70 100644 --- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts +++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts @@ -49,8 +49,6 @@ import { FollowUpTypes } from '../../../amazonq/commons/types' import { Messenger } from '../../../amazonq/commons/connector/baseMessenger' import { BaseChatSessionStorage } from '../../../amazonq/commons/baseChatStorage' -export const TotalSteps = 3 - export interface ChatControllerEventEmitters { readonly processHumanChatMessage: EventEmitter readonly followUpClicked: EventEmitter @@ -462,12 +460,17 @@ export class FeatureDevController { if (remainingIterations !== undefined && totalIterations !== undefined) { this.messenger.sendAnswer({ - type: 'answer', + type: 'answer' as const, tabID: tabID, - message: - remainingIterations === 0 - ? 'Would you like me to add this code to your project?' - : `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`, + message: (() => { + if (remainingIterations > 2) { + return 'Would you like me to add this code to your project, or provide feedback for new code?' + } else if (remainingIterations > 0) { + return `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.` + } else { + return 'Would you like me to add this code to your project?' + } + })(), }) } @@ -518,9 +521,8 @@ export class FeatureDevController { if (session?.state?.tokenSource?.token.isCancellationRequested) { this.workOnNewTask( session.tabID, - session.state.codeGenerationRemainingIterationCount || - TotalSteps - (session.state?.currentIteration || 0), - session.state.codeGenerationTotalIterationCount || TotalSteps, + session.state.codeGenerationRemainingIterationCount, + session.state.codeGenerationTotalIterationCount, session?.state?.tokenSource?.token.isCancellationRequested ) this.disposeToken(session) @@ -563,10 +565,16 @@ export class FeatureDevController { ) { if (isStoppedGeneration) { this.messenger.sendAnswer({ - message: - (remainingIterations ?? 0) <= 0 - ? "I stopped generating your code. You don't have more iterations left, however, you can start a new session." - : `I stopped generating your code. If you want to continue working on this task, provide another description. You have ${remainingIterations} out of ${totalIterations} code generations left.`, + message: ((remainingIterations) => { + if (remainingIterations && totalIterations) { + if (remainingIterations <= 0) { + return "I stopped generating your code. You don't have more iterations left, however, you can start a new session." + } else if (remainingIterations <= 2) { + return `I stopped generating your code. If you want to continue working on this task, provide another description. You have ${remainingIterations} out of ${totalIterations} code generations left.` + } + } + return 'I stopped generating your code. If you want to continue working on this task, provide another description.' + })(remainingIterations), type: 'answer-part', tabID, }) diff --git a/packages/core/src/amazonqFeatureDev/session/sessionState.ts b/packages/core/src/amazonqFeatureDev/session/sessionState.ts index 705232b0536..f3cd49eb972 100644 --- a/packages/core/src/amazonqFeatureDev/session/sessionState.ts +++ b/packages/core/src/amazonqFeatureDev/session/sessionState.ts @@ -175,14 +175,16 @@ abstract class CodeGenBase { codeGenerationRemainingIterationCount?: number codeGenerationTotalIterationCount?: number }> { + let codeGenerationRemainingIterationCount = undefined + let codeGenerationTotalIterationCount = undefined for ( let pollingIteration = 0; pollingIteration < this.pollCount && !this.isCancellationRequested; ++pollingIteration ) { const codegenResult = await this.config.proxyClient.getCodeGeneration(this.conversationId, codeGenerationId) - const codeGenerationRemainingIterationCount = codegenResult.codeGenerationRemainingIterationCount - const codeGenerationTotalIterationCount = codegenResult.codeGenerationTotalIterationCount + codeGenerationRemainingIterationCount = codegenResult.codeGenerationRemainingIterationCount + codeGenerationTotalIterationCount = codegenResult.codeGenerationTotalIterationCount getLogger().debug(`Codegen response: %O`, codegenResult) telemetry.setCodeGenerationResult(codegenResult.codeGenerationStatus.status) @@ -272,6 +274,8 @@ abstract class CodeGenBase { newFiles: [], deletedFiles: [], references: [], + codeGenerationRemainingIterationCount: codeGenerationRemainingIterationCount, + codeGenerationTotalIterationCount: codeGenerationTotalIterationCount, } } } @@ -345,8 +349,13 @@ export class CodeGenState extends CodeGenBase implements SessionState { this.filePaths = codeGeneration.newFiles this.deletedFiles = codeGeneration.deletedFiles this.references = codeGeneration.references + this.codeGenerationRemainingIterationCount = codeGeneration.codeGenerationRemainingIterationCount this.codeGenerationTotalIterationCount = codeGeneration.codeGenerationTotalIterationCount + this.currentIteration = + this.codeGenerationRemainingIterationCount && this.codeGenerationTotalIterationCount + ? this.codeGenerationTotalIterationCount - this.codeGenerationRemainingIterationCount + : this.currentIteration + 1 if (action.uploadHistory && !action.uploadHistory[codeGenerationId] && codeGenerationId) { action.uploadHistory[codeGenerationId] = { @@ -366,7 +375,7 @@ export class CodeGenState extends CodeGenBase implements SessionState { this.deletedFiles, this.references, this.tabID, - this.currentIteration + 1, + this.currentIteration, this.codeGenerationRemainingIterationCount, this.codeGenerationTotalIterationCount, action.uploadHistory, diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts index 44cfe17eb1f..97044d99338 100644 --- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts +++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts @@ -526,6 +526,29 @@ describe('Controller', () => { await waitUntil(() => Promise.resolve(sendMetricDataTelemetrySpy.callCount >= 2), {}) } + async function verifyAddCodeMessage( + remainingIterations: number, + totalIterations: number, + expectedMessage: string + ) { + sinon.stub(session, 'send').resolves() + sinon.stub(session, 'sendLinesOfCodeGeneratedTelemetry').resolves() // Avoid sending extra telemetry + const sendAnswerSpy = sinon.stub(controllerSetup.messenger, 'sendAnswer') + sinon.stub(session.state, 'codeGenerationRemainingIterationCount').value(remainingIterations) + sinon.stub(session.state, 'codeGenerationTotalIterationCount').value(totalIterations) + + await fireChatMessage(session) + await verifyMetricsCalled() + + assert.ok( + sendAnswerSpy.calledWith({ + type: 'answer', + tabID, + message: expectedMessage, + }) + ) + } + beforeEach(async () => { session = await createCodeGenState() sinon.stub(session, 'preloader').resolves() @@ -558,6 +581,23 @@ describe('Controller', () => { await verifyException(error) }) } + + // Using 3 to avoid spamming the tests + for (let remainingIterations = 0; remainingIterations <= 3; remainingIterations++) { + it(`verifies add code messages for remaining iterations at ${remainingIterations}`, async () => { + const totalIterations = 10 + const expectedMessage = (() => { + if (remainingIterations > 2) { + return 'Would you like me to add this code to your project, or provide feedback for new code?' + } else if (remainingIterations > 0) { + return `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.` + } else { + return 'Would you like me to add this code to your project?' + } + })() + await verifyAddCodeMessage(remainingIterations, totalIterations, expectedMessage) + }) + } }) describe('processErrorChatMessage', function () { diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 6341a576c77..346e03e488a 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -4128,277 +4128,270 @@ "fontCharacter": "\\f1b9" } }, - "aws-amazonq-transform-landing-page-icon": { - "description": "AWS Contributed Icon", - "default": { - "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1ba" - } - }, "aws-amazonq-transform-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1bb" + "fontCharacter": "\\f1ba" } }, "aws-amazonq-transform-step-into-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1bc" + "fontCharacter": "\\f1bb" } }, "aws-amazonq-transform-step-into-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1bd" + "fontCharacter": "\\f1bc" } }, "aws-amazonq-transform-variables-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1be" + "fontCharacter": "\\f1bd" } }, "aws-amazonq-transform-variables-light": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1bf" + "fontCharacter": "\\f1be" } }, "aws-applicationcomposer-icon": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c0" + "fontCharacter": "\\f1bf" } }, "aws-applicationcomposer-icon-dark": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c1" + "fontCharacter": "\\f1c0" } }, "aws-apprunner-service": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c2" + "fontCharacter": "\\f1c1" } }, "aws-cdk-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c3" + "fontCharacter": "\\f1c2" } }, "aws-cloudformation-stack": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c4" + "fontCharacter": "\\f1c3" } }, "aws-cloudwatch-log-group": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c5" + "fontCharacter": "\\f1c4" } }, "aws-codecatalyst-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c6" + "fontCharacter": "\\f1c5" } }, "aws-codewhisperer-icon-black": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c7" + "fontCharacter": "\\f1c6" } }, "aws-codewhisperer-icon-white": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c8" + "fontCharacter": "\\f1c7" } }, "aws-codewhisperer-learn": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1c9" + "fontCharacter": "\\f1c8" } }, "aws-ecr-registry": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1ca" + "fontCharacter": "\\f1c9" } }, "aws-ecs-cluster": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1cb" + "fontCharacter": "\\f1ca" } }, "aws-ecs-container": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1cc" + "fontCharacter": "\\f1cb" } }, "aws-ecs-service": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1cd" + "fontCharacter": "\\f1cc" } }, "aws-generic-attach-file": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1ce" + "fontCharacter": "\\f1cd" } }, "aws-iot-certificate": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1cf" + "fontCharacter": "\\f1ce" } }, "aws-iot-policy": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d0" + "fontCharacter": "\\f1cf" } }, "aws-iot-thing": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d1" + "fontCharacter": "\\f1d0" } }, "aws-lambda-function": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d2" + "fontCharacter": "\\f1d1" } }, "aws-mynah-MynahIconBlack": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d3" + "fontCharacter": "\\f1d2" } }, "aws-mynah-MynahIconWhite": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d4" + "fontCharacter": "\\f1d3" } }, "aws-mynah-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d5" + "fontCharacter": "\\f1d4" } }, "aws-redshift-cluster": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d6" + "fontCharacter": "\\f1d5" } }, "aws-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d7" + "fontCharacter": "\\f1d6" } }, "aws-redshift-database": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d8" + "fontCharacter": "\\f1d7" } }, "aws-redshift-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1d9" + "fontCharacter": "\\f1d8" } }, "aws-redshift-schema": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1da" + "fontCharacter": "\\f1d9" } }, "aws-redshift-table": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1db" + "fontCharacter": "\\f1da" } }, "aws-s3-bucket": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1dc" + "fontCharacter": "\\f1db" } }, "aws-s3-create-bucket": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1dd" + "fontCharacter": "\\f1dc" } }, "aws-schemas-registry": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1de" + "fontCharacter": "\\f1dd" } }, "aws-schemas-schema": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1df" + "fontCharacter": "\\f1de" } }, "aws-stepfunctions-preview": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", - "fontCharacter": "\\f1e0" + "fontCharacter": "\\f1df" } } }, From efedd96db9b772d485e54221b59d026ac6eef1e2 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:05:07 -0500 Subject: [PATCH 159/202] ci(jscpd): improve output format #6373 ## Problem The output format of clones found in `jscpd` can be difficult to parse. As an example, see https://github.com/aws/aws-toolkit-vscode/actions/runs/12778633640/job/35621822359?pr=6370. Additionally, it mentions file names and line numbers, but doesn't provide a way to get to those files. ## Solution - reduce friction by linking directly to the duplicates --- .github/workflows/filterDuplicates.js | 21 ++++++++++++++++++--- .github/workflows/node.js.yml | 5 ++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js index 0284ea20654..2bb9d440cb5 100644 --- a/.github/workflows/filterDuplicates.js +++ b/.github/workflows/filterDuplicates.js @@ -4,7 +4,7 @@ * the program exits with an error and logs the filtered report to console. * * Usage: - * node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] + * node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] [commit_hash] [repo_name] * * Tests: * node filterDuplicates.js test @@ -84,9 +84,25 @@ function filterDuplicates(report, changes) { return duplicates } +function formatDuplicates(duplicates, commitHash, repoName) { + const baseUrl = `https://github.com/${repoName}` + return duplicates.map((dupe) => { + return { + first: formUrl(dupe.firstFile, commitHash), + second: formUrl(dupe.secondFile, commitHash), + numberOfLines: dupe.lines, + } + }) + function formUrl(file, commitHash) { + return `${baseUrl}/blob/${commitHash}/${file.name}#L${file.start}-L${file.end}` + } +} + async function run() { const rawDiffPath = process.argv[3] const jscpdReportPath = process.argv[4] + const commitHash = process.argv[5] + const repoName = process.argv[6] const changes = await parseDiff(rawDiffPath) const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8')) const filteredDuplicates = filterDuplicates(jscpdReport, changes) @@ -94,7 +110,7 @@ async function run() { console.log('%s files changes', changes.size) console.log('%s duplicates found', filteredDuplicates.length) if (filteredDuplicates.length > 0) { - console.log(filteredDuplicates) + console.log(formatDuplicates(filteredDuplicates, commitHash, repoName)) process.exit(1) } } @@ -102,7 +118,6 @@ async function run() { /** * Mini-test Suite */ -console.log(__dirname) const testDiffFile = path.resolve(__dirname, 'test/test_diff.txt') let testCounter = 0 function assertEqual(actual, expected) { diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 04a289eded9..0cc8025125d 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -101,7 +101,10 @@ jobs: path: ./jscpd-report.json - name: Check for Duplicates - run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json + env: + COMMIT_HASH: ${{ github.sha}} + REPO_NAME: ${{ github.repository }} + run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json $COMMIT_HASH $REPO_NAME macos: needs: lint-commits From dd1d8e16f0958cbcdb025db89d3ee2b67370f83f Mon Sep 17 00:00:00 2001 From: Avi Alpert <131792194+avi-alpert@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:05:48 -0500 Subject: [PATCH 160/202] test(amazonq): "edit README" E2E test case for /doc #6317 Add E2E test case for /doc: Making a specific change to the README --- packages/amazonq/test/e2e/amazonq/doc.test.ts | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/packages/amazonq/test/e2e/amazonq/doc.test.ts b/packages/amazonq/test/e2e/amazonq/doc.test.ts index 78322b63ab0..ad6b3df914c 100644 --- a/packages/amazonq/test/e2e/amazonq/doc.test.ts +++ b/packages/amazonq/test/e2e/amazonq/doc.test.ts @@ -108,6 +108,43 @@ describe('Amazon Q Doc', async function () { FollowUpTypes.MakeChanges, FollowUpTypes.RejectChanges, ]) + + tab.clickButton(FollowUpTypes.AcceptChanges) + + await tab.waitForButtons([FollowUpTypes.NewTask, FollowUpTypes.CloseSession]) + }) + }) + + describe('Edits a README', () => { + beforeEach(async function () { + tab.addChatMessage({ command: '/doc' }) + await tab.waitForChatFinishesLoading() + }) + + it('Make specific change in README', async () => { + await tab.waitForButtons([FollowUpTypes.UpdateDocumentation]) + + tab.clickButton(FollowUpTypes.UpdateDocumentation) + + await tab.waitForButtons([FollowUpTypes.SynchronizeDocumentation, FollowUpTypes.EditDocumentation]) + + tab.clickButton(FollowUpTypes.EditDocumentation) + + await tab.waitForButtons([FollowUpTypes.ProceedFolderSelection]) + + tab.clickButton(FollowUpTypes.ProceedFolderSelection) + + tab.addChatMessage({ prompt: 'remove the repository structure section' }) + + await tab.waitForText( + `${i18n('AWS.amazonq.doc.answer.readmeUpdated')} ${i18n('AWS.amazonq.doc.answer.codeResult')}` + ) + + await tab.waitForButtons([ + FollowUpTypes.AcceptChanges, + FollowUpTypes.MakeChanges, + FollowUpTypes.RejectChanges, + ]) }) }) }) From 0d7ea7d6d3e0d2362943258b9c83519c73e07632 Mon Sep 17 00:00:00 2001 From: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:07:52 -0500 Subject: [PATCH 161/202] build(lint): add rule to prefer direct imports over index.ts #6372 ## Problem Importing from `..` or an `index.ts` file can lead to circular dependencies. ## Solution - add a lint rule to discourage importing from `..`. - migrate existing cases to import directly from the target module. --- .eslintrc.js | 5 +++++ .../core/src/codewhisperer/commands/startTestGeneration.ts | 2 +- packages/core/src/codewhisperer/service/testGenHandler.ts | 6 +++--- packages/core/src/shared/env/resolveEnv.ts | 2 +- packages/core/src/shared/utilities/downloadPatterns.ts | 2 +- packages/core/src/shared/utilities/pollingSet.ts | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4eb0399f631..edfcaa2cb72 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -206,6 +206,11 @@ module.exports = { message: 'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.', }, + { + name: '..', + message: + 'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.', + }, ], }, ], diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts index 3b0f41ab1d6..8480ee3184e 100644 --- a/packages/core/src/codewhisperer/commands/startTestGeneration.ts +++ b/packages/core/src/codewhisperer/commands/startTestGeneration.ts @@ -15,7 +15,7 @@ import { throwIfCancelled, } from '../service/testGenHandler' import path from 'path' -import { testGenState } from '..' +import { testGenState } from '../models/model' import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession' import { ChildProcess, spawn } from 'child_process' // eslint-disable-line no-restricted-imports import { BuildStatus } from '../../amazonqTest/chat/session/session' diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts index ee2de612b77..01be77a834b 100644 --- a/packages/core/src/codewhisperer/service/testGenHandler.ts +++ b/packages/core/src/codewhisperer/service/testGenHandler.ts @@ -16,7 +16,7 @@ import CodeWhispererUserClient, { import { CreateUploadUrlError, InvalidSourceZipError, TestGenFailedError, TestGenTimedOutError } from '../models/errors' import { getMd5, uploadArtifactToS3 } from './securityScanHandler' import { fs, randomUUID, sleep, tempDirPath } from '../../shared' -import { ShortAnswer, TestGenerationJobStatus, testGenState } from '..' +import { ShortAnswer, testGenState } from '../models/model' import { ChatSessionManager } from '../../amazonqTest/chat/storages/chatSession' import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient' import { downloadExportResultArchive } from '../../shared/utilities/download' @@ -182,9 +182,9 @@ export async function pollTestJobStatus( } ChatSessionManager.Instance.getSession().shortAnswer = shortAnswer } - if (resp.testGenerationJob?.status !== TestGenerationJobStatus.IN_PROGRESS) { + if (resp.testGenerationJob?.status !== CodeWhispererConstants.TestGenerationJobStatus.IN_PROGRESS) { // This can be FAILED or COMPLETED - status = resp.testGenerationJob?.status as TestGenerationJobStatus + status = resp.testGenerationJob?.status as CodeWhispererConstants.TestGenerationJobStatus logger.verbose(`testgen job status: ${status}`) logger.verbose(`Complete polling test job status.`) break diff --git a/packages/core/src/shared/env/resolveEnv.ts b/packages/core/src/shared/env/resolveEnv.ts index 2c50169f984..7b1b4bc31cb 100644 --- a/packages/core/src/shared/env/resolveEnv.ts +++ b/packages/core/src/shared/env/resolveEnv.ts @@ -10,7 +10,7 @@ import * as crypto from 'crypto' import { DevSettings } from '../settings' -import { getLogger } from '..' +import { getLogger } from '../logger/logger' import { ToolkitError } from '../errors' import { userInfo } from 'os' import path from 'path' diff --git a/packages/core/src/shared/utilities/downloadPatterns.ts b/packages/core/src/shared/utilities/downloadPatterns.ts index 7936bd39ba9..12f4fb04b9c 100644 --- a/packages/core/src/shared/utilities/downloadPatterns.ts +++ b/packages/core/src/shared/utilities/downloadPatterns.ts @@ -8,7 +8,7 @@ import AdmZip from 'adm-zip' import { getLogger } from '../logger/logger' import * as vscode from 'vscode' import * as path from 'path' -import { ToolkitError } from '..' +import { ToolkitError } from '../errors' // Get pattern code and save it in temporary folder async function fetchUrl(owner: string, repoName: string, assetName: string): Promise { diff --git a/packages/core/src/shared/utilities/pollingSet.ts b/packages/core/src/shared/utilities/pollingSet.ts index 321dde153b8..d8c4f7c6ded 100644 --- a/packages/core/src/shared/utilities/pollingSet.ts +++ b/packages/core/src/shared/utilities/pollingSet.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { globals } from '..' +import globals from '../../shared/extensionGlobals' /** * A useful abstraction that does the following: From 2e424b3c7cdc71334d0651d26486690f1b66b2f0 Mon Sep 17 00:00:00 2001 From: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:37:51 -0500 Subject: [PATCH 162/202] test(amazonq): Add e2e tests for general amazon q chat panel (#6279) ## Problem - We want tests for the general amazon q panel - We want other teams to quickly be able to write tests for their agents ## Solution - Add general tests for the amazon q chat panel - Add a template that other teams can use to write their tests - Fix an issue that occurred only in tests where tab id's weren't defined for the help message. The problem was that in the framework everything is instant which meant a tab id was defined before that code ran and was never passed through to processQuickActionCommand - By default don't show the welcome page for now tests --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --- packages/amazonq/test/e2e/amazonq/assert.ts | 11 +++ .../amazonq/test/e2e/amazonq/chat.test.ts | 85 +++++++++++++++++++ .../test/e2e/amazonq/framework/framework.ts | 2 +- .../amazonq/test/e2e/amazonq/template.test.ts | 67 +++++++++++++++ .../amazonq/test/e2e/amazonq/welcome.test.ts | 10 +-- packages/core/src/amazonq/index.ts | 1 + .../controllers/chat/controller.ts | 8 +- 7 files changed, 172 insertions(+), 12 deletions(-) create mode 100644 packages/amazonq/test/e2e/amazonq/chat.test.ts create mode 100644 packages/amazonq/test/e2e/amazonq/template.test.ts diff --git a/packages/amazonq/test/e2e/amazonq/assert.ts b/packages/amazonq/test/e2e/amazonq/assert.ts index 7bc7bb2c22e..5bcec3fc0b4 100644 --- a/packages/amazonq/test/e2e/amazonq/assert.ts +++ b/packages/amazonq/test/e2e/amazonq/assert.ts @@ -28,3 +28,14 @@ export function assertQuickActions(tab: Messenger, commands: string[]) { assert.fail(`Could not find commands: ${missingCommands.join(', ')} for ${tab.tabID}`) } } + +export function assertContextCommands(tab: Messenger, contextCommands: string[]) { + assert.deepStrictEqual( + tab + .getStore() + .contextCommands?.map((x) => x.commands) + .flat() + .map((x) => x.command), + contextCommands + ) +} diff --git a/packages/amazonq/test/e2e/amazonq/chat.test.ts b/packages/amazonq/test/e2e/amazonq/chat.test.ts new file mode 100644 index 00000000000..3021be28782 --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/chat.test.ts @@ -0,0 +1,85 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +import assert from 'assert' +import { qTestingFramework } from './framework/framework' +import sinon from 'sinon' +import { Messenger } from './framework/messenger' +import { MynahUIDataModel } from '@aws/mynah-ui' +import { assertContextCommands, assertQuickActions } from './assert' +import { registerAuthHook, using } from 'aws-core-vscode/test' +import { loginToIdC } from './utils/setup' +import { webviewConstants } from 'aws-core-vscode/amazonq' + +describe('Amazon Q Chat', function () { + let framework: qTestingFramework + let tab: Messenger + let store: MynahUIDataModel + + const availableCommands: string[] = ['/dev', '/test', '/review', '/doc', '/transform'] + + before(async function () { + /** + * Login to the amazonq-test-account. When running in CI this has unlimited + * calls to the backend api + */ + await using(registerAuthHook('amazonq-test-account'), async () => { + await loginToIdC() + }) + }) + + // jscpd:ignore-start + beforeEach(() => { + // Make sure you're logged in before every test + registerAuthHook('amazonq-test-account') + framework = new qTestingFramework('cwc', true, []) + tab = framework.createTab() + store = tab.getStore() + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => { + assertQuickActions(tab, availableCommands) + }) + + it('Shows @workspace', () => { + assertContextCommands(tab, ['@workspace']) + }) + + // jscpd:ignore-end + + it('Shows title', () => { + assert.deepStrictEqual(store.tabTitle, 'Chat') + }) + + it('Shows placeholder', () => { + assert.deepStrictEqual(store.promptInputPlaceholder, 'Ask a question or enter "/" for quick actions') + }) + + it('Sends message', async () => { + tab.addChatMessage({ + prompt: 'What is a lambda', + }) + await tab.waitForChatFinishesLoading() + const chatItems = tab.getChatItems() + // the last item should be an answer + assert.deepStrictEqual(chatItems[4].type, 'answer') + }) + + describe('Clicks examples', () => { + it('Click help', async () => { + tab.clickButton('help') + await tab.waitForText(webviewConstants.helpMessage) + const chatItems = tab.getChatItems() + assert.deepStrictEqual(chatItems[4].type, 'answer') + assert.deepStrictEqual(chatItems[4].body, webviewConstants.helpMessage) + }) + }) +}) diff --git a/packages/amazonq/test/e2e/amazonq/framework/framework.ts b/packages/amazonq/test/e2e/amazonq/framework/framework.ts index b39dbe4314b..6a29015c06f 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/framework.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/framework.ts @@ -29,7 +29,7 @@ export class qTestingFramework { featureName: TabType, amazonQEnabled: boolean, featureConfigsSerialized: [string, FeatureContext][], - welcomeCount = 0 + welcomeCount = Number.MAX_VALUE // by default don't show the welcome page ) { /** * Instantiate the UI and override the postMessage to publish using the app message diff --git a/packages/amazonq/test/e2e/amazonq/template.test.ts b/packages/amazonq/test/e2e/amazonq/template.test.ts new file mode 100644 index 00000000000..42857575583 --- /dev/null +++ b/packages/amazonq/test/e2e/amazonq/template.test.ts @@ -0,0 +1,67 @@ +/*! + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +// jscpd:ignore-start +import assert from 'assert' +import { qTestingFramework } from './framework/framework' +import sinon from 'sinon' +import { Messenger } from './framework/messenger' +import { MynahUIDataModel } from '@aws/mynah-ui' +import { assertQuickActions } from './assert' +import { registerAuthHook, using } from 'aws-core-vscode/test' +import { loginToIdC } from './utils/setup' + +describe.skip('Amazon Q Test Template', function () { + let framework: qTestingFramework + let tab: Messenger + let store: MynahUIDataModel + + const availableCommands: string[] = [] + + before(async function () { + /** + * Login to the amazonq-test-account. When running in CI this has unlimited + * calls to the backend api + */ + await using(registerAuthHook('amazonq-test-account'), async () => { + await loginToIdC() + }) + }) + + beforeEach(() => { + // Make sure you're logged in before every test + registerAuthHook('amazonq-test-account') + + // TODO change unknown to the tab type you want to test + framework = new qTestingFramework('unknown', true, []) + tab = framework.getTabs()[0] // use the default tab that gets created + framework.createTab() // alternatively you can create a new tab + store = tab.getStore() + }) + + afterEach(() => { + framework.removeTab(tab.tabID) + framework.dispose() + sinon.restore() + }) + + it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => { + assertQuickActions(tab, availableCommands) + }) + + it('Shows title', () => { + assert.deepStrictEqual(store.tabTitle, '') + }) + + it('Shows placeholder', () => { + assert.deepStrictEqual(store.promptInputPlaceholder, '') + }) + + describe('clicks examples', () => {}) + + describe('sends message', async () => {}) +}) + +// jscpd:ignore-end diff --git a/packages/amazonq/test/e2e/amazonq/welcome.test.ts b/packages/amazonq/test/e2e/amazonq/welcome.test.ts index 3f9929cf062..d9f0ccd66bf 100644 --- a/packages/amazonq/test/e2e/amazonq/welcome.test.ts +++ b/packages/amazonq/test/e2e/amazonq/welcome.test.ts @@ -8,8 +8,8 @@ import { qTestingFramework } from './framework/framework' import sinon from 'sinon' import { Messenger } from './framework/messenger' import { MynahUIDataModel } from '@aws/mynah-ui' -import { assertQuickActions } from './assert' import { FeatureContext } from 'aws-core-vscode/shared' +import { assertContextCommands, assertQuickActions } from './assert' describe('Amazon Q Welcome page', function () { let framework: qTestingFramework @@ -42,13 +42,7 @@ describe('Amazon Q Welcome page', function () { }) it('Shows context commands', async () => { - assert.deepStrictEqual( - store.contextCommands - ?.map((x) => x.commands) - .flat() - .map((x) => x.command), - ['@workspace', '@highlight'] - ) + assertContextCommands(tab, ['@workspace', '@highlight']) }) describe('shows 3 times', async () => { diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts index cd4ec424365..9ca9af7687c 100644 --- a/packages/core/src/amazonq/index.ts +++ b/packages/core/src/amazonq/index.ts @@ -25,6 +25,7 @@ export { init as gumbyChatAppInit } from '../amazonqGumby/app' export { init as testChatAppInit } from '../amazonqTest/app' export { init as docChatAppInit } from '../amazonqDoc/app' export { amazonQHelpUrl } from '../shared/constants' +export * as webviewConstants from './webview/ui/texts/constants' export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu' export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands' export { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens' diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts index 57b45d414c1..a5205be78ca 100644 --- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts +++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts @@ -231,17 +231,19 @@ export class ChatController { this.openLinkInExternalBrowser(click) } - private processQuickActionCommand(quickActionCommand: ChatPromptCommandType) { + private processQuickActionCommand(message: PromptMessage) { this.editorContextExtractor .extractContextForTrigger('QuickAction') .then((context) => { const triggerID = randomUUID() + const quickActionCommand = message.command as ChatPromptCommandType + this.messenger.sendQuickActionMessage(quickActionCommand, triggerID) this.triggerEventsStorage.addTriggerEvent({ id: triggerID, - tabID: undefined, + tabID: message.tabID, message: undefined, type: 'quick_action', quickAction: quickActionCommand, @@ -484,7 +486,7 @@ export class ChatController { recordTelemetryChatRunCommand('clear') return default: - this.processQuickActionCommand(message.command) + this.processQuickActionCommand(message) } } From d862a212bc6f7d94324e52feb01ff1433e06b140 Mon Sep 17 00:00:00 2001 From: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:56:16 -0500 Subject: [PATCH 163/202] fix(sso): login with custom startUrl not allowed (#6368) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem: A user reported that a non-standard start url is technically valid. This is because it can redirect to the underlying valid start url that matches the pattern: https://xxxxxxxx.awsapps.com/start ## Solution: Allow any URL, but warn users if they are using a non-standard one. We will show a yellow warning message in this case. The red error message is still shown when the input does not match a URL in general. ## Examples ### Invalid URL Screenshot 2025-01-14 at 4 33 58 PM ### Possibly valid since it may redirect to a valid URL Screenshot 2025-01-14 at 4 34 13 PM ### Missing the trailing `/start` Screenshot 2025-01-14 at 4 34 29 PM ### URL that also matches expected pattern Screenshot 2025-01-14 at 4 34 35 PM --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: nkomonen-amazon --- ...-71c6bbc1-67ae-4318-a7f0-c594e097ebc4.json | 4 ++ packages/core/src/auth/sso/constants.ts | 11 +++- .../core/src/login/webview/vue/backend.ts | 5 ++ packages/core/src/login/webview/vue/login.vue | 56 +++++++++++++++---- .../core/src/shared/utilities/uriUtils.ts | 12 ++++ .../test/shared/utilities/uriUtils.test.ts | 14 ++++- ...-29e6ef4c-536b-47bb-ae27-26b802ccdb65.json | 4 ++ 7 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 packages/amazonq/.changes/next-release/Bug Fix-71c6bbc1-67ae-4318-a7f0-c594e097ebc4.json create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-29e6ef4c-536b-47bb-ae27-26b802ccdb65.json diff --git a/packages/amazonq/.changes/next-release/Bug Fix-71c6bbc1-67ae-4318-a7f0-c594e097ebc4.json b/packages/amazonq/.changes/next-release/Bug Fix-71c6bbc1-67ae-4318-a7f0-c594e097ebc4.json new file mode 100644 index 00000000000..e0c15b7f2dc --- /dev/null +++ b/packages/amazonq/.changes/next-release/Bug Fix-71c6bbc1-67ae-4318-a7f0-c594e097ebc4.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "Auth: Valid StartURL not accepted at login" +} diff --git a/packages/core/src/auth/sso/constants.ts b/packages/core/src/auth/sso/constants.ts index 4b0e781ceaa..0e6bb082d7e 100644 --- a/packages/core/src/auth/sso/constants.ts +++ b/packages/core/src/auth/sso/constants.ts @@ -11,8 +11,15 @@ export const builderIdStartUrl = 'https://view.awsapps.com/start' export const internalStartUrl = 'https://amzn.awsapps.com/start' +/** + * Doc: https://docs.aws.amazon.com/singlesignon/latest/userguide/howtochangeURL.html + */ export const ssoUrlFormatRegex = /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/ -export const ssoUrlFormatMessage = - 'URLs must start with http:// or https://. Example: https://d-xxxxxxxxxx.awsapps.com/start' +/** + * It is possible for a start url to be a completely custom url that redirects to something that matches the format + * below, so this message is only a warning. + */ +export const ssoUrlFormatMessage = 'URL possibly invalid. Expected format: https://xxxxxxxxxx.awsapps.com/start' +export const urlInvalidFormatMessage = 'URL format invalid. Expected format: https://xxxxxxxxxx.com/yyyy' diff --git a/packages/core/src/login/webview/vue/backend.ts b/packages/core/src/login/webview/vue/backend.ts index 0c1cbdaebc7..ed467175334 100644 --- a/packages/core/src/login/webview/vue/backend.ts +++ b/packages/core/src/login/webview/vue/backend.ts @@ -31,6 +31,7 @@ import { AuthEnabledFeatures, AuthError, AuthFlowState, AuthUiClick, userCancell import { DevSettings } from '../../../shared/settings' import { AuthSSOServer } from '../../../auth/sso/server' import { getLogger } from '../../../shared/logger/logger' +import { isValidUrl } from '../../../shared/utilities/uriUtils' export abstract class CommonAuthWebview extends VueWebview { private readonly className = 'CommonAuthWebview' @@ -276,4 +277,8 @@ export abstract class CommonAuthWebview extends VueWebview { cancelAuthFlow() { AuthSSOServer.lastInstance?.cancelCurrentFlow() } + + validateUrl(url: string) { + return isValidUrl(url) + } } diff --git a/packages/core/src/login/webview/vue/login.vue b/packages/core/src/login/webview/vue/login.vue index f15848a9069..4c9f65a2f6a 100644 --- a/packages/core/src/login/webview/vue/login.vue +++ b/packages/core/src/login/webview/vue/login.vue @@ -193,6 +193,7 @@ @keydown.enter="handleContinueClick()" />

{{ startUrlError }}

+

{{ startUrlWarning }}

Region
AWS Region that hosts identity directory
${column}