Address comments

Author: chrisqm-dev

.github/workflows/post-beta-long-running.yml

@@ -1,4 +1,4 @@
-name: Post-Beta Long Running Tests
+name: Post-Release Long Running Tests
 run-name: Long Running Tests for ${{ github.event.release.tag_name }}
 
 on:
@@ -9,30 +9,38 @@ permissions:
   contents: read
 
 jobs:
-  check-beta-release:
+  check-release:
     runs-on: ubuntu-latest
     outputs:
-      is-beta: ${{ steps.check.outputs.is-beta }}
+      should-run: ${{ steps.check.outputs.should-run }}
+      duration: ${{ steps.check.outputs.duration }}
+      timeout: ${{ steps.check.outputs.timeout }}
     steps:
-      - name: Check if beta release
+      - name: Check release type
         id: check
         run: |
           TAG="${{ github.event.release.tag_name }}"
           if [[ "$TAG" =~ -beta$ ]]; then
-            echo "is-beta=true" >> $GITHUB_OUTPUT
+            echo "should-run=true" >> $GITHUB_OUTPUT
+            echo "duration=4h" >> $GITHUB_OUTPUT
+            echo "timeout=360" >> $GITHUB_OUTPUT
+          elif [[ "$TAG" =~ -alpha$ ]]; then
+            echo "should-run=true" >> $GITHUB_OUTPUT
+            echo "duration=20m" >> $GITHUB_OUTPUT
+            echo "timeout=60" >> $GITHUB_OUTPUT
           else
-            echo "is-beta=false" >> $GITHUB_OUTPUT
+            echo "should-run=false" >> $GITHUB_OUTPUT
           fi
 
   long-running-tests:
-    needs: check-beta-release
-    if: needs.check-beta-release.outputs.is-beta == 'true'
+    needs: check-release
+    if: needs.check-release.outputs.should-run == 'true'
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [18, 20, 22]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 360
+    timeout-minutes: ${{ fromJSON(needs.check-release.outputs.timeout) }}
     steps:
       - uses: actions/checkout@v5
         with:
@@ -44,6 +52,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Download release standalone
+        shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
@@ -57,11 +66,10 @@ jobs:
           gh release download "$TAG" --pattern "$PATTERN"
 
       - name: Extract standalone bundle
+        shell: bash
         run: |
-          if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
-            unzip *.zip
-          else
-            unzip *.zip
+          unzip *.zip
+          if [[ "${{ matrix.os }}" != "windows-latest" ]]; then
             chmod +x cfn-lsp-server-standalone.js
           fi
 
@@ -73,15 +81,15 @@ jobs:
 
       - name: Run long-running stability tests
         env:
-          STABILITY_TEST_DURATION: 4h
+          STABILITY_TEST_DURATION: ${{ needs.check-release.outputs.duration }}
           STANDALONE_PATH: ./cfn-lsp-server-standalone.js
         run: npm run test:stability
 
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: long-running-test-results-${{ matrix.os }}
+          name: long-running-test-results-${{ matrix.os }}-node${{ matrix.node-version }}
           path: |
             test-results.json
             test-logs.txt

.gitignore

@@ -9,7 +9,6 @@
 *.node
 .DS_Store
 tools/*
-!tools/*/
 !tools/**/*.ts
 **/.aws-cfn-storage
 /oss-attribution

tools/lspClient/LspClient.ts

