Skip to content

Commit 2db3517

Browse files
roshan04roshan04
committed
added user id
1 parent 105091a commit 2db3517

File tree

11 files changed

+140
-64
lines changed

11 files changed

+140
-64
lines changed

‎bin/commands/generateDownloads.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
const logger = require("../helpers/logger").winstonLogger,
44
Constants = require("../helpers/constants"),
55
utils = require("../helpers/utils"),
6-
downloadBuildArtifacts = require('../helpers/buildArtifacts').downloadBuildArtifacts;
6+
downloadBuildArtifacts = require('../helpers/buildArtifacts').downloadBuildArtifacts,
7+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
78

89

910
module.exports = async function generateDownloads(args, rawArgs) {
@@ -19,6 +20,12 @@ module.exports = async function generateDownloads(args, rawArgs) {
1920
// accept the access key from command line if provided
2021
utils.setAccessKey(bsConfig, args);
2122

23+
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
24+
25+
let buildReportData = {
26+
'user_id': initDetails.user_id
27+
};
28+
2229
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2330

2431
// set cypress config filename
@@ -28,12 +35,12 @@ module.exports = async function generateDownloads(args, rawArgs) {
2835
let errorCode = null;
2936
let buildId = args._[1];
3037

31-
await downloadBuildArtifacts(bsConfig, buildId, args, rawArgs);
32-
utils.sendUsageReport(bsConfig, args, Constants.usageReportingConstants.GENERATE_DOWNLOADS, messageType, errorCode, null, rawArgs);
38+
await downloadBuildArtifacts(bsConfig, buildId, args, rawArgs, buildReportData);
39+
utils.sendUsageReport(bsConfig, args, Constants.usageReportingConstants.GENERATE_DOWNLOADS, messageType, errorCode, buildReportData, rawArgs);
3340
}).catch(function (err) {
3441
logger.error(err);
3542
utils.setUsageReportingFlag(null, args.disableUsageReporting);
36-
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), null, rawArgs);
43+
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), buildReportData, rawArgs);
3744
process.exitCode = Constants.ERROR_EXIT_CODE;
3845
});
3946
};

‎bin/commands/generateReport.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
const logger = require("../helpers/logger").winstonLogger,
44
Constants = require("../helpers/constants"),
55
utils = require("../helpers/utils"),
6-
reporterHTML = require('../helpers/reporterHTML');
6+
reporterHTML = require('../helpers/reporterHTML'),
7+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
78

89

910
module.exports = function generateReport(args, rawArgs) {
@@ -20,6 +21,12 @@ module.exports = function generateReport(args, rawArgs) {
2021
// accept the access key from command line if provided
2122
utils.setAccessKey(bsConfig, args);
2223

24+
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
25+
26+
let buildReportData = {
27+
'user_id': initDetails.user_id
28+
};
29+
2330
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2431

2532
// set cypress config filename
@@ -29,12 +36,12 @@ module.exports = function generateReport(args, rawArgs) {
2936
let errorCode = null;
3037
let buildId = args._[1];
3138

32-
reportGenerator(bsConfig, buildId, args, rawArgs);
33-
utils.sendUsageReport(bsConfig, args, 'generate-report called', messageType, errorCode, null, rawArgs);
39+
reportGenerator(bsConfig, buildId, args, rawArgs, buildReportData);
40+
utils.sendUsageReport(bsConfig, args, 'generate-report called', messageType, errorCode, buildReportData, rawArgs);
3441
}).catch(function (err) {
3542
logger.error(err);
3643
utils.setUsageReportingFlag(null, args.disableUsageReporting);
37-
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), null, rawArgs);
44+
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), buildReportData, rawArgs);
3845
process.exitCode = Constants.ERROR_EXIT_CODE;
3946
});
4047
};

‎bin/commands/info.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const request = require('request');
44
const config = require("../helpers/config"),
55
logger = require("../helpers/logger").winstonLogger,
66
Constants = require("../helpers/constants"),
7-
utils = require("../helpers/utils");
7+
utils = require("../helpers/utils"),
8+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
89

