neonctl 1.35.0 → 1.37.0

package/commands/branches.js

@@ -187,17 +187,16 @@ const list = async (props) => {
     });
 };
 const create = async (props) => {
-    const parentProps = await (() => {
+    const branches = await props.apiClient
+        .listProjectBranches(props.projectId)
+        .then(({ data }) => data.branches);
+    const parentProps = (() => {
         if (!props.parent) {
-            return props.apiClient
-                .listProjectBranches(props.projectId)
-                .then(({ data }) => {
-                const branch = data.branches.find((b) => b.default);
-                if (!branch) {
-                    throw new Error('No default branch found');
-                }
-                return { parent_id: branch.id };
-            });
+            const branch = branches.find((b) => b.default);
+            if (!branch) {
+                throw new Error('No default branch found');
+            }
+            return { parent_id: branch.id };
         }
         if (looksLikeLSN(props.parent)) {
             return { parent_lsn: props.parent };
@@ -208,15 +207,11 @@ const create = async (props) => {
         if (looksLikeBranchId(props.parent)) {
             return { parent_id: props.parent };
         }
-        return props.apiClient
-            .listProjectBranches(props.projectId)
-            .then(({ data }) => {
-            const branch = data.branches.find((b) => b.name === props.parent);
-            if (!branch) {
-                throw new Error(`Branch ${props.parent} not found`);
-            }
-            return { parent_id: branch.id };
-        });
+        const branch = branches.find((b) => b.name === props.parent);
+        if (!branch) {
+            throw new Error(`Branch ${props.parent} not found`);
+        }
+        return { parent_id: branch.id };
     })();
     const { data } = await retryOnLock(() => props.apiClient.createProjectBranch(props.projectId, {
         branch: {
@@ -236,6 +231,10 @@ const create = async (props) => {
             ? JSON.parse(props.annotation)
             : undefined,
     }));
+    const parent = branches.find((b) => b.id === data.branch.parent_id);
+    if (parent?.protected) {
+        log.warning('The parent branch is protected; a unique role password has been generated for the new branch.');
+    }
     const out = writer(props);
     out.write(data.branch, {
         fields: BRANCH_FIELDS,

package/commands/projects.js

@@ -13,9 +13,11 @@ export const PROJECT_FIELDS = [
 const REGIONS = [
     'aws-us-west-2',
     'aws-ap-southeast-1',
+    'aws-ap-southeast-2',
     'aws-eu-central-1',
     'aws-us-east-2',
     'aws-us-east-1',
+    'azure-eastus2',
 ];
 const PROJECTS_LIST_LIMIT = 100;
 export const command = 'projects';
@@ -24,7 +26,12 @@ export const aliases = ['project'];
 export const builder = (argv) => {
     return argv
         .usage('$0 projects <sub-command> [options]')
-        .command('list', 'List projects', (yargs) => yargs, async (args) => {
+        .command('list', 'List projects', (yargs) => yargs.options({
+        'org-id': {
+            describe: 'List projects of a given organization',
+            type: 'string',
+        },
+    }), async (args) => {
         await list(args);
     })
         .command('create', 'Create a project', (yargs) => yargs.options({
@@ -36,6 +43,10 @@ export const builder = (argv) => {
             describe: `The region ID. Possible values: ${REGIONS.join(', ')}`,
             type: 'string',
         },
+        'org-id': {
+            describe: "The project's organization ID",
+            type: 'string',
+        },
         psql: {
             type: 'boolean',
             describe: 'Connect to a new project via psql',
@@ -103,6 +114,7 @@ const list = async (props) => {
         while (!end) {
             const { data } = await fn({
                 limit: PROJECTS_LIST_LIMIT,
+                org_id: props.orgId,
                 cursor,
             });
             result.push(...data.projects);
@@ -114,19 +126,21 @@ const list = async (props) => {
         }
         return result;
     };
-    const [ownedProjects, sharedProjects] = await Promise.all([
-        getList(props.apiClient.listProjects),
-        getList(props.apiClient.listSharedProjects),
-    ]);
+    const ownedProjects = getList(props.apiClient.listProjects);
+    const sharedProjects = props.orgId
+        ? undefined
+        : getList(props.apiClient.listSharedProjects);
     const out = writer(props);
-    out.write(ownedProjects, {
+    out.write(await ownedProjects, {
         fields: PROJECT_FIELDS,
         title: 'Projects',
     });
-    out.write(sharedProjects, {
-        fields: PROJECT_FIELDS,
-        title: 'Shared with me',
-    });
+    if (sharedProjects) {
+        out.write(await sharedProjects, {
+            fields: PROJECT_FIELDS,
+            title: 'Shared with you',
+        });
+    }
     out.end();
 };
 const create = async (props) => {
@@ -137,6 +151,9 @@ const create = async (props) => {
     if (props.regionId) {
         project.region_id = props.regionId;
     }
+    if (props.orgId) {
+        project.org_id = props.orgId;
+    }
     project.branch = {};
     if (props.database) {
         project.branch.database_name = props.database;

package/commands/projects.test.js

@@ -7,9 +7,22 @@ describe('projects', () => {
     test('list', async ({ testCliCommand }) => {
         await testCliCommand(['projects', 'list']);
     });
+    test('list with org id', async ({ testCliCommand }) => {
+        await testCliCommand(['projects', 'list', '--org-id', 'org-2']);
+    });
     test('create', async ({ testCliCommand }) => {
         await testCliCommand(['projects', 'create', '--name', 'test_project']);
     });
+    test('create with org id', async ({ testCliCommand }) => {
+        await testCliCommand([
+            'projects',
+            'create',
+            '--name',
+            'test_project',
+            '--org-id',
+            'org-2',
+        ]);
+    });
     test('create with database and role', async ({ testCliCommand }) => {
         await testCliCommand([
             'projects',

package/commands/set_context.js

@@ -6,10 +6,15 @@ export const builder = (argv) => argv.usage('$0 set-context [options]').options(
         describe: 'Project ID',
         type: 'string',
     },
+    'org-id': {
+        describe: 'Organization ID',
+        type: 'string',
+    },
 });
 export const handler = (props) => {
     const context = {
         projectId: props.projectId,
+        orgId: props.orgId,
     };
     updateContextFile(props.contextFile, context);
 };

package/commands/set_context.test.js

@@ -28,7 +28,7 @@ const test = originalTest.extend({
     },
 });
 describe('set_context', () => {
-    describe('should set the context', () => {
+    describe('should set the context to project', () => {
         test('set-context', async ({ testCliCommand, readFile }) => {
             await testCliCommand([
                 'set-context',
@@ -93,4 +93,67 @@ describe('set_context', () => {
             });
         });
     });
+    describe('should set the context to organization', () => {
+        test('set-context', async ({ testCliCommand, readFile }) => {
+            await testCliCommand([
+                'set-context',
+                '--org-id',
+                'org-2',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
+            expect(readFile(CONTEXT_FILE)).toMatchSnapshot();
+        });
+        test('list projects selecting organization from the context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(CONTEXT_FILE, {
+                orgId: 'org-2',
+            });
+            await testCliCommand([
+                'projects',
+                'list',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
+        });
+        test('list projects with explicit org id overrides context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(CONTEXT_FILE, {
+                orgId: 'org-2',
+            });
+            await testCliCommand([
+                'project',
+                'list',
+                '--org-id',
+                'org-3',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
+        });
+        test('create projects selecting organization from the context', async ({ testCliCommand, writeFile, }) => {
+            writeFile(CONTEXT_FILE, {
+                orgId: 'org-2',
+            });
+            await testCliCommand([
+                'projects',
+                'create',
+                '--name',
+                'test_project',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
+        });
+    });
+    describe('can set the context to project and organization at the same time', () => {
+        test('set-context', async ({ testCliCommand, readFile }) => {
+            await testCliCommand([
+                'set-context',
+                '--project-id',
+                'test_project',
+                '--org-id',
+                'org-2',
+                '--context-file',
+                CONTEXT_FILE,
+            ]);
+            expect(readFile(CONTEXT_FILE)).toMatchSnapshot();
+        });
+    });
 });

package/context.js

@@ -36,6 +36,9 @@ export const enrichFromContext = (args) => {
         return;
     }
     const context = readContextFile(args.contextFile);
+    if (!args.orgId) {
+        args.orgId = context.orgId;
+    }
     if (!args.projectId) {
         args.projectId = context.projectId;
     }

package/index.js

@@ -137,6 +137,7 @@ builder = builder
     default: true,
 })
     .middleware(analyticsMiddleware, true)
+    .version(pkg.version)
     .group('version', 'Global options:')
     .alias('version', 'v')
     .completion()

package/log.js

@@ -6,6 +6,9 @@ export const log = {
             process.stderr.write(`DEBUG: ${format(...args)}\n`);
         }
     },
+    warning: (...args) => {
+        process.stderr.write(`WARNING: ${format(...args)}\n`);
+    },
     info: (...args) => {
         process.stderr.write(`INFO: ${format(...args)}\n`);
     },

package/package.json

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