Merge branch 'master' into muaydin/docdb-polling-bug-fix

Muzaffer Aydin · Muzaffer Aydin · commit 410d38e44f6b · 2025-01-14T10:11:01.000-08:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json b/packages/amazonq/.changes/next-release/Bug Fix-d8c02c38-bdc4-492a-bf8c-6c35e35087be.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "User-selected customizations are sometimes not being persisted."
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json b/packages/amazonq/.changes/next-release/Feature-8a43c3c3-9ecb-44b6-bb0c-34d2065aee26.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "feat(amazonq): Add error message for updated README too large"
+}
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -218,11 +218,6 @@
                     "id": "aws.AmazonQChatView",
                     "name": "%AWS.amazonq.chat%",
                     "when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
-                },
-                {
-                    "id": "aws.AmazonQNeverShowBadge",
-                    "name": "",
-                    "when": "false"
                 }
             ],
             "aws-codewhisperer-reference-log": [
diff --git a/packages/amazonq/src/app/chat/activation.ts b/packages/amazonq/src/app/chat/activation.ts
@@ -61,7 +61,6 @@ export async function activate(context: ExtensionContext) {
         void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))
     })
 
-    await amazonq.activateBadge()
     void setupLsp()
     void setupAuthNotification()
 }
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -391,6 +391,7 @@
     "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.",
     "AWS.amazonq.doc.error.contentLengthError": "Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.doc.error.readmeTooLarge": "The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.readmeUpdateTooLarge": "The updated README is too large. Try reducing the size of your README, or asking for a smaller update. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.doc.error.workspaceEmpty": "The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.doc.error.promptTooVague": "I need more information to make changes to your README. Try providing some of the following details:\n- Which sections you want to modify\n- The content you want to add or remove\n- Specific issues that need correcting\n\nFor more information on prompt best practices, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.doc.error.promptUnrelated": "These changes don't seem related to documentation. Try describing your changes again, using the following best practices:\n- Changes should relate to how project functionality is reflected in the README\n- Content you refer to should be available in your codebase\n\n For more information on prompt best practices, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts
@@ -24,7 +24,6 @@ export { init as featureDevChatAppInit } from '../amazonqFeatureDev/app'
 export { init as gumbyChatAppInit } from '../amazonqGumby/app'
 export { init as testChatAppInit } from '../amazonqTest/app'
 export { init as docChatAppInit } from '../amazonqDoc/app'
-export { activateBadge } from './util/viewBadgeHandler'
 export { amazonQHelpUrl } from '../shared/constants'
 export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
 export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
diff --git a/packages/core/src/amazonq/util/viewBadgeHandler.ts b/packages/core/src/amazonq/util/viewBadgeHandler.ts
diff --git a/packages/core/src/amazonq/webview/webView.ts b/packages/core/src/amazonq/webview/webView.ts
@@ -19,8 +19,6 @@ import { dispatchAppsMessagesToWebView, dispatchWebViewMessagesToApps } from './
 import { MessageListener } from '../messages/messageListener'
 import { MessagePublisher } from '../messages/messagePublisher'
 import { TabType } from './ui/storages/tabsStorage'
-import { deactivateInitialViewBadge, shouldShowBadge } from '../util/viewBadgeHandler'
-import { telemetry } from '../../shared/telemetry/telemetry'
 import { amazonqMark } from '../../shared/performance/marks'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
@@ -66,19 +64,5 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         )
 
         performance.mark(amazonqMark.open)
-
-        // badge is shown, emit telemetry for first time an existing, unscoped user tries Q
-        // note: this will fire on any not-properly-scoped Q entry.
-        // this means we can't tie it directly to the badge although it is hinted at
-        if (await shouldShowBadge()) {
-            telemetry.ui_click.emit({
-                elementId: 'amazonq_tryAmazonQ',
-                passive: false,
-            })
-        }
-        // if a user EVER enters Q, we should never show the badge again.
-        // the webview view only loads if the user clicks the view container,
-        // so we can essentially use this as a guarantee that a user has entered Q.
-        deactivateInitialViewBadge()
     }
 }
