|
1 | 1 | // TODO: confirm if we need to add command line args. if yes then decide priority
|
2 | 2 |
|
3 |
| -const logger = require("./logger").winstonLogger; |
| 3 | +const request = require('request'), |
| 4 | + logger = require('./logger').winstonLogger, |
| 5 | + utils = require('./utils'), |
| 6 | + config = require('./config'); |
| 7 | + Constants = require('./constants'); |
4 | 8 |
|
5 | 9 | exports.isTurboScaleSession = (bsConfig) => {
|
6 | 10 | // env var will override config
|
@@ -39,15 +43,40 @@ exports.getTurboScaleGridName = (bsConfig) => {
|
39 | 43 | exports.getTurboScaleGridDetails = async (bsConfig) => {
|
40 | 44 | try {
|
41 | 45 | const gridName = this.getTurboScaleGridName(bsConfig);
|
42 |
| - // TODO: update request making logic |
43 |
| - const response = await this.nodeRequest('GET', `${turboScaleConstants.API_ENDPOINT}/grids/${gridName}`, {}, bsConfig); |
44 | 46 |
|
45 |
| - return JSON.parse(response.data); |
| 47 | + return new Promise((resolve, reject) => { |
| 48 | + let options = { |
| 49 | + url: `${config.turboScaleAPIUrl}/grids/${gridName}`, |
| 50 | + auth: { |
| 51 | + username: bsConfig.auth.username, |
| 52 | + password: bsConfig.auth.access_key, |
| 53 | + }, |
| 54 | + headers: { |
| 55 | + 'User-Agent': utils.getUserAgent(), |
| 56 | + } |
| 57 | + }; |
| 58 | + let responseData = {}; |
| 59 | + request.get(options, function (err, resp, data) { |
| 60 | + if(err) { |
| 61 | + logger.warn(utils.formatRequest(err, resp, data)); |
| 62 | + utils.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'get_initial_details_failed', null, rawArgs); |
| 63 | + resolve({}); |
| 64 | + } else { |
| 65 | + try { |
| 66 | + responseData = JSON.parse(data); |
| 67 | + } catch (e) { |
| 68 | + responseData = {}; |
| 69 | + } |
| 70 | + if(resp.statusCode != 200) { |
| 71 | + logger.warn(`Warn: Get Initial Details Request failed with status code ${resp.statusCode}`); |
| 72 | + utils.sendUsageReport(bsConfig, args, responseData["error"], Constants.messageTypes.ERROR, 'get_initial_details_failed', null, rawArgs); |
| 73 | + resolve({}); |
| 74 | + } |
| 75 | + resolve(responseData); |
| 76 | + } |
| 77 | + }); |
| 78 | + }); |
46 | 79 | } catch (err) {
|
47 | 80 | logger.error(`Failed to find TurboScale Grid: ${err}: ${err.stack}`);
|
48 | 81 | }
|
49 | 82 | };
|
50 |
| - |
51 |
| - |
52 |
| - |
53 |
| -ATSGridName = getTurboScaleGridName(bsConfig); |
|
0 commit comments