neonctl 1.32.1 → 1.34.0

package/commands/connection_string.test.js

@@ -1,9 +1,8 @@
 import { describe, expect } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command';
+import { test } from '../test_utils/fixtures';
 describe('connection_string', () => {
-    testCliCommand({
-        name: 'connection_string',
-        args: [
+    test('connection_string', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -12,14 +11,10 @@ describe('connection_string', () => {
             'test_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string branch id',
-        args: [
+    test('connection_string branch id', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'br-sunny-branch-123456',
             '--project-id',
@@ -28,14 +23,10 @@ describe('connection_string', () => {
             'test_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string branch id 8 digits',
-        args: [
+    test('connection_string branch id 8 digits', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'br-cloudy-branch-12345678',
             '--project-id',
@@ -44,14 +35,10 @@ describe('connection_string', () => {
             'test_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string pooled',
-        args: [
+    test('connection_string pooled', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -61,14 +48,10 @@ describe('connection_string', () => {
             '--role-name',
             'test_role',
             '--pooled',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string prisma',
-        args: [
+    test('connection_string prisma', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -78,14 +61,10 @@ describe('connection_string', () => {
             '--role-name',
             'test_role',
             '--prisma',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string prisma pooled',
-        args: [
+    test('connection_string prisma pooled', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -96,14 +75,10 @@ describe('connection_string', () => {
             'test_role',
             '--prisma',
             '--pooled',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string prisma pooled extended',
-        args: [
+    test('connection_string prisma pooled extended', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -115,22 +90,15 @@ describe('connection_string', () => {
             '--prisma',
             '--pooled',
             '--extended',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string without any args should pass',
-        args: ['connection-string'],
-        mockDir: 'single_project',
-        expected: {
-            snapshot: true,
-        },
+    test('connection_string without any args should pass', async ({ testCliCommand, }) => {
+        await testCliCommand(['connection-string'], {
+            mockDir: 'single_project',
+        });
     });
-    testCliCommand({
-        name: 'connection_string with psql',
-        args: [
+    test('connection_string with psql', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -140,14 +108,10 @@ describe('connection_string', () => {
             '--role-name',
             'test_role',
             '--psql',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string with psql and psql args',
-        args: [
+    test('connection_string with psql and psql args', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -160,14 +124,10 @@ describe('connection_string', () => {
             '--',
             '-c',
             'SELECT 1',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string without ssl',
-        args: [
+    test('connection_string without ssl', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -178,14 +138,10 @@ describe('connection_string', () => {
             'test_role',
             '--ssl',
             'omit',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string with ssl verify full',
-        args: [
+    test('connection_string with ssl verify full', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -196,14 +152,10 @@ describe('connection_string', () => {
             'test_role',
             '--ssl',
             'verify-full',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string with lsn',
-        args: [
+    test('connection_string with lsn', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch@0/123456',
             '--project-id',
@@ -212,14 +164,10 @@ describe('connection_string', () => {
             'test_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string with timestamp',
-        args: [
+    test('connection_string with timestamp', async ({ testCliCommand }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch@2021-01-01T00:00:00Z',
             '--project-id',
@@ -228,14 +176,10 @@ describe('connection_string', () => {
             'test_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'connection_string fails for non-existing database',
-        args: [
+    test('connection_string fails for non-existing database', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'connection-string',
             'test_branch',
             '--project-id',
@@ -244,10 +188,9 @@ describe('connection_string', () => {
             'non_existing_db',
             '--role-name',
             'test_role',
-        ],
-        expected: {
+        ], {
             code: 1,
             stderr: expect.stringMatching(/Database not found/),
-        },
+        });
     });
 });

package/commands/databases.js

@@ -1,7 +1,7 @@
 import { retryOnLock } from '../api.js';
 import { branchIdFromProps, fillSingleProject } from '../utils/enrichers.js';
 import { writer } from '../writer.js';
-const DATABASE_FIELDS = ['name', 'owner_name', 'created_at'];
+export const DATABASE_FIELDS = ['name', 'owner_name', 'created_at'];
 export const command = 'databases';
 export const describe = 'Manage databases';
 export const aliases = ['database', 'db'];
@@ -18,7 +18,7 @@ export const builder = (argv) => argv
     },
 })
     .middleware(fillSingleProject)
-    .command('list', 'List databases', (yargs) => yargs, async (args) => await list(args))
+    .command('list', 'List databases', (yargs) => yargs, (args) => list(args))
     .command('create', 'Create a database', (yargs) => yargs.options({
     name: {
         describe: 'Database name',
@@ -29,8 +29,8 @@ export const builder = (argv) => argv
         describe: 'Owner name',
         type: 'string',
     },
-}), async (args) => await create(args))
-    .command('delete <database>', 'Delete a database', (yargs) => yargs, async (args) => await deleteDb(args));
+}), (args) => create(args))
+    .command('delete <database>', 'Delete a database', (yargs) => yargs, (args) => deleteDb(args));
 export const handler = (args) => {
     return args;
 };

package/commands/databases.test.js

@@ -1,23 +1,18 @@
 import { describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('databases', () => {
-    testCliCommand({
-        name: 'list',
-        args: [
+    test('list', async ({ testCliCommand }) => {
+        await testCliCommand([
             'databases',
             'list',
             '--project-id',
             'test',
             '--branch',
             'test_branch',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'create',
-        args: [
+    test('create', async ({ testCliCommand }) => {
+        await testCliCommand([
             'databases',
             'create',
             '--project-id',
@@ -28,14 +23,10 @@ describe('databases', () => {
             'test_db',
             '--owner-name',
             'test_owner',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'delete',
-        args: [
+    test('delete', async ({ testCliCommand }) => {
+        await testCliCommand([
             'databases',
             'delete',
             'test_db',
@@ -43,9 +34,6 @@ describe('databases', () => {
             'test',
             '--branch',
             'test_branch',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
 });

package/commands/help.test.js

@@ -1,11 +1,9 @@
 import { describe, expect } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('help', () => {
-    testCliCommand({
-        name: 'without args',
-        args: [],
-        expected: {
+    test('without args', async ({ testCliCommand }) => {
+        await testCliCommand([], {
             stderr: expect.stringContaining(`neonctl <command> [options]`),
-        },
+        });
     });
 });

package/commands/ip_allow.test.js

@@ -1,33 +1,23 @@
 import { describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('ip-allow', () => {
-    testCliCommand({
-        name: 'list IP allow',
-        args: ['ip-allow', 'list', '--project-id', 'test'],
-        expected: {
-            snapshot: true,
-        },
+    test('list IP allow', async ({ testCliCommand }) => {
+        await testCliCommand(['ip-allow', 'list', '--project-id', 'test']);
     });
-    testCliCommand({
-        name: 'list IP Allow with single-project',
-        args: ['ip-allow', 'list'],
-        mockDir: 'single_project',
-        expected: {
-            snapshot: true,
-        },
+    test('list IP Allow with single-project', async ({ testCliCommand }) => {
+        await testCliCommand(['ip-allow', 'list'], {
+            mockDir: 'single_project',
+        });
     });
-    testCliCommand({
-        name: 'Add IP allow - Error',
-        args: ['ip-allow', 'add', '--projectId', 'test'],
-        expected: {
+    test('Add IP allow - Error', async ({ testCliCommand }) => {
+        await testCliCommand(['ip-allow', 'add', '--projectId', 'test'], {
             code: 1,
             stderr: `ERROR: Enter individual IP addresses, define ranges with a dash, or use CIDR notation for more flexibility.
-       Example: neonctl ip-allow add 192.168.1.1, 192.168.1.20-192.168.1.50, 192.168.1.0/24 --project-id <id>`,
-        },
+         Example: neonctl ip-allow add 192.168.1.1, 192.168.1.20-192.168.1.50, 192.168.1.0/24 --project-id <id>`,
+        });
     });
-    testCliCommand({
-        name: 'Add IP allow - Primary',
-        args: [
+    test('Add IP allow - Primary', async ({ testCliCommand }) => {
+        await testCliCommand([
             'ip-allow',
             'add',
             '127.0.0.1',
@@ -35,14 +25,10 @@ describe('ip-allow', () => {
             '--primary-only',
             '--project-id',
             'test',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'Add IP allow - Protected',
-        args: [
+    test('Add IP allow - Protected', async ({ testCliCommand }) => {
+        await testCliCommand([
             'ip-allow',
             'add',
             '127.0.0.1',
@@ -50,45 +36,35 @@ describe('ip-allow', () => {
             '--protected-only',
             '--project-id',
             'test',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'Remove IP allow - Error',
-        args: ['ip-allow', 'remove', '--project-id', 'test'],
-        expected: {
+    test('Remove IP allow - Error', async ({ testCliCommand }) => {
+        await testCliCommand(['ip-allow', 'remove', '--project-id', 'test'], {
             code: 1,
             stderr: `ERROR: Remove individual IP addresses and ranges. Example: neonctl ip-allow remove 192.168.1.1 --project-id <id>`,
-        },
+        });
     });
-    testCliCommand({
-        name: 'Remove IP allow',
-        args: ['ip-allow', 'remove', '192.168.1.1', '--project-id', 'test'],
-        expected: {
-            snapshot: true,
-        },
+    test('Remove IP allow', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'ip-allow',
+            'remove',
+            '192.168.1.1',
+            '--project-id',
+            'test',
+        ]);
     });
-    testCliCommand({
-        name: 'Reset IP allow',
-        args: ['ip-allow', 'reset', '--project-id', 'test'],
-        expected: {
-            snapshot: true,
-            stdout: `id: test
-name: test_project
-IP_addresses: []
-primary_branch_only: false
-protected_branches_only: false
-`,
+    test('Reset IP allow', async ({ testCliCommand }) => {
+        await testCliCommand(['ip-allow', 'reset', '--project-id', 'test'], {
             stderr: `INFO: The IP allowlist has been reset. All databases on project "test_project" are now exposed to the internet`,
-        },
+        });
     });
-    testCliCommand({
-        name: 'Reset IP allow to new list',
-        args: ['ip-allow', 'reset', '192.168.2.2', '--project-id', 'test'],
-        expected: {
-            snapshot: true,
-        },
+    test('Reset IP allow to new list', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'ip-allow',
+            'reset',
+            '192.168.2.2',
+            '--project-id',
+            'test',
+        ]);
     });
 });

package/commands/operations.js

@@ -13,7 +13,7 @@ export const builder = (argv) => argv
     },
 })
     .middleware(fillSingleProject)
-    .command('list', 'List operations', (yargs) => yargs, async (args) => await list(args));
+    .command('list', 'List operations', (yargs) => yargs, (args) => list(args));
 export const handler = (args) => {
     return args;
 };

package/commands/operations.test.js

@@ -1,11 +1,7 @@
 import { describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('operations', () => {
-    testCliCommand({
-        name: 'list',
-        args: ['operations', 'list', '--project-id', 'test'],
-        expected: {
-            snapshot: true,
-        },
+    test('list', async ({ testCliCommand }) => {
+        await testCliCommand(['operations', 'list', '--project-id', 'test']);
     });
 });

package/commands/orgs.test.js

@@ -1,11 +1,7 @@
 import { describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('orgs', () => {
-    testCliCommand({
-        name: 'list',
-        args: ['orgs', 'list'],
-        expected: {
-            snapshot: true,
-        },
+    test('list', async ({ testCliCommand }) => {
+        await testCliCommand(['orgs', 'list']);
     });
 });