Skip to content

Commit 768017c

Browse files
roshan04roshan04
committed
added changes for other requests
1 parent 2db3517 commit 768017c

File tree

3 files changed

+98
-94
lines changed

3 files changed

+98
-94
lines changed

‎bin/commands/generateReport.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,25 @@ module.exports = function generateReport(args, rawArgs) {
2121
// accept the access key from command line if provided
2222
utils.setAccessKey(bsConfig, args);
2323

24-
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
25-
26-
let buildReportData = {
27-
'user_id': initDetails.user_id
28-
};
29-
30-
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
31-
32-
// set cypress config filename
33-
utils.setCypressConfigFilename(bsConfig, args);
34-
35-
let messageType = Constants.messageTypes.INFO;
36-
let errorCode = null;
37-
let buildId = args._[1];
38-
39-
reportGenerator(bsConfig, buildId, args, rawArgs, buildReportData);
40-
utils.sendUsageReport(bsConfig, args, 'generate-report called', messageType, errorCode, buildReportData, rawArgs);
24+
getInitialDetails(bsConfig, args, rawArgs).then((initDetails) => {
25+
let buildReportData = {
26+
'user_id': initDetails.user_id
27+
};
28+
29+
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
30+
31+
// set cypress config filename
32+
utils.setCypressConfigFilename(bsConfig, args);
33+
34+
let messageType = Constants.messageTypes.INFO;
35+
let errorCode = null;
36+
let buildId = args._[1];
37+
38+
reportGenerator(bsConfig, buildId, args, rawArgs, buildReportData);
39+
utils.sendUsageReport(bsConfig, args, 'generate-report called', messageType, errorCode, buildReportData, rawArgs);
40+
}).catch(() => {
41+
process.exitCode = Constants.ERROR_EXIT_CODE;
42+
});
4143
}).catch(function (err) {
4244
logger.error(err);
4345
utils.setUsageReportingFlag(null, args.disableUsageReporting);

‎bin/commands/info.js

Lines changed: 78 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -19,93 +19,94 @@ module.exports = function info(args, rawArgs) {
1919
// accept the access key from command line if provided
2020
utils.setAccessKey(bsConfig, args);
2121

22-
let initDetails = await getInitialDetails(bsConfig, args, rawArgs);
23-
24-
let buildReportData = {
25-
'user_id': initDetails.user_id
26-
};
27-
28-
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
29-
30-
// set cypress config filename
31-
utils.setCypressConfigFilename(bsConfig, args);
32-
33-
let buildId = args._[1];
34-
35-
let options = {
36-
url: config.buildUrl + buildId,
37-
auth: {
38-
user: bsConfig.auth.username,
39-
password: bsConfig.auth.access_key,
40-
},
41-
headers: {
42-
'User-Agent': utils.getUserAgent(),
43-
},
44-
};
45-
46-
request.get(options, function (err, resp, body) {
47-
let message = null;
48-
let messageType = null;
49-
let errorCode = null;
50-
51-
if (err) {
52-
message = Constants.userMessages.BUILD_INFO_FAILED;
53-
messageType = Constants.messageTypes.ERROR;
54-
errorCode = 'api_failed_build_info';
55-
56-
logger.info(message);
57-
logger.error(utils.formatRequest(err, resp, body));
58-
} else {
59-
let build = null;
60-
try {
61-
build = JSON.parse(body);
62-
} catch (error) {
63-
build = null;
64-
}
65-
66-
if (resp.statusCode == 299) {
67-
messageType = Constants.messageTypes.INFO;
68-
errorCode = 'api_deprecated';
22+
getInitialDetails(bsConfig, args, rawArgs).then((initDetails) => {
23+
let buildReportData = {
24+
user_id: initDetails.user_id
25+
}
6926

70-
if (build) {
71-
message = build.message;
72-
logger.info(message);
73-
} else {
74-
message = Constants.userMessages.API_DEPRECATED;
75-
logger.info(message);
76-
}
77-
logger.info(utils.formatRequest(err, resp, body));
78-
} else if (resp.statusCode != 200) {
27+
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
28+
29+
// set cypress config filename
30+
utils.setCypressConfigFilename(bsConfig, args);
31+
32+
let buildId = args._[1];
33+
34+
let options = {
35+
url: config.buildUrl + buildId,
36+
auth: {
37+
user: bsConfig.auth.username,
38+
password: bsConfig.auth.access_key,
39+
},
40+
headers: {
41+
'User-Agent': utils.getUserAgent(),
42+
},
43+
};
44+
request.get(options, function (err, resp, body) {
45+
let message = null;
46+
let messageType = null;
47+
let errorCode = null;
48+
49+
if (err) {
50+
message = Constants.userMessages.BUILD_INFO_FAILED;
7951
messageType = Constants.messageTypes.ERROR;
8052
errorCode = 'api_failed_build_info';
81-
82-
if (build) {
83-
message = `${
84-
Constants.userMessages.BUILD_INFO_FAILED
85-
} with error: \n${JSON.stringify(build, null, 2)}`;
86-
logger.error(message);
87-
if (build.message === 'Unauthorized') errorCode = 'api_auth_failed';
88-
} else {
89-
message = Constants.userMessages.BUILD_INFO_FAILED;
90-
logger.error(message);
91-
}
53+
54+
logger.info(message);
9255
logger.error(utils.formatRequest(err, resp, body));
9356
} else {
94-
messageType = Constants.messageTypes.SUCCESS;
95-
message = `Build info for build id: \n ${JSON.stringify(
96-
build,
97-
null,
98-
2
99-
)}`;
100-
logger.info(message);
57+
let build = null;
58+
try {
59+
build = JSON.parse(body);
60+
} catch (error) {
61+
build = null;
62+
}
63+
64+
if (resp.statusCode == 299) {
65+
messageType = Constants.messageTypes.INFO;
66+
errorCode = 'api_deprecated';
67+
68+
if (build) {
69+
message = build.message;
70+
logger.info(message);
71+
} else {
72+
message = Constants.userMessages.API_DEPRECATED;
73+
logger.info(message);
74+
}
75+
logger.info(utils.formatRequest(err, resp, body));
76+
} else if (resp.statusCode != 200) {
77+
messageType = Constants.messageTypes.ERROR;
78+
errorCode = 'api_failed_build_info';
79+
80+
if (build) {
81+
message = `${
82+
Constants.userMessages.BUILD_INFO_FAILED
83+
} with error: \n${JSON.stringify(build, null, 2)}`;
84+
logger.error(message);
85+
if (build.message === 'Unauthorized') errorCode = 'api_auth_failed';
86+
} else {
87+
message = Constants.userMessages.BUILD_INFO_FAILED;
88+
logger.error(message);
89+
}
90+
logger.error(utils.formatRequest(err, resp, body));
91+
} else {
92+
messageType = Constants.messageTypes.SUCCESS;
93+
message = `Build info for build id: \n ${JSON.stringify(
94+
build,
95+
null,
96+
2
97+
)}`;
98+
logger.info(message);
99+
}
101100
}
102-
}
103-
utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
101+
utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
102+
});
103+
}).catch((err) => {
104+
process.exitCode = Constants.ERROR_EXIT_CODE;
104105
});
105106
}).catch(function (err) {
106107
logger.error(err);
107108
utils.setUsageReportingFlag(null, args.disableUsageReporting);
108-
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), buildReportData, rawArgs);
109+
utils.sendUsageReport(null, args, err.message, Constants.messageTypes.ERROR, utils.getErrorCodeFromErr(err), null, rawArgs);
109110
process.exitCode = Constants.ERROR_EXIT_CODE;
110111
})
111112
}

‎bin/helpers/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config.cypress_v1 = `${config.rails_host}/automate/cypress/v1`;
1616
config.buildUrl = `${config.cypress_v1}/builds/`;
1717
config.buildStopUrl = `${config.cypress_v1}/builds/stop/`;
1818
config.checkMd5sum = `${config.cypress_v1}/md5sumcheck/`;
19+
config.getInitialDetails = `${config.cypress_v1}/get_initial_details/`;
1920
config.fileName = "tests.zip";
2021
config.packageFileName = "bstackPackages.tar.gz";
2122
config.packageDirName = "tmpBstackPackages";

0 commit comments

Comments
 (0)