Merge branch 'develop', prepare 6.0.2

Author: yamalight

.travis.yml

@@ -2,20 +2,20 @@ language: node_js
 
 node_js: lts/erbium
 
-cache: yarn
+cache: npm
 
 script:
-  - yarn test
-  - yarn lint
+  - npm test
+  - npm run lint
 
 after_success:
-  - yarn coveralls
-  - yarn build
-  - yarn package
+  - npm run coveralls
+  - npm run build
+  - npm run package
 
 deploy:
   - provider: releases
-    skip_cleanup: true
+    edge: true
     api_key:
       secure: cX62q8fanA+1BXidpVobsx6vkmD7mI7STJN2b/zD9TxLKa7EY4MpSI8t3JFnW0EaUxbiIwTJEjeftfDJhxey0kPvPgUxEAf3h5V7IoO6KSmCZ0I8xYdnNbMtKNBJqNj5USHupWyK5geZbIQ+GtjCr0k07G7Sm1zz9SaV3pmB/FZpPFsev8TukUPrGMyfa6AThS32EJXrNSTDEcewaxrCQN+5PylWlACKZ72v1MUBa9Lzxs7Rfd9god0jFqw29EBuCkpqmvgpThdG2sT0wFgAlodBFnW/DeVRyyfciAbLiMUKPTErNCbH51Hcndh3Wi7lGpjqhk+UeU9rMuF7br+BnmHy0eqr+vBAFSaVxnornrsebX0qO+Vgd/accM0VgI6UzIbrEZeRtKYpkZAf1y+gYFOA3ThafEp3PBBSJz1RI6hP03VuPx4GS2qCDfLm9nWBHR/pKMc9MAUuGiaEmeSXWwUGxLpM+B/9vzJGHrywSUXM/9NLb0Tqd35HElPKp2Vv39dYSASC/XQIhW696Gt2Ewkrg4Cqx5RTn7WlJBWXAvryVMDtOiZzgdaqk5aOUMie3Qe5bH5M6lwEGp/Rbo9rCFtSXDPQMbxiQrUuBVt3u0lX4BTynKVWagpDDfuOTm1Fl4CY50dwvmuZZmmtK0GLLQ/POL7LiOhX1XUoL4WL1sU=
     file:
@@ -27,15 +27,15 @@ deploy:
       repo: exoframejs/exoframe
   - provider: npm
     email: [email protected]
-    skip_cleanup: true
+    edge: true
     api_key:
       secure: qAIUnXMdpq7+rEch+hhWehdEpDMd1ZxjMwvlr3QuNkYH3SAgmB9aDeAgcjcOR/gZysH5dXU5s/7paMAur/CnHD7fqapkk01QWjusi4Z+xzznnX0srvysaYg2Eaev6SM666aWtrzxVSZw8aX1BH5k8wjzoNLQ5ARGSKpMRtjXsWkz9RczglgY6vSyz8vuJ+Bw5qlFfiIHt3tI7Ns5NgqkdSTSexX6YaKzZqdv0SNvZu8bCFhUPrE4VmgLVtKGno4ML7sodFEOEs65fPRrznjQW0M5mO9hYGmfU36W4VwXoDr8miBb/dXSjb9Hm/nX3vtf90HtuIb2noxCPLGWku7/NQj76JSzp9PS1X17w7glj/+b5tJsG5V2VRwO0Ta+MnO/0mH2Wbk9K57ZprTVnNirrRX4hYMfn1QPAJEpdSsNpOgTr/LyXbDf1sG84F6337tbJWr3bq1v9go3W3c87Ara32c006NzfXtqC+79+chJi9YqEG6kla6PLj2pdYR9yr2QsYRJo61DG5+xUeHQXQDCLy/f9kpaS24DRlziilqfIzgET+l+TeRtNN18aZAjKFNCKPdtAfPlIWA03LLwG+2KGAP4UfzRIrdIROPDZ9k6Y9/bFKNM3UNF7GBHP9p3rFAQ6yhuOL7BzA/U27E57sU+ZtJQP0iVT9EmjNzQyg/vkzU=
     on:
       tags: true
       repo: exoframejs/exoframe
   - provider: npm
     email: [email protected]
