@axway/axway-central-cli 2.4.1 → 2.5.3

package/README.md

@@ -456,8 +456,8 @@ USAGE: axway central create <command> [options]
 Create one or more resources from a file or stdin
 
 CREATE COMMANDS:
-  environment   Create an environment with the specified name
-  service-account Create a service account
+  agent-resource  Create an agent resource
+  environment     Create an environment with the specified name
 
 CREATE OPTIONS:
   --account [value]                                  Override your default account config
@@ -504,8 +504,6 @@ axway central create env newenv
 axway central create environment newenv -o yaml
 # create multiple resources from file
 axway central create -f ./some/folder/resources.yaml
-# create a service account(DOSA)
-axway central create service-account
 # create an agent resource
 axway central create agent-resource
 ```

package/dist/commands/create/serviceAccount.js

@@ -5,57 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.serviceAccount = void 0;
 
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
-var _ApiCentralClient = require("../../common/ApiCentralClient");
-
-var _bashCommands = require("../../common/bashCommands");
-
-var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
-
-var _helpers = require("../install/helpers");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const {
-  log
-} = (0, _snooplogg.default)('central: create: service-account');
-
-const action = async ({
-  argv,
-  console
-}) => {
-  const {
-    baseUrl,
-    account,
-    region
-  } = argv;
-  const render = new _Renderer.default(console);
-  let isCmdError = false;
-  const apiCentralClient = new _ApiCentralClient.ApiCentralClient({
-    baseUrl,
-    account,
-    region
-  });
-
-  try {
-    await (0, _bashCommands.isOpenSslInstalled)();
-    const dosaName = await (0, _helpers.askServiceAccountName)();
-    await (0, _helpers.createDosaAndCerts)(apiCentralClient, dosaName);
-  } catch (e) {
-    log('command error', e);
-    render.anyError(e);
-    isCmdError = true;
-  } finally {
-    log('command finished, error = ', isCmdError);
-    if (isCmdError) process.exit(1);
-    process.exit(0);
-  }
+const action = async ({}) => {
+  throw new Error('Creating a service account via "central" is no longer supported. ' + 'Use the "axway" CLI instead. ' + 'Example: "axway service-account create [options]"');
 };
 
 const serviceAccount = {
   aliases: ['service account', 'service-account', 'serviceaccount'],
   action,
-  desc: 'Create a service account'
+  desc: 'Create a service account',
+  hidden: true // Hide this command line option since it's no longer supported.
+
 };
 exports.serviceAccount = serviceAccount;

package/dist/commands/delete/index.js

@@ -106,14 +106,29 @@ ${defsManager.getDefsTableForHelpMsg()}`);
         return scope && (scope.kind && scope.kind === ((_defs$scope = defs.scope) === null || _defs$scope === void 0 ? void 0 : _defs$scope.spec.kind) || !scope.kind && !!defs.scope) || !scope && !defs.scope;
       }); // this should never happen, the filtering logic is probably invalid if true
 
-      if (!matchingDefs.length) throw Error(`can't find matching resource definitions.`); // Prompt the confirmation if action will be executed on multiple resources
-
-      if (!yes && matchingDefs.length > 1) {
-        if ((await (0, _basicPrompts.askList)({
-          msg: 'The resource may exist in many scopes, and multiple entities might be deleted. Do you want to continue?',
-          choices: _types.YesNoChoices,
-          default: _types.YesNo.Yes
-        })) === _types.YesNo.No) process.exit(1);
+      if (!matchingDefs.length) throw Error(`can't find matching resource definitions.`); // Ask user if it's okay to delete unless the "--yes" option is set.
+      // Note: Only prompt if it ends up deleting multiple associated resources.
+
+      if (!yes) {
+        let result = _types.YesNo.Yes;
+
+        if (!scope) {
+          result = await (0, _basicPrompts.askList)({
+            msg: 'Deleting this will delete all resources under its scope. Are you sure you want to do this?',
+            choices: _types.YesNoChoices,
+            default: _types.YesNo.No
+          });
+        } else if (matchingDefs.length > 1) {
+          result = await (0, _basicPrompts.askList)({
+            msg: 'The resource may exist in many scopes, and multiple entities might be deleted. Do you want to continue?',
+            choices: _types.YesNoChoices,
+            default: _types.YesNo.No
+          });
+        }
+
+        if (result === _types.YesNo.No) {
+          process.exit(1);
+        }
       }
 
       render.startSpin(`Deleting resources${wait ? ' and waiting for them to be deleted' : ''}`);

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/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.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;
@@ -71,13 +71,15 @@ 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 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,
-    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;
 };
