Remove override/V2 SDK (#286)

Author: atennak1

assets/featureFlag/prod.json

@@ -6,9 +6,39 @@
       "enabled": false
     },
     "EnhancedDryRun": {
-      "enabled": false,
+      "enabled": true,
       "fleetPercentage": 100,
-      "allowlistedRegions": []
+      "allowlistedRegions": [
+        "us-east-1",
+        "us-east-2",
+        "us-west-1",
+        "us-west-2",
+        "ca-central-1",
+        "ca-west-1",
+        "sa-east-1",
+        "eu-north-1",
+        "eu-west-1",
+        "eu-west-2",
+        "eu-west-3",
+        "eu-central-1",
+        "eu-central-2",
+        "eu-south-1",
+        "eu-south-2",
+        "ap-east-1",
+        "ap-south-1",
+        "ap-south-2",
+        "ap-northeast-1",
+        "ap-northeast-2",
+        "ap-northeast-3",
+        "ap-southeast-1",
+        "ap-southeast-2",
+        "ap-southeast-3",
+        "ap-southeast-4",
+        "me-south-1",
+        "me-central-1",
+        "af-south-1",
+        "il-central-1"
+      ]
     }
   }
 }

package-lock.json

@@ -45,12 +45,12 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudcontrol": "3.873.0",
-    "@aws-sdk/client-cloudformation": "3.873.0",
-    "@aws-sdk/client-iam": "3.873.0",
-    "@aws-sdk/client-s3": "3.873.0",
-    "@aws-sdk/client-sts": "3.873.0",
-    "@aws-sdk/credential-provider-node": "3.873.0",
+    "@aws-sdk/client-cloudcontrol": "3.934.0",
+    "@aws-sdk/client-cloudformation": "3.934.0",
+    "@aws-sdk/client-iam": "3.934.0",
+    "@aws-sdk/client-s3": "3.934.0",
+    "@aws-sdk/client-sts": "3.934.0",
+    "@aws-sdk/credential-provider-node": "3.934.0",
     "@base2/pretty-print-object": "1.0.2",
     "@langchain/anthropic": "0.3.26",
     "@langchain/aws": "0.1.14",

package.json

@@ -23,10 +23,8 @@ import {
 } from '../stacks/actions/StackActionRequestType';
 import { StackActionWorkflow } from '../stacks/actions/StackActionWorkflowType';
 import { ValidationWorkflow } from '../stacks/actions/ValidationWorkflow';
-import { ValidationWorkflowV2 } from '../stacks/actions/ValidationWorkflowV2';
 import { StackEventManager } from '../stacks/StackEventManager';
 import { StackManager } from '../stacks/StackManager';
-import { localCfnClientExists } from '../utils/ClientUtil';
 import { Closeable, closeSafely } from '../utils/Closeable';
 import { Configurable, Configurables } from '../utils/Configurable';
 import { CfnExternal } from './CfnExternal';
@@ -63,10 +61,7 @@ export class CfnLspProviders implements Configurables, Closeable {
         this.stackManager = overrides.stackManager ?? new StackManager(external.cfnService);
         this.stackEventManager = overrides.stackEventManager ?? new StackEventManager(external.cfnService);
         this.validationWorkflowService =
-            overrides.validationWorkflowService ??
-            (localCfnClientExists()
-                ? ValidationWorkflowV2.create(core, external, core.validationManager)
-                : ValidationWorkflow.create(core, external, core.validationManager));
+            overrides.validationWorkflowService ?? ValidationWorkflow.create(core, external, core.validationManager);
         this.deploymentWorkflowService =
             overrides.deploymentWorkflowService ?? DeploymentWorkflow.create(core, external);
         this.changeSetDeletionWorkflowService =

src/server/CfnLspProviders.ts

@@ -18,6 +18,8 @@ import {
     DeleteStackCommandOutput,
     DetectStackDriftCommand,
     DetectStackDriftCommandOutput,
+    DescribeEventsCommand,
+    DescribeEventsCommandOutput,
     DescribeStackEventsCommand,
     DescribeStackEventsCommandOutput,
     DescribeStackResourcesCommand,
@@ -193,6 +195,40 @@ export class CfnService {
         });
     }
 
