fix: stop apify upgrade reporting success after a failed binary write

src/commands/cli-management/upgrade.ts

@@ -187,9 +187,9 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 				return this.startUpgradeProcess(bundleDirectory, versionWithoutV, assets);
 			}
 
-			await this.handleUnixUpgrade(bundleDirectory, versionWithoutV, assets);
-
-			this.successMessage(versionWithoutV);
+			if (await this.handleUnixUpgrade(bundleDirectory, versionWithoutV, assets)) {
+				this.successMessage(versionWithoutV);
+			}
 
 			return;
 		}
@@ -294,7 +294,7 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 		cliDebugPrint('[upgrade] downloaded upgrade script to', filePath);
 	}
 
-	private async handleUnixUpgrade(bundleDirectory: string, version: string, assets: Asset[]) {
+	private async handleUnixUpgrade(bundleDirectory: string, version: string, assets: Asset[]): Promise<boolean> {
 		const metadata = useCLIMetadata();
 
 		for (const asset of assets) {
@@ -322,7 +322,8 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 					].join('\n'),
 				});
 
-				return;
+				process.exitCode = 1;
+				return false;
 			}
 
 			if (process.env.APIFY_CLI_DEBUG && !process.env.APIFY_CLI_FORCE) {
@@ -363,7 +364,12 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 						`- The error: ${err.message}`,
 					].join('\n'),
 				});
+
+				process.exitCode = 1;
+				return false;
 			}
 		}
+
+		return true;
 	}
 }

test/local/commands/upgrade.test.ts

@@ -0,0 +1,85 @@
+import process from 'node:process';
+
+import { useConsoleSpy } from '../../__setup__/hooks/useConsoleSpy.js';
+
+const fsMocks = vi.hoisted(() => ({
+	rename: vi.fn<(from: string, to: string) => Promise<void>>(),
+}));
+
+vi.mock('node:fs/promises', async (importOriginal) => ({
+	...(await importOriginal<typeof import('node:fs/promises')>()),
+	readdir: vi.fn(async () => ['apify-cli']),
+	writeFile: vi.fn(async () => {}),
+	rename: fsMocks.rename,
+	rm: vi.fn(async () => {}),
+}));
+
+vi.mock('../../../src/lib/bundleMigration.js', () => ({ writeEntrypointShims: vi.fn() }));
+
+vi.mock('../../../src/lib/hooks/useCLIMetadata.js', async (importOriginal) => {
+	const original = await importOriginal<typeof import('../../../src/lib/hooks/useCLIMetadata.js')>();
+	const metadata = { ...original.useCLIMetadata(), installMethod: 'bundle', platform: 'linux', arch: 'x64' };
+
+	return { ...original, useCLIMetadata: () => metadata };
+});
+
+vi.mock('../../../src/lib/hooks/useCLIVersionAssets.js', () => ({
+	useCLIVersionAssets: async () => ({
+		version: '1.10.0',
+		assets: [{ browser_download_url: 'https://example.com/apify-cli-1.10.0-linux-x64' }],
+	}),
+}));
+
+const { logMessages } = useConsoleSpy();
+
+const { UpgradeCommand } = await import('../../../src/commands/cli-management/upgrade.js');
+const { testRunCommand } = await import('../../../src/lib/command-framework/apify-command.js');
+
+const allOutput = () => [...logMessages.log, ...logMessages.error].join('\n');
+
+describe('apify upgrade (bundle, unix)', () => {
+	beforeEach(() => {
+		vi.stubGlobal(
+			'fetch',
+			vi.fn(async () => new Response(new Uint8Array([1, 2, 3]), { status: 200 })),
+		);
+		fsMocks.rename.mockReset().mockResolvedValue(undefined);
+	});
+
+	afterEach(() => {
+		vi.unstubAllGlobals();
+		process.exitCode = undefined;
+	});
+
+	it('reports success when the binary is replaced', async () => {
+		await testRunCommand(UpgradeCommand, { flags_version: '1.10.0' });
+
+		expect(allOutput()).toMatch(/Successfully upgraded to 1\.10\.0/);
+		expect(process.exitCode).toBeFalsy();
+	});
+
+	it('does not report success and exits non-zero when writing the binary fails', async () => {
+		fsMocks.rename.mockRejectedValue(
+			Object.assign(new Error("ETXTBSY: text file is busy, open 'apify-cli'"), { code: 'ETXTBSY' }),
+		);
+
+		await testRunCommand(UpgradeCommand, { flags_version: '1.10.0' });
+
+		expect(allOutput()).toMatch(/Failed to write the apify-cli bundle/);
+		expect(allOutput()).not.toMatch(/Successfully upgraded/);
+		expect(process.exitCode).toBe(1);
+	});
+
+	it('does not report success and exits non-zero when downloading the binary fails', async () => {
+		vi.stubGlobal(
+			'fetch',
+			vi.fn(async () => new Response('not found', { status: 404 })),
+		);
+
+		await testRunCommand(UpgradeCommand, { flags_version: '1.10.0' });
+
+		expect(allOutput()).toMatch(/Failed to fetch the apify-cli bundle/);
+		expect(allOutput()).not.toMatch(/Successfully upgraded/);
+		expect(process.exitCode).toBe(1);
+	});
+});