changes from mainline

Author: hayemaxi

packages/amazonq/.changes/next-release/Bug Fix-cd2d5207-4deb-43c7-a4f6-beb0692a5ea7.json

@@ -4,15 +4,10 @@
  */
 
 import assert from 'assert'
-import { ToolkitGlobals } from 'aws-core-vscode/shared'
+import { globals, ToolkitGlobals } from 'aws-core-vscode/shared'
 
 describe('activation', async () => {
     it('defines a region provider that can provide regions when in web mode', async () => {
-        // For some reason, a top-level import will result in undefined.
-        // Other tests don't seem to have this issue.
-        // TODO: why?
-        const { globals } = require('aws-core-vscode/shared')
-
         assert((globals as unknown as ToolkitGlobals).regionProvider.getRegions().length > 0)
     })
 })

packages/amazonq/test/web/extension.test.ts

@@ -35,6 +35,9 @@ export async function runTests(
         }
 
         /**
+         * Tests are not run for core at the moment, but leaving this here because it may be useful in the future.
+         * It might also explain why `import { global } ...` works in web tests but `import global ...` does not.
+         *
          * Node's `require` caches modules by case-sensitive paths, regardless of the underlying
          * file system. This is normally not a problem, but VS Code also happens to normalize paths
          * on Windows to use lowercase drive letters when using its bootstrap loader. This means

packages/core/src/test/testRunner.ts

@@ -1145,6 +1145,10 @@
                     "command": "aws.ec2.openTerminal",
                     "when": "aws.isDevMode"
                 },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "when": "aws.isDevMode"
+                },
                 {
                     "command": "aws.ec2.startInstance",
                     "when": "aws.isDevMode"
@@ -1367,6 +1371,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",
@@ -1509,7 +1523,7 @@
                 },
                 {
                     "command": "aws.ec2.copyInstanceId",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Parent|Running|Stopped)Node)$/",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/",
                     "group": "2@0"
                 },
                 {
@@ -2209,6 +2223,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%",