@axway/axway-central-cli 2.15.1 → 2.16.0

package/da.yaml

@@ -0,0 +1,47 @@
+
+---
+group: management
+apiVersion: v1alpha1
+kind: DiscoveryAgent
+name: aws-discovery-agent
+title: AWS Discovery Agent
+metadata:
+  id: 8ac989a48947da6401894b06933a0008
+  audit:
+    createTimestamp: 2023-07-12T16:54:29.434+0000
+    createUserId: 821ba748-459f-45b0-ab87-82d11052975a
+    modifyTimestamp: 2023-07-12T16:54:30.276+0000
+  scope:
+    id: 8ac989a48947da6401894b068b940000
+    kind: Environment
+    name: aws-cli
+    title: aws-cli
+    selfLink: /management/v1alpha1/environments/aws-cli
+  acl: []
+  accessRights:
+    canChangeOwner: true
+    canDelete: true
+    canWrite: true
+    canRead: true
+  resourceVersion: '3'
+  references:
+    - id: 8ac989a48947da6401894b068d870002
+      kind: Dataplane
+      name: aws-dataplane
+      scopeKind: Environment
+      scopeName: aws-cli
+      selfLink: /management/v1alpha1/environments/aws-cli/dataplanes/aws-dataplane
+      type: soft
+      group: management
+  selfLink: >-
+    /management/v1alpha1/environments/aws-cli/discoveryagents/aws-discovery-agent
+attributes: {}
+finalizers: []
+tags: []
+spec:
+  config:
+    owningTeam: Default Team
+  dataplaneType: AWS
+dataplane:
+  name: aws-dataplane
+  queueDiscovery: true

package/dist/commands/install/agents.js

@@ -37,7 +37,7 @@ var helpers = _interopRequireWildcard(require("./helpers"));
 
 var istioAgents = _interopRequireWildcard(require("./istioAgents"));
 
-var saasAgents = _interopRequireWildcard(require("./saasAgents"));
+var saasAgents = _interopRequireWildcard(require("./awsSaasAgents"));
 
 var platform = _interopRequireWildcard(require("./platform"));
 

