Skip to content

Commit 3f69e96

Browse files
justinmk3justinmk3
authored
feat(ec2): graduate EC2 out of Experiments #6435 
1 parent ba3a4f7 commit 3f69e96

File tree

5 files changed

+20
-48
lines changed

5 files changed

+20
-48
lines changed

‎packages/core/package.nls.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
2121
"AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files",
2222
"AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
23-
"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.",
23+
"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.",
2424
"AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
2525
"AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
2626
"AWS.configuration.description.awssam.debug.api": "API Gateway configuration",

‎packages/core/src/awsexplorer/regionNode.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { getEcsRootNode } from '../awsService/ecs/model'
3030
import { compareTreeItems, TreeShim } from '../shared/treeview/utils'
3131
import { Ec2ParentNode } from '../awsService/ec2/explorer/ec2ParentNode'
3232
import { Ec2Client } from '../shared/clients/ec2Client'
33-
import { Experiments } from '../shared/settings'
3433

3534
interface ServiceNode {
3635
allRegions?: boolean
@@ -64,7 +63,6 @@ const serviceCandidates: ServiceNode[] = [
6463
},
6564
{
6665
serviceId: 'ec2',
67-
when: () => Experiments.instance.isExperimentEnabled('ec2RemoteConnect'),
6866
createFn: (regionCode: string, partitionId: string) =>
6967
new Ec2ParentNode(regionCode, partitionId, new Ec2Client(regionCode)),
7068
},

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ export const toolkitSettings = {
4141
"ssoCacheError": {}
4242
},
4343
"aws.experiments": {
44-
"jsonResourceModification": {},
45-
"ec2RemoteConnect": {}
44+
"jsonResourceModification": {}
4645
},
4746
"aws.resources.enabledResources": {},
4847
"aws.lambda.recentlyUploaded": {},

‎packages/toolkit/.changes/next-release/Feature-a7fb8317-77bc-4459-a278-2bc98fd0a5cf.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "EC2 is now available in AWS Explorer:\n\n1. Remote-connect VSCode to your EC2 instances.\n2. Open terminal to your EC2 instances.\n3. Start, stop, and visit the Launch page."
4+
}

‎packages/toolkit/package.json

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,12 @@
240240
"type": "object",
241241
"markdownDescription": "%AWS.configuration.description.experiments%",
242242
"default": {
243-
"jsonResourceModification": false,
244-
"ec2RemoteConnect": false
243+
"jsonResourceModification": false
245244
},
246245
"properties": {
247246
"jsonResourceModification": {
248247
"type": "boolean",
249248
"default": false
250-
},
251-
"ec2RemoteConnect": {
252-
"type": "boolean",
253-
"default": false
254249
}
255250
},
256251
"additionalProperties": false
@@ -1206,30 +1201,6 @@
12061201
{
12071202
"command": "aws.toolkit.auth.manageConnections"
12081203
},
1209-
{
1210-
"command": "aws.ec2.openRemoteConnection",
1211-
"when": "config.aws.experiments.ec2RemoteConnect"
1212-
},
1213-
{
1214-
"command": "aws.ec2.openTerminal",
1215-
"when": "config.aws.experiments.ec2RemoteConnect"
1216-
},
1217-
{
1218-
"command": "aws.ec2.linkToLaunch",
1219-
"when": "config.aws.experiments.ec2RemoteConnect"
1220-
},
1221-
{
1222-
"command": "aws.ec2.startInstance",
1223-
"when": "config.aws.experiments.ec2RemoteConnect"
1224-
},
1225-
{
1226-
"command": "aws.ec2.stopInstance",
1227-
"when": "config.aws.experiments.ec2RemoteConnect"
1228-
},
1229-
{
1230-
"command": "aws.ec2.rebootInstance",
1231-
"when": "config.aws.experiments.ec2RemoteConnect"
1232-
},
12331204
{
12341205
"command": "aws.dev.openMenu",
12351206
"when": "aws.isDevMode || isCloud9"
@@ -1453,66 +1424,66 @@
14531424
{
14541425
"command": "aws.ec2.openTerminal",
14551426
"group": "0@1",
1456-
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
1427+
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
14571428
},
14581429
{
14591430
"command": "aws.ec2.openTerminal",
14601431
"group": "inline@1",
1461-
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
1432+
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
14621433
},
14631434
{
14641435
"command": "aws.ec2.linkToLaunch",
14651436
"group": "0@0",
1466-
"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
1437+
"when": "viewItem =~ /^(awsEc2ParentNode)$/"
14671438
},
14681439
{
14691440
"command": "aws.ec2.linkToLaunch",
14701441
"group": "inline@0",
1471-
"when": "viewItem =~ /^(awsEc2ParentNode)$/ && config.aws.experiments.ec2RemoteConnect"
1442+
"when": "viewItem =~ /^(awsEc2ParentNode)$/"
14721443
},
14731444
{
14741445
"command": "aws.ec2.openRemoteConnection",
14751446
"group": "0@1",
1476-
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
1447+
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
14771448
},
14781449
{
14791450
"command": "aws.ec2.openRemoteConnection",
14801451
"group": "inline@1",
1481-
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/ && config.aws.experiments.ec2RemoteConnect"
1452+
"when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
14821453
},
14831454
{
14841455
"command": "aws.ec2.startInstance",
14851456
"group": "0@1",
1486-
"when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect"
1457+
"when": "viewItem == awsEc2StoppedNode"
14871458
},
14881459
{
14891460
"command": "aws.ec2.startInstance",
14901461
"group": "inline@1",
1491-
"when": "viewItem == awsEc2StoppedNode && config.aws.experiments.ec2RemoteConnect"
1462+
"when": "viewItem == awsEc2StoppedNode"
14921463
},
14931464
{
14941465
"command": "aws.ec2.stopInstance",
14951466
"group": "0@1",
1496-
"when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
1467+
"when": "viewItem == awsEc2RunningNode"
14971468
},
14981469
{
14991470
"command": "aws.ec2.stopInstance",
15001471
"group": "inline@1",
1501-
"when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
1472+
"when": "viewItem == awsEc2RunningNode"
15021473
},
15031474
{
15041475
"command": "aws.ec2.rebootInstance",
15051476
"group": "0@1",
1506-
"when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
1477+
"when": "viewItem == awsEc2RunningNode"
15071478
},
15081479
{
15091480
"command": "aws.ec2.rebootInstance",
15101481
"group": "inline@1",
1511-
"when": "viewItem == awsEc2RunningNode && config.aws.experiments.ec2RemoteConnect"
1482+
"when": "viewItem == awsEc2RunningNode"
15121483
},
15131484
{
15141485
"command": "aws.ec2.copyInstanceId",
1515-
"when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/ && config.aws.experiments.ec2RemoteConnect",
1486+
"when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/",
15161487
"group": "2@0"
15171488
},
15181489
{

0 commit comments

Comments
 (0)