Merge branch 'master' into ec2/sshDryRun

Author: Hweinstock

packages/amazonq/.changes/next-release/Bug Fix-17fd1915-ab2a-4fe8-aa1e-6fc15524b46a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: `@workspace` command shown in all tab types"
+}

packages/amazonq/.changes/next-release/Feature-76e907b5-f09d-4b24-bc60-156471d3cb22.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Code Transform: Enable support for Java 17 projects."
+}

packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts

@@ -50,10 +50,12 @@ describe('crossFileContextUtil', function () {
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
                 preview: false,
             })
+
+            await assertTabCount(2)
+
             const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
             assert.ok(actual)
-            assert.ok(actual.supplementalContextItems.length === 3)
-
+            assert.strictEqual(actual.supplementalContextItems.length, 3)
             assert.strictEqual(actual.supplementalContextItems[0].content.split('\n').length, 50)
             assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50)
             assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
@@ -64,6 +66,9 @@ describe('crossFileContextUtil', function () {
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
                 preview: false,
             })
+
+            await assertTabCount(2)
+
             sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t1')
             sinon
                 .stub(LspController.instance, 'queryInlineProjectContext')
@@ -78,7 +83,7 @@ describe('crossFileContextUtil', function () {
 
             const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
             assert.ok(actual)
-            assert.ok(actual.supplementalContextItems.length === 4)
+            assert.strictEqual(actual.supplementalContextItems.length, 4)
             assert.strictEqual(actual?.strategy, 'codemap')
             assert.deepEqual(actual?.supplementalContextItems[0], {
                 content: 'foo',
@@ -96,6 +101,9 @@ describe('crossFileContextUtil', function () {
             const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
                 preview: false,
             })
+
+            await assertTabCount(2)
+
             sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t2')
             sinon
                 .stub(LspController.instance, 'queryInlineProjectContext')
@@ -130,7 +138,7 @@ describe('crossFileContextUtil', function () {
 
             const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
             assert.ok(actual)
-            assert.ok(actual.supplementalContextItems.length === 5)
+            assert.strictEqual(actual.supplementalContextItems.length, 5)
             assert.strictEqual(actual?.strategy, 'bm25')
 
             assert.deepEqual(actual?.supplementalContextItems[0], {

packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts

@@ -7,7 +7,7 @@ import assert from 'assert'
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import * as crossFile from 'aws-core-vscode/codewhisperer'
-import { TestFolder } from 'aws-core-vscode/test'
+import { TestFolder, assertTabCount } from 'aws-core-vscode/test'
 import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer'
 import { toTextEditor } from 'aws-core-vscode/test'
 
@@ -39,6 +39,8 @@ describe('supplementalContextUtil', function () {
                     preview: false,
                 })
 
+                await assertTabCount(4)
+
                 const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
                 assert.ok(actual?.supplementalContextItems.length === 3)
             })
@@ -53,6 +55,8 @@ describe('supplementalContextUtil', function () {
                     preview: false,
                 })
 
+                await assertTabCount(4)
+
                 const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
                 assert.ok(actual?.supplementalContextItems.length === 0)
             })

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -4,11 +4,23 @@
  */
 import { isSQLTransformReady } from '../../../../dev/config'
 import { TabType } from '../storages/tabsStorage'
+import { QuickActionCommandGroup } from '@aws/mynah-ui'
 
 export type TabTypeData = {
     title: string
     placeholder: string
     welcome: string
+    contextCommands?: QuickActionCommandGroup[]
+}
+
+const workspaceCommand: QuickActionCommandGroup = {
+    groupName: 'Mention code',
+    commands: [
+        {
+            command: '@workspace',
+            description: '(BETA) Reference all code in workspace.',
+        },
+    ],
 }
 
 const commonTabData: TabTypeData = {
@@ -17,6 +29,7 @@ const commonTabData: TabTypeData = {
     welcome: `Hi, I'm Amazon Q. I can answer your software development questions.
   Ask me to explain, debug, or optimize your code.
   You can enter \`/\` to see a list of quick actions. Add @workspace to beginning of your message to include your entire workspace as context.`,
+    contextCommands: [workspaceCommand],
 }
 
 export const TabTypeDataMap: Record<TabType, TabTypeData> = {
@@ -42,8 +55,6 @@ I can help you with the following tasks:
 - Convert embedded SQL from Oracle databases to PostgreSQL
 
 What would you like to do? You can enter 'language upgrade' or 'SQL conversion'.`
-            : `Welcome to code transformation!
-
-I can help you upgrade your Java 8 and 11 codebases to Java 17.`,
+            : `Welcome to code transformation!`,
     },
 }

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -35,17 +35,7 @@ export class TabDataGenerator {
                 'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
             quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
             promptInputPlaceholder: TabTypeDataMap[tabType].placeholder,
-            contextCommands: [
-                {
-                    groupName: 'Mention code',
-                    commands: [
-                        {
-                            command: '@workspace',
-                            description: '(BETA) Reference all code in workspace.',
-                        },
-                    ],
-                },
-            ],
+            contextCommands: TabTypeDataMap[tabType].contextCommands,
             chatItems: needWelcomeMessages
                 ? [
                       {

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

@@ -191,6 +191,10 @@ export class Messenger {
                     value: JDKVersion.JDK11,
                     label: JDKVersion.JDK11,
                 },
+                {
+                    value: JDKVersion.JDK17,
+                    label: JDKVersion.JDK17,
+                },
                 {
                     value: JDKVersion.UNSUPPORTED,
                     label: 'Other',

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

@@ -44,9 +44,11 @@ export default class MessengerUtils {
         } else if (os.platform() === 'darwin') {
             const jdkVersion = transformByQState.getSourceJDKVersion()
             if (jdkVersion === JDKVersion.JDK8) {
-                javaHomePrompt += ` ${CodeWhispererConstants.macJava8HomeHelpChatMessage}`
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(1.8)}`
             } else if (jdkVersion === JDKVersion.JDK11) {
-                javaHomePrompt += ` ${CodeWhispererConstants.macJava11HomeHelpChatMessage}`
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(11)}`
+            } else if (jdkVersion === JDKVersion.JDK17) {
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(17)}`
             }
         } else {
             javaHomePrompt += ` ${CodeWhispererConstants.linuxJavaHomeHelpChatMessage}`

packages/core/src/auth/providers/sharedCredentialsProviderFactory.ts

@@ -3,47 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from '../../shared/fs/fs'
 import { getLogger, Logger } from '../../shared/logger'
 import { loadSharedCredentialsSections, updateAwsSdkLoadConfigEnvVar } from '../credentials/sharedCredentials'
 import { CredentialsProviderType } from './credentials'
 import { BaseCredentialsProviderFactory } from './credentialsProviderFactory'
 import { SharedCredentialsProvider } from './sharedCredentialsProvider'
-import { getCredentialsFilename, getConfigFilename } from '../credentials/sharedCredentialsFile'
 
 export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFactory<SharedCredentialsProvider> {
     private readonly logger: Logger = getLogger()
 
-    private loadedCredentialsModificationMillis?: number
-    private loadedConfigModificationMillis?: number
-
     public async refresh(): Promise<void> {
-        if (await this.needsRefresh()) {
-            await this.loadSharedCredentialsProviders()
-        }
+        await this.loadSharedCredentialsProviders()
     }
 
     public override getProviderType(): CredentialsProviderType | undefined {
         return SharedCredentialsProvider.getProviderType()
     }
 
-    protected override resetProviders() {
-        this.loadedCredentialsModificationMillis = undefined
-        this.loadedConfigModificationMillis = undefined
-
-        super.resetProviders()
-    }
-
-    private async needsRefresh(): Promise<boolean> {
-        const credentialsLastModMillis = await this.getLastModifiedMillis(getCredentialsFilename())
-        const configLastModMillis = await this.getLastModifiedMillis(getConfigFilename())
-
-        return (
-            this.loadedCredentialsModificationMillis !== credentialsLastModMillis ||
-            this.loadedConfigModificationMillis !== configLastModMillis
-        )
-    }
-
     private async loadSharedCredentialsProviders(): Promise<void> {
         this.resetProviders()
 
@@ -52,9 +28,6 @@ export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFac
             const errors = result.errors.map((e) => e.message).join('\t\n')
             getLogger().warn(`credentials: errors while parsing:\n%s`, errors)
         }
-
-        this.loadedCredentialsModificationMillis = await this.getLastModifiedMillis(getCredentialsFilename())
-        this.loadedConfigModificationMillis = await this.getLastModifiedMillis(getConfigFilename())
         await updateAwsSdkLoadConfigEnvVar()
 
         getLogger().verbose(
@@ -79,13 +52,4 @@ export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFac
             this.addProvider(provider)
         }
     }
-
-    private async getLastModifiedMillis(filepath: string): Promise<number | undefined> {
-        try {
-            const stat = await fs.stat(filepath)
-            return stat.mtime
-        } catch (err) {
-            return undefined
-        }
-    }
 }

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

@@ -174,6 +174,8 @@ async function validateJavaHome(): Promise<boolean> {
             javaVersionUsedByMaven = JDKVersion.JDK8
         } else if (javaVersionUsedByMaven === '11.') {
             javaVersionUsedByMaven = JDKVersion.JDK11
+        } else if (javaVersionUsedByMaven === '17.') {
+            javaVersionUsedByMaven = JDKVersion.JDK17
         }
     }
     if (javaVersionUsedByMaven !== transformByQState.getSourceJDKVersion()) {