neonctl 2.9.2 → 2.10.1

package/commands/projects.js

@@ -4,6 +4,9 @@ import { writer } from '../writer.js';
 import { psql } from '../utils/psql.js';
 import { updateContextFile } from '../context.js';
 import { getComputeUnits } from '../utils/compute_units.js';
+import { isAxiosError } from 'axios';
+import prompts from 'prompts';
+import { isCi } from '../env.js';
 export const PROJECT_FIELDS = [
     'id',
     'name',
@@ -36,7 +39,7 @@ export const builder = (argv) => {
             type: 'string',
         },
     }), async (args) => {
-        await list(args);
+        await handleMissingOrgId(args, list);
     })
         .command('create', 'Create a project', (yargs) => yargs.options({
         'block-public-connections': {
@@ -84,7 +87,7 @@ export const builder = (argv) => {
             type: 'string',
         },
     }), async (args) => {
-        await create(args);
+        await handleMissingOrgId(args, create);
     })
         .command('update <id>', 'Update a project', (yargs) => yargs.options({
         'block-vpc-connections': {
@@ -252,3 +255,71 @@ const get = async (props) => {
     const { data } = await props.apiClient.getProject(props.id);
     writer(props).end(data.project, { fields: PROJECT_FIELDS });
 };
+const handleMissingOrgId = async (args, cmd) => {
+    try {
+        await cmd(args);
+    }
+    catch (err) {
+        if (!isCi() && isOrgIdError(err)) {
+            const orgId = await selectOrg(args);
+            await cmd({ ...args, orgId });
+        }
+        else {
+            throw err;
+        }
+    }
+};
+const isOrgIdError = (err) => {
+    return (isAxiosError(err) &&
+        err.response?.status == 400 &&
+        err.response?.data?.message?.includes('org_id is required'));
+};
+const selectOrg = async (props) => {
+    const { data: { organizations }, } = await props.apiClient.getCurrentUserOrganizations();
+    if (!organizations?.length) {
+        throw new Error(`You don't belong to any organizations. Please create an organization first.`);
+    }
+    const { orgId } = await prompts({
+        onState: onPromptState,
+        type: 'select',
+        name: 'orgId',
+        message: `What organization would you like to use?`,
+        choices: organizations.map((org) => ({
+            title: `${org.name} (${org.id})`,
+            value: org.id,
+        })),
+        initial: 0,
+    });
+    const { save } = await prompts({
+        onState: onPromptState,
+        type: 'confirm',
+        name: 'save',
+        message: `Would you like to use this organization by default?`,
+        initial: true,
+    });
+    if (save) {
+        updateContextFile(props.contextFile, { orgId });
+        writer(props).text(`
+The organization ID has been saved in ${props.contextFile}
+
+If you'd like to change the default organization later, use
+
+    neonctl set-context --org-id <org_id>
+
+Or to clear the context file and forget the default organization
+
+    neonctl set-context
+
+`);
+    }
+    return orgId;
+};
+const onPromptState = (state) => {
+    if (state.aborted) {
+        // If we don't re-enable the terminal cursor before exiting
+        // the program, the cursor will remain hidden
+        process.stdout.write('\x1B[?25h');
+        process.stdout.write('\n');
+        process.exit(1);
+    }
+};

package/package.json

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