Skip to content

Modern Docker Management, Designed for Everyone

fix: remove analysis on project editors

Kyle Mendell011a9ca2a0ad
diff --git a/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts b/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
index 28bfb44d2..9b327c253 100644
--- a/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
+++ b/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
@@ -8,10 +8,6 @@ import { getMissingComposeVariables, resolveVariableSource } from './vars-analys
const MAX_SCHEMA_DIAGNOSTICS_DEFAULT = 30;
const TAB_INDENT_REGEX = /(^|\n)(\t+)/g;
-const SECRET_NAME_REGEX = /(password|passwd|secret|token|api[_-]?key|private[_-]?key|credential|aws_secret)/i;
-const SECRET_VALUE_REGEX = /(?:-----BEGIN [A-Z ]+-----|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+|[A-Za-z0-9_\/-]{24,})/;
-const NON_SECRET_VALUE_KEYS = new Set(['image']);
-const NON_SECRET_VALUE_PARENT_KEYS = new Set(['x-arcane']);
const VARIABLE_TOKEN_REGEX = /\$\{([A-Za-z_][A-Za-z0-9_]*)(?:(?::[-?+])[^}]*)?\}|\$([A-Za-z_][A-Za-z0-9_]*)/g;
const LIST_FIELDS = ['volumes', 'ports', 'env_file', 'dns', 'tmpfs'];
@@ -322,90 +318,6 @@ function buildComposeSemanticDiagnostics(parsedValue: unknown, doc: YamlDocLike)
return diagnostics;
}
-function buildMissingVariableDiagnostics(
- source: string,
- context: EditorContext
-): { diagnostics: Diagnostic[]; unresolved: string[] } {
- const unresolved = getMissingComposeVariables(context, source);
- if (unresolved.length === 0) return { diagnostics: [], unresolved: [] };
-
- const unresolvedSet = new Set(unresolved);
- const diagnostics: Diagnostic[] = [];
-
- for (const match of source.matchAll(VARIABLE_TOKEN_REGEX)) {
- const whole = match[0] ?? '';
- const name = match[1] || match[2];
- if (!name || !unresolvedSet.has(name)) continue;
- const from = match.index ?? 0;
- const to = Math.max(from + 1, from + whole.length);
- diagnostics.push({
- from,
- to,
- severity: 'warning',
- message: `Variable "${name}" is not defined in .env or global variables.`
- });
- }
-
- return { diagnostics, unresolved };
-}
-
-function buildSecretDiagnostics(source: string): Diagnostic[] {
- const diagnostics: Diagnostic[] = [];
- const lines = source.split('\n');
- let offset = 0;
- const keyStack: Array<{ key: string; indent: number }> = [];
-
- for (const rawLine of lines) {
- const line = rawLine.endsWith('\r') ? rawLine.slice(0, -1) : rawLine;
- const match = /^(\s*)([A-Za-z0-9_.-]+)\s*:\s*(.*)$/.exec(line);
- if (!match) {
- offset += rawLine.length + 1;
- continue;
- }
-
- const indent = (match[1] ?? '').length;
- while (keyStack.length > 0 && keyStack[keyStack.length - 1]!.indent >= indent) {
- keyStack.pop();
- }
-
- const key = match[2] ?? '';
- const value = (match[3] ?? '').trim();
- const isBlockKey = value === '';
- const isSecretKey = SECRET_NAME_REGEX.test(key);
- const lowerKey = key.toLowerCase();
- const isArcaneExtensionKey = lowerKey.startsWith('x-arcane');
- const inArcaneExtensionBlock = keyStack.some((entry) => NON_SECRET_VALUE_PARENT_KEYS.has(entry.key.toLowerCase()));
- const shouldCheckValue = !NON_SECRET_VALUE_KEYS.has(lowerKey) && !isArcaneExtensionKey && !inArcaneExtensionBlock;
- const isSecretValue = shouldCheckValue && SECRET_VALUE_REGEX.test(value);
-
- if (!isSecretKey && !isSecretValue) {
- if (isBlockKey) {
- keyStack.push({ key, indent });
- }
- offset += rawLine.length + 1;
- continue;
- }
-
- const keyIndex = line.indexOf(key);
- const from = offset + Math.max(0, keyIndex);
- const to = from + Math.max(1, key.length);
- diagnostics.push({
- from,
- to,
- severity: 'warning',
- message: `"${key}" looks like a secret. Prefer Docker secrets or external secret managers.`
- });
-
- if (isBlockKey) {
- keyStack.push({ key, indent });
- }
-
- offset += rawLine.length + 1;
- }
-
- return diagnostics;
-}
-
function buildOutline(doc: YamlDocLike): OutlineItem[] {
const outline: OutlineItem[] = [];
const sections = ['services', 'networks', 'volumes', 'configs', 'secrets'];
@@ -466,7 +378,7 @@ export function findVariableReferenceAtPosition(
export async function analyzeComposeContent(
view: EditorView,
schemaContext: ComposeSchemaContext,
- editorContext: EditorContext,
+ _editorContext: EditorContext,
maxSchemaDiagnostics = MAX_SCHEMA_DIAGNOSTICS_DEFAULT
): Promise<AnalysisResult> {
const source = view.state.doc.toString();
@@ -492,11 +404,9 @@ export async function analyzeComposeContent(
});
}
- const duplicateKeyWarnings = collectDuplicateKeyDiagnostics(doc.contents ?? null, diagnostics);
+ collectDuplicateKeyDiagnostics(doc.contents ?? null, diagnostics);
let outlineItems: OutlineItem[] = [];
- let unresolvedVariables: string[] = [];
- let secretWarnings = 0;
if (diagnostics.every((item) => item.severity !== 'error')) {
try {
@@ -514,14 +424,6 @@ export async function analyzeComposeContent(
}
diagnostics.push(...buildComposeSemanticDiagnostics(parsedValue, doc));
-
- const missing = buildMissingVariableDiagnostics(source, editorContext);
- unresolvedVariables = missing.unresolved;
- diagnostics.push(...missing.diagnostics);
-
- const secretDiagnostics = buildSecretDiagnostics(source);
- secretWarnings = secretDiagnostics.length;
- diagnostics.push(...secretDiagnostics);
} catch {
diagnostics.push({
from: 0,
@@ -535,11 +437,7 @@ export async function analyzeComposeContent(
return {
diagnostics,
outlineItems,
- summaryPatch: {
- duplicateKeyWarnings,
- secretWarnings,
- unresolvedVariables
- }
+ summaryPatch: {}
};
}
diff --git a/frontend/src/lib/components/code-editor/analysis/env-analysis.ts b/frontend/src/lib/components/code-editor/analysis/env-analysis.ts
index 9557d652f..33e238f83 100644
--- a/frontend/src/lib/components/code-editor/analysis/env-analysis.ts
+++ b/frontend/src/lib/components/code-editor/analysis/env-analysis.ts
@@ -1,12 +1,8 @@
-import type { EditorView } from '@codemirror/view';
import type { Diagnostic } from '@codemirror/lint';
import type { AnalysisResult, EditorContext, OutlineItem } from './types';
import { isOpenQuote } from './parse-env-utils';
-import { extractComposeVariables } from './vars-analysis';
const ENV_KEY_REGEX = /^[A-Za-z_][A-Za-z0-9_]*$/;
-const SECRET_NAME_REGEX = /(password|passwd|secret|token|api[_-]?key|private[_-]?key|credential|aws_secret)/i;
-const SECRET_VALUE_REGEX = /(?:-----BEGIN [A-Z ]+-----|eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+|[A-Za-z0-9_\/-]{24,})/;
type ParsedEnvLine = {
lineNumber: number;
@@ -21,14 +17,9 @@ type ParsedEnvLine = {
function parseEnv(source: string): {
entries: ParsedEnvLine[];
diagnostics: Diagnostic[];
- duplicateKeys: number;
- secretWarnings: number;
} {
const diagnostics: Diagnostic[] = [];
const entries: ParsedEnvLine[] = [];
- const seen = new Map<string, ParsedEnvLine>();
- let duplicateKeys = 0;
- let secretWarnings = 0;
const lines = source.split('\n');
let offset = 0;
@@ -52,49 +43,7 @@ function parseEnv(source: string): {
keyTo: number
): void {
const parsed: ParsedEnvLine = { lineNumber, from, to: Math.max(from + 1, to), key, value, keyFrom, keyTo };
-
- if (seen.has(key)) {
- const previous = seen.get(key);
- duplicateKeys += 1;
- diagnostics.push({
- from: keyFrom,
- to: keyTo,
- severity: 'warning',
- message: `Duplicate variable "${key}". Last value wins.`,
- actions: [
- {
- name: 'Remove earlier duplicate',
- apply(view: EditorView) {
- const doc = view.state.doc;
- const target = previous ?? parsed;
- let removeTo = target.to;
- const nextChars = doc.sliceString(removeTo, Math.min(doc.length, removeTo + 2));
- if (nextChars.startsWith('\r\n')) {
- removeTo += 2;
- } else if (nextChars.startsWith('\n')) {
- removeTo += 1;
- }
- view.dispatch({
- changes: { from: target.from, to: removeTo, insert: '' }
- });
- }
- }
- ]
- });
- }
-
- seen.set(key, parsed);
entries.push(parsed);
-
- if (SECRET_NAME_REGEX.test(key) || SECRET_VALUE_REGEX.test(value)) {
- secretWarnings += 1;
- diagnostics.push({
- from: keyFrom,
- to: keyTo,
- severity: 'warning',
- message: `"${key}" looks like a secret. Consider using Docker secrets or external secret management.`
- });
- }
}
for (let index = 0; index < lines.length; index += 1) {
@@ -182,7 +131,7 @@ function parseEnv(source: string): {
});
}
- return { entries, diagnostics, duplicateKeys, secretWarnings };
+ return { entries, diagnostics };
}
function makeOutlineItems(entries: ParsedEnvLine[]): OutlineItem[] {
@@ -196,37 +145,14 @@ function makeOutlineItems(entries: ParsedEnvLine[]): OutlineItem[] {
}));
}
-function buildUnusedVarDiagnostics(entries: ParsedEnvLine[], context: EditorContext): Diagnostic[] {
- const referenced = extractComposeVariables(context.composeContents ?? []);
- if (referenced.size === 0) return [];
-
- const diagnostics: Diagnostic[] = [];
- for (const entry of entries) {
- if (!referenced.has(entry.key)) {
- diagnostics.push({
- from: entry.keyFrom,
- to: entry.keyTo,
- severity: 'warning',
- message: `Variable "${entry.key}" is not referenced in compose files.`
- });
- }
- }
-
- return diagnostics;
-}
-
-export function analyzeEnvContent(source: string, context: EditorContext): AnalysisResult {
+export function analyzeEnvContent(source: string, _context: EditorContext): AnalysisResult {
const parsed = parseEnv(source);
- const unusedDiagnostics = buildUnusedVarDiagnostics(parsed.entries, context);
- const diagnostics = [...parsed.diagnostics, ...unusedDiagnostics];
+ const diagnostics = [...parsed.diagnostics];
const outlineItems = makeOutlineItems(parsed.entries);
return {
diagnostics,
outlineItems,
- summaryPatch: {
- duplicateEnvWarnings: parsed.duplicateKeys,
- secretWarnings: parsed.secretWarnings
- }
+ summaryPatch: {}
};
}
diff --git a/frontend/src/lib/components/code-editor/analysis/types.ts b/frontend/src/lib/components/code-editor/analysis/types.ts
index 56b390122..7e4b299c7 100644
--- a/frontend/src/lib/components/code-editor/analysis/types.ts
+++ b/frontend/src/lib/components/code-editor/analysis/types.ts
@@ -17,10 +17,6 @@ export type DiagnosticSummary = {
hints: number;
schemaStatus: SchemaStatus;
schemaMessage?: string;
- unresolvedVariables: string[];
- secretWarnings: number;
- duplicateKeyWarnings: number;
- duplicateEnvWarnings: number;
cursorLine: number;
cursorCol: number;
validationReady: boolean;
diff --git a/frontend/src/lib/components/code-editor/editor-constants.ts b/frontend/src/lib/components/code-editor/editor-constants.ts
index 8b50827bb..c807bf072 100644
--- a/frontend/src/lib/components/code-editor/editor-constants.ts
+++ b/frontend/src/lib/components/code-editor/editor-constants.ts
@@ -38,10 +38,6 @@ export function createDefaultSummary(): DiagnosticSummary {
hints: 0,
schemaStatus: 'unavailable',
schemaMessage: undefined,
- unresolvedVariables: [],
- secretWarnings: 0,
- duplicateKeyWarnings: 0,
- duplicateEnvWarnings: 0,
cursorLine: 1,
cursorCol: 1,
validationReady: false
diff --git a/frontend/src/lib/components/code-editor/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelte
index d33442b1b..94fd7df33 100644
--- a/frontend/src/lib/components/code-editor/editor.svelte
+++ b/frontend/src/lib/components/code-editor/editor.svelte
@@ -654,8 +654,6 @@
<span>{diagnosticSummary.errors} errors</span>
<span>{diagnosticSummary.warnings} warnings</span>
<span>Schema: {diagnosticSummary.schemaStatus}</span>
- <span>Unresolved vars: {diagnosticSummary.unresolvedVariables.length}</span>
- <span>Secrets: {diagnosticSummary.secretWarnings}</span>
<span>Ln {diagnosticSummary.cursorLine}, Col {diagnosticSummary.cursorCol}</span>
<span>Diagnostics: {countCurrentDiagnostics()}</span>
{#if !validationReady}
diff --git a/frontend/src/routes/(app)/projects/components/CodePanel.svelte b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
index 63d3d6e4e..0b3f02630 100644
--- a/frontend/src/routes/(app)/projects/components/CodePanel.svelte
+++ b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
@@ -25,10 +25,6 @@
hints: 0,
schemaStatus: 'unavailable',
schemaMessage: undefined,
- unresolvedVariables: [],
- secretWarnings: 0,
- duplicateKeyWarnings: 0,
- duplicateEnvWarnings: 0,
cursorLine: 1,
cursorCol: 1,
validationReady: false