❇️ migration from request library to axios

bin/commands/generateReport.js

@@ -31,7 +31,6 @@ module.exports = function generateReport(args, rawArgs) {
       let messageType = Constants.messageTypes.INFO;
       let errorCode = null;
       let buildId = args._[1];
-
       reportGenerator(bsConfig, buildId, args, rawArgs, buildReportData);
       utils.sendUsageReport(bsConfig, args, 'generate-report called', messageType, errorCode, buildReportData, rawArgs);
     }).catch((err) => {

bin/commands/info.js

@@ -1,6 +1,5 @@
 'use strict';
-const request = require('request');
-
+const axios = require('axios').default;
 const config = require("../helpers/config"),
   logger = require("../helpers/logger").winstonLogger,
   Constants = require("../helpers/constants"),
@@ -19,7 +18,7 @@ module.exports = function info(args, rawArgs) {
     // accept the access key from command line if provided
     utils.setAccessKey(bsConfig, args);
 
-    getInitialDetails(bsConfig, args, rawArgs).then((buildReportData) => {
+    getInitialDetails(bsConfig, args, rawArgs).then(async (buildReportData) => {
 
       utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
@@ -38,65 +37,62 @@ module.exports = function info(args, rawArgs) {
           'User-Agent': utils.getUserAgent(),
         },
       };
-      request.get(options, function (err, resp, body) {
-        let message = null;
-        let messageType = null;
-        let errorCode = null;
-
-        if (err) {
-          message = Constants.userMessages.BUILD_INFO_FAILED;
-          messageType = Constants.messageTypes.ERROR;
-          errorCode = 'api_failed_build_info';
+      let message = null;
+      let messageType = null;
+      let errorCode = null;
 
-          logger.info(message);
-          logger.error(utils.formatRequest(err, resp, body));
-        } else {
-          let build = null;
+      try {
+        const response = await axios.get(options.url, {
+          auth: {
+            username: bsConfig.auth.username,
+            password: bsConfig.auth.access_key
+          },
+          headers: options.headers
+        });
+        let build = null;
           try {
-            build = JSON.parse(body);
+            build = response.data;
           } catch (error) {
             build = null;
           }
-
-          if (resp.statusCode == 299) {
+          if (response.status == 299) {
             messageType = Constants.messageTypes.INFO;
             errorCode = 'api_deprecated';
-
-            if (build) {
-              message = build.message;
-              logger.info(message);
-            } else {
-              message = Constants.userMessages.API_DEPRECATED;
-              logger.info(message);
-            }
-            logger.info(utils.formatRequest(err, resp, body));
-          } else if (resp.statusCode != 200) {
+            message = build ? build.message : Constants.userMessages.API_DEPRECATED;
+            logger.info(utils.formatRequest(response.statusText, response, response.data));
+          } else if (response.status != 200) {
+            message = Constants.userMessages.BUILD_INFO_FAILED;
             messageType = Constants.messageTypes.ERROR;
             errorCode = 'api_failed_build_info';
-
             if (build) {
               message = `${
                 Constants.userMessages.BUILD_INFO_FAILED
               } with error: \n${JSON.stringify(build, null, 2)}`;
-              logger.error(message);
               if (build.message === 'Unauthorized') errorCode = 'api_auth_failed';
             } else {
               message = Constants.userMessages.BUILD_INFO_FAILED;
-              logger.error(message);
             }
-            logger.error(utils.formatRequest(err, resp, body));
+            logger.error(message);
+            logger.error(utils.formatRequest(response.statusText, response, response.data));
           } else {
             messageType = Constants.messageTypes.SUCCESS;
             message = `Build info for build id: \n ${JSON.stringify(
               build,
               null,
               2
             )}`;
-            logger.info(message);
           }
-        }
-        utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
-      });
+        logger.info(message);
+      } catch (error) {
+        message = `${
+          Constants.userMessages.BUILD_INFO_FAILED
+        } with error: \n${error.response.data.message}`;
+        messageType = Constants.messageTypes.ERROR;
+        errorCode = 'api_failed_build_info';
+        logger.info(message);
+        logger.error(utils.formatRequest(error.response.statusText, error.response, error.response.data));
+      }      
+      utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
     }).catch((err) => {
       logger.warn(err);
     });

bin/commands/stop.js

@@ -1,5 +1,4 @@
 'use strict';
-const request = require('request');
 
 const config = require("../helpers/config"),
   logger = require("../helpers/logger").winstonLogger,

bin/helpers/build.js

@@ -1,5 +1,5 @@
 'use strict';
-const request = require('request');
+const axios = require('axios').default;
 
 const config = require('./config'),
   capabilityHelper = require("../helpers/capabilityHelper"),
@@ -9,7 +9,7 @@ const config = require('./config'),
 
 const createBuild = (bsConfig, zip) => {
   return new Promise(function (resolve, reject) {
-    capabilityHelper.caps(bsConfig, zip).then(function(data){
+    capabilityHelper.caps(bsConfig, zip).then(async function(data){
       let options = {
         url: config.buildUrl,
         auth: {
@@ -23,38 +23,42 @@ const createBuild = (bsConfig, zip) => {
         body: data
       }
 
-      request.post(options, function (err, resp, body) {
-        if (err) {
-          logger.error(utils.formatRequest(err, resp, body));
-          reject(err);
-        } else {
-          let build = null;
-          try {
-            build = JSON.parse(body);
-          } catch (error) {
-            build = null;
+      try {
+        const response = await axios.post(options.url, data, {
+          auth: {
+            username: options.auth.user,
+            password: options.auth.password
+          },
+          headers: options.headers
+        });
+        let build = null;
+        try {
+          build = response.data;
+        } catch (error) {
+          build = null;
+        }
+        if (response.status == 299) {
+          if (build) {
+            resolve(build.message);
+          } else {
+            logger.error(utils.formatRequest(response.statusText, response, response.data));
+            reject(Constants.userMessages.API_DEPRECATED);
           }
-
-          if (resp.statusCode == 299) {
-            if (build) {
-              resolve(build.message);
-            } else {
-              logger.error(utils.formatRequest(err, resp, body));
-              reject(Constants.userMessages.API_DEPRECATED);
-            }
-          } else if (resp.statusCode != 201) {
-            logger.error(utils.formatRequest(err, resp, body));
-            if (build) {
-              reject(`${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`);
-            } else {
-              reject(Constants.userMessages.BUILD_FAILED);
-            }
+        } else if (response.status != 201) {
+          logger.error(utils.formatRequest(response.statusText, response, response.data));
+          if (build) {
+            reject(`${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`);
           } else {
-            resolve(build);
+            reject(Constants.userMessages.BUILD_FAILED);
           }
-          resolve(build);
         }
-      })
+        resolve(build);
+      } catch (error) {
+        if(error.response) {
+          logger.error(utils.formatRequest(error.response.statusText, error.response, error.response.data));
+          reject(`${Constants.userMessages.BUILD_FAILED} Error: ${error.response.data.message}`);
+        }
+      }
     }).catch(function(err){
       reject(err);
     });