neonctl 1.27.0-beta.0 → 1.27.0

package/commands/branches.js

@@ -74,7 +74,15 @@ export const builder = (argv) => argv
         describe: 'Name under which to preserve the old branch',
     },
 }), async (args) => await reset(args))
-    .command('restore <id|name> <point-in-time>', 'Restore a branch to a point in time.\nPoint in time format is following ^self|^parent|source-branch-(id|name)[@(lsn|timestamp)]', (yargs) => yargs
+    .command('restore <target-id|name> <source>[@(timestamp|lsn)]', 'Restores a branch to a specific point in time\n<source> can be: ^self, ^parent, or <source-branch-id|name>', (yargs) => yargs
+    // we want to show meaningful help for the command
+    // but it makes yargs to fail on parsing the command
+    // so we need to fill in the missing args manually
+    .middleware((args) => {
+    args.id = args.targetId;
+    args.pointInTime = args['source@(timestamp'];
+})
+    .usage('$0 branches restore <target-id|name> <source>[@(timestamp|lsn)]')
     .options({
     'preserve-under-name': {
         describe: 'Name under which to preserve the old branch',
@@ -83,19 +91,19 @@ export const builder = (argv) => argv
     .example([
     [
         '$0 branches restore main br-source-branch-123456',
-        'Restore main to the head of the branch with id br-source-branch-123456',
+        'Restores main to the head of the branch with id br-source-branch-123456',
     ],
     [
         '$0 branches restore main source@2021-01-01T00:00:00Z',
-        'Restore main to the timestamp 2021-01-01T00:00:00Z of the source branch',
+        'Restores main to the timestamp 2021-01-01T00:00:00Z of the source branch',
     ],
     [
         '$0 branches restore my-branch ^self@0/123456',
-        'Restore my-branch to the LSN 0/123456 of the branch itself',
+        'Restores my-branch to the LSN 0/123456 from its own history',
     ],
     [
         '$0 branches restore my-branch ^parent',
-        'Restore my-branch to the head of the parent branch',
+        'Restore my-branch to the head of its parent branch',
     ],
 ]), async (args) => await restore(args))
     .command('rename <id|name> <new-name>', 'Rename a branch', (yargs) => yargs, async (args) => await rename(args))

package/commands/connection_string.js

@@ -49,6 +49,11 @@ export const builder = (argv) => {
             describe: 'Connect to a database via psql using connection string',
             default: false,
         },
+        ssl: {
+            type: 'boolean',
+            describe: 'Add sslmode=require to the connection string',
+            default: true,
+        },
     })
         .middleware(fillSingleProject);
 };
@@ -107,6 +112,9 @@ export const handler = async (props) => {
             connectionString.searchParams.set('pgbouncer', 'true');
         }
     }
+    if (props.ssl) {
+        connectionString.searchParams.set('sslmode', 'require');
+    }
     if (props.psql) {
         const psqlArgs = props['--'];
         await psql(connectionString.toString(), psqlArgs);

package/commands/connection_string.test.js

@@ -165,4 +165,22 @@ describe('connection_string', () => {
             snapshot: true,
         },
     });
+    testCliCommand({
+        name: 'connection_string without ssl',
+        args: [
+            'connection-string',
+            'test_branch',
+            '--project-id',
+            'test',
+            '--database-name',
+            'test_db',
+            '--role-name',
+            'test_role',
+            '--ssl',
+            'false',
+        ],
+        expected: {
+            snapshot: true,
+        },
+    });
 });

package/help.js

@@ -128,9 +128,10 @@ const formatHelp = (help) => {
             ui.div({
                 text: chalk.bold(command),
                 padding: [0, 0, 0, 0],
-            }, {
-                text: description,
-                padding: [0, 0, 0, 0],
+            });
+            ui.div({
+                text: chalk.reset(description),
+                padding: [0, 0, 0, 2],
             });
         }
         result.push(ui.toString());
@@ -139,7 +140,7 @@ const formatHelp = (help) => {
 };
 export const showHelp = async (argv) => {
     // add wrap to ensure that there are no line breaks
-    const help = await argv.wrap(500).getHelp();
+    const help = await argv.getHelp();
     process.stderr.write(formatHelp(help).join('\n') + '\n');
     process.exit(0);
 };

package/index.js

@@ -145,7 +145,10 @@ builder = builder
             log.error('Authentication failed, please run `neonctl auth`');
         }
         else {
-            log.error('Fail: status: %d %s | path: %s | message: %s', err.response?.status, err.response?.statusText, err.request?.path, err.response?.data?.message);
+            if (err.response?.data?.message) {
+                log.error(err.response?.data?.message);
+            }
+            log.debug('status: %d %s | path: %s', err.response?.status, err.response?.statusText, err.request?.path);
             sendError(err, 'API_ERROR');
         }
     }

package/package.json

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