@axway/axway-central-cli 2.7.0 → 2.8.0-rc.1

package/dist/commands/install/agents.js

@@ -103,7 +103,7 @@ const agents = {
       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;
@@ -134,6 +134,11 @@ const agents = {
         if (installConfig.switches.isTaEnabled) {
           installConfig.taVersion = await helpers.getLatestAgentVersion(agentInstallFlow.AgentNameMap[_types.AgentTypes.ta]);
         }
+      } // if EDGE_GATEWAY or EDGE_GATEWAY_ONLY and isDaEnabled, ask if the organization structure should replicate
+
+
+      if ((gatewayType === _types.GatewayTypes.EDGE_GATEWAY || gatewayType === _types.GatewayTypes.EDGE_GATEWAY_ONLY) && installConfig.switches.isDaEnabled) {
+        installConfig.switches.isOrgRep = await edgeAgents.askOrganizationReplication();
       } // get platform connectivity
 
 

package/dist/commands/install/edgeAgents.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testables = exports.prompts = exports.installPreprocess = exports.gatewayConnectivity = exports.dockerPublicKey = exports.dockerPrivateKey = exports.completeInstall = exports.askIsGatewayOnlyMode = exports.askConfigType = exports.askBundleTypeGWOnly = exports.askBundleType = exports.EdgeInstallMethods = exports.EdgeGWOnlyInstallMethods = exports.ConfigFiles = void 0;
+exports.testables = exports.prompts = exports.installPreprocess = exports.gatewayConnectivity = exports.dockerPublicKey = exports.dockerPrivateKey = exports.completeInstall = exports.askOrganizationReplication = exports.askIsGatewayOnlyMode = exports.askConfigType = exports.askBundleTypeGWOnly = exports.askBundleType = exports.EdgeInstallMethods = exports.EdgeGWOnlyInstallMethods = exports.ConfigFiles = void 0;
 
 var _cliKit = require("cli-kit");
 
@@ -69,7 +69,8 @@ const prompts = {
   askEventsPath: 'Enter the path to the API Gateway event log directory',
   askOpenTrafficPath: 'Enter the path to the API Gateway open traffic log directory',
   enterGatewayAgentNs: 'Enter the namespace to use for the Amplify Gateway Agents',
-  enterGatewayManagerMode: 'Do you want to use API Manager with the API Gateway'
+  enterGatewayManagerMode: 'Do you want to use API Manager with the API Gateway',
+  askIfOrgReplication: 'Do you want to replicate your original organization structure for your newly discovered APIs? If yes, make sure the organization names match the team names that are created in Amplify platform'
 };
 exports.prompts = prompts;
 
@@ -124,6 +125,17 @@ const askIsGatewayOnlyMode = async () => {
 
 exports.askIsGatewayOnlyMode = askIsGatewayOnlyMode;
 
+const askOrganizationReplication = async () => {
+  const mode = await (0, _basicPrompts.askList)({
+    msg: prompts.askIfOrgReplication,
+    default: _types.YesNo.Yes,
+    choices: _types.YesNoChoices
+  });
+  return mode == _types.YesNo.Yes;
+};
+
+exports.askOrganizationReplication = askOrganizationReplication;
+
 const askBundleType = async () => {
   return await (0, _basicPrompts.askList)({
     msg: helpers.agentMessages.selectAgentType,

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,9 @@ CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
 CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+{{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+{{/compare}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
@@ -195,7 +197,9 @@ env:
   CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_ORGANIZATIONID: "{{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
   LOG_LEVEL: info
@@ -266,7 +270,9 @@ CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
 CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+{{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+{{/compare}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 {{/compare}}
@@ -315,7 +321,9 @@ env:
   CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
-  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
+  {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
+  CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+  {{/compare}}
   CENTRAL_URL: {{centralConfig.url}}
   LOG_LEVEL: info
 

package/dist/commands/install/platform.js

@@ -100,7 +100,11 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
   centralConfig.orgId = await helpers.getCurrentUserOrgId();
   centralConfig.ampcEnvInfo = await helpers.askEnvironmentName(apiServerClient, defsManager, centralConfig.axwayManaged);
   centralConfig.production = centralConfig.ampcEnvInfo.isNew ? await askIsProductionEnvironment() : false;
-  centralConfig.ampcTeamName = await askTeamName(platformClient);
+
+  if (!installConfig.switches.isOrgRep) {
+    centralConfig.ampcTeamName = await askTeamName(platformClient);
+  }
+
   centralConfig.ampcDosaInfo = {
     clientId: '',
     name: '',

package/dist/common/CoreConfigController.js

@@ -45,7 +45,7 @@ class CoreConfigController {
 
     configCtrl.validateSavedConfigKeys();
     log(`getAuthInfo, received clientId = ${clientId}, account = ${account}, team = ${team}`);
-    const baseUrl = configCtrl.get(_CliConfigManager.CliConfigKeys.BASE_URL); // environment defined by using central cli "base-url" or axway "env" configs if set,
+    const baseUrl = process.env.AXWAY_CENTRAL_BASE_URL || configCtrl.get(_CliConfigManager.CliConfigKeys.BASE_URL); // environment defined by using central cli "base-url" or axway "env" configs if set,
     // otherwise its undefined (equals to prod)
 
     const environment = !baseUrl || baseUrl === _types.ProdBaseUrls.US || baseUrl === _types.ProdBaseUrls.EU ? config.get('env') : 'preprod';
@@ -120,13 +120,14 @@ class CoreConfigController {
     const result = {
       orgId: devOpsAccount.isPlatform ? `${devOpsAccount.org.id}` : undefined,
       orgRegion: (_devOpsAccount$org = devOpsAccount.org) === null || _devOpsAccount$org === void 0 ? void 0 : _devOpsAccount$org.region,
-      token: devOpsAccount.auth.tokens.access_token
+      token: process.env.AXWAY_CENTRAL_AUTH_TOKEN || config.get('central.authToken', devOpsAccount.auth.tokens.access_token)
     }; // now that we have resolved the account, we can validate the team
 
     if (team) {
-      var _devOpsAccount$org$te;
-
-      const teamObj = (_devOpsAccount$org$te = devOpsAccount.org.teams) === null || _devOpsAccount$org$te === void 0 ? void 0 : _devOpsAccount$org$te.find(t => {
+      const {
+        teams
+      } = await sdk.team.list(devOpsAccount);
+      const teamObj = teams.find(t => {
         return t.guid.toLowerCase() === team.toLowerCase() || t.name.toLowerCase() === team.toLowerCase();
       });
 

package/dist/common/PlatformClient.js

@@ -155,9 +155,19 @@ class PlatformClient {
     return result.client;
   }
 
-  async getServiceAccounts() {
+  async getServiceAccounts(filterRole) {
     const result = await _classPrivateFieldGet(this, _amplifySdk).client.list(await this.getAccountInfo());
-    return result.clients || [];
+    log('non filtered clients', result.clients); // If no filter, return all the service accounts
+
+    if (!filterRole) {
+      return result.clients || [];
+    } // Filter service accounts by filterRole
+
+
+    log('filter clients by ', filterRole);
+    const filteredClients = result === null || result === void 0 ? void 0 : result.clients.filter(client => client.roles.find(r => r === filterRole));
+    log('filteredClients', filteredClients);
+    return filteredClients;
   }
 
   async getTeams() {

package/dist/common/Renderer.js

@@ -127,11 +127,19 @@ class Renderer {
       bulkResult.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${simpleSuccessMsg}`));
       bulkResult.error.forEach(r => this.anyError(r.error, `"${r.kind}/${r.name}" error: `, true));
     } else if (this.output) {
-      (0, _resultsRenderers.renderResponse)(this._console, bulkResult.success, this.output);
-    } else {
       var _bulkResult$warning2;
 
-      (_bulkResult$warning2 = bulkResult.warning) === null || _bulkResult$warning2 === void 0 ? void 0 : _bulkResult$warning2.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} was created with an autogenerated logical name.`));
+      let results = bulkResult.success;
+
+      if ((_bulkResult$warning2 = bulkResult.warning) !== null && _bulkResult$warning2 !== void 0 && _bulkResult$warning2.length) {
+        results = bulkResult.warning.concat(results);
+      }
+
+      (0, _resultsRenderers.renderResponse)(this._console, results, this.output);
+    } else {
+      var _bulkResult$warning3;
+
+      (_bulkResult$warning3 = bulkResult.warning) === null || _bulkResult$warning3 === void 0 ? void 0 : _bulkResult$warning3.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} was created with an autogenerated logical name.`));
       bulkResult.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${simpleSuccessMsg}`));
     }
   }
@@ -160,11 +168,19 @@ class Renderer {
       bulkResult.updated.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${updateSuccessMsg}`));
       bulkResultCombined.error.forEach(r => this.anyError(r.error, `"${r.kind}/${r.name}" error: `, true));
     } else if (this.output) {
-      (0, _resultsRenderers.renderResponse)(this._console, bulkResultCombined.success, this.output);
-    } else {
       var _bulkResult$created$w2;
 
-      (_bulkResult$created$w2 = bulkResult.created.warning) === null || _bulkResult$created$w2 === void 0 ? void 0 : _bulkResult$created$w2.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} ${createWarningMsg}`));
+      let results = bulkResultCombined.success;
+
+      if ((_bulkResult$created$w2 = bulkResult.created.warning) !== null && _bulkResult$created$w2 !== void 0 && _bulkResult$created$w2.length) {
+        results = bulkResult.created.warning.concat(results);
+      }
+
+      (0, _resultsRenderers.renderResponse)(this._console, results, this.output);
+    } else {
+      var _bulkResult$created$w3;
+
+      (_bulkResult$created$w3 = bulkResult.created.warning) === null || _bulkResult$created$w3 === void 0 ? void 0 : _bulkResult$created$w3.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} ${createWarningMsg}`));
       bulkResult.created.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${createSuccessMsg}`));
       bulkResult.updated.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${updateSuccessMsg}`));
     }

package/dist/common/dataService.js

@@ -64,7 +64,7 @@ const getDefaultHeaders = ({
 
 
 const getBaseUrl = async (baseUrl, basePath, region, orgRegion) => {
-  const configuredBaseUrl = baseUrl || (await (0, _utils.getConfig)())[_types.ConfigTypes.BASE_URL];
+  const configuredBaseUrl = baseUrl || process.env.AXWAY_CENTRAL_BASE_URL || (await (0, _utils.getConfig)())[_types.ConfigTypes.BASE_URL];
 
   if (configuredBaseUrl) {
     return basePath ? configuredBaseUrl + basePath : configuredBaseUrl;

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;
@@ -411,12 +411,15 @@ class AgentInstallSwitches {
 
     _defineProperty(this, "isBinaryInstall", void 0);
 
+    _defineProperty(this, "isOrgRep", void 0);
+
     this.isDaEnabled = false;
     this.isTaEnabled = false;
     this.isHelmInstall = false;
     this.isGatewayOnly = false;
     this.isDockerInstall = false;
     this.isBinaryInstall = false;
+    this.isOrgRep = false;
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.7.0",
+	"version": "2.8.0-rc.1",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -41,7 +41,7 @@
 		"name": "central"
 	},
 	"dependencies": {
-		"@axway/amplify-cli-utils": "^5.0.3",
+		"@axway/amplify-cli-utils": "^5.0.6",
 		"chalk": "^4.1.2",
 		"cli-kit": "^1.15.0",
 		"dayjs": "^1.10.7",
@@ -60,42 +60,41 @@
 		"tmp": "^0.2.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.16.0",
-		"@babel/core": "^7.16.0",
-		"@babel/plugin-proposal-class-properties": "^7.16.0",
-		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-		"@babel/plugin-proposal-optional-chaining": "^7.16.0",
-		"@babel/preset-env": "^7.16.4",
-		"@babel/preset-typescript": "^7.16.0",
-		"@types/chai": "^4.2.22",
+		"@babel/cli": "^7.16.8",
+		"@babel/core": "^7.16.12",
+		"@babel/plugin-proposal-class-properties": "^7.16.7",
+		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+		"@babel/plugin-proposal-optional-chaining": "^7.16.7",
+		"@babel/preset-env": "^7.16.11",
+		"@babel/preset-typescript": "^7.16.7",
+		"@types/chai": "^4.3.0",
 		"@types/chai-as-promised": "^7.1.4",
-		"@types/easy-table": "^0.0.33",
 		"@types/form-data": "^2.5.0",
 		"@types/fs-extra": "^9.0.13",
-		"@types/inquirer": "^8.1.3",
+		"@types/inquirer": "^8.2.0",
 		"@types/js-yaml": "^4.0.5",
-		"@types/lodash": "^4.14.177",
-		"@types/mocha": "^9.0.0",
-		"@types/node": "^16.11.10",
+		"@types/lodash": "^4.14.178",
+		"@types/mocha": "^9.1.0",
+		"@types/node": "^17.0.14",
 		"@types/rx": "^4.1.2",
 		"@types/semver": "^7.3.9",
-		"@types/sinon": "^10.0.6",
-		"@types/tmp": "^0.2.2",
+		"@types/sinon": "^10.0.9",
+		"@types/tmp": "^0.2.3",
 		"@types/update-notifier": "^5.1.0",
-		"@types/uuid": "^8.3.3",
+		"@types/uuid": "^8.3.4",
 		"babel-plugin-lodash": "^3.3.4",
-		"chai": "^4.3.4",
+		"chai": "^4.3.6",
 		"chai-as-promised": "^7.1.1",
-		"core-js": "^3.19.1",
-		"mocha": "^9.1.3",
-		"nock": "^13.2.1",
+		"core-js": "^3.21.0",
+		"mocha": "^9.2.0",
+		"nock": "^13.2.2",
 		"nodemon": "^2.0.15",
 		"nyc": "^15.1.0",
-		"prettier": "^2.4.1",
+		"prettier": "^2.5.1",
 		"sinon": "^11.1.2",
 		"source-map-support": "^0.5.21",
-		"ts-mocha": "^8.0.0",
-		"typescript": "^4.5.2"
+		"ts-mocha": "^9.0.2",
+		"typescript": "^4.5.5"
 	},
 	"jest": {
 		"verbose": true,