neonctl 1.9.3 → 1.10.0

package/commands/branches.js

@@ -7,7 +7,7 @@ export const describe = 'Manage branches';
 export const builder = (argv) => argv
     .demandCommand(1, '')
     .fail(commandFailHandler)
-    .usage('usage: $0 branches <cmd> [args]')
+    .usage('usage: $0 branches <sub-command> [options]')
     .options({
     'project.id': {
         describe: 'Project ID',

package/commands/connection_string.js

@@ -2,7 +2,7 @@ export const command = 'connection-string';
 export const aliases = ['cs'];
 export const describe = 'Get connection string';
 export const builder = (argv) => {
-    return argv.usage('usage: $0 connection-string [args]').options({
+    return argv.usage('usage: $0 connection-string [options]').options({
         'project.id': {
             type: 'string',
             describe: 'Project ID',
@@ -23,12 +23,20 @@ export const builder = (argv) => {
             describe: 'Database name',
             demandOption: true,
         },
+        pooled: {
+            type: 'boolean',
+            describe: 'Use pooled connection',
+            default: false,
+        },
     });
 };
 export const handler = async (props) => {
     const { data: { endpoint }, } = await props.apiClient.getProjectEndpoint(props.project.id, props.endpoint.id);
     const { data: password } = await props.apiClient.getProjectBranchRolePassword(props.project.id, endpoint.branch_id, props.role.name);
-    const connectionString = new URL(`postgres://${endpoint.host}`);
+    const host = props.pooled
+        ? endpoint.host.replace(endpoint.id, `${endpoint.id}-pooler`)
+        : endpoint.host;
+    const connectionString = new URL(`postgres://${host}`);
     connectionString.pathname = props.database.name;
     connectionString.username = props.role.name;
     connectionString.password = password.password;

package/commands/connection_string.test.js

@@ -18,4 +18,22 @@ describe('connection_string', () => {
             snapshot: true,
         },
     });
+    testCliCommand({
+        name: 'connection_string pooled',
+        args: [
+            'connection-string',
+            '--project.id',
+            'test',
+            '--endpoint.id',
+            'test_endpoint_id',
+            '--database.name',
+            'test_db',
+            '--role.name',
+            'test_role',
+            '--pooled',
+        ],
+        expected: {
+            snapshot: true,
+        },
+    });
 });

package/commands/databases.js

@@ -7,7 +7,7 @@ export const describe = 'Manage databases';
 export const builder = (argv) => argv
     .demandCommand(1, '')
     .fail(commandFailHandler)
-    .usage('usage: $0 databases <cmd> [args]')
+    .usage('usage: $0 databases <sub-command> [options]')
     .options({
     'project.id': {
         describe: 'Project ID',

package/commands/endpoints.js

@@ -13,7 +13,7 @@ export const describe = 'Manage endpoints';
 export const builder = (argv) => argv
     .demandCommand(1, '')
     .fail(commandFailHandler)
-    .usage('usage: $0 endpoints <cmd> [args]')
+    .usage('usage: $0 endpoints <sub-command> [options]')
     .options({
     'project.id': {
         describe: 'Project ID',

package/commands/help.test.js

@@ -5,7 +5,7 @@ describe('help', () => {
         name: 'without args',
         args: [],
         expected: {
-            stderr: expect.stringContaining('usage: neonctl <cmd> [args]'),
+            stderr: expect.stringContaining('usage: neonctl <command> [options]'),
         },
     });
 });

package/commands/index.js

@@ -1,6 +1,6 @@
 import * as auth from './auth.js';
 import * as projects from './projects.js';
-import * as users from './users.js';
+import * as users from './user.js';
 import * as branches from './branches.js';
 import * as endpoints from './endpoints.js';
 import * as databases from './databases.js';
@@ -9,8 +9,8 @@ import * as operations from './operations.js';
 import * as cs from './connection_string.js';
 export default [
     auth,
-    projects,
     users,
+    projects,
     branches,
     endpoints,
     databases,

package/commands/operations.js

@@ -6,7 +6,7 @@ export const describe = 'Manage operations';
 export const builder = (argv) => argv
     .demandCommand(1, '')
     .fail(commandFailHandler)
-    .usage('usage: $0 operations <cmd> [args]')
+    .usage('usage: $0 operations <sub-command> [options]')
     .options({
     'project.id': {
         describe: 'Project ID',

package/commands/projects.js

@@ -8,7 +8,7 @@ export const builder = (argv) => {
     return argv
         .demandCommand(1, '')
         .fail(commandFailHandler)
-        .usage('usage: $0 projects <cmd> [args]')
+        .usage('usage: $0 projects <sub-command> [options]')
         .command('list', 'List projects', (yargs) => yargs, async (args) => {
         await list(args);
     })

package/commands/roles.js

@@ -7,7 +7,7 @@ export const describe = 'Manage roles';
 export const builder = (argv) => argv
     .demandCommand(1, '')
     .fail(commandFailHandler)
-    .usage('usage: $0 roles <cmd> [args]')
+    .usage('usage: $0 roles <sub-command> [options]')
     .options({
     'project.id': {
         describe: 'Project ID',

package/index.js

@@ -21,9 +21,10 @@ import { fillInArgs } from './utils.js';
 import pkg from './pkg.js';
 import commands from './commands/index.js';
 import { analyticsMiddleware } from './analytics.js';
-const builder = yargs(hideBin(process.argv))
+let builder = yargs(hideBin(process.argv));
+builder = builder
     .scriptName(pkg.name)
-    .usage('usage: $0 <cmd> [args]')
+    .usage('usage: $0 <command> [options]')
     .help()
     .option('output', {
     alias: 'o',

package/package.json

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