@axway/axway-central-cli 4.1.0 → 4.2.0-rc.0

package/dist/commands/install/apigeexAgents.js

@@ -35,6 +35,7 @@ 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)',
@@ -46,7 +47,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 Envirnoment to filter discovered APIs/metrics'
+  ENVIRONMENT: 'Enter the Apigee Environment to filter discovered APIs/metrics'
 };
 const askBundleType = async gateway => {
   console.log(gateway);
@@ -72,6 +73,14 @@ 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
 });
@@ -174,6 +183,14 @@ 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,13 +26,15 @@ class DataplaneConfig {
   }
 }
 class APIGEEXDataplaneConfig extends DataplaneConfig {
-  constructor(projectID, developerEmail, mode, metricsFilter, environment) {
+  constructor(controlPlaneRegion, projectID, developerEmail, mode, metricsFilter, environment) {
     super("Apigee X");
+    _defineProperty(this, "controlPlaneRegion", void 0);
     _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;
@@ -60,6 +62,7 @@ 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);
@@ -69,6 +72,7 @@ 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, []);
@@ -92,6 +96,7 @@ 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',
+  CONTROL_PLANE_REGION: 'Enter the service endpoint URL where the API Services reside',
   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',
@@ -116,6 +121,10 @@ const askConfigType = async () => {
 };
 const askForAPIGEEXCredentials = async hostedAgentValues => {
   log("gathering access details for apigee x");
+  hostedAgentValues.controlPlaneRegion = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.CONTROL_PLANE_REGION,
+    defaultValue: hostedAgentValues.controlPlaneRegion !== '' ? hostedAgentValues.controlPlaneRegion : undefined
+  });
   hostedAgentValues.projectId = await (0, _basicPrompts.askInput)({
     msg: SaasPrompts.PROJECT_ID,
     defaultValue: hostedAgentValues.projectId !== '' ? hostedAgentValues.projectId : undefined,
@@ -251,7 +260,7 @@ 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.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode, apigeeXAgentValues.metricsFilter, apigeeXAgentValues.environment);
+    apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.controlPlaneRegion, apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode, apigeeXAgentValues.metricsFilter, apigeeXAgentValues.environment);
   }
 
   // create the data plane resource

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+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;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
@@ -70,6 +70,8 @@ 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,
@@ -92,6 +94,28 @@ 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,6 +13,7 @@ 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);
@@ -21,6 +22,7 @@ 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;
@@ -38,6 +40,9 @@ 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}}
@@ -84,6 +89,9 @@ 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/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.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.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;
 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; }
@@ -338,6 +338,20 @@ 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.1.0",
+	"version": "4.2.0-rc.0",
 	"description": "Manage APIs, services and publish to the Amplify Marketplace",
 	"homepage": "https://platform.axway.com",
 	"author": {