neonctl 0.5.4 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neonctl",
-    "version": "0.5.4",
+    "version": "0.7.0",
     "description": "CLI tool for NeonDB Cloud management",
     "main": "index.js",
     "author": "NeonDB",
@@ -26,6 +26,7 @@
         "cli-table": "^0.3.11",
         "open": "^8.4.0",
         "openid-client": "^5.1.9",
+        "yaml": "^2.1.1",
         "yargs": "^17.5.1"
     },
     "publishConfig": {
@@ -39,7 +40,7 @@
         "build": "npm run clean && tsc && cp src/*.html dist/src/",
         "clean": "rm -rf dist",
         "start": "node index.js",
-        "publizh": "npm run build && npm publish ./dist && git push"
+        "publizh": "npm run build && npm publish --ignore-scripts ./dist"
     },
     "lint-staged": {
         "*.ts": [

package/src/api/operations.js

@@ -0,0 +1,32 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOperation = exports.waitOperationFinalState = void 0;
+const log_1 = require("../log");
+const gateway_1 = require("./gateway");
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+// wait 20 sec max.
+const waitOperationFinalState = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    for (let i = 0; i < 20; i++) {
+        const operation = yield (0, exports.getOperation)(Object.assign({}, props));
+        if (operation.status == 'finished') {
+            return;
+        }
+        log_1.log.info(`Waiting for operation "${props.operation_id}" to finish`);
+        yield sleep(1000);
+    }
+    throw Error(`timeout while waiting for operation ${props.operation_id}`);
+});
+exports.waitOperationFinalState = waitOperationFinalState;
+const getOperation = (props) => (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { path: `projects/${props.project_id}/operations/${props.operation_id}`, method: 'GET' }));
+exports.getOperation = getOperation;

package/src/api/roles.js

@@ -0,0 +1,20 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetPassword = void 0;
+const gateway_1 = require("./gateway");
+const operations_1 = require("./operations");
+const resetPassword = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield (0, gateway_1.apiCall)(Object.assign(Object.assign({}, props), { path: `projects/${props.project_id}/roles/${props.role_name}/reset_password`, method: 'POST' }));
+    yield (0, operations_1.waitOperationFinalState)(Object.assign(Object.assign({}, props), response));
+    return response;
+});
+exports.resetPassword = resetPassword;

package/src/auth.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.auth = exports.refreshToken = void 0;
+exports.auth = exports.refreshToken = exports.defaultClientID = void 0;
 const openid_client_1 = require("openid-client");
 const node_http_1 = require("node:http");
 const node_fs_1 = require("node:fs");
@@ -24,15 +24,15 @@ const SERVER_TIMEOUT = 10000;
 // where to wait for incoming redirect request from oauth server to arrive
 const REDIRECT_URI = (port) => `http://127.0.0.1:${port}/callback`;
 // These scopes cannot be cancelled, they are always needed.