package/dist/commands/install/{saasAgents.js → awsSaasAgents.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testables = exports.AWSSaaSInstallMethods = void 0;
+exports.testables = exports.askBundleType = exports.AWSSaaSInstallMethods = void 0;
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
@@ -13,6 +13,8 @@ var _basicPrompts = require("../../common/basicPrompts");
 
 var _types = require("../../common/types");
 
+var _utils = require("../../common/utils");
+
 var helpers = _interopRequireWildcard(require("./helpers"));
 
 var _crypto = _interopRequireDefault(require("crypto"));
@@ -29,16 +31,105 @@ const {
   log
 } = (0, _snooplogg.default)('central: install: agents: saas');
 
+class DataplaneConfig {
+  constructor(type) {
+    _defineProperty(this, "type", void 0);
+
+    this.type = type || "";
+  }
+
+}
+
+class AWSDataplaneConfig extends DataplaneConfig {
+  constructor(arn) {
+    super("AWS");
+
+    _defineProperty(this, "accessLogARN", void 0);
+
+    this.accessLogARN = arn;
+  }
+
+}
+
+class Sampling {
+  constructor() {
+    _defineProperty(this, "percentage", void 0);
+
+    _defineProperty(this, "allErrors", void 0);
+
+    this.percentage = 10;
+    this.allErrors = true;
+  }
+
+}
+
+class Sanitize {
+  constructor(k, m) {
+    _defineProperty(this, "keyMatch", void 0);
+
+    _defineProperty(this, "valMatch", void 0);
+
+    this.keyMatch = k;
+    this.valMatch = m;
+  }
+
+}
+
+class RedactionSet {
+  constructor() {
+    _defineProperty(this, "show", void 0);
+
+    _defineProperty(this, "sanitize", void 0);
+
+    this.show = [];
+    this.sanitize = [];
+  }
+
+}
+
+class Redaction {
+  constructor() {
+    _defineProperty(this, "maskingCharacter", void 0);
+
+    _defineProperty(this, "path", void 0);
+
+    _defineProperty(this, "queryArgument", void 0);
+
+    _defineProperty(this, "requestHeaders", void 0);
+
+    _defineProperty(this, "responseHeaders", void 0);
+
+    this.maskingCharacter = "{*}";
+    this.path = [];
+    this.queryArgument = new RedactionSet();
+    this.requestHeaders = new RedactionSet();
+    this.responseHeaders = new RedactionSet();
+  }
+
+}
+
 class SaasAgentValues {
   constructor() {
-    _defineProperty(this, "frequency", void 0);
+    _defineProperty(this, "frequencyDA", void 0);
 
-    _defineProperty(this, "queue", void 0);
+    _defineProperty(this, "queueDA", void 0);
+
+    _defineProperty(this, "frequencyTA", void 0);
+
+    _defineProperty(this, "sampling", void 0);
+
+    _defineProperty(this, "redaction", void 0);
+
+    _defineProperty(this, "dataplaneConfig", void 0);
 
     _defineProperty(this, "centralConfig", void 0);
 
-    this.frequency = '';
-    this.queue = false;
+    this.frequencyDA = '';
+    this.queueDA = false;
+    this.frequencyTA = '';
+    this.sampling = new Sampling();
+    this.redaction = new Redaction();
+    this.dataplaneConfig = new DataplaneConfig();
     this.centralConfig = new _types.CentralAgentConfig();
   }
 
@@ -64,12 +155,15 @@ class SaasAWSAgentValues extends SaasAgentValues {
 
     _defineProperty(this, "externalID", void 0);
 
+    _defineProperty(this, "accessLogARN", void 0);
+
     this.authType = AWSAuthType.ASSUME;
     this.accessKey = '';
     this.secretKey = '';
     this.region = '';
     this.assumeRole = '';
     this.externalID = '';
+    this.accessLogARN = '';
   }
 
   getAccessData() {
@@ -108,14 +202,29 @@ const SaasPrompts = {
   SECRET_KEY: 'Enter the AWS Secret Access Key the agent will use',
   ASSUME_ROLE: 'Enter the Role ARN that the agent will Assume',
   EXTERNAL_ID: 'Enter the External ID the Assume Role expects',
-  FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
-  QUEUE: 'Do you want to discover immediately after installation'
+  ACCESS_LOG_ARN: 'Enter the ARN for the Access Log that the Discovery will add and the Traceability will use',
+  DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
+  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',
+  SAMP_ALL_ERRS: 'Do you want to see all errors regardless of sampling',
+  REDACT_SHOW: 'Enter a regular expression for {0}s that may be shown',
+  ENTER_SANITIZE_RULE: 'Do you want to add sanitization rules for {0}s',
+  SANITIZE_KEY: 'Enter a regular expression for {0} keys that values should be sanitized',
+  SANITIZE_VAL: 'Enter a regular expression for sanitization of values when matching a {0} key',
+  MASKING_CHARS: 'Enter the characters to use when sanitizing a value',
+  ENTER_MORE: 'Do you want to enter another {0} for {1}'
 };
 
 const askBundleType = async () => {
-  return _types.BundleType.DISCOVERY;
+  return await (0, _basicPrompts.askList)({
+    msg: helpers.agentMessages.selectAgentType,
+    choices: [_types.BundleType.ALL_AGENTS, _types.BundleType.DISCOVERY]
+  });
 };
 
+exports.askBundleType = askBundleType;
+
 const askConfigType = async () => {
   return _types.AgentConfigTypes.HOSTED;
 }; //
@@ -123,6 +232,110 @@ const askConfigType = async () => {
 //
 
 
+const askForRedactionSet = async (setting, redactionSet) => {
+  // ask for path reg exs
+  let askShow = true;
+  console.log(_chalk.default.gray((0, _utils.FormatString)("\nRedaction settings for {0}s", setting)));
+
+  while (askShow) {
+    const input = await (0, _basicPrompts.askInput)({
+      msg: (0, _utils.FormatString)(SaasPrompts.REDACT_SHOW, setting),
+      defaultValue: ".*",
+      validate: (0, _basicPrompts.validateValidRegex)()
+    });
+    redactionSet.show.push(input);
+    askShow = (await (0, _basicPrompts.askList)({
+      msg: (0, _utils.FormatString)(SaasPrompts.ENTER_MORE, "redaction regular expression", setting),
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+  }
+
+  console.log(_chalk.default.gray((0, _utils.FormatString)("Sanitization settings for {0}s", setting)));
+  let askSanitize = (await (0, _basicPrompts.askList)({
+    msg: (0, _utils.FormatString)(SaasPrompts.ENTER_SANITIZE_RULE, setting),
+    default: _types.YesNo.No,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+  console.log(_chalk.default.gray("When a match for the key regular expression is found, a match\nfor the value regular expression will be replaced by the masking character(s)"));
+
+  while (askSanitize) {
+    const keyMatch = await (0, _basicPrompts.askInput)({
+      msg: (0, _utils.FormatString)(SaasPrompts.SANITIZE_KEY, setting),
+      allowEmptyInput: true,
+      validate: (0, _basicPrompts.validateValidRegex)()
+    });
+    const valMatch = await (0, _basicPrompts.askInput)({
+      msg: (0, _utils.FormatString)(SaasPrompts.SANITIZE_VAL, setting),
+      allowEmptyInput: true,
+      validate: (0, _basicPrompts.validateValidRegex)()
+    });
+
+    if (keyMatch === "" || valMatch === "") {
+      console.log("can't add sanitization rule with an empty key or value regular expression");
+    } else {
+      redactionSet.sanitize.push(new Sanitize(keyMatch, valMatch));
+    }
+
+    askSanitize = (await (0, _basicPrompts.askList)({
+      msg: (0, _utils.FormatString)(SaasPrompts.ENTER_MORE, "sanitization rule", setting),
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+  }
+
+  return redactionSet;
+};
+
+const askForRedaction = async hostedAgentValues => {
+  console.log(_chalk.default.gray("\nRedaction and Sanitization settings")); // ask for path reg exps
+
+  let askPaths = true;
+  console.log(_chalk.default.gray("\nRedaction settings for URL paths"));
+
+  while (askPaths) {
+    const input = await (0, _basicPrompts.askInput)({
+      msg: (0, _utils.FormatString)(SaasPrompts.REDACT_SHOW, "URL path"),
+      defaultValue: ".*",
+      validate: (0, _basicPrompts.validateValidRegex)()
+    });
+    hostedAgentValues.redaction.path.push(input);
+    askPaths = (await (0, _basicPrompts.askList)({
+      msg: (0, _utils.FormatString)(SaasPrompts.ENTER_MORE, "redaction regular expression", "URL path"),
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+  }
+
+  hostedAgentValues.redaction.queryArgument = await askForRedactionSet("query argument", hostedAgentValues.redaction.queryArgument);
+  hostedAgentValues.redaction.requestHeaders = await askForRedactionSet("request header", hostedAgentValues.redaction.requestHeaders);
+  hostedAgentValues.redaction.responseHeaders = await askForRedactionSet("response header", hostedAgentValues.redaction.responseHeaders);
+  hostedAgentValues.redaction.maskingCharacter = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.MASKING_CHARS,
+    defaultValue: "{*}",
+    validate: (0, _basicPrompts.validateRegex)(helpers.maskingRegex, "Please enter a valid value")
+  });
+  return hostedAgentValues;
+};
+
+const askForSampling = async hostedAgentValues => {
+  // ask sampling percentage
+  console.log(_chalk.default.gray("\nSampling settings"));
+  console.log(_chalk.default.gray("Sampling percentage can be a value from 0 to 50"));
+  hostedAgentValues.sampling.percentage = await (0, _basicPrompts.askInput)({
+    type: "number",
+    msg: SaasPrompts.SAMP_PERCENTAGE,
+    defaultValue: 10,
+    validate: (0, _basicPrompts.validateValueRange)(0, 50)
+  }); // ask sampling all errorsSN
+
+  hostedAgentValues.sampling.allErrors = (await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.SAMP_ALL_ERRS,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+  return hostedAgentValues;
+};
+
 const askForAWSCredentials = async hostedAgentValues => {
   hostedAgentValues.region = await helpers.askAWSRegion();
   log("gathering access details for aws"); // Ask Auth type
@@ -197,7 +410,7 @@ const validateFrequency = () => input => {
 
 const gatewayConnectivity = async installConfig => {
   console.log('\nCONNECTION TO AMAZON API GATEWAY:');
-  console.log(_chalk.default.gray(`The Discovery Agent needs to connect to the AWS API Gateway to discover API's for publishing to Amplify Central`)); // DeploymentType
+  console.log(_chalk.default.gray("The Discovery Agent needs to connect to the AWS API Gateway to discover API's for publishing to Amplify Central")); // DeploymentType
 
   let hostedAgentValues = new SaasAgentValues();
 
@@ -205,21 +418,42 @@ const gatewayConnectivity = async installConfig => {
     // AWS connection details
     hostedAgentValues = new SaasAWSAgentValues();
     hostedAgentValues = await askForAWSCredentials(hostedAgentValues);
+
+    if (installConfig.switches.isTaEnabled) {
+      console.log(_chalk.default.gray("\nThe access log ARN is a cloud watch log group amazon resource name"));
+      hostedAgentValues.accessLogARN = await (0, _basicPrompts.askInput)({
+        msg: SaasPrompts.ACCESS_LOG_ARN,
+        validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_ACCESS_LOG_ARN, helpers.invalidValueExampleErrMsg('access log arn', 'arn:aws:logs:region:000000000000:log-group:log-group-name'))
+      });
+    }
   } // Ask to queue discovery now
 
 
   log("getting the frequency and if the agent should run now");
-  console.log(_chalk.default.gray(`00d00h00m format, where 30m = 30 minutes, 1h = 1 hour, 7d = 7 days, and 7d1h30m = 7 days 1 hour and 30 minutes. Minimum of 30m.`));
-  hostedAgentValues.frequency = await (0, _basicPrompts.askInput)({
-    msg: SaasPrompts.FREQUENCY,
+  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.frequencyDA = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.DA_FREQUENCY,
     validate: validateFrequency(),
     allowEmptyInput: true
   });
-  hostedAgentValues.queue = (await (0, _basicPrompts.askList)({
+  hostedAgentValues.queueDA = (await (0, _basicPrompts.askList)({
     msg: SaasPrompts.QUEUE,
     default: _types.YesNo.No,
     choices: _types.YesNoChoices
   })) === _types.YesNo.Yes;
+
+  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)({
+      msg: SaasPrompts.TA_FREQUENCY,
+      defaultValue: "30m",
+      validate: validateFrequency(),
+      allowEmptyInput: true
+    });
+    hostedAgentValues = await askForSampling(hostedAgentValues);
+    hostedAgentValues = await askForRedaction(hostedAgentValues);
+  }
+
   return hostedAgentValues;
 };
 
@@ -251,14 +485,20 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   /**
    * Create agent resources
    */
+  console.log("\n");
   let awsAgentValues = installConfig.gatewayConfig; // create the environment, if necessary
 
   installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', {
     axwayManaged: installConfig.centralConfig.axwayManaged,
     production: installConfig.centralConfig.production
-  }) : installConfig.centralConfig.ampcEnvInfo.name; // create the data plane resource
+  }) : installConfig.centralConfig.ampcEnvInfo.name;
+
+  if (installConfig.gatewayType === _types.GatewayTypes.AWS_GATEWAY) {
+    awsAgentValues.dataplaneConfig = new AWSDataplaneConfig(awsAgentValues.accessLogARN);
+  } // create the data plane resource
+
 
-  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType]); // create data plane secret resource
+  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], awsAgentValues.dataplaneConfig); // create data plane secret resource
 
   try {
     await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], dataplaneRes.name, await createEncryptedAccessData(awsAgentValues, dataplaneRes));
@@ -275,7 +515,17 @@ 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.frequency, awsAgentValues.queue);
+  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);
+
+  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, // AWS TA is never triggered at install, as DA has to run prior
+    {
+      sampling: awsAgentValues.sampling,
+      redaction: awsAgentValues.redaction
+    });
+  }
+
   console.log(await generateOutput(installConfig));
 };
 

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

@@ -108,7 +108,7 @@ const createByResourceType = async (client, defsManager, name, resourceType, res
 
 exports.createByResourceType = createByResourceType;
 
-const createNewAgentResource = async (client, defsManager, envName, dataPlaneType, agentResource, agentType, owningTeam, agentName, dataPlaneName, frequency, queue) => {
+const createNewAgentResource = async (client, defsManager, envName, dataPlaneType, agentResource, agentType, owningTeam, agentName, dataPlaneName, frequency, queue, config) => {
   console.log(`Creating a new ${agentResource}, with data plane type: ${dataPlaneType}.`); // NOTE: only a first found set is used
 
   const defs = defsManager.findDefsByWord(agentType);
@@ -126,23 +126,18 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
     withSubResources = true;
   }
 
-  if (frequency) {
-    dataplane.frequency = frequency;
-  }
-
-  if (queue) {
-    dataplane.queueDiscovery = queue;
-  }
-
+  frequency ? dataplane.frequency = frequency : null;
+  queue ? agentResource === _types.AgentResourceKind.da ? dataplane.queueDiscovery = queue : dataplane.queueTrafficCollection = queue : null;
+  config ? null : config = {
+    owningTeam: owningTeam
+  };
   const result = await client.createResource({
     // @ts-ignore payload
     resource: {
       title: agentName,
       spec: {
         dataplaneType: dataPlaneType,
-        config: {
-          owningTeam: owningTeam
-        }
+        config: config
       },
       dataplane: dataplane
     },
@@ -179,7 +174,7 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
 
 exports.createNewAgentResource = createNewAgentResource;
 
-const createNewDataPlaneResource = async (client, defsManager, envName, dataPlaneType) => {
+const createNewDataPlaneResource = async (client, defsManager, envName, dataPlaneType, config) => {
   console.log(`Creating a new Dataplane resource, with type: ${dataPlaneType}.`); // NOTE: only a first found set is used
 
   const defs = defsManager.findDefsByWord("dp");
@@ -193,7 +188,8 @@ const createNewDataPlaneResource = async (client, defsManager, envName, dataPlan
     resource: {
       title: dataPlaneType + " Dataplane",
       spec: {
-        type: dataPlaneType
+        type: dataPlaneType,
+        config: config
       }
     },
     resourceDef: defs[0].resource,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceRegex = exports.percentageRegex = exports.namespaceRegex = exports.invalidResourceMsg = exports.invalidPercentage = exports.invalidNamespace = exports.invalidDosaName = exports.invalidDomainName = exports.frequencyRegex = exports.dosaRegex = exports.domainNameRegex = exports.AzureRegexPatterns = exports.AWSRegexPatterns = void 0;
+exports.resourceRegex = exports.percentageRegex = exports.namespaceRegex = exports.maskingRegex = exports.invalidResourceMsg = exports.invalidPercentage = exports.invalidNamespace = exports.invalidDosaName = exports.invalidDomainName = exports.frequencyRegex = exports.dosaRegex = exports.domainNameRegex = exports.AzureRegexPatterns = exports.AWSRegexPatterns = void 0;
 const resourceRegex = '^(?:[a-z0-9]*(?:\\.(?=[a-z0-9])|-+(?=[a-z0-9]))?)+[a-z0-9]$';
 exports.resourceRegex = resourceRegex;
 const namespaceRegex = '^[a-z0-9]?(?:[-a-z0-9]*[a-z0-9]){1,100}?$';
@@ -16,6 +16,8 @@ const percentageRegex = '^[1-9][0-9]?$|^100$';
 exports.percentageRegex = percentageRegex;
 const frequencyRegex = '^(\\d*[d])?(\\d*[h])?(\\d*[m])?$|^$';
 exports.frequencyRegex = frequencyRegex;
+const maskingRegex = '^[a-zA-Z0-9-*#^~.{}]{0,5}$';
+exports.maskingRegex = maskingRegex;
 const invalidPercentage = 'Percentage must be an integer between 1-100';
 exports.invalidPercentage = invalidPercentage;
 const invalidDosaName = 'Account name can contain A-z 0-9 _ - ( ) [ ] and can include 1-100 characters.';
@@ -39,8 +41,9 @@ const AWSRegexPatterns = {
   AWS_REGEXP_SUBNET: '^subnet-[0-9a-z]*$|^$',
   AWS_REGEXP_SSH_LOCATION: '^\\d{1,3}(\\.\\d{1,3}){3}\\/\\d{1,2}$',
   AWS_REGEXP_ACCESS_KEY_ID: '((?:ASIA|AKIA|AROA|AIDA)([A-Z0-7]{16}))',
-  AWS_REGEXP_SECRET_ACCESS_KEY: '([a-zA-Z0-9+/]{40})',
-  AWS_REGEXP_ROLE_ARN: '^arn:(aws[a-zA-Z-]*)?:iam::\\d{12}:role\\/?[a-zA-Z_0-9+=,.@\\-_\\/]{1,128}$'
+  AWS_REGEXP_SECRET_ACCESS_KEY: '[a-zA-Z0-9+/]{40}',
+  AWS_REGEXP_ROLE_ARN: '^arn:aws[a-zA-Z-]*:iam::\\d{12}:role\\/?[a-zA-Z0-9+=,.@\\-_\\/]{1,128}$',
+  AWS_ACCESS_LOG_ARN: '^arn:aws[a-zA-Z-]*:logs:[a-zA-Z0-9\-]*:\\d{12}:log-group:[a-zA-Z0-9_\\-\\/\\.#]{1,512}$'
 }; // AzureRegexPatterns - regex patters to validate user inputs
 
 exports.AWSRegexPatterns = AWSRegexPatterns;

package/dist/commands/install/platform.js

@@ -122,7 +122,7 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
 
   centralConfig.taAgentName = '';
 
-  if (installConfig.switches.isTaEnabled) {
+  if (installConfig.switches.isTaEnabled && !installConfig.switches.isHostedInstall) {
     centralConfig.taAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.ta, centralConfig.ampcEnvInfo.name);
   }
 

package/dist/common/basicPrompts.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateRegex = exports.validateNonEmptyInput = exports.validateInputIsNew = exports.runValidations = exports.filterEmptyNumberInput = exports.askUsernameAndPassword = exports.askList = exports.askInputValidation = exports.askInput = void 0;
+exports.validateValueRange = exports.validateValidRegex = exports.validateRegex = exports.validateNonEmptyInput = exports.validateInputIsNew = exports.runValidations = exports.filterEmptyNumberInput = exports.askUsernameAndPassword = exports.askList = exports.askInputValidation = exports.askInput = void 0;
 
 var _inquirer = _interopRequireDefault(require("inquirer"));
 
@@ -32,13 +32,55 @@ const validateRegex = (regexp, message) => input => {
 
 exports.validateRegex = validateRegex;
 
+const validateValidRegex = () => input => {
+  try {
+    new RegExp(input.toString());
+  } catch (error) {
+    return 'Please provide a valid regular expression.';
+  }
+
+  return true;
+};
+
+exports.validateValidRegex = validateValidRegex;
+
 const validateInputIsNew = (options, error) => input => {
   const isFound = options.find(opt => opt === input);
   return isFound ? error : true;
+};
+
+exports.validateInputIsNew = validateInputIsNew;
+
+const validateValueRange = (lowerLimit, upperLimit) => input => {
+  const inputNum = Number(input);
+
+  if (isNaN(inputNum)) {
+    return 'Please provide a number.';
+  }
+
+  let msg = "";
+
+  if (typeof lowerLimit !== undefined && typeof upperLimit !== undefined) {
+    msg = `Please provide a number from ${lowerLimit} to ${upperLimit}`;
+  } else if (typeof lowerLimit !== undefined) {
+    msg = `Please provide a minimum number of ${lowerLimit}`;
+  } else if (typeof upperLimit !== undefined) {
+    msg = `Please provide a maximum number of ${upperLimit}`;
+  }
+
+  if (typeof lowerLimit !== undefined && inputNum < lowerLimit) {
+    return msg;
+  }
+
+  if (typeof upperLimit !== undefined && inputNum > upperLimit) {
+    return msg;
+  }
+
+  return true;
 }; // exporting for test
 
 
-exports.validateInputIsNew = validateInputIsNew;
+exports.validateValueRange = validateValueRange;
 
 const validateNonEmptyInput = input => {
   return String(input).length ? true : 'Please provide a non-empty value.';

package/dist/common/utils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.FormatString = FormatString;
 exports.parseScopeParam = exports.loadAndVerifySpecs = exports.isWindows = exports.isValidJson = exports.isApiServerErrorType = exports.isApiServerErrorResponseType = exports.hbsCompare = exports.getConfig = exports.configFile = exports.compareResourcesByKindDesc = exports.compareResourcesByKindAsc = exports.buildTemplate = exports.buildGenericResource = void 0;
 exports.sanitizeMetadata = sanitizeMetadata;
 exports.writeToFile = exports.writeTemplates = exports.verifyScopeParam = exports.verifyFile = exports.transformSimpleFilters = void 0;
@@ -403,4 +404,12 @@ const transformSimpleFilters = (title, attribute, tag) => {
   return transformedFilter;
 };
 
-exports.transformSimpleFilters = transformSimpleFilters;
+exports.transformSimpleFilters = transformSimpleFilters;
+
+function FormatString(str, ...val) {
+  for (let index = 0; index < val.length; index++) {
+    str = str.replace(`{${index}}`, val[index]);
+  }
+
+  return str;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.15.1",
+	"version": "2.16.0",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {