neonctl 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neonctl",
-    "version": "0.6.0",
+    "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": {

package/src/api/operations.js

@@ -10,18 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 < 100; i++) {
+    for (let i = 0; i < 20; i++) {
         const operation = yield (0, exports.getOperation)(Object.assign({}, props));
         if (operation.status == 'finished') {
             return;
         }
-        yield sleep(200);
+        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}`);
 });

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

@@ -13,6 +13,6 @@ 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: [] });
+    (0, writer_1.writeOut)(props)(yield (0, roles_1.resetPassword)(props), { fields: ['dsn'] });
 });
 exports.resetPwd = resetPwd;

package/src/index.js

@@ -52,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',

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;
     }