neonctl 1.23.2 → 1.24.0

package/commands/branches.js

@@ -12,6 +12,13 @@ const BRANCH_FIELDS = [
     'created_at',
     'updated_at',
 ];
+const BRANCH_FIELDS_RESET = [
+    'id',
+    'name',
+    'primary',
+    'created_at',
+    'last_reset_at',
+];
 export const command = 'branches';
 export const describe = 'Manage branches';
 export const aliases = ['branch'];
@@ -56,6 +63,16 @@ export const builder = (argv) => argv
         default: false,
     },
 }), async (args) => await create(args))
+    .command('reset <id|name>', 'Reset a branch', (yargs) => yargs.options({
+    parent: {
+        describe: 'Reset to a parent branch',
+        type: 'boolean',
+        default: false,
+    },
+    'preserve-under-name': {
+        describe: 'Name under which to preserve the old branch',
+    },
+}), async (args) => await reset(args))
     .command('rename <id|name> <new-name>', 'Rename a branch', (yargs) => yargs, async (args) => await rename(args))
     .command('set-primary <id|name>', 'Set a branch as primary', (yargs) => yargs, async (args) => await setPrimary(args))
     .command('add-compute <id|name>', 'Add a compute to a branch', (yargs) => yargs.options({
@@ -194,3 +211,26 @@ const addCompute = async (props) => {
         fields: ['id', 'host'],
     });
 };
+const reset = async (props) => {
+    if (!props.parent) {
+        throw new Error('Only resetting to parent is supported for now');
+    }
+    const branchId = await branchIdFromProps(props);
+    const { data: { branch }, } = await props.apiClient.getProjectBranch(props.projectId, branchId);
+    if (!branch.parent_id) {
+        throw new Error('Branch has no parent');
+    }
+    const { data } = await retryOnLock(() => props.apiClient.request({
+        method: 'POST',
+        path: `/projects/${props.projectId}/branches/${branch.id}/reset`,
+        body: {
+            source_branch_id: branch.parent_id,
+            preserve_under_name: props.preserveUnderName || undefined,
+        },
+    }));
+    const resultBranch = data.branch;
+    writer(props).end(resultBranch, {
+        // need to reset types until we expose reset api
+        fields: BRANCH_FIELDS_RESET,
+    });
+};

package/commands/branches.test.js

@@ -250,4 +250,18 @@ describe('branches', () => {
             snapshot: true,
         },
     });
+    testCliCommand({
+        name: 'reset branch to parent',
+        args: [
+            'branches',
+            'reset',
+            'test_branch',
+            '--project-id',
+            'test',
+            '--parent',
+        ],
+        expected: {
+            snapshot: true,
+        },
+    });
 });

package/commands/set_context.test.js

@@ -1,6 +1,6 @@
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { rmSync } from 'node:fs';
+import { rmSync, writeFileSync } from 'node:fs';
 import { afterAll, describe } from '@jest/globals';
 import { testCliCommand } from '../test_utils/test_cli_command';
 const CONTEXT_FILE = join(tmpdir(), `neon_${Date.now()}`);
@@ -26,5 +26,28 @@ describe('set_context', () => {
                 snapshot: true,
             },
         });
+        const overrideContextFile = join(tmpdir(), `neon_override_ctx_${Date.now()}`);
+        testCliCommand({
+            name: 'get branch id overrides context set branch',
+            before: async () => {
+                writeFileSync(overrideContextFile, JSON.stringify({
+                    projectId: 'test',
+                    branchId: 'br-cloudy-branch-12345678',
+                }));
+            },
+            after: async () => {
+                rmSync(overrideContextFile);
+            },
+            args: [
+                'branches',
+                'get',
+                'br-sunny-branch-123456',
+                '--context-file',
+                overrideContextFile,
+            ],
+            expected: {
+                snapshot: true,
+            },
+        });
     });
 });

package/context.js

@@ -36,7 +36,7 @@ export const enrichFromContext = (args) => {
         return;
     }
     const context = readContextFile(args.contextFile);
-    if (!args.branch) {
+    if (!args.branch && !args.id && !args.name) {
         args.branch = context.branchId;
     }
     if (!args.projectId) {

package/help.js

@@ -23,6 +23,11 @@ const formatHelp = (help) => {
         });
         commandsBlock.forEach((line) => {
             const [command, description] = splitColumns(line);
+            // patch the previous command if it was multiline
+            if (!description && ui.rows.length > 1) {
+                ui.rows[ui.rows.length - 2][0].text += command;
+                return;
+            }
             ui.div(chalk.cyan(command));
             ui.div({
                 text: chalk.gray(drawPointer(SPACE_WIDTH)),

package/package.json

@@ -5,7 +5,7 @@
     "url": "git@github.com:neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",

package/test_utils/test_cli_command.js

@@ -4,13 +4,19 @@ import { join } from 'node:path';
 import { log } from '../log.js';
 import strip from 'strip-ansi';
 import { runMockServer } from './mock_server.js';
-export const testCliCommand = ({ args, name, expected, mockDir = 'main', }) => {
+export const testCliCommand = ({ args, name, expected, before, after, mockDir = 'main', }) => {
     let server;
     describe(name, () => {
         beforeAll(async () => {
+            if (before) {
+                await before();
+            }
             server = await runMockServer(mockDir);
         });
         afterAll(async () => {
+            if (after) {
+                await after();
+            }
             return new Promise((resolve) => {
                 server.close(() => {
                     resolve();