Integration tests and a small bug fixed

Author: Chris Wiechmann

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/actions.js

@@ -129,10 +129,10 @@ async function lookupTopology(params, options) {
 	var topology;
 	if(requestHeaders.authorization) {
 		logger.debug(`Trying to get API-Gateway topology based on Authorization header.`);
-		topology = await _getTopology(headers = {'Authorization': `${requestHeaders.authorization}`}, options);
+		topology = await _getTopology(headers = {'Authorization': `${requestHeaders.authorization}`}, logger);
 	} else {
 		logger.trace(`Trying to get API-Gateway topology based on VIDUSR cookie.`);
-		topology = await _getTopology(headers = {'Cookie': requestHeaders.cookie, 'csrf-token': requestHeaders['csrf-token']}, options);
+		topology = await _getTopology(headers = {'Cookie': requestHeaders.cookie, 'csrf-token': requestHeaders['csrf-token']}, logger);
 	}
 	if(topology.services) {
 		topology.services = topology.services.filter(function(service) {
@@ -453,7 +453,7 @@ async function _getCurrentGWUser(requestHeaders) {
 	return loginName;
 }
 
-async function _getTopology(requestHeaders, options) {
+async function _getTopology(requestHeaders, logger) {
 	var options = {
 		path: '/api/topology',
 		headers: requestHeaders,
@@ -464,8 +464,8 @@ async function _getTopology(requestHeaders, options) {
 			return response.body.result;
 		})
 		.catch(err => {
-			options.logger.error(`Error getting API-Gateway topology from Admin-Node-Manager. Request sent to: '${pluginConfig.apigateway.url}'. Response-Code: ${err.statusCode}`);
-			options.logger.error(`This error will cause the application to fail in a future release.`);
+			logger.error(`Error getting API-Gateway topology from Admin-Node-Manager. Request sent to: '${pluginConfig.apigateway.url}'. Response-Code: ${err.statusCode}`);
+			logger.error(`This error will cause the application to fail in a future release.`);
 			return {};
 			// During a grace period it not cause the entire application to fail - Just EMT will not include all services.
 			//throw new Error(`Error getting API-Gateway topology from Admin-Node-Manager. Request sent to: '${pluginConfig.apigateway.url}'. Response-Code: ${err.statusCode}`);

apibuilder4elastic/test/trafficMonitorAPI/asAdmin/payload/test_payload.js

@@ -16,6 +16,7 @@ describe('Payload', function () {
 		// Simulate all responses in this test-file to be an admin, which will not lead to any result restriction
 		nock('https://mocked-api-gateway:8090').get('/api/rbac/currentuser').reply(200, { "result": "david" });
 		nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/adminUserDavid.json');
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
@@ -55,7 +56,7 @@ describe('Payload', function () {
 	after(() => stopApiBuilder(server));
 
 	describe('Payload tests', () => {
-		it('[Payload-0001]  Should return sent payload for leg 0', () => {
+		it.only('[Payload-0001]  Should return sent payload for leg 0', () => {
 			const testPayload = fs.readFileSync(`${payloadFolder}/2020-07-03/08.55/0455ff5e82267be8182a553d-0-sent`);
 			return requestAsync({
 				method: 'GET',  // 

apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_disabled_authz.js

@@ -50,6 +50,8 @@ describe('Payload restricted', function () {
 		it('[Disabled-AuthZ-Payload-0001] Should return payload as the authz is disabled', () => {
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/currentuser').reply(200, { "result": "chris" });
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/operatorChris.json');
+			nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
+
 			return requestAsync({
 				method: 'GET',
 				uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/stream/0455ff5e82267be8182a553d/1/received`,

apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_extHttp1.js

@@ -54,6 +54,7 @@ describe('Payload restricted using Ext HTTP-Service', function () {
 		it('[Ext-AuthZ-Payload-0001] Should return payload as the authz is disabled', () => {
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/currentuser').reply(200, { "result": "chris" });
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/operatorChris.json');
+			nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 
 			nock('https://mocked-server:8443')
 				.defaultReplyHeaders({'Content-Type': 'application/json; charset=utf-8'})

apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_restricted.js

@@ -51,6 +51,9 @@ describe('Payload restricted', function () {
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/operatorChris.json');
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/users?field=loginName&op=eq&value=chris&field=enabled&op=eq&value=enabled`).replyWithFile(200, './test/mockedReplies/apimanager/apiManagerUserChris.json');		
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/organizations/2bfaa1c2-49ab-4059-832d-CHRIS`).replyWithFile(200, './test/mockedReplies/apimanager/organizationChris.json');
+			nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
+
+
 			return requestAsync({
 				method: 'GET',
 				uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/stream/0455ff5e82267be8182a553d/1/received`,
@@ -71,6 +74,8 @@ describe('Payload restricted', function () {
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/operatorMax.json');
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/users?field=loginName&op=eq&value=max&field=enabled&op=eq&value=enabled`).replyWithFile(200, './test/mockedReplies/apimanager/apiManagerUserMax.json');		
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/organizations/2bfaa1c2-49ab-4059-832d-MAX`).replyWithFile(200, './test/mockedReplies/apimanager/organizationMax.json');
+			nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
+
 			return requestAsync({
 				method: 'GET',
 				uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/stream/0455ff5e82267be8182a553d/1/received`,
@@ -91,6 +96,8 @@ describe('Payload restricted', function () {
 			nock('https://mocked-api-gateway:8090').get('/api/rbac/permissions/currentuser').replyWithFile(200, './test/mockedReplies/apigateway/operatorRene.json');
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/users?field=loginName&op=eq&value=rene&field=enabled&op=eq&value=enabled`).replyWithFile(200, './test/mockedReplies/apimanager/apiManagerUserRene.json');		
 			nock('https://mocked-api-gateway:8075').get(`/api/portal/v1.3/organizations/2bfaa1c2-49ab-4059-832d-MAX`).replyWithFile(200, './test/mockedReplies/apimanager/organizationMax.json');
+			nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
+
 			return requestAsync({
 				method: 'GET',
 				uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/stream/0455ff5e82267be8182a553d/0/sent`,