Merge branch 'main' into fix/extract-to-parameter

Author: atennak1

eslint.config.mjs

@@ -26,6 +26,7 @@ export default tseslint.config([
         '**/*.md',
         'src/services/guard/assets/**',
         'sbom/',
+        'vendor/',
     ]),
     eslint.configs.recommended,
     ...tseslint.configs.recommendedTypeChecked,

package-lock.json

@@ -37,6 +37,7 @@
     "bundle:beta": "rm -rf out && webpack --env mode=production --env env=beta",
     "bundle:prod": "rm -rf out && webpack --env mode=production --env env=prod",
     "download-wheels": "tsx tools/download-wheels.ts",
+    "build-cfn-guard": "tsx tools/build-cfn-guard.ts",
     "benchmark": "cross-env NODE_ENV=test AWS_ENV=alpha node --max-old-space-size=16384 --expose-gc -r ts-node/register tools/benchmark.ts",
     "generate-metrics": "cross-env NODE_ENV=development AWS_ENV=alpha node --max-old-space-size=16384 -r ts-node/register tools/telemetry-generator.ts",
     "debug-tree": "node -r ts-node/register tools/debug_tree.ts",
@@ -74,7 +75,7 @@
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
     "axios": "1.11.0",
-    "cfn-guard": "https://gitpkg.now.sh/aws-cloudformation/cloudformation-guard/guard/ts-lib?33d9931",
+    "cfn-guard": "file:./vendor/cfn-guard",
     "deep-object-diff": "1.1.9",
     "fast-deep-equal": "3.1.3",
     "fuse.js": "7.1.0",
@@ -151,7 +152,6 @@
     "@opentelemetry/sdk-trace-base",
     "@opentelemetry/sdk-trace-node",
     "@tree-sitter-grammars/tree-sitter-yaml",
-    "cfn-guard",
     "lmdb",
     "pino",
     "pino-pretty",

package.json

@@ -63,7 +63,7 @@ export class CfnExternal implements Configurables, Closeable {
             overrides.guardService ??
             new GuardService(core.documentManager, core.diagnosticCoordinator, core.syntaxTreeManager);
 
-        this.onlineStatus = overrides.onlineStatus ?? new OnlineStatus(core.clientMessage);
+        this.onlineStatus = overrides.onlineStatus ?? new OnlineStatus();
         this.featureFlags = overrides.featureFlags ?? new FeatureFlagProvider(getFromGitHub);
         this.onlineFeatureGuard = overrides.onlineFeatureGuard ?? new OnlineFeatureGuard(core.awsCredentials);
     }

src/server/CfnExternal.ts

@@ -1,14 +1,15 @@
 import { lookup } from 'node:dns/promises';
-import { MessageType } from 'vscode-languageserver-protocol';
-import { ClientMessage } from '../telemetry/ClientMessage';
+import { LoggerFactory } from '../telemetry/LoggerFactory';
 import { Closeable } from '../utils/Closeable';
 
