kourou 0.23.0 → 0.24.2

package/README.md

@@ -26,7 +26,7 @@ $ npm install -g kourou
 $ kourou COMMAND
 running command...
 $ kourou (-v|--version|version)
-kourou/0.23.0 linux-x64 node-v14.18.2
+kourou/0.24.2 darwin-x64 node-v16.17.0
 $ kourou --help [COMMAND]
 USAGE
   $ kourou COMMAND
@@ -156,7 +156,7 @@ All other arguments and options will be passed as-is to the `sdk:query` method.
 * [`kourou instance:list`](#kourou-instancelist)
 * [`kourou instance:logs`](#kourou-instancelogs)
 * [`kourou instance:spawn`](#kourou-instancespawn)
-* [`kourou paas:deploy ENVIRONMENT IMAGE`](#kourou-paasdeploy-environment-image)
+* [`kourou paas:deploy ENVIRONMENT APPLICATIONID IMAGE`](#kourou-paasdeploy-environment-applicationid-image)
 * [`kourou paas:init PROJECT`](#kourou-paasinit-project)
 * [`kourou paas:login`](#kourou-paaslogin)
 * [`kourou paas:logs ENVIRONMENT APPLICATION`](#kourou-paaslogs-environment-application)
@@ -303,8 +303,9 @@ OPTIONS
   --forwardPort=forwardPort  [default: 9222] Port of the forwarding server
   --help                     show CLI help
   --host=host                [default: localhost] Kuzzle server host
+  --keepAuth                 Keep the user authenticated
 
-  --nonoAutoEnableDebugger   True if Kourou should not enable and disable the Debugger automatically before and after
+  --noAutoEnableDebugger     True if Kourou should not enable and disable the Debugger automatically before and after
                              usage
 
   --password=password        Kuzzle user password
@@ -319,6 +320,8 @@ OPTIONS
 
   --ssl                      Use SSL to connect to Kuzzle
 
+  --ttl=ttl                  [default: 1h] Kuzzle login TTL
+
   --username=username        [default: anonymous] Kuzzle username (local strategy)
 ```
 
@@ -378,7 +381,7 @@ EXAMPLES
   $ kourou autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.0/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.2.0/src/commands/autocomplete/index.ts)_
 
 ## `kourou collection:create INDEX COLLECTION [BODY]`
 
@@ -955,17 +958,18 @@ OPTIONS
 
 _See code: [src/commands/instance/spawn.ts](src/commands/instance/spawn.ts)_
 
-## `kourou paas:deploy ENVIRONMENT IMAGE`
+## `kourou paas:deploy ENVIRONMENT APPLICATIONID IMAGE`
 
 Deploy a new version of the application in the PaaS
 
 ```
 USAGE
-  $ kourou paas:deploy ENVIRONMENT IMAGE
+  $ kourou paas:deploy ENVIRONMENT APPLICATIONID IMAGE
 
 ARGUMENTS
-  ENVIRONMENT  Project environment name
-  IMAGE        Image name and hash as myimage:mytag
+  ENVIRONMENT    Project environment name
+  APPLICATIONID  Application Identifier
+  IMAGE          Image name and hash as myimage:mytag
 
 OPTIONS
   --help             show CLI help
@@ -1002,6 +1006,7 @@ USAGE
 
 OPTIONS
   --help               show CLI help
+  --only_npm           Only perform the login on the private NPM registry
   --project=project    Current PaaS project
   --username=username  PaaS username
 ```

package/lib/commands/app/debug-proxy.d.ts

@@ -13,7 +13,9 @@ export default class DebugProxy extends Kommand {
         'api-key': flags.IOptionFlag<string | undefined>;
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
         forwardPort: import("@oclif/parser/lib/flags").IOptionFlag<number>;
-        nonoAutoEnableDebugger: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        ttl: flags.IOptionFlag<string>;
+        keepAuth: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        noAutoEnableDebugger: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         showDebuggerEvents: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
         showDebuggerPayloads: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
     };

package/lib/commands/app/debug-proxy.js

@@ -160,9 +160,15 @@ DebugProxy.description = 'Create a Proxy Server that allows Chrome to debug Kuzz
 DebugProxy.flags = Object.assign({ help: command_1.flags.help(), forwardPort: command_1.flags.integer({
         description: 'Port of the forwarding server',
         default: 9222
-    }), nonoAutoEnableDebugger: command_1.flags.boolean({
+    }), ttl: command_1.flags.string({
+        description: 'Kuzzle login TTL',
+        default: '1h',
+    }), keepAuth: command_1.flags.boolean({
+        description: 'Keep the user authenticated',
+        default: false,
+    }), noAutoEnableDebugger: command_1.flags.boolean({
         description: 'True if Kourou should not enable and disable the Debugger automatically before and after usage',
-        default: true
+        default: false
     }), showDebuggerEvents: command_1.flags.boolean({
         description: 'Verbose mode to display events sent to the Chrome Debugger',
         default: false,

package/lib/commands/app/scaffold.js

@@ -21,9 +21,11 @@ class AppScaffold extends common_1.Kommand {
         this.logOk(`Scaffolding complete! Use ${chalk_1.default.grey(`cd ${destination} && npm run docker npm install`)} install dependencies and then ${chalk_1.default.grey(`npm run docker:dev`)} to run your application!`);
     }
     async cloneTemplate(flavor, destination) {
-        await (0, execute_1.execute)('git', 'clone', '--depth=1', 'https://github.com/kuzzleio/project-templates', '--branch', flavor, '--single-branch');
-        await (0, execute_1.execute)('mv', `project-templates/${flavor}`, `${destination}/`);
-        await (0, execute_1.execute)('rm', '-rf', 'project-templates/');
+        const templatesDir = '/tmp/project-templates';
+        await (0, execute_1.execute)('rm', '-rf', templatesDir);
+        await (0, execute_1.execute)('git', 'clone', '--depth=1', 'https://github.com/kuzzleio/project-templates', '--branch', flavor, '--single-branch', templatesDir);
+        await (0, execute_1.execute)('cp', '-r', `${templatesDir}/${flavor}`, `${destination}/`);
+        await (0, execute_1.execute)('rm', '-rf', templatesDir);
     }
 }
 exports.default = AppScaffold;

package/lib/commands/paas/deploy.js

@@ -19,7 +19,7 @@ class PaasDeploy extends PaasKommand_1.PaasKommand {
             action: 'deploy',
             environmentId: this.args.environment,
             projectId: this.flags.project || this.getProject(),
-            applicationId: 'kuzzle',
+            applicationId: this.args.applicationId,
             body: {
                 image: {
                     name: image,
@@ -61,6 +61,7 @@ PaasDeploy.flags = {
 };
 PaasDeploy.args = [
     { name: 'environment', description: 'Project environment name', required: true },
+    { name: 'applicationId', description: 'Application Identifier', required: true },
     { name: 'image', description: 'Image name and hash as myimage:mytag', required: true },
 ];
 exports.default = PaasDeploy;

package/lib/commands/paas/login.d.ts

@@ -7,6 +7,7 @@ declare class PaasLogin extends PaasKommand {
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
         project: flags.IOptionFlag<string | undefined>;
         username: flags.IOptionFlag<string | undefined>;
+        only_npm: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
     };
     runSafe(): Promise<void>;
     createProjectCredentials(apiKey: ApiKey): void;

package/lib/commands/paas/login.js

@@ -16,6 +16,10 @@ class PaasLogin extends PaasKommand_1.PaasKommand {
         const password = process.env.KUZZLE_PAAS_PASSWORD
             ? process.env.KUZZLE_PAAS_PASSWORD
             : await cli_ux_1.default.prompt(`    Password`, { type: 'hide' });
+        if (this.flags.only_npm) {
+            await this.authenticateNPM(username, password);
+            return;
+        }
         await this.initPaasClient({ username, password });
         const apiKey = await this.paas.auth.createApiKey('Kourou PaaS API Key');
         this.createProjectCredentials(apiKey);
@@ -55,10 +59,16 @@ PaasLogin.description = 'Login for a PaaS project';
 PaasLogin.flags = {
     help: command_1.flags.help(),
     project: command_1.flags.string({
-        description: 'Current PaaS project'
+        description: 'Current PaaS project',
+        required: false
     }),
     username: command_1.flags.string({
         description: 'PaaS username',
     }),
+    only_npm: command_1.flags.boolean({
+        description: 'Only perform the login on the private NPM registry',
+        required: false,
+        default: false
+    })
 };
 exports.default = PaasLogin;

package/lib/commands/vault/encrypt.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultEncrypt = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const command_1 = require("@oclif/command");
 const kuzzle_vault_1 = require("kuzzle-vault");
@@ -15,8 +16,8 @@ class VaultEncrypt extends common_1.Kommand {
         if (lodash_1.default.isEmpty(this.args.file)) {
             throw new Error('A secrets file must be provided');
         }
-        const [filename, ext] = this.args.file.split('.');
-        let outputFile = `${filename}.enc.${ext}`;
+        const { name, ext } = path_1.default.parse(this.args.file);
+        let outputFile = `${name}.enc${ext}`;
         if (this.flags['output-file']) {
             outputFile = this.flags['output-file'];
         }

package/lib/common.js

@@ -113,6 +113,7 @@ class Kommand extends command_1.Command {
                 this.logKo(JSON.stringify(error.reason));
             }
             err = true;
+            this.exitCode = 1;
         }
         finally {
             if (kommand.id !== undefined) {
@@ -127,6 +128,7 @@ class Kommand extends command_1.Command {
                 ]);
             }
             this.sdk.disconnect();
+            process.exit(this.exitCode);
         }
         return this.exitCode;
     }

package/lib/support/PaasKommand.js

@@ -11,7 +11,7 @@ class PaasKommand extends common_1.Kommand {
         super(...arguments);
         this.host = process.env.KUZZLE_PAAS_HOST
             ? process.env.KUZZLE_PAAS_HOST
-            : 'api.console.paas.kuzzle.io';
+            : 'console.paas.kuzzle.io';
         this.port = process.env.KUZZLE_PAAS_PORT
             ? parseInt(process.env.KUZZLE_PAAS_PORT)
             : 443;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kourou",
   "description": "The CLI that helps you manage your Kuzzle instances",
-  "version": "0.23.0",
+  "version": "0.24.2",
   "author": "The Kuzzle Team <support@kuzzle.io>",
   "bin": {
     "kourou": "./bin/run"