clever-tools 3.13.1 → 4.0.0

package/src/commands/scale.js

@@ -1,10 +1,14 @@
-import * as Application from '../models/application.js';
 import { Logger } from '../logger.js';
+import * as Application from '../models/application.js';
 
-function validateOptions (options) {
-
+function validateOptions(options) {
   let { flavor, 'min-flavor': minFlavor, 'max-flavor': maxFlavor } = options;
-  let { instances, 'min-instances': minInstances, 'max-instances': maxInstances, 'build-flavor': buildFlavor } = options;
+  let {
+    instances,
+    'min-instances': minInstances,
+    'max-instances': maxInstances,
+    'build-flavor': buildFlavor,
+  } = options;
 
   if ([flavor, minFlavor, maxFlavor, instances, minInstances, maxInstances, buildFlavor].every((v) => v == null)) {
     throw new Error('You should provide at least 1 option');
@@ -12,7 +16,7 @@ function validateOptions (options) {
 
   if (flavor != null) {
     if (minFlavor != null || maxFlavor != null) {
-      throw new Error('You can\'t use --flavor and --min-flavor or --max-flavor at the same time');
+      throw new Error("You can't use --flavor and --min-flavor or --max-flavor at the same time");
     }
     minFlavor = flavor;
     maxFlavor = flavor;
@@ -20,38 +24,43 @@ function validateOptions (options) {
 
   if (instances != null) {
     if (minInstances != null || maxInstances != null) {
-      throw new Error('You can\'t use --instances and --min-instances or --max-instances at the same time');
+      throw new Error("You can't use --instances and --min-instances or --max-instances at the same time");
     }
     minInstances = instances;
     maxInstances = instances;
   }
 
   if (minInstances != null && maxInstances != null && minInstances > maxInstances) {
-    throw new Error('min-instances can\'t be greater than max-instances');
+    throw new Error("min-instances can't be greater than max-instances");
   }
 
   if (minFlavor != null && maxFlavor != null) {
     const minFlavorIndex = Application.listAvailableFlavors().indexOf(minFlavor);
     const maxFlavorIndex = Application.listAvailableFlavors().indexOf(maxFlavor);
     if (minFlavorIndex > maxFlavorIndex) {
-      throw new Error('min-flavor can\'t be a greater flavor than max-flavor');
+      throw new Error("min-flavor can't be a greater flavor than max-flavor");
     }
   }
 
   return { minFlavor, maxFlavor, minInstances, maxInstances, buildFlavor };
 }
 
-export async function scale (params) {
+export async function scale(params) {
   const { alias, app: appIdOrName } = params.options;
   const { minFlavor, maxFlavor, minInstances, maxInstances, buildFlavor } = validateOptions(params.options);
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
-  await Application.setScalability(appId, ownerId, {
-    minFlavor,
-    maxFlavor,
-    minInstances,
-    maxInstances,
-  }, buildFlavor);
+  await Application.setScalability(
+    appId,
+    ownerId,
+    {
+      minFlavor,
+      maxFlavor,
+      minInstances,
+      maxInstances,
+    },
+    buildFlavor,
+  );
 
   Logger.println('App rescaled successfully');
-};
+}

package/src/commands/service.js

@@ -1,9 +1,17 @@
+import { styleText } from 'node:util';
+import { Logger } from '../logger.js';
 import * as Addon from '../models/addon.js';
 import * as Application from '../models/application.js';
-import { Logger } from '../logger.js';
 
-export async function list (params) {
-  const { alias, app: appIdOrName, 'show-all': showAll, 'only-apps': onlyApps, 'only-addons': onlyAddons, format } = params.options;
+export async function list(params) {
+  const {
+    alias,
+    app: appIdOrName,
+    'show-all': showAll,
+    'only-apps': onlyApps,
+    'only-addons': onlyAddons,
+    format,
+  } = params.options;
   if (onlyApps && onlyAddons) {
     throw new Error('--only-apps and --only-addons are mutually exclusive');
   }
@@ -38,20 +46,29 @@ 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 ${styleText('blue', 'clever service link-app')} or ${styleText('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})`));
       }
     }
   }
 }
 
-export async function linkApp (params) {
+export async function linkApp(params) {
   const { alias, app: appIdOrName } = params.options;
   const [dependency] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -60,7 +77,7 @@ export async function linkApp (params) {
   Logger.println(`App ${dependency.app_id || dependency.app_name} successfully linked`);
 }
 
-export async function unlinkApp (params) {
+export async function unlinkApp(params) {
   const { alias, app: appIdOrName } = params.options;
   const [dependency] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -69,7 +86,7 @@ export async function unlinkApp (params) {
   Logger.println(`App ${dependency.app_id || dependency.app_name} successfully unlinked`);
 }
 
-export async function linkAddon (params) {
+export async function linkAddon(params) {
   const { alias, app: appIdOrName } = params.options;
   const [addon] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -78,7 +95,7 @@ export async function linkAddon (params) {
   Logger.println(`Addon ${addon.addon_id || addon.addon_name} successfully linked`);
 }
 
-export async function unlinkAddon (params) {
+export async function unlinkAddon(params) {
   const { alias, app: appIdOrName } = params.options;
   const [addon] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);

package/src/commands/ssh-keys.js

@@ -1,22 +1,22 @@
-import { confirm } from '../lib/prompts.js';
-import colors from 'colors/safe.js';
-import { Logger } from '../logger.js';
-import fs from 'node:fs';
-import { sendToApi } from '../models/send-to-api.js';
-import { openBrowser } from '../models/utils.js';
-import dedent from 'dedent';
 import {
   todo_addSshKey as addSshKey,
   todo_getSshKeys as getSshKeys,
   todo_removeSshKey as removeSshKey,
 } from '@clevercloud/client/esm/api/v2/user.js';
+import dedent from 'dedent';
+import fs from 'node:fs';
+import { styleText } from 'node:util';
+import { confirm } from '../lib/prompts.js';
+import { Logger } from '../logger.js';
+import { sendToApi } from '../models/send-to-api.js';
+import { openBrowser } from '../models/utils.js';
 
 /**
  * List SSH keys of the current user
  * @param {object} params The command parameters
  * @param {string} params.options.format The output format
  */
-export async function list (params) {
+export async function list(params) {
   const { format } = params.options;
 
   const keys = await getUserSshKeys();
@@ -30,23 +30,23 @@ export async function list (params) {
     default: {
       if (keys.length === 0) {
         Logger.println(dedent`
-          ${colors.blue('🔐 No SSH keys')}
+          ${styleText('blue', '🔐 No SSH keys')}
           
           To list the SSH keys on your local system, use the following command:
-          ${colors.grey('ssh-add -l -E sha256')}
+          ${styleText('grey', 'ssh-add -l -E sha256')}
           
           To create a new key pair, use the following command:
-          ${colors.grey('ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519_clever -C "An optional comment"')}
+          ${styleText('grey', 'ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519_clever -C "An optional comment"')}
           
           Then add the public key to your Clever Cloud account:
-          ${colors.grey('clever ssh-keys add myNewKey ~/.ssh/id_ed25519_clever.pub')}
+          ${styleText('grey', 'clever ssh-keys add myNewKey ~/.ssh/id_ed25519_clever.pub')}
         `);
         return;
       }
 
       Logger.println(`🔐 ${keys.length} SSH key(s):`);
       keys.forEach((key) => {
-        Logger.println(` • ${colors.blue(key.name)}`, colors.grey(`(${key.fingerprint})`));
+        Logger.println(` • ${styleText('blue', key.name)}`, styleText('grey', `(${key.fingerprint})`));
       });
     }
   }
@@ -57,7 +57,7 @@ export async function list (params) {
  * @param {object} params The command parameters
  * @param {Array<string>} params.args
  */
-export async function add (params) {
+export async function add(params) {
   const [keyName, filePath] = params.args;
 
   if (!fs.existsSync(filePath)) {
@@ -69,11 +69,10 @@ export async function add (params) {
 
   try {
     await addSshKey({ key: encodeURIComponent(keyName) }, JSON.stringify(pubKeyContent)).then(sendToApi);
-  }
-  catch (e) {
+  } catch (e) {
     console.log(e?.responseBody?.id);
     if (e?.responseBody?.id === 505) {
-      throw new Error('This SSH key is not valid, please make sure you\'re pointing to the public key file');
+      throw new Error("This SSH key is not valid, please make sure you're pointing to the public key file");
     }
   }
 
@@ -85,13 +84,13 @@ export async function add (params) {
  * @param {object} params The command parameters
  * @param {Array<string>} params.args
  */
-export async function remove (params) {
+export async function remove(params) {
   const [keyName] = params.args;
 
   const keys = await getUserSshKeys();
 
   if (keys.find((key) => key.name === keyName) == null) {
-    throw new Error(`SSH key ${colors.red(keyName)} not found`);
+    throw new Error(`SSH key ${styleText('red', keyName)} not found`);
   }
 
   const keyNameEncoded = encodeURIComponent(keyName);
@@ -106,12 +105,9 @@ export async function remove (params) {
  * @param {object} params.options The command options
  * @param {boolean} params.options.yes The user confirmation
  */
-export async function removeAll (params) {
+export async function removeAll(params) {
   if (!params.options.yes) {
-    await confirm(
-      'Are you sure you want to remove all your SSH keys?',
-      'No SSH keys removed',
-    );
+    await confirm('Are you sure you want to remove all your SSH keys?', 'No SSH keys removed');
   }
 
   const keys = await getUserSshKeys();
@@ -124,7 +120,8 @@ export async function removeAll (params) {
   const results = await Promise.all(
     keys.map((key) => {
       const keyNameEncoded = encodeURIComponent(key.name);
-      return removeSshKey({ key: keyNameEncoded }).then(sendToApi)
+      return removeSshKey({ key: keyNameEncoded })
+        .then(sendToApi)
         .then(() => [true, key.name])
         .catch(() => [false, key.name]);
     }),
@@ -132,8 +129,7 @@ export async function removeAll (params) {
 
   if (results.every(([isRemoved]) => isRemoved)) {
     Logger.printSuccess('All SSH keys were removed successfully');
-  }
-  else {
+  } else {
     const keyNamesWithErrors = results
       .filter(([isRemoved]) => !isRemoved)
       .map(([_, keyName]) => keyName)
@@ -146,14 +142,14 @@ export async function removeAll (params) {
  * Open the SSH keys management page of the Console in your browser
  * @returns {Promise<void>} A promise that resolves when the page is opened
  */
-export function openConsole () {
+export function openConsole() {
   return openBrowser('/users/me/ssh-keys', 'Opening the SSH keys management page of the Console in your browser');
 }
 
 /**
  * @return {Promise<Array<{ name: string, key: string, fingerprint: string }>>}
  */
-async function getUserSshKeys () {
+async function getUserSshKeys() {
   const rawKeys = await getSshKeys().then(sendToApi);
   return rawKeys.sort((a, b) => a.name.localeCompare(b.name));
 }

package/src/commands/ssh.js

@@ -1,9 +1,8 @@
 import { spawn } from 'node:child_process';
-
 import * as Application from '../models/application.js';
 import { conf } from '../models/configuration.js';
 
-export async function ssh (params) {
+export async function ssh(params) {
   const { alias, app: appIdOrName, 'identity-file': identityFile } = params.options;
 
   const { appId } = await Application.resolveId(appIdOrName, alias);

package/src/commands/status.js

@@ -1,13 +1,11 @@
+import { getAllInstances, get as getApplication } from '@clevercloud/client/esm/api/v2/application.js';
 import _ from 'lodash';
-import colors from 'colors/safe.js';
-
-import * as Application from '../models/application.js';
+import { styleText } from 'node:util';
 import { Logger } from '../logger.js';
-
-import { get as getApplication, getAllInstances } from '@clevercloud/client/esm/api/v2/application.js';
+import * as Application from '../models/application.js';
 import { sendToApi } from '../models/send-to-api.js';
 
-export async function status (params) {
+export async function status(params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -23,30 +21,37 @@ export async function status (params) {
     }
     case 'human':
     default: {
-      const statusMessage = status.status === 'running'
-        ? `${colors.bold.green('running')} ${displayInstances(status.instances, status.commit)}`
-        : colors.bold.red('stopped');
+      const statusMessage =
+        status.status === 'running'
+          ? `${styleText(['bold', 'green'], 'running')} ${displayInstances(status.instances, status.commit)}`
+          : styleText(['bold', 'red'], 'stopped');
 
       Logger.println(`${status.name}: ${statusMessage}`);
-      Logger.println(`Executed as: ${colors.bold(status.lifetime)}`);
+      Logger.println(`Executed as: ${styleText('bold', status.lifetime)}`);
       if (status.deploymentInProgress) {
-        Logger.println(`Deployment in progress ${displayInstances(status.deploymentInProgress.instances, status.deploymentInProgress.commit)}`);
+        Logger.println(
+          `Deployment in progress ${displayInstances(status.deploymentInProgress.instances, status.deploymentInProgress.commit)}`,
+        );
       }
       Logger.println();
       Logger.println('Scalability:');
-      Logger.println(`  Auto scalability: ${status.scalability.enabled ? colors.green('enabled') : colors.red('disabled')}`);
-      Logger.println(`  Scalers: ${colors.bold(formatScalability(status.scalability.horizontal))}`);
-      Logger.println(`  Sizes: ${colors.bold(formatScalability(status.scalability.vertical))}`);
-      Logger.println(`  Dedicated build: ${status.separateBuild ? colors.bold(status.buildFlavor) : colors.red('disabled')}`);
+      Logger.println(
+        `  Auto scalability: ${status.scalability.enabled ? styleText('green', 'enabled') : styleText('red', 'disabled')}`,
+      );
+      Logger.println(`  Scalers: ${styleText('bold', formatScalability(status.scalability.horizontal))}`);
+      Logger.println(`  Sizes: ${styleText('bold', formatScalability(status.scalability.vertical))}`);
+      Logger.println(
+        `  Dedicated build: ${status.separateBuild ? styleText('bold', status.buildFlavor) : styleText('red', 'disabled')}`,
+      );
     }
   }
 }
 
-function displayInstances (instances, commit) {
+function displayInstances(instances, commit) {
   return `(${instances.map((instance) => `${instance.count}*${instance.flavor}`)},  Commit: ${commit || 'N/A'})`;
 }
 
-function computeStatus (instances, app) {
+function computeStatus(instances, app) {
   const upInstances = _.filter(instances, ({ state }) => state === 'UP');
   const isUp = !_.isEmpty(upInstances);
   const upCommit = _(upInstances).map('commit').head();
@@ -57,8 +62,7 @@ function computeStatus (instances, app) {
 
   const { minFlavor, maxFlavor, minInstances, maxInstances } = app.instance;
 
-  const scalabilityEnabled = (minFlavor.name !== maxFlavor.name)
-    || (minInstances !== maxInstances);
+  const scalabilityEnabled = minFlavor.name !== maxFlavor.name || minInstances !== maxInstances;
 
   const status = {
     id: app.id,
@@ -86,11 +90,16 @@ function computeStatus (instances, app) {
   return status;
 }
 
-function formatScalability ({ min, max }) {
-  return (min === max) ? min : `${min} to ${max}`;
+/**
+ * @param {number} min
+ * @param {number} max
+ * @returns {string}
+ */
+function formatScalability({ min, max }) {
+  return min === max ? min.toString() : `${min} to ${max}`;
 }
 
-function groupInstances (instances) {
+function groupInstances(instances) {
   return _(instances)
     .groupBy((i) => i.flavor.name)
     .map((instances, flavorName) => ({

package/src/commands/stop.js

@@ -1,9 +1,9 @@
-import * as Application from '../models/application.js';
+import { undeploy as stopApplication } from '@clevercloud/client/esm/api/v2/application.js';
 import { Logger } from '../logger.js';
+import * as Application from '../models/application.js';
 import { sendToApi } from '../models/send-to-api.js';
-import { undeploy as stopApplication } from '@clevercloud/client/esm/api/v2/application.js';
 
-export async function stop (params) {
+export async function stop(params) {
   const { alias, app: appIdOrName } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 

package/src/commands/tcp-redirs.js

@@ -1,13 +1,12 @@
-import colors from 'colors/safe.js';
-
-import * as Namespaces from '../models/namespaces.js';
-import { sendToApi } from '../models/send-to-api.js';
+import { addTcpRedir, getTcpRedirs, removeTcpRedir } from '@clevercloud/client/esm/api/v2/application.js';
+import { styleText } from 'node:util';
 import { confirm } from '../lib/prompts.js';
 import { Logger } from '../logger.js';
 import * as Application from '../models/application.js';
-import { addTcpRedir, getTcpRedirs, removeTcpRedir } from '@clevercloud/client/esm/api/v2/application.js';
+import * as Namespaces from '../models/namespaces.js';
+import { sendToApi } from '../models/send-to-api.js';
 
-export async function listNamespaces (params) {
+export async function listNamespaces(params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId } = await Application.resolveId(appIdOrName, alias);
 
@@ -40,7 +39,7 @@ export async function listNamespaces (params) {
   }
 }
 
-export async function list (params) {
+export async function list(params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -55,8 +54,7 @@ export async function list (params) {
     default: {
       if (redirs.length === 0) {
         Logger.println('No active TCP redirection for this application');
-      }
-      else {
+      } else {
         Logger.println('Enabled TCP redirections:');
         for (const { namespace, port } of redirs) {
           Logger.println(port + ' on ' + namespace);
@@ -66,11 +64,13 @@ export async function list (params) {
   }
 }
 
-async function acceptPayment (result, skipConfirmation) {
+async function acceptPayment(result, skipConfirmation) {
   if (!skipConfirmation) {
-    result.lines.forEach(({ description, VAT, price }) => Logger.println(`${description}\tVAT: ${VAT}%\tPrice: ${price}€`));
+    result.lines.forEach(({ description, VAT, price }) =>
+      Logger.println(`${description}\tVAT: ${VAT}%\tPrice: ${price}€`),
+    );
     Logger.println(`Total (without taxes): ${result.totalHT}€`);
-    Logger.println(colors.bold(`Total (with taxes): ${result.totalTTC}€`));
+    Logger.println(styleText('bold', `Total (with taxes): ${result.totalTTC}€`));
 
     await confirm(
       `You're about to pay ${result.totalTTC}€, confirm?`,
@@ -79,25 +79,26 @@ async function acceptPayment (result, skipConfirmation) {
   }
 }
 
-export async function add (params) {
+export async function add(params) {
   const { alias, app: appIdOrName, namespace, yes: skipConfirmation } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
-  const { port } = await addTcpRedir({ id: ownerId, appId }, { namespace }).then(sendToApi).catch((error) => {
-    if (error.status === 402) {
-      return acceptPayment(error.response.body, skipConfirmation).then(() => {
-        return addTcpRedir({ id: ownerId, appId, payment: 'accepted' }, { namespace }).then(sendToApi);
-      });
-    }
-    else {
-      throw error;
-    }
-  });
+  const { port } = await addTcpRedir({ id: ownerId, appId }, { namespace })
+    .then(sendToApi)
+    .catch((error) => {
+      if (error.status === 402) {
+        return acceptPayment(error.response.body, skipConfirmation).then(() => {
+          return addTcpRedir({ id: ownerId, appId, payment: 'accepted' }, { namespace }).then(sendToApi);
+        });
+      } else {
+        throw error;
+      }
+    });
 
   Logger.println('Successfully added tcp redirection on port: ' + port);
-};
+}
 
-export async function remove (params) {
+export async function remove(params) {
   const [port] = params.args;
   const { alias, app: appIdOrName, namespace } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -105,4 +106,4 @@ export async function remove (params) {
   await removeTcpRedir({ id: ownerId, appId, sourcePort: port, namespace }).then(sendToApi);
 
   Logger.println('Successfully removed tcp redirection.');
-};
+}