diff --git a/packages/core/src/amazonqDoc/errors.ts b/packages/core/src/amazonqDoc/errors.ts
@@ -20,6 +20,14 @@ export class ReadmeTooLargeError extends ToolkitError {
     }
 }
 
+export class ReadmeUpdateTooLargeError extends ToolkitError {
+    constructor() {
+        super(i18n('AWS.amazonq.doc.error.readmeUpdateTooLarge'), {
+            code: ReadmeUpdateTooLargeError.name,
+        })
+    }
+}
+
 export class WorkspaceEmptyError extends ToolkitError {
     constructor() {
         super(i18n('AWS.amazonq.doc.error.workspaceEmpty'), {
diff --git a/packages/core/src/amazonqDoc/session/sessionState.ts b/packages/core/src/amazonqDoc/session/sessionState.ts
@@ -45,6 +45,7 @@ import {
     PromptTooVagueError,
     PromptUnrelatedError,
     ReadmeTooLargeError,
+    ReadmeUpdateTooLargeError,
     WorkspaceEmptyError,
 } from '../errors'
 import { DocMessenger } from '../messenger'
@@ -149,6 +150,9 @@ abstract class CodeGenBase {
                         case codegenResult.codeGenerationStatusDetail?.includes('README_TOO_LARGE'): {
                             throw new ReadmeTooLargeError()
                         }
+                        case codegenResult.codeGenerationStatusDetail?.includes('README_UPDATE_TOO_LARGE'): {
+                            throw new ReadmeUpdateTooLargeError()
+                        }
                         case codegenResult.codeGenerationStatusDetail?.includes('WORKSPACE_TOO_LARGE'): {
                             throw new ContentLengthError()
                         }
diff --git a/packages/core/src/codewhisperer/commands/startTestGeneration.ts b/packages/core/src/codewhisperer/commands/startTestGeneration.ts
@@ -120,6 +120,7 @@ export async function startTestGenerationProcess(
         )
         // TODO: Send status to test summary
         if (jobStatus === TestGenerationJobStatus.FAILED) {
+            session.numberOfTestsGenerated = 0
             logger.verbose(`Test generation failed.`)
             throw new TestGenFailedError()
         }
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -654,14 +654,14 @@ export async function getValidSQLConversionCandidateProjects() {
         let resultLog = ''
         for (const project of javaProjects) {
             // as long as at least one of these strings is found, project contains embedded SQL statements
-            const searchStrings = ['oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@', 'jdbc:oracle:oci:@', 'jdbc:odbc:']
+            const searchStrings = ['oracle.jdbc.', 'jdbc:oracle:', 'jdbc:odbc:']
             for (const str of searchStrings) {
                 const spawnResult = await findStringInDirectory(str, project.path)
                 // just for telemetry purposes
                 if (spawnResult.error || spawnResult.stderr) {
-                    resultLog += `search failed: ${JSON.stringify(spawnResult)}`
+                    resultLog += `search error: ${JSON.stringify(spawnResult)}--`
                 } else {
-                    resultLog += `search succeeded: ${spawnResult.exitCode}`
+                    resultLog += `search complete (exit code: ${spawnResult.exitCode})--`
                 }
                 getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${resultLog}`)
                 if (spawnResult.exitCode === 0) {
diff --git a/packages/core/src/codewhisperer/index.ts b/packages/core/src/codewhisperer/index.ts
@@ -26,6 +26,7 @@ export type {
     SendTelemetryEventResponse,
     TelemetryEvent,
     InlineChatEvent,
+    Customization,
 } from './client/codewhispereruserclient.d.ts'
 export type { default as CodeWhispererUserClient } from './client/codewhispereruserclient.d.ts'
 export { SecurityPanelViewProvider } from './views/securityPanelViewProvider'
@@ -98,6 +99,6 @@ export * as diagnosticsProvider from './service/diagnosticsProvider'
 export * from './ui/codeWhispererNodes'
 export { SecurityScanError } from '../codewhisperer/models/errors'
 export * as CodeWhispererConstants from '../codewhisperer/models/constants'
-export { getSelectedCustomization } from './util/customizationUtil'
+export { getSelectedCustomization, setSelectedCustomization, baseCustomization } from './util/customizationUtil'
 export { Container } from './service/serviceContainer'
 export * from './util/gitUtil'
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -501,7 +501,7 @@ export const codeTransformLocThreshold = 100000
 export const jobStartedChatMessage =
     'I am starting to transform your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub. If I run into any issues, I might pause the transformation to get input from you on how to proceed.'
 
-export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17, or upgrade Java 17 code with up to date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".`
+export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8 and Java 11 codebases to Java 17, or upgrade Java 17 code with up to date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS. [Learn more](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-embedded-sql.html).\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".`
 
 export const chooseTransformationObjectivePlaceholder = 'Enter "language upgrade" or "sql conversion"'
 
@@ -731,11 +731,6 @@ export const linkToDocsHome = 'https://docs.aws.amazon.com/amazonq/latest/aws-bu
 
 export const linkToBillingInfo = 'https://aws.amazon.com/q/developer/pricing/'
 
-export const linkToUploadZipTooLarge =
-    'https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/troubleshooting-code-transformation.html#project-size-limit'
-
-export const linkToDownloadZipTooLarge = ''
-
 export const dependencyFolderName = 'transformation_dependencies_temp_'
 
 export const cleanInstallErrorChatMessage = `Sorry, I couldn\'t run the Maven clean install command to build your project. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootMvnFailure}).`
diff --git a/packages/core/src/codewhisperer/service/testGenHandler.ts b/packages/core/src/codewhisperer/service/testGenHandler.ts
@@ -222,6 +222,8 @@ export async function exportResultsArchive(
     await fs.mkdir(pathToArchiveDir)
 
     let downloadErrorMessage = undefined
+
+    const session = ChatSessionManager.Instance.getSession()
     try {
         const pathToArchive = path.join(pathToArchiveDir, 'QTestGeneration.zip')
         // Download and deserialize the zip
@@ -248,6 +250,7 @@ export async function exportResultsArchive(
             })
         }
     } catch (e) {
+        session.numberOfTestsGenerated = 0
         downloadErrorMessage = (e as Error).message
         getLogger().error(`Unit Test Generation: ExportResultArchive error = ${downloadErrorMessage}`)
         throw new Error('Error downloading test generation result artifacts: ' + downloadErrorMessage)
diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts
@@ -91,6 +91,12 @@ export const baseCustomization = {
     ),
 }
 
+/**
+ * Gets the customization that should be used for user requests. If a user has manually selected
+ * a customization, always respect that choice. If not, check if the user is part of an AB
+ * group assigned a specific customization. If so, use that customization. If not, use the
+ * base customization.
+ */
 export const getSelectedCustomization = (): Customization => {
     if (
         !AuthUtil.instance.isCustomizationFeatureEnabled ||
@@ -105,21 +111,22 @@ export const getSelectedCustomization = (): Customization => {
         Object,
         {}
     )
-    const result = selectedCustomizationArr[AuthUtil.instance.conn.label] || baseCustomization
-
-    // A/B case
-    const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride)
-    const arnOverride = customizationFeature?.value.stringValue
-    const customizationOverrideName = customizationFeature?.variation
-    if (arnOverride === undefined || arnOverride === '') {
-        return result
+    const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label]
+
+    if (selectedCustomization && selectedCustomization.name !== baseCustomization.name) {
+        return selectedCustomization
     } else {
-        // A trick to prioritize arn from A/B over user's currently selected(for request and telemetry)
-        // but still shows customization info of user's currently selected.
-        return {
-            arn: arnOverride,
-            name: customizationOverrideName,
-            description: result.description,
+        const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride)
+        const arnOverride = customizationFeature?.value.stringValue
+        const customizationOverrideName = customizationFeature?.variation
+        if (arnOverride === undefined) {
+            return baseCustomization
+        } else {
+            return {
+                arn: arnOverride,
+                name: customizationOverrideName,
+                description: baseCustomization.description,
+            }
         }
     }
 }
diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts
@@ -58,7 +58,6 @@ export type globalKey =
     | 'dev.beta'
     | 'globalsMostRecentVersion'
     | 'gumby.wasQCodeTransformationUsed'
-    | 'hasAlreadyOpenedAmazonQ'
     | 'isExtensionFirstUse'
     | 'lastExtensionVersion'
     | 'lastSelectedRegion'
diff --git a/packages/core/src/shared/wizards/wizard.ts b/packages/core/src/shared/wizards/wizard.ts
@@ -94,7 +94,7 @@ export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
     private assertReady() {
         // Check for `false` explicity so that the base-class constructor can access `this._form`.
         // We want to guard against confusion when implementing a subclass, not this base-class.
-        if (this._ready === false && this.init) {
+        if (this._ready === false) {
             throw Error('run() (or init()) must be called immediately after creating the Wizard')
         }
     }
@@ -113,7 +113,7 @@ export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
         return this._stepOffset[1] + this.stateController.totalSteps
     }
 
-    public get _form() {
+    protected get _form() {
         this.assertReady()
         return this.__form
     }
@@ -136,14 +136,22 @@ export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
         this._estimator = estimator
     }
 
-    public constructor(private readonly options: WizardOptions<TState> = {}) {
+    public constructor(protected readonly options: WizardOptions<TState> = {}) {
         this.stateController = new StateMachineController(options.initState as TState)
         this.__form = options.initForm ?? new WizardForm()
         this._exitStep =
             options.exitPrompterProvider !== undefined ? this.createExitStep(options.exitPrompterProvider) : undefined
 
         // Subclass constructor logic should live in `init()`, if it exists.
         this._ready = !this.init
+
+        if (typeof this.init === 'function') {
+            const _init = this.init.bind(this)
+            this.init = () => {
+                this._ready = true
+                return _init()
+            }
+        }
     }
 
     /**
@@ -166,7 +174,6 @@ export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
         if (!this._ready && this.init) {
             this._ready = true // Let init() use `this._form`.
             await this.init()
-            delete this.init
         }
 
         this.assignSteps()
diff --git a/packages/core/src/test/amazonq/customizationUtil.test.ts b/packages/core/src/test/amazonq/customizationUtil.test.ts
diff --git a/packages/core/src/test/setupUtil.ts b/packages/core/src/test/setupUtil.ts
diff --git a/packages/core/src/test/shared/wizards/wizardTestUtils.ts b/packages/core/src/test/shared/wizards/wizardTestUtils.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "User-selected customizations are sometimes not being persisted."
 +}
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ export async function activate(context: ExtensionContext) {`
`61`	`61`	`void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))`
`62`	`62`	`})`
`63`	`63`
`64`		`- await amazonq.activateBadge()`
`65`	`64`	`void setupLsp()`
`66`	`65`	`void setupAuthNotification()`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,14 @@ export class ReadmeTooLargeError extends ToolkitError {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
	`23`	`+export class ReadmeUpdateTooLargeError extends ToolkitError {`
	`24`	`+ constructor() {`
	`25`	`+ super(i18n('AWS.amazonq.doc.error.readmeUpdateTooLarge'), {`
	`26`	`+ code: ReadmeUpdateTooLargeError.name,`
	`27`	`+ })`
	`28`	`+ }`
	`29`	`+}`
	`30`	`+`
`23`	`31`	`export class WorkspaceEmptyError extends ToolkitError {`
`24`	`32`	`constructor() {`
`25`	`33`	`super(i18n('AWS.amazonq.doc.error.workspaceEmpty'), {`