Skip to content

Commit d25bc44

Browse files
damntreckyNick Ardecky
andauthored
Feature - Update aws-toolkit-commons package (#4159)
* Feature - Update aws-toolkit-commons package - update AmazonQ Code Transform telemetry definitions for new package update * Feature - Update aws-toolkit-commons package - update AmazonQ Code Transform telemetry definitions for new package update * Chore - remove stale import * Chore - delete changelog sinces its only internal change --------- Co-authored-by: Nick Ardecky <[email protected]>
1 parent 853b3f8 commit d25bc44

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4264,7 +4264,7 @@
42644264
},
42654265
"devDependencies": {
42664266
"@aws-sdk/types": "^3.13.1",
4267-
"@aws-toolkits/telemetry": "^1.0.169",
4267+
"@aws-toolkits/telemetry": "^1.0.171",
42684268
"@aws/fully-qualified-names": "^2.1.1",
42694269
"@cspotcode/source-map-support": "^0.8.1",
42704270
"@sinonjs/fake-timers": "^10.0.2",

src/codewhisperer/service/transformByQHandler.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { spawnSync } from 'child_process'
1818
import AdmZip from 'adm-zip'
1919
import fetch from '../../common/request'
2020
import globals from '../../shared/extensionGlobals'
21-
import { CodeTransformPreValidationError, telemetry } from '../../shared/telemetry/telemetry'
21+
import { telemetry } from '../../shared/telemetry/telemetry'
2222
import { ToolkitError } from '../../shared/errors'
2323
import { codeTransformTelemetryState } from '../../amazonqGumby/telemetry/codeTransformTelemetryState'
2424
import { calculateTotalLatency } from '../../amazonqGumby/telemetry/codeTransformTelemetry'
@@ -93,7 +93,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
9393
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
9494
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
9595
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
96-
codeTransformPreValidationError: 'No Java project found' as CodeTransformPreValidationError,
96+
codeTransformPreValidationError: 'NoJavaProject',
9797
result: MetadataResult.Fail,
9898
})
9999
throw new TransformByQJavaProjectNotFound()
@@ -107,7 +107,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
107107
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
108108
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
109109
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
110-
codeTransformPreValidationError: 'No Java project found' as CodeTransformPreValidationError,
110+
codeTransformPreValidationError: 'NoJavaProject',
111111
result: MetadataResult.Fail,
112112
})
113113
throw new ToolkitError('Unable to determine Java version', {
@@ -125,8 +125,7 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
125125
vscode.window.showErrorMessage(CodeWhispererConstants.noSupportedJavaProjectsFoundMessage, { modal: true })
126126
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
127127
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
128-
codeTransformPreValidationError:
129-
'Project selected is not Java 8 or Java 11' as CodeTransformPreValidationError,
128+
codeTransformPreValidationError: 'UnsupportedJavaVersion',
130129
result: MetadataResult.Fail,
131130
reason: javaVersion,
132131
})
@@ -140,11 +139,18 @@ export async function validateProjectSelection(project: vscode.QuickPickItem) {
140139
if (buildFile.length < 1) {
141140
const buildType = await checkIfGradle(projectPath!)
142141
vscode.window.showErrorMessage(CodeWhispererConstants.noPomXmlFoundMessage, { modal: true })
142+
if (buildType === 'Gradle') {
143+
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
144+
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
145+
codeTransformPreValidationError: 'NonMavenProject',
146+
result: MetadataResult.Fail,
147+
reason: buildType,
148+
})
149+
}
143150
telemetry.codeTransform_isDoubleClickedToTriggerInvalidProject.emit({
144151
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
145-
codeTransformPreValidationError: 'Only Maven projects supported' as CodeTransformPreValidationError,
152+
codeTransformPreValidationError: 'NoPom',
146153
result: MetadataResult.Fail,
147-
reason: buildType,
148154
})
149155
throw new ToolkitError('No valid Maven build file found', { code: 'CouldNotFindPomXml' })
150156
}

0 commit comments

Comments
 (0)