Merge branch 'aws:master' into fix/sagemaker

Author: ashishrp-aws

packages/amazonq/.changes/next-release/Bug Fix-a06c2136-a87a-41af-9304-454bc77aaecc.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Added automatic system certificate detection and VSCode proxy settings support"
+}

packages/amazonq/.changes/next-release/Feature-d46a67ff-b237-46cc-b6e7-8de8f2e87f45.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/transform: run all builds client-side"
+}

packages/amazonq/src/extension.ts

@@ -122,7 +122,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     }
 
     // Configure proxy settings early
-    ProxyUtil.configureProxyForLanguageServer()
+    await ProxyUtil.configureProxyForLanguageServer()
 
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)

packages/amazonq/test/e2e/amazonq/transformByQ.test.ts

@@ -129,8 +129,6 @@ describe('Amazon Q Code Transformation', function () {
                 waitIntervalInMs: 1000,
             })
 
-            // TO-DO: add this back when releasing CSB
-            /*
             const customDependencyVersionPrompt = tab.getChatItems().pop()
             assert.strictEqual(
                 customDependencyVersionPrompt?.body?.includes('You can optionally upload a YAML file'),
@@ -139,19 +137,18 @@ describe('Amazon Q Code Transformation', function () {
             tab.clickCustomFormButton({ id: 'gumbyTransformFormContinue' })
 
             // 2 additional chat messages get sent after Continue button clicked; wait for both of them
-            await tab.waitForEvent(() => tab.getChatItems().length > 13, {
+            await tab.waitForEvent(() => tab.getChatItems().length > 10, {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })
-            */
 
             const sourceJdkPathPrompt = tab.getChatItems().pop()
             assert.strictEqual(sourceJdkPathPrompt?.body?.includes('Enter the path to JDK 8'), true)
 
             tab.addChatMessage({ prompt: '/dummy/path/to/jdk8' })
 
             // 2 additional chat messages get sent after JDK path submitted; wait for both of them
