@axway/axway-central-cli 2.4.0 → 2.5.2

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/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/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);
@@ -73,7 +73,9 @@ class CoreConfigController {
       } 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();
+        const list = await sdk.auth.list({
+          validate: true
+        });
         log(`getAuthInfo, authenticated accounts found: ${list.length}`);
 
         if (list.length === 1) {

package/package.json

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