Merge remote-tracking branch 'upstream/feature/vector-custom' into feature/vector

Author: Will-ShaoHua

.changes/1.94.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2023-10-12",
+	"version": "1.94.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: improve auto-suggestions for additional languages"
+		},
+		{
+			"type": "Feature",
+			"description": "StepFunctions: Support rendering SFN graph with ItemProcessor field"
+		},
+		{
+			"type": "Feature",
+			"description": "auth: Adding or switching connections in CodeWhisperer, CodeCatalyst and Explorer is now faster and requires fewer steps"
+		}
+	]
+}

.changes/next-release/Feature-0cd31fc0-2e29-4295-83a3-f4cb7eeaa325.json

@@ -1,3 +1,9 @@
+## 1.94.0 2023-10-12
+
+- **Feature** CodeWhisperer: improve auto-suggestions for additional languages
+- **Feature** StepFunctions: Support rendering SFN graph with ItemProcessor field
+- **Feature** auth: Adding or switching connections in CodeWhisperer, CodeCatalyst and Explorer is now faster and requires fewer steps
+
 ## 1.93.0 2023-10-05
 
 - **Bug Fix** SAM: local debugging of a .NET lambda may fail if `containerbuild=true`

.changes/next-release/Feature-3d9dd25d-a1c3-40a8-b520-a19b339bd4dd.json

@@ -8,9 +8,11 @@ Details about any publicly accessible functionalities exposed through [extension
 
 #### `aws.codeWhisperer.connect`
 
-**Signature**: _async (startUrl?: string, region?: string) => Promise<void>_
+**Signature**: _async (startUrl?: string, region?: string, customizationArn?: string, customizationName?: string, customizationDescription?: string) => Promise<void>_
 
-Shortcut command to directly connect to Identity Center or prompt start URL entry, as well as set a customization for CodeWhisperer requests. Customization is not yet supported.
+Shortcut command to directly connect to Identity Center or prompt start URL entry, as well as set a customization for CodeWhisperer requests.
 
-This command expects two arguments: startUrl and region (both strings).
-If these arguments are provided, they will be used. Otherwise, the commands prompts for them interactively.
+This command supports two sets of arguments:
+
+-   startUrl and region. If both arguments are provided they will be used, otherwise the command prompts for them interactively.
+-   customization{Arn, Name, Description}. If at least customizationArn is provided, the command selects this customization.

.changes/next-release/Feature-93736bc9-dfa0-4698-924d-0f1d8a119c85.json

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeWhisperer, CodeCatalyst, and support for Lambda, S3, CloudWatch Logs, and many other services",
-    "version": "1.94.0-SNAPSHOT",
+    "version": "1.95.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

CHANGELOG.md

@@ -33,9 +33,9 @@ import {
     showIntroduction,
     reconnect,
     refreshStatusBar,
-    selectCustomization,
+    selectCustomizationPrompt,
     notifyNewCustomizationsCmd,
-    connectIdCenter,
+    connectWithCustomization,
 } from './commands/basicCommands'
 import { sleep } from '../shared/utilities/timeoutUtils'
 import { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
@@ -159,8 +159,8 @@ export async function activate(context: ExtContext): Promise<void> {
         }),
         // show introduction
         showIntroduction.register(),
-        // CodeWhisperer Identity Center connection setup
-        connectIdCenter.register(),
+        // direct CodeWhisperer connection setup with customization
+        connectWithCustomization.register(),
         // toggle code suggestions
         toggleCodeSuggestions.register(context.extensionContext.globalState),
         // enable code suggestions
@@ -184,7 +184,7 @@ export async function activate(context: ExtContext): Promise<void> {
             invokeRecommendation(vscode.window.activeTextEditor as vscode.TextEditor, client, await getConfigEntry())
         }),
         // select customization
-        selectCustomization.register(),
+        selectCustomizationPrompt.register(),
         // notify new customizations
         notifyNewCustomizationsCmd.register(),
         /**

docs/api.md

@@ -19,7 +19,12 @@ import { AuthUtil } from '../util/authUtil'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { InlineCompletionService } from '../service/inlineCompletionService'
 import { openUrl } from '../../shared/utilities/vsCodeUtils'
-import { notifyNewCustomizations, showCustomizationPrompt } from '../util/customizationUtil'
+import {
+    getPersistedCustomizations,
+    notifyNewCustomizations,
+    selectCustomization,
+    showCustomizationPrompt,
+} from '../util/customizationUtil'
 import { get, set } from '../util/commonUtil'
 import { CodeWhispererCommandDeclarations } from '../commands/gettingStartedPageCommands'
 import { getIcon } from '../../shared/icons'
@@ -40,7 +45,7 @@ export const toggleCodeSuggestions = Commands.declare(
         })
     }
 )
-/* 
+/*
 createGettingStartedNode(Learn) will be a childnode of CodeWhisperer
 onClick on this "Learn" Node will open the Learn CodeWhisperer Page.
 */
@@ -100,7 +105,7 @@ export const showSecurityScan = Commands.declare(
         }
 )
 
-export const selectCustomization = Commands.declare('aws.codeWhisperer.selectCustomization', () => async () => {
+export const selectCustomizationPrompt = Commands.declare('aws.codeWhisperer.selectCustomization', () => async () => {
     telemetry.ui_click.emit({ elementId: 'cw_selectCustomization_Cta' })
     showCustomizationPrompt().then()
 })
@@ -115,19 +120,37 @@ export const showSsoSignIn = Commands.declare('aws.codeWhisperer.sso', () => asy
 })
 
 // Shortcut command to directly connect to Identity Center or prompt start URL entry
-// Customization is not yet supported.
-export const connectIdCenter = Commands.declare(
+// It can optionally set a customization too.
+export const connectWithCustomization = Commands.declare(
     'aws.codeWhisperer.connect',
-    () => async (startUrl?: string, region?: string) => {
-        // This command expects two arguments: startUrl and region (both strings).
-        // If these arguments are provided, they will be used.
-        // Otherwise, the commands prompts for them interactively.
-        if (startUrl && region) {
-            await connectToEnterpriseSso(startUrl, region)
-        } else {
-            await getStartUrl()
+    () =>
+        async (
+            startUrl?: string,
+            region?: string,
+            customizationArn?: string,
+            customizationName?: string,
+            customizationDescription?: string
+        ) => {
+            // This command supports two sets of arguments:
+            //  * startUrl and region. If both arguments are provided they will be used, otherwise
+            //    the command prompts for them interactively.
+            //  * customization{Arn, Name, Description}. If at least customizationArn is provided,
+            //    the command selects this customization.
+            if (startUrl && region) {
+                await connectToEnterpriseSso(startUrl, region)
+            } else {
+                await getStartUrl()
+            }
+            if (customizationArn) {
+                const match = getPersistedCustomizations().find(c => c.arn == customizationArn)
+                const customization = {
+                    arn: customizationArn,
+                    name: customizationName ?? match?.name ?? 'unknown',
+                    description: customizationDescription ?? match?.description ?? 'unknown',
+                }
+                await selectCustomization(customization)
+            }
         }
-    }
 )
 
 export const showLearnMore = Commands.declare('aws.codeWhisperer.learnMore', () => async () => {