Integration tests fixed

Chris Wiechmann · Chris Wiechmann · commit 7a033f8360b2 · 2021-06-21T22:46:55.000+02:00
diff --git a/apibuilder4elastic/flows/trafficMonitorApi-payload.json b/apibuilder4elastic/flows/trafficMonitorApi-payload.json
@@ -157,51 +157,6 @@
 			},
 			"metaMethod": "Execute"
 		},
-		"javascript.2": {
-			"type": "nodehandler://@axway/api-builder-plugin-fn-javascript/javascript",
-			"name": "Create query",
-			"method": "Execute",
-			"parameters": [
-				{
-					"name": "data",
-					"type": "jsonpath",
-					"value": "$",
-					"metaName": "data",
-					"metaDescription": "The value to apply as the `data` argument to the JavaScript code. For objects and arrays, `data` is passed by reference."
-				},
-				{
-					"name": "code",
-					"type": "string",
-					"value": "\"let elasticQuery = {\\n    \\\"bool\\\": {\\n      \\\"must\\\": [\\n        {\\\"term\\\": {\\\"correlationId\\\": data.params.correlationID}},\\n          {\\\"term\\\": {\\\"processInfo.serviceId\\\": data.params.serviceID}}\\n      ]\\n    }\\n  };\\n  return elasticQuery;\"",
-					"metaName": "code",
-					"metaDescription": "A JavaScript function body. Supports `await` and returning promises."
-				},
-				{
-					"name": "unsafe",
-					"type": "boolean",
-					"value": "true",
-					"metaName": "Unsafe mode",
-					"metaDescription": "USE WITH CAUTION. When enabled, JavaScript is not executed in a sandboxed environment and all globals are available."
-				}
-			],
-			"outputs": {
-				"next": {
-					"context": "$.elasticsearch.query",
-					"routes": [
-						"authorization.1"
-					],
-					"metaName": "Next"
-				},
-				"error": {
-					"context": "$.error",
-					"routes": [
-						"http.3"
-					],
-					"metaName": "Error"
-				}
-			},
-			"metaMethod": "Execute"
-		},
 		"http.2": {
 			"type": "nodehandler://axway-flow/http",
 			"name": "Set HTTP Response",
@@ -428,7 +383,7 @@
 			"outputs": {
 				"next": {
 					"routes": [
-						"javascript.2"
+						"axway-api-management.2"
 					],
 					"context": "$.user",
 					"metaName": "Next"
@@ -508,7 +463,9 @@
 				{
 					"name": "restrictionField",
 					"type": "jsonpath",
-					"value": "$.authzConfig.detailedRestrictionField"
+					"value": "$.authzConfig.detailedRestrictionField",
+					"metaName": "Restriction field",
+					"metaDescription": "The field on which the restriction should be applied. For instance a custom property."
 				}
 			],
 			"outputs": {
@@ -760,6 +717,73 @@
 				}
 			},
 			"metaMethod": "Switch on Authorization"
+		},
+		"axway-api-management.2": {
+			"type": "nodehandler://api-builder-plugin-axway-api-management/axway-api-management",
+			"name": "Lookup topology",
+			"method": "lookupTopology",
+			"parameters": [
+				{
+					"name": "requestHeaders",
+					"type": "jsonpath",
+					"value": "$.request.headers"
+				}
+			],
+			"outputs": {
+				"next": {
+					"routes": [
+						"traffic-monitor-api-utils.1"
+					],
+					"context": "$.gatewayTopology"
+				},
+				"error": {
+					"routes": [
+						"http.3"
+					],
+					"context": "$.error"
+				}
+			}
+		},
+		"traffic-monitor-api-utils.1": {
+			"type": "nodehandler://api-builder-plugin-traffic-monitor-api-utils/traffic-monitor-api-utils",
+			"name": "Create Payload query",
+			"method": "createCircuitPathQuery",
+			"parameters": [
+				{
+					"name": "gatewayTopology",
+					"type": "jsonpath",
+					"value": "$.gatewayTopology"
+				},
+				{
+					"name": "authzConfig",
+					"type": "jsonpath",
+					"value": "$.authzConfig"
+				},
+				{
+					"name": "params",
+					"type": "jsonpath",
+					"value": "$.params"
+				},
+				{
+					"name": "user",
+					"type": "jsonpath",
+					"value": "$.user"
+				}
+			],
+			"outputs": {
+				"next": {
+					"routes": [
+						"authorization.1"
+					],
+					"context": "$.elasticsearch.query"
+				},
+				"error": {
+					"routes": [
+						"http.3"
+					],
+					"context": "$.error"
+				}
+			}
 		}
 	}
 }
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_anm_api_with_http_basic.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_anm_api_with_http_basic.js
@@ -16,6 +16,7 @@ describe('Traffic Monitor API', function () {
 		// 
 		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(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_circuitpath.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_circuitpath.js
@@ -16,6 +16,7 @@ describe('Traffic Monitor API', 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(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_getinfo_endpoint.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_getinfo_endpoint.js
@@ -15,6 +15,7 @@ describe('Endpoints', 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(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_disabled_authz.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_disabled_authz.js
@@ -48,6 +48,8 @@ describe('Traffic Monitor API', 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/c8705e5ecc00adca32be7472/*/circuitpath`,
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_extHttp1.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_extHttp1.js
@@ -49,6 +49,7 @@ describe('Traffic Monitor API Circuitpath - Ext-HTTP-AuthZ', function () {
 		it('[restricted-circuitpath-extHttpAuthZ-0001] Should return http 200 and (API Broker/HTTP Petstore) Policy with 2 filters as the transaction belongs to users organization', () => {
 			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: {} });
 			// Disabled API-Manager Mocks, as this AuthZ should not need the API-Manager
 			//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');
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_restricted.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_restricted.js
@@ -47,6 +47,8 @@ describe('Traffic Monitor API', 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/c8705e5ecc00adca32be7472/*/circuitpath`,
@@ -74,6 +76,8 @@ describe('Traffic Monitor API', 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/c8705e5ecc00adca32be7472/*/circuitpath`,
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_disabled_authz.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_disabled_authz.js
@@ -46,6 +46,8 @@ describe('Endpoints', function () {
 		it('[Disabled-AuthZ-Getinfo-0001] Should return a result, as user authorization 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/http/0455ff5e82267be8182a553d/*/getinfo?format=json&details=1&rheaders=1&sheaders=1`,
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_extHttp1.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_extHttp1.js
@@ -49,6 +49,7 @@ describe('Endpoints', function () {
 		it('[Ext-Http AuthZ-Getinfo-0001] Should return a result', () => {
 			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'})
