fix disable-usage-reporting flag bug

browserstack · May 7, 2020 · 3f61f91 · 3f61f91
1 parent c1caee0
commit 3f61f91
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/bin/commands/info.js b/bin/commands/info.js
@@ -14,7 +14,7 @@ function buildInfo(args) {
   let bsConfigPath = process.cwd() + args.cf;
 
   util.validateBstackJson(bsConfigPath).then(function (bsConfig) {
-    util.setUsageReportingFlag(bsConfig, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
     let buildId = args._[1];
 
@@ -85,7 +85,7 @@ function buildInfo(args) {
     })
   }).catch(function (err) {
     logger.error(err);
-    util.setUsageReportingFlag(null, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(null, args.disableUsageReporting);
     util.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, util.getErrorCodeFromErr(err));
   })
 }
diff --git a/bin/commands/runs.js b/bin/commands/runs.js
@@ -28,7 +28,7 @@ function runCypress(args) {
   let bsConfigPath = process.cwd() + args.cf;
 
   util.validateBstackJson(bsConfigPath).then(function (bsConfig) {
-    util.setUsageReportingFlag(bsConfig, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
     // Validate browserstack.json values
     capabilityHelper.validate(bsConfig).then(function (validated) {
@@ -77,7 +77,7 @@ function runCypress(args) {
     });
   }).catch(function (err) {
     logger.error(err);
-    util.setUsageReportingFlag(null, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(null, args.disableUsageReporting);
     util.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, util.getErrorCodeFromErr(err));
   })
 }
diff --git a/bin/commands/stop.js b/bin/commands/stop.js
@@ -14,7 +14,7 @@ function buildStop(args) {
   let bsConfigPath = process.cwd() + args.cf;
 
   util.validateBstackJson(bsConfigPath).then(function (bsConfig) {
-    util.setUsageReportingFlag(bsConfig, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
     let buildId = args._[1];
 
@@ -81,7 +81,7 @@ function buildStop(args) {
     })
   }).catch(function (err) {
     logger.error(err);
-    util.setUsageReportingFlag(null, args.cf.disableUsageReporting);
+    util.setUsageReportingFlag(null, args.disableUsageReporting);
     util.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, util.getErrorCodeFromErr(err));
   })
 }
diff --git a/bin/helpers/usageReporting.js b/bin/helpers/usageReporting.js
@@ -170,7 +170,7 @@ function isUsageReportingEnabled() {
 }
 
 function send(args) {
-  if (!isUsageReportingEnabled()) return;
+  if (isUsageReportingEnabled() === "true") return;
 
   let bsConfig = args.bstack_config;
   let cli_details = cli_version_and_path(bsConfig);

diff --git a/bin/helpers/util.js b/bin/helpers/util.js
@@ -61,11 +61,9 @@ exports.sendUsageReport = (bsConfig, args, message, message_type, error_code) =>
 }
 
 exports.setUsageReportingFlag = (bsConfig, disableUsageReporting) => {
-  if (disableUsageReporting === undefined && bsConfig && bsConfig.disable_usage_reporting != undefined) {
-    process.env.DISABLE_USAGE_REPORTING = bsConfig.disable_usage_reporting;
-  } else if (!disableUsageReporting) {
-    process.env.DISABLE_USAGE_REPORTING = false;
+  if (disableUsageReporting === undefined && bsConfig && bsConfig['disable-usage-reporting'] != undefined) {
+    process.env.DISABLE_USAGE_REPORTING = bsConfig['disable-usage-reporting'];
   } else {
-    process.env.DISABLE_USAGE_REPORTING = true;
+    process.env.DISABLE_USAGE_REPORTING = disableUsageReporting;
   }
 }
diff --git a/bin/templates/configTemplate.js b/bin/templates/configTemplate.js
@@ -19,7 +19,8 @@ module.exports = function () {
     "connection_settings": {
       "local": false,
       "localIdentifier": null
-    }
+    },
+    "disable-usage-reporting": false
   }
   var EOL = require('os').EOL
   var file = [