Skip to content

Let request handle JSON processing #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scaryuncledevin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Let request handle JSON processing #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2dec4c
Let request library handle JSON
scaryuncledevin Sep 27, 2018
2999e04
Restoring a removed request option
scaryuncledevin Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions javascript/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,6 @@ function getGMTDate() {
return new Date().toGMTString();
}

/**
* Callback for sending HTTP requests.
* @function makeRequest
* @private
* @param {Object} requestData Requests formatted object.
* @return {Object} Javascript Object from JSON response.
*/
function makeRequest(requestData) {
return request(requestData).then(response => {
return response.toJSON();
});
}

/**
* Retrieve an Intersight object moid by name.
* @function getMoidByName
Expand All @@ -172,8 +159,8 @@ async function getMoidByName(resourcePath, targetName) {

var response = await intersightREST(options);

if(JSON.parse(response.body).Results != null) {
locatedMoid = JSON.parse(response.body).Results[0].Moid;
if(response.body.Results != null) {
locatedMoid = response.body.Results[0].Moid;
} else {
return Promise.reject(`Object with name "${targetName}" not found!`);
}
Expand Down Expand Up @@ -297,14 +284,15 @@ const intersightREST = async function intersight_call({httpMethod="", resourcePa
method: method,
url: targetUrl,
qs: queryParams,
body: JSON.stringify(body),
body: body,
headers: request_header,
resolveWithFullResponse: true,
proxy: proxy
proxy: proxy,
json:true
};

// Make HTTP request & return a Javascript Promise
return makeRequest(requestOptions);
return request(requestOptions)
}

// Export the module functions
Expand Down