Merge staging into feature/vector

Author: aws-toolkit-automation

src/auth/activation.ts

@@ -11,8 +11,9 @@ import { fromString } from './providers/credentials'
 import { registerCommandsWithVSCode } from '../shared/vscode/commands2'
 import { AuthCommandBackend, AuthCommandDeclarations } from './commands'
 import { getLogger } from '../shared/logger'
-import { isInDevEnv } from '../codecatalyst/utils'
 import { ExtensionUse } from './utils'
+import { isCloud9 } from '../shared/extensionUtilities'
+import { isInDevEnv } from '../codecatalyst/utils'
 
 export async function initialize(
     extensionContext: vscode.ExtensionContext,
@@ -41,17 +42,20 @@ export async function initialize(
  * Show the Manage Connections page when the extension starts up, if it should be shown.
  */
 async function showManageConnectionsOnStartup() {
+    // Do not show connection management to user in certain scenarios.
+    let reason: string = ''
     if (!ExtensionUse.instance.isFirstUse()) {
-        getLogger().debug(
-            'firstStartup: This is not the users first use of the extension, skipping showing Add Connections page.'
-        )
-        return
+        reason = 'This is not the users first use of the extension'
+    } else if (isInDevEnv()) {
+        reason = 'The user is in a Dev Evironment'
+    } else if (isCloud9('any')) {
+        reason = 'The user is in Cloud9'
     }
-
-    if (isInDevEnv()) {
-        getLogger().debug('firstStartup: Detected we are in Dev Env, skipping showing Add Connections page.')
+    if (reason) {
+        getLogger().debug(`firstStartup: ${reason}. Skipped showing Add Connections page.`)
         return
     }
 
-    AuthCommandDeclarations.instance.declared.showConnectionsPage.execute('firstStartup')
+    // Show connection management to user
+    AuthCommandDeclarations.instance.declared.showManageConnections.execute('firstStartup')
 }

src/auth/commands.ts

@@ -6,15 +6,22 @@ import * as vscode from 'vscode'
 import { CommandDeclarations, Commands } from '../shared/vscode/commands2'
 import { AuthSource, showAuthWebview } from './ui/vue/show'
 import { ServiceItemId, isServiceItemId } from './ui/vue/types'
-import { showConnectionsPageCommand } from './utils'
+import { addConnection, showConnectionsPageCommand } from './utils'
+import { isCloud9 } from '../shared/extensionUtilities'
 
 /**
  * The methods with backend logic for the Auth commands.
  */
 export class AuthCommandBackend {
     constructor(private readonly extContext: vscode.ExtensionContext) {}
 
-    public showConnectionsPage(source: AuthSource, serviceToShow?: ServiceItemId) {
+    public showManageConnections(source: AuthSource, serviceToShow?: ServiceItemId) {
+        // The auth webview page does not make sense to use in C9,
+        // so show the auth quick pick instead.
+        if (isCloud9('any')) {
+            return addConnection.execute()
+        }
+
         // Edge case where called by vscode UI and non ServiceItemId object
         // is passed in.
         if (typeof source !== 'string') {
@@ -41,7 +48,7 @@ export class AuthCommandDeclarations implements CommandDeclarations<AuthCommandB
     private constructor() {}
 
     public readonly declared = {
-        showConnectionsPage: Commands.from(AuthCommandBackend).declareShowConnectionsPage({
+        showManageConnections: Commands.from(AuthCommandBackend).declareShowManageConnections({
             id: showConnectionsPageCommand,
         }),
     } as const

src/codecatalyst/explorer.ts

@@ -35,7 +35,7 @@ async function getLocalCommands(auth: CodeCatalystAuthenticationProvider) {
     const docsUrl = isCloud9() ? codecatalyst.docs.cloud9.overview : codecatalyst.docs.vscode.overview
     if (!isBuilderIdConnection(auth.activeConnection) || !(await auth.isConnectionOnboarded(auth.activeConnection))) {
         return [
-            AuthCommandDeclarations.instance.declared.showConnectionsPage
+            AuthCommandDeclarations.instance.declared.showManageConnections
                 .build('codecatalystDeveloperTools', 'codecatalyst')
                 .asTreeNode({
                     label: 'Start',

src/codewhisperer/explorer/codewhispererChildrenNodes.ts

@@ -61,7 +61,7 @@ export const createSecurityScanNode = () => {
 }
 
 export const createSsoSignIn = () =>
-    AuthCommandDeclarations.instance.declared.showConnectionsPage
+    AuthCommandDeclarations.instance.declared.showManageConnections
         .build('codewhispererDeveloperTools', 'codewhisperer')
         .asTreeNode({
             label: localize('AWS.explorerNode.sSoSignInNode.label', 'Start'),