-            await tab.waitForEvent(() => tab.getChatItems().length > 10, {
+            await tab.waitForEvent(() => tab.getChatItems().length > 12, {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })
@@ -173,7 +170,7 @@ describe('Amazon Q Code Transformation', function () {
                 text: 'View summary',
             })
 
-            await tab.waitForEvent(() => tab.getChatItems().length > 11, {
+            await tab.waitForEvent(() => tab.getChatItems().length > 13, {
                 waitTimeoutInMs: 5000,
                 waitIntervalInMs: 1000,
             })

packages/core/resources/amazonQCT/QCT-Maven-6-16.jar

@@ -41,13 +41,9 @@ import {
 } from '../../errors'
 import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
 import MessengerUtils, { ButtonActions, GumbyCommands } from './messenger/messengerUtils'
-import { CancelActionPositions, JDKToTelemetryValue, telemetryUndefined } from '../../telemetry/codeTransformTelemetry'
+import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
-import {
-    telemetry,
-    CodeTransformJavaTargetVersionsAllowed,
-    CodeTransformJavaSourceVersionsAllowed,
-} from '../../../shared/telemetry/telemetry'
+import { telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
 import DependencyVersions from '../../models/dependencies'
 import { getStringHash } from '../../../shared/utilities/textUtilities'
@@ -308,7 +304,6 @@ export class GumbyController {
     }
 
     private async validateLanguageUpgradeProjects(message: any) {
-        let telemetryJavaVersion = JDKToTelemetryValue(JDKVersion.UNSUPPORTED) as CodeTransformJavaSourceVersionsAllowed
         try {
             const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
                 telemetry.record({
@@ -317,12 +312,6 @@ export class GumbyController {
                 })
 
                 const validProjects = await getValidLanguageUpgradeCandidateProjects()
-                if (validProjects.length > 0) {
-                    // validProjects[0].JDKVersion will be undefined if javap errors out or no .class files found, so call it UNSUPPORTED
-                    const javaVersion = validProjects[0].JDKVersion ?? JDKVersion.UNSUPPORTED
-                    telemetryJavaVersion = JDKToTelemetryValue(javaVersion) as CodeTransformJavaSourceVersionsAllowed
-                }
-                telemetry.record({ codeTransformLocalJavaVersion: telemetryJavaVersion })
                 return validProjects
             })
             return validProjects
@@ -384,7 +373,7 @@ export class GumbyController {
                 break
             case ButtonActions.CONTINUE_TRANSFORMATION_FORM:
                 this.messenger.sendMessage(
-                    CodeWhispererConstants.continueWithoutYamlMessage,
+                    CodeWhispererConstants.continueWithoutConfigFileMessage,
                     message.tabID,
                     'ai-prompt'
                 )
@@ -437,9 +426,7 @@ export class GumbyController {
                 userChoice: skipTestsSelection,
             })
             this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
-            this.promptJavaHome('source', message.tabID)
-            // TO-DO: delete line above and uncomment line below when releasing CSB
-            // await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
+            await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
         })
     }
 
@@ -465,16 +452,9 @@ export class GumbyController {
             const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
 
             telemetry.record({
-                // TODO: remove JavaSource/TargetVersionsAllowed when BI is updated to use source/target
-                codeTransformJavaSourceVersionsAllowed: JDKToTelemetryValue(
-                    fromJDKVersion
-                ) as CodeTransformJavaSourceVersionsAllowed,
-                codeTransformJavaTargetVersionsAllowed: JDKToTelemetryValue(
-                    toJDKVersion
-                ) as CodeTransformJavaTargetVersionsAllowed,
                 source: fromJDKVersion,
                 target: toJDKVersion,
-                codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
                 userChoice: 'Confirm-Java',
             })
 
@@ -503,7 +483,7 @@ export class GumbyController {
             const schema: string = message.formSelectedValues['GumbyTransformSQLSchemaForm']
 
             telemetry.record({
-                codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
                 source: transformByQState.getSourceDB(),
                 target: transformByQState.getTargetDB(),
                 userChoice: 'Confirm-SQL',
@@ -563,7 +543,7 @@ export class GumbyController {
             canSelectMany: false,
             openLabel: 'Select',
             filters: {
-                'YAML file': ['yaml'], // restrict user to only pick a .yaml file
+                File: ['yaml', 'yml'], // restrict user to only pick a .yaml file
             },
         })
         if (!fileUri || fileUri.length === 0) {
@@ -576,7 +556,7 @@ export class GumbyController {
             this.messenger.sendUnrecoverableErrorResponse('invalid-custom-versions-file', message.tabID)
             return
         }
-        this.messenger.sendMessage('Received custom dependency version YAML file.', message.tabID, 'ai-prompt')
+        this.messenger.sendMessage(CodeWhispererConstants.receivedValidConfigFileMessage, message.tabID, 'ai-prompt')
         transformByQState.setCustomDependencyVersionFilePath(fileUri[0].fsPath)
         this.promptJavaHome('source', message.tabID)
     }
@@ -660,17 +640,13 @@ export class GumbyController {
                 const pathToJavaHome = extractPath(data.message)
                 if (pathToJavaHome) {
                     transformByQState.setSourceJavaHome(pathToJavaHome)
-                    // TO-DO: delete line below and uncomment the block below when releasing CSB
-                    await this.prepareLanguageUpgradeProject(data.tabID)
                     // if source and target JDK versions are the same, just re-use the source JAVA_HOME and start the build
-                    /*
                     if (transformByQState.getTargetJDKVersion() === transformByQState.getSourceJDKVersion()) {
                         transformByQState.setTargetJavaHome(pathToJavaHome)
                         await this.prepareLanguageUpgradeProject(data.tabID)
                     } else {
                         this.promptJavaHome('target', data.tabID)
                     }
-                    */
                 } else {
                     this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
                 }

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

@@ -410,7 +410,7 @@ export class Messenger {
                 message = CodeWhispererConstants.noPomXmlFoundChatMessage
                 break
             case 'could-not-compile-project':
-                message = CodeWhispererConstants.cleanInstallErrorChatMessage
+                message = CodeWhispererConstants.cleanTestCompileErrorChatMessage
                 break
             case 'invalid-java-home':
                 message = CodeWhispererConstants.noJavaHomeFoundChatMessage
@@ -704,7 +704,7 @@ ${codeSnippet}
     }
 
     public async sendCustomDependencyVersionMessage(tabID: string) {
-        const message = CodeWhispererConstants.chooseYamlMessage
+        const message = CodeWhispererConstants.chooseConfigFileMessage
         const buttons: ChatItemButton[] = []
 
         buttons.push({
@@ -731,7 +731,7 @@ ${codeSnippet}
                 tabID
             )
         )
-        const sampleYAML = `name: "custom-dependency-management"
+        const sampleYAML = `name: "dependency-upgrade"
 description: "Custom dependency version management for Java migration from JDK 8/11/17 to JDK 17/21"
 
 dependencyManagement:
@@ -744,7 +744,7 @@ dependencyManagement:
       targetVersion: "3.0.0"
       originType: "THIRD_PARTY"
   plugins:
-    - identifier: "com.example.plugin"
+    - identifier: "com.example:plugin"
       targetVersion: "1.2.0"
       versionProperty: "plugin.version"  # Optional`
 

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

@@ -30,12 +30,6 @@ export class NoMavenJavaProjectsFoundError extends ToolkitError {
     }
 }
 
-export class ZipExceedsSizeLimitError extends ToolkitError {
-    constructor() {
-        super('Zip file exceeds size limit', { code: 'ZipFileExceedsSizeLimit' })
-    }
-}
-
 export class AlternateDependencyVersionsNotFoundError extends Error {
     constructor() {
         super('No available versions for dependency update')

packages/core/src/amazonqGumby/errors.ts

@@ -262,7 +262,7 @@ export class DefaultCodeWhispererClient {
     /**
      * @description Use this function to get the status of the code transformation. We should
      * be polling this function periodically to get updated results. When this function
-     * returns COMPLETED we know the transformation is done.
+     * returns PARTIALLY_COMPLETED or COMPLETED we know the transformation is done.
      */
     public async codeModernizerGetCodeTransformation(
         request: CodeWhispererUserClient.GetTransformationRequest
@@ -272,15 +272,15 @@ export class DefaultCodeWhispererClient {
     }
 
     /**
-     * @description After the job has been PAUSED we need to get user intervention. Once that user
-     * intervention has been handled we can resume the transformation job.
+     * @description During client-side build, or after the job has been PAUSED we need to get user intervention.
+     * Once that user action has been handled we can resume the transformation job.
      * @params transformationJobId - String id returned from StartCodeTransformationResponse
      * @params userActionStatus - String to determine what action the user took, if any.
      */
     public async codeModernizerResumeTransformation(
         request: CodeWhispererUserClient.ResumeTransformationRequest
     ): Promise<PromiseResult<CodeWhispererUserClient.ResumeTransformationResponse, AWSError>> {
-        return (await this.createUserSdkClient()).resumeTransformation(request).promise()
+        return (await this.createUserSdkClient(8)).resumeTransformation(request).promise()
     }
 
     /**