Skip to content

Commit b74b405

Browse files
dhasani23Nick Ardecky
andauthored
Bugfix project details loggin (#4568)
* Bugfix - revert Toolkit Error changes for projectDetails emission * Chore - revert tests as well --------- Co-authored-by: Nick Ardecky <[email protected]>
1 parent 46a307d commit b74b405

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

packages/core/src/codewhisperer/service/transformByQHandler.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
} from '../../amazonqGumby/telemetry/codeTransformTelemetry'
3131
import { MetadataResult } from '../../shared/telemetry/telemetryClient'
3232
import request from '../../common/request'
33+
import { ToolkitError } from '../../shared/errors'
3334

3435
// log project details silently
3536
export async function validateAndLogProjectDetails() {
@@ -54,6 +55,7 @@ export async function validateAndLogProjectDetails() {
5455
} finally {
5556
if (result || reason || codeTransformLocalJavaVersion || codeTransformPreValidationError) {
5657
telemetry.codeTransform_projectDetails.emit({
58+
passive: true,
5759
codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
5860
codeTransformLocalJavaVersion,
5961
codeTransformPreValidationError,
@@ -84,7 +86,7 @@ export async function getOpenProjects() {
8486
CodeWhispererConstants.linkToPrerequisites
8587
)
8688
)
87-
throw new Error('No open projects')
89+
throw new ToolkitError('No Java projects found since no projects are open', { code: 'NoOpenProjects' })
8890
}
8991
const openProjects: vscode.QuickPickItem[] = []
9092
for (const folder of folders) {
@@ -212,7 +214,7 @@ export async function validateOpenProjects(projects: vscode.QuickPickItem[], onP
212214
reason: 'CouldNotFindJavaProject',
213215
})
214216
}
215-
throw new Error('Could not find Java project')
217+
throw new ToolkitError('No Java projects found', { code: 'CouldNotFindJavaProject', name: 'NoJavaProject' })
216218
}
217219
const mavenJavaProjects = await getMavenJavaProjects(javaProjects)
218220
if (mavenJavaProjects.length === 0) {
@@ -230,7 +232,7 @@ export async function validateOpenProjects(projects: vscode.QuickPickItem[], onP
230232
reason: 'NoPomFileFound',
231233
})
232234
}
233-
throw new Error('No pom.xml file found')
235+
throw new ToolkitError('No valid Maven build file found', { code: 'NoPomFileFound', name: 'NonMavenProject' })
234236
}
235237

236238
/*

packages/core/src/test/codewhisperer/commands/transformByQ.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ describe('transformByQ', function () {
8282
await validateOpenProjects(dummyQuickPickItems)
8383
},
8484
{
85-
name: 'Error',
86-
message: 'Could not find Java project',
85+
name: 'NoJavaProject',
86+
message: 'No Java projects found',
8787
}
8888
)
8989
})
@@ -106,8 +106,8 @@ describe('transformByQ', function () {
106106
await validateOpenProjects(dummyQuickPickItems)
107107
},
108108
{
109-
name: 'Error',
110-
message: 'No pom.xml file found',
109+
name: 'NonMavenProject',
110+
message: 'No valid Maven build file found',
111111
}
112112
)
113113
})
@@ -130,7 +130,7 @@ describe('transformByQ', function () {
130130
},
131131
{
132132
name: 'Error',
133-
message: 'No open projects',
133+
message: 'No Java projects found since no projects are open',
134134
}
135135
)
136136
})

0 commit comments

Comments
 (0)