-const DEFAULT_SCOPES = [
-    'openid',
-    'offline',
-    'offline_access',
+const ALWAYS_PRESENT_SCOPES = ['openid', 'offline', 'offline_access'];
+const NEONCTL_SCOPES = [
+    ...ALWAYS_PRESENT_SCOPES,
     'urn:neoncloud:projects:create',
     'urn:neoncloud:projects:read',
-    'urn:neoncloud:projects:modify',
+    'urn:neoncloud:projects:update',
     'urn:neoncloud:projects:delete',
 ];
+exports.defaultClientID = 'neonctl';
 openid_client_1.custom.setHttpOptionsDefaults({
     timeout: SERVER_TIMEOUT,
 });
@@ -94,8 +94,9 @@ const auth = ({ oauthHost, clientId }) => __awaiter(void 0, void 0, void 0, func
         //
         // Open browser to let user authenticate
         //
+        const scopes = clientId == exports.defaultClientID ? NEONCTL_SCOPES : ALWAYS_PRESENT_SCOPES;
         const authUrl = neonOAuthClient.authorizationUrl({
-            scope: DEFAULT_SCOPES.join(' '),
+            scope: scopes.join(' '),
             state,
             code_challenge: codeChallenge,
             code_challenge_method: 'S256',

package/src/commands/auth.js

@@ -94,7 +94,11 @@ const ensureAuth = (props) => __awaiter(void 0, void 0, void 0, function* () {
                 return;
             }
             const token = tokenSet.access_token || 'UNKNOWN';
-            yield validateToken({ apiHost: props['api-host'], token });
+            yield validateToken({
+                apiHost: props['api-host'],
+                token,
+                output: 'json',
+            });
             props.token = token;
             return;
         }

package/src/commands/projects.js

@@ -13,7 +13,9 @@ exports.create = exports.list = void 0;
 const projects_1 = require("../api/projects");
 const writer_1 = require("../writer");
 const list = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    (0, writer_1.writeOut)(props)(yield (0, projects_1.listProjects)(props), { fields: [] });
+    (0, writer_1.writeOut)(props)(yield (0, projects_1.listProjects)(props), {
+        fields: ['id', 'name', 'region_name', 'created_at'],
+    });
 });
 exports.list = list;
 const create = (props) => __awaiter(void 0, void 0, void 0, function* () {

package/src/commands/roles.js

@@ -0,0 +1,18 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetPwd = void 0;
+const writer_1 = require("../writer");
+const roles_1 = require("../api/roles");
+const resetPwd = (props) => __awaiter(void 0, void 0, void 0, function* () {
+    (0, writer_1.writeOut)(props)(yield (0, roles_1.resetPassword)(props), { fields: ['dsn'] });
+});
+exports.resetPwd = resetPwd;

package/src/index.js

@@ -41,6 +41,7 @@ const gateway_1 = require("./api/gateway");
 const auth_1 = require("./commands/auth");
 const config_1 = require("./config");
 const log_1 = require("./log");
+const auth_2 = require("./auth");
 const showHelpMiddleware = (argv) => {
     if (argv._.length === 1) {
         yargs.showHelp();
@@ -51,9 +52,11 @@ const builder = yargs
     .scriptName(package_json_1.default.name)
     .usage('usage: $0 <cmd> [args]')
     .help()
-    .option('json', {
-    describe: 'Set output format to JSON',
-    type: 'boolean',
+    .option('output', {
+    describe: 'Set output format',
+    type: 'string',
+    choices: ['json', 'yaml', 'table'],
+    default: 'table',
 })
     .option('api-host', {
     describe: 'The API host',
@@ -74,7 +77,7 @@ const builder = yargs
     .option('client-id', {
     description: 'OAuth client id',
     type: 'string',
-    default: 'neonctl',
+    default: auth_2.defaultClientID,
 })
     .command('auth', 'Authenticate user', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
     (yield Promise.resolve().then(() => __importStar(require('./commands/auth')))).authFlow(args);
@@ -87,18 +90,32 @@ const builder = yargs
 })
     .command('me', 'Get user info', (yargs) => yargs.middleware(auth_1.ensureAuth), (args) => __awaiter(void 0, void 0, void 0, function* () {
     yield (yield Promise.resolve().then(() => __importStar(require('./commands/users')))).me(args);
+}))
+    .command('roles', 'Manage roles', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
+    yargs
+        .usage('usage: $0 roles <cmd> [args]')
+        .command('resetpassword', 'Reset password for a role', (yargs) => yargs
+        .option('project-id', {
+        describe: 'Project ID',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('role-name', {
+        describe: 'Role name',
+        type: 'string',
+        demandOption: true,
+    }), (args) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (yield Promise.resolve().then(() => __importStar(require('./commands/roles')))).resetPwd(Object.assign(Object.assign({}, args), { role_name: args['role-name'], project_id: args['project-id'] }));
+    }))
+        .middleware(showHelpMiddleware)
+        .middleware(auth_1.ensureAuth);
 }))
     .command('projects', 'Manage projects', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
     yargs
         .usage('usage: $0 projects <cmd> [args]')
-        // .command(
-        //   'list',
-        //   'List projects',
-        //   (yargs) => yargs,
-        //   async (args) => {
-        //     await (await import('./commands/projects')).list(args);
-        //   }
-        // )
+        .command('list', 'List projects', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).list(args);
+    }))
         .command('create', 'Create a project', (yargs) => yargs.option('name', {
         describe: 'Project name',
         type: 'string',

package/src/writer.js

@@ -4,9 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeOut = void 0;
+const yaml_1 = __importDefault(require("yaml"));
 const cli_table_1 = __importDefault(require("cli-table"));
+// Allow PIPE to finish reading before the end of the output.
+process.stdout.on('error', function (err) {
+    if (err.code == 'EPIPE') {
+        process.exit(0);
+    }
+});
 const writeOut = (props) => (data, config) => {
-    if (props.json) {
+    if (props.output == 'yaml') {
+        process.stdout.write(yaml_1.default.stringify(data, null, 2));
+        return;
+    }
+    if (props.output == 'json') {
         process.stdout.write(JSON.stringify(data, null, 2));
         return;
     }