clever-tools 3.13.0 → 3.14.0

package/bin/clever.js

@@ -872,7 +872,7 @@ async function run () {
   const keycloakVersionsCommands = cliparse.command('version', {
     description: 'Check Keycloak deployed version',
     args: [args.addonIdOrName],
-    options: [opts.humanJsonOutputFormat],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [keycloakVersionCheckCommand, keycloakVersionUpdateCommand],
   }, keycloak.checkVersion);
   const keycloakCommand = cliparse.command('keycloak', {
@@ -991,7 +991,7 @@ async function run () {
   const metabaseVersionsCommands = cliparse.command('version', {
     description: 'Manage Metabase deployed version',
     args: [args.addonIdOrName],
-    options: [opts.humanJsonOutputFormat],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [metabaseVersionCheckCommand, metabaseVersionUpdateCommand],
   }, metabase.checkVersion);
   const metabaseCommand = cliparse.command('metabase', {
@@ -1121,7 +1121,7 @@ async function run () {
   const otoroshiVersionsCommands = cliparse.command('version', {
     description: 'Manage Otoroshi deployed version',
     args: [args.addonIdOrName],
-    options: [opts.humanJsonOutputFormat],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [otoroshiVersionCheckCommand, otoroshiVersionUpdateCommand],
   }, otoroshi.checkVersion);
   const otoroshiCommand = cliparse.command('otoroshi', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.13.0",
+  "version": "3.14.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "type": "module",
@@ -17,6 +17,7 @@
   "license": "Apache-2.0",
   "bin": {
     "clever": "bin/clever.js",
+    "clever-tools": "bin/clever.js",
     "install-clever-completion": "scripts/install-autocomplete.sh",
     "uninstall-clever-completion": "scripts/uninstall-autocomplete.sh"
   },

package/src/commands/create.js

@@ -73,7 +73,7 @@ async function displayAppCreation (app, alias, github, taskCommand) {
   printFieldsAsTable(2, {
     Type: colors.blue(`⬢ ${app.instance.variant.name}`),
     ID: app.id,
-    'Org ID': app.ownerId,
+    'Organisation ID': app.ownerId,
     Name: app.name,
     GitHub: github != null && `${github.owner}/${github.name}`,
     Alias: hasDistinctAlias && alias,

package/src/commands/deploy.js

@@ -56,7 +56,7 @@ export async function deploy (params) {
   Logger.println(dedent`
     ${colors.bold(`🚀 Deploying ${colors.green(appData.name)}`)}
        Application ID  ${colors.grey(`${appId}`)}
-       Org ID          ${colors.grey(`${ownerId}`)}
+       Organisation ID ${colors.grey(`${ownerId}`)}
   `);
 
   Logger.println();

package/src/commands/service.js

@@ -1,3 +1,4 @@
+import colors from 'colors/safe.js';
 import * as Addon from '../models/addon.js';
 import * as Application from '../models/application.js';
 import { Logger } from '../logger.js';
@@ -38,14 +39,21 @@ export async function list (params) {
     }
     case 'human':
     default: {
-      if (formattedServices.applications) {
+      const { applications = [], addons = [] } = formattedServices;
+
+      if (applications.length === 0 && addons.length === 0) {
+        Logger.printInfo(`No linked services found, use ${colors.bold.blue('clever service link-app')} or ${colors.bold.blue('clever service link-addon')} to link services to an application`);
+        return;
+      }
+
+      if (applications.length > 0) {
         Logger.println('Applications:');
-        formattedServices.applications.forEach(({ isLinked, name }) => Logger.println(`${isLinked ? '*' : ' '} ${name}`));
+        applications.forEach(({ isLinked, name }) => Logger.println(`${isLinked ? '*' : ' '} ${name}`));
       }
 
-      if (formattedServices.addons) {
+      if (addons.length > 0) {
         Logger.println('Addons:');
-        formattedServices.addons.forEach(({ isLinked, name, realId }) => Logger.println(`${isLinked ? '*' : ' '} ${name} (${realId})`));
+        addons.forEach(({ isLinked, name, realId }) => Logger.println(`${isLinked ? '*' : ' '} ${name} (${realId})`));
       }
     }
   }

package/src/logger.js

@@ -58,6 +58,9 @@ Logger.println = console.log;
 // Logger for success with a green check before the message
 Logger.printSuccess = (message) => console.log(`${colors.bold.green('✓')} ${message}`);
 
+// Logger for information with a blue 'i' before the message
+Logger.printInfo = (message) => console.log(`${colors.bold.blue('i')} ${message}`);
+
 // No decoration for Logger.println
 Logger.printJson = (obj) => {
   console.log(JSON.stringify(obj, null, 2));

package/src/models/addon.js

@@ -43,9 +43,8 @@ export async function list (ownerId, appId, showAll) {
   }
 
   const myAddons = await getAllLinkedAddons({ id: ownerId, appId }).then(sendToApi);
-
-  if (showAll == null) {
-    return myAddons;
+  if (!showAll) {
+    return myAddons.map((addon) => ({ ...addon, isLinked: true }));
   }
 
   const myAddonIds = myAddons.map((addon) => addon.id);

package/src/models/log-v4.js

@@ -9,6 +9,8 @@ import * as ExitStrategy from '../models/exit-strategy-option.js';
 import { getBest } from './domain.js';
 import { conf } from './configuration.js';
 
+const RESET_COLOR = '\x1B[0m';
+
 // 2000 logs per 100ms maximum
 const THROTTLE_ELEMENTS = 2000;
 const THROTTLE_PER_IN_MILLISECONDS = 100;
@@ -67,6 +69,7 @@ export async function displayLogs (params) {
           return;
         case 'human':
         default:
+          if (log.message === RESET_COLOR) return;
           Logger.println(formatLogLine(log));
       }
     });
@@ -162,7 +165,7 @@ function formatLogLine (log) {
   else if (isBuildSucessMessage(log)) {
     return `${date.toISOString()}: ${colors.bold.blue(message)}`;
   }
-  return `${date.toISOString()}: ${message}`;
+  return `${date.toISOString()}: ${message}${RESET_COLOR}`;
 }
 
 function isCleverMessage (log) {