neonctl 1.32.1 → 1.34.0

package/commands/projects.test.js

@@ -1,27 +1,17 @@
-import { afterAll, describe, expect, test } from 'vitest';
+import { describe, expect } from 'vitest';
 import { readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
-const CONTEXT_FILE = join(tmpdir(), `neon_project_create_ctx_${Date.now()}`);
+import { test } from '../test_utils/fixtures';
 describe('projects', () => {
-    testCliCommand({
-        name: 'list',
-        args: ['projects', 'list'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create',
-        args: ['projects', 'create', '--name', 'test_project'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create with database and role',
-        args: [
+    test('list', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'list']);
+    });
+    test('create', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'create', '--name', 'test_project']);
+    });
+    test('create with database and role', async ({ testCliCommand }) => {
+        await testCliCommand([
             'projects',
             'create',
             '--name',
@@ -30,21 +20,19 @@ describe('projects', () => {
             'test_db',
             '--role',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create and connect with psql',
-        args: ['projects', 'create', '--name', 'test_project', '--psql'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create and connect with psql and psql args',
-        args: [
+        ]);
+    });
+    test('create and connect with psql', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'projects',
+            'create',
+            '--name',
+            'test_project',
+            '--psql',
+        ]);
+    });
+    test('create and connect with psql and psql args', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'projects',
             'create',
             '--name',
@@ -53,14 +41,11 @@ describe('projects', () => {
             '--',
             '-c',
             'SELECT 1',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create project with setting the context',
-        args: [
+        ]);
+    });
+    test('create project with setting the context', async ({ testCliCommand, }) => {
+        const CONTEXT_FILE = join(tmpdir(), `neon_project_create_ctx_${Date.now()}`);
+        await testCliCommand([
             'projects',
             'create',
             '--name',
@@ -68,62 +53,44 @@ describe('projects', () => {
             '--context-file',
             CONTEXT_FILE,
             '--set-context',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create project with default fixed size CU',
-        args: [
+        ]);
+        expect(readFileSync(CONTEXT_FILE, 'utf-8')).toContain('new-project-123456');
+        rmSync(CONTEXT_FILE);
+    });
+    test('create project with default fixed size CU', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'projects',
             'create',
             '--name',
             'test_project_with_fixed_cu',
             '--cu',
             '2',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'create project with default autoscaled CU',
-        args: [
+        ]);
+    });
+    test('create project with default autoscaled CU', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'projects',
             'create',
             '--name',
             'test_project_with_autoscaling',
             '--cu',
             '0.5-2',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    afterAll(() => {
-        rmSync(CONTEXT_FILE);
+    test('delete', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'delete', 'test']);
     });
-    test('context file should exist and contain the project id', () => {
-        expect(readFileSync(CONTEXT_FILE, 'utf-8')).toContain('new-project-123456');
+    test('update name', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'projects',
+            'update',
+            'test',
+            '--name',
+            'test_project_new_name',
+        ]);
     });
-    testCliCommand({
-        name: 'delete',
-        args: ['projects', 'delete', 'test'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update name',
-        args: ['projects', 'update', 'test', '--name', 'test_project_new_name'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update ip allow',
-        args: [
+    test('update ip allow', async ({ testCliCommand }) => {
+        await testCliCommand([
             'projects',
             'update',
             'test',
@@ -131,50 +98,39 @@ describe('projects', () => {
             '127.0.0.1',
             '192.168.1.2/22',
             '--ip-primary-only',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update ip allow primary only flag',
-        args: ['projects', 'update', 'test', '--ip-primary-only', 'false'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update ip allow remove',
-        args: ['projects', 'update', 'test', '--ip-allow'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update project with default fixed size CU',
-        args: ['projects', 'update', 'test_project_with_fixed_cu', '--cu', '2'],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'update project with default autoscaled CU',
-        args: [
+        ]);
+    });
+    test('update ip allow primary only flag', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'projects',
+            'update',
+            'test',
+            '--ip-primary-only',
+            'false',
+        ]);
+    });
+    test('update ip allow remove', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'update', 'test', '--ip-allow']);
+    });
+    test('update project with default fixed size CU', async ({ testCliCommand, }) => {
+        await testCliCommand([
+            'projects',
+            'update',
+            'test_project_with_fixed_cu',
+            '--cu',
+            '2',
+        ]);
+    });
+    test('update project with default autoscaled CU', async ({ testCliCommand, }) => {
+        await testCliCommand([
             'projects',
             'update',
             'test_project_with_autoscaling',
             '--cu',
             '0.5-2',
-        ],
-        expected: {
-            snapshot: true,
-        },
-    });
-    testCliCommand({
-        name: 'get',
-        args: ['projects', 'get', 'test'],
-        expected: {
-            snapshot: true,
-        },
+        ]);
+    });
+    test('get', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'get', 'test']);
     });
 });

package/commands/roles.js

@@ -18,15 +18,15 @@ export const builder = (argv) => argv
     },
 })
     .middleware(fillSingleProject)