+const logger = LoggerFactory.getLogger('OnlineStatus');
+
 export class OnlineStatus implements Closeable {
     private _isOnline: boolean = false;
     private notifiedOnce: boolean = false;
     private readonly timeout: NodeJS.Timeout;
 
-    constructor(private readonly clientMessage: ClientMessage) {
+    constructor() {
         void this.hasInternet();
 
         this.timeout = setInterval(
@@ -26,21 +27,14 @@ export class OnlineStatus implements Closeable {
         } catch {
             this._isOnline = false;
         } finally {
-            await this.notify();
+            this.notify();
         }
     }
 
-    private async notify() {
+    private notify() {
         if (!this.notifiedOnce && !this._isOnline) {
-            try {
-                await this.clientMessage.showMessageNotification(
-                    MessageType.Warning,
-                    'Internet connection lost. Some AWS CloudFormation features may not work properly.',
-                );
-                this.notifiedOnce = true;
-            } catch {
-                // Nothing to do here
-            }
+            logger.warn('Internet connection lost. Some AWS CloudFormation features may not work properly.');
+            this.notifiedOnce = true;
         }
     }
 

src/services/OnlineStatus.ts

@@ -83,7 +83,7 @@ export class CfnLintService implements SettingsConfigurable, Closeable {
     ) {
         this.settings = DefaultSettings.diagnostics.cfnLint;
         this.delayer = delayer ?? new Delayer<void>(this.settings.delayMs);
-        this.workerManager = workerManager ?? new PyodideWorkerManager(this.settings.initialization);
+        this.workerManager = workerManager ?? new PyodideWorkerManager(this.settings.initialization, this.settings);
     }
 
     configure(settingsManager: ISettingsSubscriber): void {
@@ -103,6 +103,7 @@ export class CfnLintService implements SettingsConfigurable, Closeable {
 
     private onSettingsChanged(newSettings: CfnLintSettings): void {
         this.settings = newSettings;
+        this.workerManager.updateSettings(newSettings);
         // Note: Delayer delay is immutable, set at construction time
         // The new delayMs will be used for future operations that check this.settings.delayMs
     }

src/services/cfnLint/CfnLintService.ts

@@ -2,7 +2,7 @@ import path from 'path';
 import { Worker } from 'worker_threads';
 import { PublishDiagnosticsParams } from 'vscode-languageserver';
 import { CloudFormationFileType } from '../../document/Document';
-import { CfnLintInitializationSettings } from '../../settings/Settings';
+import { CfnLintInitializationSettings, CfnLintSettings } from '../../settings/Settings';
 import { LoggerFactory } from '../../telemetry/LoggerFactory';
 import { retryWithExponentialBackoff } from '../../utils/Retry';
 import { WorkerNotInitializedError } from './CfnLintErrors';
@@ -33,6 +33,7 @@ export class PyodideWorkerManager {
 
     constructor(
         private readonly retryConfig: CfnLintInitializationSettings,
+        private cfnLintSettings: CfnLintSettings,
         private readonly log = LoggerFactory.getLogger(PyodideWorkerManager),
     ) {}
 
@@ -169,15 +170,29 @@ export class PyodideWorkerManager {
         uri: string,
         fileType: CloudFormationFileType,
     ): Promise<PublishDiagnosticsParams[]> {
-        return await this.executeTask<PublishDiagnosticsParams[]>('lint', { content, uri, fileType });
+        return await this.executeTask<PublishDiagnosticsParams[]>('lint', {
+            content,
+            uri,
+            fileType,
+            settings: this.cfnLintSettings,
+        });
     }
 
     public async lintFile(
         path: string,
         uri: string,
         fileType: CloudFormationFileType,
     ): Promise<PublishDiagnosticsParams[]> {
-        return await this.executeTask<PublishDiagnosticsParams[]>('lintFile', { path, uri, fileType });
+        return await this.executeTask<PublishDiagnosticsParams[]>('lintFile', {
+            path,
+            uri,
+            fileType,
+            settings: this.cfnLintSettings,
+        });
+    }
+
+    public updateSettings(settings: CfnLintSettings): void {
+        this.cfnLintSettings = settings;
     }
 
     public async mountFolder(fsDir: string, mountDir: string): Promise<void> {

src/services/cfnLint/PyodideWorkerManager.ts

@@ -54,6 +54,7 @@ if (parentPort) {
                         payload.content as string,
                         payload.uri as string,
                         payload.fileType as CloudFormationFileType,
+                        payload.settings as Record<string, unknown>,
                     );
                     break;
                 }
@@ -62,6 +63,7 @@ if (parentPort) {
                         payload.path as string,
                         payload.uri as string,
                         payload.fileType as CloudFormationFileType,
+                        payload.settings as Record<string, unknown>,
                     );
                     break;
                 }
@@ -247,30 +249,71 @@ async function initializePyodide(): Promise<InitializeResult> {
           
           return results
       
-      def lint_str(template_str, uri, template_args=None):
+      def parse_cfn_lint_settings(settings):
+          """Parse cfn-lint settings into ManualArgs format"""
+          config = {}
+          if not settings:
+              return config
+              
+          if settings.get('ignoreChecks'):
+              config['ignore_checks'] = settings['ignoreChecks']
+          if settings.get('includeChecks'):
+              config['include_checks'] = settings['includeChecks']
+          if settings.get('mandatoryChecks'):
+              config['mandatory_checks'] = settings['mandatoryChecks']
+          if settings.get('includeExperimental'):
+              config['include_experimental'] = settings['includeExperimental']
+          if settings.get('configureRules'):
+              # Parse configure rules from string format "RuleId:key=value"
+              configure_rules = {}
+              for rule_config in settings['configureRules']:
+                  if ':' in rule_config:
+                      rule_id, config_str = rule_config.split(':', 1)
+                      if '=' in config_str:
+                          key, value = config_str.split('=', 1)
+                          if rule_id not in configure_rules:
+                              configure_rules[rule_id] = {}
+                          # Convert string values to appropriate types
+                          if value.lower() == 'true':
+                              configure_rules[rule_id][key] = True
+                          elif value.lower() == 'false':
+                              configure_rules[rule_id][key] = False
+                          else:
+                              try:
+                                  configure_rules[rule_id][key] = int(value)
+                              except ValueError:
+                                  configure_rules[rule_id][key] = value
+              if configure_rules:
+                  config['configure_rules'] = configure_rules
+          if settings.get('regions'):
+              config['regions'] = settings['regions']
+          return config
+
+      def lint_str(template_str, uri, settings=None):
           """
           Lint a CloudFormation template string and return LSP diagnostics
           
           Args:
               template_str (str): CloudFormation template as a string
               uri (str): Document URI
-              template_args (dict, optional): Additional template arguments
+              settings (dict, optional): cfn-lint settings
 
           Returns:
               dict: LSP PublishDiagnosticsParams
           """
+          config = parse_cfn_lint_settings(settings)
+          return match_to_diagnostics(lint(template_str, config=ManualArgs(**config) if config else None), uri)
 
-          return match_to_diagnostics(lint(template_str), uri)
-
-      def lint_uri(lint_path, uri, lint_type, template_args=None):
-          args = ManualArgs()
+      def lint_uri(lint_path, uri, lint_type, settings=None):
+          config = parse_cfn_lint_settings(settings)
           path = Path(lint_path)
+          
           if lint_type == "template":
-              args["templates"] = [str(path)]
+              config["templates"] = [str(path)]
           elif lint_type == "gitsync-deployment":
-              args["deployment_files"] = [str(path)]
+              config["deployment_files"] = [str(path)]
 
-          return match_to_diagnostics(lint_by_config(args), uri)
+          return match_to_diagnostics(lint_by_config(ManualArgs(**config)), uri)
     `);
 
         // Create result object first
@@ -309,6 +352,7 @@ async function lintTemplate(
     content: string,
     uri: string,
     _fileType: CloudFormationFileType,
+    settings?: Record<string, unknown>,
 ): Promise<PublishDiagnosticsParams[]> {
     if (!initialized || !pyodide) {
         throw new Error('Pyodide not initialized');
@@ -319,9 +363,11 @@ async function lintTemplate(
     const pyUri = pyodide.toPy(uri);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const pyContent = pyodide.toPy(content.replaceAll('"""', '\\"\\"\\"'));
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const pySettings = pyodide.toPy(settings ?? {});
 
     // Execute Python code and get result
-    const pythonCode = `lint_str(r"""${pyContent}""", r"""${pyUri}""")`;
+    const pythonCode = `lint_str(r"""${pyContent}""", r"""${pyUri}""", ${pySettings})`;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const result = await pyodide.runPythonAsync(pythonCode);
 
@@ -333,13 +379,17 @@ async function lintFile(
     path: string,
     uri: string,
     fileType: CloudFormationFileType,
+    settings?: Record<string, unknown>,
 ): Promise<PublishDiagnosticsParams[]> {
     if (!initialized || !pyodide) {
         throw new Error('Pyodide not initialized');
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const pySettings = pyodide.toPy(settings ?? {});
+
     // Execute Python code and get result
-    const pythonCode = `lint_uri(r"""${path}""", r"""${uri}""", r"""${fileType}""")`;
+    const pythonCode = `lint_uri(r"""${path}""", r"""${uri}""", r"""${fileType}""", ${pySettings})`;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const result = await pyodide.runPythonAsync(pythonCode);
 

src/services/cfnLint/pyodide-worker.ts

@@ -29,6 +29,16 @@ export type CfnLintSettings = Toggleable<{
     delayMs: number;
     lintOnChange: boolean;
     initialization: CfnLintInitializationSettings;
+    ignoreChecks: readonly string[];
+    includeChecks: readonly string[];
+    mandatoryChecks: readonly string[];
+    includeExperimental: boolean;
+    configureRules: readonly string[];
+    regions: readonly string[];
+    customRules: readonly string[];
+    appendRules: readonly string[];
+    overrideSpec: string;
+    registrySchemas: readonly string[];
 }>;
 
 export type GuardSettings = Toggleable<{
@@ -87,6 +97,16 @@ export const DefaultSettings: DeepReadonly<Settings> = {
                 backoffMultiplier: 2,
                 totalTimeoutMs: 120_000, // 2 minutes total timeout
             },
+            ignoreChecks: [],
+            includeChecks: [],
+            mandatoryChecks: [],
+            includeExperimental: false,
+            configureRules: [],
+            regions: [],
+            customRules: [],
+            appendRules: [],
+            overrideSpec: '',
+            registrySchemas: [],
         },
         cfnGuard: {
             enabled: true,