-    skip_cleanup: true
+    edge: true
     tag: next
     api_key:
       secure: qAIUnXMdpq7+rEch+hhWehdEpDMd1ZxjMwvlr3QuNkYH3SAgmB9aDeAgcjcOR/gZysH5dXU5s/7paMAur/CnHD7fqapkk01QWjusi4Z+xzznnX0srvysaYg2Eaev6SM666aWtrzxVSZw8aX1BH5k8wjzoNLQ5ARGSKpMRtjXsWkz9RczglgY6vSyz8vuJ+Bw5qlFfiIHt3tI7Ns5NgqkdSTSexX6YaKzZqdv0SNvZu8bCFhUPrE4VmgLVtKGno4ML7sodFEOEs65fPRrznjQW0M5mO9hYGmfU36W4VwXoDr8miBb/dXSjb9Hm/nX3vtf90HtuIb2noxCPLGWku7/NQj76JSzp9PS1X17w7glj/+b5tJsG5V2VRwO0Ta+MnO/0mH2Wbk9K57ZprTVnNirrRX4hYMfn1QPAJEpdSsNpOgTr/LyXbDf1sG84F6337tbJWr3bq1v9go3W3c87Ara32c006NzfXtqC+79+chJi9YqEG6kla6PLj2pdYR9yr2QsYRJo61DG5+xUeHQXQDCLy/f9kpaS24DRlziilqfIzgET+l+TeRtNN18aZAjKFNCKPdtAfPlIWA03LLwG+2KGAP4UfzRIrdIROPDZ9k6Y9/bFKNM3UNF7GBHP9p3rFAQ6yhuOL7BzA/U27E57sU+ZtJQP0iVT9EmjNzQyg/vkzU=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe",
-  "version": "6.0.1",
+  "version": "6.0.6-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "dist/index.js",
   "repository": "[email protected]:exoframejs/exoframe.git",
@@ -23,24 +23,24 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@zeit/ncc": "^0.20.5",
+    "@zeit/ncc": "^0.21.0",
     "apache-md5": "^1.1.2",
     "babel-eslint": "^10.0.3",
-    "chalk": "^2.4.2",
+    "chalk": "^3.0.0",
     "cli-table3": "^0.5.1",
     "coveralls": "^3.0.7",
     "eslint": "^6.6.0",
     "eslint-config-prettier": "^6.5.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "got": "^9.6.0",
+    "got": "^10.4.0",
     "highland": "^2.13.5",
     "inquirer": "^7.0.0",
-    "jest": "^24.9.0",
+    "jest": "^25.1.0",
     "js-yaml": "^3.13.1",
     "jsonwebtoken": "^8.5.1",
     "latest-version": "^5.1.0",
@@ -52,9 +52,9 @@
     "pkg": "^4.4.0",
     "prettier": "^1.18.2",
     "semver-diff": "^3.1.1",
-    "sinon": "^7.5.0",
+    "sinon": "^8.1.1",
     "tar-fs": "^2.0.0",