-    .command('list', 'List roles', (yargs) => yargs, async (args) => await list(args))
+    .command('list', 'List roles', (yargs) => yargs, (args) => list(args))
     .command('create', 'Create a role', (yargs) => yargs.options({
     name: {
         describe: 'Role name',
         type: 'string',
         demandOption: true,
     },
-}), async (args) => await create(args))
-    .command('delete <role>', 'Delete a role', (yargs) => yargs, async (args) => await deleteRole(args));
+}), (args) => create(args))
+    .command('delete <role>', 'Delete a role', (yargs) => yargs, (args) => deleteRole(args));
 export const handler = (args) => {
     return args;
 };

package/commands/roles.test.js

@@ -1,16 +1,18 @@
 import { describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command.js';
+import { test } from '../test_utils/fixtures';
 describe('roles', () => {
-    testCliCommand({
-        name: 'list',
-        args: ['roles', 'list', '--project-id', 'test', '--branch', 'test_branch'],
-        expected: {
-            snapshot: true,
-        },
+    test('list', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'roles',
+            'list',
+            '--project-id',
+            'test',
+            '--branch',
+            'test_branch',
+        ]);
     });
-    testCliCommand({
-        name: 'create',
-        args: [
+    test('create', async ({ testCliCommand }) => {
+        await testCliCommand([
             'roles',
             'create',
             '--project-id',
@@ -19,14 +21,10 @@ describe('roles', () => {
             'test_branch',
             '--name',
             'test_role',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
-    testCliCommand({
-        name: 'delete',
-        args: [
+    test('delete', async ({ testCliCommand }) => {
+        await testCliCommand([
             'roles',
             'delete',
             'test_role',
@@ -34,9 +32,6 @@ describe('roles', () => {
             'test',
             '--branch',
             'test_branch',
-        ],
-        expected: {
-            snapshot: true,
-        },
+        ]);
     });
 });

package/commands/set_context.js

@@ -7,7 +7,7 @@ export const builder = (argv) => argv.usage('$0 set-context [options]').options(
         type: 'string',
     },
 });
-export const handler = async (props) => {
+export const handler = (props) => {
     const context = {
         projectId: props.projectId,
     };

package/commands/set_context.test.js

@@ -1,93 +1,96 @@
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { rmSync, writeFileSync } from 'node:fs';
-import { afterAll, describe } from 'vitest';
-import { testCliCommand } from '../test_utils/test_cli_command';
+import { rmSync, writeFileSync, readFileSync } from 'node:fs';
+import { describe, expect } from 'vitest';
+import { test as originalTest } from '../test_utils/fixtures';
 const CONTEXT_FILE = join(tmpdir(), `neon_${Date.now()}`);
+const test = originalTest.extend({
+    // eslint-disable-next-line no-empty-pattern
+    cleanupFile: async ({}, use) => {
+        let writtenFilename;
+        await use((name) => (writtenFilename = name));
+        if (writtenFilename) {
+            rmSync(writtenFilename);
+        }
+    },
+    writeFile: async ({ cleanupFile }, use) => {
+        await use((name, content) => {
+            writeFileSync(name, JSON.stringify(content));
+            cleanupFile(name);
+        });
+    },
+    readFile: async ({ cleanupFile }, use) => {
+        await use((name) => {
+            const content = readFileSync(name, 'utf-8');
+            cleanupFile(name);
+            return content;
+        });
+    },
+});
 describe('set_context', () => {
-    afterAll(() => {
-        rmSync(CONTEXT_FILE);
-    });
     describe('should set the context', () => {
-        testCliCommand({
-            name: 'set-context',
-            args: [
+        test('set-context', async ({ testCliCommand, readFile }) => {
+            await testCliCommand([
                 'set-context',
                 '--project-id',
                 'test',
                 '--context-file',
                 CONTEXT_FILE,
-            ],
+            ]);
+            expect(readFile(CONTEXT_FILE)).toMatchSnapshot();
         });
-        testCliCommand({
-            name: 'list branches selecting project from the context',
-            args: ['branches', 'list', '--context-file', CONTEXT_FILE],
-            expected: {
-                snapshot: true,
-            },
+        test('list branches selecting project from the context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(CONTEXT_FILE, {
+                projectId: 'test',
+            });
+            await testCliCommand([
+                'branches',
+                'list',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
         });
         const overrideContextFile = join(tmpdir(), `neon_override_ctx_${Date.now()}`);
-        testCliCommand({
-            name: 'get project id overrides context set project',
-            before: async () => {
-                writeFileSync(overrideContextFile, JSON.stringify({
-                    projectId: 'new-project id',
-                }));
-            },
-            after: async () => {
-                rmSync(overrideContextFile);
-            },
-            args: [
+        test('get project id overrides context set project', async ({ testCliCommand, writeFile, }) => {
+            writeFile(overrideContextFile, {
+                projectId: 'new-project id',
+            });
+            await testCliCommand([
                 'project',
                 'get',
                 'project-id-123',
                 '--context-file',
                 overrideContextFile,
-            ],
-            expected: {
-                snapshot: true,
-            },
+            ]);
         });
-        testCliCommand({
-            name: 'set the branchId and projectId is from context',
-            before: async () => {
-                writeFileSync(overrideContextFile, JSON.stringify({
-                    projectId: 'test',
-                    branchId: 'test_branch',
-                }));
-            },
-            after: async () => {
-                rmSync(overrideContextFile);
-            },
-            args: ['databases', 'list', '--context-file', overrideContextFile],
-            expected: {
-                snapshot: true,
-            },
+        test('set the branchId and projectId is from context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(overrideContextFile, {
+                projectId: 'test',
+                branchId: 'test_branch',
+            });
+            await testCliCommand([
+                'databases',
+                'list',
+                '--context-file',
+                overrideContextFile,
+            ]);
         });
-        testCliCommand({
-            name: 'should not set branchId from context for non-context projectId',
-            before: async () => {
-                writeFileSync(overrideContextFile, JSON.stringify({
-                    projectId: 'project-id-123',
-                    branchId: 'test_branch',
-                }));
-            },
-            after: async () => {
-                rmSync(overrideContextFile);
-            },
-            args: [
+        test('set the branchId and projectId is from context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(overrideContextFile, {
+                projectId: 'project-id-123',
+                branchId: 'test_branch',
+            });
+            await testCliCommand([
                 'databases',
                 'list',
                 '--project-id',
                 'test',
                 '--context-file',
                 overrideContextFile,
-            ],
-            expected: {
+            ], {
                 code: 1,
                 stderr: 'ERROR: Not Found',
-                snapshot: true,
-            },
+            });
         });
     });
 });

package/config.js

@@ -4,7 +4,7 @@ import { existsSync, mkdirSync } from 'node:fs';
 import { isCi } from './env.js';
 export const CREDENTIALS_FILE = 'credentials.json';
 export const defaultDir = join(process.env.XDG_CONFIG_HOME || join(homedir(), '.config'), 'neonctl');
-export const ensureConfigDir = async ({ 'config-dir': configDir, 'force-auth': forceAuth, }) => {
+export const ensureConfigDir = ({ 'config-dir': configDir, 'force-auth': forceAuth, }) => {
     if (!existsSync(configDir) && (!isCi() || forceAuth)) {
         mkdirSync(configDir, { recursive: true });
     }

package/context.js

@@ -15,7 +15,7 @@ export const currentContextFile = () => {
                 accessSync(resolve(currentDir, file));
                 return wrapWithContextFile(currentDir);
             }
-            catch (e) {
+            catch {
                 // ignore
             }
         }
@@ -27,7 +27,7 @@ export const readContextFile = (file) => {
     try {
         return JSON.parse(readFileSync(file, 'utf-8'));
     }
-    catch (e) {
+    catch {
         return {};
     }
 };

package/help.js

@@ -22,7 +22,7 @@ const formatHelp = (help) => {
             width: 0,
         });
         commandsBlock.forEach((line) => {
-            if (line.match(/^\s{3,}/)) {
+            if (/^\s{3,}/.exec(line)) {
                 ui.div({
                     text: '',
                     width: SPACE_WIDTH,

package/index.js

@@ -108,7 +108,9 @@ builder = builder
         default: true,
     },
 })
-    .middleware((args) => fillInArgs(args), true)
+    .middleware((args) => {
+    fillInArgs(args);
+}, true)
     .help(false)
     .group('help', 'Global options:')
     .option('help', {
@@ -168,10 +170,12 @@ builder = builder
         log.error(msg || err?.message);
     }
     await closeAnalytics();
-    err?.stack && log.debug('Stack: %s', err.stack);
+    if (err?.stack) {
+        log.debug('Stack: %s', err.stack);
+    }
     process.exit(1);
 });
-(async () => {
+void (async () => {
     try {
         const args = await builder.argv;
         if (args._.length === 0 || args.help) {

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "1.32.1",
+  "version": "1.34.0",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",
@@ -22,6 +22,7 @@
     "@apidevtools/swagger-parser": "^10.1.0",
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
+    "@eslint/js": "^9.6.0",
     "@rollup/plugin-commonjs": "^25.0.2",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",
@@ -30,16 +31,15 @@
     "@types/bun": "^1.1.4",
     "@types/cli-table": "^0.3.0",
     "@types/diff": "^5.2.1",
+    "@types/eslint__js": "^8.42.3",
     "@types/express": "^4.17.17",
     "@types/node": "^18.7.13",
     "@types/prompts": "2.4.9",
     "@types/validate-npm-package-name": "4.0.2",
     "@types/which": "^3.0.0",
     "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^5.34.0",
-    "@typescript-eslint/parser": "^5.34.0",
     "emocks": "^3.0.1",
-    "eslint": "^8.22.0",
+    "eslint": "^9.6.0",
     "express": "^4.18.2",
     "husky": "^8.0.3",
     "lint-staged": "^13.0.3",
@@ -50,15 +50,17 @@
     "semantic-release": "^23.0.8",
     "strip-ansi": "^7.1.0",
     "typescript": "^4.7.4",
+    "typescript-eslint": "v8.0.0-alpha.41",
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@neondatabase/api-client": "1.9.0",
+    "@neondatabase/api-client": "^1.10.0",
     "@segment/analytics-node": "^1.0.0-beta.26",
     "axios": "^1.4.0",
     "axios-debug-log": "^1.0.0",
     "chalk": "^5.2.0",
     "cli-table": "^0.3.11",
+    "crypto-random-string": "^5.0.0",
     "diff": "^5.2.0",
     "inquirer": "^9.2.6",
     "open": "^10.1.0",
@@ -91,8 +93,8 @@
   "scripts": {
     "watch": "tsc --watch",
     "typecheck": "tsc --noEmit",
-    "lint": "npm run typecheck && eslint src --ext .ts && prettier --check .",
-    "lint:fix": "npm run typecheck && eslint src --ext .ts --fix && prettier --w .",
+    "lint": "npm run typecheck && eslint src && prettier --check .",
+    "lint:fix": "npm run typecheck && eslint src --fix && prettier --w .",
     "build": "bun generateParams && bun clean && tsc && cp src/*.html package*.json README.md ./dist",
     "clean": "rm -rf dist",
     "generateParams": "bun generateOptionsFromSpec.ts",