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

package/dist/commands/install/apigeexSaasAgents.js

@@ -26,8 +26,9 @@ 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 X");
+    super("Apigee");
     _defineProperty(this, "controlPlaneRegion", void 0);
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmail", void 0);
@@ -96,7 +97,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',
+  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',
@@ -121,15 +122,21 @@ 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,
     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)({
@@ -264,10 +271,14 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   }
 
   // create the data plane resource
-  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], apigeeXAgentValues.dataplaneConfig);
+  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.DataPlaneNames.APIGEE,
+  // hardcoded for APIGEE to match dataplane definitions
+  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));
+    await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.DataPlaneNames.APIGEE,
+    // hardcoded for APIGEE to match dataplane definitions
+    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/common/types.js

@@ -278,6 +278,7 @@ let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGat
 }({});
 let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNames) {
   DataPlaneNames["APIGEEX"] = "Apigee X";
+  DataPlaneNames["APIGEE"] = "Apigee";
   DataPlaneNames["AWS"] = "AWS";
   DataPlaneNames["GITHUB"] = "GitHub";
   DataPlaneNames["GITLAB"] = "GitLab";

package/package.json

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