clever-tools 2.7.2 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # clever-tools changelog
 
+## 2.9.0 (2022-01-12)
+
+* Add NewRelic support in `clever drains`
+
+## 2.8.1 (2022-01-10)
+
+* Fix `colors` to `1.4.0`
+
+## 2.8.0 (2021-02-09)
+
+* Add options support for `clever addon create` (options like encryption-at-rest)
+* Display available versions in `clever addon providers show <provider>`
+* Display available options in `clever addon providers show <provider>`
+* Fix `clever deploy` which was displaying logs from runtime instances
+* Fix `clever accesslogs` so it doesn't fail when source object is undefined
+* Prevent race conditions on parallel CI configs with `clever deploy` and git add remote
+* Format `.clever.json` (Mickael Chanrion)
+
 ## 2.7.2 (2020-10-09)
 
 * addon: fix create relying on default region

package/README.md

@@ -26,6 +26,14 @@ npm install -g clever-tools@beta
 
 #### Debian/Ubuntu (.deb)
 
+---
+
+##### Warning
+
+Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+
+---
+
 If you are using a GNU/Linux distribution that uses `.deb` packages like Debian or Ubuntu, you can run:
 
 ```sh
@@ -46,6 +54,14 @@ echo "deb https://dl.bintray.com/clevercloud/deb unstable beta" | tee -a /etc/ap
 
 #### CentOS/Fedora (.rpm)
 
+---
+
+##### Warning
+
+Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+
+---
+
 If you are using a GNU/Linux distribution that uses `.rpm` packages like CentOS or Fedora, you can run:
 
 ```sh
@@ -131,7 +147,15 @@ NOTES:
 
 #### Using chocolatey
 
