ec2: add new command for remote connect (#3649)

Problem:
We need an entry point for the remote connect functionality and a clear distinction between openTerminal and openRemoteConnection.

Solution:
change aws.ec2.connectToInstance to aws.ec2.openTerminal. (inline with ecs naming.)
add new command aws.ec2.openRemoteConnecton. (inline with CodeCatalyst naming)
make command accessible from the command palette.
allow aws.ec2.openRemoteConnection to be empty.
refactor code to make clear which parts are specific to terminal and which are for general connection.

Author: Hweinstock

package.json

@@ -1111,7 +1111,11 @@
                     "command": "aws.auth.manageConnections"
                 },
                 {
-                    "command": "aws.ec2.connectToInstance",
+                    "command": "aws.ec2.openRemoteConnection",
+                    "when": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
                     "when": "aws.isDevMode"
                 },
                 {
@@ -1309,7 +1313,7 @@
                     "group": "inline@1"
                 },
                 {
-                    "command": "aws.ec2.connectToInstance",
+                    "command": "aws.ec2.openTerminal",
                     "group": "0@1",
                     "when": "viewItem == awsEc2Node"
                 },
@@ -2056,8 +2060,18 @@
                 }
             },
             {
-                "command": "aws.ec2.connectToInstance",
-                "title": "%AWS.command.ec2.connectToInstance%",
+                "command": "aws.ec2.openTerminal",
+                "title": "%AWS.command.ec2.openTerminal%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.openRemoteConnection",
+                "title": "%AWS.command.ec2.openRemoteConnection%",
                 "category": "%AWS.title%",
                 "cloud9": {
                     "cn": {

package.nls.json

@@ -108,7 +108,8 @@
     "AWS.command.refreshAwsExplorer": "Refresh Explorer",
     "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",
     "AWS.command.cdk.help": "View CDK Documentation",
-    "AWS.command.ec2.connectToInstance": "Connect to EC2 Instance...",
+    "AWS.command.ec2.openTerminal": "Open terminal to EC2 instance...",
+    "AWS.command.ec2.openRemoteConnection": "Connect to EC2 instance in New Window...",
     "AWS.command.ecr.copyTagUri": "Copy Tag URI",
     "AWS.command.ecr.copyRepositoryUri": "Copy Repository URI",
     "AWS.command.ecr.createRepository": "Create Repository...",

src/ec2/activation.ts

@@ -4,17 +4,27 @@
  */
 import { ExtContext } from '../shared/extensions'
 import { Commands } from '../shared/vscode/commands2'
-import { tryConnect } from './commands'
 import { telemetry } from '../shared/telemetry/telemetry'
 import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
+import { promptUserForEc2Selection } from './prompter'
+import { Ec2ConnectionManager } from './model'
 
 export async function activate(ctx: ExtContext): Promise<void> {
     ctx.extensionContext.subscriptions.push(
-        Commands.register('aws.ec2.connectToInstance', async (node?: Ec2InstanceNode) => {
+        Commands.register('aws.ec2.openTerminal', async (node?: Ec2InstanceNode) => {
             await telemetry.ec2_connectToInstance.run(async span => {
                 span.record({ ec2ConnectionType: 'ssm' })
-                await (node ? tryConnect(node.toSelection()) : tryConnect())
+                const selection = node ? node.toSelection() : await promptUserForEc2Selection()
+
+                const connectionManager = new Ec2ConnectionManager(selection.region)
+                await connectionManager.attemptToOpenEc2Terminal(selection)
             })
+        }),
+
+        Commands.register('aws.ec2.openRemoteConnection', async (node?: Ec2InstanceNode) => {
+            const selection = node ? node.toSelection() : await promptUserForEc2Selection()
+            //const connectionManager = new Ec2ConnectionManager(selection.region)
+            console.log(selection)
         })
     )
 }

src/ec2/commands.ts

@@ -113,7 +113,7 @@ export class Ec2ConnectionManager {
         })
     }
 
-    public async attemptEc2Connection(selection: Ec2Selection): Promise<void> {
+    public async attemptToOpenEc2Terminal(selection: Ec2Selection): Promise<void> {
         await this.checkForStartSessionError(selection)
         try {
             const response = await this.ssmClient.startSession(selection.instanceId)

src/ec2/model.ts

@@ -7,6 +7,8 @@ import { RegionSubmenu, RegionSubmenuResponse } from '../shared/ui/common/region
 import { Ec2Selection, getInstancesFromRegion } from './utils'
 import { DataQuickPickItem } from '../shared/ui/pickerPrompter'
 import { Ec2Instance } from '../shared/clients/ec2Client'
+import { isValidResponse } from '../shared/wizards/wizard'
+import { CancellationError } from '../shared/utilities/timeoutUtils'
 
 function asQuickpickItem(instance: Ec2Instance): DataQuickPickItem<string> {
     return {
@@ -16,6 +18,17 @@ function asQuickpickItem(instance: Ec2Instance): DataQuickPickItem<string> {
     }
 }
 
+export async function promptUserForEc2Selection(): Promise<Ec2Selection> {
+    const prompter = createEc2ConnectPrompter()
+    const response = await prompter.prompt()
+
+    if (isValidResponse(response)) {
+        return handleEc2ConnectPrompterResponse(response)
+    } else {
+        throw new CancellationError('user')
+    }
+}
+
 export function handleEc2ConnectPrompterResponse(response: RegionSubmenuResponse<string>): Ec2Selection {
     return {
         instanceId: response.data,