@axway/axway-central-cli 2.3.0 → 2.5.1

package/dist/commands/get/index.js

@@ -49,7 +49,7 @@ const get = {
       attribute,
       baseUrl,
       cache,
-      clientId,
+      account,
       region,
       tag,
       title
@@ -65,7 +65,12 @@ const get = {
 
     try {
       // get specs and allowed words
-      const client = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region, cache);
+      const client = new _ApiServerClient.ApiServerClient({
+        baseUrl,
+        account,
+        region,
+        useCache: cache
+      });
       const defsManager = await new _DefinitionsManager.DefinitionsManager(client).init();
       const scope = (0, _utils.parseScopeParam)(argv.scope);
       const formattedFilter = (0, _utils.transformSimpleFilters)(title, attribute, tag);

package/dist/commands/install/agents.js

@@ -74,7 +74,7 @@ const agents = {
   }) {
     const {
       baseUrl,
-      clientId,
+      account,
       region,
       apicDeployment,
       cache,
@@ -85,9 +85,22 @@ const agents = {
 
     try {
       // initiate clients
-      const apiCentralClient = new _ApiCentralClient.ApiCentralClient(baseUrl, clientId, region);
-      const apiServerClient = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region, cache);
-      const platformClient = new _PlatformClient.PlatformClient(baseUrl, clientId, region);
+      const apiCentralClient = new _ApiCentralClient.ApiCentralClient({
+        baseUrl,
+        account,
+        region
+      });
+      const apiServerClient = new _ApiServerClient.ApiServerClient({
+        baseUrl,
+        account,
+        region,
+        useCache: cache
+      });
+      const platformClient = new _PlatformClient.PlatformClient({
+        baseUrl,
+        account,
+        region
+      });
       const defsManager = await new _DefinitionsManager.DefinitionsManager(apiServerClient).init(); // helper text
 
       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`));

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transactionLoggingMessages = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askToEnableTransactionLogging = exports.askServiceAccountName = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askAgentName = exports.agentMessages = void 0;
+exports.transactionLoggingMessages = exports.serviceAccountNameAlreadyExists = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.fetchServiceAccount = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askToEnableTransactionLogging = exports.askServiceAccountName = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askAgentName = exports.agentMessages = void 0;
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
@@ -71,39 +71,50 @@ const enterPrivateKeyPath = 'Enter the file path to the private key';
 exports.enterPrivateKeyPath = enterPrivateKeyPath;
 const selectIngestionProtocol = 'Select Traceability protocol';
 exports.selectIngestionProtocol = selectIngestionProtocol;
+const serviceAccountNameAlreadyExists = 'Service account already exists.  Please enter a new name.';
+exports.serviceAccountNameAlreadyExists = serviceAccountNameAlreadyExists;
 
-const askServiceAccountName = async () => {
-  console.warn(_chalk.default.yellow(`WARNING: Creating a new DOSA account will overwrite any existing "private_key.pem" and "public_key.pem" files in this directory`));
+const askServiceAccountName = async serviceAccounts => {
+  console.warn(_chalk.default.yellow(`WARNING: Creating a new DOSA account will overwrite any existing "private_key.pem" and "public_key.pem" files in this directory`)); // map to get sa names
+
+  const serviceAccountNames = serviceAccounts.map(a => a.name);
   const name = await (0, _basicPrompts.askInput)({
     msg: enterServiceAccountName,
     defaultValue: cliNowString,
-    validate: (0, _basicPrompts.validateRegex)(_regex.dosaRegex, _regex.invalidDosaName)
+    validate: (0, _basicPrompts.runValidations)((0, _basicPrompts.validateInputIsNew)(serviceAccountNames, serviceAccountNameAlreadyExists), (0, _basicPrompts.validateRegex)(_regex.dosaRegex, _regex.invalidDosaName))
   });
   return name;
 };
 
 exports.askServiceAccountName = askServiceAccountName;
 
-const askDosaClientId = async (client, showWarning = true) => {
+const fetchServiceAccount = async client => {
   const res = await client.getServiceAccounts();
   if (!res.data) throw Error('Get service accounts error.');
+  return res.data;
+};
+
+exports.fetchServiceAccount = fetchServiceAccount;
+
+const askDosaClientId = async (client, showWarning = true) => {
+  const serviceAccounts = await fetchServiceAccount(client);
   const answer = await (0, _basicPrompts.askList)({
     msg: selectServiceAccount,
     choices: [{
       name: 'Create a new account',
       value: 'CREATE_NEW'
-    }, new _inquirer.default.Separator(), ...res.data.map(a => a.name), new _inquirer.default.Separator()]
+    }, new _inquirer.default.Separator(), ...serviceAccounts.map(a => a.name), new _inquirer.default.Separator()]
   });
 
   if (answer === 'CREATE_NEW') {
-    const name = await askServiceAccountName();
+    const name = await askServiceAccountName(serviceAccounts);
     return {
       clientId: null,
       name,
       isNew: true
     };
   } else {
-    const dosa = res.data.find(a => a.name === answer);
+    const dosa = serviceAccounts.find(a => a.name === answer);
 
     if (showWarning) {
       console.log(_chalk.default.yellow('Please make sure your "private_key.pem" and "public_key.pem" files for the selected service account are copied to the folder location of the agents.'));

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

@@ -79,6 +79,12 @@ als:
   condorSslVerification: full
   enabled: {{istioAgentValues.alsEnabled}}
 
+  # sampling configuration
+  sampling:
+    percentage: {{traceabilityConfig.samplingPercentage}}
+    per_api: true
+    reportAllErrors: {{traceabilityConfig.samplingReportAllErrors}}
+
   # name of the secret containing the public & private keys used by the provided DOSA client ID
   keysSecretName: {{istioAgentValues.keysSecretName}}
   publishHeaders: true

package/dist/commands/install/platform.js

@@ -60,18 +60,15 @@ const getTraceabilityConfig = async installConfig => {
   traceabilityConfig.usageReportingOffline = installConfig.bundleType === _types.BundleType.TRACEABILITY_OFFLINE; // Do not ask Traceability questions in offline mode
 
   if (!traceabilityConfig.usageReportingOffline) {
-    console.log('\nCONNECTION TO TRACEABILITY MODULE:'); // Will remove this logic check once sampling is added to ISTIO.  For now, suppress askToEnableTransactionLogging
-
-    if (installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
-      const {
-        enabled,
-        samplingPercentage,
-        shouldReportAllErrors
-      } = await helpers.askToEnableTransactionLogging();
-      traceabilityConfig.enabled = enabled;
-      traceabilityConfig.samplingPercentage = samplingPercentage;
-      traceabilityConfig.samplingReportAllErrors = shouldReportAllErrors;
-    }
+    console.log('\nCONNECTION TO TRACEABILITY MODULE:');
+    const {
+      enabled,
+      samplingPercentage,
+      shouldReportAllErrors
+    } = await helpers.askToEnableTransactionLogging();
+    traceabilityConfig.enabled = enabled;
+    traceabilityConfig.samplingPercentage = samplingPercentage;
+    traceabilityConfig.samplingReportAllErrors = shouldReportAllErrors;
 
     if (traceabilityConfig.enabled) {
       const traceabilityProtocol = await helpers.askIngestionProtocol();

package/dist/commands/proxies/create.js

@@ -38,6 +38,7 @@ const action = async ({
   const {
     baseUrl,
     clientId,
+    account,
     force,
     json,
     proxyDefinition,
@@ -55,6 +56,7 @@ const action = async ({
       baseUrl,
       basePath: _types.BasePaths.Aggregator,
       clientId,
+      account,
       region
     });
     const body = new _formData.default();

package/dist/commands/proxies/index.js

@@ -21,6 +21,7 @@ const proxies = {
   },
   desc: 'Manage API proxies',
   options: { ..._types.commonCmdArgsDescription,
+    '--client-id [value]': `Override your DevOps account's client ID`,
     '--json': 'Show JSON output'
   }
 };

package/dist/commands/proxies/promote.js

@@ -38,6 +38,7 @@ const action = async ({
   const {
     baseUrl,
     clientId,
+    account,
     region,
     json,
     proxyDefinition,
@@ -56,6 +57,7 @@ const action = async ({
       baseUrl,
       basePath: _types.BasePaths.Aggregator,
       clientId,
+      account,
       region
     });
     const body = new _formData.default();

package/dist/common/ApiCentralClient.js

@@ -20,16 +20,20 @@ const {
 } = (0, _snooplogg.default)('central:class.ApiCentralClient');
 
 class ApiCentralClient {
-  constructor(baseUrl, clientId, region) {
+  constructor({
+    baseUrl,
+    region,
+    account
+  }) {
     _defineProperty(this, "baseUrl", void 0);
 
-    _defineProperty(this, "clientId", void 0);
-
     _defineProperty(this, "region", void 0);
 
-    log(`initializing client with params: baseUrl = ${baseUrl}, clientId = ${clientId}, region = ${region}`);
+    _defineProperty(this, "account", void 0);
+
+    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}`);
     this.baseUrl = baseUrl;
-    this.clientId = clientId;
+    this.account = account;
     this.region = region;
   }
   /**
@@ -50,7 +54,7 @@ class ApiCentralClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         basePath: _types.BasePaths.ApiCentral,
-        clientId: this.clientId,
+        account: this.account,
         region: this.region
       });
       const payload = {
@@ -88,7 +92,7 @@ class ApiCentralClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         basePath: _types.BasePaths.ApiCentral,
-        clientId: this.clientId,
+        account: this.account,
         region: this.region
       });
       const response = await service.getWithPagination(`/serviceAccounts`, 'type==SA&sort=modifyTime%2CDESC');

package/dist/common/ApiServerClient.js

@@ -44,18 +44,23 @@ class ApiServerClient {
    * Init temporary file if "data" is provided - write data to file (as YAML at the moment)
    * @param {object} data optional data to write while creating file
    */
-  constructor(baseUrl, clientId, region, useCache) {
+  constructor({
+    baseUrl,
+    region,
+    account,
+    useCache
+  } = {}) {
     _defineProperty(this, "baseUrl", void 0);
 
-    _defineProperty(this, "clientId", void 0);
-
     _defineProperty(this, "region", void 0);
 
     _defineProperty(this, "useCache", void 0);
 
-    log(`initializing client with params: baseUrl = ${baseUrl}, clientId = ${clientId}, region = ${region}, useCache = ${useCache}`);
+    _defineProperty(this, "account", void 0);
+
+    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}, useCache = ${useCache}`);
     this.baseUrl = baseUrl;
-    this.clientId = clientId;
+    this.account = account;
     this.region = region;
     this.useCache = useCache === undefined ? true : useCache; // using cache by default
   }
@@ -105,8 +110,8 @@ class ApiServerClient {
 
     const service = await (0, _dataService.dataService)({
       baseUrl: this.baseUrl,
-      clientId: this.clientId,
-      region: this.region
+      region: this.region,
+      account: this.account
     });
     const baseUrl = this.buildResourceBaseUrl({
       resourceDef,
@@ -232,8 +237,8 @@ class ApiServerClient {
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -305,8 +310,8 @@ class ApiServerClient {
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -378,8 +383,8 @@ class ApiServerClient {
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -457,8 +462,8 @@ class ApiServerClient {
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -507,8 +512,8 @@ class ApiServerClient {
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const url = this.buildResourceBaseUrl({
         resourceDef,
@@ -544,8 +549,8 @@ class ApiServerClient {
       const specs = {};
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
-        clientId: this.clientId,
-        region: this.region
+        region: this.region,
+        account: this.account
       });
       const groups = await service.getWithPagination(`/definitions/${version}/groups`);
 

package/dist/common/CliConfigManager.js

@@ -23,10 +23,11 @@ exports.CliConfigKeys = CliConfigKeys;
 (function (CliConfigKeys) {
   CliConfigKeys["APIC_DEPLOYMENT"] = "apic-deployment";
   CliConfigKeys["BASE_URL"] = "base-url";
-  CliConfigKeys["CLIENT_ID"] = "client-id";
+  CliConfigKeys["ACCOUNT"] = "account";
   CliConfigKeys["REGION"] = "region";
   CliConfigKeys["PLATFORM"] = "platform";
   CliConfigKeys["EXTENSIONS"] = "extensions";
+  CliConfigKeys["CLIENT_ID"] = "client-id";
 })(CliConfigKeys || (exports.CliConfigKeys = CliConfigKeys = {}));
 
 class CliConfigManager {
@@ -34,7 +35,26 @@ class CliConfigManager {
     (0, _fsExtra.outputJsonSync)(CliConfigManager.configFilePath, values, {
       spaces: '\t'
     });
-  } // Note: current validation is good for "unset" but for set its needed to validate the value for "extensions" (should be non-empty)
+  }
+  /**
+   * Temporary validator for config file content. Needed only to cleanup some values from config files for a couple of
+   * versions, remove it after some time.
+   */
+
+
+  validateSavedConfigKeys() {
+    const deprecatedKeys = [// TODO: a few other configs might be getting deprecated: https://jira.axway.com/browse/APIGOV-19737
+    // CliConfigKeys.PLATFORM,
+    CliConfigKeys.CLIENT_ID];
+    const keysToRemove = Object.keys(this.getAll()).filter(key => deprecatedKeys.includes(key));
+
+    if (keysToRemove.length) {
+      throw Error(`Following Axway Central CLI config keys has been deprecated and no longer needed: ${keysToRemove.join(', ')}
+Please unset by running:
+${keysToRemove.map(key => `axway central config unset ${key}`).join('\n')}
+			`);
+    }
+  } // Note: current validation is good for "unset" but for "set" its needed to validate the value for "extensions" (should be non-empty)
 
 
   validate(key) {

package/dist/common/CoreConfigController.js

@@ -28,61 +28,83 @@ const {
 class CoreConfigController {
   /**
    * Get authentication info
-   * @param clientId client id to use, if not provided and nothing stored in Central CLI configs "amplify-cli" is used by default
-   * @returns object containing token and orgId. For DOSA accounts orgId is undefined.
+   * @param clientId client id to use
+   * @returns object containing token and orgId. For service accounts orgId is undefined.
    * @throws 401 if no authenticated account found.
    */
   async getAuthInfo({
-    accountName,
+    account,
     clientId
   } = {}) {
     var _CoreConfigController;
 
-    const configCtrl = new _CliConfigManager.CliConfigManager();
-    const devOpsClientId = clientId ? clientId : configCtrl.get(_CliConfigManager.CliConfigKeys.CLIENT_ID) || _types.defaultClientId;
-    log(`getAuthInfo, using clientId = ${devOpsClientId}, accountName = ${accountName}`);
+    const configCtrl = new _CliConfigManager.CliConfigManager(); // note: remove this validator after couple of versions
 
-    if (!CoreConfigController.devOpsAccount || CoreConfigController.devOpsAccount.auth.clientId !== devOpsClientId) {
-      log(`getAuthInfo, no cached devOpsAccount found, or clientId does not match`);
-      const baseUrl = configCtrl.get(_CliConfigManager.CliConfigKeys.BASE_URL);
-      const platform = configCtrl.get(_CliConfigManager.CliConfigKeys.PLATFORM); // environment defined by using central cli "platform" or "base-url" configs if set,
+    configCtrl.validateSavedConfigKeys();
+    log(`getAuthInfo, received clientId = ${clientId}, account = ${account}`);
+
+    if (!CoreConfigController.devOpsAccount || account && CoreConfigController.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 env = platform || (!baseUrl || baseUrl === _types.ProdBaseUrls.US || baseUrl === _types.ProdBaseUrls.EU ? undefined : 'preprod');
-      log(`getAuthInfo, baseUrl = ${baseUrl}, platform = ${platform}, env = ${env}`);
+      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)({
-        clientId: devOpsClientId,
-        env
-      }); // TODO: filtering by the clientId will not be needed when https://jira.axway.com/browse/APIGOV-20702 is fixed
-
-      const list = (await sdk.auth.list()).filter(a => a.auth.clientId === devOpsClientId);
-      log(`getAuthInfo, matching accounts found: ${list.length}`);
-
-      if (list.length > 1) {
-        // try to find the default one
-        const defaultAccount = list.find(a => a.name === accountName || a.name === config.get('auth.defaultAccount'));
-
-        if (defaultAccount) {
-          CoreConfigController.devOpsAccount = await sdk.auth.find(defaultAccount.name);
-        } else if (!accountName) {
-          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 "${selectedName}" account by default, run: axway config set auth.defaultAccount ${selectedName}}\n`);
-          CoreConfigController.devOpsAccount = await sdk.auth.find(selectedName);
+        env: environment
+      });
+
+      if (clientId) {
+        // TODO: client-id is a legacy option used only by proxies promote/create, should be removed
+        // https://jira.axway.com/browse/APIGOV-20818
+        log(`getAuthInfo, clientId value passed, trying to find a matching account`);
+        const list = await sdk.auth.list({
+          verify: true
+        });
+        const matchingAccount = list.find(a => a.auth.clientId === clientId);
+        if (matchingAccount) CoreConfigController.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);
+      } else {
+        // ELSE: trying to get any authenticated account
+        log(`getAuthInfo, account value not passed, trying to find default/any match`);
+        const list = await sdk.auth.list({
+          verify: true
+        });
+        log(`getAuthInfo, authenticated accounts found: ${list.length}`);
+
+        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);
+        } 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);
+          }
         }
-      } else if (list.length === 1) {
-        CoreConfigController.devOpsAccount = await sdk.auth.find(accountName || list[0].name);
       }
 
       if (!CoreConfigController.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-20818
+        // https://jira.axway.com/browse/APIGOV-20520
         log(`getAuthInfo, no devOpsAccount set after all, throwing 401`); // const title: string = accountName
         // 	? `Account "${accountName}" cannot be found`
         // 	: 'No authenticated accounts found.';
@@ -93,14 +115,14 @@ class CoreConfigController {
         throw {
           errors: [{
             status: 401,
-            title: accountName ? `Account "${accountName}" cannot be found` : 'No authenticated accounts found.'
+            title: account ? `Account "${account}" cannot be found` : 'No authenticated accounts found.'
           }]
         };
       }
     }
 
     const token = CoreConfigController.devOpsAccount.auth.tokens.access_token;
-    const orgId = (devOpsClientId === null || devOpsClientId === void 0 ? void 0 : devOpsClientId.substring(0, 5)) === 'DOSA_' ? undefined : `${CoreConfigController.devOpsAccount.org.id}`;
+    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)}`);
@@ -113,14 +135,15 @@ class CoreConfigController {
     };
   }
   /**
-   * Get all config from core cli.
-   * @returns entire object with core cli config.
+   * Get all or specific config value from core cli.
+   * @returns entire object config or a specific value if key passed.
    */
 
 
-  getConfig() {
-    log(`getConfig`);
-    return (0, _amplifyCliUtils.loadConfig)().get();
+  getConfig(key) {
+    log(`getConfig, key = ${key}`); // note: not using loadConfig().get(key) because of config mocks setup for tests.
+
+    return key ? (0, _amplifyCliUtils.loadConfig)().get()[key] : (0, _amplifyCliUtils.loadConfig)().get();
   }
 
   static getEnv() {

package/dist/common/PlatformClient.js

@@ -20,16 +20,20 @@ const {
 } = (0, _snooplogg.default)('central:class.PlatformClient');
 
 class PlatformClient {
-  constructor(baseUrl, clientId, region) {
+  constructor({
+    baseUrl,
+    region,
+    account
+  } = {}) {
     _defineProperty(this, "baseUrl", void 0);
 
-    _defineProperty(this, "clientId", void 0);
+    _defineProperty(this, "account", void 0);
 
     _defineProperty(this, "region", void 0);
 
-    log(`initializing client with params: baseUrl = ${baseUrl}, clientId = ${clientId}, region = ${region}`);
+    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}`);
     this.baseUrl = baseUrl;
-    this.clientId = clientId;
+    this.account = account;
     this.region = region;
   }
 
@@ -44,7 +48,7 @@ class PlatformClient {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
         basePath: _types.BasePaths.Platform,
-        clientId: this.clientId
+        account: this.account
       }); // Not using "getWithPagination" method here because /teams API does not support pagination
 
       const response = await service.get('/team');

package/dist/common/Renderer.js

@@ -241,13 +241,16 @@ class Renderer {
     if ((this.output === _types.OutputTypes.json || this.output === _types.OutputTypes.yaml) && !ignoreOutputParam) {
       // IF output param has been provided and ignoreOutputParam is not set - render the error in the yaml or json format.
       // Rendering ApiServer errors as-is, other errors as { name, message } object.
-      const err = (0, _utils.isApiServerErrorType)(error) || (0, _utils.isApiServerErrorResponseType)(error) ? error : {
+      const err = (0, _utils.isApiServerErrorType)(error) || (0, _utils.isApiServerErrorResponseType)(error) ? // note: direct catch of "dataService" methods returns "got" error, which is an instance of Error
+      // AND isApiServerErrorResponseType === true with error.name === 'HTTPError'. So trying to get "errors"
+      // array or error as-is
+      error instanceof Error && error.name === 'HTTPError' && error.errors ? error.errors : error : {
         name: error.name,
         message: error.message
       };
       (0, _resultsRenderers.renderResponse)(this._console, err, this.output);
-    } else if (error instanceof Error) {
-      // ELSE IF some generic error is happening
+    } else if (error instanceof Error && error.name !== 'HTTPError') {
+      // ELSE IF some generic error is happening (and its not an instance of "got" HTTPError)
       const message = error.name === 'AbortError' ? `Error: couldn't connect to Amplify Central` : `${error.name}: ${error.message}`;
       this.error(message);
     } else {
@@ -264,9 +267,6 @@ class Renderer {
           this.console((0, _cliKit.chalk)`{cyan axway auth login}`);
           this.console('Or if using a service account:');
           this.console((0, _cliKit.chalk)`{cyan axway auth login --client-id <Service Account Client ID> --secret-file <Private Key>}`);
-          this.console((0, _cliKit.chalk)`{cyan axway central config set --client-id=<Service Account Client ID>}`);
-          this.console(`Or if no longer using a service account:`);
-          this.console((0, _cliKit.chalk)`{cyan axway central config unset client-id}`);
           break;
 
         case 400:

package/dist/common/dataService.js

@@ -85,7 +85,7 @@ const handleResponse = response => {
 };
 
 const dataService = async ({
-  accountName,
+  account,
   baseUrl,
   basePath = _types.BasePaths.ApiServer,
   clientId,
@@ -98,7 +98,7 @@ const dataService = async ({
     orgRegion,
     token
   } = await new _CoreConfigController.CoreConfigController().getAuthInfo({
-    accountName,
+    account,
     clientId
   });
   const url = await getBaseUrl(baseUrl, basePath, region, orgRegion);