-If you are using Windows and you have [chocolatey](https://chocolatey.org) installed, you can run: 
+---
+
+##### Warning
+
+Bintray is ending on May 1st 2021, we will migrate hosting as soon as possible. Please refer to the dedicated [issue](https://github.com/CleverCloud/clever-tools/issues/454) to track the migration.
+
+---
+
+If you are using Windows and you have [chocolatey](https://chocolatey.org) installed, you can run:
 
 ```bash
 choco sources add -n=clevercloud -s='https://api.bintray.com/nuget/clevercloud/nupkg'
@@ -160,6 +184,14 @@ docker pull clevercloud/clever-tools
 docker run --rm clever-tools <command>
 ```
 
+#### Dockerfile
+
+In your `Dockerfile` you can copy the clever-tools CLI from the image itself with a simple one liner:
+
+```Dockerfile
+COPY --from=clevercloud/clever-tools /bin/clever /usr/local/bin/clever
+```
+
 ### Via Nix
 
 If you are using Nix, you will find a Nix derivation on Fretlink's Github repository: https://github.com/fretlink/clever-tools-nix
@@ -168,7 +200,7 @@ If you are using Nix, you will find a Nix derivation on Fretlink's Github reposi
 
 The clever-tools CLI comes with a comprehensive auto-completion system.
 Some installation methods like `.deb` packages, `.rpm` packages or brew will try to enable it automatically.
-If it does not work, try this for bash: 
+If it does not work, try this for bash:
 
 ```bash
 clever --bash-autocomplete-script $(which clever) | sudo tee /usr/share/bash-completion/completions/clever
@@ -288,6 +320,7 @@ Where `DRAIN-TYPE` is one of:
 - `HTTP`: for TCP syslog endpoint (note that this endpoint has optional username/passwordparameters as HTTP Basic Authentication);
 - `ElasticSearch`: for ElasticSearch endpoint (note that this endpoint requires username/password parameters as HTTP Basic Authentication);
 - `DatadogHTTP`: for Datadog endpoint (note that this endpoint needs your Datadog API Key).
+- `NewRelicHTTP`: for NewRelic endpoint (note that this endpoint needs your NewRelic API Key).
 
 #### ElasticSearch logs drains
 
@@ -305,6 +338,16 @@ clever drain create DatadogHTTP "https://http-intake.logs.datadoghq.com/v1/input
 
 Please note that the `host` query parameter is not mandatory: in the Datadog pipeline configuration, you can map `@source_host` which is the host provided by Clever Cloud in logs as `host` property.
 
+#### NewRelic logs drains
+
+NewRelic has two zones, EU and US. An account on one zone is not available on the other, make sure to target the good EU or US intake endpoint.
+
+To create a [NewRelic](https://docs.newrelic.com/docs/logs/log-api/introduction-log-api/) drain, you just need to use:
+
+```sh
+clever drain create NewRelicHTTP "https://log-api.eu.newrelic.com/log/v1" --api-key <API_KEY>
+```
+
 ### Display help
 
 You can display help about each command with `clever help`.

package/bin/clever.js

@@ -297,6 +297,14 @@ function run () {
       description: 'Region to provision the addon in, depends on the provider',
       complete: Addon('completeRegion'),
     }),
+    addonVersion: cliparse.option('addon-version', {
+      metavar: 'addon-version',
+      description: 'The version to use for the add-on',
+    }),
+    addonOptions: cliparse.option('option', {
+      metavar: 'option',
+      description: 'Option to enable for the add-on. Multiple --option argument can be passed to enable multiple options',
+    }),
     region: cliparse.option('region', {
       aliases: ['r'],
       default: 'par',
@@ -379,7 +387,7 @@ function run () {
   const addonCreateCommand = cliparse.command('create', {
     description: 'Create an addon',
     args: [args.addonProvider, args.addonName],
-    options: [opts.linkAddon, opts.confirmAddonCreation, opts.addonPlan, opts.addonRegion],
+    options: [opts.linkAddon, opts.confirmAddonCreation, opts.addonPlan, opts.addonRegion, opts.addonVersion, opts.addonOptions],
   }, addon('create'));
   const addonDeleteCommand = cliparse.command('delete', {
     description: 'Delete an addon',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "2.7.2",
+  "version": "2.9.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -25,45 +25,45 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "^6.0.0",
+    "@clevercloud/client": "^7.4.0",
     "clf-date": "^0.2.0",
-    "cliparse": "^0.3.1",
-    "colors": "^1.4.0",
+    "cliparse": "^0.3.3",
+    "colors": "1.4.0",
     "common-env": "^6.4.0",
-    "eventsource": "^1.0.7",
-    "isomorphic-git": "1.7.4",
+    "eventsource": "^1.1.0",
+    "isomorphic-git": "^1.8.2",
     "linux-release-info": "^3.0.0",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
-    "moment": "^2.27.0",
+    "moment": "^2.29.1",
     "opn": "^6.0.0",
-    "slugify": "^1.4.5",
-    "string-length": "^3.1.0",
-    "superagent": "^6.0.0",
+    "slugify": "^1.5.3",
+    "string-length": "^4.0.2",
+    "superagent": "^6.1.0",
     "text-table": "^0.2.0",
-    "update-notifier": "^4.1.1",
-    "ws": "^7.3.1",
+    "update-notifier": "^5.1.0",
+    "ws": "^7.4.6",
     "xdg": "^0.1.1"
   },
   "devDependencies": {
-    "aws-sdk": "^2.735.0",
-    "chai": "^4.2.0",
-    "del": "^5.1.0",
-    "eslint": "^7.7.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "aws-sdk": "^2.919.0",
+    "chai": "^4.3.4",
+    "del": "^6.0.0",
+    "eslint": "^7.27.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "fs-extra": "^9.0.1",
-    "glob": "^7.1.6",
-    "grunt": "^1.2.1",
-    "grunt-cli": "^1.3.2",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "fs-extra": "^10.0.0",
+    "glob": "^7.1.7",
+    "grunt": "^1.4.1",
+    "grunt-cli": "^1.4.3",
     "grunt-http": "^2.3.3",
     "grunt-mocha-test": "^0.13.3",
-    "mocha": "^8.1.1",
-    "pkg": "^4.4.9",
-    "semver": "^7.3.2"
+    "mocha": "^8.4.0",
+    "pkg": "^5.2.1",
+    "semver": "^7.3.5"
   },
   "scripts": {
     "pretest": "npm run lint",
@@ -83,5 +83,9 @@
     "scripts": [
       "src/**/*.js"
     ]
+  },
+  "volta": {
+    "node": "12.22.8",
+    "npm": "6.14.15"
   }
 }

package/src/commands/accesslogs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { getAccessLogsFromWarp10InBatches, getContinuousAccessLogsFromWarp10 } = require('@clevercloud/client/cjs/access-logs.js');
-const { getWarp10AccessLogsToken } = require('@clevercloud/client/cjs/api/warp-10.js');
+const { getWarp10AccessLogsToken } = require('@clevercloud/client/cjs/api/v2/warp-10.js');
 const { ONE_HOUR_MICROS, ONE_SECOND_MICROS, toMicroTimestamp } = require('@clevercloud/client/cjs/utils/date.js');
 
 const Addon = require('../models/addon.js');

package/src/commands/addon.js

@@ -9,6 +9,7 @@ const formatTable = require('../format-table')();
 const Logger = require('../logger.js');
 const Organisation = require('../models/organisation.js');
 const User = require('../models/user.js');
+const { parseAddonOptions } = require('../models/addon.js');
 
 async function list (params) {
   const { org: orgaIdOrName } = params.options;
@@ -30,6 +31,8 @@ async function list (params) {
 async function create (params) {
   const [providerName, name] = params.args;
   const { link: linkedAppAlias, plan: planName, region, yes: skipConfirmation, org: orgaIdOrName } = params.options;
+  const version = params.options['addon-version'];
+  const addonOptions = parseAddonOptions(params.options.option);
 
   const ownerId = (orgaIdOrName != null)
     ? await Organisation.getId(orgaIdOrName)
@@ -47,12 +50,14 @@ async function create (params) {
       planName,
       region,
       skipConfirmation,
+      version,
+      addonOptions,
     });
     await Addon.link(linkedAppData.ownerId, linkedAppData.appId, { addon_id: newAddon.id });
     Logger.println(`Addon ${name} (id: ${newAddon.id}) successfully created and linked to the application`);
   }
   else {
-    const newAddon = await Addon.create({ ownerId, name, providerName, planName, region, skipConfirmation });
+    const newAddon = await Addon.create({ ownerId, name, providerName, planName, region, skipConfirmation, version, addonOptions });
     Logger.println(`Addon ${name} (id: ${newAddon.id}) successfully created`);
   }
 }
@@ -85,7 +90,7 @@ async function listProviders () {
     return [
       colors.bold(provider.id),
       provider.name,
-      provider.shortDesc,
+      provider.shortDesc || '',
     ];
   });
   Logger.println(formatTable(formattedProviders));
@@ -95,6 +100,8 @@ async function showProvider (params) {
   const [providerName] = params.args;
 
   const provider = await Addon.getProvider(providerName);
+  const providerInfos = await Addon.getProviderInfos(providerName);
+  const providerPlans = provider.plans.sort((a, b) => a.price - b.price);
 
   Logger.println(colors.bold(provider.id));
   Logger.println(`${provider.name}: ${provider.shortDesc}`);
@@ -103,11 +110,35 @@ async function showProvider (params) {
   Logger.println();
   Logger.println('Available plans');
 
-  provider.plans.forEach((plan) => {
+  providerPlans.forEach((plan) => {
     Logger.println(`Plan ${colors.bold(plan.slug)}`);
     _(plan.features)
       .sortBy('name')
       .forEach(({ name, value }) => Logger.println(`  ${name}: ${value}`));
+
+    if (providerInfos != null) {
+      const planType = plan.features.find(({ name }) => name.toLowerCase() === 'type');
+      if (planType != null && planType.value.toLowerCase() === 'dedicated') {
+        const planVersions = Object.keys(providerInfos.dedicated);
+        const versions = planVersions.map((version) => {
+          if (version === providerInfos.defaultDedicatedVersion) {
+            return `${version} (default)`;
+          }
+          else {
+            return version;
+          }
+        });
+        Logger.println(`  Available versions: ${versions.join(', ')}`);
+
+        planVersions.forEach((version) => {
+          const features = providerInfos.dedicated[version].features;
+          Logger.println(`  Options for version ${version}:`);
+          features.forEach(({ name, enabled }) => {
+            Logger.println(`    ${name}: default=${enabled}`);
+          });
+        });
+      }
+    }
   });
 }
 

package/src/commands/cancel-deploy.js

@@ -2,7 +2,7 @@
 
 const AppConfig = require('../models/app_configuration.js');
 const Logger = require('../logger.js');
-const { getAllDeployments, cancelDeployment } = require('@clevercloud/client/cjs/api/application.js');
+const { getAllDeployments, cancelDeployment } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 async function cancelDeploy (params) {

package/src/commands/config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 
 const AppConfig = require('../models/app_configuration.js');
 const Application = require('../models/application.js');

package/src/commands/deploy.js

@@ -7,7 +7,7 @@ const Application = require('../models/application.js');
 const git = require('../models/git.js');
 const Log = require('../models/log.js');
 const Logger = require('../logger.js');
-const { getAllDeployments } = require('@clevercloud/client/cjs/api/application.js');
+const { getAllDeployments } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 // Once the API call to redeploy() has been triggered successfully,

package/src/commands/domain.js

@@ -9,7 +9,7 @@ const {
   markFavouriteDomain,
   unmarkFavouriteDomain,
   removeDomain,
-} = require('@clevercloud/client/cjs/api/application.js');
+} = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function getFavouriteDomain ({ ownerId, appId }) {

package/src/commands/drain.js

@@ -4,7 +4,7 @@ const AppConfig = require('../models/app_configuration.js');
 const { createDrainBody } = require('../models/drain.js');
 const Logger = require('../logger.js');
 
-const { getDrains, createDrain, deleteDrain, updateDrainState } = require('@clevercloud/client/cjs/api/log.js');
+const { getDrains, createDrain, deleteDrain, updateDrainState } = require('@clevercloud/client/cjs/api/v2/log.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 // TODO: This could be useful in other commands

package/src/commands/env.js

@@ -5,7 +5,7 @@ const Logger = require('../logger.js');
 const variables = require('../models/variables.js');
 const { sendToApi } = require('../models/send-to-api.js');
 const { toNameEqualsValueString, validateName } = require('@clevercloud/client/cjs/utils/env-vars.js');
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 
 async function list (params) {
   const { alias, 'add-export': addExports } = params.options;

package/src/commands/notify-email.js

@@ -5,7 +5,7 @@ const colors = require('colors/safe');
 const Logger = require('../logger.js');
 const { getOwnerAndApp, getOrgaIdOrUserId } = require('../models/notification.js');
 
-const { getEmailhooks, createEmailhook, deleteEmailhook } = require('@clevercloud/client/cjs/api/notification.js');
+const { getEmailhooks, createEmailhook, deleteEmailhook } = require('@clevercloud/client/cjs/api/v2/notification.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function displayEmailhook (hook) {
@@ -55,6 +55,7 @@ function getEmailNotificationTargets (notifTargets) {
       if (el.toLowerCase() === 'organisation') {
         return { type: 'organisation' };
       }
+      return null;
     })
     .filter((e) => e != null);
 }

package/src/commands/published-config.js

@@ -5,7 +5,7 @@ const Logger = require('../logger.js');
 const variables = require('../models/variables.js');
 const { sendToApi } = require('../models/send-to-api.js');
 const { toNameEqualsValueString, validateName } = require('@clevercloud/client/cjs/utils/env-vars.js');
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 
 async function list (params) {
   const { alias } = params.options;

package/src/commands/status.js

@@ -6,7 +6,7 @@ const colors = require('colors/safe');
 const AppConfig = require('../models/app_configuration.js');
 const Logger = require('../logger.js');
 
-const { get: getApplication, getAllInstances } = require('@clevercloud/client/cjs/api/application.js');
+const { get: getApplication, getAllInstances } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function displayGroupInfo (instances, commit) {

package/src/commands/stop.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const AppConfig = require('../models/app_configuration.js');
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 const Logger = require('../logger.js');
 const { sendToApi } = require('../models/send-to-api.js');
 

package/src/commands/tcp-redirs.js

@@ -7,7 +7,7 @@ const Organisation = require('../models/organisation.js');
 const { sendToApi } = require('../models/send-to-api.js');
 const Interact = require('../models/interact.js');
 const Logger = require('../logger.js');
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 
 async function listNamespaces (params) {
   const namespaces = await Organisation.getNamespaces(params);

package/src/commands/webhooks.js

@@ -5,7 +5,7 @@ const colors = require('colors/safe');
 const Logger = require('../logger.js');
 const { getOwnerAndApp, getOrgaIdOrUserId } = require('../models/notification.js');
 
-const { getWebhooks, createWebhook, deleteWebhook } = require('@clevercloud/client/cjs/api/notification.js');
+const { getWebhooks, createWebhook, deleteWebhook } = require('@clevercloud/client/cjs/api/v2/notification.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function displayWebhook (hook) {

package/src/models/accesslogs.js

@@ -19,12 +19,22 @@ function getFormatter (format, isAddon) {
   }
 }
 
+function formatSource (l) {
+  if (l.s != null) {
+    const location = l.s.ct ? `${l.s.ct}, ${l.s.co}` : l.s.co;
+    return `${l.ipS} - ${location}`;
+  }
+  else {
+    return l.ipS;
+  }
+}
+
 function formatSimple (l) {
   return `${new Date(l.t).toISOString()} ${l.ipS} ${l.vb} ${l.path}`;
 }
 
 function formatExtended (l) {
-  return `${new Date(l.t).toISOString()} [ ${l.ipS} - ${l.s.ct ? `${l.s.ct}, ${l.s.co}` : `${l.s.co}`} ] ${l.vb} ${l.h} ${l.path} ${l.sC}`;
+  return `${new Date(l.t).toISOString()} [ ${formatSource(l)} ] ${l.vb} ${l.h} ${l.path} ${l.sC}`;
 }
 
 function formatCLF (l) {
@@ -36,7 +46,7 @@ function formatSimpleAddon (l) {
 }
 
 function formatExtendedAddon (l) {
-  return `${new Date(l.t).toISOString()} [ ${l.ipS} - ${l.s.ct ? `${l.s.ct}, ${l.s.co}` : `${l.s.co}`} ] duration(ms): ${l.sDuration}`;
+  return `${new Date(l.t).toISOString()} [ ${formatSource(l)} ] duration(ms): ${l.sDuration}`;
 }
 
 function formatCLFAddon (l) {

package/src/models/activity.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 
 const { sendToApi } = require('./send-to-api.js');
 

package/src/models/addon.js

@@ -1,11 +1,12 @@
 'use strict';
 
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 const autocomplete = require('cliparse').autocomplete;
 const colors = require('colors/safe');
-const { get: getAddon, getAll: getAllAddons, remove: removeAddon, create: createAddon, preorder: preorderAddon, update: updateAddon } = require('@clevercloud/client/cjs/api/addon.js');
-const { getAllAddonProviders } = require('@clevercloud/client/cjs/api/product.js');
-const { getSummary } = require('@clevercloud/client/cjs/api/user.js');
+const { get: getAddon, getAll: getAllAddons, remove: removeAddon, create: createAddon, preorder: preorderAddon, update: updateAddon } = require('@clevercloud/client/cjs/api/v2/addon.js');
+const { getAllAddonProviders } = require('@clevercloud/client/cjs/api/v2/product.js');
+const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
+const { getAddonProvider } = require('@clevercloud/client/cjs/api/v4/addon-providers.js');
 
 const Interact = require('./interact.js');
 const Logger = require('../logger.js');
@@ -24,6 +25,16 @@ async function getProvider (providerName) {
   return provider;
 }
 
+function getProviderInfos (providerName) {
+  return getAddonProvider({ providerId: providerName }).then(sendToApi)
+    .catch(() => {
+      // An error can occur because the add-on api doesn't implement this endpoint yet
+      // This is fine, just ignore it
+      Logger.debug(`${providerName} doesn't yet implement the provider info endpoint`);
+      return Promise.resolve(null);
+    });
+}
+
 async function list (ownerId, appId, showAll) {
   const allAddons = await getAllAddons({ id: ownerId }).then(sendToApi);
 
@@ -45,7 +56,78 @@ async function list (ownerId, appId, showAll) {
   });
 }
 