@@ -85,33 +87,37 @@ const askServiceAccountName = async () => {
 exports.askServiceAccountName = askServiceAccountName;
 
 const askDosaClientId = async (client, showWarning = true) => {
-  const res = await client.getServiceAccounts();
-  if (!res.data) throw Error('Get service accounts error.');
-  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(), ...res.data.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();
+  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 = res.data.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
     };
   }
@@ -233,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') {
@@ -321,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.
  */
 
@@ -384,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/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

@@ -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

@@ -37,7 +37,7 @@ const askTeamName = async client => {
   if (!res.data) throw Error('Get teams error.');
   return (0, _basicPrompts.askList)({
     msg: helpers.envMessages.selectTeam,
-    choices: res.data.result.map(t => t.name),
+    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
   });
 };
@@ -82,12 +82,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 +104,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 +126,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/CoreConfigController.js

@@ -62,7 +62,7 @@ class CoreConfigController {
         // 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
+          validate: true
         });
         const matchingAccount = list.find(a => a.auth.clientId === clientId);
         if (matchingAccount) CoreConfigController.devOpsAccount = await sdk.auth.find(matchingAccount.name);
@@ -74,7 +74,7 @@ class CoreConfigController {
         // 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
+          validate: true
         });
         log(`getAuthInfo, authenticated accounts found: ${list.length}`);
 

package/dist/common/PlatformClient.js

@@ -3,21 +3,76 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PlatformClient = void 0;
+exports.PlatformTeamMemberRole = exports.PlatformServiceAccountRole = exports.PlatformClient = exports.PlatformAuthMethod = void 0;
 
 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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+
+function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 
 const {
   log
 } = (0, _snooplogg.default)('central:class.PlatformClient');
