Integration tests fixed

Chris Wiechmann · Chris Wiechmann · commit 5c396b7660c4 · 2021-06-21T20:21:20.000+02:00
diff --git a/.github/workflows/apibuilder4elastic.yml b/.github/workflows/apibuilder4elastic.yml
@@ -134,7 +134,7 @@ jobs:
         ELASTICSEARCH_HOSTS: 'http://localhost:9200'
         VALIDATE_CONFIG: false
         LOG_LEVEL: DEBUG
-        DISABLE_SETUP_FLOWS: true # Disable Elasticsearch tests for the tests.
+        DISABLE_SETUP_FLOWS: true # Disable Elasticsearch setup flows for the tests.
         CI: true
       run: | 
         npm ci
diff --git a/apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/actions.js b/apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/actions.js
@@ -142,6 +142,9 @@ async function lookupTopology(params, options) {
 		cache.set( cacheKey, topology, 300);
 		return topology;
 	}
+	// Without topology, inactive serviceIDs will not be included in the Traffic-Monitor result set
+	logger.error(`Error retrieving topology from ANM. With that EMT-Mode is not fully supported.`);
+	return {};
 }
 
 async function lookupAPIDetails(params, options) {
diff --git a/apibuilder4elastic/test/.env b/apibuilder4elastic/test/.env
@@ -6,7 +6,7 @@ API_MANAGER_USERNAME=apiadmin
 API_MANAGER_PASSWORD=changeme
 
 # Dont validate API-Manager configuration when running tests, which are mocked anyway
-VALIDATE_CONFIG=false
+VALIDATE_CONFIG=true
 
 # Let the HTTP Port enbaled when running tests
 ENABLE_HTTP_PORT=true
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/filetransfer/test_search_filetransfer_AsAdmin.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/filetransfer/test_search_filetransfer_AsAdmin.js
@@ -16,7 +16,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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_count_AsAdmin.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_count_AsAdmin.js
@@ -15,7 +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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_AsAdmin.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_AsAdmin.js
@@ -16,7 +16,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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_AsAdmin_with_EMT.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_AsAdmin_with_EMT.js
@@ -67,7 +67,7 @@ describe('Endpoints', function () {
 				expect(response.statusCode).to.equal(200);
 				expect(body).to.be.an('Object');
 				expect(body).to.have.property('data');
-				debugger;
+
 				expect(body.data).to.have.lengthOf(2); // Expected two results - One for the given Service-ID and the one already GONE
 				expect(body.data[0].correlationId).to.equals('7a240f5f0e21555d2d343482');
 				expect(body.data[1].correlationId).to.equals('19250f5f4321b5ba2a4de364');
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_regional.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_regional.js
@@ -18,7 +18,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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/jms/test_search_jms_AsAdmin.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/jms/test_search_jms_AsAdmin.js
@@ -19,7 +19,7 @@ describe('Endpoints', function () {
 		// Which is translated into false by the Policy and the ANM implementation then takes care of the request
 		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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/websock/test_search_websock_AsAdmin.js b/apibuilder4elastic/test/trafficMonitorAPI/asAdmin/websock/test_search_websock_AsAdmin.js
@@ -19,7 +19,7 @@ describe('Endpoints', function () {
 		// Which is translated into false by the Policy --> The ANM implementation then takes care of the request
 		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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/filetransfer/test_search_filetransfer.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/filetransfer/test_search_filetransfer.js
@@ -18,7 +18,7 @@ describe('Endpoints', 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, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	afterEach(() => {
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_restricted.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_restricted.js
@@ -13,7 +13,7 @@ describe('Endpoints', function () {
 
 	beforeEach(() => {
 		// Just return an empty topology as it's not required for the tests in this file
-		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	/**
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_disabled_authz.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_disabled_authz.js
@@ -13,7 +13,7 @@ describe('Endpoints', function () {
 
 	beforeEach(() => {
 		// Just return an empty topology as it's not required for the tests in this file
-		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	/**
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_extHttp1.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_extHttp1.js
@@ -13,7 +13,7 @@ describe('Endpoints', function () {
 
 	beforeEach(() => {
 		// Just return an empty topology as it's not required for the tests in this file
-		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	/**
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_extHttp1Custom.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_extHttp1Custom.js
@@ -13,7 +13,7 @@ describe('Endpoints', function () {
 
 	beforeEach(() => {
 		// Just return an empty topology as it's not required for the tests in this file
-		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	/**
diff --git a/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_restricted.js b/apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_search_restricted.js
@@ -13,7 +13,7 @@ describe('Endpoints', function () {
 
 	beforeEach(() => {
 		// Just return an empty topology as it's not required for the tests in this file
-		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { });
+		nock('https://mocked-api-gateway:8090').get('/api/topology').reply(200, { result: {} });
 	});
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ async function lookupTopology(params, options) {`
`142`	`142`	`cache.set( cacheKey, topology, 300);`
`143`	`143`	`return topology;`
`144`	`144`	`}`
	`145`	`+ // Without topology, inactive serviceIDs will not be included in the Traffic-Monitor result set`
	`146`	+ logger.error(`Error retrieving topology from ANM. With that EMT-Mode is not fully supported.`);
	`147`	`+ return {};`
`145`	`148`	`}`
`146`	`149`
`147`	`150`	`async function lookupAPIDetails(params, options) {`