clever-tools 2.8.0 → 2.8.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # clever-tools changelog
 
+## 2.8.1 (2021-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)

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -25,45 +25,45 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "^7.2.0",
+    "@clevercloud/client": "^7.4.0",
     "clf-date": "^0.2.0",
     "cliparse": "^0.3.3",
-    "colors": "^1.4.0",
+    "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/notify-email.js

@@ -55,6 +55,7 @@ function getEmailNotificationTargets (notifTargets) {
       if (el.toLowerCase() === 'organisation') {
         return { type: 'organisation' };
       }
+      return null;
     })
     .filter((e) => e != null);
 }

package/src/models/accesslogs.js

@@ -23,7 +23,8 @@ 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 {
+  }
+  else {
     return l.ipS;
   }
 }

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}`);

package/src/models/deployments.js

@@ -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/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 !== '/') {