@axway/axway-central-cli 3.6.0 → 3.7.0-rc.0

package/dist/commands/install/awsSaasAgents.js

@@ -78,6 +78,7 @@ class SaasAgentValues {
   constructor() {
     _defineProperty(this, "frequencyDA", void 0);
     _defineProperty(this, "queueDA", void 0);
+    _defineProperty(this, "filterDA", void 0);
     _defineProperty(this, "frequencyTA", void 0);
     _defineProperty(this, "sampling", void 0);
     _defineProperty(this, "redaction", void 0);
@@ -86,6 +87,7 @@ class SaasAgentValues {
     this.frequencyDA = '';
     this.queueDA = false;
     this.frequencyTA = '';
+    this.filterDA = '';
     this.sampling = new Sampling();
     this.redaction = new Redaction();
     this.dataplaneConfig = new DataplaneConfig();
@@ -150,6 +152,7 @@ const SaasPrompts = {
   ACCESS_LOG_ARN: 'Enter the ARN for the Access Log that the Discovery will add and the Traceability will use',
   FULL_TRANSACTION_LOGGING: 'Do you want to enable Full Transaction Logging? Please note that CloudWatch costs would increase when Full Transaction Logging is enabled',
   DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
+  DA_FILTER: 'Please enter the filter conditions for discovery of API Services based on tags',
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
   SAMP_PERCENTAGE: 'Enter the percentage of transactions to sample',
@@ -358,6 +361,10 @@ const gatewayConnectivity = async installConfig => {
     default: _types.YesNo.No,
     choices: _types.YesNoChoices
   })) === _types.YesNo.Yes;
+  hostedAgentValues.filterDA = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.DA_FILTER,
+    allowEmptyInput: true
+  });
   if (installConfig.switches.isTaEnabled) {
     console.log(_chalk.default.gray('\n00d00h00m format, where 30m = 30 minutes, 1h = 1 hour, 7d = 7 days, and 7d1h30m = 7 days 1 hour and 30 minutes. Minimum of 30m.'));
     hostedAgentValues.frequencyTA = await (0, _basicPrompts.askInput)({
@@ -426,7 +433,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   }
 
   // create discovery agent resource
-  installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Discovery Agent', dataplaneRes.name, awsAgentValues.frequencyDA, awsAgentValues.queueDA);
+  installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Discovery Agent', dataplaneRes.name, awsAgentValues.frequencyDA, awsAgentValues.queueDA, awsAgentValues.filterDA);
   if (installConfig.switches.isTaEnabled) {
     // create traceability agent resource
     installConfig.centralConfig.taAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.ta, _types.AgentTypes.ta, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Traceability Agent', dataplaneRes.name, awsAgentValues.frequencyTA, false,

package/dist/commands/install/azureSaasAgents.js

@@ -93,6 +93,7 @@ class SaasAgentValues {
   constructor() {
     _defineProperty(this, "frequencyDA", void 0);
     _defineProperty(this, "queueDA", void 0);
+    _defineProperty(this, "filterDA", void 0);
     _defineProperty(this, "frequencyTA", void 0);
     _defineProperty(this, "sampling", void 0);
     _defineProperty(this, "redaction", void 0);
@@ -100,6 +101,7 @@ class SaasAgentValues {
     _defineProperty(this, "centralConfig", void 0);
     this.frequencyDA = '';
     this.queueDA = false;
+    this.filterDA = '';
     this.frequencyTA = '';
     this.sampling = new Sampling();
     this.redaction = new Redaction();
@@ -168,6 +170,7 @@ const SaasPrompts = {
   EVENT_HUB_CONSUMER_GROUP: 'Enter the Azure Event Hub Consumer Group',
   // general prompts
   DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
+  DA_FILTER: 'Please enter the filter conditions for discovery of API Services based on tags',
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
   SAMP_PERCENTAGE: 'Enter the percentage of transactions to sample',
@@ -370,6 +373,10 @@ const gatewayConnectivity = async installConfig => {
     default: _types.YesNo.No,
     choices: _types.YesNoChoices
   })) === _types.YesNo.Yes;
+  hostedAgentValues.filterDA = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.DA_FILTER,
+    allowEmptyInput: true
+  });
   if (installConfig.switches.isTaEnabled) {
     console.log(_chalk.default.gray('\n00d00h00m format, where 30m = 30 minutes, 1h = 1 hour, 7d = 7 days, and 7d1h30m = 7 days 1 hour and 30 minutes. Minimum of 30m.'));
     hostedAgentValues.frequencyTA = await (0, _basicPrompts.askInput)({
@@ -493,7 +500,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   }
 
   // create discovery agent resource
-  installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Discovery Agent', dataplaneRes.name, azureAgentValues.frequencyDA, azureAgentValues.queueDA);
+  installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Discovery Agent', dataplaneRes.name, azureAgentValues.frequencyDA, azureAgentValues.queueDA, azureAgentValues.filterDA);
   if (installConfig.switches.isTaEnabled) {
     // create traceability agent resource
     installConfig.centralConfig.taAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.ta, _types.AgentTypes.ta, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + ' Traceability Agent', dataplaneRes.name, azureAgentValues.frequencyTA, false,

package/dist/commands/install/helpers/creators.js

@@ -122,7 +122,7 @@ const createByResourceType = async (client, defsManager, name, resourceType, res
   return result.data.name;
 };
 exports.createByResourceType = createByResourceType;
-const createNewAgentResource = async (client, defsManager, envName, dataPlaneType, agentResource, agentType, owningTeam, agentName, dataPlaneName, frequency, queue, config) => {
+const createNewAgentResource = async (client, defsManager, envName, dataPlaneType, agentResource, agentType, owningTeam, agentName, dataPlaneName, frequency, queue, config, filterDA) => {
   console.log(`Creating a new ${agentResource}, with data plane type: ${dataPlaneType}.`);
   // NOTE: only a first found set is used
   const defs = defsManager.findDefsByWord(agentType);
@@ -140,7 +140,8 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
   frequency ? dataplane.frequency = frequency : null;
   queue ? agentResource === _types.AgentResourceKind.da ? dataplane.queueDiscovery = queue : dataplane.queueTrafficCollection = queue : null;
   config ? null : config = {
-    owningTeam: owningTeam
+    owningTeam: owningTeam,
+    filter: dataPlaneType === _types.DataPlaneNames.AWS || _types.DataPlaneNames.AZURE ? filterDA : ''
   };
   const result = await client.createResource({
     // @ts-ignore payload

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "3.6.0",
+	"version": "3.7.0-rc.0",
 	"description": "Manage APIs, services and publish to the Amplify Marketplace",
 	"homepage": "https://platform.axway.com",
 	"author": {