feat(cloudformation): Add latest parameter validation and drift detection fixes

- Allow empty string in parameter validation (#175)
- Enable drift columns with change set level flag (#174)

Author: kddejong

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

@@ -142,7 +142,14 @@ export function viewChangeSetCommand(client: LanguageClient, diffProvider: DiffW
                 stackName: params.stackName,
             })
 
-            void diffProvider.updateData(params.stackName, describeChangeSetResult.changes, params.changeSetName, true)
+            void diffProvider.updateData(
+                params.stackName,
+                describeChangeSetResult.changes,
+                params.changeSetName,
+                true,
+                [],
+                describeChangeSetResult.deploymentMode
+            )
             void commands.executeCommand(commandKey('diff.focus'))
         } catch (error) {
             await handleLspError(error, 'Error viewing change set')

packages/core/src/awsService/cloudformation/stacks/actions/stackActionInputValidation.ts

@@ -57,10 +57,6 @@ export function validateChangeSetName(value: string): string | undefined {
 }
 
 export function validateParameterValue(input: string, param: TemplateParameter): string | undefined {
-    if (!input && !param.Default) {
-        return `Parameter ${param.name} is required`
-    }
-
     const actualValue = input ?? param.Default?.toString() ?? ''
 
     // Handle CommaDelimitedList validation

packages/core/src/awsService/cloudformation/stacks/actions/stackActionRequestType.ts

@@ -155,6 +155,7 @@ export type Failable = {
 export type DescribeValidationStatusResult = GetStackActionStatusResult &
     Failable & {
         ValidationDetails?: ValidationDetail[]
+        deploymentMode?: DeploymentMode
     }
 
 export type DescribeDeploymentStatusResult = GetStackActionStatusResult &
@@ -235,6 +236,7 @@ export type DescribeChangeSetParams = ChangeSetReference
 export type DescribeChangeSetResult = ChangeSetInfo & {
     stackName: string
     changes?: StackChange[]
+    deploymentMode?: DeploymentMode
 }
 
 export type StackInfo = {

packages/core/src/awsService/cloudformation/stacks/actions/validationWorkflow.ts

@@ -12,6 +12,7 @@ import {
     ResourceToImport,
     ChangeSetOptionalFlags,
     ValidationDetail,
+    DeploymentMode,
 } from './stackActionRequestType'
 import { LanguageClient } from 'vscode-languageclient/node'
 import { showErrorMessage, showValidationStarted, showValidationSuccess, showValidationFailure } from '../../ui/message'
@@ -114,7 +115,10 @@ export class Validation {
                             if (validationResult.state === StackActionState.SUCCESSFUL) {
                                 showValidationSuccess(this.stackName)
 
-                                this.showDiffView(describeValidationStatusResult.ValidationDetails ?? [])
+                                this.showDiffView(
+                                    describeValidationStatusResult.ValidationDetails,
+                                    describeValidationStatusResult.deploymentMode
+                                )
                             } else {
                                 showValidationFailure(
                                     this.stackName,
@@ -152,13 +156,14 @@ export class Validation {
         }, 1000)
     }
 
-    private showDiffView(validationDetail?: ValidationDetail[]) {
+    private showDiffView(validationDetail?: ValidationDetail[], deploymentMode?: DeploymentMode) {
         void this.diffProvider.updateData(
             this.stackName,
             this.changes,
             this.changeSetName,
             this.shouldEnableDeployment,
-            validationDetail
+            validationDetail,
+            deploymentMode
         )
         void commands.executeCommand(commandKey('diff.focus'))
     }

packages/core/src/awsService/cloudformation/ui/diffWebviewProvider.ts

@@ -4,7 +4,7 @@
  */
 
 import { WebviewView, WebviewViewProvider, commands, Disposable } from 'vscode'
-import { StackChange, ValidationDetail } from '../stacks/actions/stackActionRequestType'
+import { DeploymentMode, StackChange, ValidationDetail } from '../stacks/actions/stackActionRequestType'
 import { DiffViewHelper } from './diffViewHelper'
 import { commandKey } from '../utils'
 import { StackViewCoordinator } from './stackViewCoordinator'
@@ -23,6 +23,7 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
     private totalPages: number = 0
     private readonly disposables: Disposable[] = []
     private validationDetail: ValidationDetail[] = []
+    private deploymentMode?: DeploymentMode
 
     constructor(private readonly coordinator: StackViewCoordinator) {
         this.disposables.push(
@@ -44,7 +45,8 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
         changes: StackChange[] = [],
         changeSetName?: string,
         enableDeployments = false,
-        validationDetail?: ValidationDetail[]
+        validationDetail?: ValidationDetail[],
+        deploymentMode?: DeploymentMode
     ) {
         this.stackName = stackName
         this.changes = changes
@@ -55,6 +57,7 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
         if (validationDetail) {
             this.validationDetail = validationDetail
         }
+        this.deploymentMode = deploymentMode
 
         await this.coordinator.setChangeSetMode(stackName, true)
         if (this._view) {
@@ -139,15 +142,18 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
             `
         }
 
-        // Check if any resource has drift
+        // Check if REVERT_DRIFT change set or any resource has drift
         // TODO: adapt if we do real backend pagination
-        const hasDrift = changes.some(
-            (change) =>
-                change.resourceChange?.resourceDriftStatus ||
-                change.resourceChange?.details?.some(
-                    (detail) => detail.Target?.Drift || detail.Target?.LiveResourceDrift
-                )
-        )
+        // TODO: remove resource fallback once server is passing deploymentMode
+        const hasDrift =
+            this.deploymentMode === DeploymentMode.REVERT_DRIFT ||
+            changes.some(
+                (change) =>
+                    change.resourceChange?.resourceDriftStatus ||
+                    change.resourceChange?.details?.some(
+                        (detail) => detail.Target?.Drift || detail.Target?.LiveResourceDrift
+                    )
+            )
 
         let tableHtml = `
             <table style="width: 100%; border-collapse: collapse; border: 1px solid var(--vscode-panel-border);">

packages/core/src/test/awsService/cloudformation/stacks/actions/stackActionInputValidation.test.ts

@@ -66,6 +66,15 @@ describe('validateParameterValue', function () {
             assert.strictEqual(validateParameterValue('2', param), undefined)
             assert.strictEqual(validateParameterValue('3', param), 'Value must be one of: 1, 2')
         })
+
+        it('should handle empty string values', function () {
+            const param: TemplateParameter = {
+                name: 'TestParam',
+                Type: 'String',
+            }
+
+            assert.strictEqual(validateParameterValue('', param), undefined)
+        })
     })
 
     describe('Number parameters', function () {

packages/core/src/test/awsService/cloudformation/ui/diffWebviewProvider.test.ts

@@ -6,7 +6,10 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { DiffWebviewProvider } from '../../../../awsService/cloudformation/ui/diffWebviewProvider'
-import { StackChange } from '../../../../awsService/cloudformation/stacks/actions/stackActionRequestType'
+import {
+    DeploymentMode,
+    StackChange,
+} from '../../../../awsService/cloudformation/stacks/actions/stackActionRequestType'
 
 describe('DiffWebviewProvider', function () {
     let sandbox: sinon.SinonSandbox
@@ -288,5 +291,23 @@ describe('DiffWebviewProvider', function () {
             assert.ok(html.includes('live-value'))
             assert.ok(html.includes('⚠️ Modified'))
         })
+
+        it('should show drift status column when deploymentMode is REVERT_DRIFT', function () {
+            const changes: StackChange[] = [
+                {
+                    resourceChange: {
+                        action: 'Modify',
+                        logicalResourceId: 'Resource',
+                    },
+                },
+            ]
+
+            void provider.updateData('test-stack', changes, undefined, false, undefined, DeploymentMode.REVERT_DRIFT)
+            const mockWebview = createMockWebview()
+            provider.resolveWebviewView(mockWebview as any)
+            const html = mockWebview.webview.html
+
+            assert.ok(html.includes('Drift Status'))
+        })
     })
 })