@axway/axway-central-cli 2.8.0-rc.0 → 2.8.0

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

@@ -13,6 +13,8 @@ var _basicPrompts = require("../../../common/basicPrompts");
 
 var _Kubectl = require("../../../common/Kubectl");
 
+var _PlatformClient = require("../../../common/PlatformClient");
+
 var _types = require("../../../common/types");
 
 var _getters = require("./getters");
@@ -88,7 +90,7 @@ exports.askServiceAccountName = askServiceAccountName;
 
 const askDosaClientId = async (client, showWarning = true) => {
   // Fetch all existing service accounts.
-  const serviceAccounts = await client.getServiceAccounts();
+  const serviceAccounts = await client.getServiceAccounts(_PlatformClient.PlatformServiceAccountRole.ApiCentralAdmin);
   const serviceAccountNames = serviceAccounts.map(nextAccount => nextAccount.name); // Ask user to select an existing service account or create a new one.
 
   const selectedName = await (0, _basicPrompts.askList)({

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

@@ -124,7 +124,7 @@ CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
 CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
-{{#compare centralConfig.ampcTeamName '!=' ""}}
+{{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
 {{#compare . centralConfig.region "EU"}}
@@ -197,8 +197,8 @@ env:
   CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.ampcTeamName}}"
-  {{#compare centralConfig.ampcTeamName '!=' ""}}
-  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
+  {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
+  CENTRAL_TEAM={{centralConfig.ampcTeamName}}
   {{/compare}}
   CENTRAL_URL:  {{centralConfig.url}}
   EVENT_LOG_FILE_PATHS: /events/*.log
@@ -270,7 +270,7 @@ CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
 CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
-{{#compare centralConfig.ampcTeamName '!=' ""}}
+{{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
 {{#compare . centralConfig.region "EU"}}
@@ -321,8 +321,8 @@ env:
   CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
-  {{#compare centralConfig.ampcTeamName '!=' ""}}
-  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
+  {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
+  CENTRAL_TEAM={{centralConfig.ampcTeamName}}
   {{/compare}}
   CENTRAL_URL: {{centralConfig.url}}
   LOG_LEVEL: info

package/dist/common/PlatformClient.js

@@ -155,9 +155,16 @@ class PlatformClient {
     return result.client;
   }
 
-  async getServiceAccounts() {
+  async getServiceAccounts(filterRole) {
     const result = await _classPrivateFieldGet(this, _amplifySdk).client.list(await this.getAccountInfo());
-    return result.clients || [];
+    let clients = result.clients || [];
+
+    if (filterRole) {
+      log('filter clients by ', filterRole);
+      clients = clients.filter(client => client === null || client === void 0 ? void 0 : client.roles.find(r => r === filterRole));
+    }
+
+    return clients;
   }
 
   async getTeams() {

package/dist/common/resultsRenderers.js

@@ -63,9 +63,11 @@ const parseAsTable = (response, columns) => {
 
   for (const i of data) {
     for (const col of columns) {
-      // jsonPath starts with '.' so using the substring
-      const value = (0, _get.default)(i, col.jsonPath.substring(1));
-      t.cell(col.name.toUpperCase(), col.type === 'date' ? (0, _dayjs.default)(value).fromNow() : value);
+      if (!col.hidden) {
+        // jsonPath starts with '.' so using the substring
+        const value = (0, _get.default)(i, col.jsonPath.substring(1));
+        t.cell(col.name.toUpperCase(), col.type === 'date' ? (0, _dayjs.default)(value).fromNow() : value);
+      }
     }
 
     t.newRow();

package/dist/common/types.js

@@ -13,7 +13,7 @@ const cliVersionHeader = 'x-axway-cli-version';
 exports.cliVersionHeader = cliVersionHeader;
 const docsUrl = 'https://docs.axway.com/bundle/amplify-central/page/docs/index.html';
 exports.docsUrl = docsUrl;
-const ABORT_TIMEOUT = process.env.NODE_ENV === 'test' ? 1e3 : 30e3;
+const ABORT_TIMEOUT = process.env.NODE_ENV === 'test' ? 1e3 : process.env.DEBUG || process.env.SNOOPLOGG ? 1e9 : 30e3;
 exports.ABORT_TIMEOUT = ABORT_TIMEOUT;
 const MAX_FILE_SIZE = process.env.NODE_ENV === 'test' ? 1e5 : 20 * 1024 * 1024;
 exports.MAX_FILE_SIZE = MAX_FILE_SIZE;

package/package.json

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