mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-18 16:02:10 +00:00
a22d179903
* feat(cli): add GitHub Actions CI and raw app sync tests - Add CLI tests GitHub Action that runs on Linux and Windows - Add build check job that runs on CLI and openapi.yaml changes - Uses Rust cargo backend instead of Docker for better CI compatibility - Add cargo_backend.ts and test_backend.ts for test infrastructure - Fix Windows path separator bug in raw_apps.ts (use "/" for relative paths) - Fix PostgreSQL URL parsing in cargo_backend.ts - Update tests to use gitBranches format instead of deprecated overrides - Add raw_app_sync.test.ts for raw app sync workflow testing (ignored for now - needs EE) - Skip tests that require EE features (git sync settings, raw apps) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): Fix Windows path compatibility issues in tests - Use fromFileUrl() in cargo_backend.ts for proper Windows path handling - Normalize path separators to forward slashes in resource_folders.ts - Fix readDirRecursive to return normalized paths in test helper - Use forward slashes consistently in buildMetadataPath and detection functions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): Use SEP in test assertions instead of modifying logic - Revert resource_folders.ts to use SEP as intended - Update test assertions to use SEP for platform-specific paths - Keep readDirRecursive normalization for consistent test comparisons Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): Use SEP for all path separators in test assertions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): Use resolve() for proper cross-platform path handling in cargo_backend String concatenation with path separators creates malformed paths on Windows. Use path.resolve() instead for proper cross-platform path resolution. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(backend): Add cfg attributes for Windows compatibility - Add #[cfg(unix)] to anyhow::anyhow import (only used in unix cfg block) - Add #[cfg(not(windows))] to parse_file function (uses cat, only for cgroups) - Remove unused std::io import, use std::io::Result directly Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: Windows compilation + convert integration tests to withTestBackend - Fix unused import SYSTEM_ROOT in csharp_executor.rs on Windows by requiring both windows and csharp feature - Fix unused variable id in handle_child.rs on Windows by adding #[allow(unused_variables)] since id is only used in cfg(unix) code - Convert all RUN_INTEGRATION_TESTS dependent tests in sync_pull_push.test.ts to use withTestBackend pattern for automatic backend setup Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat: configurable test features with CI_MINIMAL_FEATURES env var - Default: full features (zip, private, enterprise) for local development - CI mode: minimal features (zip only) when CI_MINIMAL_FEATURES=true - Add shouldSkipOnCI() helper for tests requiring EE features - Update EE-dependent tests to use shouldSkipOnCI() - Add test instructions to cli/README.md Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: enable raw app tests (not EE-dependent) Raw apps work with minimal features. 2 tests pass, 2 have test logic bugs to investigate separately: - "delete file and push" - file deletion not syncing correctly - "dry-run push shows expected changes" - JSON output parsing issue Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: gate cgroups module to Linux only cgroups are Linux-specific, the module was causing dead_code warnings on Windows compilation. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(ci): add CI_MINIMAL_FEATURES env var to CLI tests workflow Set CI_MINIMAL_FEATURES=true in both Linux and Windows test jobs so the backend compiles with minimal features (zip only) and EE-dependent tests self-skip via shouldSkipOnCI(). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): raw app tests and backend startup timing - Add 5s delay after backend ready for migrations to complete - Fix dry-run JSON output parsing (handle pretty-printed JSON) - Temporarily ignore "delete file" test (needs isSuperset fix) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): raw app file deletion sync - Add deepEqual check for files in raw_apps.ts isSuperset comparison - Handle raw_app file deletions in sync.ts by re-pushing the entire app - Fix test to remove CSS import before deleting the file When deleting a file from a raw app, the sync now properly updates the backend with the new file list (excluding the deleted file). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): Windows path separators in tests Normalize paths for cross-platform comparison by converting backslashes to forward slashes before path assertions. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(cli): normalize featurePaths in multi_instance_workspace test Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test(cli): add mixed case paths sync tests for Windows compatibility Add comprehensive tests for sync pull/push with capitalized folder paths to catch Windows case-insensitivity issues: - Scripts in f/MyFolder/MyScript - Flows in f/MyFlows/DataProcessor - Apps in f/MyApps/Dashboard - Variables in f/MyVars/ApiKey - Deeply nested paths with mixed case - Multiple resources in same capitalized folder - CamelCase folder names with numbers Each test verifies the full pull -> modify -> push -> verify cycle. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test(cli): add idempotency check to mixed case paths tests After each push, pull again with --dry-run --json-output and verify that no changes are detected. This ensures the sync is stable and catches issues where pull/push cycles cause spurious diffs. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
289 lines
11 KiB
TypeScript
289 lines
11 KiB
TypeScript
import { assertEquals, assert, assertStringIncludes } from "https://deno.land/std@0.224.0/assert/mod.ts";
|
|
import { withTestBackend } from "./test_backend.ts";
|
|
import { addWorkspace } from "../workspace.ts";
|
|
import { parseJsonFromCLIOutput } from "./test_config_helpers.ts";
|
|
|
|
// =============================================================================
|
|
// MULTI-BRANCH WORKSPACE TESTS
|
|
// Tests for handling multiple Git branches with different configurations
|
|
// =============================================================================
|
|
|
|
// Helper function to set up workspace profile with specific name
|
|
async function setupWorkspaceProfile(backend: any, workspaceName: string): Promise<void> {
|
|
const testWorkspace = {
|
|
remote: backend.baseUrl,
|
|
workspaceId: backend.workspace,
|
|
name: workspaceName,
|
|
token: backend.token
|
|
};
|
|
|
|
await addWorkspace(testWorkspace, { force: true, configDir: backend.testConfigDir });
|
|
}
|
|
|
|
Deno.test({
|
|
name: "Multi-Branch: sync pull with branch-specific overrides",
|
|
sanitizeResources: false,
|
|
sanitizeOps: false,
|
|
fn: async () => {
|
|
await withTestBackend(async (backend, tempDir) => {
|
|
await setupWorkspaceProfile(backend, "multi_branch_test");
|
|
|
|
// Create wmill.yaml with gitBranches configuration
|
|
await Deno.writeTextFile(`${tempDir}/wmill.yaml`, `defaultTs: bun
|
|
includes:
|
|
- "**"
|
|
excludes: []
|
|
|
|
gitBranches:
|
|
main:
|
|
overrides:
|
|
skipVariables: false
|
|
skipResources: false
|
|
staging:
|
|
overrides:
|
|
skipVariables: true
|
|
skipResources: false
|
|
prod:
|
|
overrides:
|
|
skipVariables: true
|
|
skipResources: true`);
|
|
|
|
// Test main branch - should include variables and resources
|
|
const mainResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'main',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "multi_branch_test");
|
|
|
|
assertEquals(mainResult.code, 0, `Main branch sync should succeed: ${mainResult.stderr}`);
|
|
|
|
const mainData = parseJsonFromCLIOutput(mainResult.stdout);
|
|
const mainPaths = (mainData.changes || []).map((c: any) => c.path);
|
|
|
|
const mainHasVariables = mainPaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const mainHasResources = mainPaths.some((path: string) => path.includes('.resource.yaml'));
|
|
|
|
assertEquals(mainHasVariables, true, "Main branch should include variables");
|
|
assertEquals(mainHasResources, true, "Main branch should include resources");
|
|
|
|
// Test staging branch - should skip variables but include resources
|
|
const stagingResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'staging',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "multi_branch_test");
|
|
|
|
assertEquals(stagingResult.code, 0, `Staging branch sync should succeed: ${stagingResult.stderr}`);
|
|
|
|
const stagingData = parseJsonFromCLIOutput(stagingResult.stdout);
|
|
const stagingPaths = (stagingData.changes || []).map((c: any) => c.path);
|
|
|
|
const stagingHasVariables = stagingPaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const stagingHasResources = stagingPaths.some((path: string) => path.includes('.resource.yaml'));
|
|
|
|
assertEquals(stagingHasVariables, false, "Staging branch should skip variables");
|
|
assertEquals(stagingHasResources, true, "Staging branch should include resources");
|
|
|
|
// Test prod branch - should skip both variables and resources
|
|
const prodResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'prod',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "multi_branch_test");
|
|
|
|
assertEquals(prodResult.code, 0, `Prod branch sync should succeed: ${prodResult.stderr}`);
|
|
|
|
const prodData = parseJsonFromCLIOutput(prodResult.stdout);
|
|
const prodPaths = (prodData.changes || []).map((c: any) => c.path);
|
|
|
|
const prodHasVariables = prodPaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const prodHasResources = prodPaths.some((path: string) => path.includes('.resource.yaml'));
|
|
|
|
assertEquals(prodHasVariables, false, "Prod branch should skip variables");
|
|
assertEquals(prodHasResources, false, "Prod branch should skip resources");
|
|
});
|
|
}
|
|
});
|
|
|
|
Deno.test({
|
|
name: "Multi-Branch: branch override with includes filtering",
|
|
sanitizeResources: false,
|
|
sanitizeOps: false,
|
|
fn: async () => {
|
|
await withTestBackend(async (backend, tempDir) => {
|
|
await setupWorkspaceProfile(backend, "includes_branch_test");
|
|
|
|
await Deno.writeTextFile(`${tempDir}/wmill.yaml`, `defaultTs: bun
|
|
includes:
|
|
- "**"
|
|
|
|
gitBranches:
|
|
feature:
|
|
overrides:
|
|
includes:
|
|
- "f/**"
|
|
skipVariables: true
|
|
release:
|
|
overrides:
|
|
includes:
|
|
- "f/**"
|
|
- "users/**"
|
|
skipVariables: false`);
|
|
|
|
// Test feature branch - should skip variables and only include f/**
|
|
const featureResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'feature',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "includes_branch_test");
|
|
|
|
assertEquals(featureResult.code, 0, `Feature branch sync should succeed: ${featureResult.stderr}`);
|
|
|
|
const featureData = parseJsonFromCLIOutput(featureResult.stdout);
|
|
const featurePaths = (featureData.changes || []).map((c: any) => c.path);
|
|
// Normalize paths for cross-platform comparison (Windows uses backslashes)
|
|
const normalizedFeaturePaths = featurePaths.map((p: string) => p.replace(/\\/g, '/'));
|
|
|
|
const featureHasVariables = normalizedFeaturePaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const featureHasUsers = normalizedFeaturePaths.some((path: string) => path.startsWith('users/'));
|
|
|
|
assertEquals(featureHasVariables, false, "Feature branch should skip variables");
|
|
assertEquals(featureHasUsers, false, "Feature branch should not include users (not in includes)");
|
|
|
|
// Test release branch - should include variables and users
|
|
const releaseResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'release',
|
|
'--include-users',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "includes_branch_test");
|
|
|
|
assertEquals(releaseResult.code, 0, `Release branch sync should succeed: ${releaseResult.stderr}`);
|
|
|
|
const releaseData = parseJsonFromCLIOutput(releaseResult.stdout);
|
|
const releasePaths = (releaseData.changes || []).map((c: any) => c.path);
|
|
// Normalize paths for cross-platform comparison (Windows uses backslashes)
|
|
const normalizedReleasePaths = releasePaths.map((p: string) => p.replace(/\\/g, '/'));
|
|
|
|
const releaseHasVariables = normalizedReleasePaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const releaseHasUsers = normalizedReleasePaths.some((path: string) => path.startsWith('users/'));
|
|
|
|
assertEquals(releaseHasVariables, true, "Release branch should include variables");
|
|
assertEquals(releaseHasUsers, true, "Release branch should include users");
|
|
});
|
|
}
|
|
});
|
|
|
|
Deno.test({
|
|
name: "Multi-Branch: fallback to base config when branch not defined",
|
|
sanitizeResources: false,
|
|
sanitizeOps: false,
|
|
fn: async () => {
|
|
await withTestBackend(async (backend, tempDir) => {
|
|
await setupWorkspaceProfile(backend, "fallback_test");
|
|
|
|
await Deno.writeTextFile(`${tempDir}/wmill.yaml`, `defaultTs: bun
|
|
includes:
|
|
- "**"
|
|
skipVariables: true
|
|
skipResources: true
|
|
|
|
gitBranches:
|
|
main:
|
|
overrides:
|
|
skipVariables: false
|
|
skipResources: false`);
|
|
|
|
// Test undefined branch - should use base config (skip variables and resources)
|
|
const undefinedResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'undefined_branch',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "fallback_test");
|
|
|
|
assertEquals(undefinedResult.code, 0, `Undefined branch sync should succeed: ${undefinedResult.stderr}`);
|
|
|
|
const undefinedData = parseJsonFromCLIOutput(undefinedResult.stdout);
|
|
const undefinedPaths = (undefinedData.changes || []).map((c: any) => c.path);
|
|
|
|
const undefinedHasVariables = undefinedPaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const undefinedHasResources = undefinedPaths.some((path: string) => path.includes('.resource.yaml'));
|
|
|
|
// Should use base config since branch is not defined
|
|
assertEquals(undefinedHasVariables, false, "Undefined branch should use base config skipVariables: true");
|
|
assertEquals(undefinedHasResources, false, "Undefined branch should use base config skipResources: true");
|
|
|
|
// Test defined main branch - should use branch overrides
|
|
const mainResult = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'main',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "fallback_test");
|
|
|
|
assertEquals(mainResult.code, 0, `Main branch sync should succeed: ${mainResult.stderr}`);
|
|
|
|
const mainData = parseJsonFromCLIOutput(mainResult.stdout);
|
|
const mainPaths = (mainData.changes || []).map((c: any) => c.path);
|
|
|
|
const mainHasVariables = mainPaths.some((path: string) => path.includes('.variable.yaml'));
|
|
const mainHasResources = mainPaths.some((path: string) => path.includes('.resource.yaml'));
|
|
|
|
assertEquals(mainHasVariables, true, "Main branch should use override skipVariables: false");
|
|
assertEquals(mainHasResources, true, "Main branch should use override skipResources: false");
|
|
});
|
|
}
|
|
});
|
|
|
|
Deno.test({
|
|
name: "Multi-Branch: branch inherits unspecified settings from base",
|
|
sanitizeResources: false,
|
|
sanitizeOps: false,
|
|
fn: async () => {
|
|
await withTestBackend(async (backend, tempDir) => {
|
|
await setupWorkspaceProfile(backend, "inherit_test");
|
|
|
|
await Deno.writeTextFile(`${tempDir}/wmill.yaml`, `defaultTs: bun
|
|
includes:
|
|
- "**"
|
|
skipVariables: true
|
|
skipResources: true
|
|
skipApps: true
|
|
|
|
gitBranches:
|
|
partial:
|
|
overrides:
|
|
skipVariables: false`);
|
|
|
|
// Test partial branch - should inherit skipResources and skipApps from base
|
|
const result = await backend.runCLICommand([
|
|
'sync', 'pull',
|
|
'--branch', 'partial',
|
|
'--dry-run',
|
|
'--json-output'
|
|
], tempDir, "inherit_test");
|
|
|
|
assertEquals(result.code, 0, `Partial branch sync should succeed: ${result.stderr}`);
|
|
|
|
const data = parseJsonFromCLIOutput(result.stdout);
|
|
const paths = (data.changes || []).map((c: any) => c.path);
|
|
|
|
const hasVariables = paths.some((path: string) => path.includes('.variable.yaml'));
|
|
const hasResources = paths.some((path: string) => path.includes('.resource.yaml'));
|
|
const hasApps = paths.some((path: string) => path.includes('.app/') || path.endsWith('.app.yaml'));
|
|
|
|
// skipVariables is overridden to false
|
|
assertEquals(hasVariables, true, "Partial branch should include variables (override)");
|
|
// skipResources and skipApps are inherited from base (true)
|
|
assertEquals(hasResources, false, "Partial branch should skip resources (inherited)");
|
|
assertEquals(hasApps, false, "Partial branch should skip apps (inherited)");
|
|
});
|
|
}
|
|
});
|