@axway/axway-central-cli 4.6.0 → 4.7.0

package/dist/commands/install/agents.js

@@ -242,7 +242,7 @@ const agents = exports.agents = {
       process.exit(0);
     }
   },
-  desc: 'Amplify API Gateway / Amazon API Gateway / Azure API Gateway / Istio / Apigee X Gateway / GitHub / GitLab / Kafka / SwaggerHub/ Software AG WebMethods',
+  desc: 'Amplify API Gateway / Apigee X Gateway / Amazon API Gateway / Azure API Gateway / Azure EventHub / Backstage / GitLab / Istio / Kafka /' + ' Graylog / IBM API Connect / SwaggerHub / Software AG WebMethods / Traceable / SAP API Portal / Sensedia / WSO2',
   options: {
     ..._types.commonCmdArgsDescription
   }
@@ -275,7 +275,7 @@ function checkUserRole(isCentralAdmin, isPlatformAdmin, accountInfo, render) {
     process.exit(1);
   }
 }
-const validateFrequency = () => input => {
+const validateFrequency = lowerLimit => input => {
   let val = (0, _basicPrompts.validateRegex)(helpers.frequencyRegex, helpers.invalidValueExampleErrMsg('frequency', '3d5h12m'))(input);
   if (typeof val === 'string') {
     return val;
@@ -284,8 +284,10 @@ const validateFrequency = () => input => {
   if (r) {
     // only minutes
     let mins = r[1];
-    if (parseInt(mins, 10) < 30) {
-      return 'Minimum frequency is 30m';
+    const minValue = parseInt(mins, 10);
+    const minimumRequired = lowerLimit !== null && lowerLimit !== void 0 ? lowerLimit : 30; // Use provided lowerLimit or default to 30
+    if (minValue < minimumRequired) {
+      return `Minimum frequency is ${minimumRequired}m`;
     }
   }
   return true;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceRegex = exports.namespaceRegex = exports.maskingRegex = exports.keyFromKeyValuePairRegex = exports.invalidResourceMsg = exports.invalidNamespace = exports.invalidDosaName = exports.invalidDomainName = exports.frequencyRegex = exports.dosaRegex = exports.domainNameRegex = exports.WSO2RegexPatterns = exports.KafkaRegexPatterns = exports.GitLabRegexPatterns = exports.GitHubRegexPatterns = exports.AzureRegexPatterns = exports.AWSRegexPatterns = exports.APIGEEXRegexPatterns = void 0;
+exports.resourceRegex = exports.namespaceRegex = exports.maskingRegex = exports.keyFromKeyValuePairRegex = exports.invalidResourceMsg = exports.invalidNamespace = exports.invalidDosaName = exports.invalidDomainName = exports.frequencyRegex = exports.dosaRegex = exports.domainNameRegex = exports.WSO2RegexPatterns = exports.SensediaRegexPatterns = exports.KafkaRegexPatterns = exports.GitLabRegexPatterns = exports.GitHubRegexPatterns = exports.AzureRegexPatterns = exports.AWSRegexPatterns = exports.APIGEEXRegexPatterns = void 0;
 const resourceRegex = exports.resourceRegex = '^(?:[a-z0-9]*(?:\\.(?=[a-z0-9])|-+(?=[a-z0-9]))?)+[a-z0-9]$';
 const namespaceRegex = exports.namespaceRegex = '^[a-z0-9]?(?:[-a-z0-9]*[a-z0-9]){1,100}?$';
 const domainNameRegex = exports.domainNameRegex = '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\\.)+([A-Za-z]){2,}$';
@@ -64,4 +64,9 @@ const KafkaRegexPatterns = exports.KafkaRegexPatterns = {
 };
 const WSO2RegexPatterns = exports.WSO2RegexPatterns = {
   wso2BaseURLRegex: '^(http:\/\/|https:\/\/)[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$'
+};
+const SensediaRegexPatterns = exports.SensediaRegexPatterns = {
+  noCommaRegex: '^[^,]+$',
+  emailRegex: '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$',
+  urlRegex: '^(http:\/\/|https:\/\/)[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$'
 };

package/dist/commands/install/sensediaAgents.js

@@ -37,8 +37,9 @@ const SensediaPrompts = {
   enterClientId: 'Enter the Sensedia Client ID',
   enterClientSecret: 'Enter the Sensedia Client Secret',
   enterDeveloperEmail: 'Enter the Developer Email',
-  enterEnvironments: 'Enter the environments used to discover APIs and for reporting transactions ?',
-  enterMoreEnvironments: 'Do you want to add another environment?'
+  enterEnvironments: 'Do you want to configure specific environments for discovery and reporting? If no value is provided, discovery occurs on all the environments',
+  enterMoreEnvironments: 'Enter an environment name (or press Enter to finish)',
+  invalidEnvironmentMessage: 'Commas are not allowed in the name due to the way the agent parses the environments list. Make sure you input one environment name at a time'
 };
 const askBundleType = async gateway => {
   console.log(gateway);
@@ -61,7 +62,8 @@ const askConfigType = async () => {
 //
 exports.askConfigType = askConfigType;
 const askSensediaBaseUrl = async () => await (0, _basicPrompts.askInput)({
-  msg: SensediaPrompts.enterBaseUrl
+  msg: SensediaPrompts.enterBaseUrl,
+  validate: (0, _basicPrompts.validateRegex)(helpers.SensediaRegexPatterns.urlRegex, helpers.invalidValueExampleErrMsg('baseURL', 'https://sensedia.com'))
 });
 const askSensediaClientId = async () => await (0, _basicPrompts.askInput)({
   msg: SensediaPrompts.enterClientId
@@ -70,24 +72,27 @@ const askSensediaClientSecret = async () => await (0, _basicPrompts.askInput)({
   msg: SensediaPrompts.enterClientSecret
 });
 const askSensediaDeveloperEmail = async () => await (0, _basicPrompts.askInput)({
-  msg: SensediaPrompts.enterDeveloperEmail
+  msg: SensediaPrompts.enterDeveloperEmail,
+  validate: (0, _basicPrompts.validateRegex)(helpers.SensediaRegexPatterns.emailRegex, helpers.invalidValueExampleErrMsg('DeveloperEmail', 'dev@gmail.com'))
 });
 const askSensediaEnvironments = async () => {
   let environments = [];
-  let askMoreEnvironments = true;
-  while (askMoreEnvironments) {
+  let addEnvironments = (await (0, _basicPrompts.askList)({
+    msg: SensediaPrompts.enterEnvironments,
+    default: _types.YesNo.No,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+  while (addEnvironments) {
     const env = await (0, _basicPrompts.askInput)({
-      msg: SensediaPrompts.enterEnvironments,
+      msg: SensediaPrompts.enterMoreEnvironments,
+      validate: (0, _basicPrompts.validateRegex)(helpers.SensediaRegexPatterns.noCommaRegex, SensediaPrompts.invalidEnvironmentMessage),
       allowEmptyInput: true
     });
     if (env && env.trim() !== '') {
       environments.push(env);
+    } else {
+      return environments;
     }
-    askMoreEnvironments = (await (0, _basicPrompts.askList)({
-      msg: SensediaPrompts.enterMoreEnvironments,
-      default: _types.YesNo.No,
-      choices: _types.YesNoChoices
-    })) === _types.YesNo.Yes;
   }
   return environments;
 };
@@ -160,7 +165,7 @@ async function askDiscoveryPrompts(sensediaAgentValues) {
   sensediaAgentValues.developerEmail = await askSensediaDeveloperEmail();
 
   // Sensedia Environments
-  sensediaAgentValues.environments = await askSensediaEnvironments();
+  sensediaAgentValues.environments = [...new Set(await askSensediaEnvironments())];
 }
 const completeInstall = async installConfig => {
   /**

package/package.json

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