@@ -29,9 +29,12 @@ export class LspClient implements LspConnection {
     protected isShutdown = false;
     protected workspaceConfig: Record<string, unknown>[] = [{}];
 
-    constructor(protected config: LspClientConfig) {
+    private readonly suppressLevels: string[];
+
+    constructor(private readonly config: LspClientConfig) {
         this.createdAt = performance.now();
         this.encryptionKey = randomBytes(32);
+        this.suppressLevels = this.config.suppressLogLevels ?? ['INFO', 'DEBUG'];
     }
 
     async initialize(): Promise<void> {
@@ -100,9 +103,7 @@ export class LspClient implements LspConnection {
     private readonly onServerOutput = (data: Buffer) => {
         const output = data.toString().trim();
 
-        // Log filtering - keep for debugging
-        const suppressLevels = this.config.suppressLogLevels ?? ['INFO', 'DEBUG'];
-        const shouldSuppress = suppressLevels.some((level) => output.includes(`${level}:`));
+        const shouldSuppress = this.suppressLevels.some((level) => output.includes(`${level}:`));
 
         if (!shouldSuppress) {
             console.error(`[LSP Server]: ${output}`);

tools/stability/Config.ts

@@ -30,24 +30,6 @@ function parseSimpleArgs(): Partial<Config> {
     return args;
 }
 
-export function parseConfig(): Config {
-    // Start with environment variables (npm script support)
-    const envConfig = {
-        duration: process.env.STABILITY_TEST_DURATION ?? '4h',
-        maxRetries: Number.parseInt(process.env.MAX_RETRIES ?? '3'),
-        responseTimeout: Number.parseInt(process.env.RESPONSE_TIMEOUT ?? '5000'),
-        path: process.env.STANDALONE_PATH ?? './cfn-lsp-server-standalone.js',
-    };
-
-    // Override with command line arguments if provided
-    const cliArgs = parseSimpleArgs();
-
-    return {
-        ...envConfig,
-        ...cliArgs,
-    };
-}
-
 export function parseDuration(duration: string): number {
     const match = duration.match(/^(\d+)([hms])$/);
     if (!match) throw new Error(`Invalid duration format: ${duration}`);
@@ -70,3 +52,11 @@ export function parseDuration(duration: string): number {
         }
     }
 }
+
+export const config: Config = {
+    duration: process.env.STABILITY_TEST_DURATION ?? '4h',
+    maxRetries: Number.parseInt(process.env.MAX_RETRIES ?? '3'),
+    responseTimeout: Number.parseInt(process.env.RESPONSE_TIMEOUT ?? '5000'),
+    path: process.env.STANDALONE_PATH ?? './cfn-lsp-server-standalone.js',
+    ...parseSimpleArgs(),
+};

tools/stability/Monitoring.ts

@@ -1,4 +1,4 @@
-import { OperationType, getTesterConfig } from './testers/TesterTypes';
+import { OperationType, TESTER_CONFIG } from './testers/TesterTypes';
 
 export type TestMetrics = {
     operations: number;
@@ -83,7 +83,7 @@ export function generateFinalReport(testStartTime: number): void {
 
 export function checkPerformanceDegradation(): void {
     for (const [operationType, metric] of Object.entries(metrics) as [OperationType, TestMetrics][]) {
-        const config = getTesterConfig(operationType);
+        const config = TESTER_CONFIG[operationType];
 
         if (metric.averageDuration !== null && metric.averageDuration > config.avgDurationLimitMs) {
             throw new Error(

tools/stability/Templates.ts

@@ -1,25 +1,8 @@
-import { Templates } from '../../tst/utils/TemplateUtils';
+import { TemplateConfig, Templates } from '../../tst/utils/TemplateUtils';
 
-export interface TemplateConfig {
-    name: string;
-    content: string;
-}
-
-export const TEMPLATE_CONFIGS: TemplateConfig[] = [
-    {
-        name: 'sample.yaml',
-        content: Templates.sample.yaml.contents,
-    },
-    {
-        name: 'simple.yaml',
-        content: Templates.simple.yaml.contents,
-    },
-    {
-        name: 'comprehensive.yaml',
-        content: Templates.comprehensive.yaml.contents,
-    },
-    {
-        name: 'condition-usage.yaml',
-        content: Templates.conditionUsage.yaml.contents,
-    },
+export const TEST_TEMPLATES: TemplateConfig[] = [
+    Templates.sample.yaml,
+    Templates.simple.yaml,
+    Templates.comprehensive.yaml,
+    Templates.conditionUsage.yaml,
 ];

tools/stability/TestOrchestrator.ts

@@ -1,22 +1,22 @@
 import { LspClient } from '../lspClient/LspClient';
-import { parseConfig, parseDuration } from './Config';
+import { config, parseDuration } from './Config';
 import { initializeMonitoring, logProgress, checkPerformanceDegradation } from './Monitoring';
 import { HoverTester } from './testers/HoverTester';
 import { CompletionTester } from './testers/CompletionTester';
-import { TEMPLATE_CONFIGS } from './Templates';
+import { TEST_TEMPLATES } from './Templates';
 import { AwsRegion } from '../../src/utils/Region';
 import { WaitFor } from '../../tst/utils/Utils';
 import { existsSync } from 'fs';
 
 export class TestOrchestrator {
     private client!: LspClient;
-    private readonly config = parseConfig();
+    private readonly config = config;
     private startTime!: number;
     private endTime!: number;
     private hoverTester!: HoverTester;
     private completionTester!: CompletionTester;
 
-    private readonly templates = TEMPLATE_CONFIGS;
+    private readonly templates = TEST_TEMPLATES;
 
     private readonly testRegions = Object.values(AwsRegion).filter(
         (region) => region !== AwsRegion.ME_SOUTH_1 && region !== AwsRegion.ME_CENTRAL_1,
@@ -138,15 +138,15 @@ export class TestOrchestrator {
 
             // Test all templates for this region
             for (const template of this.templates) {
-                const uri = `file:///test/${template.name}`;
+                const uri = `file:///test/${template.fileName}`;
 
                 try {
-                    await this.client.openDocument(uri, template.content);
+                    await this.client.openDocument(uri, template.contents);
 
                     await this.validateLsp(uri);
 
                     // Revert document to original state after tests
-                    await this.client.updateDocument(uri, 6, template.content);
+                    await this.client.updateDocument(uri, 6, template.contents);
                 } finally {
                     try {
                         await this.client.closeDocument(uri);

tools/stability/testers/CompletionTester.ts

@@ -1,6 +1,6 @@
 import { LspClient } from '../../lspClient/LspClient';
 import { OperationTester, OperationType } from './TesterTypes';
-import { retryOperationWithPerformance } from './TesterCommon';
+import { retryOperationWithPerformance } from './TesterUtils';
 
 export class CompletionTester implements OperationTester {
     constructor(private readonly client: LspClient) {}

tools/stability/testers/HoverTester.ts

@@ -1,6 +1,6 @@
 import { LspClient } from '../../lspClient/LspClient';
 import { OperationTester, OperationType } from './TesterTypes';
-import { retryOperationWithPerformance } from './TesterCommon';
+import { retryOperationWithPerformance } from './TesterUtils';
 
 export class HoverTester implements OperationTester {
     constructor(private readonly client: LspClient) {}

tools/stability/testers/TesterTypes.ts

@@ -25,7 +25,3 @@ export const TESTER_CONFIG: Record<OperationType, TesterConfig> = {
         maxDurationLimitMs: 5000,
     },
 };
-
-export function getTesterConfig(operationType: OperationType): TesterConfig {
-    return TESTER_CONFIG[operationType];
-}