skip buildCode step in hub

Author: David Hasani

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

@@ -19,6 +19,7 @@ import {
     ZipManifest,
     TransformByQStatus,
     DB,
+    TransformationType,
 } from '../models/model'
 import { convertDateToTimestamp } from '../../shared/utilities/textUtilities'
 import {
@@ -91,13 +92,15 @@ export async function processLanguageUpgradeTransformFormInput(
     fromJDKVersion: JDKVersion,
     toJDKVersion: JDKVersion
 ) {
+    transformByQState.setTransformationType(TransformationType.LANGUAGE_UPGRADE)
     transformByQState.setProjectName(path.basename(pathToProject))
     transformByQState.setProjectPath(pathToProject)
     transformByQState.setSourceJDKVersion(fromJDKVersion)
     transformByQState.setTargetJDKVersion(toJDKVersion)
 }
 
 export async function processSQLConversionTransformFormInput(pathToProject: string, schema: string) {
+    transformByQState.setTransformationType(TransformationType.SQL_CONVERSION)
     transformByQState.setProjectName(path.basename(pathToProject))
     transformByQState.setProjectPath(pathToProject)
     transformByQState.setSchema(schema)
@@ -782,7 +785,7 @@ export async function postTransformationJob() {
     const durationInMs = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime())
     const resultStatusMessage = transformByQState.getStatus()
 
-    if (!transformByQState.getSchema()) {
+    if (transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION) {
         // the below is only applicable when user is doing a Java 8/11 language upgrade
         const versionInfo = await getVersionData()
         const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`

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

@@ -352,7 +352,7 @@ export const newCustomizationMessage = 'You have access to new Amazon Q customiz
 // Start of QCT Strings
 
 // feature flag for SQL transformations
-export const isSQLTransformReady = false
+export const isSQLTransformReady = true
 
 export const uploadZipSizeLimitInBytes = 2000000000 // 2GB
 

packages/core/src/codewhisperer/models/model.ts

@@ -284,6 +284,11 @@ export enum TransformByQStatus {
     PartiallySucceeded = 'Partially Succeeded',
 }
 
+export enum TransformationType {
+    LANGUAGE_UPGRADE = 'Language Upgrade',
+    SQL_CONVERSION = 'SQL Conversion',
+}
+
 export enum TransformByQReviewStatus {
     NotStarted = 'NotStarted',
     PreparingReview = 'PreparingReview',
@@ -383,6 +388,8 @@ export let sessionJobHistory: {
 export class TransformByQState {
     private transformByQState: TransformByQStatus = TransformByQStatus.NotStarted
 
+    private transformationType: TransformationType | undefined = undefined
+
     private projectName: string = ''
     private projectPath: string = ''
 
@@ -464,6 +471,10 @@ export class TransformByQState {
         return this.transformByQState === TransformByQStatus.PartiallySucceeded
     }
 
+    public getTransformationType() {
+        return this.transformationType
+    }
+
     public getProjectName() {
         return this.projectName
     }
@@ -620,6 +631,10 @@ export class TransformByQState {
         this.transformByQState = TransformByQStatus.PartiallySucceeded
     }
 
+    public setTransformationType(type: TransformationType) {
+        this.transformationType = type
+    }
+
     public setProjectName(name: string) {
         this.projectName = name
     }
@@ -761,6 +776,7 @@ export class TransformByQState {
         this.targetDB = undefined
         this.sourceServerName = ''
         this.schemaOptions.clear()
+        this.schema = ''
         this.errorLog = ''
         this.customBuildCommand = ''
         this.intervalId = undefined

packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts

@@ -16,6 +16,7 @@ import {
     jobPlanProgress,
     sessionJobHistory,
     StepProgress,
+    TransformationType,
     transformByQState,
     TransformByQStatus,
     TransformByQStoppedError,
@@ -212,7 +213,7 @@ export async function uploadPayload(payloadFileName: string, uploadContext?: Upl
         transformByQState.setJobId(encodeHTML(response.uploadId))
     }
     jobPlanProgress['uploadCode'] = StepProgress.Succeeded
-    if (transformByQState.getSchema()) {
+    if (transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION) {
         // if doing a SQL conversion, we don't build the code, so mark this step as succeeded immediately so that next step renders
         jobPlanProgress['buildCode'] = StepProgress.Succeeded
     }

packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts

@@ -6,7 +6,13 @@
 import * as vscode from 'vscode'
 import globals from '../../../shared/extensionGlobals'
 import * as CodeWhispererConstants from '../../models/constants'
-import { StepProgress, jobPlanProgress, sessionJobHistory, transformByQState } from '../../models/model'
+import {
+    StepProgress,
+    TransformationType,
+    jobPlanProgress,
+    sessionJobHistory,
+    transformByQState,
+} from '../../models/model'
 import { convertToTimeString } from '../../../shared/utilities/textUtilities'
 import { getLogger } from '../../../shared/logger'
 import { getTransformationSteps } from './transformApiHandler'
@@ -264,7 +270,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             case 'PREPARING':
             case 'PREPARED':
                 // for SQL conversions, skip to planningMessage since we don't build the code
-                return transformByQState.getSchema()
+                return transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION
                     ? CodeWhispererConstants.planningMessage
                     : CodeWhispererConstants.buildingCodeMessage.replace(
                           'JAVA_VERSION_HERE',
@@ -334,7 +340,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                 activeStepId === 0
             )
             const buildMarkup =
-                activeStepId >= 1 && !transformByQState.getSchema() // for SQL conversions, don't show buildCode step
+                activeStepId >= 1 && transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION // for SQL conversions, don't show buildCode step
                     ? simpleStep(
                           this.getProgressIconMarkup(jobPlanProgress['buildCode']),
                           CodeWhispererConstants.buildCodeStepMessage,