De-dupe codewhisperer add connection logic

Author: JadenSimon

src/codewhisperer/util/getStartUrl.ts

@@ -16,6 +16,7 @@ export const getStartUrl = async () => {
     const inputBox = await createStartUrlPrompter('IAM Identity Center', false)
     const userInput = await inputBox.prompt()
     if (!isValidResponse(userInput)) {
+        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
         throw new CancellationError('user')
     }
     telemetry.ui_click.emit({ elementId: 'connection_startUrl' })

src/codewhisperer/util/showSsoPrompt.ts

@@ -3,9 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
 import * as vscode from 'vscode'
 import { getLogger } from '../../shared/logger'
 import { getStartUrl } from './getStartUrl'
@@ -14,13 +11,12 @@ import { AuthUtil, isUpgradeableConnection } from './authUtil'
 import { failedToConnectAwsBuilderId } from '../models/constants'
 import { isValidResponse } from '../../shared/wizards/wizard'
 import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { codicon, getIcon } from '../../shared/icons'
-import { DataQuickPickItem } from '../../shared/ui/pickerPrompter'
-import { getIdeProperties } from '../../shared/extensionUtilities'
 import { isUserCancelledError, ToolkitError } from '../../shared/errors'
 import { createCommonButtons } from '../../shared/ui/buttons'
 import { Auth } from '../../credentials/auth'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { createBuilderIdItem, createIamItem, createSsoItem } from '../../credentials/auth'
+import { telemetry } from '../../shared/telemetry/telemetry'
 
 export const showConnectionPrompt = async () => {
     const currentConn = Auth.instance.activeConnection
@@ -39,15 +35,14 @@ export const showConnectionPrompt = async () => {
         }
     }
 
-    const resp = await showQuickPick(
-        [createCodeWhispererBuilderIdItem(), createCodeWhispererSsoItem(), createCodeWhispererIamItem()],
-        {
-            title: 'CodeWhisperer: Add Connection to AWS',
-            placeholder: 'Select a connection option to start using CodeWhisperer',
-            buttons: createCommonButtons() as vscode.QuickInputButton[],
-        }
-    )
+    const resp = await showQuickPick([createBuilderIdItem(), createSsoItem(), createCodeWhispererIamItem()], {
+        title: 'CodeWhisperer: Add Connection to AWS',
+        placeholder: 'Select a connection option to start using CodeWhisperer',
+        buttons: createCommonButtons() as vscode.QuickInputButton[],
+    })
+
     if (!isValidResponse(resp)) {
+        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
         throw new CancellationError('user')
     }
     switch (resp) {
@@ -73,32 +68,11 @@ async function awsIdSignIn() {
     await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
 }
 
-export const createCodeWhispererBuilderIdItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-person')} ${localize(
-            'aws.auth.builderIdItem.label',
-            'Use a personal email to sign up and sign in with AWS Builder ID'
-        )}`,
-        data: 'builderId',
-        detail: 'Create or sign in with AWS Builder ID - a new, personal profile for builders.',
-    } as DataQuickPickItem<'builderId'>)
+export const createCodeWhispererIamItem = () => {
+    const item = createIamItem()
+    item.detail = 'Not supported by CodeWhisperer.'
+    item.description = 'not supported'
+    item.invalidSelection = true
 
-export const createCodeWhispererSsoItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-organization')} ${localize(
-            'aws.auth.ssoItem.label',
-            'Connect using {0} IAM Identity Center',
-            getIdeProperties().company
-        )}`,
-        data: 'sso',
-        detail: "Sign in to your company's IAM Identity Center access portal login page.",
-    } as DataQuickPickItem<'sso'>)
-
-export const createCodeWhispererIamItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-key')} ${localize('aws.auth.iamItem.label', 'Use IAM Credentials')}`,
-        data: 'iam',
-        detail: 'Not supported by CodeWhisperer.',
-        description: 'not supported',
-        invalidSelection: true,
-    } as DataQuickPickItem<'iam'>)
+    return item
+}