@axway/axway-central-cli 2.5.3 → 2.6.0

package/dist/commands/get/index.js

@@ -52,6 +52,7 @@ const get = {
       account,
       region,
       tag,
+      team,
       title
     } = argv; // will be set to true and exit 1 if any get result contains an error or args invalid
 
@@ -69,6 +70,7 @@ const get = {
         baseUrl,
         account,
         region,
+        team,
         useCache: cache
       });
       const defsManager = await new _DefinitionsManager.DefinitionsManager(client).init();
@@ -166,34 +168,28 @@ ${defsManager.getDefsTableForHelpMsg()}`);
     name: 'args',
     desc: 'Command arguments, run "axway central get" to see the examples',
     multiple: true,
-    required: false,
-    type: 'string'
+    required: false
   }],
   options: { ..._types.commonCmdArgsDescription,
     '-o, --output [value]': {
-      desc: `Additional output formats. One of: ${_types.OutputTypes.yaml} | ${_types.OutputTypes.json}`,
-      type: 'string'
+      desc: `Additional output formats. One of: ${_types.OutputTypes.yaml} | ${_types.OutputTypes.json}`
     },
-    '-s, --scope [name|kind/name]"': {
-      desc: `Scope name or kind/name for scoped resources`,
-      type: 'string'
+    '-s, --scope [name|kind/name]': {
+      desc: 'Scope name or kind/name for scoped resources'
     },
     '-q, --query [RSQL query]': {
-      desc: `RSQL-formatted query to search for filters that match specific parameters`,
-      type: 'string'
+      desc: 'RSQL-formatted query to search for filters that match specific parameters'
     },
     '--title [title]': {
-      desc: `Title of resource(s) to fetch`,
-      type: 'string'
+      desc: 'Title of resource(s) to fetch'
     },
     '--attribute [key=value]': {
-      desc: `Attribute in key=value pair format to filter by`,
-      type: 'string'
+      desc: 'Attribute in key=value pair format to filter by'
     },
     '--tag [tag]': {
-      desc: `Tag of resource(s) to fetch`,
-      type: 'string'
-    }
+      desc: 'Tag of resource(s) to fetch'
+    },
+    '--team [guid|name]': 'The team name or guid to use'
   }
 };
 exports.get = get;

package/dist/commands/install/platform.js

@@ -31,14 +31,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Complex prompts
 //
 const askTeamName = async client => {
-  var _res$data$result$find;
+  var _teams$find;
+
+  const teams = await client.getTeams();
+
+  if (!(teams !== null && teams !== void 0 && teams.length)) {
+    throw new Error('Account has no teams!');
+  }
 
-  const res = await client.getTeams();
-  if (!res.data) throw Error('Get teams error.');
   return (0, _basicPrompts.askList)({
     msg: helpers.envMessages.selectTeam,
-    choices: res.data.result.map(t => t.name).sort((name1, name2) => name1.localeCompare(name2)),
-    default: (_res$data$result$find = res.data.result.find(t => t.default)) === null || _res$data$result$find === void 0 ? void 0 : _res$data$result$find.name
+    choices: teams.map(t => t.name).sort((name1, name2) => name1.localeCompare(name2)),
+    default: (_teams$find = teams.find(t => t.default)) === null || _teams$find === void 0 ? void 0 : _teams$find.name
   });
 };
 

package/dist/common/ApiServerClient.js

@@ -48,7 +48,8 @@ class ApiServerClient {
     baseUrl,
     region,
     account,
-    useCache
+    useCache,
+    team
   } = {}) {
     _defineProperty(this, "baseUrl", void 0);
 
@@ -58,11 +59,15 @@ class ApiServerClient {
 
     _defineProperty(this, "account", void 0);
 
-    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}, useCache = ${useCache}`);
+    _defineProperty(this, "team", void 0);
+
+    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}, useCache = ${useCache}, team = ${team}`);
     this.baseUrl = baseUrl;
     this.account = account;
     this.region = region;
     this.useCache = useCache === undefined ? true : useCache; // using cache by default
+
+    this.team = team;
   }
   /**
    * Build resource url based on its ResourceDefinition and passed scope def and name.
@@ -111,7 +116,8 @@ class ApiServerClient {
     const service = await (0, _dataService.dataService)({
       baseUrl: this.baseUrl,
       region: this.region,
-      account: this.account
+      account: this.account,
+      team: this.team
     });
     const baseUrl = this.buildResourceBaseUrl({
       resourceDef,
@@ -238,7 +244,8 @@ class ApiServerClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         region: this.region,
-        account: this.account
+        account: this.account,
+        team: this.team
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -311,7 +318,8 @@ class ApiServerClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         region: this.region,
-        account: this.account
+        account: this.account,
+        team: this.team
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -384,7 +392,8 @@ class ApiServerClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         region: this.region,
-        account: this.account
+        account: this.account,
+        team: this.team
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -463,7 +472,8 @@ class ApiServerClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         region: this.region,
-        account: this.account
+        account: this.account,
+        team: this.team
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -513,7 +523,8 @@ class ApiServerClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         region: this.region,
-        account: this.account
+        account: this.account,
+        team: this.team
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,

package/dist/common/CoreConfigController.js

@@ -7,12 +7,8 @@ exports.CoreConfigController = void 0;
 
 var _amplifyCliUtils = require("@axway/amplify-cli-utils");
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _basicPrompts = require("./basicPrompts");
-
 var _CliConfigManager = require("./CliConfigManager");
 
 var _types = require("./types");
@@ -23,39 +19,48 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const {
   log
-} = (0, _snooplogg.default)('central: CoreConfigController');
+} = (0, _snooplogg.default)('central: CoreConfigController'); // TODO: https://jira.axway.com/browse/APIGOV-20520
+// interface AuthenticationError extends Error {
+// 	errors?: Array<object>;
+// }
 
 class CoreConfigController {
   /**
    * Get authentication info
-   * @param clientId client id to use
+   * @param {String} clientId client id to use
+   * @param {String} [team] The team name or guid to use, otherwise fallsback to the default from
+   * the Axway CLI config.
    * @returns object containing token and orgId. For service accounts orgId is undefined.
    * @throws 401 if no authenticated account found.
    */
   async getAuthInfo({
     account,
-    clientId
+    clientId,
+    team
   } = {}) {
-    var _CoreConfigController;
+    var _devOpsAccount$org;
 
-    const configCtrl = new _CliConfigManager.CliConfigManager(); // note: remove this validator after couple of versions
+    const configCtrl = new _CliConfigManager.CliConfigManager();
+    const config = (0, _amplifyCliUtils.loadConfig)(); // note: remove this validator after couple of versions
 
     configCtrl.validateSavedConfigKeys();
-    log(`getAuthInfo, received clientId = ${clientId}, account = ${account}`);
-
-    if (!CoreConfigController.devOpsAccount || account && CoreConfigController.devOpsAccount.name !== account) {
+    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,
+    // otherwise its undefined (equals to prod)
+
+    const environment = !baseUrl || baseUrl === _types.ProdBaseUrls.US || baseUrl === _types.ProdBaseUrls.EU ? config.get('env') : 'preprod';
+    log(`getAuthInfo, baseUrl = ${baseUrl}, environment = ${environment}`);
+    const {
+      sdk
+    } = (0, _amplifyCliUtils.initSDK)({
+      env: environment
+    }, config);
+    let {
+      devOpsAccount
+    } = CoreConfigController;
+
+    if (!devOpsAccount || account && devOpsAccount.name !== account) {
       log(`getAuthInfo, no cached devOpsAccount found, or account name does not match`);
-      const baseUrl = 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 ? this.getConfig('env') : 'preprod';
-      log(`getAuthInfo, baseUrl = ${baseUrl}, environment = ${environment}`);
-      const {
-        config,
-        sdk
-      } = (0, _amplifyCliUtils.initSDK)({
-        env: environment
-      });
 
       if (clientId) {
         // TODO: client-id is a legacy option used only by proxies promote/create, should be removed
@@ -65,11 +70,14 @@ class CoreConfigController {
           validate: true
         });
         const matchingAccount = list.find(a => a.auth.clientId === clientId);
-        if (matchingAccount) CoreConfigController.devOpsAccount = await sdk.auth.find(matchingAccount.name);
+
+        if (matchingAccount) {
+          devOpsAccount = await sdk.auth.find(matchingAccount.name);
+        }
       } else if (account) {
         // ELSE IF: account name passed - ignoring defaultAccount and other accounts
         log(`getAuthInfo, account value passed, trying to find a matching account`);
-        CoreConfigController.devOpsAccount = await sdk.auth.find(account);
+        devOpsAccount = await sdk.auth.find(account);
       } else {
         // ELSE: trying to get any authenticated account
         log(`getAuthInfo, account value not passed, trying to find default/any match`);
@@ -80,28 +88,14 @@ class CoreConfigController {
 
         if (list.length === 1) {
           log(`getAuthInfo, using a single account found with name: ${list[0].name}`);
-          CoreConfigController.devOpsAccount = await sdk.auth.find(list[0].name);
+          devOpsAccount = list[0];
         } else if (list.length > 1) {
           // try to find the default account
-          const defaultAccount = list.find(a => a.name === config.get('auth.defaultAccount'));
-
-          if (defaultAccount) {
-            log(`getAuthInfo, match found for defaultAccount, refreshing its token`);
-            CoreConfigController.devOpsAccount = await sdk.auth.find(defaultAccount.name);
-          } else {
-            log(`getAuthInfo, no match found for defaultAccount`);
-            const selectedName = await (0, _basicPrompts.askList)({
-              msg: 'Multiple authenticated accounts found, please select which one you want to use',
-              choices: Array.from(new Set(list.map(a => a.name)))
-            });
-            console.log((0, _chalk.default)`{grey If you always want to use this account by default, run:\naxway config set auth.defaultAccount ${selectedName}}\n`);
-            log(`getAuthInfo, refreshing token for selected account: ${selectedName}`);
-            CoreConfigController.devOpsAccount = await sdk.auth.find(selectedName);
-          }
+          devOpsAccount = list.find(a => a.name === config.get('auth.defaultAccount')) || list.find(a => a.default) || list[0];
         }
       }
 
-      if (!CoreConfigController.devOpsAccount) {
+      if (!devOpsAccount) {
         // TODO: piece of old logic here, move throwing out of the method?
         // temporary commenting out the new functionality and reverting back to the old one, will be fixed with:
         // https://jira.axway.com/browse/APIGOV-20520
@@ -119,43 +113,48 @@ class CoreConfigController {
           }]
         };
       }
+
+      CoreConfigController.devOpsAccount = devOpsAccount;
     }
 
-    const token = CoreConfigController.devOpsAccount.auth.tokens.access_token;
-    const orgId = CoreConfigController.devOpsAccount.isPlatform ? `${CoreConfigController.devOpsAccount.org.id}` : undefined;
-    const orgRegion = (_CoreConfigController = CoreConfigController.devOpsAccount.org) === null || _CoreConfigController === void 0 ? void 0 : _CoreConfigController.region;
-    log(`getAuthInfo, returning account = ${CoreConfigController.devOpsAccount.name}`);
-    log(`getAuthInfo, returning token = ${token.substring(0, 5)}*****${token.substring(token.length - 5)}`);
-    log(`getAuthInfo, returning orgId = ${orgId}`);
-    log(`getAuthInfo, returning orgRegion = ${orgRegion}`);
-    return {
-      orgId,
-      orgRegion,
-      token
-    };
-  }
-  /**
-   * Get all or specific config value from core cli.
-   * @returns entire object config or a specific value if key passed.
-   */
+    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
+    }; // 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 => {
+        return t.guid.toLowerCase() === team.toLowerCase() || t.name.toLowerCase() === team.toLowerCase();
+      });
 
-  getConfig(key) {
-    log(`getConfig, key = ${key}`); // note: not using loadConfig().get(key) because of config mocks setup for tests.
+      if (!teamObj) {
+        throw new Error(`Unable to find team "${team}" in the "${devOpsAccount.org.name}" organization`);
+      }
+
+      result.teamGuid = teamObj.guid;
+    }
 
-    return key ? (0, _amplifyCliUtils.loadConfig)().get()[key] : (0, _amplifyCliUtils.loadConfig)().get();
+    log(`getAuthInfo, returning account = ${devOpsAccount.name}`);
+    log(`getAuthInfo, returning token = ${result.token.substring(0, 5)}*****${result.token.substring(result.token.length - 5)}`);
+    log(`getAuthInfo, returning orgId = ${result.orgId}`);
+    log(`getAuthInfo, returning orgRegion = ${result.orgRegion}`);
+    log(`getAuthInfo, returning teamGuid = ${result.teamGuid}`);
+    return result;
   }
 
   static getEnv() {
-    var _CoreConfigController2, _CoreConfigController3;
+    var _CoreConfigController, _CoreConfigController2;
 
-    return ((_CoreConfigController2 = CoreConfigController.devOpsAccount) === null || _CoreConfigController2 === void 0 ? void 0 : (_CoreConfigController3 = _CoreConfigController2.auth) === null || _CoreConfigController3 === void 0 ? void 0 : _CoreConfigController3.env) || _types.Platforms.prod;
+    return ((_CoreConfigController = CoreConfigController.devOpsAccount) === null || _CoreConfigController === void 0 ? void 0 : (_CoreConfigController2 = _CoreConfigController.auth) === null || _CoreConfigController2 === void 0 ? void 0 : _CoreConfigController2.env) || _types.Platforms.prod;
   }
 
   static getAuthUrl() {
-    var _CoreConfigController4, _CoreConfigController5;
+    var _CoreConfigController3, _CoreConfigController4;
 
-    return ((_CoreConfigController4 = CoreConfigController.devOpsAccount) === null || _CoreConfigController4 === void 0 ? void 0 : (_CoreConfigController5 = _CoreConfigController4.auth) === null || _CoreConfigController5 === void 0 ? void 0 : _CoreConfigController5.baseUrl) || _types.AuthUrls.Prod;
+    return ((_CoreConfigController3 = CoreConfigController.devOpsAccount) === null || _CoreConfigController3 === void 0 ? void 0 : (_CoreConfigController4 = _CoreConfigController3.auth) === null || _CoreConfigController4 === void 0 ? void 0 : _CoreConfigController4.baseUrl) || _types.AuthUrls.Prod;
   }
 
 }

package/dist/common/PlatformClient.js

@@ -9,10 +9,6 @@ var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
 var _amplifyCliUtils = require("@axway/amplify-cli-utils");
 
-var _dataService = require("./dataService");
-
-var _types = require("./types");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
@@ -127,13 +123,19 @@ class PlatformClient {
 
     if (_classPrivateFieldGet(this, _accountName)) {
       accountInfo = await _classPrivateFieldGet(this, _amplifySdk).auth.find(_classPrivateFieldGet(this, _accountName), defaultTeams);
-    } else {
+
+      if (!accountInfo) {
+        throw new Error(`Account "${_classPrivateFieldGet(this, _accountName)}" not found`);
+      }
+    }
+
+    if (!accountInfo) {
       const accountArray = await _classPrivateFieldGet(this, _amplifySdk).auth.list({
         defaultTeams,
         validate: true
       });
 
-      if (accountArray && accountArray.length > 0) {
+      if (accountArray) {
         accountInfo = accountArray.find(nextAccount => nextAccount.default) || accountArray[0];
       }
     } // Make sure "subscriptions" is defined since Amplify SDK requires it. (Will throw error if missing.)
@@ -160,27 +162,13 @@ class PlatformClient {
 
   async getTeams() {
     log(`getTeams`);
-    const result = {
-      data: null,
-      error: null
-    };
-
-    try {
-      const service = await (0, _dataService.dataService)({
-        baseUrl: _classPrivateFieldGet(this, _baseUrl),
-        basePath: _types.BasePaths.Platform,
-        account: _classPrivateFieldGet(this, _accountName)
-      }); // Not using "getWithPagination" method here because /teams API does not support pagination
-
-      const response = await service.get('/team');
-      result.data = response;
-    } catch (e) {
-      if (e.errors && Array.isArray(e.errors)) {
-        result.error = e.errors;
-      } else throw e;
-    }
-
-    return result;
+    const account = await this.getAccountInfo();
+    const {
+      teams
+    } = await _classPrivateFieldGet(this, _amplifySdk).team.list(account);
+    return teams.map(team => ({ ...team,
+      default: team.guid === account.team.guid
+    }));
   }
 
 }

package/dist/common/dataService.js

@@ -113,23 +113,34 @@ const updateRequestError = err => {
     Object.assign(err, jsonBody);
   }
 };
+/**
+ * Creates an object with various functions communicating with the API Server.
+ * @param {String} clientId Client id to use.
+ * @param {String} [team] The preferred team to use. This value overrides the default from the Axway CLI config.
+ * @param {String} [region] The preferred region to use.
+ * @returns Object containing data retrieval functions.
+ */
+
 
 const dataService = async ({
   account,
   baseUrl,
   basePath = _types.BasePaths.ApiServer,
   clientId,
-  region
+  region,
+  team
 }) => {
   // see above
   // await versionCheckWarning();
   const {
     orgId,
     orgRegion,
+    teamGuid,
     token
   } = await new _CoreConfigController.CoreConfigController().getAuthInfo({
     account,
-    clientId
+    clientId,
+    team
   });
   const url = await getBaseUrl(baseUrl, basePath, region, orgRegion);
   const defaultHeaders = getDefaultHeaders({
@@ -140,6 +151,13 @@ const dataService = async ({
 
   const fetch = async (method, url, params = {}) => {
     try {
+      // add the team guid
+      if (teamGuid) {
+        const parsed = new _url.URL(url);
+        parsed.searchParams.set('query', `owner.id==${teamGuid}`);
+        url = parsed.toString();
+      }
+
       const response = await got[method](url, {
         followRedirect: false,
         retry: 0,

package/dist/common/types.js

@@ -149,9 +149,9 @@ const APICDeployments = {
 };
 exports.APICDeployments = APICDeployments;
 const commonCmdArgsDescription = {
-  '--account [value]': `Override your default account config`,
-  '--region [value]': `Override your region config`,
-  '--no-cache': `Do not use cache when communicating with the server`,
+  '--account [value]': 'Override your default account config',
+  '--region [value]': 'Override your region config',
+  '--no-cache': 'Do not use cache when communicating with the server',
   '--base-url [value]': {
     hidden: true
   },
@@ -726,5 +726,7 @@ class IstioInstallValues {
   }
 
 }
+/** Provides information for a platform team. */
+
 
 exports.IstioInstallValues = IstioInstallValues;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.5.3",
+	"version": "2.6.0",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -43,7 +43,7 @@
 	"dependencies": {
 		"@axway/amplify-cli-utils": "^5.0.3",
 		"chalk": "^4.1.2",
-		"cli-kit": "^1.14.1",
+		"cli-kit": "^1.15.0",
 		"dayjs": "^1.10.7",
 		"easy-table": "^1.2.0",
 		"extract-zip": "^2.0.1",
@@ -60,42 +60,42 @@
 		"tmp": "^0.2.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.15.7",
-		"@babel/core": "^7.15.8",
-		"@babel/plugin-proposal-class-properties": "^7.14.5",
-		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-		"@babel/plugin-proposal-optional-chaining": "^7.14.5",
-		"@babel/preset-env": "^7.15.8",
-		"@babel/preset-typescript": "^7.15.0",
+		"@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",
 		"@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/js-yaml": "^4.0.4",
-		"@types/lodash": "^4.14.176",
+		"@types/js-yaml": "^4.0.5",
+		"@types/lodash": "^4.14.177",
 		"@types/mocha": "^9.0.0",
-		"@types/node": "^16.11.5",
+		"@types/node": "^16.11.10",
 		"@types/rx": "^4.1.2",
 		"@types/semver": "^7.3.9",
-		"@types/sinon": "^10.0.5",
+		"@types/sinon": "^10.0.6",
 		"@types/tmp": "^0.2.2",
 		"@types/update-notifier": "^5.1.0",
-		"@types/uuid": "^8.3.1",
+		"@types/uuid": "^8.3.3",
 		"babel-plugin-lodash": "^3.3.4",
 		"chai": "^4.3.4",
 		"chai-as-promised": "^7.1.1",
-		"core-js": "^3.19.0",
+		"core-js": "^3.19.1",
 		"mocha": "^9.1.3",
-		"nock": "^13.1.4",
-		"nodemon": "^2.0.14",
+		"nock": "^13.2.1",
+		"nodemon": "^2.0.15",
 		"nyc": "^15.1.0",
 		"prettier": "^2.4.1",
 		"sinon": "^11.1.2",
-		"source-map-support": "^0.5.20",
+		"source-map-support": "^0.5.21",
 		"ts-mocha": "^8.0.0",
-		"typescript": "^4.4.4"
+		"typescript": "^4.5.2"
 	},
 	"jest": {
 		"verbose": true,