-async function create ({ ownerId, name, providerName, planName, region, skipConfirmation }) {
+function validateAddonVersionAndOptions (region, version, addonOptions, providerInfos, planType) {
+  if (providerInfos != null) {
+    if (version != null) {
+      const type = planType.value.toLowerCase();
+      if (type === 'shared') {
+        const cluster = providerInfos.clusters.find(({ zone }) => zone === region);
+        if (cluster == null) {
+          throw new Error(`Can't find cluster for region ${region}`);
+        }
+        else if (cluster.version !== version) {
+          throw new Error(`Invalid version ${version}, selected shared cluster only supports version ${cluster.version}`);
+        }
+      }
+      else if (type === 'dedicated') {
+        const availableVersions = Object.keys(providerInfos.dedicated);
+        const hasVersion = availableVersions.find((availableVersion) => availableVersion === version);
+        if (hasVersion == null) {
+          throw new Error(`Invalid version ${addonOptions.version}, available versions are: ${availableVersions.join(', ')}`);
+        }
+      }
+    }
+
+    const chosenVersion = version != null ? version : providerInfos.defaultDedicatedVersion;
+
+    // Check the selected options to see if the chosen plan / region offers them
+    // If not, abort the creation
+    if (Object.keys(addonOptions).length > 0) {
+      const type = planType.value.toLowerCase();
+      let availableOptions = [];
+      if (type === 'shared') {
+        const cluster = providerInfos.clusters.find(({ zone }) => zone === region);
+        if (cluster == null) {
+          throw new Error(`Can't find cluster for region ${region}`);
+        }
+
+        availableOptions = cluster.features;
+      }
+      else if (type === 'dedicated') {
+        availableOptions = providerInfos.dedicated[chosenVersion].features;
+      }
+
+      for (const selectedOption in addonOptions) {
+        const isAvailable = availableOptions.find(({ name }) => name === selectedOption);
+        if (isAvailable == null) {
+          const optionNames = availableOptions.map(({ name }) => name).join(',');
+          let availableOptionsError = null;
+          if (optionNames.length > 0) {
+            availableOptionsError = `Avalailble options are: ${optionNames}.`;
+          }
+          else {
+            availableOptionsError = 'No options are available for this plan.';
+          }
+
+          throw new Error(`Option "${selectedOption}" is not available on this plan. ${availableOptionsError}`);
+        }
+      }
+    }
+
+    return {
+      version: chosenVersion,
+      ...addonOptions,
+    };
+  }
+  else {
+    if (version != null) {
+      throw new Error('You provided a version for an add-on that doesn\'t support choosing the version.');
+    }
+    return {};
+  }
+}
+
+async function create ({ ownerId, name, providerName, planName, region, skipConfirmation, version, addonOptions }) {
 
   // TODO: We should be able to use it without {}
   const providers = await listProviders();
@@ -58,13 +140,33 @@ async function create ({ ownerId, name, providerName, planName, region, skipConf
     throw new Error(`invalid region name. Available regions: ${provider.regions.join(', ')}`);
   }
 
-  const plan = provider.plans.find((p) => p.slug === planName);
+  const plan = provider.plans.find((p) => p.slug.toLowerCase() === planName.toLowerCase());
   if (plan == null) {
     const availablePlans = provider.plans.map((p) => p.slug);
     throw new Error(`invalid plan name. Available plans: ${availablePlans.join(', ')}`);
   }
 
-  const addonToCreate = { name, plan: plan.id, providerId: provider.id, region };
+  const providerInfos = await getProviderInfos(provider.id);
+  const planType = plan.features.find(({ name }) => name.toLowerCase() === 'type');
+
+  // If we have a providerInfos but we don't have a planType, we won't be able to go further
+  // The process should stop here to make sure users don't create something they don't intend to
+  // This missing feature should have been added during the add-on's development phase
+  // The console has a similar check so I believe we shouldn't hit this
+  if (providerInfos != null && planType == null) {
+    throw new Error('Internal error. The selected plan misses the TYPE feature. Please contact our support with the command line you used');
+  }
+
+  const createOptions = validateAddonVersionAndOptions(region, version, addonOptions, providerInfos, planType);
+
+  const addonToCreate = {
+    name,
+    plan: plan.id,
+    providerId: provider.id,
+    region,
+    options: createOptions,
+  };
+
   const result = await preorderAddon({ id: ownerId }, addonToCreate).then(sendToApi);
 
   if (result.totalTTC > 0 && !skipConfirmation) {
@@ -153,6 +255,33 @@ async function findById (addonId) {
   throw new Error(`Could not find add-on with ID: ${addonId}`);
 }
 
+function parseAddonOptions (options) {
+  if (options == null) {
+    return {};
+  }
+
+  return options.split(',').reduce((options, option) => {
+    const [key, value] = option.split('=');
+    if (value == null) {
+      throw new Error("Options are malformed. Usage is '--option name=enabled|disabled|true|false'");
+    }
+
+    let formattedValue = value;
+    if (value === 'true' || value === 'enabled') {
+      formattedValue = 'true';
+    }
+    else if (value === 'false' || value === 'disabled') {
+      formattedValue = 'false';
+    }
+    else {
+      throw new Error(`Can't parse option value: ${value}. Accepted values are: enabled, disabled, true, false`);
+    }
+
+    options[key] = formattedValue;
+    return options;
+  }, {});
+}
+
 module.exports = {
   completePlan,
   completeRegion,
@@ -160,9 +289,11 @@ module.exports = {
   delete: deleteAddon,
   findById,
   getProvider,
+  getProviderInfos,
   link,
   list,
   listProviders,
+  parseAddonOptions,
   rename,
   unlink,
 };

package/src/models/app_configuration.js

@@ -111,7 +111,7 @@ async function getAppDetails ({ alias }) {
 };
 
 function persistConfig (modifiedConfig) {
-  const jsonContents = JSON.stringify(modifiedConfig);
+  const jsonContents = JSON.stringify(modifiedConfig, null, 2);
   return fs.writeFile(conf.APP_CONFIGURATION_FILE, jsonContents);
 };
 

package/src/models/application.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const _ = require('lodash');
-const application = require('@clevercloud/client/cjs/api/application.js');
+const application = require('@clevercloud/client/cjs/api/v2/application.js');
 const autocomplete = require('cliparse').autocomplete;
-const product = require('@clevercloud/client/cjs/api/product.js');
+const product = require('@clevercloud/client/cjs/api/v2/product.js');
 
 const AppConfiguration = require('./app_configuration.js');
 const Interact = require('./interact.js');

package/src/models/configuration.js

@@ -1,11 +1,7 @@
 'use strict';
 
-const fs = require('fs');
+const { promises: fs } = require('fs');
 const path = require('path');
-const util = require('util');
-
-const readFile = util.promisify(fs.readFile);
-const writeFile = util.promisify(fs.writeFile);
 
 const commonEnv = require('common-env');
 const mkdirp = require('mkdirp');
@@ -14,7 +10,7 @@ const xdg = require('xdg');
 const Logger = require('../logger.js');
 const env = commonEnv(Logger);
 
-function getConfigPath () {
+function getConfigDir () {
   if (process.platform === 'win32') {
     return path.resolve(process.env.APPDATA, 'clever-cloud');
   }
@@ -23,6 +19,37 @@ function getConfigPath () {
   }
 }
 
+function getConfigPath () {
+  const configDir = getConfigDir();
+  return path.resolve(configDir, 'clever-tools.json');
+}
+
+async function isFile (path) {
+  try {
+    const pathStat = await fs.stat(path);
+    return pathStat.isFile();
+  }
+  catch (e) {
+    return false;
+  }
+}
+
+async function maybeMigrateFromLegacyConfigurationPath () {
+  // This used to be a file
+  const configDir = getConfigDir();
+  const legacyConfig = await isFile(configDir);
+  // If it is still a file, we replace it with a dir and move it inside
+  if (legacyConfig) {
+    const tmpConfigFile = `${configDir}.tmp`;
+    const configFile = getConfigPath();
+
+    // Rename so that we can create the directory
+    await fs.rename(configDir, tmpConfigFile);
+    await mkdirp(configDir, { mode: 0o700 });
+    await fs.rename(tmpConfigFile, configFile);
+  }
+}
+
 async function loadOAuthConf () {
   Logger.debug('Load configuration from environment variables');
   if (process.env.CLEVER_TOKEN != null && process.env.CLEVER_SECRET != null) {
@@ -32,8 +59,9 @@ async function loadOAuthConf () {
     };
   }
   Logger.debug('Load configuration from ' + conf.CONFIGURATION_FILE);
+  await maybeMigrateFromLegacyConfigurationPath();
   try {
-    const rawFile = await readFile(conf.CONFIGURATION_FILE);
+    const rawFile = await fs.readFile(conf.CONFIGURATION_FILE);
     return JSON.parse(rawFile);
   }
   catch (error) {
@@ -47,7 +75,7 @@ async function writeOAuthConf (oauthData) {
   const configDir = path.dirname(conf.CONFIGURATION_FILE);
   try {
     await mkdirp(configDir, { mode: 0o700 });
-    await writeFile(conf.CONFIGURATION_FILE, JSON.stringify(oauthData));
+    await fs.writeFile(conf.CONFIGURATION_FILE, JSON.stringify(oauthData));
   }
   catch (error) {
     throw new Error(`Cannot write configuration to ${conf.CONFIGURATION_FILE}\n${error.message}`);
@@ -55,8 +83,8 @@ async function writeOAuthConf (oauthData) {
 }
 
 const conf = env.getOrElseAll({
-  API_HOST: 'https://api.clever-cloud.com/v2',
-  // API_HOST: 'https://ccapi-preprod.cleverapps.io/v2',
+  API_HOST: 'https://api.clever-cloud.com',
+  // API_HOST: 'https://ccapi-preprod.cleverapps.io',
   LOG_WS_URL: 'wss://api.clever-cloud.com/v2/logs/logs-socket/<%- appId %>?since=<%- timestamp %>',
   LOG_HTTP_URL: 'https://api.clever-cloud.com/v2/logs/<%- appId %>',
   EVENT_URL: 'wss://api.clever-cloud.com/v2/events/event-socket',

package/src/models/deployments.js

@@ -4,7 +4,7 @@ const { promisify } = require('util');
 const delay = promisify(setTimeout);
 
 const Logger = require('../logger.js');
-const { getDeployment, getAllDeployments } = require('@clevercloud/client/cjs/api/application.js');
+const { getDeployment, getAllDeployments } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('./send-to-api.js');
 
 const DEPLOYMENT_POLLING_DELAY = 5000;
@@ -30,6 +30,7 @@ async function waitForDeploymentStart ({ ownerId, appId, deploymentId, commitId,
           const isNew = knownDeployments.every(({ uuid }) => uuid !== d.uuid);
           return isNew && d.commit === commitId;
         }
+        return false;
       });
       if (deployment != null) {
         Logger.debug(`Deployment has started (state:${deployment.state})`);

package/src/models/domain.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 
 const Logger = require('../logger.js');
-const { getAllDomains, getFavouriteDomain } = require('@clevercloud/client/cjs/api/application.js');
+const { getAllDomains, getFavouriteDomain } = require('@clevercloud/client/cjs/api/v2/application.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 async function getBest (appId, orgaId) {

package/src/models/drain.js

@@ -8,12 +8,13 @@ const DRAIN_TYPES = [
   { id: 'HTTP', credentials: 'OPTIONAL' },
   { id: 'ElasticSearch', credentials: 'MANDATORY' },
   { id: 'DatadogHTTP' },
+  { id: 'NewRelicHTTP', apiKey: 'MANDATORY' },
 ];
 
 function createDrainBody (appId, drainTargetURL, drainTargetType, drainTargetCredentials, drainTargetConfig) {
 
-  if (!authorizeDrainCreation(drainTargetType, drainTargetCredentials)) {
-    throw new Error("Credentials are: optional for HTTP, mandatory for ElasticSearch and TCPSyslog/UDPSyslog don't need them.");
+  if (!authorizeDrainCreation(drainTargetType, drainTargetCredentials, drainTargetConfig)) {
+    throw new Error("Credentials are: optional for HTTP, mandatory for ElasticSearch, NewRelicHTTP and TCPSyslog/UDPSyslog don't need them.");
   }
 
   const body = {
@@ -26,20 +27,37 @@ function createDrainBody (appId, drainTargetURL, drainTargetType, drainTargetCre
       password: drainTargetCredentials.password || '',
     };
   }
+  if (keyExist(drainTargetConfig)) {
+    body.APIKey = drainTargetConfig.apiKey;
+  }
   return body;
 }
 
-function authorizeDrainCreation (drainTargetType, drainTargetCredentials) {
+function authorizeDrainCreation (drainTargetType, drainTargetCredentials, drainTargetConfig) {
   if (drainTypeExists(drainTargetType)) {
     // retrieve creds for drain type ('mandatory', 'optional', undefined)
-    const status = credentialsStatus(drainTargetType).credentials;
-    if (status === 'MANDATORY') {
+    const credStatus = credentialsStatus(drainTargetType).credentials;
+    const keyStatus = credentialsStatus(drainTargetType).apiKey;
+
+    if (credStatus === 'MANDATORY') {
       return credentialsExist(drainTargetCredentials);
     }
-    if (status === 'OPTIONAL') {
+    if (credStatus === 'OPTIONAL') {
+      return true;
+    }
+    if (!credStatus && !keyStatus) {
+      return credentialsEmpty(drainTargetCredentials);
+    }
+
+    if (keyStatus === 'MANDATORY') {
+      return keyExist(drainTargetConfig);
+    }
+    if (keyStatus === 'OPTIONAL') {
       return true;
     }
-    return credentialsEmpty(drainTargetCredentials);
+    if (!keyStatus) {
+      return keyEmpty(drainTargetConfig);
+    }
   }
 }
 
@@ -59,6 +77,14 @@ function credentialsEmpty ({ username, password }) {
   return username == null && password == null;
 }
 
+function keyExist ({ apiKey }) {
+  return apiKey != null;
+}
+
+function keyEmpty ({ apiKey }) {
+  return apiKey == null;
+}
+
 function listDrainTypes () {
   return autocomplete.words(DRAIN_TYPES.map((type) => type.id));
 }

package/src/models/fs-utils.js

@@ -1,14 +1,11 @@
 'use strict';
 
 const { join } = require('path');
-const fs = require('fs');
-const { promisify } = require('util');
-
-const fsStat = promisify(fs.stat);
+const { promises: fs } = require('fs');
 
 function findPath (dir, name) {
   const fullPath = join(dir, name);
-  return fsStat(fullPath)
+  return fs.stat(fullPath)
     .then(() => dir)
     .catch((e) => {
       if (e.code === 'ENOENT' && dir !== '/') {

package/src/models/git.js

@@ -36,7 +36,8 @@ async function addRemote (remoteName, url) {
   const allRemotes = await git.listRemotes({ ...repo });
   const existingRemote = _.find(allRemotes, { remote: safeRemoteName });
   if (existingRemote == null) {
-    return git.addRemote({ ...repo, remote: safeRemoteName, url });
+    // In some situations, we may end up with race conditions so we force it
+    return git.addRemote({ ...repo, remote: safeRemoteName, url, force: true });
   }
 }
 

package/src/models/log.js

@@ -5,7 +5,7 @@ const colors = require('colors/safe');
 
 const Logger = require('../logger.js');
 const { Deferred } = require('./utils.js');
-const { getOldLogs } = require('@clevercloud/client/cjs/api/log.js');
+const { getOldLogs } = require('@clevercloud/client/cjs/api/v2/log.js');
 const { LogsStream } = require('@clevercloud/client/cjs/streams/logs.node.js');
 const { sendToApi, getHostAndTokens } = require('./send-to-api.js');
 const { waitForDeploymentEnd, waitForDeploymentStart } = require('./deployments.js');
@@ -25,7 +25,8 @@ function isDeploymentFailedMessage (line) {
 };
 
 function isBuildSucessMessage (line) {
-  return _.startsWith(line._source['@message'].toLowerCase(), 'build succeeded in');
+  return isCleverMessage(line)
+    && _.startsWith(line._source['@message'].toLowerCase(), 'build succeeded in');
 };
 
 function formatLogLine (line) {
@@ -115,7 +116,7 @@ async function watchDeploymentAndDisplayLogs ({ ownerId, appId, deploymentId, co
     // displayLiveLogs() defines callback listeners so if it catches error in those callbacks,
     // it has no proper way to bubble up the error here.
     // Using the deferred enables this.
-    logsStream = await displayLiveLogs({ appId, deploymentId }, deferred);
+    logsStream = await displayLiveLogs({ appId, deploymentId: deployment.uuid }, deferred);
   }
 
   Logger.println('Waiting for application logs…');

package/src/models/organisation.js

@@ -5,8 +5,8 @@ const autocomplete = require('cliparse').autocomplete;
 
 const AppConfig = require('./app_configuration.js');
 
-const organisation = require('@clevercloud/client/cjs/api/organisation.js');
-const { getSummary } = require('@clevercloud/client/cjs/api/user.js');
+const organisation = require('@clevercloud/client/cjs/api/v2/organisation.js');
+const { getSummary } = require('@clevercloud/client/cjs/api/v2/user.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 async function getId (orgaIdOrName) {

package/src/models/user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { get } = require('@clevercloud/client/cjs/api/organisation.js');
+const { get } = require('@clevercloud/client/cjs/api/v2/organisation.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function getCurrent () {