Skip to content

Feature - Update aws-toolkit-commons package #4159

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 12, 2023
Merged

Feature - Update aws-toolkit-commons package #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfc05e4
Feature - Update aws-toolkit-commons package
Dec 11, 2023
039d738
Feature - Update aws-toolkit-commons package
Dec 11, 2023
66f9a52
Merge branch 'nardeck/amazonq-code-transform-telemetry-updates' of gi…
Dec 11, 2023
74654a8
Chore - remove stale import
Dec 11, 2023
21f0b0d
Chore - delete changelog sinces its only internal change
Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4263,7 +4263,7 @@
},
"devDependencies": {
"@aws-sdk/types": "^3.13.1",
"@aws-toolkits/telemetry": "^1.0.169",
"@aws-toolkits/telemetry": "^1.0.171",
"@aws/fully-qualified-names": "^2.1.1",
"@cspotcode/source-map-support": "^0.8.1",
"@sinonjs/fake-timers": "^10.0.2",
Expand Down
20 changes: 13 additions & 7 deletions src/codewhisperer/service/transformByQHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { spawnSync } from 'child_process'
import AdmZip from 'adm-zip'
import fetch from '../../common/request'
import globals from '../../shared/extensionGlobals'
import { CodeTransformPreValidationError, telemetry } from '../../shared/telemetry/telemetry'
import { telemetry } from '../../shared/telemetry/telemetry'
import { ToolkitError } from '../../shared/errors'
import { codeTransformTelemetryState } from '../../amazonqGumby/telemetry/codeTransformTelemetryState'
import { calculateTotalLatency } from '../../amazonqGumby/telemetry/codeTransformTelemetry'
Expand Down Expand Up @@ -93,7 +93,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
codeTransformPreValidationError: 'No Java project found' as CodeTransformPreValidationError,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Typecast with as is unnecessary.

codeTransformPreValidationError: 'NoJavaProject',
result: MetadataResult.Fail,
})
throw new TransformByQJavaProjectNotFound()
Expand All @@ -107,7 +107,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
codeTransformPreValidationError: 'No Java project found' as CodeTransformPreValidationError,
codeTransformPreValidationError: 'NoJavaProject',
result: MetadataResult.Fail,
})
throw new ToolkitError('Unable to determine Java version', {
Expand All @@ -125,8 +125,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
codeTransformPreValidationError:
'Project selected is not Java 8 or Java 11' as CodeTransformPreValidationError,
codeTransformPreValidationError: 'UnsupportedJavaVersion',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New values DO NOT have spaces.

result: MetadataResult.Fail,
reason: javaVersion,
})
Expand All @@ -140,11 +139,18 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
if (buildFile.length < 1) {
const buildType = await checkIfGradle(projectPath!)
vscode.window.showErrorMessage(CodeWhispererConstants.noPomXmlFoundMessage, { modal: true })
if (buildType === 'Gradle') {
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
codeTransformPreValidationError: 'NonMavenProject',
result: MetadataResult.Fail,
reason: buildType,
})
}
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
codeTransformPreValidationError: 'Only Maven projects supported' as CodeTransformPreValidationError,
codeTransformPreValidationError: 'NoPom',
Copy link
Contributor

@justinmk3 justinmk3 Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

could save some repeated code (though I see that reason was omitted below?)

Suggested change
codeTransformPreValidationError: 'NoPom',
codeTransformPreValidationError: buildType === 'Gradle' ? NonMavenProject : 'NoPom',

result: MetadataResult.Fail,
reason: buildType,
})
throw new ToolkitError('No valid Maven build file found', { code: 'CouldNotFindPomXml' })
}
Expand Down