@@ -41,13 +41,9 @@ import {
41
41
} from '../../errors'
42
42
import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
43
43
import MessengerUtils , { ButtonActions , GumbyCommands } from './messenger/messengerUtils'
44
- import { CancelActionPositions , JDKToTelemetryValue , telemetryUndefined } from '../../telemetry/codeTransformTelemetry'
44
+ import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
45
45
import { openUrl } from '../../../shared/utilities/vsCodeUtils'
46
- import {
47
- telemetry ,
48
- CodeTransformJavaTargetVersionsAllowed ,
49
- CodeTransformJavaSourceVersionsAllowed ,
50
- } from '../../../shared/telemetry/telemetry'
46
+ import { telemetry } from '../../../shared/telemetry/telemetry'
51
47
import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
52
48
import DependencyVersions from '../../models/dependencies'
53
49
import { getStringHash } from '../../../shared/utilities/textUtilities'
@@ -308,7 +304,6 @@ export class GumbyController {
308
304
}
309
305
310
306
private async validateLanguageUpgradeProjects ( message : any ) {
311
- let telemetryJavaVersion = JDKToTelemetryValue ( JDKVersion . UNSUPPORTED ) as CodeTransformJavaSourceVersionsAllowed
312
307
try {
313
308
const validProjects = await telemetry . codeTransform_validateProject . run ( async ( ) => {
314
309
telemetry . record ( {
@@ -317,12 +312,6 @@ export class GumbyController {
317
312
} )
318
313
319
314
const validProjects = await getValidLanguageUpgradeCandidateProjects ( )
320
- if ( validProjects . length > 0 ) {
321
- // validProjects[0].JDKVersion will be undefined if javap errors out or no .class files found, so call it UNSUPPORTED
322
- const javaVersion = validProjects [ 0 ] . JDKVersion ?? JDKVersion . UNSUPPORTED
323
- telemetryJavaVersion = JDKToTelemetryValue ( javaVersion ) as CodeTransformJavaSourceVersionsAllowed
324
- }
325
- telemetry . record ( { codeTransformLocalJavaVersion : telemetryJavaVersion } )
326
315
return validProjects
327
316
} )
328
317
return validProjects
@@ -384,7 +373,7 @@ export class GumbyController {
384
373
break
385
374
case ButtonActions . CONTINUE_TRANSFORMATION_FORM :
386
375
this . messenger . sendMessage (
387
- CodeWhispererConstants . continueWithoutYamlMessage ,
376
+ CodeWhispererConstants . continueWithoutConfigFileMessage ,
388
377
message . tabID ,
389
378
'ai-prompt'
390
379
)
@@ -437,9 +426,7 @@ export class GumbyController {
437
426
userChoice : skipTestsSelection ,
438
427
} )
439
428
this . messenger . sendSkipTestsSelectionMessage ( skipTestsSelection , message . tabID )
440
- this . promptJavaHome ( 'source' , message . tabID )
441
- // TO-DO: delete line above and uncomment line below when releasing CSB
442
- // await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
429
+ await this . messenger . sendCustomDependencyVersionMessage ( message . tabID )
443
430
} )
444
431
}
445
432
@@ -465,16 +452,9 @@ export class GumbyController {
465
452
const fromJDKVersion : JDKVersion = message . formSelectedValues [ 'GumbyTransformJdkFromForm' ]
466
453
467
454
telemetry . record ( {
468
- // TODO: remove JavaSource/TargetVersionsAllowed when BI is updated to use source/target
469
- codeTransformJavaSourceVersionsAllowed : JDKToTelemetryValue (
470
- fromJDKVersion
471
- ) as CodeTransformJavaSourceVersionsAllowed ,
472
- codeTransformJavaTargetVersionsAllowed : JDKToTelemetryValue (
473
- toJDKVersion
474
- ) as CodeTransformJavaTargetVersionsAllowed ,
475
455
source : fromJDKVersion ,
476
456
target : toJDKVersion ,
477
- codeTransformProjectId : pathToProject === undefined ? telemetryUndefined : getStringHash ( pathToProject ) ,
457
+ codeTransformProjectId : pathToProject === undefined ? undefined : getStringHash ( pathToProject ) ,
478
458
userChoice : 'Confirm-Java' ,
479
459
} )
480
460
@@ -503,7 +483,7 @@ export class GumbyController {
503
483
const schema : string = message . formSelectedValues [ 'GumbyTransformSQLSchemaForm' ]
504
484
505
485
telemetry . record ( {
506
- codeTransformProjectId : pathToProject === undefined ? telemetryUndefined : getStringHash ( pathToProject ) ,
486
+ codeTransformProjectId : pathToProject === undefined ? undefined : getStringHash ( pathToProject ) ,
507
487
source : transformByQState . getSourceDB ( ) ,
508
488
target : transformByQState . getTargetDB ( ) ,
509
489
userChoice : 'Confirm-SQL' ,
@@ -563,7 +543,7 @@ export class GumbyController {
563
543
canSelectMany : false ,
564
544
openLabel : 'Select' ,
565
545
filters : {
566
- 'YAML file' : [ 'yaml' ] , // restrict user to only pick a .yaml file
546
+ File : [ 'yaml' , 'yml '] , // restrict user to only pick a .yaml file
567
547
} ,
568
548
} )
569
549
if ( ! fileUri || fileUri . length === 0 ) {
@@ -576,7 +556,7 @@ export class GumbyController {
576
556
this . messenger . sendUnrecoverableErrorResponse ( 'invalid-custom-versions-file' , message . tabID )
577
557
return
578
558
}
579
- this . messenger . sendMessage ( 'Received custom dependency version YAML file.' , message . tabID , 'ai-prompt' )
559
+ this . messenger . sendMessage ( CodeWhispererConstants . receivedValidConfigFileMessage , message . tabID , 'ai-prompt' )
580
560
transformByQState . setCustomDependencyVersionFilePath ( fileUri [ 0 ] . fsPath )
581
561
this . promptJavaHome ( 'source' , message . tabID )
582
562
}
@@ -660,17 +640,13 @@ export class GumbyController {
660
640
const pathToJavaHome = extractPath ( data . message )
661
641
if ( pathToJavaHome ) {
662
642
transformByQState . setSourceJavaHome ( pathToJavaHome )
663
- // TO-DO: delete line below and uncomment the block below when releasing CSB
664
- await this . prepareLanguageUpgradeProject ( data . tabID )
665
643
// if source and target JDK versions are the same, just re-use the source JAVA_HOME and start the build
666
- /*
667
644
if ( transformByQState . getTargetJDKVersion ( ) === transformByQState . getSourceJDKVersion ( ) ) {
668
645
transformByQState . setTargetJavaHome ( pathToJavaHome )
669
646
await this . prepareLanguageUpgradeProject ( data . tabID )
670
647
} else {
671
648
this . promptJavaHome ( 'target' , data . tabID )
672
649
}
673
- */
674
650
} else {
675
651
this . messenger . sendUnrecoverableErrorResponse ( 'invalid-java-home' , data . tabID )
676
652
}
0 commit comments