Skip to content
This repository was archived by the owner on Dec 14, 2022. It is now read-only.

Commit da4ac7b

Browse files
author
Chris Wiechmann
committed
Added log messags for API-Manager config parsing (#76)
1 parent d544f40 commit da4ac7b

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ async function getPlugin(pluginConfig, options) {
3232
if(!pluginConfig.apigateway.url) {
3333
throw new Error(`Required parameter: apigateway.url is not set.`);
3434
}
35-
pluginConfig.apimanager = await parseAPIManagerConfig(pluginConfig);
35+
pluginConfig.apimanager = await parseAPIManagerConfig(pluginConfig, options);
3636
if(pluginConfig.validateConfig==true) {
3737
var isValid = await checkAPIManagers(pluginConfig.apimanager, options.logger);
3838
if(!isValid) {

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function isDeveloperMode() {
8585
}
8686
}
8787

88-
async function parseAPIManagerConfig(pluginConfig) {
88+
async function parseAPIManagerConfig(pluginConfig, options) {
8989
var configuredManagers = {};
9090
if(!pluginConfig.apimanager.username) {
9191
throw new Error(`Required parameter: apimanager.username is not set.`)
@@ -97,6 +97,7 @@ async function parseAPIManagerConfig(pluginConfig) {
9797
// If no API-Manager URL is given, use the Admin-Node-Manager URL
9898
const managerURL = new URL(pluginConfig.apigateway.url);
9999
managerURL.port = 8075;
100+
options.logger.info(`Parameter API_MANAGER not set. Expect API-Manager on URL: ${managerURL.toString()}`);
100101
configuredManagers = {
101102
default: {
102103
url: managerURL.toString(),
@@ -108,23 +109,28 @@ async function parseAPIManagerConfig(pluginConfig) {
108109
// Check, if multiple API-Manager URLs based on the groupId and regions are given (Format: groupId|managerUrl or groupId|region|managerUrl)
109110
if(pluginConfig.apimanager.url.indexOf('|')!=-1) {
110111
configuredManagers.perGroupAndRegion = true;
112+
options.logger.info(`Parse group/region based API_MANAGER: ${pluginConfig.apimanager.url}.`);
111113
// Looks like manager URLs are given based on groupIds and regions
112114
pluginConfig.apimanager.url.split(',').forEach(groupRegionAndURL => {
113115
groupRegionAndURL = groupRegionAndURL.trim().toLowerCase().split('|');
114116
if(groupRegionAndURL.length == 1) {
115117
// The default API-Manager
118+
options.logger.debug(`Found default API-Manager URL: ${groupRegionAndURL[0]}`);
116119
configuredManagers.default = { url: groupRegionAndURL[0], username: pluginConfig.apimanager.username, password: pluginConfig.apimanager.password }
117120
} else if(groupRegionAndURL.length == 2) {
118121
// Only the Group-ID is given
122+
options.logger.debug(`Found API-Manager URL: ${groupRegionAndURL[1]} for group: ${groupRegionAndURL[0]}`);
119123
configuredManagers[groupRegionAndURL[0]] = { url: groupRegionAndURL[1], username: pluginConfig.apimanager.username, password: pluginConfig.apimanager.password }
120124
} else if(groupRegionAndURL.length == 3) {
121125
// Group-ID and region is given (Just create a map with a special key)
126+
options.logger.debug(`Found API-Manager URL: ${groupRegionAndURL[2]} for group: ${groupRegionAndURL[1]} and region: ${groupRegionAndURL[1]}`);
122127
configuredManagers[`${groupRegionAndURL[0]}###${groupRegionAndURL[1]}`] = { url: groupRegionAndURL[2], username: pluginConfig.apimanager.username, password: pluginConfig.apimanager.password}
123128
} else {
124129
return Promise.reject(`Unexpected API-Manager format: ${groupRegionAndURL}`);
125130
}
126131
});
127132
} else { // If not, create a default API-Manager
133+
options.logger.info(`Using only default API_MANAGER: ${pluginConfig.apimanager.url}.`);
128134
configuredManagers = {
129135
default: {
130136
url: pluginConfig.apimanager.url,

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/test/testManagerConfigs.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Test API-Manager configuration variations', () => {
2424
username: "user", password: "password"
2525
}
2626
}
27-
var configuredManagers = await parseAPIManagerConfig(pluginConfig);
27+
var configuredManagers = await parseAPIManagerConfig(pluginConfig, logger);
2828
expect(configuredManagers).to.deep.equal(expectedManagers);
2929
});
3030

@@ -41,7 +41,7 @@ describe('Test API-Manager configuration variations', () => {
4141
username: "user", password: "password"
4242
}
4343
}
44-
var configuredManagers = await parseAPIManagerConfig(pluginConfig);
44+
var configuredManagers = await parseAPIManagerConfig(pluginConfig, logger);
4545
expect(configuredManagers).to.deep.equal(expectedManagers);
4646
});
4747

@@ -63,7 +63,7 @@ describe('Test API-Manager configuration variations', () => {
6363
username: "user", password: "password"
6464
}
6565
}
66-
var configuredManagers = await parseAPIManagerConfig(pluginConfig);
66+
var configuredManagers = await parseAPIManagerConfig(pluginConfig, logger);
6767
expect(configuredManagers).to.deep.equal(expectedManagers);
6868
});
6969

@@ -89,7 +89,7 @@ describe('Test API-Manager configuration variations', () => {
8989
username: "user", password: "password"
9090
}
9191
}
92-
var configuredManagers = await parseAPIManagerConfig(pluginConfig);
92+
var configuredManagers = await parseAPIManagerConfig(pluginConfig, logger);
9393
expect(configuredManagers).to.deep.equal(expectedManagers);
9494
});
9595

@@ -111,7 +111,7 @@ describe('Test API-Manager configuration variations', () => {
111111
username: "user", password: "password"
112112
}
113113
}
114-
var configuredManagers = await parseAPIManagerConfig(pluginConfig);
114+
var configuredManagers = await parseAPIManagerConfig(pluginConfig, logger);
115115
expect(configuredManagers).to.deep.equal(expectedManagers);
116116
});
117117
});

0 commit comments

Comments
 (0)