feat(cloudformation): Additional CloudFormation features and improvements

* Remove resource type from list using right click
* Few startup fixes for CloudFormation extension
* Add exec permissions and support node versions
* Add node to AWS Explorer CFN panel
* Add prompt for deploymentMode and plumb to deployment
* Coordinate stack views and add overview to CFN console
* Fix extract to parameter cursor command

Author: kddejong

packages/core/src/awsService/cloudformation/cfn/resourceRequestTypes.ts

@@ -42,6 +42,8 @@ export const ResourceTypesRequest = new RequestType<ResourceTypesParams, Resourc
     'aws/cfn/resources/types'
 )
 
+export const RemoveResourceTypeRequest = new RequestType<string, void, void>('aws/cfn/resources/list/remove')
+
 export type ResourceSelection = {
     resourceType: string
     resourceIdentifiers: string[]

packages/core/src/awsService/cloudformation/commands/cfnCommands.ts

@@ -4,7 +4,7 @@
  */
 
 import { commands, env, Uri, window, workspace, Range, Selection, TextEditorRevealType, ProgressLocation } from 'vscode'
-import { commandKey, extractErrorMessage, findParameterDescriptionPosition } from '../utils'
+import { commandKey, extractErrorMessage, findParameterDescriptionPosition, isStackInTransientState } from '../utils'
 import { LanguageClient } from 'vscode-languageclient/node'
 import { Command } from 'vscode-languageclient/node'
 import * as yaml from 'js-yaml'
@@ -25,15 +25,14 @@ import {
     getOnStackFailure,
     getIncludeNestedStacks,
     getImportExistingResources,
+    getDeploymentMode,
     shouldUploadToS3,
     getS3Bucket,
     getS3Key,
     shouldSaveFlagsToFile,
     getFilePath,
 } from '../ui/inputBox'
-import { setContext } from '../../../shared/vscode/setContext'
 import { DiffWebviewProvider } from '../ui/diffWebviewProvider'
-import { StackResourcesWebviewProvider } from '../ui/stackResourcesWebviewProvider'
 import { showErrorMessage } from '../ui/message'
 import { getLastValidation, setLastValidation, Validation } from '../stacks/actions/validationWorkflow'
 import {
@@ -49,21 +48,23 @@ import {
     TemplateParameter,
     ResourceToImport,
     ChangeSetReference,
+    DeploymentMode,
 } from '../stacks/actions/stackActionRequestType'
-import { StackInfo } from '../stacks/actions/stackActionRequestType'
 import { ResourceNode } from '../explorer/nodes/resourceNode'
 import { ResourcesManager } from '../resources/resourcesManager'
 import { RelatedResourcesManager } from '../relatedResources/relatedResourcesManager'
 import { DocumentManager } from '../documents/documentManager'
 import { CfnEnvironmentManager } from '../cfn-init/cfnEnvironmentManager'
 
 import { StackOverviewWebviewProvider } from '../ui/stackOverviewWebviewProvider'
-import { StackEventsWebviewProvider } from '../ui/stackEventsWebviewProvider'
 import { StackOutputsWebviewProvider } from '../ui/stackOutputsWebviewProvider'
+import { StackResourcesWebviewProvider } from '../ui/stackResourcesWebviewProvider'
+import { StackViewCoordinator } from '../ui/stackViewCoordinator'
 import { ResourceContextValue } from '../explorer/contextValue'
 import { getLogger } from '../../../shared/logger/logger'
 import { CloudFormationExplorer } from '../explorer/explorer'
 import { StacksNode } from '../explorer/nodes/stacksNode'
+import { StackNode } from '../explorer/nodes/stackNode'
 import { ResourcesNode } from '../explorer/nodes/resourcesNode'
 import { ResourceTypeNode } from '../explorer/nodes/resourceTypeNode'
 import { StackChangeSetsNode } from '../explorer/nodes/stackChangeSetsNode'
@@ -72,7 +73,6 @@ import { CfnInitUiInterface } from '../cfn-init/cfnInitUiInterface'
 import { ChangeSetDeletion } from '../stacks/actions/changeSetDeletionWorkflow'
 import { fs } from '../../../shared/fs/fs'
 import { convertParametersToRecord, convertTagsToRecord } from '../cfn-init/utils'
-import { StackNode } from '../explorer/nodes/stackNode'
 import { DescribeStackRequest } from '../stacks/actions/stackActionProtocol'
 
 export function validateDeploymentCommand(
@@ -127,12 +127,12 @@ export function deployTemplateFromStacksMenuCommand() {
     })
 }
 
-export function executeChangeSetCommand(client: LanguageClient) {
+export function executeChangeSetCommand(client: LanguageClient, coordinator: StackViewCoordinator) {
     return commands.registerCommand(
         commandKey('api.executeChangeSet'),
         async (stackName: string, changeSetName: string) => {
             try {
-                const deployment = new Deployment(stackName, changeSetName, client)
+                const deployment = new Deployment(stackName, changeSetName, client, coordinator)
 
                 await deployment.deploy()
             } catch (error) {
@@ -174,9 +174,7 @@ export function viewChangeSetCommand(client: LanguageClient, diffProvider: DiffW
                 stackName: params.stackName,
             })
 
-            void setContext('aws.cloudformation.stacks.diffVisible', true)
-
-            diffProvider.updateData(params.stackName, describeChangeSetResult.changes, params.changeSetName, true)
+            void diffProvider.updateData(params.stackName, describeChangeSetResult.changes, params.changeSetName, true)
             void commands.executeCommand(commandKey('diff.focus'))
         } catch (error) {
             showErrorMessage(`Error viewing change set: ${extractErrorMessage(error)}`)
@@ -259,6 +257,18 @@ type OptionalFlagSelection = ChangeSetOptionalFlags & {
     shouldSaveOptions?: boolean
 }
 
+function shouldPromptForDeploymentMode(
+    stackDetails: Stack | undefined,
+    importExistingResources: boolean | undefined,
+    includeNestedStacks: boolean | undefined,
+    onStackFailure: OnStackFailure | undefined
+): boolean {
+    const isCreate = !stackDetails
+    const hasDisableRollback = onStackFailure === OnStackFailure.DO_NOTHING
+
+    return !isCreate && !importExistingResources && !includeNestedStacks && !hasDisableRollback
+}
+
 export async function promptForOptionalFlags(
     fileFlags?: ChangeSetOptionalFlags,
     stackDetails?: Stack
@@ -281,29 +291,60 @@ export async function promptForOptionalFlags(
                 includeNestedStacks: fileFlags?.includeNestedStacks,
                 tags: fileFlags?.tags,
                 importExistingResources: fileFlags?.importExistingResources,
+                // default to REVERT_DRIFT if possible because it's generally useful
+                deploymentMode:
+                    fileFlags?.deploymentMode ??
+                    (shouldPromptForDeploymentMode(
+                        stackDetails,
+                        fileFlags?.importExistingResources,
+                        fileFlags?.includeNestedStacks,
+                        fileFlags?.onStackFailure
+                    )
+                        ? DeploymentMode.REVERT_DRIFT
+                        : undefined),
                 shouldSaveOptions: false,
             }
 
             break
-        case OptionalFlagMode.Input:
+        case OptionalFlagMode.Input: {
+            const onStackFailure = fileFlags?.onStackFailure ?? (await getOnStackFailure(!!stackDetails))
+            const includeNestedStacks = fileFlags?.includeNestedStacks ?? (await getIncludeNestedStacks())
+            const importExistingResources = fileFlags?.importExistingResources ?? (await getImportExistingResources())
+
+            let deploymentMode = fileFlags?.deploymentMode
+            if (
+                !deploymentMode &&
+                shouldPromptForDeploymentMode(
+                    stackDetails,
+                    importExistingResources,
+                    includeNestedStacks,
+                    onStackFailure
+                )
+            ) {
+                deploymentMode = await getDeploymentMode()
+            }
+
             optionalFlags = {
-                onStackFailure: fileFlags?.onStackFailure ?? (await getOnStackFailure()),
-                includeNestedStacks: fileFlags?.includeNestedStacks ?? (await getIncludeNestedStacks()),
+                onStackFailure,
+                includeNestedStacks,
                 tags: fileFlags?.tags ?? (await getTags(stackDetails?.Tags)),
-                importExistingResources: fileFlags?.importExistingResources ?? (await getImportExistingResources()),
+                importExistingResources,
+                deploymentMode,
             }
 
             if (!fileFlags && Object.values(optionalFlags).some((val) => val !== undefined)) {
                 optionalFlags.shouldSaveOptions = true
             }
 
             break
+        }
         case OptionalFlagMode.DevFriendly:
             optionalFlags = {
                 onStackFailure: OnStackFailure.DO_NOTHING,
                 includeNestedStacks: true,
                 tags: fileFlags?.tags ?? (await getTags(stackDetails?.Tags)),
                 importExistingResources: true,
+                deploymentMode: undefined,
             }
 
             if (!fileFlags && optionalFlags.tags) {
@@ -341,6 +382,7 @@ export async function promptToSaveToFile(
         'on-stack-failure': optionalFlags?.onStackFailure,
         'include-nested-stacks': optionalFlags?.includeNestedStacks,
         'import-existing-resources': optionalFlags?.importExistingResources,
+        'deployment-mode': optionalFlags?.deploymentMode,
     }
 
     // Determine file type and format accordingly
@@ -590,23 +632,17 @@ async function getTemplateParameters(client: LanguageClient, templateUri: string
     }
 }
 
-export const SelectResourceTypeCommand: Command = {
-    title: 'Select Resource Types',
-    command: commandKey('api.selectResourceTypes'),
-    arguments: [],
-}
-
-export function selectResourceTypesCommand(resourcesManager: ResourcesManager) {
+export function addResourceTypesCommand(resourcesManager: ResourcesManager) {
     return commands.registerCommand(
-        commandKey('api.selectResourceTypes'),
+        commandKey('api.addResourceTypes'),
         async () => await resourcesManager.selectResourceTypes()
     )
 }
 
-export function addResourceTypesCommand(resourcesManager: ResourcesManager) {
+export function removeResourceTypeCommand(resourcesManager: ResourcesManager) {
     return commands.registerCommand(
-        commandKey('api.addResourceTypes'),
-        async () => await resourcesManager.selectResourceTypes()
+        commandKey('removeResourceType'),
+        async (node: ResourceTypeNode) => await resourcesManager.removeResourceType(node.typeName)
     )
 }
 
@@ -684,24 +720,6 @@ export function refreshResourceListCommand(resourcesManager: ResourcesManager, e
     })
 }
 
-export function viewStackDiffCommand() {
-    return commands.registerCommand(commandKey('stacks.viewDiff'), () => {
-        void setContext('aws.cloudformation.stacks.diffVisible', true)
-        void commands.executeCommand(commandKey('diff.focus'))
-    })
-}
-
-export function viewStackDetailCommand(resourcesProvider: StackResourcesWebviewProvider) {
-    return commands.registerCommand(commandKey('stacks.viewDetail'), async (node?: any) => {
-        void setContext('aws.cloudformation.stacks.detailVisible', true)
-
-        const stackName = node?.stackName || 'Unknown Stack'
-
-        await resourcesProvider.updateData(stackName)
-        void commands.executeCommand(commandKey('detail.focus'))
-    })
-}
-
 export function focusDiffCommand() {
     return commands.registerCommand(commandKey('diff.focus'), () => {
         void commands.executeCommand('workbench.view.extension.cfn-diff')
@@ -714,7 +732,7 @@ export function getStackManagementInfoCommand(resourcesManager: ResourcesManager
     })
 }
 
-export function extractToParameterPositionCursorCommand() {
+export function extractToParameterPositionCursorCommand(client: LanguageClient) {
     return commands.registerCommand(
         'aws.cloudformation.extractToParameter.positionCursor',
         async (
@@ -725,9 +743,12 @@ export function extractToParameterPositionCursorCommand() {
             actionType?: string
         ) => {
             try {
-                // Track code action acceptance if tracking parameters provided
+                // Track code action acceptance on the server if tracking parameters provided
                 if (trackingCommand && actionType) {
-                    await commands.executeCommand(trackingCommand, actionType)
+                    await client.sendRequest('workspace/executeCommand', {
+                        command: trackingCommand,
+                        arguments: [actionType],
+                    })
                 }
 
                 const uri = Uri.parse(documentUri)
@@ -846,23 +867,37 @@ export function loadMoreChangeSetsCommand(explorer: CloudFormationExplorer) {
     })
 }
 
-export function showStackOverviewCommand(overviewProvider: StackOverviewWebviewProvider) {
-    return commands.registerCommand(commandKey('api.showStackOverview'), async (stack: StackInfo) => {
-        await overviewProvider.showStackOverview(stack)
-    })
-}
+export function viewStackCommand(
+    coordinator: StackViewCoordinator,
+    overviewProvider: StackOverviewWebviewProvider,
+    outputsProvider: StackOutputsWebviewProvider,
+    resourcesProvider: StackResourcesWebviewProvider
+) {
+    return commands.registerCommand(commandKey('stack.view'), async (node?: StackNode) => {
+        let stackName: string | undefined
 
-export function showStackEventsCommand(eventsProvider: StackEventsWebviewProvider) {
-    return commands.registerCommand(commandKey('stack.events.show'), async (stackName: string) => {
-        await eventsProvider.showStackEvents(stackName)
-        await commands.executeCommand(commandKey('stack.events.focus'))
-    })
-}
+        if (node?.stack.StackName) {
+            stackName = node.stack.StackName
+        } else {
+            stackName = await getStackName()
+            if (!stackName) {
+                return
+            }
+        }
+
+        await coordinator.setStack(stackName)
+
+        await overviewProvider.showStackOverview(stackName)
+
+        const stackStatus = coordinator.currentStackStatus
+
+        await resourcesProvider.updateData(stackName)
+
+        if (stackStatus && !isStackInTransientState(stackStatus)) {
+            await outputsProvider.showOutputs(stackName)
+        }
 
-export function showStackOutputsCommand(outputsProvider: StackOutputsWebviewProvider) {
-    return commands.registerCommand(commandKey('stack.outputs.show'), async (stackName: string) => {
-        await outputsProvider.showOutputs(stackName)
-        await commands.executeCommand(commandKey('stack.outputs.focus'))
+        await commands.executeCommand(commandKey('stack.overview.focus'))
     })
 }
 

packages/core/src/awsService/cloudformation/commands/lspCommands.ts

@@ -6,11 +6,6 @@
 import { TreeItemCollapsibleState, ThemeIcon, ThemeColor } from 'vscode'
 import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
 import { StackSummary } from '@aws-sdk/client-cloudformation'
-import { StackStatusNode } from './stackStatusNode'
-import { StackOverviewNode } from './stackOverviewNode'
-import { StackEventsNode } from './stackEventsNode'
-import { StackOutputsNode } from './stackOutputsNode'
-import { StackResourcesNode } from './stackResourcesNode'
 import { StackChangeSetsNode } from './stackChangeSetsNode'
 import { ChangeSetsManager } from '../../stacks/changeSetsManager'
 
@@ -43,18 +38,9 @@ export class StackNode extends AWSTreeNodeBase {
 
     public override async getChildren(): Promise<AWSTreeNodeBase[]> {
         const stackName = this.stack.StackName ?? ''
-        const stackStatus = this.stack.StackStatus ?? 'UNKNOWN'
 
-        // Pre-load change sets to get accurate count
         await this.changeSetsManager.getChangeSets(stackName)
 
-        return [
-            new StackStatusNode(stackStatus),
-            new StackOverviewNode(this.stack),
-            new StackEventsNode(stackName),
-            new StackOutputsNode(stackName),
-            new StackResourcesNode(stackName),
-            new StackChangeSetsNode(stackName, this.changeSetsManager),
-        ]
+        return [new StackChangeSetsNode(stackName, this.changeSetsManager)]
     }
 }