neonctl 1.11.2 → 1.11.3

package/api.js

@@ -1,3 +1,27 @@
 import { createApiClient } from '@neondatabase/api-client';
+import { isAxiosError } from 'axios';
+import { log } from './log.js';
 export const getApiClient = ({ apiKey, apiHost }) => createApiClient({ apiKey, baseURL: apiHost, timeout: 10000 });
-export const isApiError = (err) => err instanceof Error && 'response' in err;
+const RETRY_COUNT = 5;
+const RETRY_DELAY = 3000;
+export const retryOnLock = async (fn) => {
+    let attempt = 0;
+    let errOut;
+    while (attempt < RETRY_COUNT) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            errOut = err;
+            if (isAxiosError(err) && err.response?.status === 423) {
+                attempt++;
+                log.info(`Resource is locked. Waiting ${RETRY_DELAY}ms before retrying...`);
+                await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    throw errOut;
+};

package/commands/branches.js

@@ -1,6 +1,7 @@
 import { writer } from '../writer.js';
 import { branchCreateRequest, branchCreateRequestEndpointOptions, branchUpdateRequest, } from '../parameters.gen.js';
 import { commandFailHandler } from '../utils.js';
+import { retryOnLock } from '../api.js';
 const BRANCH_FIELDS = ['id', 'name', 'created_at'];
 export const command = 'branches';
 export const describe = 'Manage branches';
@@ -46,10 +47,10 @@ const list = async (props) => {
     });
 };
 const create = async (props) => {
-    const { data } = await props.apiClient.createProjectBranch(props.project.id, {
+    const { data } = await retryOnLock(() => props.apiClient.createProjectBranch(props.project.id, {
         branch: props.branch,
         endpoints: props.endpoint ? [props.endpoint] : undefined,
-    });
+    }));
     const out = writer(props);
     out.write(data.branch, {
         fields: BRANCH_FIELDS,
@@ -70,15 +71,15 @@ const create = async (props) => {
     out.end();
 };
 const update = async (props) => {
-    const { data } = await props.apiClient.updateProjectBranch(props.project.id, props.branch.id, {
+    const { data } = await retryOnLock(() => props.apiClient.updateProjectBranch(props.project.id, props.branch.id, {
         branch: props.branch,
-    });
+    }));
     writer(props).end(data.branch, {
         fields: BRANCH_FIELDS,
     });
 };
 const deleteBranch = async (props) => {
-    const { data } = await props.apiClient.deleteProjectBranch(props.project.id, props.branch.id);
+    const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranch(props.project.id, props.branch.id));
     writer(props).end(data.branch, {
         fields: BRANCH_FIELDS,
     });

package/commands/databases.js

@@ -1,3 +1,4 @@
+import { retryOnLock } from '../api.js';
 import { databaseCreateRequest } from '../parameters.gen.js';
 import { commandFailHandler } from '../utils.js';
 import { writer } from '../writer.js';
@@ -40,15 +41,15 @@ export const list = async (props) => {
     });
 };
 export const create = async (props) => {
-    const { data } = await props.apiClient.createProjectBranchDatabase(props.project.id, props.branch.id, {
+    const { data } = await retryOnLock(() => props.apiClient.createProjectBranchDatabase(props.project.id, props.branch.id, {
         database: props.database,
-    });
+    }));
     writer(props).end(data.database, {
         fields: DATABASE_FIELDS,
     });
 };
 export const deleteDb = async (props) => {
-    const { data } = await props.apiClient.deleteProjectBranchDatabase(props.project.id, props.branch.id, props.database.name);
+    const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranchDatabase(props.project.id, props.branch.id, props.database.name));
     writer(props).end(data.database, {
         fields: DATABASE_FIELDS,
     });

package/commands/endpoints.js

@@ -1,3 +1,4 @@
+import { retryOnLock } from '../api.js';
 import { endpointCreateRequest, endpointUpdateRequest, } from '../parameters.gen.js';
 import { commandFailHandler } from '../utils.js';
 import { writer } from '../writer.js';
@@ -62,19 +63,23 @@ const list = async (props) => {
     });
 };
 const create = async (props) => {
-    const { data } = await props.apiClient.createProjectEndpoint(props.project.id, { endpoint: props.endpoint });
+    const { data } = await retryOnLock(() => props.apiClient.createProjectEndpoint(props.project.id, {
+        endpoint: props.endpoint,
+    }));
     writer(props).end(data.endpoint, {
         fields: ENDPOINT_FIELDS,
     });
 };
 const update = async (props) => {
-    const { data } = await props.apiClient.updateProjectEndpoint(props.project.id, props.endpoint.id, { endpoint: props.endpoint });
+    const { data } = await retryOnLock(() => props.apiClient.updateProjectEndpoint(props.project.id, props.endpoint.id, {
+        endpoint: props.endpoint,
+    }));
     writer(props).end(data.endpoint, {
         fields: ENDPOINT_FIELDS,
     });
 };
 const deleteEndpoint = async (props) => {
-    const { data } = await props.apiClient.deleteProjectEndpoint(props.project.id, props.endpoint.id);
+    const { data } = await retryOnLock(() => props.apiClient.deleteProjectEndpoint(props.project.id, props.endpoint.id));
     writer(props).end(data.endpoint, {
         fields: ENDPOINT_FIELDS,
     });

package/commands/endpoints.test.js

@@ -1,4 +1,4 @@
-import { describe } from '@jest/globals';
+import { describe, expect } from '@jest/globals';
 import { testCliCommand } from '../test_utils.js';
 describe('endpoints', () => {
     testCliCommand({
@@ -38,6 +38,23 @@ describe('endpoints', () => {
             snapshot: true,
         },
     });
+    testCliCommand({
+        name: 'create with retry',
+        args: [
+            'endpoints',
+            'create',
+            '--project.id',
+            'test',
+            '--endpoint.branch_id',
+            'test_branch_with_retry',
+            '--endpoint.type',
+            'read_only',
+        ],
+        expected: {
+            stderr: expect.stringContaining('Resource is locked'),
+            snapshot: true,
+        },
+    });
     testCliCommand({
         name: 'delete',
         args: [

package/commands/roles.js

@@ -1,3 +1,4 @@
+import { retryOnLock } from '../api.js';
 import { roleCreateRequest } from '../parameters.gen.js';
 import { commandFailHandler } from '../utils.js';
 import { writer } from '../writer.js';
@@ -40,15 +41,15 @@ export const list = async (props) => {
     });
 };
 export const create = async (props) => {
-    const { data } = await props.apiClient.createProjectBranchRole(props.project.id, props.branch.id, {
+    const { data } = await retryOnLock(() => props.apiClient.createProjectBranchRole(props.project.id, props.branch.id, {
         role: props.role,
-    });
+    }));
     writer(props).end(data.role, {
         fields: ROLES_FIELDS,
     });
 };
 export const deleteRole = async (props) => {
-    const { data } = await props.apiClient.deleteProjectBranchRole(props.project.id, props.branch.id, props.role.name);
+    const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranchRole(props.project.id, props.branch.id, props.role.name));
     writer(props).end(data.role, {
         fields: ROLES_FIELDS,
     });

package/index.js

@@ -16,12 +16,12 @@ import { ensureAuth } from './commands/auth.js';
 import { defaultDir, ensureConfigDir } from './config.js';
 import { log } from './log.js';
 import { defaultClientID } from './auth.js';
-import { isApiError } from './api.js';
 import { fillInArgs } from './utils.js';
 import pkg from './pkg.js';
 import commands from './commands/index.js';
 import { analyticsMiddleware } from './analytics.js';
 import { isCi } from './env.js';
+import { isAxiosError } from 'axios';
 let builder = yargs(hideBin(process.argv));
 builder = builder
     .scriptName(pkg.name)
@@ -79,12 +79,12 @@ builder = builder
 })
     .middleware(analyticsMiddleware)
     .fail(async (msg, err) => {
-    if (isApiError(err)) {
-        if (err.response.status === 401) {
+    if (isAxiosError(err)) {
+        if (err.response?.status === 401) {
             log.error('Authentication failed, please run `neonctl auth`');
         }
         else {
-            log.error('%d: %s\n%s', err.response.status, err.response.statusText, err.response.data?.message);
+            log.error('%d: %s\n%s', err.response?.status, err.response?.statusText, err.response?.data?.message);
         }
     }
     else {

package/package.json

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