@axway/axway-central-cli 4.2.0-rc.2 → 4.2.0-rc.4

package/dist/commands/install/agents.js

@@ -32,6 +32,7 @@ var graylogAgent = _interopRequireWildcard(require("./graylogAgent"));
 var ibmAPIConnectAgent = _interopRequireWildcard(require("./ibmAPIConnectAgents"));
 var softwareAGWebMethodsAgent = _interopRequireWildcard(require("./softwareAGWebMethodsAgents"));
 var traceableAgent = _interopRequireWildcard(require("./traceableAgents"));
+var traceableSaaSAgents = _interopRequireWildcard(require("./traceableSaasAgents"));
 var platform = _interopRequireWildcard(require("./platform"));
 var backstageAgent = _interopRequireWildcard(require("./backstageAgents"));
 var sapApiPortalAgent = _interopRequireWildcard(require("./sapApiPortalAgents"));
@@ -71,7 +72,8 @@ const saasAgentInstallFlows = {
   [_types.SaaSGatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
   [_types.SaaSGatewayTypes.SWAGGERHUB]: swaggerHubAgents.SwaggerHubSaaSInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureSaasAgents.AzureSaaSInstallMethods,
-  [_types.GatewayTypes.AZURE_EVENTHUB]: azureSaasAgents.AzureSaaSInstallMethods
+  [_types.GatewayTypes.AZURE_EVENTHUB]: azureSaasAgents.AzureSaaSInstallMethods,
+  [_types.GatewayTypes.TRACEABLE]: traceableSaaSAgents.TraceableSaaSInstallMethods
 };
 const createConfigBackup = async (configFiles, gatewayType) => {
   // If current configurations exist, back them up
@@ -142,7 +144,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 && v !== _types.SaaSGatewayTypes.APIGEEX_GATEWAY).forEach(v => gatewayTypeChoices.push(v));
+      Object.values(_types.SaaSGatewayTypes).filter(v => v !== _types.SaaSGatewayTypes.AWS_GATEWAY && v !== _types.SaaSGatewayTypes.APIGEEX_GATEWAY && v !== _types.SaaSGatewayTypes.TRACEABLE).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,
@@ -150,7 +152,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 || gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
+      if (gatewayType === _types.GatewayTypes.AWS_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_GATEWAY || gatewayType === _types.GatewayTypes.AZURE_EVENTHUB || gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.GatewayTypes.TRACEABLE) {
         // hosted vs on premise
         installConfig.switches.isHostedInstall = (await (0, _basicPrompts.askList)({
           msg: prompts.hostedAgentOption,

package/dist/commands/install/apigeexAgents.js

@@ -35,7 +35,6 @@ const ConfigFiles = exports.ConfigFiles = {
 // ApigeeXPrompts - prompts for user inputs
 const ApigeeXPrompts = {
   AUTHENTICATION_TYPE: 'Authenticate with an Impersonation of a Service Account or by providing a Credential File',
-  SETUP_CONTROL_PLANE_REGION: 'The APIGEE X Gateway service allows you to configure a regionalized control plane for a more specific service endpoint location. Do you want to configure that?',
   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)',
@@ -47,7 +46,7 @@ const ApigeeXPrompts = {
   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 Environment to filter discovered APIs/metrics'
+  ENVIRONMENT: 'Enter the Apigee Envirnoment to filter discovered APIs/metrics'
 };
 const askBundleType = async gateway => {
   console.log(gateway);
@@ -73,14 +72,6 @@ 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 askToCreateControlPlaneRegionSetup = async () => {
-  return (await (0, _basicPrompts.askList)({
-    msg: ApigeeXPrompts.SETUP_CONTROL_PLANE_REGION,
-    choices: _types.YesNoChoices,
-    default: _types.YesNo.Yes
-  })) === _types.YesNo.Yes ? _types.YesNo.Yes : _types.YesNo.No;
-};
-const askApigeexControlPlaneRegion = async () => await helpers.askApigeexControlPlaneRegion();
 const askApigeeXDeveloperEmailAddress = async () => await (0, _basicPrompts.askInput)({
   msg: ApigeeXPrompts.DEVELOPER_EMAIL_ADDRESS
 });
@@ -183,14 +174,6 @@ const dockerSuccessMsg = installConfig => {
 async function askDiscoveryPrompts(apigeeXAgentValues) {
   // Apigee X ProjectId
   apigeeXAgentValues.projectId = await askApigeeXProjectId();
-
-  // Ask if Control Plane Region support is needed
-  let controlPlaneRegionSupport = await askToCreateControlPlaneRegionSetup();
-  if (controlPlaneRegionSupport === _types.YesNo.Yes) {
-    // Apigee X Control Plane Region
-    apigeeXAgentValues.controlPlaneRegion = await askApigeexControlPlaneRegion();
-  }
-
   // Apigee X Developer Email Address
   apigeeXAgentValues.developerEmailAddress = await askApigeeXDeveloperEmailAddress();
   // Apigee X Auth File Path

package/dist/commands/install/apigeexSaasAgents.js

@@ -26,16 +26,13 @@ class DataplaneConfig {
   }
 }
 class APIGEEXDataplaneConfig extends DataplaneConfig {
-  // super constructor to set the type to 'Apigee' since this is a specific type of dataplane for SaaS agents (enum) available
-  constructor(controlPlaneRegion, projectID, developerEmail, mode, metricsFilter, environment) {
-    super("Apigee");
-    _defineProperty(this, "controlPlaneRegion", void 0);
+  constructor(projectID, developerEmail, mode, metricsFilter, environment) {
+    super("Apigee X");
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmail", void 0);
     _defineProperty(this, "mode", void 0);
     _defineProperty(this, "metricsFilter", void 0);
     _defineProperty(this, "environment", void 0);
-    this.controlPlaneRegion = controlPlaneRegion;
     this.projectId = projectID;
     this.developerEmail = developerEmail;
     this.mode = mode;
@@ -63,7 +60,6 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
     _defineProperty(this, "authType", void 0);
     _defineProperty(this, "clientEmailAddress", void 0);
     _defineProperty(this, "credentialJSON", void 0);
-    _defineProperty(this, "controlPlaneRegion", void 0);
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmailAddress", void 0);
     _defineProperty(this, "mode", void 0);
@@ -73,7 +69,6 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
     this.clientEmailAddress = '';
     this.credentialJSON = '';
     this.projectId = '';
-    this.controlPlaneRegion = '';
     this.developerEmailAddress = '';
     this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
     this.metricsFilter = new _types.ApigeeMetricsFilterConfig(true, []);
@@ -97,7 +92,6 @@ const ConfigFiles = {};
 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',
-  SETUP_CONTROL_PLANE_REGION: 'The APIGEE X Gateway service allows you to configure a regionalized control plane for a more specific service endpoint location. Do you want to configure that?',
   DEVELOPER_EMAIL_ADDRESS: 'Enter the APIGEE X Developer Email Address the agent will use',
   CLIENT_EMAIL_ADDRESS: 'Enter the Client Email Address the agent will use for the APIGEE X Service Account',
   UPLOAD_CREDENTIAL_FILE: 'Upload a JSON Credential file to be used for APIGEE X Authentication',
@@ -108,7 +102,7 @@ const SaasPrompts = {
   FILTER_METRICS: 'Do you want metrics filtering? (defaults to true)',
   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'
+  ENVIRONMENT: 'Enter the Apigee Environment to filter discovered APIs/metrics'
 };
 const askBundleType = async () => {
   return await (0, _basicPrompts.askList)({
@@ -127,16 +121,6 @@ const askForAPIGEEXCredentials = async hostedAgentValues => {
     defaultValue: hostedAgentValues.projectId !== '' ? hostedAgentValues.projectId : undefined,
     validate: (0, _basicPrompts.validateRegex)(helpers.APIGEEXRegexPatterns.APIGEEX_REGEXP_PROJECT_ID, helpers.invalidValueExampleErrMsg('Project ID', 'rd-amplify-apigee-x'))
   });
-  let controlPlaneRegionSupport = await (0, _basicPrompts.askList)({
-    msg: SaasPrompts.SETUP_CONTROL_PLANE_REGION,
-    default: _types.YesNo.No,
-    choices: _types.YesNoChoices
-  });
-  if (controlPlaneRegionSupport === _types.YesNo.Yes) {
-    hostedAgentValues.controlPlaneRegion = await helpers.askApigeexControlPlaneRegion();
-  } else {
-    hostedAgentValues.controlPlaneRegion = '';
-  }
 
   // get developer email address
   hostedAgentValues.developerEmailAddress = await (0, _basicPrompts.askInput)({
@@ -267,18 +251,14 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
     production: installConfig.centralConfig.production
   }) : installConfig.centralConfig.ampcEnvInfo.name;
   if (installConfig.gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY) {
-    apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.controlPlaneRegion, apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode, apigeeXAgentValues.metricsFilter, apigeeXAgentValues.environment);
+    apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode, apigeeXAgentValues.metricsFilter, apigeeXAgentValues.environment);
   }
 
   // create the data plane resource
-  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.DataPlaneNames.APIGEE,
-  // hardcoded for APIGEE to match dataplane definitions
-  apigeeXAgentValues.dataplaneConfig);
+  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], apigeeXAgentValues.dataplaneConfig);
   // create data plane secret resource
   try {
-    await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.DataPlaneNames.APIGEE,
-    // hardcoded for APIGEE to match dataplane definitions
-    dataplaneRes.name, await createEncryptedAccessData(apigeeXAgentValues, dataplaneRes));
+    await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], dataplaneRes.name, await createEncryptedAccessData(apigeeXAgentValues, dataplaneRes));
   } catch (error) {
     console.log(_chalk.default.redBright("rolling back installation. Please check the credential data before re-running install"));
     if (installConfig.centralConfig.ampcEnvInfo.isNew) {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.serviceAccountNameAlreadyExists = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.selectApigeexControlPlaneRegion = exports.selectAWSRegion = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.idpTestables = exports.idpMessages = exports.getCentralEnvironments = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.enterApigeexControlPlaneRegion = exports.enterAWSRegion = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askServiceAccountName = exports.askReferencedEnvironments = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askKeyValuePairLoop = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askForIDPConfiguration = exports.askForIDPAuthConfiguration = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askArrayLoop = exports.askApigeexControlPlaneRegion = exports.askAgentName = exports.askAWSRegion = exports.agentMessages = exports.addIdentityProvider = void 0;
+exports.serviceAccountNameAlreadyExists = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.selectAWSRegion = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.idpTestables = exports.idpMessages = exports.getCentralEnvironments = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.enterAWSRegion = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askServiceAccountName = exports.askReferencedEnvironments = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askKeyValuePairLoop = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askForIDPConfiguration = exports.askForIDPAuthConfiguration = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askArrayLoop = exports.askAgentName = exports.askAWSRegion = exports.agentMessages = exports.addIdentityProvider = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
@@ -70,8 +70,6 @@ const selectIngestionProtocol = exports.selectIngestionProtocol = 'Select Tracea
 const serviceAccountNameAlreadyExists = exports.serviceAccountNameAlreadyExists = 'Service account already exists.  Please enter a new name.';
 const selectAWSRegion = exports.selectAWSRegion = 'Select an AWS Region';
 const enterAWSRegion = exports.enterAWSRegion = 'Enter an AWS Region';
-const selectApigeexControlPlaneRegion = exports.selectApigeexControlPlaneRegion = 'Select an Apigeex Control Plane Region';
-const enterApigeexControlPlaneRegion = exports.enterApigeexControlPlaneRegion = 'Enter an Apigeex Control Plane Region';
 const askAWSRegion = async (region = '') => {
   let regions = Object.values(_types.AWSRegions).map(str => ({
     name: str,
@@ -94,28 +92,6 @@ const askAWSRegion = async (region = '') => {
   }
 };
 exports.askAWSRegion = askAWSRegion;
-const askApigeexControlPlaneRegion = async (region = '') => {
-  let regions = Object.values(_types.ApigeexControlPlaneRegions).map(str => ({
-    name: str,
-    value: str
-  }));
-  let answer = await (0, _basicPrompts.askList)({
-    msg: selectApigeexControlPlaneRegion,
-    default: region,
-    choices: [{
-      name: 'Enter an Apigeex Control Plane Region not on the list',
-      value: 'CREATE_NEW'
-    }, ...regions]
-  });
-  if (answer === 'CREATE_NEW') {
-    return await (0, _basicPrompts.askInput)({
-      msg: enterApigeexControlPlaneRegion
-    });
-  } else {
-    return answer;
-  }
-};
-exports.askApigeexControlPlaneRegion = askApigeexControlPlaneRegion;
 const askServiceAccountName = async serviceAccountNames => {
   console.warn(_chalk.default.yellow(`WARNING: Creating a new service account will overwrite any existing "private_key.pem" and "public_key.pem" files in this directory`));
   const name = await (0, _basicPrompts.askInput)({

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

@@ -13,7 +13,6 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  */
 class ApigeeXAgentValues {
   constructor() {
-    _defineProperty(this, "controlPlaneRegion", void 0);
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmailAddress", void 0);
     _defineProperty(this, "mode", void 0);
@@ -22,7 +21,6 @@ class ApigeeXAgentValues {
     _defineProperty(this, "metricsFilter", void 0);
     _defineProperty(this, "centralConfig", void 0);
     _defineProperty(this, "traceabilityConfig", void 0);
-    this.controlPlaneRegion = "";
     this.projectId = "";
     this.developerEmailAddress = "";
     this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
@@ -40,9 +38,6 @@ class ApigeeXAgentValues {
 exports.ApigeeXAgentValues = ApigeeXAgentValues;
 const apigeeXTAEnvVarTemplate = () => {
   return `# ApigeeX configs
-{{#if controlPlaneRegion}}
-APIGEE_CONTROLPLANEREGION={{controlPlaneRegion}}
-{{/if}}
 APIGEE_PROJECTID={{projectId}}
 APIGEE_DEVELOPEREMAIL={{developerEmailAddress}}
 APIGEE_MODE={{mode}}
@@ -89,9 +84,6 @@ LOG_FILE_PATH=logs
 exports.apigeeXTAEnvVarTemplate = apigeeXTAEnvVarTemplate;
 const apigeeXDAEnvVarTemplate = () => {
   return `# Azure configs
-{{#if controlPlaneRegion}}
-APIGEE_CONTROLPLANEREGION={{controlPlaneRegion}}
-{{/if}}
 APIGEE_PROJECTID={{projectId}}
 APIGEE_DEVELOPEREMAIL={{developerEmailAddress}}
 APIGEE_MODE={{mode}}

package/dist/commands/install/traceableAgents.js

@@ -35,9 +35,10 @@ const prompts = {
   agentNamespace: 'Enter the namespace to use for the Amplify Traceable Agents',
   enterToken: 'Enter the token that the agent will use',
   enterRegion: 'Enter the region that the agent will use',
-  enterEnvironments: 'Enter an environment that the agent will use',
-  enterMoreEnviroments: 'Do you want to enter another environment ?',
-  selectCentralMappingEnvironment: 'Select an Engage environment to map to the provided Traceable Agent Environement'
+  enterEnvironments: 'Enter a Traceable environment',
+  enterMoreEnvironments: 'Do you want to enter another mapping?',
+  selectCentralMappingEnvironment: 'Select an Engage environment to map to the provided Traceable environment',
+  environmentsDescription: 'Configure a mapping of Traceable environment to Engage environment that the agent will use'
 };
 const askBundleType = async () => {
   return _types.BundleType.TRACEABILITY;
@@ -75,7 +76,7 @@ const askEnvironments = async (centralEnvs, traceableAgentValues) => {
   let askEnvs = true;
   let envs = [];
   let mappedCentralEnvs = [];
-  console.log(_chalk.default.gray("An array of environments that the agent will use"));
+  console.log(_chalk.default.gray(prompts.environmentsDescription));
   while (askEnvs) {
     const env = await (0, _basicPrompts.askInput)({
       msg: prompts.enterEnvironments,
@@ -99,7 +100,7 @@ const askEnvironments = async (centralEnvs, traceableAgentValues) => {
       return ((_centralEnvs$find = centralEnvs.find(env => env.name === centralMappingEnv)) === null || _centralEnvs$find === void 0 ? void 0 : _centralEnvs$find.name) !== env.name;
     });
     askEnvs = (await (0, _basicPrompts.askList)({
-      msg: prompts.enterMoreEnviroments,
+      msg: prompts.enterMoreEnvironments,
       default: _types.YesNo.No,
       choices: _types.YesNoChoices
     })) === _types.YesNo.Yes;

package/dist/commands/install/traceableSaasAgents.js

@@ -0,0 +1,266 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testables = exports.askTraceableRegion = exports.askBundleType = exports.TraceableSaaSInstallMethods = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _snooplogg = _interopRequireDefault(require("snooplogg"));
+var _basicPrompts = require("../../common/basicPrompts");
+var _types = require("../../common/types");
+var _crypto = _interopRequireDefault(require("crypto"));
+var helpers = _interopRequireWildcard(require("./helpers"));
+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 }; }
+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); }
+const {
+  log
+} = (0, _snooplogg.default)('engage: install: agents: saas');
+class DataplaneConfig {
+  constructor(type) {
+    _defineProperty(this, "type", void 0);
+    this.type = type || '';
+  }
+}
+class TraceableDataplaneConfig extends DataplaneConfig {
+  constructor(region, environments) {
+    super("Traceable");
+    _defineProperty(this, "region", void 0);
+    _defineProperty(this, "environments", void 0);
+    this.region = region;
+    this.environments = environments;
+  }
+}
+class TraceableEnvironments {
+  constructor(traceable, environment) {
+    _defineProperty(this, "traceable", void 0);
+    _defineProperty(this, "environment", void 0);
+    this.traceable = traceable;
+    this.environment = environment;
+  }
+}
+class SaasAgentValues {
+  constructor() {
+    _defineProperty(this, "dataplaneConfig", void 0);
+    _defineProperty(this, "centralConfig", void 0);
+    this.dataplaneConfig = new DataplaneConfig();
+    this.centralConfig = new _types.CentralAgentConfig();
+  }
+  getAccessData() {
+    return '';
+  }
+}
+class SaasTraceableAgentValues extends SaasAgentValues {
+  constructor() {
+    super();
+    _defineProperty(this, "traceableToken", void 0);
+    _defineProperty(this, "traceableRegion", void 0);
+    _defineProperty(this, "environments", void 0);
+    _defineProperty(this, "centralEnvironments", void 0);
+    this.traceableToken = '';
+    this.traceableRegion = _types.TraceableRegionType.US;
+    this.environments = [];
+    this.centralEnvironments = [];
+  }
+  getAccessData() {
+    let data = JSON.stringify({
+      token: this.traceableToken
+    });
+    return data;
+  }
+}
+
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = {};
+
+// TraceableSaaSPrompts - all Traceable Saas prompts to the user for input
+const SaasPrompts = {
+  configTypeMsg: 'Select the mode of installation',
+  agentNamespace: 'Enter the namespace to use for the Amplify Traceable Agents',
+  enterToken: 'Enter the token that the agent will use',
+  enterRegion: 'Enter the region that the agent will use',
+  enterEnvironments: 'Enter a Traceable environment',
+  enterMoreEnvironments: 'Do you want to enter another mapping?',
+  selectCentralMappingEnvironment: 'Select an Engage environment to map to the provided Traceable environment',
+  environmentsDescription: 'Configure a mapping of Traceable environment to Engage environment that the agent will use'
+};
+const askBundleType = async () => {
+  return _types.BundleType.TRACEABILITY;
+};
+exports.askBundleType = askBundleType;
+const askConfigType = async () => {
+  return _types.AgentConfigTypes.HOSTED;
+};
+const askEnvironments = async (centralEnvs, hostedAgentValues) => {
+  let askEnvs = true;
+  let envs = [];
+  let mappedCentralEnvs = [];
+  console.log(_chalk.default.gray(SaasPrompts.environmentsDescription));
+  while (askEnvs) {
+    const env = await (0, _basicPrompts.askInput)({
+      msg: SaasPrompts.enterEnvironments,
+      allowEmptyInput: true
+    });
+    if (envs.length === 0 && env.toString().trim() === "") {
+      break;
+    }
+    if (env && env.toString().trim() !== "") {
+      envs.push(env);
+    }
+    const centralMappingEnv = await (0, _basicPrompts.askList)({
+      msg: SaasPrompts.selectCentralMappingEnvironment,
+      choices: centralEnvs.map(e => e.name)
+    });
+    if (centralMappingEnv && centralMappingEnv.toString().trim() !== "") {
+      mappedCentralEnvs.push(centralMappingEnv);
+    }
+    centralEnvs = centralEnvs.filter(env => {
+      var _centralEnvs$find;
+      return ((_centralEnvs$find = centralEnvs.find(env => env.name === centralMappingEnv)) === null || _centralEnvs$find === void 0 ? void 0 : _centralEnvs$find.name) !== env.name;
+    });
+    askEnvs = (await (0, _basicPrompts.askList)({
+      msg: SaasPrompts.enterMoreEnvironments,
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+  }
+  hostedAgentValues.environments = envs;
+  hostedAgentValues.centralEnvironments = mappedCentralEnvs;
+};
+const validateFrequency = () => input => {
+  let val = (0, _basicPrompts.validateRegex)(helpers.frequencyRegex, helpers.invalidValueExampleErrMsg('frequency', '3d5h12m'))(input);
+  if (typeof val === "string") {
+    return val;
+  }
+  let r = input.toString().match(/^(\d*)m/);
+  if (r) {
+    // only minutes
+    let mins = r[1];
+    if (parseInt(mins, 10) < 30) {
+      return "Minimum frequency is 30m";
+    }
+  }
+  return true;
+};
+
+//
+// Questions for the configuration of Traceable agent
+//
+const askToken = async () => await (0, _basicPrompts.askInput)({
+  msg: SaasPrompts.enterToken,
+  allowEmptyInput: false
+});
+const askTraceableRegion = async () => {
+  return await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.enterRegion,
+    choices: Object.entries(_types.TraceableRegionType).reduce((accumulator, curr) => {
+      return accumulator.concat({
+        name: curr[0],
+        value: curr[1]
+      });
+    }, []),
+    default: _types.TraceableRegionType.US
+  });
+};
+
+// @ts-ignore
+exports.askTraceableRegion = askTraceableRegion;
+const gatewayConnectivity = async installConfig => {
+  console.log('\nCONNECTION TO TRACEABLE API GATEWAY:');
+  // DeploymentType
+  let hostedAgentValues = new SaasTraceableAgentValues();
+  if (installConfig.gatewayType === _types.SaaSGatewayTypes.TRACEABLE) {
+    log('gathering access details for traceable');
+    // Traceable connection details
+    hostedAgentValues = new SaasTraceableAgentValues();
+    hostedAgentValues.traceableToken = await askToken();
+    hostedAgentValues.traceableRegion = await askTraceableRegion();
+    await helpers.getCentralEnvironments(installConfig.centralConfig.apiServerClient, installConfig.centralConfig.definitionManager).then(async envs => {
+      if (envs) {
+        await askEnvironments(envs, hostedAgentValues);
+      }
+    });
+  }
+  return hostedAgentValues;
+};
+const generateOutput = async installConfig => {
+  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+};
+const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
+  var _dataplaneRes$securit, _dataplaneRes$securit2;
+  // grab key from data plane resource
+  let key = ((_dataplaneRes$securit = dataplaneRes.security) === null || _dataplaneRes$securit === void 0 ? void 0 : _dataplaneRes$securit.encryptionKey) || "";
+  let hash = ((_dataplaneRes$securit2 = dataplaneRes.security) === null || _dataplaneRes$securit2 === void 0 ? void 0 : _dataplaneRes$securit2.encryptionHash) || "";
+  if (key === "" || hash === "") {
+    throw Error(`cannot encrypt access data as the encryption key info was incomplete`);
+  }
+  const accessData = hostedAgentValues.getAccessData();
+  let encData = _crypto.default.publicEncrypt({
+    key: key,
+    padding: _crypto.default.constants.RSA_PKCS1_OAEP_PADDING,
+    oaepHash: hash
+  }, Buffer.from(accessData));
+  return encData.toString("base64");
+};
+const completeInstall = async (installConfig, apiServerClient, defsManager) => {
+  /**
+   * Create agent resources
+   */
+  console.log("\n");
+  let traceableAgentValues = 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;
+  if (installConfig.gatewayType === _types.GatewayTypes.TRACEABLE) {
+    const traceableEnvObjs = (traceableAgentValues.environments || []).map((env, idx) => new TraceableEnvironments(env, traceableAgentValues.centralEnvironments[idx]));
+    traceableAgentValues.dataplaneConfig = new TraceableDataplaneConfig(traceableAgentValues.traceableRegion, traceableEnvObjs);
+  }
+
+  // create the data plane resource
+  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], traceableAgentValues.dataplaneConfig);
+  // create data plane secret resource
+  try {
+    await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], dataplaneRes.name, await createEncryptedAccessData(traceableAgentValues, dataplaneRes));
+  } catch (error) {
+    log(error);
+    console.log(_chalk.default.redBright("rolling back installation. Please check the credential data before re-running install"));
+    if (installConfig.centralConfig.ampcEnvInfo.isNew) {
+      await helpers.deleteByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env');
+    } else {
+      await helpers.deleteByResourceType(apiServerClient, defsManager, dataplaneRes.name, "Dataplane", "dp", installConfig.centralConfig.environment);
+    }
+    return;
+  }
+
+  // create compliance agent resource 
+  installConfig.centralConfig.taAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.ca, _types.AgentTypes.ca, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + " Compliance Agent", dataplaneRes.name);
+  console.log(await generateOutput(installConfig));
+};
+const TraceableSaaSInstallMethods = exports.TraceableSaaSInstallMethods = {
+  GetBundleType: askBundleType,
+  GetDeploymentType: askConfigType,
+  AskGatewayQuestions: gatewayConnectivity,
+  FinalizeGatewayInstall: completeInstall,
+  ConfigFiles: [],
+  AgentNameMap: {
+    [_types.AgentTypes.ca]: _types.AgentNames.TRACEABLE_CA
+  },
+  GatewayDisplay: _types.GatewayTypes.TRACEABLE
+};
+
+// These are the items that are not exported, but need to be for testing
+const testables = exports.testables = {
+  SaasAgentValues,
+  SaasTraceableAgentValues,
+  SaasPrompts,
+  ConfigFiles,
+  createEncryptedAccessData,
+  // <-- already exported
+  validateFrequency // <-- add this line for test access
+};

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.ApigeexControlPlaneRegions = 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;
+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; }
@@ -274,11 +274,11 @@ let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGat
   SaaSGatewayTypes["APIGEEX_GATEWAY"] = "Apigee X Gateway";
   SaaSGatewayTypes["GITHUB"] = "GitHub";
   SaaSGatewayTypes["SWAGGERHUB"] = "SwaggerHub";
+  SaaSGatewayTypes["TRACEABLE"] = "Traceable";
   return SaaSGatewayTypes;
 }({});
 let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNames) {
   DataPlaneNames["APIGEEX"] = "Apigee X";
-  DataPlaneNames["APIGEE"] = "Apigee";
   DataPlaneNames["AWS"] = "AWS";
   DataPlaneNames["GITHUB"] = "GitHub";
   DataPlaneNames["GITLAB"] = "GitLab";
@@ -339,20 +339,6 @@ let AWSRegions = exports.AWSRegions = /*#__PURE__*/function (AWSRegions) {
   AWSRegions["EU_WEST_2"] = "eu-west-2";
   AWSRegions["EU_WEST_3"] = "eu-west-3";
   return AWSRegions;
-}({}); // Apigee X Control Plane Regions
-let ApigeexControlPlaneRegions = exports.ApigeexControlPlaneRegions = /*#__PURE__*/function (ApigeexControlPlaneRegions) {
-  ApigeexControlPlaneRegions["US"] = "us";
-  ApigeexControlPlaneRegions["CANADA"] = "ca";
-  ApigeexControlPlaneRegions["EUROPEAN_UNION"] = "eu";
-  ApigeexControlPlaneRegions["GERMANY"] = "de";
-  ApigeexControlPlaneRegions["FRANCE"] = "fr";
-  ApigeexControlPlaneRegions["SWITZERLAND"] = "ch";
-  ApigeexControlPlaneRegions["AUSTRALIA"] = "au";
-  ApigeexControlPlaneRegions["INDIA"] = "in";
-  ApigeexControlPlaneRegions["JAPAN"] = "jp";
-  ApigeexControlPlaneRegions["SAUDI_ARABIA"] = "sa";
-  ApigeexControlPlaneRegions["ISRAEL"] = "il";
-  return ApigeexControlPlaneRegions;
 }({});
 let APIGEEXDISCOVERYMODES = exports.APIGEEXDISCOVERYMODES = /*#__PURE__*/function (APIGEEXDISCOVERYMODES) {
   APIGEEXDISCOVERYMODES["PROXY"] = "proxy";

package/package.json

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