-    "yargs": "^14.2.0"
+    "yargs": "^15.1.0"
   },
   "jest": {
     "testEnvironment": "node"

src/commands/deploy.js

@@ -257,7 +257,7 @@ exports.handler = async (args = {}) => {
   } catch (e) {
     spinner && spinner.fail('Deployment failed!');
     // if authorization is expired/broken/etc
-    if (e.statusCode === 401) {
+    if (e.response.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return process.exit(1);

src/commands/list.js

@@ -21,7 +21,7 @@ exports.handler = async () => {
     headers: {
       Authorization: `Bearer ${userConfig.token}`,
     },
-    json: true,
+    responseType: 'json',
   };
   // try sending request
   let containers = [];

src/commands/login.js

@@ -89,7 +89,7 @@ exports.handler = async ({key, passphrase, url}) => {
   let phrase;
   let loginReqId;
   try {
-    const {body} = await got(remoteUrl, {json: true});
+    const {body} = await got(remoteUrl, {responseType: 'json'});
     phrase = body.phrase;
     loginReqId = body.uid;
     if (!phrase || !loginReqId) {
@@ -137,12 +137,13 @@ exports.handler = async ({key, passphrase, url}) => {
   try {
     const user = {username};
     const {body} = await got(remoteUrl, {
-      body: {
+      method: 'POST',
+      json: {
         user,
         token: reqToken,
         requestId: loginReqId,
       },
-      json: true,
+      responseType: 'json',
     });
     // check for errors
     if (!body || !body.token) {

src/commands/remove.js

@@ -37,8 +37,7 @@ exports.handler = async (args = {}) => {
     headers: {
       Authorization: `Bearer ${authToken}`,
     },
-    body: {},
-    json: true,
+    json: {},
   };
   // try sending request
   try {
@@ -50,14 +49,14 @@ exports.handler = async (args = {}) => {
     }
   } catch (e) {
     // if authorization is expired/broken/etc
-    if (e.statusCode === 401) {
+    if (e.response.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return;
     }
 
     // if container was not found
-    if (e.statusCode === 404) {
+    if (e.response.statusCode === 404) {
       console.log(
         chalk.red('Error: container or function was not found!'),
         'Please, check deployment ID and try again.'

src/commands/secrets.js

@@ -45,7 +45,7 @@ exports.handler = async args => {
       headers: {
         Authorization: `Bearer ${userConfig.token}`,
       },
-      json: true,
+      responseType: 'json',
     };
     // try sending request
     let secrets = [];
@@ -54,7 +54,7 @@ exports.handler = async args => {
       secrets = body.secrets;
     } catch (e) {
       // if authorization is expired/broken/etc
-      if (e.statusCode === 401) {
+      if (e.response.statusCode === 401) {
         logout(userConfig);
         console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
         return;
@@ -114,15 +114,15 @@ exports.handler = async args => {
         headers: {
           Authorization: `Bearer ${userConfig.token}`,
         },
-        json: true,
+        responseType: 'json',
       };
       let secret;
       try {
         const {body} = await got(`${remoteUrl}/${selectedSecret}`, options);
         secret = body.secret;
       } catch (e) {
         // if authorization is expired/broken/etc
-        if (e.statusCode === 401) {
+        if (e.response.statusCode === 401) {
           logout(userConfig);
           console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
           return;
@@ -147,8 +147,8 @@ exports.handler = async args => {
       headers: {
         Authorization: `Bearer ${userConfig.token}`,
       },
-      json: true,
-      body: {
+      responseType: 'json',
+      json: {
         secretName: selectedSecret,
       },
     };
@@ -161,7 +161,7 @@ exports.handler = async args => {
       console.log(chalk.green('Deployment secret successfully removed!'));
     } catch (e) {
       // if authorization is expired/broken/etc
-      if (e.statusCode === 401) {
+      if (e.response.statusCode === 401) {
         logout(userConfig);
         console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
         return;
@@ -206,8 +206,8 @@ exports.handler = async args => {
     headers: {
       Authorization: `Bearer ${userConfig.token}`,
     },
-    json: true,
-    body: {
+    responseType: 'json',
+    json: {
       secretName,
       secretValue,
     },
@@ -223,7 +223,7 @@ exports.handler = async args => {
     console.log(chalk.green('DONE!'));
   } catch (e) {
     // if authorization is expired/broken/etc
-    if (e.statusCode === 401) {
+    if (e.response.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return;

src/commands/setup.js

@@ -32,7 +32,7 @@ exports.handler = async args => {
     headers: {
       Authorization: `Bearer ${userConfig.token}`,
     },
-    json: true,
+    responseType: 'json',
   };
 
   console.log(chalk.bold('Setting new deployment using recipe at:'), userConfig.endpoint);
@@ -55,9 +55,10 @@ exports.handler = async args => {
   // ask for questions for this recipe
   const options = Object.assign({}, baseOptions, {
     method: 'GET',
-    query: {
+    searchParams: {
       recipeName,
     },
+    responseType: 'json',
   });
 
   // show loader
@@ -93,10 +94,11 @@ exports.handler = async args => {
     // send answers and execute recipe
     const answerOptions = Object.assign({}, baseOptions, {
       method: 'POST',
-      body: {
+      json: {
         recipeName,
         answers,
       },
+      responseType: 'json',
     });
 
     const {body: finalBody} = await got(remoteUrl, answerOptions);
@@ -119,7 +121,7 @@ exports.handler = async args => {
   } catch (e) {
     spinner.fail('Recipe execution failed!');
     // if authorization is expired/broken/etc
-    if (e.statusCode === 401) {
+    if (e.response.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return;

src/commands/template.js

@@ -35,7 +35,7 @@ exports.handler = async args => {
     headers: {
       Authorization: `Bearer ${userConfig.token}`,
     },
-    json: true,
+    responseType: 'json',
   };
 
   // if remove or ls - fetch tokens from remote, then do work
@@ -48,11 +48,11 @@ exports.handler = async args => {
     // try sending request
     let templates = [];
     try {
-      const {body} = await got(remoteUrl, baseOptions);
+      const {body} = await got(remoteUrl, {...baseOptions});
       templates = body;
     } catch (e) {
       // if authorization is expired/broken/etc
-      if (e.statusCode === 401) {
+      if (e.response.statusCode === 401) {
         logout(userConfig);
         console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
         return;
@@ -98,12 +98,14 @@ exports.handler = async args => {
     const {rmTemplate} = await inquirer.prompt(prompts);
 
     // construct shared request params
-    const rmOptions = Object.assign(baseOptions, {
+    const rmOptions = {
+      ...baseOptions,
       method: 'DELETE',
-      body: {
+      json: {
         templateName: rmTemplate,
       },
-    });
+      responseType: 'json',
+    };
     try {
       const {body} = await got(remoteUrl, rmOptions);
       if (!body.removed) {
@@ -119,7 +121,7 @@ exports.handler = async args => {
       console.log(chalk.green('Template successfully removed!'));
     } catch (e) {
       // if authorization is expired/broken/etc
-      if (e.statusCode === 401) {
+      if (e.response.statusCode === 401) {
         logout(userConfig);
         console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
         return;
@@ -146,12 +148,14 @@ exports.handler = async args => {
   const {templateName} = await inquirer.prompt(prompts);
 
   // construct shared request params
-  const options = Object.assign(baseOptions, {
+  const options = {
+    ...baseOptions,
     method: 'POST',
-    body: {
+    json: {
       templateName,
     },
-  });
+    responseType: 'json',
+  };
 
   // show loader
   const spinner = ora('Installing new template...').start();
@@ -176,7 +180,7 @@ exports.handler = async args => {
   } catch (e) {
     spinner.fail('Template install failed!');
     // if authorization is expired/broken/etc
-    if (e.statusCode === 401) {
+    if (e.response.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return;