From 08e72a4a737ffc7de92175151ae782d95f5fa0b3 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Thu, 19 Nov 2026 10:36:45 -0800 Subject: [PATCH] fix(cli): preserve permission CSV compatibility and diagnostics --- .../src/commands/source-permissions.test.ts | 5 +-- .../src/transfer/permission-csv.test.ts | 32 +++++++++++++++++++ .../sim-cli/src/transfer/permission-csv.ts | 18 ++++++++--- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 packages/sim-cli/src/transfer/permission-csv.test.ts diff --git a/packages/sim-cli/src/commands/source-permissions.test.ts b/packages/sim-cli/src/commands/source-permissions.test.ts index 224f21dc14c..d90d209c213 100644 --- a/packages/sim-cli/src/commands/source-permissions.test.ts +++ b/packages/sim-cli/src/commands/source-permissions.test.ts @@ -180,8 +180,8 @@ describe('Search permission CSV upload', () => { it('stages immutable bounded parts, preserves CSV records, and activates only after both files', async () => { const requests: { path: string; body: Record }[] = [] const released: string[] = [] - const users = '\ufeffuser_id,email\r\n42,"person@example.com"\r\n' - const grants = `project_path,user_id\n${'team/repo,42\n'.repeat(5001)}` + const users = '\ufeff user_id , email \r\n \t\r\n 42 , "person@example.com" \r\n' + const grants = `project_path,user_id\n${' "team/repo" , 42 \n'.repeat(5001)}` const result = await runEmbeddedCli( args, { @@ -212,6 +212,7 @@ describe('Search permission CSV upload', () => { projectPermissions: { rowCount: 5001, parts: 2 }, }) const parts = requests.slice(1, -1) + expect(parts[0].body.content).toBe('user_id,email\n42,person@example.com\n') expect(parts.map(({ body }) => body.field)).toEqual([ 'userMapping', 'projectPermissions', diff --git a/packages/sim-cli/src/transfer/permission-csv.test.ts b/packages/sim-cli/src/transfer/permission-csv.test.ts new file mode 100644 index 00000000000..79f3ae11c2f --- /dev/null +++ b/packages/sim-cli/src/transfer/permission-csv.test.ts @@ -0,0 +1,32 @@ +import { mkdtemp, rm } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { describe, expect, it, vi } from 'vitest' +import { SimApiError } from '#sim-cli/http/client' +import { stagePermissionCsvs } from '#sim-cli/transfer/permission-csv' + +describe('Permission CSV staging errors', () => { + it.each(['input', 'temporary directory'])( + 'preserves the cause of a missing %s', + async (missing) => { + const directory = await mkdtemp(join(tmpdir(), 'sim-csv-error-')) + try { + if (missing === 'temporary directory') vi.stubEnv('TMPDIR', join(directory, 'missing')) + const failure = await stagePermissionCsvs('gitlab', { + userMapping: join(directory, 'users.csv'), + projectPermissions: join(directory, 'projects.csv'), + }).catch((error: unknown) => error) + expect(failure).toBeInstanceOf(SimApiError) + expect(failure).toMatchObject({ + cause: expect.objectContaining({ + code: 'ENOENT', + path: expect.any(String), + syscall: missing === 'input' ? 'open' : 'mkdtemp', + }), + }) + } finally { + await rm(directory, { recursive: true, force: true }) + } + } + ) +}) diff --git a/packages/sim-cli/src/transfer/permission-csv.ts b/packages/sim-cli/src/transfer/permission-csv.ts index 6c9c22aa3fe..cb0636b4903 100644 --- a/packages/sim-cli/src/transfer/permission-csv.ts +++ b/packages/sim-cli/src/transfer/permission-csv.ts @@ -58,7 +58,9 @@ export async function stagePermissionCsvs( signal?: AbortSignal ) { const directory = await mkdtemp(join(tmpdir(), 'sim-permissions-')).catch((error: unknown) => { - throw new SimApiError(`Cannot stage permission CSVs: ${getErrorMessage(error)}`, 0) + const failure = new SimApiError(`Cannot stage permission CSVs: ${getErrorMessage(error)}`, 0) + failure.cause = error + throw failure }) const parts: { field: CsvField; path: string }[] = [] const manifest = {} as Record @@ -143,7 +145,12 @@ export async function stagePermissionCsvs( parts.push({ field, path: partPath }) totalBytes += partBytes } - const parser = parse({ bom: true, skip_empty_lines: true, max_record_size: 8192 }) + const parser = parse({ + bom: true, + trim: true, + skip_empty_lines: true, + max_record_size: 8192, + }) const decoded = Readable.from(decode()) decoded.on('error', (error) => parser.destroy(error)) decoded.pipe(parser) @@ -203,8 +210,11 @@ export async function stagePermissionCsvs( } catch (error) { await dispose() if (error instanceof SimApiError) throw error - if (error instanceof Error && 'code' in error && typeof error.code === 'string') - throw new SimApiError(`Cannot stage permission CSVs: ${error.message}`, 0) + if (error instanceof Error && 'code' in error && typeof error.code === 'string') { + const failure = new SimApiError(`Cannot stage permission CSVs: ${error.message}`, 0) + failure.cause = error + throw failure + } throw error } }