clever-tools 3.8.1 → 3.8.3

package/bin/clever.js

@@ -41,8 +41,9 @@ if (!updateNotifierExplicitFalse && !isRunThroughPackagedBinary) {
     pkg,
     tagsUrl: 'https://api.github.com/repos/CleverCloud/clever-tools/tags',
   }).notify({
+    isGlobal: true,
     getDetails () {
-      const docsUrl = 'https://www.clever-cloud.com/doc/clever-tools/getting_started';
+      const docsUrl = 'https://github.com/CleverCloud/clever-tools/tree/master/docs#how-to-use-clever-tools';
       return `\nPlease follow this link to update your clever-tools:\n${docsUrl}`;
     },
   });
@@ -417,8 +418,7 @@ function run () {
     drainIndexPrefix: cliparse.option('index-prefix', {
       aliases: ['i'],
       metavar: 'index_prefix',
-      description: '(ElasticSearch drains) Index prefix',
-      default: 'logstash-<YYYY-MM-DD>',
+      description: '(ElasticSearch drains) optional index prefix. `logstash` value is used if not set',
     }),
     drainSDParameters: cliparse.option('sd-params', {
       aliases: ['s'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.8.1",
+  "version": "3.8.3",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -70,8 +70,7 @@
     "mocha": "8.4.0",
     "pkg": "5.8.1",
     "rollup": "4.14.1",
-    "semver": "7.3.5",
-    "text-table": "0.2.0"
+    "semver": "7.3.5"
   },
   "overrides": {
     "pkg-fetch": "3.5.2"

package/src/commands/addon.js

@@ -117,6 +117,12 @@ function displayAddon (format, addon, providerName, message) {
         'Learn more about Materia KV on Clever Cloud: https://developers.clever-cloud.com/doc/addons/materia-kv/',
       ].join('\n'),
     },
+    metabase: {
+      status: 'tech preview',
+      postCreateInstructions: [
+        'Learn more about Metabase on Clever Cloud: https://developers.clever-cloud.com/doc/addons/metabase/',
+      ].join('\n'),
+    },
     'addon-pulsar': {
       status: 'beta',
       postCreateInstructions: [
@@ -176,7 +182,17 @@ async function deleteAddon (params) {
   const { yes: skipConfirmation, org: orgaIdOrName } = params.options;
   const [addon] = params.args;
 
-  const ownerId = await Organisation.getId(orgaIdOrName);
+  let ownerId = await Organisation.getId(orgaIdOrName);
+
+  if (ownerId == null && addon.addon_id != null) {
+    ownerId = await Addon.findOwnerId(ownerId, addon.addon_id);
+  }
+
+  if (ownerId == null && addon.addon_name != null) {
+    const foundAddon = await Addon.findByName(addon.addon_name);
+    ownerId = foundAddon.orgaId;
+  }
+
   await Addon.delete(ownerId, addon, skipConfirmation);
 
   Logger.println(`Addon ${addon.addon_id || addon.addon_name} successfully deleted`);

package/src/commands/drain.js

@@ -43,7 +43,7 @@ async function list (params) {
 
         let drainView = `${id} -> ${state} for ${url} as ${drainType}`;
         if (indexPrefix != null) {
-          drainView += `, index: '${indexPrefix}-<YYYY-MM-DD>'`;
+          drainView += `, custom index: '${indexPrefix}-YYYY-MM-DD'`;
         }
         if (structuredDataParameters != null) {
           drainView += `, sd-params: '${structuredDataParameters}'`;

package/src/models/addon.js

@@ -243,6 +243,22 @@ async function findById (addonId) {
   throw new Error(`Could not find add-on with ID: ${addonId}`);
 }
 
+async function findByName (addonName) {
+  const { user, organisations } = await getSummary({}).then(sendToApi);
+  for (const orga of [user, ...organisations]) {
+    for (const simpleAddon of orga.addons) {
+      if (simpleAddon.name === addonName) {
+        const addon = await getAddon({ id: orga.id, addonId: simpleAddon.id }).then(sendToApi);
+        return {
+          ...addon,
+          orgaId: orga.id,
+        };
+      }
+    }
+  }
+  throw new Error(`Could not find add-on with name ${addonName}`);
+}
+
 async function findOwnerId (org, addonId) {
 
   if (org != null && org.orga_id != null) {
@@ -305,6 +321,7 @@ module.exports = {
   delete: deleteAddon,
   findById,
   findOwnerId,
+  findByName,
   getProvider,
   getProviderInfos,
   link,