Skip to content
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

rkiesler-dev #9

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

rkiesler-dev #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cf0615
Update swagger2mashery.js
rkiesler1 Nov 29, 2016
11e90f7
Update config.js
rkiesler1 Nov 29, 2016
9f4e3fa
Update swagger2mashery.js
rkiesler1 Nov 30, 2016
e046f9e
Update package.json
rkiesler1 Nov 30, 2016
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
1 change: 0 additions & 1 deletion api_definition_converter/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ mashery_tools = [
];

swaggerLoadWait = 5000; // maximum time to wait for Swagger loading -- increase as needed
syncInterval = 5000; // 5 seconds between API calls

// Not used in Web UI (onli in CLI)
sample_response_raml_dir = './Samples/RAML'; // TODO: RAML can have inline !includes
Expand Down
1 change: 1 addition & 0 deletions api_definition_converter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"start": "node ./bin/www"
},
"dependencies": {
"async": "^2.1.4",
"body-parser": "~1.13.2",
"bunyan": "^1.8.1",
"cookie-parser": "~1.3.5",
Expand Down
114 changes: 63 additions & 51 deletions api_definition_converter/routes/swagger2mashery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
var express = require('express');
var router = express.Router();

var swagger = require('swagger-parser');
var http = require('http'); // HTTP client
var https = require('https'); // HTTP client
var url = require('url'); // URL parser
var fs = require('fs'); // File system
var path = require('path'); // Directory
var mashery = require('mashery');
var async = require('async'); // Asynchronous operations
var bunyan = require('bunyan'); // Logging
var express = require('express'); // Web framework
var fs = require('fs'); // File system
var http = require('http'); // HTTP client
var https = require('https'); // Secure HTTP client
var path = require('path'); // Directory
var mashery = require('mashery'); // V3 API
var multer = require('multer'); // File upload
var swagger = require('swagger-parser'); // Swagger validator
var url = require('url'); // URL parser

var bunyan = require('bunyan');
var router = express.Router();
var log = bunyan.createLogger({
name: 'swagger2mashery',
serializers: {
Expand All @@ -20,7 +21,6 @@ var log = bunyan.createLogger({
level : bunyan.DEBUG
});

var multer = require('multer');
router.use(multer({storage: multer.memoryStorage(), inMemory:true}).single('input_file'));

var creds = require(path.join(__dirname, '..', 'credentials.js'));
Expand Down Expand Up @@ -93,14 +93,14 @@ router.post('/', function (req, res) {

var swaggerPath = parsedUrl ?
path.resolve(
parsedUrl.hostname ? sample_response_dir : '',
'',
parsedUrl.hostname ? '.' + path.dirname(parsedUrl.pathname) : path.dirname(swaggerUrl)) : null;
var swaggerFile = path.basename(swaggerUrl);

// when a URL is used, default to samples directory as defined in config. Do not append relative path of URL.
var swaggerDir = swaggerSource === "file" ?
path.resolve(swaggerPath + path.sep + path.basename(swaggerFile, path.extname(swaggerFile))) :
path.resolve(sample_response_dir);
path.resolve('');


if (parsedUrl.protocol && typeof parsedUrl.protocol !== 'undefined') {
Expand Down Expand Up @@ -174,8 +174,9 @@ router.post('/', function (req, res) {
} else {
svcArgs = {
data: {
"name": swaggerDoc.resourcePath.substring(1),
"version": swaggerDoc.apiVersion
"name": swaggerDoc.resourcePath ? swaggerDoc.resourcePath.substring(1) :
basePath.path.substring(basePath.path.lastIndexOf('/') + 1),
"version": swaggerDoc.apiVersion ? swaggerDoc.apiVersion : "1.0"
}
};
}
Expand Down Expand Up @@ -241,12 +242,12 @@ router.post('/', function (req, res) {
}
} else {
log.error(domainData);
errorMsg = domainData.errorMessage;
errorMsg = domainData.errorMessage ? domainData.errorMessage :
(domainData.errors && domainData.errors.length > 0 ? domainData.errors[0].message : "UNKNOWN");
}
} else {
//console.log("Registering new domain: '%s' is now %s", domainData.domain, domainData.status);
if (domainData && domainData.domain && domainData.status &&
domainData.status === "active" && whitelist.indexOf(domainData.domain) < 0) {
log.info("Registering new domain: '%s' is now %s", domainData.domain, domainData.status);
if (domainData && domainData.status === "active" && whitelist.indexOf(domainData.domain) < 0) {
whitelist.push(domainData.domain);
}
}
Expand All @@ -257,24 +258,31 @@ router.post('/', function (req, res) {
/*************************
* create a new endpoint *
*************************/
var domains = [];
var endpoints = [];
var createEndpoint = function(epArgs) {
//printJson(epArgs);
var endpointUrls = [];
var createEndpoint = function(epArgs, callback) {
log.debug("Creating endpoint %s", epArgs.data.name);
apiClient.methods.createServiceEndpoint(epArgs, function(epData, epRawResponse) {
log.debug(epData);
if (epData.errorCode && epData.errorCode === 400 &&
epData.errors && epData.errors.length > 0) {
errorMsg = epData.errorMessage + " " + (epData.errors[0].message ? domainData.errors[0].message : "");
log.error(epData);
callback(new Error(epData));
} else if (epData.errorCode && epData.errorCode === 500) {
errorMsg = printJson(epData);
log.error(epData);
callback(new Error(epData));
} else {
if ("undefined" === typeof epData.name) {
errorMsg = printJson(epData);
log.error(epData);
callback(new Error(epData));
} else {
endpoints.push(epData.name);
endpointUrls.push(epData.name);
//console.log("Endpoint " + epData.name + " was created");
callback();
}
}
});
Expand Down Expand Up @@ -330,10 +338,12 @@ router.post('/', function (req, res) {
}
};

if (printOnly && whitelist.indexOf(dmArgs.data.domain) < 0) {
whitelist.push(dmArgs.data.domain);
if (printOnly) {
if (whitelist.indexOf(dmArgs.data.domain) < 0) {
whitelist.push(dmArgs.data.domain);
}
} else {
setTimeout(whitelistDomain, 1000, dmArgs);
domains.push(dmArgs);
}

/******************
Expand All @@ -354,11 +364,9 @@ router.post('/', function (req, res) {
};
if (updateJson) {
mdArgs.sampleJsonResponse = fs.readFileSync(jsonFile, 'utf-8');
//console.log(" Sample JSON for method '%s': %s", methods[m].name, mdArgs.sampleJsonResponse);
}
if (updateXml) {
mdArgs.sampleXmlResponse = fs.readFileSync(xmlFile, 'utf-8');
//console.log(" Sample XML for method '%s': %s", methods[m].name, mdArgs.sampleXmlResponse);
}
methods[m] = mdArgs;
} // end if updateJson || updateXml
Expand All @@ -383,16 +391,20 @@ router.post('/', function (req, res) {
"inboundSslRequired": false
}
};
setTimeout(createEndpoint, (ep+2)*1000, epArgs);
endpoints.push(epArgs);
} else {
endpoints.push(cleanPath);
endpointUrls.push(cleanPath);
}
ep++;
} // end for swaggerDoc.apis

var renderTimeout = printOnly ? 1000 : (swaggerDoc.apis.length + 1)* 2000;
//console.log("Render timeout: " + renderTimeout);
setTimeout(renderOutput, renderTimeout);
async.eachSeries(domains, whitelistDomain, function (err) {
if (err) { throw err; }
});
async.eachSeries(endpoints, createEndpoint, function (err) {
if (err) { throw err; }
renderOutput();
});
};

/***********************
Expand All @@ -412,7 +424,7 @@ router.post('/', function (req, res) {
swagger.validate(swaggerDoc, function(err, api) {
if ("undefined" != err && err.message) {
errorMsg = "Swagger 2.0 validation error: " + JSON.stringify(err.message, null, 2);
//console.error(errorMsg);
log.error(errorMsg);
}
});
}
Expand Down Expand Up @@ -457,11 +469,12 @@ router.post('/', function (req, res) {
}
};

if (printOnly && whitelist.indexOf(dmArgs.data.domain) < 0) {
whitelist.push(dmArgs.data.domain);
//console.log(" Endpoint '%s' will be created", cleanPath);
if (printOnly) {
if (whitelist.indexOf(dmArgs.data.domain) < 0) {
whitelist.push(dmArgs.data.domain);
}
} else {
setTimeout(whitelistDomain, 1000, dmArgs);
domains.push(dmArgs);
}

/******************
Expand All @@ -482,11 +495,9 @@ router.post('/', function (req, res) {
};
if (updateJson) {
mdArgs.sampleJsonResponse = fs.readFileSync(jsonFile, 'utf-8');
//console.log(" Sample JSON for method '%s': %s", methods[m].name, mdArgs.sampleJsonResponse);
}
if (updateXml) {
mdArgs.sampleXmlResponse = fs.readFileSync(xmlFile, 'utf-8');
//console.log(" Sample XML for method '%s': %s", methods[m].name, mdArgs.sampleXmlResponse);
}
methods[m] = mdArgs;
} // end if updateJson || updateXml
Expand All @@ -511,34 +522,35 @@ router.post('/', function (req, res) {
}
};

//console.log(epArgs);
if (!printOnly) {
setTimeout(createEndpoint, (ep+2)*syncInterval, epArgs);
log.debug("Endpoint #" + (ep+1) + " will be created in " + ((ep+2)*(syncInterval/1000)) + " seconds");
endpoints.push(epArgs);
} else {
endpoints.push(epArgs.data.name);
endpointUrls.push(epArgs.data.name);
}
ep++;
} // end if p.length > 0
} // end for p in paths

var renderTimeout = printOnly ? 2000 : Object.keys(swaggerDoc.paths).length + 1 * syncInterval;

console.log("Render timeout: " + renderTimeout);
setTimeout(renderOutput, renderTimeout);
async.eachSeries(domains, whitelistDomain, function (err) {
if (err) { throw err; }
});
async.eachSeries(endpoints, createEndpoint, function (err) {
if (err) { throw err; }
renderOutput();
});
};

/***********************
* Render output *
***********************/
var renderOutput = function() {
console.log("# of endpoints: %d", endpoints.length);
console.log("# of endpoints: %d", endpointUrls.length);
var wlMulti;
if (whitelist.length > 1) {
wlMulti = "true";
}
var epMulti;
if (endpoints.length > 1) {
if (endpointUrls.length > 1) {
epMulti = "true";
}
res.render('swagger2mashery', {
Expand All @@ -549,7 +561,7 @@ router.post('/', function (req, res) {
warn: warnMsg,
whitelist: whitelist,
wlMulti: wlMulti,
endpoints: endpoints,
endpoints: endpointUrls,
epMulti: epMulti,
apiName: apiName,
apiId: apiId,
Expand Down