@axway/axway-central-cli 2.5.1 → 2.6.1

package/README.md

@@ -2,7 +2,7 @@
 
 Axway Central CLI package for managing Amplify Central resources and DevOps operations.
 
-**For more documentation and examples please visit [Amplify Central CLI documentation portal](https://docs.axway.com/bundle/axway-open-docs/page/docs/central/cli_central/index.html).**
+**For more documentation and examples please visit [Amplify Central CLI documentation portal](https://docs.axway.com/bundle/amplify-central/page/docs/integrate_with_central/cli_central/index.html).**
 
 # Installation
 
@@ -250,7 +250,7 @@ PROXIES OPTIONS:
   --json  Show JSON output
 ```
 
-CLI supports multiple versions of proxy definition file. For more details and examples visit our [docs portal](https://docs.axway.com/bundle/axway-open-docs/page/docs/central/cli_central/index.html) and [stoplight hub](https://d-api.docs.stoplight.io/).
+CLI supports multiple versions of proxy definition file. For more details and examples visit our [docs portal](https://docs.axway.com/bundle/amplify-central/page/docs/integrate_with_central/cli_central/index.html) and [stoplight hub](https://d-api.docs.stoplight.io/).
 
 - **v0**
 

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/agents.js

@@ -9,8 +9,6 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _ApiCentralClient = require("../../common/ApiCentralClient");
-
 var _ApiServerClient = require("../../common/ApiServerClient");
 
 var _basicPrompts = require("../../common/basicPrompts");
@@ -84,12 +82,7 @@ const agents = {
     const render = new _Renderer.default(console);
 
     try {
-      // initiate clients
-      const apiCentralClient = new _ApiCentralClient.ApiCentralClient({
-        baseUrl,
-        account,
-        region
-      });
+      // initialize clients
       const apiServerClient = new _ApiServerClient.ApiServerClient({
         baseUrl,
         account,
@@ -144,7 +137,7 @@ const agents = {
       } // get platform connectivity
 
 
-      installConfig.centralConfig = await platform.getCentralConfig(apiCentralClient, apiServerClient, platformClient, defsManager, apicDeployment, installConfig); // Create the object of GatewayTypes -> GatewayConnectivity functions
+      installConfig.centralConfig = await platform.getCentralConfig(apiServerClient, platformClient, defsManager, apicDeployment, installConfig); // Create the object of GatewayTypes -> GatewayConnectivity functions
 
       installConfig.gatewayConfig = await agentInstallFlow.AskGatewayQuestions(installConfig, apiServerClient, defsManager); // traceability options
 
@@ -157,7 +150,7 @@ const agents = {
 
       if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize platform setup
 
-      installConfig = await platform.finalizeCentralInstall(apiCentralClient, apiServerClient, platformClient, defsManager, installConfig); // finalize gateway setup and output
+      installConfig = await platform.finalizeCentralInstall(apiServerClient, platformClient, defsManager, installConfig); // finalize gateway setup and output
 
       await agentInstallFlow.FinalizeGatewayInstall(installConfig, apiServerClient, defsManager);
     } catch (e) {

package/dist/commands/install/edgeAgents.js

@@ -317,7 +317,7 @@ const completeInstall = async installConfig => {
 
     await helpers.createSecret(v7AgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, async () => {
       if (installConfig.centralConfig.ampcDosaInfo.isNew) {
-        console.log(_cliKit.chalk.yellow(`The secret '${helpers.amplifyAgentsKeysSecret}' will be created with the same "private_key.pem" and "public_key.pem" that was auto generated to create the DOSA Account.`));
+        console.log(_cliKit.chalk.yellow(`The secret '${helpers.amplifyAgentsKeysSecret}' will be created with the same "private_key.pem" and "public_key.pem" that was auto generated to create the Service Account.`));
       }
 
       await helpers.createAmplifyAgentKeysSecret(v7AgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, 'public_key', v7AgentValues.centralConfig.dosaAccount.publicKey, 'private_key', v7AgentValues.centralConfig.dosaAccount.privateKey);

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

@@ -13,6 +13,8 @@ var _bashCommands = require("../../../common/bashCommands");
 
 var _Kubectl = require("../../../common/Kubectl");
 
+var _PlatformClient = require("../../../common/PlatformClient");
+
 var _types = require("../../../common/types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -48,18 +50,15 @@ const createDosaAndCerts = async (client, name) => {
 
   const publicCert = _fsExtra.default.readFileSync(publicKey).toString();
 
-  const result = await client.createDOSAAccount(name, publicCert);
-
-  if (!result.data) {
-    var _result$error;
-
-    throw Error(`Cannot create service account${(_result$error = result.error) !== null && _result$error !== void 0 && _result$error.length ? `: ${result.error[0].title}` : '.'}`);
-  } else {
-    console.log(_chalk.default.green(`New service account "${result.data.name}" with clientId "${result.data.clientId}" has been successfully created.`));
-    console.log(_chalk.default.green(`The private key has been placed at ${privateKey}\nThe public key has been placed at ${publicKey}`));
-  }
-
-  return new _types.DosaAccount(result.data.clientId, publicKey, privateKey);
+  const account = await client.createServiceAccount({
+    name: name,
+    desc: name,
+    publicKey: publicCert,
+    roles: [_PlatformClient.PlatformServiceAccountRole.ApiCentralAdmin]
+  });
+  console.log(_chalk.default.green(`New service account "${account.name}" with clientId "${account.client_id}" has been successfully created.`));
+  console.log(_chalk.default.green(`The private key has been placed at ${privateKey}\nThe public key has been placed at ${publicKey}`));
+  return new _types.DosaAccount(account.client_id, publicKey, privateKey);
 };
 
 exports.createDosaAndCerts = createDosaAndCerts;
@@ -85,9 +84,9 @@ const createByResourceType = async (client, defsManager, name, resourceType, res
   });
 
   if (!result.data) {
-    var _result$error2;
+    var _result$error;
 
-    throw Error(`Cannot create a new ${resourceType.toLowerCase()}${(_result$error2 = result.error) !== null && _result$error2 !== void 0 && _result$error2.length ? `: ${result.error[0].detail}` : '.'}`);
+    throw Error(`Cannot create a new ${resourceType.toLowerCase()}${(_result$error = result.error) !== null && _result$error !== void 0 && _result$error.length ? `: ${result.error[0].detail}` : '.'}`);
   } else {
     console.log(`New ${resourceType.toLowerCase()} "${result.data.name}" has been successfully created.`);
   }
@@ -123,9 +122,9 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
   });
 
   if (!result.data) {
-    var _result$error3;
+    var _result$error2;
 
-    throw Error(`Cannot create a new agent ${(_result$error3 = result.error) !== null && _result$error3 !== void 0 && _result$error3.length ? `: ${result.error[0].detail}` : '.'}`);
+    throw Error(`Cannot create a new agent ${(_result$error2 = result.error) !== null && _result$error2 !== void 0 && _result$error2.length ? `: ${result.error[0].detail}` : '.'}`);
   } else {
     console.log(`New agent of type "${defs[0].resource.name}" named "${result.data.name}" has been successfully created.`);
   }

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

@@ -174,10 +174,10 @@ const configFiles = {
 };
 exports.configFiles = configFiles;
 const agentsDocsUrl = {
-  V7: 'https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-api-manager/gateway-administation/index.html',
-  AWS: 'https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-aws-gateway/cloud-administration-operation/index.html',
-  AZURE: 'https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-azure-gateway/index.html',
-  ISTIO: 'https://docs.axway.com/bundle/axway-open-docs/page/docs/central/mesh_management/index.html'
+  V7: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/index.html',
+  AWS: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_aws_gateway/index.html',
+  AZURE: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_azure_gateway/index.html',
+  ISTIO: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html'
 }; // export * from './updaters';
 
 exports.agentsDocsUrl = agentsDocsUrl;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+exports.transactionLoggingMessages = exports.serviceAccountNameAlreadyExists = 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;
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
@@ -61,7 +61,7 @@ const secretAlreadyExists = 'Secret already exists. Please enter a new name.';
 exports.secretAlreadyExists = secretAlreadyExists;
 const enterNamespaceName = 'Enter a new namespace name';
 exports.enterNamespaceName = enterNamespaceName;
-const selectServiceAccount = 'Select a service account (DOSA)';
+const selectServiceAccount = 'Select a service account';
 exports.selectServiceAccount = selectServiceAccount;
 const enterServiceAccountName = 'Enter a new service account name';
 exports.enterServiceAccountName = enterServiceAccountName;
@@ -74,10 +74,8 @@ exports.selectIngestionProtocol = selectIngestionProtocol;
 const serviceAccountNameAlreadyExists = 'Service account already exists.  Please enter a new name.';
 exports.serviceAccountNameAlreadyExists = serviceAccountNameAlreadyExists;
 
-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 askServiceAccountName = async serviceAccountNames => {
+  console.warn(_chalk.default.yellow(`WARNING: Creating a new service account will overwrite any existing "private_key.pem" and "public_key.pem" files in this directory`));
   const name = await (0, _basicPrompts.askInput)({
     msg: enterServiceAccountName,
     defaultValue: cliNowString,
@@ -88,41 +86,38 @@ const askServiceAccountName = async serviceAccounts => {
 
 exports.askServiceAccountName = askServiceAccountName;
 
-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)({
+  // Fetch all existing service accounts.
+  const serviceAccounts = await client.getServiceAccounts();
+  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)({
     msg: selectServiceAccount,
     choices: [{
-      name: 'Create a new account',
+      name: 'Create a new service account',
       value: 'CREATE_NEW'
-    }, new _inquirer.default.Separator(), ...serviceAccounts.map(a => a.name), new _inquirer.default.Separator()]
+    }, new _inquirer.default.Separator(), ...serviceAccountNames, new _inquirer.default.Separator()]
   });
 
-  if (answer === 'CREATE_NEW') {
-    const name = await askServiceAccountName(serviceAccounts);
+  if (selectedName === 'CREATE_NEW') {
+    // We're going to create a new service account. Ask for a unique name. (We'll create it later.)
+    const name = await askServiceAccountName(serviceAccountNames);
     return {
       clientId: null,
       name,
       isNew: true
     };
   } else {
-    const dosa = serviceAccounts.find(a => a.name === answer);
-
+    // We're using an existing service account. Notify user to make its keys available to the agents.
     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.'));
-    }
+    } // Fetch selected service account's client ID and return info about it.
+
 
+    const selectedAccount = serviceAccounts.find(nextAccount => nextAccount.name === selectedName);
     return {
-      clientId: dosa.clientId,
-      name: dosa.name,
+      clientId: selectedAccount === null || selectedAccount === void 0 ? void 0 : selectedAccount.client_id,
+      name: selectedName,
       isNew: false
     };
   }
@@ -244,7 +239,7 @@ const askEnvironmentName = async (client, defsManager, isAxwayManaged = null) =>
     choices: [{
       name: envMessages.createNewEnvironment,
       value: 'CREATE_NEW'
-    }, new _inquirer.default.Separator(), ...envs.map(e => e.name), new _inquirer.default.Separator()]
+    }, new _inquirer.default.Separator(), ...envs.map(e => e.name).sort((name1, name2) => name1.localeCompare(name2)), new _inquirer.default.Separator()]
   });
 
   if (answer === 'CREATE_NEW') {
@@ -332,11 +327,11 @@ const askAgentName = async (client, defsManager, agentType, scopeName) => {
 };
 /**
  * @description Create a secret that contains a public & private key pair for agents to connect to central.
- * If a user is creating a new DOSA account, then the keys should be passed in as args.
- * If they are using an existing account, then the user will be prompted for the keys that created the DOSA account.
+ * If a user is creating a new service account, then the keys should be passed in as args.
+ * If they are using an existing account, then the user will be prompted for the keys that created the service account.
  * @param namespace The namespace to create the secret in.
  * @param secretName The name of the secret.
- * @param publicKey The file path to the public key attached to the chosen DOSA.
+ * @param publicKey The file path to the public key attached to the chosen service account.
  * @param privateKey The file path to the corresponding private key.
  */
 
@@ -395,7 +390,7 @@ const askPrivateKeyPath = async () => await (0, _basicPrompts.askInput)({
 exports.askPrivateKeyPath = askPrivateKeyPath;
 
 const askPublicAndPrivateKeysPath = async () => {
-  console.log(_chalk.default.yellow('Please provide the same "private_key.pem" and "public_key.pem" that was used to create the selected DOSA Account.'));
+  console.log(_chalk.default.yellow('Please provide the same "private_key.pem" and "public_key.pem" that was used to create the selected Service Account.'));
   const publicKey = await askPublicKeyPath();
   const privateKey = await askPrivateKeyPath();
   return [publicKey, privateKey];

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

@@ -178,9 +178,9 @@ fullnameOverride: ""
 # Health Check port
 statusPort: 8990
 
-# Info on how to fetch the values for the env parameters can ve found in the below doc.
-# https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-api-manager/gateway-administation/index.html#customizing-the-traceability-agent-environment-variable-file
-# More environment value: https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-api-manager/agent-variables/index.html#common-variables-to-both-agents
+# The following links document the environment variables for traceability.
+# https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#common-variables-to-both-agents
+# https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#specific-variables-for-traceability-agent
 env:
   APIGATEWAY_HEALTHCHECKPORT: 8090
   APIGATEWAY_HEALTHCHECKPROTOCOL: "https"
@@ -304,9 +304,9 @@ fullnameOverride: ""
 # Health Check port
 statusPort: 8989
 
-# Info on how to fetch the values for the env parameters can ve found in the below doc.
-# https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-api-manager/gateway-administation/index.html#customizing-the-discovery-agent-environment-variable-file
-# More environment value: https://docs.axway.com/bundle/axway-open-docs/page/docs/central/connect-api-manager/agent-variables/index.html#common-variables-to-both-agents
+# The following links document the environment variables for discovery.
+# https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#common-variables-to-both-agents
+# https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#specific-variables-for-discovery-agent
 env:
   APIMANAGER_HOST: {{apiManagerHost}}
   APIMANAGER_PORT: {{apiManagerPort}}

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

@@ -71,7 +71,7 @@ als:
   # distinguishes events between apic deployments
   apicDeployment: {{centralConfig.deployment}}
 
-  # DOSA client ID
+  # service account client ID
   clientID: {{centralConfig.dosaAccount.clientId}}
 
   # condor ingestion endpoint
@@ -85,7 +85,7 @@ als:
     per_api: true
     reportAllErrors: {{traceabilityConfig.samplingReportAllErrors}}
 
-  # name of the secret containing the public & private keys used by the provided DOSA client ID
+  # name of the secret containing the public & private keys used by the provided service account client ID
   keysSecretName: {{istioAgentValues.keysSecretName}}
   publishHeaders: true
 
@@ -93,7 +93,7 @@ als:
 
 # discovers API Documentation
 ada:
-  # DOSA client ID
+  # service account client ID
   clientID: {{centralConfig.dosaAccount.clientId}}
 
   # name of the K8SCluster the agent is connected to
@@ -101,12 +101,12 @@ ada:
   command: apis
   enabled: {{istioAgentValues.discoveryEnabled}}
 
-  # name of the secret containing the public & private keys used by the provided DOSA client ID
+  # name of the secret containing the public & private keys used by the provided service account client ID
   keysSecretName: {{istioAgentValues.keysSecretName}}
 
 # discovers running pods/services
 rda:
-  # DOSA client ID
+  # service account client ID
   clientID: {{centralConfig.dosaAccount.clientId}}
 
   # name of the connected K8SCluster
@@ -114,7 +114,7 @@ rda:
   command: resources
   enabled: {{istioAgentValues.discoveryEnabled}}
 
-  # name of the secret containing the public & private keys used by the provided DOSA client ID
+  # name of the secret containing the public & private keys used by the provided service account client ID
   keysSecretName: {{istioAgentValues.keysSecretName}}
 
 # to enable deployment of demo list service with agent installation. Set to true to install the demo service

package/dist/commands/install/istioAgents.js

@@ -100,7 +100,7 @@ const gatewayConnectivity = async (installConfig, apiServerClient, defsManager)
 The Amplify Istio Traceability Agent needs to be deployed to your Kubernetes cluster to collect transaction telemetry to send to the Amplify Central Observer and Visibility Dashboard.`));
   console.log(`
 For more details on client prerequesites or Kubernetes preparation refer to the documentation here:
-https://docs.axway.com/bundle/axway-open-docs/page/docs/central/mesh_management/build_hybrid_env/index.html
+https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/build_hybrid_env/index.html
 `);
   const {
     error
@@ -398,11 +398,11 @@ const createHybridOverride = overrides => {
 exports.createHybridOverride = createHybridOverride;
 
 const installPreprocess = async installConfig => {
-  // name of the dosa account, and if it is new or not
+  // name of the service account, and if it is new or not
   if (!installConfig.centralConfig.ampcDosaInfo.isNew) {
     [installConfig.centralConfig.dosaAccount.publicKey, installConfig.centralConfig.dosaAccount.privateKey] = await helpers.askPublicAndPrivateKeysPath();
   } else {
-    console.log(_chalk.default.yellow(`The secret will be created with the same "private_key.pem" and "public_key.pem" that will be auto generated to create the DOSA Account, following the completion of these prompts.`));
+    console.log(_chalk.default.yellow(`The secret will be created with the same "private_key.pem" and "public_key.pem" that will be auto generated to create the Service Account, following the completion of these prompts.`));
   }
 
   return installConfig;
@@ -424,7 +424,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
 
   await helpers.createSecret(istioValues.istioAgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, async () => {
     if (installConfig.centralConfig.ampcDosaInfo.isNew) {
-      console.log(_chalk.default.yellow(`The secret '${helpers.amplifyAgentsKeysSecret}' will be created with the same "private_key.pem" and "public_key.pem" that was auto generated to create the DOSA Account.`));
+      console.log(_chalk.default.yellow(`The secret '${helpers.amplifyAgentsKeysSecret}' will be created with the same "private_key.pem" and "public_key.pem" that was auto generated to create the Service Account.`));
     }
 
     await helpers.createAmplifyAgentKeysSecret(istioValues.istioAgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, 'publicKey', istioValues.centralConfig.dosaAccount.publicKey, 'privateKey', istioValues.centralConfig.dosaAccount.privateKey);

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),
-    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
   });
 };
 
@@ -82,12 +86,12 @@ const getTraceabilityConfig = async installConfig => {
 
 exports.getTraceabilityConfig = getTraceabilityConfig;
 
-const getCentralConfig = async (apiCentralClient, apiServerClient, platformClient, defsManager, apicDeployment, installConfig) => {
+const getCentralConfig = async (apiServerClient, platformClient, defsManager, apicDeployment, installConfig) => {
   // initiate CentralAgentConfig
   let centralConfig = installConfig.centralConfig;
   await centralConfig.setBaseHost();
   centralConfig.authUrl = `${_CoreConfigController.CoreConfigController.getAuthUrl()}/auth`;
-  centralConfig.region = String(apiCentralClient.region || (await (0, _utils.getConfig)())[_types.ConfigTypes.REGION] || _types.Regions.US).toUpperCase();
+  centralConfig.region = String(apiServerClient.region || (await (0, _utils.getConfig)())[_types.ConfigTypes.REGION] || _types.Regions.US).toUpperCase();
   centralConfig.deployment = apicDeployment || getApicDeployment(centralConfig.region, _CoreConfigController.CoreConfigController.getEnv()); // apic config
 
   console.log('\nCONNECTION TO AMPLIFY PLATFORM:');
@@ -104,7 +108,7 @@ const getCentralConfig = async (apiCentralClient, apiServerClient, platformClien
   };
 
   if (installConfig.bundleType !== _types.BundleType.TRACEABILITY_OFFLINE) {
-    centralConfig.ampcDosaInfo = await helpers.askDosaClientId(apiCentralClient);
+    centralConfig.ampcDosaInfo = await helpers.askDosaClientId(platformClient);
   } // Get the DA Agent name
 
 
@@ -126,14 +130,14 @@ const getCentralConfig = async (apiCentralClient, apiServerClient, platformClien
 
 exports.getCentralConfig = getCentralConfig;
 
-const finalizeCentralInstall = async (apiCentralClient, apiServerClient, platformClient, defsManager, installConfig) => {
+const finalizeCentralInstall = async (apiServerClient, platformClient, defsManager, installConfig) => {
   /**
    * Create agent resources
    */
   console.log('Creating agent resources');
 
   if (installConfig.centralConfig.ampcDosaInfo.isNew) {
-    installConfig.centralConfig.dosaAccount = await helpers.createDosaAndCerts(apiCentralClient, installConfig.centralConfig.ampcDosaInfo.name);
+    installConfig.centralConfig.dosaAccount = await helpers.createDosaAndCerts(platformClient, installConfig.centralConfig.ampcDosaInfo.name);
   } else {
     installConfig.centralConfig.dosaAccount.clientId = installConfig.centralConfig.ampcDosaInfo.clientId;
   }

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,