Remove RegionNode interface and replace with DefaultRegionNode class (#798)

Author: awschristou

src/awsexplorer/awsExplorer.ts

@@ -22,11 +22,10 @@ import { RefreshableAwsTreeProvider } from '../shared/treeview/awsTreeProvider'
 import { AWSCommandTreeNode } from '../shared/treeview/nodes/awsCommandTreeNode'
 import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
 import { ErrorNode } from '../shared/treeview/nodes/errorNode'
-import { RegionNode } from '../shared/treeview/nodes/regionNode'
 import { showErrorDetails } from '../shared/treeview/webviews/showErrorDetails'
 import { intersection, toMap, updateInPlace } from '../shared/utilities/collectionUtils'
 import { localize } from '../shared/utilities/vsCodeUtils'
-import { DefaultRegionNode } from './defaultRegionNode'
+import { RegionNode } from './regionNode'
 
 export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, RefreshableAwsTreeProvider {
     public viewProviderId: string = 'aws.explorer'
@@ -159,7 +158,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
             this.regionNodes,
             intersection(regionMap.keys(), explorerRegionCodes),
             key => this.regionNodes.get(key)!.update(regionMap.get(key)!),
-            key => new DefaultRegionNode(regionMap.get(key)!)
+            key => new RegionNode(regionMap.get(key)!)
         )
 
         if (this.regionNodes.size > 0) {

src/awsexplorer/defaultRegionNode.ts renamed to src/awsexplorer/regionNode.ts

@@ -8,13 +8,14 @@ import { CloudFormationNode, DefaultCloudFormationNode } from '../lambda/explore
 import { DefaultLambdaFunctionGroupNode, LambdaFunctionGroupNode } from '../lambda/explorer/lambdaNodes'
 import { RegionInfo } from '../shared/regions/regionInfo'
 import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
-import { RegionNode } from '../shared/treeview/nodes/regionNode'
 import { toMap, updateInPlace } from '../shared/utilities/collectionUtils'
 
-// Collects the regions the user has declared they want to work with;
-// on expansion each region lists the functions and CloudFormation Stacks
-// the user has available in that region.
-export class DefaultRegionNode extends AWSTreeNodeBase implements RegionNode {
+/**
+ * An AWS Explorer node representing a region.
+ * Contains resource types as child nodes (for example, nodes representing
+ * an account's Lambda Functions and CloudFormation stacks for this region)
+ */
+export class RegionNode extends AWSTreeNodeBase {
     private info: RegionInfo
     private readonly cloudFormationNode: CloudFormationNode
     private readonly lambdaFunctionGroupNode: LambdaFunctionGroupNode
@@ -62,7 +63,7 @@ export class RegionNodeCollection {
             this.regionNodes,
             regionMap.keys(),
             key => this.regionNodes.get(key)!.update(regionMap.get(key)!),
-            key => new DefaultRegionNode(regionMap.get(key)!)
+            key => new RegionNode(regionMap.get(key)!)
         )
     }
 }

src/extension.ts

@@ -7,6 +7,7 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 
 import { AwsExplorer } from './awsexplorer/awsExplorer'
+import { RegionNode } from './awsexplorer/regionNode'
 import { DefaultAWSClientBuilder } from './shared/awsClientBuilder'
 import { AwsContextTreeCollection } from './shared/awsContextTreeCollection'
 import { DefaultToolkitClientBuilder } from './shared/clients/defaultToolkitClientBuilder'
@@ -29,7 +30,6 @@ import { AwsTelemetryOptOut } from './shared/telemetry/awsTelemetryOptOut'
 import { DefaultTelemetryService } from './shared/telemetry/defaultTelemetryService'
 import { TelemetryNamespace } from './shared/telemetry/telemetryTypes'
 import { registerCommand } from './shared/telemetry/telemetryUtils'
-import { RegionNode } from './shared/treeview/nodes/regionNode'
 import { ExtensionDisposableFiles } from './shared/utilities/disposableFiles'
 import { getChannelLogger } from './shared/utilities/vsCodeUtils'
 

src/shared/treeview/nodes/regionNode.ts

@@ -5,8 +5,8 @@
 
 import * as assert from 'assert'
 import { AwsExplorer } from '../../awsexplorer/awsExplorer'
+import { RegionNode } from '../../awsexplorer/regionNode'
 import { AwsContextTreeCollection } from '../../shared/awsContextTreeCollection'
-import { RegionNode } from '../../shared/treeview/nodes/regionNode'
 import { MockOutputChannel } from '../mockOutputChannel'
 import {
     DEFAULT_TEST_REGION_CODE,

src/test/awsExplorer/awsExplorer.test.ts

@@ -4,19 +4,21 @@
  */
 
 import * as assert from 'assert'
-import { DefaultRegionNode } from '../../awsexplorer/defaultRegionNode'
+import { RegionNode } from '../../awsexplorer/regionNode'
 import { RegionInfo } from '../../shared/regions/regionInfo'
 
-// TODO: create test for getChildren() after mocking is introduced
-describe('DefaultRegionNode', () => {
+describe('RegionNode', () => {
     const regionCode = 'us-east-1'
     const regionName = 'US East (N. Virginia)'
+    const testNode = new RegionNode(new RegionInfo(regionCode, regionName))
 
-    // Validates we tagged the node correctly
     it('initializes name and tooltip', async () => {
-        const testNode = new DefaultRegionNode(new RegionInfo(regionCode, regionName))
-
         assert.strictEqual(testNode.label, regionName)
         assert.strictEqual(testNode.tooltip, `${regionName} [${regionCode}]`)
     })
+
+    it('contains children', async () => {
+        const childNodes = await testNode.getChildren()
+        assert.ok(childNodes.length > 0, 'Expected region node to have child nodes')
+    })
 })