910
module.exports = function info(args, rawArgs) {
1011
let bsConfigPath = utils.getConfigPath(args.cf);
@@ -18,6 +19,12 @@ module.exports = function info(args, rawArgs) {
1819
// accept the access key from command line if provided
1920
utils.setAccessKey(bsConfig, args);
2021

22+
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
23+
24+
let buildReportData = {
25+
'user_id': initDetails.user_id
26+
};
27+
2128
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2229

2330
// set cypress config filename
@@ -93,12 +100,12 @@ module.exports = function info(args, rawArgs) {
93100
logger.info(message);
94101
}
95102
}
96-
utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, null, rawArgs);
103+
utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
97104
});
98105
}).catch(function (err) {
99106
logger.error(err);
100107
utils.setUsageReportingFlag(null, args.disableUsageReporting);
101-
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), null, rawArgs);
108+
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), buildReportData, rawArgs);
102109
process.exitCode = Constants.ERROR_EXIT_CODE;
103110
})
104111
}

‎bin/commands/runs.js

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
const path = require('path');
3+
const { inspect } = require('util');
34

45
const archiver = require("../helpers/archiver"),
56
zipUploader = require("../helpers/zipUpload"),
@@ -11,6 +12,7 @@ const archiver = require("../helpers/archiver"),
1112
utils = require("../helpers/utils"),
1213
fileHelpers = require("../helpers/fileHelpers"),
1314
syncRunner = require("../helpers/syncRunner"),
15+
getInitialDetails = require("../helpers/getInitialDetails").getInitialDetails,
1416
checkUploaded = require("../helpers/checkUploaded"),
1517
packageInstaller = require("../helpers/packageInstaller"),
1618
reportGenerator = require('../helpers/reporterHTML').reportGenerator,
@@ -44,6 +46,13 @@ module.exports = function run(args, rawArgs) {
4446
// accept the access key from command line or env variable if provided
4547
utils.setAccessKey(bsConfig, args);
4648

49+
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
50+
51+
let buildReportData = {
52+
'user_id': initDetails.user_id
53+
};
54+
55+
console.log(`roshan1: bhai the initDetails are the ${inspect(buildReportData)}`)
4756
// accept the build name from command line if provided
4857
utils.setBuildName(bsConfig, args);
4958

@@ -113,7 +122,7 @@ module.exports = function run(args, rawArgs) {
113122
utils.setParallels(bsConfig, args, specFiles.length);
114123

115124
// warn if specFiles cross our limit
116-
utils.warnSpecLimit(bsConfig, args, specFiles, rawArgs);
125+
utils.warnSpecLimit(bsConfig, args, specFiles, rawArgs, buildReportData);
117126
markBlockEnd('preArchiveSteps');
118127
markBlockStart('zip');
119128
markBlockStart('zip.checkAlreadyUploaded');
@@ -141,20 +150,16 @@ module.exports = function run(args, rawArgs) {
141150
// Create build
142151
//setup Local Testing
143152
markBlockStart('localSetup');
144-
let bs_local = await utils.setupLocalTesting(bsConfig, args, rawArgs);
153+
let bs_local = await utils.setupLocalTesting(bsConfig, args, rawArgs, buildReportData);
145154
markBlockEnd('localSetup');
146155
markBlockStart('createBuild');
147156
return build.createBuild(bsConfig, zip).then(function (data) {
148157
markBlockEnd('createBuild');
149158
markBlockEnd('total');
150-
utils.setProcessHooks(data.build_id, bsConfig, bs_local, args);
159+
utils.setProcessHooks(data.build_id, bsConfig, bs_local, args, buildReportData);
151160
let message = `${data.message}! ${Constants.userMessages.BUILD_CREATED} with build id: ${data.build_id}`;
152161
let dashboardLink = `${Constants.userMessages.VISIT_DASHBOARD} ${data.dashboard_url}`;
153-
let buildReportData = {
154-
'build_id': data.build_id,
155-
'user_id': data.user_id,
156-
'parallels': userSpecifiedParallels
157-
};
162+
buildReportData = { 'build_id': data.build_id, 'user_id': data.user_id, ...buildReportData }
158163
utils.exportResults(data.build_id, `${config.dashboardUrl}${data.build_id}`);
159164
if ((utils.isUndefined(bsConfig.run_settings.parallels) && utils.isUndefined(args.parallels)) || (!utils.isUndefined(bsConfig.run_settings.parallels) && bsConfig.run_settings.parallels == Constants.cliMessages.RUN.DEFAULT_PARALLEL_MESSAGE)) {
160165
logger.warn(Constants.userMessages.NO_PARALLELS);
@@ -177,22 +182,22 @@ module.exports = function run(args, rawArgs) {
177182

178183

179184
if (args.sync) {
180-
syncRunner.pollBuildStatus(bsConfig, data, rawArgs).then(async (exitCode) => {
185+
syncRunner.pollBuildStatus(bsConfig, data, rawArgs, buildReportData).then(async (exitCode) => {
181186

182187
// stop the Local instance
183-
await utils.stopLocalBinary(bsConfig, bs_local, args, rawArgs);
188+
await utils.stopLocalBinary(bsConfig, bs_local, args, rawArgs, buildReportData);
184189

185190
// waiting for 5 secs for upload to complete (as a safety measure)
186191
await new Promise(resolve => setTimeout(resolve, 5000));
187192

188193
// download build artifacts
189194
if (exitCode != Constants.BUILD_FAILED_EXIT_CODE) {
190195
if (utils.nonEmptyArray(bsConfig.run_settings.downloads)) {
191-
await downloadBuildArtifacts(bsConfig, data.build_id, args, rawArgs);
196+
await downloadBuildArtifacts(bsConfig, data.build_id, args, rawArgs, buildReportData);
192197
}
193198

194199
// Generate custom report!
195-
reportGenerator(bsConfig, data.build_id, args, rawArgs, function(){
200+
reportGenerator(bsConfig, data.build_id, args, rawArgs, buildReportData, function(){
196201
utils.sendUsageReport(bsConfig, args, `${message}\n${dashboardLink}`, Constants.messageTypes.SUCCESS, null, buildReportData, rawArgs);
197202
utils.handleSyncExit(exitCode, data.dashboard_url);
198203
});
@@ -268,22 +273,22 @@ module.exports = function run(args, rawArgs) {
268273
// stop the Local instance
269274
await utils.stopLocalBinary(bsConfig, bs_local, args, rawArgs);
270275

271-
utils.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'build_failed', null, rawArgs);
276+
utils.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'build_failed', buildReportData, rawArgs);
272277
process.exitCode = Constants.ERROR_EXIT_CODE;
273278
});
274279
}).catch(function (err) {
275280
// Zip Upload failed | Local Start failed
276281
logger.error(err);
277282
if(err === Constants.userMessages.LOCAL_START_FAILED){
278-
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.LOCAL_START_FAILED}`, Constants.messageTypes.ERROR, 'local_start_failed', null, rawArgs);
283+
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.LOCAL_START_FAILED}`, Constants.messageTypes.ERROR, 'local_start_failed', buildReportData, rawArgs);
279284
} else {
280285
logger.error(Constants.userMessages.ZIP_UPLOAD_FAILED);
281286
fileHelpers.deleteZip();
282-
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.ZIP_UPLOAD_FAILED}`, Constants.messageTypes.ERROR, 'zip_upload_failed', null, rawArgs);
287+
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.ZIP_UPLOAD_FAILED}`, Constants.messageTypes.ERROR, 'zip_upload_failed', buildReportData, rawArgs);
283288
try {
284289
fileHelpers.deletePackageArchieve();
285290
} catch (err) {
286-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', null, rawArgs);
291+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', buildReportData, rawArgs);
287292
}
288293
}
289294
process.exitCode = Constants.ERROR_EXIT_CODE;
@@ -292,36 +297,36 @@ module.exports = function run(args, rawArgs) {
292297
// Zipping failed
293298
logger.error(err);
294299
logger.error(Constants.userMessages.FAILED_TO_ZIP);
295-
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.FAILED_TO_ZIP}`, Constants.messageTypes.ERROR, 'zip_creation_failed', null, rawArgs);
300+
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.FAILED_TO_ZIP}`, Constants.messageTypes.ERROR, 'zip_creation_failed', buildReportData, rawArgs);
296301
try {
297302
fileHelpers.deleteZip();
298303
} catch (err) {
299-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.ZIP_DELETE_FAILED, Constants.messageTypes.ERROR, 'zip_deletion_failed', null, rawArgs);
304+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.ZIP_DELETE_FAILED, Constants.messageTypes.ERROR, 'zip_deletion_failed', buildReportData, rawArgs);
300305
}
301306
try {
302307
fileHelpers.deletePackageArchieve();
303308
} catch (err) {
304-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', null, rawArgs);
309+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', buildReportData, rawArgs);
305310
}
306311
process.exitCode = Constants.ERROR_EXIT_CODE;
307312
});
308313
}).catch(function (err) {
309314
// package installer failed
310315
logger.error(err);
311316
logger.error(Constants.userMessages.FAILED_CREATE_NPM_ARCHIVE);
312-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.FAILED_CREATE_NPM_ARCHIVE, Constants.messageTypes.ERROR, 'npm_package_archive_failed', null, rawArgs);
317+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.FAILED_CREATE_NPM_ARCHIVE, Constants.messageTypes.ERROR, 'npm_package_archive_failed', buildReportData, rawArgs);
313318
try {
314319
fileHelpers.deletePackageArchieve();
315320
} catch (err) {
316-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', null, rawArgs);
321+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed', buildReportData, rawArgs);
317322
}
318323
process.exitCode = Constants.ERROR_EXIT_CODE;
319324
});
320325
}).catch(function (err) {
321326
// md5 check failed
322327
logger.error(err);
323328
logger.error(Constants.userMessages.FAILED_MD5_CHECK);
324-
utils.sendUsageReport(bsConfig, args, Constants.userMessages.MD5_CHECK_FAILED, Constants.messageTypes.ERROR, 'zip_already_uploaded_failed', null, rawArgs);
329+
utils.sendUsageReport(bsConfig, args, Constants.userMessages.MD5_CHECK_FAILED, Constants.messageTypes.ERROR, 'zip_already_uploaded_failed', buildReportData, rawArgs);
325330
process.exitCode = Constants.ERROR_EXIT_CODE;
326331
});
327332
}).catch(function (err) {
@@ -335,7 +340,7 @@ module.exports = function run(args, rawArgs) {
335340
}
336341

337342
let error_code = utils.getErrorCodeFromMsg(err);
338-
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.validationMessages.NOT_VALID}`, Constants.messageTypes.ERROR, error_code, null, rawArgs);
343+
utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.validationMessages.NOT_VALID}`, Constants.messageTypes.ERROR, error_code, buildReportData, rawArgs);
339344
process.exitCode = Constants.ERROR_EXIT_CODE;
340345
});
341346
}).catch(function (err) {

‎bin/commands/stop.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const request = require('request');
44
const config = require("../helpers/config"),
55
logger = require("../helpers/logger").winstonLogger,
66
Constants = require("../helpers/constants"),
7-
utils = require("../helpers/utils");
7+
utils = require("../helpers/utils"),
8+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
89

910
module.exports = function stop(args, rawArgs) {
1011
let bsConfigPath = utils.getConfigPath(args.cf);
@@ -18,19 +19,25 @@ module.exports = function stop(args, rawArgs) {
1819
// accept the access key from command line if provided
1920
utils.setAccessKey(bsConfig, args);
2021

22+
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
23+
24+
let buildReportData = {
25+
'user_id': initDetails.user_id
26+
};
27+
2128
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2229

2330
// set cypress config filename
2431
utils.setCypressConfigFilename(bsConfig, args);
2532

2633
let buildId = args._[1];
2734

28-
await utils.stopBrowserStackBuild(bsConfig, args, buildId, rawArgs);
35+
await utils.stopBrowserStackBuild(bsConfig, args, buildId, rawArgs, buildReportData);
2936

3037
}).catch(function (err) {
3138
logger.error(err);
3239
utils.setUsageReportingFlag(null, args.disableUsageReporting);
33-
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), null, rawArgs);
40+
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), buildReportData, rawArgs);
3441
process.exitCode = Constants.ERROR_EXIT_CODE;
3542
})
3643
}

0 commit comments

Comments
 (0)