@axway/axway-central-cli 2.9.2 → 2.9.5

package/dist/commands/install/agents.js

@@ -118,12 +118,13 @@ const agents = {
 
       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; // gateway type
+      installConfig.centralConfig.axwayManaged = !!axwayManaged;
+      installConfig.centralConfig.region = region ? region.toString() : _types.Regions.US; // gateway type
 
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,
         choices: [_types.GatewayTypes.EDGE_GATEWAY, _types.GatewayTypes.AWS_GATEWAY, _types.GatewayTypes.AZURE_GATEWAY, _types.GatewayTypes.ISTIO]
-      }); // 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;
@@ -173,7 +174,7 @@ const agents = {
 
       createConfigBackup(agentInstallFlow.ConfigFiles, agentInstallFlow.GatewayDisplay); // run any install preprocess steps
 
-      if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize platform setup
+      if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize Platform setup
 
       installConfig = await platform.finalizeCentralInstall(apiServerClient, platformClient, defsManager, installConfig); // finalize gateway setup and output
 

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

@@ -136,8 +136,8 @@ const getLatestAgentVersion = async agent => {
       } // find the largest tag
 
 
-      const [pMajor, pMinor, pPatch] = prev.split('.');
-      const [cMajor, cMinor, cPatch] = current.split('.');
+      const [pMajor, pMinor, pPatch] = prev.split('.').map(Number);
+      const [cMajor, cMinor, cPatch] = current.split('.').map(Number);
 
       if (cMajor > pMajor) {
         return current;

package/dist/commands/install/helpers/templates/awsTemplates.js

@@ -94,25 +94,17 @@ CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
-{{#if traceabilityConfig.enabled}}
 
 TRACEABILITY_HOST={{traceabilityConfig.host}}
-{{else}}
-
-{{/if}}
 {{/compare}}
 {{#compare . centralConfig.region "US"}}
 
 {{/compare}}
-{{#if traceabilityConfig.enabled}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
 TRACEABILITY_SAMPLING_PERCENTAGE={{traceabilityConfig.samplingPercentage}}
 TRACEABILITY_SAMPLING_REPORTALLERRORS={{traceabilityConfig.samplingReportAllErrors}}
-{{else}}
-TRACEABILITY_SAMPLING_PERCENTAGE=0
-{{/if}}
 {{/if}}
 
 # Logging configs

package/dist/commands/install/helpers/templates/azureTemplates.js

@@ -89,25 +89,17 @@ CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
-{{#if traceabilityConfig.enabled}}
 
 TRACEABILITY_HOST={{traceabilityConfig.host}}
-{{else}}
-
-{{/if}}
 {{/compare}}
 {{#compare . centralConfig.region "US"}}
 
 {{/compare}}
-{{#if traceabilityConfig.enabled}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
 TRACEABILITY_SAMPLING_PERCENTAGE={{traceabilityConfig.samplingPercentage}}
 TRACEABILITY_SAMPLING_REPORTALLERRORS={{traceabilityConfig.samplingReportAllErrors}}
-{{else}}
-TRACEABILITY_SAMPLING_PERCENTAGE=0
-{{/if}}
 {{/if}}
 
 # Logging configs

package/dist/commands/install/helpers/templates/edgeTemplates.js

@@ -130,22 +130,17 @@ CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
-{{#if traceabilityConfig.enabled}}
 
 TRACEABILITY_HOST={{traceabilityConfig.host}}
-{{else}}
+{{/compare}}
+{{#compare . centralConfig.region "US"}}
 
-{{/if}}
 {{/compare}}
-{{#if traceabilityConfig.enabled}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
 TRACEABILITY_SAMPLING_PERCENTAGE={{traceabilityConfig.samplingPercentage}}
 TRACEABILITY_SAMPLING_REPORTALLERRORS={{traceabilityConfig.samplingReportAllErrors}}
-{{else}}
-TRACEABILITY_SAMPLING_PERCENTAGE=0
-{{/if}}
 {{/if}}
 
 # Logging configs

package/dist/commands/install/platform.js

@@ -73,12 +73,9 @@ const getTraceabilityConfig = async installConfig => {
     traceabilityConfig.enabled = enabled;
     traceabilityConfig.samplingPercentage = samplingPercentage;
     traceabilityConfig.samplingReportAllErrors = shouldReportAllErrors;
-
-    if (traceabilityConfig.enabled) {
-      const traceabilityProtocol = await helpers.askIngestionProtocol();
-      traceabilityConfig.protocol = traceabilityProtocol;
-      traceabilityConfig.host = helpers.getIngestionHost(installConfig.centralConfig.region, _CoreConfigController.CoreConfigController.getEnv(), installConfig.centralConfig.deployment, traceabilityProtocol);
-    }
+    const traceabilityProtocol = await helpers.askIngestionProtocol();
+    traceabilityConfig.protocol = traceabilityProtocol;
+    traceabilityConfig.host = helpers.getIngestionHost(installConfig.centralConfig.region, _CoreConfigController.CoreConfigController.getEnv(), installConfig.centralConfig.deployment, traceabilityProtocol);
   }
 
   return traceabilityConfig;

package/dist/common/resultsRenderers.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.renderResponse = exports.parseAsYaml = exports.parseAsJson = void 0;
 exports.resolveTeamNames = resolveTeamNames;
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _dayjs = _interopRequireDefault(require("dayjs"));
 
 var _easyTable = _interopRequireDefault(require("easy-table"));
@@ -76,7 +78,7 @@ const parseAsTable = (response, columns) => {
       if (col.type === 'date') {
         value = (0, _dayjs.default)(value).fromNow();
       } else if (col.type === 'teamGuid' && !value) {
-        value = '- - -';
+        value = _chalk.default.gray('---');
       }
 
       t.cell(col.name.toUpperCase(), value);
@@ -166,11 +168,16 @@ async function resolveTeamNames({
   column.jsonPath = `.${targetJsonPath}`; // next loop over data and set the team name
 
   for (const {
-    data = []
+    data
   } of results) {
-    for (const obj of data) {
-      const value = (0, _get.default)(obj, jsonPath);
-      (0, _set.default)(obj, targetJsonPath, value && teamNames[value] || value || '');
+    if (Array.isArray(data)) {
+      for (const obj of data) {
+        const value = (0, _get.default)(obj, jsonPath, null);
+
+        if (value !== null) {
+          (0, _set.default)(obj, targetJsonPath, value && teamNames[value] || value || '');
+        }
+      }
     }
   }
 }

package/dist/common/types.js

@@ -370,7 +370,7 @@ class CentralAgentConfig {
     _defineProperty(this, "axwayManaged", void 0);
 
     _defineProperty(this, "setBaseHost", async () => {
-      this.url = await (0, _dataService.getBaseUrl)();
+      this.url = await (0, _dataService.getBaseUrl)(undefined, undefined, this.region);
       [this.scheme, this.host] = this.url.split('://');
     });
 

package/package.json

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