@axway/axway-central-cli 4.9.0-rc.1 → 4.10.0-rc.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 akamaiAgents = _interopRequireWildcard(require("./akamaiAgents"));
+var akamaiSaasAgents = _interopRequireWildcard(require("./akamaiSaasAgents"));
 var apigeeXAgents = _interopRequireWildcard(require("./apigeexAgents"));
 var awsAgents = _interopRequireWildcard(require("./awsAgents"));
 var awsSaaSAgents = _interopRequireWildcard(require("./awsSaasAgents"));
@@ -41,8 +42,6 @@ var sensediaAgents = _interopRequireWildcard(require("./sensediaAgents"));
 var wso2Agents = _interopRequireWildcard(require("./wso2Agents"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// import * as akamaiSaasAgents from './akamaiSaasAgents';
-
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents');
@@ -73,7 +72,7 @@ const agentInstallFlows = {
   [_types.GatewayTypes.WSO2]: wso2Agents.WSO2InstallMethods
 };
 const saasAgentInstallFlows = {
-  // [GatewayTypes.AKAMAI]: akamaiSaasAgents.AkamaiSaaSInstallMethods,
+  [_types.GatewayTypes.AKAMAI]: akamaiSaasAgents.AkamaiSaaSInstallMethods,
   [_types.SaaSGatewayTypes.AWS_GATEWAY]: awsSaaSAgents.AWSSaaSInstallMethods,
   [_types.SaaSGatewayTypes.GITHUB]: gitHubAgents.GitHubSaaSInstallMethods,
   [_types.SaaSGatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
@@ -169,9 +168,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 || gatewayType === _types.GatewayTypes.TRACEABLE
-      // gatewayType === GatewayTypes.AKAMAI
-      ) {
+      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 || gatewayType === _types.GatewayTypes.AKAMAI) {
         // hosted vs on premise
         installConfig.switches.isHostedInstall = (await (0, _basicPrompts.askList)({
           msg: prompts.hostedAgentOption,

package/dist/commands/install/akamaiSaasAgents.js

@@ -25,16 +25,14 @@ class DataplaneConfig {
   }
 }
 class AkamaiDataplaneConfig extends DataplaneConfig {
-  constructor(clientId, baseUrl, segmentLength, groups) {
+  constructor(baseUrl, segmentLength, groups) {
     super("Akamai");
-    _defineProperty(this, "clientId", void 0);
     _defineProperty(this, "baseUrl", void 0);
     _defineProperty(this, "segmentLength", void 0);
-    _defineProperty(this, "groups", void 0);
-    this.clientId = clientId;
+    _defineProperty(this, "environments", void 0);
     this.baseUrl = baseUrl;
     this.segmentLength = segmentLength;
-    this.groups = groups;
+    this.environments = groups;
   }
 }
 class AkamaiGroups {
@@ -74,7 +72,8 @@ class SaasAkamaiAgentValues extends SaasAgentValues {
   }
   getAccessData() {
     let data = JSON.stringify({
-      client_secret: this.clientSecret
+      clientID: this.clientId,
+      clientSecret: this.clientSecret
     });
     return data;
   }
@@ -146,21 +145,6 @@ const askEnvironments = async (centralEnvs, hostedAgentValues, excludeEnvironmen
   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 Akamai agents
@@ -204,7 +188,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;
@@ -236,7 +220,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   }) : installConfig.centralConfig.ampcEnvInfo.name;
   if (installConfig.gatewayType === _types.GatewayTypes.AKAMAI) {
     const akamaiGroupObjs = (akamaiAgentValues.environments || []).map((env, idx) => new AkamaiGroups(env, akamaiAgentValues.centralEnvironments[idx]));
-    akamaiAgentValues.dataplaneConfig = new AkamaiDataplaneConfig(akamaiAgentValues.clientId, akamaiAgentValues.baseUrl, akamaiAgentValues.segmentLength, akamaiGroupObjs);
+    akamaiAgentValues.dataplaneConfig = new AkamaiDataplaneConfig(akamaiAgentValues.baseUrl, akamaiAgentValues.segmentLength, akamaiGroupObjs);
   }
 
   // create the data plane resource
@@ -279,7 +263,5 @@ const testables = exports.testables = {
   ConfigFiles,
   createEncryptedAccessData,
   // <-- already exported
-  validateFrequency,
-  // <-- add this line for test access
   askEnvironments // <-- add this for testing the new logic
 };

package/dist/commands/install/apigeexSaasAgents.js

@@ -220,7 +220,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/dist/commands/install/awsSaasAgents.js

@@ -357,7 +357,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/dist/commands/install/azureSaasAgents.js

@@ -367,7 +367,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (agentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/dist/commands/install/gitHubSaasAgents.js

@@ -220,7 +220,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/dist/commands/install/swaggerHubSaasAgents.js

@@ -198,7 +198,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/dist/commands/install/traceableSaasAgents.js

@@ -194,7 +194,7 @@ const gatewayConnectivity = async installConfig => {
   return hostedAgentValues;
 };
 const generateOutput = async installConfig => {
-  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+  return `Install complete of hosted agent for ${installConfig.gatewayType}`;
 };
 const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
   var _dataplaneRes$securit, _dataplaneRes$securit2;

package/package.json

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