+let PlatformAuthMethod;
+exports.PlatformAuthMethod = PlatformAuthMethod;
+
+(function (PlatformAuthMethod) {
+  PlatformAuthMethod["Certificate"] = "certificate";
+  PlatformAuthMethod["Secret"] = "secret";
+})(PlatformAuthMethod || (exports.PlatformAuthMethod = PlatformAuthMethod = {}));
+
+let PlatformServiceAccountRole;
+exports.PlatformServiceAccountRole = PlatformServiceAccountRole;
+
+(function (PlatformServiceAccountRole) {
+  PlatformServiceAccountRole["ApiCentralAdmin"] = "api_central_admin";
+  PlatformServiceAccountRole["FlowCentralAccessManager"] = "fc_access_manager";
+  PlatformServiceAccountRole["FlowCentralIntegration"] = "fc_integration";
+  PlatformServiceAccountRole["FlowCentralITAdmin"] = "fc_it_admin";
+  PlatformServiceAccountRole["FlowCentralProductsAdmin"] = "fc_products_admin";
+  PlatformServiceAccountRole["FlowCentralSpecOps"] = "fc_spec_ops";
+  PlatformServiceAccountRole["FlowCentralSubscriptionApprover"] = "fc_subscriptionapprover";
+  PlatformServiceAccountRole["FlowCentralSubscriptionSpecialist"] = "fc_subscriptionspecialist";
+  PlatformServiceAccountRole["FlowCentralTemplatePublisher"] = "fc_templatepublisher";
+  PlatformServiceAccountRole["FlowCentralCftAdmin"] = "fc_cft_admin";
+})(PlatformServiceAccountRole || (exports.PlatformServiceAccountRole = PlatformServiceAccountRole = {}));
+
+let PlatformTeamMemberRole;
+exports.PlatformTeamMemberRole = PlatformTeamMemberRole;
+
+(function (PlatformTeamMemberRole) {
+  PlatformTeamMemberRole["Admin"] = "administrator";
+  PlatformTeamMemberRole["Developer"] = "developer";
+  PlatformTeamMemberRole["Consumer"] = "consumer";
+  PlatformTeamMemberRole["CatalogManager"] = "catalog_manager";
+})(PlatformTeamMemberRole || (exports.PlatformTeamMemberRole = PlatformTeamMemberRole = {}));
+
+var _baseUrl = /*#__PURE__*/new WeakMap();
+
+var _accountName = /*#__PURE__*/new WeakMap();
+
+var _amplifyConfig = /*#__PURE__*/new WeakMap();
+
+var _amplifySdk = /*#__PURE__*/new WeakMap();
 
 class PlatformClient {
   constructor({
@@ -25,16 +80,82 @@ class PlatformClient {
     region,
     account
   } = {}) {
-    _defineProperty(this, "baseUrl", void 0);
+    _classPrivateFieldInitSpec(this, _baseUrl, {
+      writable: true,
+      value: void 0
+    });
+
+    _classPrivateFieldInitSpec(this, _accountName, {
+      writable: true,
+      value: void 0
+    });
+
+    _classPrivateFieldInitSpec(this, _amplifyConfig, {
+      writable: true,
+      value: void 0
+    });
+
+    _classPrivateFieldInitSpec(this, _amplifySdk, {
+      writable: true,
+      value: void 0
+    });
 
-    _defineProperty(this, "account", void 0);
+    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}`);
 
-    _defineProperty(this, "region", void 0);
+    _classPrivateFieldSet(this, _baseUrl, baseUrl);
 
-    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}`);
-    this.baseUrl = baseUrl;
-    this.account = account;
-    this.region = region;
+    _classPrivateFieldSet(this, _accountName, account);
+
+    const initResult = (0, _amplifyCliUtils.initSDK)({
+      baseUrl: _classPrivateFieldGet(this, _baseUrl),
+      username: _classPrivateFieldGet(this, _accountName)
+    });
+
+    _classPrivateFieldSet(this, _amplifyConfig, initResult.config);
+
+    _classPrivateFieldSet(this, _amplifySdk, initResult.sdk);
+  }
+
+  async getAccountInfo() {
+    var _classPrivateFieldGet2;
+
+    // Get default teams from config.
+    const defaultTeams = _classPrivateFieldGet(this, _amplifyConfig).get(`${(0, _amplifyCliUtils.getAuthConfigEnvSpecifier)((_classPrivateFieldGet2 = _classPrivateFieldGet(this, _amplifySdk).env) === null || _classPrivateFieldGet2 === void 0 ? void 0 : _classPrivateFieldGet2.name)}.defaultTeam`); // Fetch specified account or default account currently logged in.
+
+
+    let accountInfo;
+
+    if (_classPrivateFieldGet(this, _accountName)) {
+      accountInfo = await _classPrivateFieldGet(this, _amplifySdk).auth.find(_classPrivateFieldGet(this, _accountName), defaultTeams);
+    } else {
+      const accountArray = await _classPrivateFieldGet(this, _amplifySdk).auth.list({
+        defaultTeams,
+        validate: true
+      });
+
+      if (accountArray && accountArray.length > 0) {
+        accountInfo = accountArray.find(nextAccount => nextAccount.default) || accountArray[0];
+      }
+    } // Make sure "subscriptions" is defined since Amplify SDK requires it. (Will throw error if missing.)
+
+
+    if (accountInfo && accountInfo.org && !accountInfo.org.subscriptions) {
+      accountInfo.org.subscriptions = [];
+    } // Return account info if found.
+
+
+    return accountInfo;
+  }
+
+  async createServiceAccount(options) {
+    const accountInfo = await this.getAccountInfo();
+    const result = await _classPrivateFieldGet(this, _amplifySdk).client.create(accountInfo, accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.org, options);
+    return result.client;
+  }
+
+  async getServiceAccounts() {
+    const result = await _classPrivateFieldGet(this, _amplifySdk).client.list(await this.getAccountInfo());
+    return result.clients || [];
   }
 
   async getTeams() {
@@ -46,9 +167,9 @@ class PlatformClient {
 
     try {
       const service = await (0, _dataService.dataService)({
-        baseUrl: this.baseUrl,
+        baseUrl: _classPrivateFieldGet(this, _baseUrl),
         basePath: _types.BasePaths.Platform,
-        account: this.account
+        account: _classPrivateFieldGet(this, _accountName)
       }); // Not using "getWithPagination" method here because /teams API does not support pagination
 
       const response = await service.get('/team');

package/dist/common/dataService.js

@@ -84,6 +84,36 @@ const handleResponse = response => {
   return /application\/json/.test(response.headers['content-type']) ? JSON.parse(response.body) : response.body;
 };
 
+const updateRequestError = err => {
+  var _err$response;
+
+  // Do not change given object if it's a timeout error.
+  if (err instanceof _got.TimeoutError) {
+    return;
+  } // If we have a JSON HTTP body, then turn it into a dictionary.
+
+
+  let jsonBody = null;
+
+  if (err instanceof _got.RequestError && (_err$response = err.response) !== null && _err$response !== void 0 && _err$response.body) {
+    jsonBody = handleResponse(err.response);
+  } // Turn given Error object into an "ApiServerError" or "ApiServerErrorResponse" object.
+
+
+  if (!jsonBody) {
+    // No response message received. Could be any kind of exception error.
+    // Turn given error into an "ApiServerErrorResponse" object.
+    err.errors = [err];
+  } else if (typeof jsonBody.code === 'number' && typeof jsonBody.description === 'string') {
+    // We received a "Platform" server error response.
+    err.status = jsonBody.code;
+    err.detail = jsonBody.description;
+  } else {
+    // Assume we received a "Central" server error response which should already conform to "ApiServerError".
+    Object.assign(err, jsonBody);
+  }
+};
+
 const dataService = async ({
   account,
   baseUrl,
@@ -124,14 +154,7 @@ const dataService = async ({
 
       return response;
     } catch (err) {
-      if (!(err instanceof _got.TimeoutError)) {
-        var _err$response;
-
-        Object.assign(err, ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.body) && handleResponse(err.response) || {
-          errors: [err]
-        });
-      }
-
+      updateRequestError(err);
       throw err;
     }
   };
@@ -250,14 +273,7 @@ const dataService = async ({
           stream.on('error', reject);
         });
       } catch (err) {
-        if (!(err instanceof _got.TimeoutError)) {
-          var _err$response2;
-
-          Object.assign(err, ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.body) && handleResponse(err.response) || {
-            errors: [err]
-          });
-        }
-
+        updateRequestError(err);
         throw err;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.4.1",
+	"version": "2.5.3",
 	"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.2",
+		"@axway/amplify-cli-utils": "^5.0.3",
 		"chalk": "^4.1.2",
 		"cli-kit": "^1.14.1",
 		"dayjs": "^1.10.7",

package/dist/common/ApiCentralClient.js

@@ -1,114 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ApiCentralClient = void 0;
-
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
-var _dataService = require("./dataService");
-
-var _types = require("./types");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-const {
-  log
-} = (0, _snooplogg.default)('central:class.ApiCentralClient');
-
-class ApiCentralClient {
-  constructor({
-    baseUrl,
-    region,
-    account
-  }) {
-    _defineProperty(this, "baseUrl", void 0);
-
-    _defineProperty(this, "region", void 0);
-
-    _defineProperty(this, "account", void 0);
-
-    log(`initializing client with params: baseUrl = ${baseUrl}, region = ${region}, account = ${account}`);
-    this.baseUrl = baseUrl;
-    this.account = account;
-    this.region = region;
-  }
-  /**
-   * Create DOSA account.
-   * @param accountName name of dosa account (can be non-unique)
-   * @param publicKey public .pem file content
-   */
-
-
-  async createDOSAAccount(accountName, publicKey) {
-    log(`createDOSAAccount`);
-    const result = {
-      data: null,
-      error: null
-    };
-
-    try {
-      const service = await (0, _dataService.dataService)({
-        baseUrl: this.baseUrl,
-        basePath: _types.BasePaths.ApiCentral,
-        account: this.account,
-        region: this.region
-      });
-      const payload = {
-        generateKeypair: false,
-        pemEncodedPublicKey: publicKey.replace(/(\r\n)/gm, '\n'),
-        serviceAccountName: accountName,
-        serviceAccountType: 'DOSA'
-      };
-      const response = await service.post('/serviceAccounts', payload);
-      result.data = response;
-    } catch (e) {
-      log('createDOSAAccount, error: ', e); // expecting only a valid ApiServer error response here
-      // re-throw if something different, so it should be handled by command's catch block.
-
-      if (e.errors && Array.isArray(e.errors)) {
-        result.error = e.errors;
-      } else throw e;
-    }
-
-    return result;
-  }
-  /**
-   * List service accounts.
-   */
-
-
-  async getServiceAccounts() {
-    log(`getServiceAccounts`);
-    const result = {
-      data: null,
-      error: null
-    };
-
-    try {
-      const service = await (0, _dataService.dataService)({
-        baseUrl: this.baseUrl,
-        basePath: _types.BasePaths.ApiCentral,
-        account: this.account,
-        region: this.region
-      });
-      const response = await service.getWithPagination(`/serviceAccounts`, 'type==SA&sort=modifyTime%2CDESC');
-      result.data = response;
-    } catch (e) {
-      log('getServiceAccounts, error: ', e); // expecting only a valid ApiServer error response here
-      // re-throw if something different, so it should be handled by command's catch block.
-
-      if (e.errors && Array.isArray(e.errors)) {
-        result.error = e.errors;
-      } else throw e;
-    }
-
-    return result;
-  }
-
-}
-
-exports.ApiCentralClient = ApiCentralClient;