@axway/axway-central-cli 2.26.0-rc.2 → 2.26.0

package/dist/commands/install/agents.js

@@ -16,6 +16,7 @@ var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 var _types = require("../../common/types");
 var _utils = require("../../common/utils");
 var awsAgents = _interopRequireWildcard(require("./awsAgents"));
+var awsSaaSAgents = _interopRequireWildcard(require("./awsSaasAgents"));
 var gitHubAgents = _interopRequireWildcard(require("./gitHubSaasAgents"));
 var gitLabAgents = _interopRequireWildcard(require("./gitLabAgents"));
 var azureAgents = _interopRequireWildcard(require("./azureAgents"));
@@ -23,7 +24,6 @@ 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 kafkaAgents = _interopRequireWildcard(require("./kafkaAgents"));
 var swaggerHubAgents = _interopRequireWildcard(require("./swaggerHubSaasAgents"));
 var platform = _interopRequireWildcard(require("./platform"));
@@ -43,13 +43,12 @@ const agentInstallFlows = {
   [_types.GatewayTypes.EDGE_GATEWAY_ONLY]: edgeAgents.EdgeGWOnlyInstallMethods,
   [_types.GatewayTypes.AWS_GATEWAY]: awsAgents.AWSInstallMethods,
   [_types.GatewayTypes.GITLAB]: gitLabAgents.GitLabInstallMethods,
-  [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.ISTIO]: istioAgents.IstioInstallMethods,
   [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods
 };
 const saasAgentInstallFlows = {
-  [_types.SaaSGatewayTypes.AWS_GATEWAY]: saasAgents.AWSSaaSInstallMethods,
+  [_types.SaaSGatewayTypes.AWS_GATEWAY]: awsSaaSAgents.AWSSaaSInstallMethods,
   [_types.SaaSGatewayTypes.GITHUB]: gitHubAgents.GitHubSaaSInstallMethods,
   [_types.SaaSGatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
   [_types.SaaSGatewayTypes.SWAGGERHUB]: swaggerHubAgents.SwaggerHubSaaSInstallMethods
@@ -113,9 +112,12 @@ const agents = exports.agents = {
       // 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 gatewayTypeChoices = [];
+      Object.values(_types.GatewayTypes).forEach(v => gatewayTypeChoices.push(v));
+      Object.values(_types.SaaSGatewayTypes).filter(v => v !== _types.SaaSGatewayTypes.AWS_GATEWAY).forEach(v => gatewayTypeChoices.push(v));
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,
-        choices: Object.values(_types.GatewayTypes).filter(v => v !== _types.GatewayTypes.EDGE_GATEWAY_ONLY)
+        choices: gatewayTypeChoices.sort().filter(v => v !== _types.GatewayTypes.EDGE_GATEWAY_ONLY)
       });
       if (gatewayType === _types.GatewayTypes.AWS_GATEWAY) {
         // hosted vs on premise
@@ -125,7 +127,7 @@ const agents = exports.agents = {
           default: _types.YesNo.Yes
         })) === _types.YesNo.Yes;
       }
-      if (gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.SaaSGatewayTypes.GITHUB || gatewayType === _types.SaaSGatewayTypes.SWAGGERHUB) {
+      if (gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.SaaSGatewayTypes.GITHUB || gatewayType === _types.SaaSGatewayTypes.SWAGGERHUB) {
         installConfig.switches.isHostedInstall = true;
       }
 

package/dist/commands/install/apigeexSaasAgents.js

@@ -157,7 +157,7 @@ const gatewayConnectivity = async installConfig => {
 
   // DeploymentType
   let hostedAgentValues = new SaasAgentValues();
-  if (installConfig.gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
+  if (installConfig.gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY) {
     // APIGEE X connection details
     hostedAgentValues = new SaasAPIGEEXAgentValues();
     hostedAgentValues = await askForAPIGEEXCredentials(hostedAgentValues);
@@ -217,7 +217,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
     axwayManaged: installConfig.centralConfig.axwayManaged,
     production: installConfig.centralConfig.production
   }) : installConfig.centralConfig.ampcEnvInfo.name;
-  if (installConfig.gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY) {
+  if (installConfig.gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY) {
     apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode);
   }
 
@@ -256,7 +256,7 @@ const APIGEEXSaaSInstallMethods = exports.APIGEEXSaaSInstallMethods = {
     [_types.AgentTypes.da]: _types.AgentNames.APIGEEX_DA,
     [_types.AgentTypes.ta]: _types.AgentNames.APIGEEX_TA
   },
-  GatewayDisplay: _types.GatewayTypes.APIGEEX_GATEWAY
+  GatewayDisplay: _types.SaaSGatewayTypes.APIGEEX_GATEWAY
 };
 
 // These are the items that are not exported, but need to be for testing

package/dist/common/types.js

@@ -229,14 +229,13 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
 let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
   GatewayTypes["EDGE_GATEWAY"] = "Amplify API Gateway";
   GatewayTypes["AWS_GATEWAY"] = "Amazon API Gateway";
-  GatewayTypes["APIGEEX_GATEWAY"] = "Apigee X Gateway";
   GatewayTypes["AZURE_GATEWAY"] = "Azure API Gateway";
   GatewayTypes["GITLAB"] = "GitLab";
   GatewayTypes["ISTIO"] = "Istio";
   GatewayTypes["EDGE_GATEWAY_ONLY"] = "Amplify API Gateway only";
   GatewayTypes["KAFKA"] = "Kafka";
   return GatewayTypes;
-}({}); // SWAGGERHUB = 'SwaggerHub'
+}({});
 let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGatewayTypes) {
   SaaSGatewayTypes["AWS_GATEWAY"] = "Amazon API Gateway";
   SaaSGatewayTypes["APIGEEX_GATEWAY"] = "Apigee X Gateway";
@@ -267,7 +266,7 @@ const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
   [GatewayTypes.GITLAB]: DataPlaneNames.GITLAB,
   [GatewayTypes.AZURE_GATEWAY]: DataPlaneNames.AZURE,
   [GatewayTypes.ISTIO]: 'Istio',
-  [GatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
+  [SaaSGatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
   [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA,
   [SaaSGatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB
 };

package/package.json

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