Merge #2499

Author: justinmk3

src/dynamicResources/explorer/nodes/resourcesNode.ts

@@ -15,6 +15,7 @@ import { ResourceTypeNode } from './resourceTypeNode'
 import { CloudFormation } from 'aws-sdk'
 import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
 import { memoizedGetResourceTypes, ResourceTypeMetadata } from '../../model/resources'
+import { isCloud9 } from '../../../shared/extensionUtilities'
 import globals from '../../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
@@ -62,7 +63,7 @@ export class ResourcesNode extends AWSTreeNodeBase {
     public async updateChildren(): Promise<void> {
         const resourceTypes = memoizedGetResourceTypes()
         const configuredResources = vscode.workspace.getConfiguration('aws').get<string[]>('resources.enabledResources')
-        const enabledResources = configuredResources?.length ? configuredResources : resourceTypes.keys()
+        const enabledResources = configuredResources?.length || !isCloud9() ? configuredResources : resourceTypes.keys()
 
         if (enabledResources) {
             const availableTypes: Map<string, CloudFormation.TypeSummary> = toMap(

src/ecs/commands/runCommandInContainer.ts

@@ -20,6 +20,7 @@ import { removeAnsi } from '../../shared/utilities/textUtilities'
 import globals from '../../shared/extensionGlobals'
 import { CommandWizard } from '../wizards/executeCommand'
 import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { isCloud9 } from '../../shared/extensionUtilities'
 
 // Required SSM permissions for the task IAM role, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-enabling-and-using
 const REQUIRED_SSM_PERMISSIONS = [
@@ -77,7 +78,7 @@ export async function runCommandInContainer(
             settings.disablePrompt('ecsRunCommand')
         }
 
-        const ssmPlugin = await getOrInstallCli('session-manager-plugin', true, window, settings)
+        const ssmPlugin = await getOrInstallCli('session-manager-plugin', !isCloud9(), window, settings)
 
         status = vscode.window.setStatusBarMessage(
             localize('AWS.command.ecs.statusBar.executing', 'ECS: Executing command...')

src/test/dynamicResources/explorer/moreResourcesNode.test.ts

@@ -8,6 +8,7 @@ import * as vscode from 'vscode'
 import { ResourcesNode } from '../../../dynamicResources/explorer/nodes/resourcesNode'
 import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
 import { CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
+import { assertNodeListOnlyContainsPlaceholderNode } from '../../utilities/explorerNodeAssertions'
 import { asyncGenerator } from '../../utilities/collectionUtils'
 import { mock, instance, when } from 'ts-mockito'
 import { CloudFormation } from 'aws-sdk'
@@ -46,14 +47,14 @@ describe('ResourcesNode', function () {
         await setConfiguration(resourceTypes)
     })
 
-    it('shows all resources by default (if no resource types are configured)', async function () {
+    it('returns placeholder node if no resource types are enabled', async function () {
         const resourceTypes: string[] = []
 
         await setConfiguration(resourceTypes)
 
         const childNodes = await testNode.getChildren()
 
-        assert.ok(childNodes.length > 200)
+        assertNodeListOnlyContainsPlaceholderNode(childNodes)
     })
 
     it('has ResourceTypeNode child nodes', async function () {