@axway/axway-central-cli 3.10.0-rc.1 → 3.10.0-rc.3

package/dist/commands/install/agents.js

@@ -15,6 +15,7 @@ var _CliConfigManager = require("../../common/CliConfigManager");
 var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 var _types = require("../../common/types");
 var _utils = require("../../common/utils");
+var apigeeXAgents = _interopRequireWildcard(require("./apigeexAgents"));
 var awsAgents = _interopRequireWildcard(require("./awsAgents"));
 var awsSaaSAgents = _interopRequireWildcard(require("./awsSaasAgents"));
 var gitHubAgents = _interopRequireWildcard(require("./gitHubSaasAgents"));
@@ -48,6 +49,7 @@ const agentInstallFlows = {
   [_types.GatewayTypes.EDGE_GATEWAY]: edgeAgents.EdgeInstallMethods,
   [_types.GatewayTypes.EDGE_GATEWAY_ONLY]: edgeAgents.EdgeGWOnlyInstallMethods,
   [_types.GatewayTypes.AWS_GATEWAY]: awsAgents.AWSInstallMethods,
+  [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeXAgents.ApigeeXInstallMethods,
   [_types.GatewayTypes.GITLAB]: gitLabAgents.GitLabInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.AZURE_EVENTHUB]: azureAgents.AzureInstallMethods,
@@ -134,7 +136,7 @@ const agents = exports.agents = {
       installConfig.centralConfig.singleEntryPointUrl = _types.SingleEntryPointUrls[installConfig.centralConfig.region];
       let gatewayTypeChoices = [];
       Object.values(_types.GatewayTypes).forEach(v => gatewayTypeChoices.push(v));
-      Object.values(_types.SaaSGatewayTypes).filter(v => v !== _types.SaaSGatewayTypes.AWS_GATEWAY).forEach(v => gatewayTypeChoices.push(v));
+      Object.values(_types.SaaSGatewayTypes).filter(v => v !== _types.SaaSGatewayTypes.AWS_GATEWAY && v !== _types.SaaSGatewayTypes.APIGEEX_GATEWAY).forEach(v => gatewayTypeChoices.push(v));
       let gatewayChoices = gatewayTypeChoices.sort().filter(v => v !== _types.GatewayTypes.EDGE_GATEWAY_ONLY);
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,
@@ -142,7 +144,7 @@ const agents = exports.agents = {
       });
 
       // if this check gets bigger, may think about an array of agents that can be both ground and embedded until ground agents become obsolete
-      if (gatewayType === _types.GatewayTypes.AWS_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_EVENTHUB) {
+      if (gatewayType === _types.GatewayTypes.AWS_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_EVENTHUB || gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
         // hosted vs on premise
         installConfig.switches.isHostedInstall = (await (0, _basicPrompts.askList)({
           msg: prompts.hostedAgentOption,
@@ -150,7 +152,7 @@ const agents = exports.agents = {
           default: _types.YesNo.Yes
         })) === _types.YesNo.Yes;
       }
-      if (gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.SaaSGatewayTypes.GITHUB || gatewayType === _types.SaaSGatewayTypes.SWAGGERHUB) {
+      if (gatewayType === _types.SaaSGatewayTypes.GITHUB || gatewayType === _types.SaaSGatewayTypes.SWAGGERHUB) {
         installConfig.switches.isHostedInstall = true;
       }
 

package/dist/commands/install/apigeexAgents.js

@@ -0,0 +1,224 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testables = exports.gatewayConnectivity = exports.defaultLogFiles = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.ConfigFiles = exports.ApigeeXInstallMethods = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _snooplogg = _interopRequireDefault(require("snooplogg"));
+var _basicPrompts = require("../../common/basicPrompts");
+var _types = require("../../common/types");
+var _utils = require("../../common/utils");
+var helpers = _interopRequireWildcard(require("./helpers"));
+var _apigeexTemplates = require("./helpers/templates/apigeexTemplates");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// @ts-ignore
+const {
+  log
+} = (0, _snooplogg.default)('central: install: agents: apigeeX');
+const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.APIGEEX_DA}`;
+const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.APIGEEX_TA}`;
+const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
+
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = exports.ConfigFiles = {
+  DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
+  TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
+  ApigeeXDABinaryFile: 'discovery_agent',
+  ApigeeXDAYaml: 'discovery_agent.yml',
+  ApigeeXTABinaryFile: 'traceability_agent',
+  ApigeeXTAYaml: 'traceability_agent.yml'
+};
+
+// ApigeeXPrompts - prompts for user inputs
+const ApigeeXPrompts = {
+  AUTHENTICATION_TYPE: 'Authenticate with an Impersonation of a Service Account or by providing a Credential File',
+  PROJECT_ID: 'Enter the APIGEE X Project ID the agent will use',
+  DEVELOPER_EMAIL_ADDRESS: 'Enter the APIGEE X Developer Email Address the agent will use',
+  AUTH_FILE_NAME: 'Enter the GCP key file name (place in the same directory as your Axway public and private keys)',
+  UPLOAD_CREDENTIAL_FILE: 'Upload a JSON Credential file to be used for APIGEE X Authentication',
+  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',
+  ENTER_MORE: 'Do you want to enter another {0} for {1}',
+  FILTER_METRICS: 'Do you want metrics filtering?',
+  FILTERED_APIS: 'Enter APIs to filter metrics for',
+  ENTER_MORE_APIS: 'Do you want to add another API?',
+  ENVIRONMENT: 'Enter the Apigee Envirnoment to filter discovered APIs/metrics'
+};
+const askBundleType = async gateway => {
+  console.log(gateway);
+  if (gateway === _types.GatewayTypes.APIGEEX_GATEWAY) {
+    return await (0, _basicPrompts.askList)({
+      msg: helpers.agentMessages.selectAgentType,
+      choices: [_types.BundleType.ALL_AGENTS, _types.BundleType.DISCOVERY]
+    });
+  } else {
+    return _types.BundleType.DISCOVERY;
+  }
+};
+exports.askBundleType = askBundleType;
+const askConfigType = async () => {
+  return _types.AgentConfigTypes.DOCKERIZED;
+};
+
+//
+// Questions for the configuration of Apigee X agents
+//
+exports.askConfigType = askConfigType;
+const askApigeeXProjectId = async () => await (0, _basicPrompts.askInput)({
+  msg: ApigeeXPrompts.PROJECT_ID,
+  validate: (0, _basicPrompts.validateRegex)(helpers.APIGEEXRegexPatterns.APIGEEX_REGEXP_PROJECT_ID, helpers.invalidValueExampleErrMsg('Project ID', 'rd-amplify-apigee-x'))
+});
+const askApigeeXDeveloperEmailAddress = async () => await (0, _basicPrompts.askInput)({
+  msg: ApigeeXPrompts.DEVELOPER_EMAIL_ADDRESS
+});
+const askApigeeXAuthFileName = async () => await (0, _basicPrompts.askInput)({
+  msg: ApigeeXPrompts.AUTH_FILE_NAME
+});
+const askApigeeXEnvironment = async () => await (0, _basicPrompts.askInput)({
+  msg: ApigeeXPrompts.ENVIRONMENT,
+  defaultValue: '',
+  allowEmptyInput: true
+});
+const askApigeeXMetricFilterConfig = async () => {
+  let filteredAPIs = [];
+  let filterMetricsEnabled = (await (0, _basicPrompts.askList)({
+    msg: ApigeeXPrompts.FILTER_METRICS,
+    default: _types.YesNo.No,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+  if (filterMetricsEnabled) {
+    let askFilteredAPIs = true;
+    console.log(_chalk.default.gray("An array of APIs to filter metrics for"));
+    while (askFilteredAPIs) {
+      const api = await (0, _basicPrompts.askInput)({
+        msg: ApigeeXPrompts.FILTERED_APIS,
+        allowEmptyInput: true
+      });
+      filteredAPIs.push(api);
+      askFilteredAPIs = (await (0, _basicPrompts.askList)({
+        msg: ApigeeXPrompts.ENTER_MORE_APIS,
+        default: _types.YesNo.No,
+        choices: _types.YesNoChoices
+      })) === _types.YesNo.Yes;
+    }
+  }
+  return new _types.ApigeeMetricsFilterConfig(filterMetricsEnabled, filteredAPIs);
+};
+const gatewayConnectivity = async installConfig => {
+  const apigeeXAgentValues = new _apigeexTemplates.ApigeeXAgentValues();
+  console.log('\nCONNECTION TO APIGEE X API GATEWAY:');
+  console.log(_chalk.default.gray(`The discovery agent needs to connect to the APIGEE X API Gateway to discover API's for publishing to Amplify.\n`));
+
+  // Apigee X Discovery Agent Prompts
+  if (installConfig.switches.isDaEnabled) {
+    console.log(_chalk.default.gray(`\nDiscovery Agent Configuration\n`));
+    await askDiscoveryPrompts(apigeeXAgentValues);
+  }
+
+  // Apigee X Traceability Agent Prompts
+  if (installConfig.switches.isTaEnabled) {
+    console.log(_chalk.default.gray(`\nTraceability Agent Configuration\n`));
+    await askTraceabilityPrompts(apigeeXAgentValues);
+  }
+  return apigeeXAgentValues;
+};
+exports.gatewayConnectivity = gatewayConnectivity;
+const generateSuccessHelpMsg = installConfig => {
+  if (installConfig.centralConfig.ampcDosaInfo.isNew && !installConfig.switches.isHelmInstall) {
+    console.log(_chalk.default.yellow('\nPlease make sure to copy the "private_key.pem" and "public_key.pem" files for the existing service account you selected.'));
+  }
+  dockerSuccessMsg(installConfig);
+  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.APIGEEX}`));
+};
+const dockerSuccessMsg = installConfig => {
+  let dockerInfo;
+  const runDaLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.DA_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
+  const runDaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.DA_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
+  const runTaLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.TA_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
+  const runTaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.TA_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
+  const startDaLinuxMsg = `\nStart the Discovery Agent on a Linux based machine`;
+  const startDaWinMsg = `\nStart the Discovery Agent on a Windows machine`;
+  const startTaLinuxMsg = `\nStart the Traceability Agent on a Linux based machine`;
+  const startTaWinMsg = `\nStart the Traceability Agent on a Windows machine`;
+  if (installConfig.switches.isDaEnabled && installConfig.switches.isTaEnabled) {
+    dockerInfo = `To utilize the agents, pull the latest Docker images and run them using the appropriate supplied environment files, (${helpers.configFiles.DA_ENV_VARS} & ${helpers.configFiles.TA_ENV_VARS}):`;
+  } else if (installConfig.switches.isDaEnabled) {
+    dockerInfo = `To utilize the discovery agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.DA_ENV_VARS}):`;
+  } else {
+    dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
+  }
+  console.log(_chalk.default.whiteBright(dockerInfo), '\n');
+  if (installConfig.switches.isDaEnabled) {
+    const daImageVersion = `${daImage}:${installConfig.daVersion}`;
+    console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));
+    console.log(_chalk.default.cyan(`docker pull ${daImageVersion}`));
+    console.log(_chalk.default.white(_utils.isWindows ? startDaWinMsg : startDaLinuxMsg));
+    console.log(_chalk.default.cyan(_utils.isWindows ? runDaWinMsg : runDaLinuxMsg));
+    console.log('\t', _chalk.default.cyan(`-v /data ${daImageVersion}`), '\n');
+  }
+  if (installConfig.switches.isTaEnabled) {
+    const taImageVersion = `${taImage}:${installConfig.taVersion}`;
+    console.log(_chalk.default.white('Pull the latest image of the Traceability Agent:'));
+    console.log(_chalk.default.cyan(`docker pull ${taImageVersion}`));
+    console.log(_chalk.default.white(_utils.isWindows ? startTaWinMsg : startTaLinuxMsg));
+    console.log(_chalk.default.cyan(_utils.isWindows ? runTaWinMsg : runTaLinuxMsg));
+    console.log('\t', _chalk.default.cyan(`-v /data ${taImageVersion}`), '\n');
+  }
+};
+
+// ApigeeX DA prompts
+async function askDiscoveryPrompts(apigeeXAgentValues) {
+  // Apigee X ProjectId
+  apigeeXAgentValues.projectId = await askApigeeXProjectId();
+  // Apigee X Developer Email Address
+  apigeeXAgentValues.developerEmailAddress = await askApigeeXDeveloperEmailAddress();
+  // Apigee X Auth File Path
+  apigeeXAgentValues.fileName = await askApigeeXAuthFileName();
+  // Apigee X Environment
+  apigeeXAgentValues.environment = await askApigeeXEnvironment();
+}
+async function askTraceabilityPrompts(apigeeXAgentValues) {
+  // Apigee X Filter metrics
+  apigeeXAgentValues.metricsFilter = await askApigeeXMetricFilterConfig();
+}
+const completeInstall = async installConfig => {
+  /**
+   * Create agent resources
+   */
+  const apigeeXAgentValues = installConfig.gatewayConfig;
+
+  // Add final settings to apigeeXAgentValues
+  apigeeXAgentValues.centralConfig = installConfig.centralConfig;
+  apigeeXAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
+  console.log('Generating the configuration file(s)...');
+  if (installConfig.switches.isDaEnabled) {
+    (0, _utils.writeTemplates)(ConfigFiles.DAEnvVars, apigeeXAgentValues, helpers.apigeeXDAEnvVarTemplate);
+  }
+  if (installConfig.switches.isTaEnabled) {
+    (0, _utils.writeTemplates)(ConfigFiles.TAEnvVars, apigeeXAgentValues, helpers.apigeeXTAEnvVarTemplate);
+  }
+  console.log('Configuration file(s) have been successfully created.\n');
+  generateSuccessHelpMsg(installConfig);
+};
+exports.completeInstall = completeInstall;
+const ApigeeXInstallMethods = exports.ApigeeXInstallMethods = {
+  GetBundleType: askBundleType,
+  GetDeploymentType: askConfigType,
+  AskGatewayQuestions: gatewayConnectivity,
+  FinalizeGatewayInstall: completeInstall,
+  ConfigFiles: Object.values(ConfigFiles),
+  AgentNameMap: {
+    [_types.AgentTypes.da]: _types.AgentNames.APIGEEX_DA,
+    [_types.AgentTypes.ta]: _types.AgentNames.APIGEEX_TA
+  },
+  GatewayDisplay: _types.GatewayTypes.APIGEEX_GATEWAY
+};
+const testables = exports.testables = {
+  ApigeeXPrompts,
+  ConfigFiles,
+  defaultLogFiles
+};

package/dist/commands/install/apigeexSaasAgents.js

@@ -40,14 +40,6 @@ class APIGEEXDataplaneConfig extends DataplaneConfig {
     this.environment = environment;
   }
 }
-class ApigeeMetricsFilterConfig {
-  constructor(filterMetrics, filteredAPIs) {
-    _defineProperty(this, "filterMetrics", void 0);
-    _defineProperty(this, "filteredAPIs", void 0);
-    this.filterMetrics = filterMetrics;
-    this.filteredAPIs = filteredAPIs;
-  }
-}
 class SaasAgentValues {
   constructor() {
     _defineProperty(this, "frequencyDA", void 0);
@@ -73,20 +65,20 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
     _defineProperty(this, "mode", void 0);
     _defineProperty(this, "metricsFilter", void 0);
     _defineProperty(this, "environment", void 0);
-    this.authType = APIGEEXAuthType.IMP_SVC_ACC;
+    this.authType = _types.APIGEEXAuthType.IMP_SVC_ACC;
     this.clientEmailAddress = '';
     this.credentialJSON = '';
     this.projectId = '';
     this.developerEmailAddress = '';
     this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
-    this.metricsFilter = new ApigeeMetricsFilterConfig(true, []);
+    this.metricsFilter = new _types.ApigeeMetricsFilterConfig(true, []);
     this.environment = '';
   }
   getAccessData() {
     let data = JSON.stringify({
       client_email: this.clientEmailAddress
     });
-    if (this.authType == APIGEEXAuthType.ACCESS_CREDENTIAL) {
+    if (this.authType == _types.APIGEEXAuthType.ACCESS_CREDENTIAL) {
       data = JSON.stringify(this.credentialJSON);
     }
     return data;
@@ -96,12 +88,7 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = {};
 
-// APIGEEXAuthType - how the agent will authenticate to APIGEEX
-var APIGEEXAuthType = /*#__PURE__*/function (APIGEEXAuthType) {
-  APIGEEXAuthType["IMP_SVC_ACC"] = "Impersonate Service Account";
-  APIGEEXAuthType["ACCESS_CREDENTIAL"] = "Access Credential";
-  return APIGEEXAuthType;
-}(APIGEEXAuthType || {}); // APIGEEX SaaSPrompts - all APIGEEX Saas prompts to the user for input
+// APIGEEX SaaSPrompts - all APIGEEX Saas prompts to the user for input
 const SaasPrompts = {
   AUTHENTICATION_TYPE: 'Authenticate with an Impersonation of a Service Account or by providing a Credential File',
   PROJECT_ID: 'Enter the APIGEE X Project ID the agent will use',
@@ -141,9 +128,9 @@ const askForAPIGEEXCredentials = async hostedAgentValues => {
     defaultValue: hostedAgentValues.developerEmailAddress !== '' ? hostedAgentValues.developerEmailAddress : undefined,
     allowEmptyInput: true
   });
-  hostedAgentValues.authType = APIGEEXAuthType.IMP_SVC_ACC;
+  hostedAgentValues.authType = _types.APIGEEXAuthType.IMP_SVC_ACC;
   console.log(_chalk.default.gray("Please refer to docs.axway.com for information on creating the necessary APIGEE X IAM policies"));
-  if (hostedAgentValues.authType === APIGEEXAuthType.IMP_SVC_ACC) {
+  if (hostedAgentValues.authType === _types.APIGEEXAuthType.IMP_SVC_ACC) {
     log("using impersonate service account authentication");
     // get client email address
     hostedAgentValues.clientEmailAddress = await (0, _basicPrompts.askInput)({
@@ -308,7 +295,7 @@ const APIGEEXSaaSInstallMethods = exports.APIGEEXSaaSInstallMethods = {
 const testables = exports.testables = {
   SaasAgentValues,
   SaasAPIGEEXAgentValues,
-  APIGEEXAuthType,
+  APIGEEXAuthType: _types.APIGEEXAuthType,
   SaasPrompts,
   ConfigFiles
 };

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

@@ -80,6 +80,18 @@ Object.keys(_regex).forEach(function (key) {
     }
   });
 });
+var _apigeexTemplates = require("./templates/apigeexTemplates");
+Object.keys(_apigeexTemplates).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _apigeexTemplates[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _apigeexTemplates[key];
+    }
+  });
+});
 var _awsTemplates = require("./templates/awsTemplates");
 Object.keys(_awsTemplates).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -239,6 +251,7 @@ const configFiles = exports.configFiles = {
 };
 const agentsDocsUrl = exports.agentsDocsUrl = {
   V7: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/index.html',
+  APIGEEX: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_apigeex_gateway/index.html',
   AWS: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_aws_gateway/index.html',
   AZURE: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_azure_gateway/index.html',
   ISTIO: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html',

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

@@ -37,8 +37,7 @@ const AWSRegexPatterns = exports.AWSRegexPatterns = {
 
 // APIGEEXRegexPatterns - regex patters to validate user inputs
 const APIGEEXRegexPatterns = exports.APIGEEXRegexPatterns = {
-  APIGEEX_REGEXP_PROJECT_ID: '^[a-z][a-z0-9-]{4,28}[a-z0-9]$',
-  AWS_REGEXP_EMAIL_ADDRESS: '^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'
+  APIGEEX_REGEXP_PROJECT_ID: '^[a-z][a-z0-9-]{4,28}[a-z0-9]$'
 };
 
 // AzureRegexPatterns - regex patters to validate user inputs

package/dist/commands/install/helpers/templates/apigeexTemplates.js

@@ -0,0 +1,113 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.apigeeXTAEnvVarTemplate = exports.apigeeXDAEnvVarTemplate = exports.ApigeeXAgentValues = void 0;
+var _types = require("../../../../common/types");
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * @description Parameters to provide to the Apigee X handlebars templates.
+ */
+class ApigeeXAgentValues {
+  constructor() {
+    _defineProperty(this, "projectId", void 0);
+    _defineProperty(this, "developerEmailAddress", void 0);
+    _defineProperty(this, "mode", void 0);
+    _defineProperty(this, "environment", void 0);
+    _defineProperty(this, "fileName", void 0);
+    _defineProperty(this, "metricsFilter", void 0);
+    _defineProperty(this, "centralConfig", void 0);
+    _defineProperty(this, "traceabilityConfig", void 0);
+    this.projectId = "";
+    this.developerEmailAddress = "";
+    this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
+    this.environment = "";
+    this.fileName = "";
+    this.metricsFilter = new _types.ApigeeMetricsFilterConfig(true, []);
+    this.centralConfig = new _types.CentralAgentConfig();
+    this.traceabilityConfig = new _types.TraceabilityConfig();
+  }
+}
+
+/**
+ * @description Generates the ApigeeX TA env vars file.
+ */
+exports.ApigeeXAgentValues = ApigeeXAgentValues;
+const apigeeXTAEnvVarTemplate = () => {
+  return `# ApigeeX configs
+APIGEE_PROJECTID={{projectId}}
+APIGEE_DEVELOPEREMAILADDRESS={{developerEmailAddress}}
+APIGEE_MODE={{mode}}
+APIGEE_ENVIRONMENT={{environment}}
+APIGEE_AUTHFILEPATH=/keys/{{fileName}}
+APIGEE_FILTERMETRICS={{metricsFilter.filterMetrics}}
+{{#if metricsFilter.filterMetrics}}
+APIGEE_FILTEREDAPIS={{metricsFilter.filteredAPIs}}
+{{/if}}
+
+# Amplify Central configs
+{{#if traceabilityConfig.usageReportingOffline}}
+CENTRAL_USAGEREPORTING_OFFLINE={{traceabilityConfig.usageReportingOffline}}
+CENTRAL_ENVIRONMENTID={{centralConfig.environmentId}}
+CENTRAL_AGENTNAME={{centralConfig.taAgentName}}
+{{else}}
+CENTRAL_AGENTNAME={{centralConfig.taAgentName}}
+CENTRAL_AUTH_CLIENTID={{centralConfig.dosaAccount.clientId}}
+CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
+CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
+CENTRAL_ENVIRONMENT={{centralConfig.environment}}
+CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_REGION={{centralConfig.region}}
+
+{{#compare . traceabilityConfig.protocol "https"}}
+TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
+{{/compare}}
+TRACEABILITY_SAMPLING_PERCENTAGE={{traceabilityConfig.samplingPercentage}}
+{{/if}}
+
+# Logging configs
+# Define the logging level: info, debug, error
+LOG_LEVEL=info
+# Specify where to send the log: stdout, file, both
+LOG_OUTPUT=stdout
+# Define where the log files are written
+LOG_FILE_PATH=logs
+`;
+};
+
+/**
+ * @description Generates the ApigeeX DA env vars file.
+ */
+exports.apigeeXTAEnvVarTemplate = apigeeXTAEnvVarTemplate;
+const apigeeXDAEnvVarTemplate = () => {
+  return `# Azure configs
+APIGEE_PROJECTID={{projectId}}
+APIGEE_DEVELOPEREMAILADDRESS={{developerEmailAddress}}
+APIGEE_MODE={{mode}}
+APIGEE_ENVIRONMENT={{environment}}
+APIGEE_AUTHFILEPATH=/keys/{{filePath}}
+
+# Amplify Central configs
+CENTRAL_AGENTNAME={{centralConfig.daAgentName}}
+CENTRAL_AUTH_CLIENTID={{centralConfig.dosaAccount.clientId}}
+CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
+CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
+CENTRAL_ENVIRONMENT={{centralConfig.environment}}
+CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_REGION={{centralConfig.region}}
+
+# Logging configs
+# Define the logging level: info, debug, error
+LOG_LEVEL=info
+# Specify where to send the log: stdout, file, both
+LOG_OUTPUT=stdout
+# Define where the log files are written
+LOG_FILE_PATH=logs
+`;
+};
+exports.apigeeXDAEnvVarTemplate = apigeeXDAEnvVarTemplate;

package/dist/common/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceableRegionType = exports.TraceabilityConfig = exports.SingleEntryPointUrls = exports.SaaSGatewayTypes = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_TABLE_STRING_LENGTH = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.LanguageTypes = exports.KindTypes = exports.Kind = exports.IstioProfileChoices = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.IDPType = exports.IDPConfiguration = exports.IDPClientSecretAuthMethod = exports.IDPAuthType = exports.IDPAuthConfiguration = exports.IDPAuthClientSecret = exports.IDPAuthAccessToken = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AzureDataplaneMode = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.AWSRegions = exports.APIGEEXDISCOVERYMODES = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
+exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceableRegionType = exports.TraceabilityConfig = exports.SingleEntryPointUrls = exports.SaaSGatewayTypes = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_TABLE_STRING_LENGTH = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.LanguageTypes = exports.KindTypes = exports.Kind = exports.IstioProfileChoices = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.IDPType = exports.IDPConfiguration = exports.IDPClientSecretAuthMethod = exports.IDPAuthType = exports.IDPAuthConfiguration = exports.IDPAuthClientSecret = exports.IDPAuthAccessToken = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AzureDataplaneMode = exports.AuthUrls = exports.ApigeeMetricsFilterConfig = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.AWSRegions = exports.APIGEEXDISCOVERYMODES = exports.APIGEEXAuthType = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
 var _dataService = require("./dataService");
 var _utils = require("./utils");
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -244,6 +244,7 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
 }({});
 let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
   GatewayTypes["EDGE_GATEWAY"] = "Amplify API Gateway";
+  GatewayTypes["APIGEEX_GATEWAY"] = "Apigee X Gateway";
   GatewayTypes["AWS_GATEWAY"] = "Amazon API Gateway";
   GatewayTypes["AZURE_GATEWAY"] = "Azure API Gateway";
   GatewayTypes["AZURE_EVENTHUB"] = "Azure EventHub";
@@ -287,13 +288,13 @@ let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNa
 const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
   [GatewayTypes.EDGE_GATEWAY]: DataPlaneNames.EDGE,
   [GatewayTypes.EDGE_GATEWAY_ONLY]: DataPlaneNames.EDGE,
+  [GatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
   [GatewayTypes.AWS_GATEWAY]: DataPlaneNames.AWS,
   [SaaSGatewayTypes.GITHUB]: DataPlaneNames.GITHUB,
   [GatewayTypes.GITLAB]: DataPlaneNames.GITLAB,
   [GatewayTypes.AZURE_GATEWAY]: DataPlaneNames.AZURE,
   [GatewayTypes.AZURE_EVENTHUB]: DataPlaneNames.AZURE,
   [GatewayTypes.ISTIO]: 'Istio',
-  [SaaSGatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
   [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA,
   [GatewayTypes.SOFTWAREAGWEBMETHODS]: DataPlaneNames.SOFTWAREAGWEBMETHODS,
   [SaaSGatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB,
@@ -760,4 +761,18 @@ let TraceableRegionType = exports.TraceableRegionType = /*#__PURE__*/function (T
   TraceableRegionType["EU"] = "EU";
   TraceableRegionType["AP"] = "AP";
   return TraceableRegionType;
-}({});
+}({}); // APIGEEXAuthType - how the agent will authenticate to APIGEEX
+let APIGEEXAuthType = exports.APIGEEXAuthType = /*#__PURE__*/function (APIGEEXAuthType) {
+  APIGEEXAuthType["IMP_SVC_ACC"] = "Impersonate Service Account";
+  APIGEEXAuthType["ACCESS_CREDENTIAL"] = "Access Credential";
+  return APIGEEXAuthType;
+}({});
+class ApigeeMetricsFilterConfig {
+  constructor(filterMetrics, filteredAPIs) {
+    _defineProperty(this, "filterMetrics", void 0);
+    _defineProperty(this, "filteredAPIs", void 0);
+    this.filterMetrics = filterMetrics;
+    this.filteredAPIs = filteredAPIs;
+  }
+}
+exports.ApigeeMetricsFilterConfig = ApigeeMetricsFilterConfig;

package/package.json

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