update validation messages. refresh unit tests

Author: stevensJourney

cli/src/commands/deploy/index.ts

@@ -251,7 +251,9 @@ export default class DeployAll extends CloudInstanceCommand {
         });
 
       if (!validation) {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await new Promise((resolve) => {
+          setTimeout(resolve, 1000);
+        });
         continue;
       }
 

cli/src/commands/validate.ts

@@ -109,6 +109,7 @@ async function runSyncRulesTestCloud(project: CloudProject): Promise<ValidationT
   }
 
   const client = createCloudClient();
+
   try {
     const result = await client.validateSyncRules({
       app_id: project.linked.project_id,

cli/test/commands/deploy.test.ts

@@ -1,36 +1,31 @@
 import { Config } from '@oclif/core';
 import { captureOutput, runCommand } from '@oclif/test';
 import { CLI_FILENAME, SERVICE_FILENAME } from '@powersync/cli-core';
-import { PowerSyncManagementClient } from '@powersync/management-client';
 import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import DeployCommand from '../../src/commands/deploy/index.js';
 import { root } from '../helpers/root.js';
-
-const mockGetInstanceConfig = vi.fn();
-const mockDeployInstance = vi.fn();
-const mockGetInstanceStatus = vi.fn();
+import { managementClientMock, resetManagementClientMocks } from '../setup.js';
 
 /** Run deploy by instantiating the command and calling .run() so the spy on createCloudClient applies. */
 async function runDeployDirect(opts?: { directory?: string }) {
   const directory = opts?.directory ?? PROJECT_DIR;
   const config = await Config.load({ root });
   const cmd = new DeployCommand(['--directory', directory], config);
-  cmd.client = {
-    deployInstance: mockDeployInstance,
-    getInstanceConfig: mockGetInstanceConfig,
-    getInstanceStatus: mockGetInstanceStatus
-  } as unknown as PowerSyncManagementClient;
+  cmd.client = managementClientMock as unknown as DeployCommand['client'];
   return captureOutput(() => cmd.run());
 }
 
 const PROJECT_DIR = 'powersync';
 
 function writeServiceYaml(projectDir: string, type: 'cloud' | 'self-hosted') {
-  const content = type === 'cloud' ? '_type: cloud\nname: test-instance\nregion: us\n' : `_type: ${type}\nregion: us\n`;
+  const content =
+    type === 'cloud'
+      ? '_type: cloud\nname: test-instance\nregion: us\nreplication:\n  connections:\n    - name: default\n      type: postgresql\n      uri: postgres://user:pass@host/db\n'
+      : `_type: ${type}\nregion: us\n`;
   writeFileSync(join(projectDir, SERVICE_FILENAME), content, 'utf8');
 }
 
@@ -45,15 +40,20 @@ describe('deploy', () => {
   let origPsToken: string | undefined;
 
   beforeEach(() => {
+    resetManagementClientMocks();
+
     origCwd = process.cwd();
     origPsToken = process.env.TOKEN;
     tmpDir = mkdtempSync(join(tmpdir(), 'deploy-test-'));
     process.chdir(tmpDir);
     process.env.TOKEN = 'test-token';
-    mockGetInstanceConfig.mockReset();
-    mockDeployInstance.mockReset();
-    mockGetInstanceStatus.mockReset();
-    mockGetInstanceConfig.mockRejectedValue(new Error('network error'));
+    managementClientMock.getInstanceConfig.mockResolvedValue({
+      config: { region: 'us', replication: { connections: [{ name: 'default', type: 'postgresql' }] } },
+      name: 'test-instance',
+      sync_rules: ''
+    });
+    managementClientMock.getInstanceStatus.mockResolvedValue({ operations: [], provisioned: true });
+    managementClientMock.deployInstance.mockRejectedValue(new Error('network error'));
   });
 
   afterEach(() => {

cli/test/commands/destroy.test.ts

@@ -5,6 +5,7 @@ import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { root } from '../helpers/root.js';
+import { resetManagementClientMocks } from '../setup.js';
 
 const CLI_FILENAME = 'cli.yaml';
 const PROJECT_DIR = 'powersync';
@@ -25,6 +26,8 @@ describe('destroy', () => {
   let origPsToken: string | undefined;
 
   beforeEach(() => {
+    resetManagementClientMocks();
+
     origCwd = process.cwd();
     origPsToken = process.env.TOKEN;
     tmpDir = mkdtempSync(join(tmpdir(), 'destroy-test-'));

cli/test/commands/fetch/config.test.ts

@@ -1,25 +1,20 @@
 import { Config } from '@oclif/core';
 import { captureOutput, runCommand } from '@oclif/test';
-import { PowerSyncManagementClient } from '@powersync/management-client';
 import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 import FetchConfigCommand from '../../../src/commands/fetch/config.js';
 import { root } from '../../helpers/root.js';
+import { managementClientMock, resetManagementClientMocks } from '../../setup.js';
 
 const PROJECT_DIR = 'powersync';
 const SERVICE_FILENAME = 'service.yaml';
 
 /** Minimal valid cloud config decodable by ServiceCloudConfig. */
 const MOCK_CONFIG = { _type: 'cloud' as const, name: 'test-instance', region: 'us' };
 
-const mockCloudClient = {
-  deployInstance: vi.fn(),
-  getInstanceConfig: vi.fn()
-};
-
 function writeServiceYaml(projectDir: string, type: 'cloud' | 'self-hosted') {
   writeFileSync(join(projectDir, SERVICE_FILENAME), `_type: ${type}\nregion: us\n`, 'utf8');
 }
@@ -38,16 +33,18 @@ describe('fetch config', () => {
     const args = ['--directory', directory];
     if (opts?.output) args.push('--output', opts.output);
     const cmd = new FetchConfigCommand(args, oclifConfig);
-    cmd.client = mockCloudClient as unknown as PowerSyncManagementClient;
+    cmd.client = managementClientMock as unknown as FetchConfigCommand['client'];
     return captureOutput(() => cmd.run());
   }
 
   beforeEach(() => {
+    resetManagementClientMocks();
+
     origCwd = process.cwd();
     tmpDir = mkdtempSync(join(tmpdir(), 'fetch-config-test-'));
     process.chdir(tmpDir);
-    mockCloudClient.getInstanceConfig.mockReset();
-    mockCloudClient.getInstanceConfig.mockRejectedValue(new Error('network error'));
+    managementClientMock.getInstanceConfig.mockReset();
+    managementClientMock.getInstanceConfig.mockRejectedValue(new Error('network error'));
   });
 
   afterEach(() => {
@@ -89,7 +86,7 @@ describe('fetch config', () => {
     });
 
     it('default output is yaml and prints fetched object (config + optional syncRules) to stdout', async () => {
-      mockCloudClient.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
+      managementClientMock.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
       const result = await runFetchConfigDirect();
       expect(result.error).toBeUndefined();
       expect(result.stdout).toContain('config:');
@@ -98,7 +95,7 @@ describe('fetch config', () => {
     });
 
     it('--output yaml prints fetched object as YAML to stdout', async () => {
-      mockCloudClient.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
+      managementClientMock.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
       const result = await runFetchConfigDirect({ output: 'yaml' });
       expect(result.error).toBeUndefined();
       expect(result.stdout).toContain('config:');
@@ -107,7 +104,7 @@ describe('fetch config', () => {
     });
 
     it('--output json prints fetched object (config, syncRules) as JSON to stdout', async () => {
-      mockCloudClient.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
+      managementClientMock.getInstanceConfig.mockResolvedValueOnce({ config: MOCK_CONFIG });
       const result = await runFetchConfigDirect({ output: 'json' });
       expect(result.error).toBeUndefined();
       const parsed = JSON.parse(result.stdout) as { config: typeof MOCK_CONFIG };
@@ -116,7 +113,7 @@ describe('fetch config', () => {
 
     it('--output json includes syncRules when returned', async () => {
       const syncRules = 'bucket_definitions: []\n';
-      mockCloudClient.getInstanceConfig.mockResolvedValueOnce({
+      managementClientMock.getInstanceConfig.mockResolvedValueOnce({
         config: MOCK_CONFIG,
         sync_rules: syncRules
       } as { config: typeof MOCK_CONFIG; sync_rules: string });

cli/test/commands/stop.test.ts

@@ -5,6 +5,7 @@ import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { root } from '../helpers/root.js';
+import { resetManagementClientMocks } from '../setup.js';
 
 const CLI_FILENAME = 'cli.yaml';
 const PROJECT_DIR = 'powersync';
@@ -25,6 +26,8 @@ describe('stop', () => {
   let origPsToken: string | undefined;
 
   beforeEach(() => {
+    resetManagementClientMocks();
+
     origCwd = process.cwd();
     origPsToken = process.env.TOKEN;
     tmpDir = mkdtempSync(join(tmpdir(), 'stop-test-'));

cli/test/setup.ts

@@ -1,4 +1,40 @@
 import { Config } from '@oclif/core';
+import { vi } from 'vitest';
+
+// Normalize env so tests don't inherit real linking values
+delete process.env.INSTANCE_ID;
+delete process.env.ORG_ID;
+delete process.env.PROJECT_ID;
+
+export const managementClientMock = {
+  deactivateInstance: vi.fn(),
+  deployInstance: vi.fn(),
+  getInstanceConfig: vi.fn(),
+  getInstanceStatus: vi.fn(),
+  listRegions: vi.fn(),
+  testConnection: vi.fn(),
+  validateSyncRules: vi.fn()
+};
+
+export function resetManagementClientMocks(): void {
+  managementClientMock.deactivateInstance.mockRejectedValue(new Error('mock deactivate failure'));
+  managementClientMock.deployInstance.mockRejectedValue(new Error('mock deploy failure'));
+  managementClientMock.getInstanceConfig.mockRejectedValue(new Error('mock getInstanceConfig failure'));
+  managementClientMock.getInstanceStatus.mockRejectedValue(new Error('mock getInstanceStatus failure'));
+  managementClientMock.listRegions.mockResolvedValue({ regions: [{ name: 'us' }] });
+  managementClientMock.testConnection.mockResolvedValue({
+    configuration: { success: true },
+    connection: { reachable: true, success: true },
+    success: true
+  });
+  managementClientMock.validateSyncRules.mockResolvedValue({ errors: [] });
+}
+
+resetManagementClientMocks();
+
+vi.mock('@powersync/management-client', () => ({
+  PowerSyncManagementClient: vi.fn().mockImplementation(() => managementClientMock)
+}));
 
 import { root } from './helpers/root.js';