feat(ec2): enable ec2 as experimental feature

packages/core/package.nls.json

@@ -20,7 +20,7 @@
     "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
     "AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files",
     "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
-    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.\n * `iamPolicyChecks` - Enables IAM Policy Checks feature, allowing users to validate IAM policies against IAM policy grammar, AWS best practices, and specified security standards.",
+    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `ec2RemoteConnect` - Allows interfacing with EC2 instances with options to start, stop, and establish remote connections. Remote connections are done over SSM and can be through a terminal or a remote VSCode window.",
     "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
     "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
     "AWS.configuration.description.awssam.debug.api": "API Gateway configuration",

packages/core/src/awsexplorer/regionNode.ts

@@ -29,9 +29,9 @@ import { DefaultSchemaClient } from '../shared/clients/schemaClient'
 import { getEcsRootNode } from '../awsService/ecs/model'
 import { compareTreeItems, TreeShim } from '../shared/treeview/utils'
 import { Ec2ParentNode } from '../awsService/ec2/explorer/ec2ParentNode'
-import { DevSettings } from '../shared/settings'
 import { Ec2Client } from '../shared/clients/ec2Client'
 import { isCloud9 } from '../shared/extensionUtilities'
+import { Experiments } from '../shared/settings'
 
 interface ServiceNode {
     allRegions?: boolean
@@ -65,7 +65,7 @@ const serviceCandidates: ServiceNode[] = [
     },
     {
         serviceId: 'ec2',
-        when: () => DevSettings.instance.isDevMode(),
+        when: () => Experiments.instance.isExperimentEnabled('ec2RemoteConnect'),
         createFn: (regionCode: string, partitionId: string) =>
             new Ec2ParentNode(regionCode, partitionId, new Ec2Client(regionCode)),
     },

packages/core/src/shared/settings-toolkit.gen.ts

@@ -41,7 +41,8 @@ export const toolkitSettings = {
         "ssoCacheError": {}
     },
     "aws.experiments": {
-        "jsonResourceModification": {}
+        "jsonResourceModification": {},
+        "ec2RemoteConnect": {}
     },
     "aws.resources.enabledResources": {},
     "aws.lambda.recentlyUploaded": {},

packages/core/src/shared/settings.ts

@@ -726,12 +726,12 @@ export class Experiments extends Settings.define(
     'aws.experiments',
     toRecord(keys(experiments), () => Boolean)
 ) {
-    public async isExperimentEnabled(name: ExperimentName): Promise<boolean> {
+    public isExperimentEnabled(name: ExperimentName): boolean {
         try {
             return this._getOrThrow(name, false)
         } catch (error) {
             this._log(`experiment check for ${name} failed: %s`, error)
-            await this.reset()
+            this.reset().catch((e) => getLogger().error(`failed to reset experiment settings: %O`, e))
 
             return false
         }

packages/toolkit/.changes/next-release/Feature-6cca02fc-98d3-4fe0-b2d7-dac2ef86cee6.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "New experimental feature EC2 Remote connect."
+}

packages/toolkit/package.json

@@ -240,12 +240,17 @@
                     "type": "object",
                     "markdownDescription": "%AWS.configuration.description.experiments%",
                     "default": {
-                        "jsonResourceModification": false
+                        "jsonResourceModification": false,
+                        "ec2RemoteConnect": false
                     },
                     "properties": {
                         "jsonResourceModification": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "ec2RemoteConnect": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -1203,27 +1208,27 @@
                 },
                 {
                     "command": "aws.ec2.openRemoteConnection",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.openTerminal",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.linkToLaunch",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.startInstance",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.stopInstance",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.rebootInstance",
-                    "when": "aws.isDevMode"
+                    "when": "config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.dev.openMenu",
@@ -1448,62 +1453,67 @@
                 {
                     "command": "aws.ec2.openTerminal",
                     "group": "0@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.openTerminal",
                     "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.linkToLaunch",
                     "group": "0@1",
-                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.linkToLaunch",
                     "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.openRemoteConnection",
                     "group": "0@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.openRemoteConnection",
                     "group": "inline@1",
-                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.startInstance",
                     "group": "0@1",
-                    "when": "viewItem == awsEc2StoppedNode"
+                    "when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.startInstance",
                     "group": "inline@1",
-                    "when": "viewItem == awsEc2StoppedNode"
+                    "when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.stopInstance",
                     "group": "0@1",
-                    "when": "viewItem == awsEc2RunningNode"
+                    "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.stopInstance",
                     "group": "inline@1",
-                    "when": "viewItem == awsEc2RunningNode"
+                    "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.rebootInstance",
                     "group": "0@1",
-                    "when": "viewItem == awsEc2RunningNode"
+                    "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
                 },
                 {
                     "command": "aws.ec2.rebootInstance",
                     "group": "inline@1",
-                    "when": "viewItem == awsEc2RunningNode"
+                    "when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
+                },
+                {
+                    "command": "aws.ec2.copyInstanceId",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/ && config.aws.experiments.ec2RemoteConnect",
+                    "group": "2@0"
                 },
                 {
                     "command": "aws.ecr.createRepository",
@@ -1605,11 +1615,6 @@
                     "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
                     "group": "1@2"
                 },
-                {
-                    "command": "aws.ec2.copyInstanceId",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/",
-                    "group": "2@0"
-                },
                 {
                     "command": "aws.ecr.copyTagUri",
                     "when": "view == aws.explorer && viewItem == awsEcrTagNode",