@axway/axway-central-cli 2.17.0 → 2.18.0

package/dist/commands/install/agents.js

@@ -4,94 +4,66 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.prompts = exports.localhost = exports.agents = void 0;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
 var _ApiServerClient = require("../../common/ApiServerClient");
-
 var _basicPrompts = require("../../common/basicPrompts");
-
 var _CoreConfigController = require("../../common/CoreConfigController");
-
 var _DefinitionsManager = require("../../common/DefinitionsManager");
-
 var _PlatformClient = require("../../common/PlatformClient");
-
 var _CliConfigManager = require("../../common/CliConfigManager");
-
 var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
-
 var _types = require("../../common/types");
-
 var _utils = require("../../common/utils");
-
 var awsAgents = _interopRequireWildcard(require("./awsAgents"));
-
+var gitHubAgents = _interopRequireWildcard(require("./gitHubSaasAgents"));
 var azureAgents = _interopRequireWildcard(require("./azureAgents"));
-
 var edgeAgents = _interopRequireWildcard(require("./edgeAgents"));
-
 var apigeeSaaSAgents = _interopRequireWildcard(require("./apigeexSaasAgents"));
-
 var helpers = _interopRequireWildcard(require("./helpers"));
-
 var istioAgents = _interopRequireWildcard(require("./istioAgents"));
-
 var saasAgents = _interopRequireWildcard(require("./awsSaasAgents"));
