Merge master into feature/sdkv3

aws-toolkit-automation · web-flow · commit 2b4d66b16257 · 2024-12-12T23:26:39.000+01:00
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -142,8 +142,8 @@
     "AWS.command.refreshAwsExplorer": "Refresh Explorer",
     "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",
     "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.openTerminal": "Open Terminal to EC2 Instance...",
+    "AWS.command.ec2.openRemoteConnection": "Connect VS Code to EC2 Instance...",
     "AWS.command.ec2.startInstance": "Start EC2 Instance",
     "AWS.command.ec2.linkToLaunch": "Launch EC2 Instance",
     "AWS.command.ec2.stopInstance": "Stop EC2 Instance",
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1462,12 +1462,12 @@
                 },
                 {
                     "command": "aws.ec2.linkToLaunch",
-                    "group": "0@1",
+                    "group": "0@0",
                     "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.linkToLaunch",
-                    "group": "inline@1",
+                    "group": "inline@0",
                     "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {

Original file line number	Diff line number	Diff line change
`@@ -1462,12 +1462,12 @@`
`1462`	`1462`	`},`
`1463`	`1463`	`{`
`1464`	`1464`	`"command": "aws.ec2.linkToLaunch",`
`1465`		`- "group": "0@1",`
	`1465`	`+ "group": "0@0",`
`1466`	`1466`	`"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"`
`1467`	`1467`	`},`
`1468`	`1468`	`{`
`1469`	`1469`	`"command": "aws.ec2.linkToLaunch",`
`1470`		`- "group": "inline@1",`
	`1470`	`+ "group": "inline@0",`
`1471`	`1471`	`"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"`
`1472`	`1472`	`},`
`1473`	`1473`	`{`