Merge master into feature/emr

Author: aws-toolkit-automation

packages/core/package.json

@@ -1189,6 +1189,10 @@
                     "command": "aws.ec2.openTerminal",
                     "when": "aws.isDevMode"
                 },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "when": "aws.isDevMode"
+                },
                 {
                     "command": "aws.ec2.startInstance",
                     "when": "aws.isDevMode"
@@ -1411,6 +1415,16 @@
                     "group": "inline@1",
                     "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
                 },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "group": "0@1",
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "group": "inline@1",
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                },
                 {
                     "command": "aws.ec2.openRemoteConnection",
                     "group": "0@1",
@@ -2253,6 +2267,18 @@
                     }
                 }
             },
+            {
+                "command": "aws.ec2.linkToLaunch",
+                "title": "%AWS.command.ec2.linkToLaunch%",
+                "icon": "$(add)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
             {
                 "command": "aws.ec2.openRemoteConnection",
                 "title": "%AWS.command.ec2.openRemoteConnection%",

packages/core/package.nls.json

@@ -124,6 +124,7 @@
     "AWS.command.ec2.openTerminal": "Open terminal to EC2 instance...",
     "AWS.command.ec2.openRemoteConnection": "Connect to EC2 instance in New Window...",
     "AWS.command.ec2.startInstance": "Start EC2 Instance",
+    "AWS.command.ec2.linkToLaunch": "Launch EC2 Instance",
     "AWS.command.ec2.stopInstance": "Stop EC2 Instance",
     "AWS.command.ec2.rebootInstance": "Reboot EC2 Instance",
     "AWS.command.ec2.copyInstanceId": "Copy Instance Id",

packages/core/src/awsService/ec2/activation.ts

@@ -15,6 +15,7 @@ import {
     startInstance,
     stopInstance,
     refreshExplorer,
+    linkToLaunchInstance,
 } from './commands'
 
 export async function activate(ctx: ExtContext): Promise<void> {
@@ -56,6 +57,12 @@ export async function activate(ctx: ExtContext): Promise<void> {
                 await rebootInstance(node)
                 refreshExplorer(node)
             })
+        }),
+
+        Commands.register('aws.ec2.linkToLaunch', async (node?: Ec2Node) => {
+            await telemetry.ec2_launchInstance.run(async (span) => {
+                await linkToLaunchInstance(node)
+            })
         })
     )
 }

packages/core/src/awsService/ec2/commands.ts

@@ -10,6 +10,9 @@ import { Ec2Prompter, instanceFilter, Ec2Selection } from './prompter'
 import { SafeEc2Instance, Ec2Client } from '../../shared/clients/ec2Client'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { getLogger } from '../../shared/logger'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { showRegionPrompter } from '../../auth/utils'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
 
 export function refreshExplorer(node?: Ec2Node) {
     if (node) {
@@ -53,6 +56,12 @@ export async function rebootInstance(node?: Ec2Node) {
     await client.rebootInstanceWithCancel(selection.instanceId)
 }
 
+export async function linkToLaunchInstance(node?: Ec2Node) {
+    const region = node ? node.regionCode : (await showRegionPrompter('Select Region', '')).id
+    const url = getAwsConsoleUrl('ec2-launch', region)
+    await openUrl(url)
+}
+
 async function getSelection(node?: Ec2Node, filter?: instanceFilter): Promise<Ec2Selection> {
     const prompter = new Ec2Prompter(filter)
     const selection = node && node instanceof Ec2InstanceNode ? node.toSelection() : await prompter.promptUser()

packages/core/src/shared/awsConsole.ts

@@ -5,12 +5,16 @@
 
 import * as vscode from 'vscode'
 
-export function getAwsConsoleUrl(service: 'ecr' | 'cloudformation', region: string): vscode.Uri {
+export function getAwsConsoleUrl(service: 'ecr' | 'cloudformation' | 'ec2-launch', region: string): vscode.Uri {
     switch (service) {
         case 'ecr':
             return vscode.Uri.parse(`https://${region}.console.aws.amazon.com/ecr/repositories?region=${region}`)
         case 'cloudformation':
             return vscode.Uri.parse(`https://${region}.console.aws.amazon.com/cloudformation/home?region=${region}`)
+        case 'ec2-launch':
+            return vscode.Uri.parse(
+                `https://${region}.console.aws.amazon.com/ec2/home?region=${region}#LaunchInstances:`
+            )
         default:
             throw Error()
     }

packages/core/src/shared/sshConfig.ts

@@ -170,14 +170,16 @@ export class SshConfig {
     private getBaseSSHConfig(proxyCommand: string): string {
         // "AddKeysToAgent" will automatically add keys used on the server to the local agent. If not set, then `ssh-add`
         // must be done locally. It's mostly a convenience thing; private keys are _not_ shared with the server.
-
+        // "IdentitiesOnly yes" forces agent to only use provided identity file.
+        // More details: https://www.ssh.com/academy/ssh/config
         return `
 # Created by AWS Toolkit for VSCode. https://github.com/aws/aws-toolkit-vscode
 Host ${this.configHostName}
     ForwardAgent yes
     AddKeysToAgent yes
     StrictHostKeyChecking accept-new
     ProxyCommand ${proxyCommand}
+    IdentitiesOnly yes
     `
     }
 

packages/toolkit/.changes/next-release/Bug Fix-7e333959-58a0-48ff-9368-888735328bf2.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "EC2 connect: remote connection will no longer fail with 'too many authentication attempt'"
+}

packages/toolkit/.changes/next-release/Feature-ddc43dca-284c-4ab6-8857-e207bcdd9858.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "EC2: Launch ec2 instances from AWS Explorer"
+}