-
 var platform = _interopRequireWildcard(require("./platform"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents');
-const localhost = 'localhost';
-exports.localhost = localhost;
-const prompts = {
+const localhost = exports.localhost = 'localhost';
+const prompts = exports.prompts = {
   hostedAgentOption: 'Will this be an embedded agent',
   selectGatewayType: 'Select the type of gateway you want to connect'
 };
-exports.prompts = prompts;
 const agentInstallFlows = {
   [_types.GatewayTypes.EDGE_GATEWAY]: edgeAgents.EdgeInstallMethods,
   [_types.GatewayTypes.EDGE_GATEWAY_ONLY]: edgeAgents.EdgeGWOnlyInstallMethods,
   [_types.GatewayTypes.AWS_GATEWAY]: awsAgents.AWSInstallMethods,
+  [_types.GatewayTypes.GITHUB]: gitHubAgents.GitHubSaaSInstallMethods,
   [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.ISTIO]: istioAgents.IstioInstallMethods
 };
 const saasAgentInstallFlows = {
   [_types.GatewayTypes.AWS_GATEWAY]: saasAgents.AWSSaaSInstallMethods,
+  [_types.GatewayTypes.GITHUB]: gitHubAgents.GitHubSaaSInstallMethods,
   [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods
 };
-
 const createConfigBackup = async (configFiles, gatewayType) => {
   // If current configurations exist, back them up
   const configsExist = await helpers.createBackUpConfigs(configFiles);
-
   if (configsExist) {
     console.log(`\nCreated configuration backups for ${gatewayType}`);
   }
 };
-
 const determineRegion = async region => {
   let configurationRegion = (await (0, _utils.getConfig)())[_CliConfigManager.CliConfigKeys.REGION];
-
   if (region) {
     return region.toString();
   }
-
   return configurationRegion ? configurationRegion : _types.Regions.US;
 };
-
-const agents = {
+const agents = exports.agents = {
   action: async function ({
     argv,
     console
@@ -106,10 +78,8 @@ const agents = {
     } = argv;
     let isCmdError = false;
     const render = new _Renderer.default(console);
-
     try {
       var _accountInfo$roles, _accountInfo$roles2;
-
       // initialize clients
       const apiServerClient = new _ApiServerClient.ApiServerClient({
         baseUrl,
@@ -122,24 +92,26 @@ const agents = {
         account,
         region
       });
-      const defsManager = await new _DefinitionsManager.DefinitionsManager(apiServerClient).init(); // Verify account has permission to create an environment and service account.
+      const defsManager = await new _DefinitionsManager.DefinitionsManager(apiServerClient).init();
 
+      // Verify account has permission to create an environment and service account.
       const accountInfo = await platformClient.getAccountInfo();
       const isCentralAdmin = accountInfo === null || accountInfo === void 0 ? void 0 : (_accountInfo$roles = accountInfo.roles) === null || _accountInfo$roles === void 0 ? void 0 : _accountInfo$roles.includes(_CoreConfigController.AccountRole.ApiCentralAdmin);
       const isPlatformAdmin = accountInfo === null || accountInfo === void 0 ? void 0 : (_accountInfo$roles2 = accountInfo.roles) === null || _accountInfo$roles2 === void 0 ? void 0 : _accountInfo$roles2.includes(_CoreConfigController.AccountRole.PlatformAdmin);
-      checkUserRole(isCentralAdmin, isPlatformAdmin, accountInfo, render); // helper text
+      checkUserRole(isCentralAdmin, isPlatformAdmin, accountInfo, render);
 
+      // helper text
       console.log(_chalk.default.gray(`This command configures and installs the agents so that you can manage your gateway environment within the Amplify Platform.\n`));
       let installConfig = new _types.AgentInstallConfig();
-      installConfig.centralConfig.axwayManaged = !!axwayManaged; // top priority is region option on command line, second priority is region from config file, default is US
+      installConfig.centralConfig.axwayManaged = !!axwayManaged;
 
+      // top priority is region option on command line, second priority is region from config file, default is US
       installConfig.centralConfig.region = await determineRegion(region);
       installConfig.centralConfig.singleEntryPointUrl = _types.SingleEntryPointUrls[installConfig.centralConfig.region];
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,
         choices: Object.values(_types.GatewayTypes).filter(v => v !== _types.GatewayTypes.EDGE_GATEWAY_ONLY)
       });
-
       if (gatewayType === _types.GatewayTypes.AWS_GATEWAY) {
         // hosted vs on premise
         installConfig.switches.isHostedInstall = (await (0, _basicPrompts.askList)({
@@ -148,55 +120,59 @@ const agents = {
           default: _types.YesNo.Yes
         })) === _types.YesNo.Yes;
       }
-
-      if (gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
+      if (gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.GatewayTypes.GITHUB) {
         installConfig.switches.isHostedInstall = true;
-      } // if gateway type is edge ask Gateway only or not
-
+      }
 
+      // if gateway type is edge ask Gateway only or not
       if (gatewayType === _types.GatewayTypes.EDGE_GATEWAY) {
         installConfig.switches.isGatewayOnly = false;
         gatewayType = await edgeAgents.askIsGatewayOnlyMode();
       }
-
       installConfig.switches.isGatewayOnly = gatewayType === _types.GatewayTypes.EDGE_GATEWAY_ONLY;
       installConfig.gatewayType = gatewayType;
       let agentInstallFlow = agentInstallFlows[installConfig.gatewayType];
-
       if (installConfig.switches.isHostedInstall) {
         agentInstallFlow = saasAgentInstallFlows[installConfig.gatewayType];
-      } // Create the object of GatewayTypes -> BundleType functions
-
+      }
 
+      // Create the object of GatewayTypes -> BundleType functions
       installConfig.bundleType = await agentInstallFlow.GetBundleType();
       installConfig.switches.isDaEnabled = installConfig.bundleType === _types.BundleType.ALL_AGENTS || installConfig.bundleType === _types.BundleType.DISCOVERY;
-      installConfig.switches.isTaEnabled = installConfig.bundleType === _types.BundleType.ALL_AGENTS || installConfig.bundleType === _types.BundleType.TRACEABILITY || installConfig.bundleType === _types.BundleType.TRACEABILITY_OFFLINE; // Create the object of GatewayTypes -> BundleType functions
+      installConfig.switches.isTaEnabled = installConfig.bundleType === _types.BundleType.ALL_AGENTS || installConfig.bundleType === _types.BundleType.TRACEABILITY || installConfig.bundleType === _types.BundleType.TRACEABILITY_OFFLINE;
 
+      // Create the object of GatewayTypes -> BundleType functions
       installConfig.deploymentType = await agentInstallFlow.GetDeploymentType();
       installConfig.switches.isHelmInstall = installConfig.deploymentType === _types.AgentConfigTypes.HELM;
       installConfig.switches.isDockerInstall = installConfig.deploymentType === _types.AgentConfigTypes.DOCKERIZED;
-      installConfig.switches.isBinaryInstall = installConfig.deploymentType === _types.AgentConfigTypes.BINARIES; // Get the version of the agents from jfrog, not needed in hosted install
+      installConfig.switches.isBinaryInstall = installConfig.deploymentType === _types.AgentConfigTypes.BINARIES;
 
-      await getAgentVersions(agentInstallFlow, installConfig); // if EDGE_GATEWAY or EDGE_GATEWAY_ONLY and isDaEnabled, ask if the organization structure should replicate
+      // Get the version of the agents from jfrog, not needed in hosted install
+      await getAgentVersions(agentInstallFlow, installConfig);
 
+      // if EDGE_GATEWAY or EDGE_GATEWAY_ONLY and isDaEnabled, ask if the organization structure should replicate
       if ((gatewayType === _types.GatewayTypes.EDGE_GATEWAY || gatewayType === _types.GatewayTypes.EDGE_GATEWAY_ONLY) && installConfig.switches.isDaEnabled) {
         installConfig.switches.isOrgRep = await edgeAgents.askOrganizationReplication();
-      } // get platform connectivity
-
+      }
 
-      installConfig.centralConfig = await platform.getCentralConfig(apiServerClient, platformClient, defsManager, apicDeployment, installConfig); // Create the object of GatewayTypes -> GatewayConnectivity functions
+      // get platform connectivity
+      installConfig.centralConfig = await platform.getCentralConfig(apiServerClient, platformClient, defsManager, apicDeployment, installConfig);
 
-      installConfig.gatewayConfig = await agentInstallFlow.AskGatewayQuestions(installConfig, apiServerClient, defsManager); // traceability options
+      // Create the object of GatewayTypes -> GatewayConnectivity functions
+      installConfig.gatewayConfig = await agentInstallFlow.AskGatewayQuestions(installConfig, apiServerClient, defsManager);
 
+      // traceability options
       if (installConfig.switches.isTaEnabled && !installConfig.switches.isHostedInstall) {
         installConfig.traceabilityConfig = await platform.getTraceabilityConfig(installConfig);
-      } // create backup
-
+      }
 
-      await createConfigBackup(agentInstallFlow.ConfigFiles, agentInstallFlow.GatewayDisplay); // run any install preprocess steps
+      // create backup
+      await createConfigBackup(agentInstallFlow.ConfigFiles, agentInstallFlow.GatewayDisplay);
 
-      installConfig = await finishInstall(agentInstallFlow, installConfig, apiServerClient, platformClient, defsManager); // finalize gateway setup and output
+      // run any install preprocess steps
+      installConfig = await finishInstall(agentInstallFlow, installConfig, apiServerClient, platformClient, defsManager);
 
+      // finalize gateway setup and output
       await agentInstallFlow.FinalizeGatewayInstall(installConfig, apiServerClient, defsManager);
     } catch (e) {
       log('command error', e);
@@ -204,37 +180,33 @@ const agents = {
       render.anyError(e);
     } finally {
       log('command complete');
-      if (isCmdError) process.exit(1); // not sure why explicit exit is needed, seems like download is causing it to hang for 10-20 sec
-
+      if (isCmdError) process.exit(1);
+      // not sure why explicit exit is needed, seems like download is causing it to hang for 10-20 sec
       process.exit(0);
     }
   },
   desc: 'Amplify API Gateway / Amazon API Gateway / Azure API Gateway / Istio',
-  options: { ..._types.commonCmdArgsDescription
+  options: {
+    ..._types.commonCmdArgsDescription
   }
 };
-exports.agents = agents;
-
 async function getAgentVersions(agentInstallFlow, installConfig) {
   if (agentInstallFlow.AgentNameMap && !installConfig.switches.isHostedInstall && installConfig.switches.isDaEnabled) {
     installConfig.daVersion = await helpers.getLatestAgentVersion(agentInstallFlow.AgentNameMap[_types.AgentTypes.da]);
   }
-
   if (agentInstallFlow.AgentNameMap && !installConfig.switches.isHostedInstall && installConfig.switches.isTaEnabled) {
     installConfig.taVersion = await helpers.getLatestAgentVersion(agentInstallFlow.AgentNameMap[_types.AgentTypes.ta]);
   }
 }
-
 async function finishInstall(agentInstallFlow, installConfig, apiServerClient, platformClient, defsManager) {
-  if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize Platform setup, only for non-hosted agents
+  if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig);
 
+  // finalize Platform setup, only for non-hosted agents
   if (!installConfig.switches.isHostedInstall) {
     installConfig = await platform.finalizeCentralInstall(apiServerClient, platformClient, defsManager, installConfig);
   }
-
   return installConfig;
 }
-
 function checkUserRole(isCentralAdmin, isPlatformAdmin, accountInfo, render) {
   if (!isCentralAdmin || !isPlatformAdmin) {
     if (!accountInfo || accountInfo.isPlatform) {
@@ -243,7 +215,6 @@ function checkUserRole(isCentralAdmin, isPlatformAdmin, accountInfo, render) {
       render.error('Error: Not authorized. "Service Account" must be authorized with a user account with "Tooling Credentials" assigned the roles: Platform Admin, Central Admin');
       render.error('See: https://docs.axway.com/bundle/axwaycli-open-docs/page/docs/authentication/index.html#service-account-with-username-password');
     }
-
     process.exit(1);
   }
 }

package/dist/commands/install/apigeexSaasAgents.js

@@ -4,94 +4,61 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.testables = exports.askBundleType = exports.APIGEEXSaaSInstallMethods = void 0;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
 var _basicPrompts = require("../../common/basicPrompts");
-
 var _types = require("../../common/types");
-
 var helpers = _interopRequireWildcard(require("./helpers"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: saas');
-
 class DataplaneConfig {
   constructor(type) {
     _defineProperty(this, "type", void 0);
-
     this.type = type || "";
   }
-
 }
-
 class APIGEEXDataplaneConfig extends DataplaneConfig {
   constructor(projectID, developerEmail, mode) {
     super("Apigee");
-
     _defineProperty(this, "projectId", void 0);
-
     _defineProperty(this, "developerEmail", void 0);
-
     _defineProperty(this, "mode", void 0);
-
     this.projectId = projectID;
     this.developerEmail = developerEmail;
     this.mode = mode;
   }
-
 }
-
 class SaasAgentValues {
   constructor() {
     _defineProperty(this, "frequencyDA", void 0);
-
     _defineProperty(this, "queueDA", void 0);
-
     _defineProperty(this, "frequencyTA", void 0);
-
     _defineProperty(this, "dataplaneConfig", void 0);
-
     _defineProperty(this, "centralConfig", void 0);
-
     this.frequencyDA = '';
     this.queueDA = false;
     this.frequencyTA = '';
     this.dataplaneConfig = new DataplaneConfig();
     this.centralConfig = new _types.CentralAgentConfig();
   }
-
 }
-
 class SaasAPIGEEXAgentValues extends SaasAgentValues {
   constructor() {
     super();
-
     _defineProperty(this, "authType", void 0);
-
     _defineProperty(this, "clientEmailAddress", void 0);
-
     _defineProperty(this, "credentialJSON", void 0);
-
     _defineProperty(this, "projectId", void 0);
-
     _defineProperty(this, "developerEmailAddress", void 0);
-
     _defineProperty(this, "mode", void 0);
-
     this.authType = APIGEEXAuthType.IMP_SVC_ACC;
     this.clientEmailAddress = '';
     this.credentialJSON = '';
@@ -99,31 +66,26 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
     this.developerEmailAddress = '';
     this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
   }
-
   getAccessData() {
     let data = JSON.stringify({
       client_email: this.clientEmailAddress
     });
-
     if (this.authType == APIGEEXAuthType.ACCESS_CREDENTIAL) {
       data = JSON.stringify(this.credentialJSON);
     }
-
     return data;
   }
+}
 
-} // ConfigFiles - all the config file that are used in the setup
-
-
-const ConfigFiles = {}; // APIGEEXAuthType - how the agent will authenticate to APIGEEX
-
-var APIGEEXAuthType; // APIGEEX SaaSPrompts - all APIGEEX Saas prompts to the user for input
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = {};
 
-(function (APIGEEXAuthType) {
+// 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";
-})(APIGEEXAuthType || (APIGEEXAuthType = {}));
-
+  return APIGEEXAuthType;
+}(APIGEEXAuthType || {}); // 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',
@@ -135,28 +97,25 @@ const SaasPrompts = {
   QUEUE: 'Do you want to discover immediately after installation',
   ENTER_MORE: 'Do you want to enter another {0} for {1}'
 };
-
 const askBundleType = async () => {
   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;
 };
-
 const askForAPIGEEXCredentials = async hostedAgentValues => {
   log("gathering access details for apigee x");
   hostedAgentValues.projectId = await (0, _basicPrompts.askInput)({
     msg: SaasPrompts.PROJECT_ID,
     defaultValue: hostedAgentValues.projectId !== '' ? hostedAgentValues.projectId : undefined,
     validate: (0, _basicPrompts.validateRegex)(helpers.APIGEEXRegexPatterns.APIGEEX_REGEXP_PROJECT_ID, helpers.invalidValueExampleErrMsg('Project ID', 'rd-amplify-apigee-x'))
-  }); // get developer email address
+  });
 
+  // get developer email address
   hostedAgentValues.developerEmailAddress = await (0, _basicPrompts.askInput)({
     msg: SaasPrompts.DEVELOPER_EMAIL_ADDRESS,
     defaultValue: hostedAgentValues.developerEmailAddress !== '' ? hostedAgentValues.developerEmailAddress : undefined,
@@ -164,55 +123,47 @@ const askForAPIGEEXCredentials = async hostedAgentValues => {
   });
   hostedAgentValues.authType = 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) {
-    log("using impersonate service account authentication"); // get client email address
-
+    log("using impersonate service account authentication");
+    // get client email address
     hostedAgentValues.clientEmailAddress = await (0, _basicPrompts.askInput)({
       msg: SaasPrompts.CLIENT_EMAIL_ADDRESS,
       defaultValue: hostedAgentValues.clientEmailAddress !== '' ? hostedAgentValues.clientEmailAddress : undefined,
       allowEmptyInput: true
     });
   }
-
   return hostedAgentValues;
 };
-
 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;
-}; // @ts-ignore
-
+};
 
+// @ts-ignore
 const gatewayConnectivity = async installConfig => {
   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 Central")); // DeploymentType
+  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 Central"));
 
+  // DeploymentType
   let hostedAgentValues = new SaasAgentValues();
-
   if (installConfig.gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
     // APIGEE X connection details
     hostedAgentValues = new SaasAPIGEEXAgentValues();
     hostedAgentValues = await askForAPIGEEXCredentials(hostedAgentValues);
-  } // Ask to queue discovery now
-
+  }
 
+  // Ask to queue discovery now
   log("getting the frequency and if the agent should run now");
   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)({
@@ -225,7 +176,6 @@ const gatewayConnectivity = async installConfig => {
     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)({
@@ -235,70 +185,59 @@ const gatewayConnectivity = async installConfig => {
       allowEmptyInput: true
     });
   }
-
   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`);
   }
-
   let encData = _crypto.default.publicEncrypt({
     key: key,
     padding: _crypto.default.constants.RSA_PKCS1_OAEP_PADDING,
     oaepHash: hash
   }, Buffer.from(hostedAgentValues.getAccessData()));
-
   return encData.toString("base64");
 };
-
 const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   /**
    * Create agent resources
    */
   console.log("\n");
-  let apigeeXAgentValues = installConfig.gatewayConfig; // create the environment, if necessary
+  let apigeeXAgentValues = 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.APIGEEX_GATEWAY) {
     apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode);
-  } // create the data plane resource
-
-
-  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], apigeeXAgentValues.dataplaneConfig); // create data plane secret resource
+  }
 
+  // create the data plane resource
+  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.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) {
       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 discovery agent resource 
-
+  }
 
+  // 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, apigeeXAgentValues.frequencyDA, apigeeXAgentValues.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, apigeeXAgentValues.frequencyTA, false // APIGEE X TA is never triggered at install, as DA has to run prior
@@ -307,8 +246,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
 
   console.log(await generateOutput(installConfig));
 };
-
-const APIGEEXSaaSInstallMethods = {
+const APIGEEXSaaSInstallMethods = exports.APIGEEXSaaSInstallMethods = {
   GetBundleType: askBundleType,
   GetDeploymentType: askConfigType,
   AskGatewayQuestions: gatewayConnectivity,
@@ -319,14 +257,13 @@ const APIGEEXSaaSInstallMethods = {
     [_types.AgentTypes.ta]: _types.AgentNames.APIGEEX_TA
   },
   GatewayDisplay: _types.GatewayTypes.APIGEEX_GATEWAY
-}; // These are the items that are not exported, but need to be for testing
+};
 
-exports.APIGEEXSaaSInstallMethods = APIGEEXSaaSInstallMethods;
-const testables = {
+// These are the items that are not exported, but need to be for testing
+const testables = exports.testables = {
   SaasAgentValues,
   SaasAPIGEEXAgentValues,
   APIGEEXAuthType,
   SaasPrompts,
   ConfigFiles
-};
-exports.testables = testables;
+};