+    @Count({ name: 'describeEvents' })
+    public async describeEvents(params: {
+        ChangeSetName: string;
+        StackName: string;
+    }): Promise<DescribeEventsCommandOutput> {
+        return await this.withClient(async (client) => {
+            let nextToken: string | undefined;
+            let result: DescribeEventsCommandOutput | undefined;
+            const operationEvents: DescribeEventsCommandOutput['OperationEvents'] = [];
+
+            do {
+                const response = (await client.send(
+                    new DescribeEventsCommand({
+                        ...params,
+                        NextToken: nextToken,
+                    }),
+                )) as unknown as DescribeEventsCommandOutput;
+
+                if (result) {
+                    operationEvents.push(...(response.OperationEvents ?? []));
+                } else {
+                    result = response;
+                    operationEvents.push(...(result.OperationEvents ?? []));
+                }
+
+                nextToken = response.NextToken;
+            } while (nextToken);
+
+            result.OperationEvents = operationEvents;
+            result.NextToken = undefined;
+            return result;
+        });
+    }
+
     @Count({ name: 'describeStackResources' })
     public async describeStackResources(params: {
         StackName?: string;

src/services/CfnService.ts

@@ -1,4 +1,12 @@
-import { Change, ChangeSetType, StackStatus, OnStackFailure } from '@aws-sdk/client-cloudformation';
+import {
+    Change,
+    ChangeSetType,
+    DescribeEventsCommandOutput,
+    StackStatus,
+    OnStackFailure,
+    EventType,
+    HookFailureMode,
+} from '@aws-sdk/client-cloudformation';
 import { WaiterState } from '@smithy/util-waiter';
 import { dump } from 'js-yaml';
 import { DateTime } from 'luxon';
@@ -11,7 +19,6 @@ import { SyntaxTreeManager } from '../../context/syntaxtree/SyntaxTreeManager';
 import { DocumentType } from '../../document/Document';
 import { DocumentManager } from '../../document/DocumentManager';
 import { CfnService } from '../../services/CfnService';
-import { DescribeEventsOutput, ChangeV2 } from '../../services/CfnServiceV2';
 import { DiagnosticCoordinator } from '../../services/DiagnosticCoordinator';
 import { S3Service } from '../../services/S3Service';
 import { LoggerFactory } from '../../telemetry/LoggerFactory';
@@ -299,12 +306,9 @@ export async function deleteChangeSet(
     }
 }
 
-export function mapChangesToStackChanges(changes?: Change[]): StackChange[] | undefined;
-export function mapChangesToStackChanges(changes?: ChangeV2[]): StackChange[] | undefined;
-export function mapChangesToStackChanges(changes?: Change[] | ChangeV2[]): StackChange[] | undefined {
-    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
-    return changes?.map((change: Change | ChangeV2) => {
-        const resourceChange = change.ResourceChange as any;
+export function mapChangesToStackChanges(changes?: Change[]): StackChange[] | undefined {
+    return changes?.map((change: Change) => {
+        const resourceChange = change.ResourceChange;
         return {
             type: change.Type,
             resourceChange: resourceChange
@@ -339,20 +343,21 @@ export function processWorkflowUpdates(
     return existingWorkflow;
 }
 
-export function parseValidationEvents(events: DescribeEventsOutput, validationName: string): ValidationDetail[] {
-    const validEvents = events.OperationEvents.filter((event) => event.EventType === 'VALIDATION_ERROR');
+export function parseValidationEvents(events: DescribeEventsCommandOutput, validationName: string): ValidationDetail[] {
+    const validEvents = events.OperationEvents?.filter((event) => event.EventType === EventType.VALIDATION_ERROR);
 
-    return validEvents.map((event) => {
-        const timestamp = event.Timestamp instanceof Date ? event.Timestamp.toISOString() : event.Timestamp;
-        return {
-            Timestamp: DateTime.fromISO(timestamp),
-            ValidationName: validationName,
-            LogicalId: event.LogicalResourceId,
-            Message: [event.ValidationName, event.ValidationStatusReason].filter(Boolean).join(': '),
-            Severity: event.ValidationFailureMode === 'FAIL' ? 'ERROR' : 'INFO',
-            ResourcePropertyPath: event.ValidationPath,
-        };
-    });
+    return (
+        validEvents?.map((event) => {
+            return {
+                Timestamp: event.Timestamp ? DateTime.fromISO(event.Timestamp.toISOString()) : undefined,
+                ValidationName: validationName,
+                LogicalId: event.LogicalResourceId,
+                Message: [event.ValidationName, event.ValidationStatusReason].filter(Boolean).join(': '),
+                Severity: event.ValidationFailureMode === HookFailureMode.FAIL ? 'ERROR' : 'INFO',
+                ResourcePropertyPath: event.ValidationPath,
+            };
+        }) ?? []
+    );
 }
 
 export async function publishValidationDiagnostics(