Skip to content

Commit a47240b

Browse files
author
David Hasani
committed
fix lint issues
1 parent 8ccc880 commit a47240b

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

‎packages/core/src/amazonqGumby/chat/controller/controller.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export class GumbyController {
236236
const authState = await AuthUtil.instance.getChatAuthState()
237237
if (authState.amazonQ !== 'connected') {
238238
this.sessionStorage.getSession().isAuthenticating = true
239-
this.messenger.sendAuthNeededExceptionMessage(authState, message.tabID)
239+
await this.messenger.sendAuthNeededExceptionMessage(authState, message.tabID)
240240
throw new NoAuthError()
241241
}
242242
this.messenger.sendTransformationIntroduction(message.tabID)
@@ -246,7 +246,7 @@ export class GumbyController {
246246
private async handleLanguageUpgrade(message: any) {
247247
try {
248248
await this.beginTransformation(message)
249-
const validProjects = await this.validateLanguageUpgradeProjectsWithReplyOnError(message)
249+
const validProjects = await this.validateLanguageUpgradeProjects(message)
250250
if (validProjects.length > 0) {
251251
this.sessionStorage.getSession().updateCandidateProjects(validProjects)
252252
await this.messenger.sendLanguageUpgradeProjectPrompt(validProjects, message.tabID)
@@ -259,7 +259,7 @@ export class GumbyController {
259259
private async handleSQLConversion(message: any) {
260260
try {
261261
await this.beginTransformation(message)
262-
const validProjects = await this.validateSQLConversionProjectsWithReplyOnError(message)
262+
const validProjects = await this.validateSQLConversionProjects(message)
263263
if (validProjects.length > 0) {
264264
this.sessionStorage.getSession().updateCandidateProjects(validProjects)
265265
await this.messenger.sendSelectSQLMetadataFileMessage(message.tabID)
@@ -269,7 +269,7 @@ export class GumbyController {
269269
}
270270
}
271271

272-
private async validateLanguageUpgradeProjectsWithReplyOnError(message: any) {
272+
private async validateLanguageUpgradeProjects(message: any) {
273273
let telemetryJavaVersion = JDKToTelemetryValue(JDKVersion.UNSUPPORTED) as CodeTransformJavaSourceVersionsAllowed
274274
try {
275275
const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
@@ -306,7 +306,7 @@ export class GumbyController {
306306
return []
307307
}
308308

309-
private async validateSQLConversionProjectsWithReplyOnError(message: any) {
309+
private async validateSQLConversionProjects(message: any) {
310310
try {
311311
const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
312312
telemetry.record({
@@ -330,7 +330,7 @@ export class GumbyController {
330330
const typedAction = MessengerUtils.stringToEnumValue(ButtonActions, message.action as any)
331331
switch (typedAction) {
332332
case ButtonActions.CONFIRM_LANGUAGE_UPGRADE_TRANSFORMATION_FORM:
333-
await this.handleUserLanguageUpgradeProjectSelection(message)
333+
await this.handleUserLanguageUpgradeProjectChoice(message)
334334
break
335335
case ButtonActions.CANCEL_TRANSFORMATION_FORM:
336336
telemetry.codeTransform_submitSelection.emit({
@@ -403,7 +403,7 @@ export class GumbyController {
403403
await this.validateBuildWithPromptOnError(message)
404404
}
405405

406-
private async handleUserLanguageUpgradeProjectSelection(message: any) {
406+
private async handleUserLanguageUpgradeProjectChoice(message: any) {
407407
await telemetry.codeTransform_submitSelection.run(async () => {
408408
const pathToProject: string = message.formSelectedValues['GumbyTransformLanguageUpgradeProjectForm']
409409
const toJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkToForm']
@@ -421,7 +421,7 @@ export class GumbyController {
421421
})
422422

423423
const projectName = path.basename(pathToProject)
424-
this.messenger.sendLanguageUpgradeProjectSelectionMessage(
424+
this.messenger.sendLanguageUpgradeProjectChoiceMessage(
425425
projectName,
426426
fromJDKVersion,
427427
toJDKVersion,
@@ -465,7 +465,7 @@ export class GumbyController {
465465
})
466466
}
467467

468-
private async prepareLanguageUpgradeProjectForSubmission(message: { pathToJavaHome: string; tabID: string }) {
468+
private async prepareLanguageUpgradeProject(message: { pathToJavaHome: string; tabID: string }) {
469469
if (message.pathToJavaHome) {
470470
transformByQState.setJavaHome(message.pathToJavaHome)
471471
getLogger().info(
@@ -524,7 +524,7 @@ export class GumbyController {
524524
throw err
525525
}
526526

527-
await this.prepareLanguageUpgradeProjectForSubmission(message)
527+
await this.prepareLanguageUpgradeProject(message)
528528
}
529529

530530
private async processMetadataFile(message: any) {
@@ -597,7 +597,7 @@ export class GumbyController {
597597
case ConversationState.PROMPT_JAVA_HOME: {
598598
const pathToJavaHome = extractPath(data.message)
599599
if (pathToJavaHome) {
600-
await this.prepareLanguageUpgradeProjectForSubmission({
600+
await this.prepareLanguageUpgradeProject({
601601
pathToJavaHome,
602602
tabID: data.tabID,
603603
})
@@ -610,9 +610,9 @@ export class GumbyController {
610610
case ConversationState.WAITING_FOR_OBJECTIVE: {
611611
const objective = data.message.trim().toLowerCase()
612612
if (objective === 'language upgrade') {
613-
this.handleLanguageUpgrade(data)
613+
await this.handleLanguageUpgrade(data)
614614
} else if (objective === 'sql conversion') {
615-
this.handleSQLConversion(data)
615+
await this.handleSQLConversion(data)
616616
} else {
617617
// keep prompting user until they enter a valid option
618618
await this.transformInitiated(data)

‎packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export class Messenger {
213213
this.dispatcher.sendAsyncEventProgress(
214214
new AsyncEventProgressMessage(tabID, {
215215
inProgress: true,
216-
message: MessengerUtils.createLanguageUpgradeTransformationConfirmationPrompt(detectedJavaVersions),
216+
message: MessengerUtils.createLanguageUpgradeConfirmationPrompt(detectedJavaVersions),
217217
})
218218
)
219219

@@ -433,10 +433,10 @@ export class Messenger {
433433
message = CodeWhispererConstants.unsupportedJavaVersionChatMessage
434434
break
435435
case 'unsupported-source-db':
436-
message = CodeWhispererConstants.invalidMetadataFileUnsupportedSourceVendor
436+
message = CodeWhispererConstants.invalidMetadataFileUnsupportedSourceDB
437437
break
438438
case 'unsupported-target-db':
439-
message = CodeWhispererConstants.invalidMetadataFileUnsupportedTargetVendor
439+
message = CodeWhispererConstants.invalidMetadataFileUnsupportedTargetDB
440440
break
441441
case 'error-parsing-sct-file':
442442
message = CodeWhispererConstants.invalidMetadataFileErrorParsing
@@ -518,7 +518,7 @@ export class Messenger {
518518
// TO-DO: add a delay for 2s here to match IntelliJ
519519
}
520520

521-
public sendLanguageUpgradeProjectSelectionMessage(
521+
public sendLanguageUpgradeProjectChoiceMessage(
522522
projectName: string,
523523
fromJDKVersion: JDKVersion,
524524
toJDKVersion: JDKVersion,

‎packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ export default class MessengerUtils {
6565
}
6666
}
6767

68-
static createLanguageUpgradeTransformationConfirmationPrompt = (
69-
detectedJavaVersions: Array<JDKVersion | undefined>
70-
): string => {
68+
static createLanguageUpgradeConfirmationPrompt = (detectedJavaVersions: Array<JDKVersion | undefined>): string => {
7169
let javaVersionString = 'Java project'
7270
const uniqueJavaOptions = new Set(detectedJavaVersions)
7371

‎packages/core/src/codewhisperer/commands/startTransformByQ.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export async function validateSQLMetadataFile(fileContents: string, message: any
108108
let sctData: any = undefined
109109
xml2js.parseString(fileContents, (err, result) => {
110110
if (err) {
111-
getLogger().error('Error parsing .sct file, not valid XML:', err)
111+
getLogger().error('CodeTransformation: Error parsing .sct file, not valid XML.', err)
112112
throw new Error(`Invalid XML encountered`)
113113
} else {
114114
sctData = result
@@ -143,10 +143,10 @@ export async function validateSQLMetadataFile(fileContents: string, message: any
143143
})
144144
transformByQState.setSchemaOptions(schemaNames) // user will choose one of these
145145
getLogger().info(
146-
`Parsed SCT file with source DB: ${sourceDB}, target DB: ${targetDB}, source host name: ${sourceServerName}, and schema names: ${schemaNames}`
146+
`CodeTransformation: Parsed .sct file with source DB: ${sourceDB}, target DB: ${targetDB}, source host name: ${sourceServerName}, and schema names: ${Array.from(schemaNames)}`
147147
)
148-
} catch (e: any) {
149-
getLogger().error('Error parsing .sct file:', e)
148+
} catch (err: any) {
149+
getLogger().error('CodeTransformation: Error parsing .sct file.', err)
150150
transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('error-parsing-sct-file', message.tabID)
151151
return false
152152
}

‎packages/core/src/codewhisperer/models/constants.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,9 @@ export const unsupportedJavaVersionChatMessage = `Sorry, currently I can only up
505505
export const selectSQLMetadataFileHelpMessage =
506506
'Next, I need the .sct metadata file of your project. You can download the .sct file by going to AWS Console -> AWS DMS -> Migration Projects. Open the schema conversion project and navigate to the S3 bucket linked to it. You will find the ZIP containing the .sct file under the {schema-conversion-project}/ directory.'
507507

508-
export const invalidMetadataFileUnsupportedSourceVendor = `Sorry, your .sct metadata file appears to be invalid; the source DB must be Oracle.`
508+
export const invalidMetadataFileUnsupportedSourceDB = `Sorry, your .sct metadata file appears to be invalid; the source DB must be Oracle.`
509509

510-
export const invalidMetadataFileUnsupportedTargetVendor = `Sorry, your .sct metadata file appears to be invalid; the target DB must be Aurora Postgresql or Amazon RDS for Postgresql.`
510+
export const invalidMetadataFileUnsupportedTargetDB = `Sorry, your .sct metadata file appears to be invalid; the target DB must be Aurora Postgresql or Amazon RDS for Postgresql.`
511511

512512
export const invalidMetadataFileErrorParsing = 'Sorry, the .sct metadata file you provided appears to be invalid.'
513513

0 commit comments

Comments
 (0)