resolve merge conflicts

Author: Hweinstock

package.json

@@ -1120,6 +1120,10 @@
                     "command": "aws.ec2.openTerminal",
                     "when": "aws.isDevMode"
                 },
+                {
+                    "command": "aws.ec2.linkToLaunchInstance",
+                    "when": "aws.isDevMode"
+                },
                 {
                     "command": "aws.ec2.startInstance",
                     "when": "false"
@@ -2192,6 +2196,17 @@
                     }
                 }
             },
+            {
+                "command": "aws.ec2.linkToLaunchInstance",
+                "title": "%AWS.command.ec2.linkToLaunchInstance%",
+                "icon": "$(add)",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
             {
                 "command": "aws.ecr.copyTagUri",
                 "title": "%AWS.command.ecr.copyTagUri%",

package.nls.json

@@ -110,10 +110,11 @@
     "AWS.command.cdk.help": "View CDK Documentation",
     "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.stopInstance": "Stop EC2 Instance",
-    "AWS.command.ec2.rebootInstance": "Reboot EC2 Instance",
     "AWS.command.ec2.copyInstanceId": "Copy Instance Id",
+    "AWS.command.ec2.startInstance": "Start EC2 Instance...",
+    "AWS.command.ec2.stopInstance": "Stop EC2 Instance...",
+    "AWS.command.ec2.rebootInstance": "Reboot EC2 Instance...",
+    "AWS.command.ec2.linkToLaunchInstance": "Launch EC2 Instance",
     "AWS.command.ecr.copyTagUri": "Copy Tag URI",
     "AWS.command.ecr.copyRepositoryUri": "Copy Repository URI",
     "AWS.command.ecr.createRepository": "Create Repository...",

src/ec2/activation.ts

@@ -9,6 +9,7 @@ import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
 import { copyTextCommand } from '../awsexplorer/commands/copyText'
 import { Ec2Node } from './explorer/ec2ParentNode'
 import {
+    linkToLaunchInstance,
     openRemoteConnection,
     openTerminal,
     rebootInstance,
@@ -47,6 +48,10 @@ export async function activate(ctx: ExtContext): Promise<void> {
         Commands.register('aws.ec2.rebootInstance', async (node?: Ec2Node) => {
             await rebootInstance(node)
             refreshExplorer(node)
+        }),
+
+        Commands.register('aws.ec2.linkToLaunchInstance', async (node?: Ec2Node) => {
+            await linkToLaunchInstance()
         })
     )
 }

src/ec2/commands.ts

@@ -9,6 +9,9 @@ import { Ec2ConnectionManager } from './model'
 import { Ec2Prompter, instanceFilter, Ec2Selection } from './prompter'
 import { Ec2Instance, Ec2Client } from '../shared/clients/ec2Client'
 import { copyToClipboard } from '../shared/utilities/messages'
+import { getAwsConsoleUrl } from '../shared/awsConsole'
+import globals from '../shared/extensionGlobals'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
 
 export async function refreshExplorer(node?: Ec2Node) {
     await node?.refreshNode()
@@ -47,6 +50,12 @@ export async function rebootInstance(node?: Ec2Node) {
     await client.rebootInstanceWithCancel(selection.instanceId)
 }
 
+export async function linkToLaunchInstance(node?: Ec2Node) {
+    const region = node ? node.regionCode : globals.regionProvider.guessDefaultRegion()
+    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()

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()
     }