@axway/axway-central-cli 2.3.0-rc.4 → 2.5.0

package/dist/commands/edit/environment.js

@@ -9,16 +9,14 @@ var _cliKit = require("cli-kit");
 
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _ora = _interopRequireDefault(require("ora"));
-
-var _TmpFile = _interopRequireDefault(require("../../common/TmpFile"));
-
 var _dataService = require("../../common/dataService");
 
-var _errorHandler = require("../../common/errorHandler");
+var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 
 var _resultsRenderers = require("../../common/resultsRenderers");
 
+var _TmpFile = _interopRequireDefault(require("../../common/TmpFile"));
+
 var _utils = require("../../common/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -33,28 +31,26 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     name,
     output,
     region
   } = argv;
   log(`editing ${name} env`);
   let file;
-  const spinner = process.env['DEBUG'] || !!output ? null : (0, _ora.default)({
-    spinner: 'dots3',
-    text: `Fetching details of "environment/${name}".`
-  }).start();
+  let commandIsSuccessful = true;
+  const render = new _Renderer.default(console, output).startSpin(`Fetching details of "environment/${name}".`);
 
   try {
     const service = await (0, _dataService.dataService)({
       baseUrl,
-      clientId,
+      account,
       region
     });
     let response = await service.get(`/management/v1alpha1/environments/${name}`);
     file = new _TmpFile.default(response); // stop spinner or it will interfere stdio of editor
 
-    spinner && spinner.stop();
+    render.stopSpin();
     const {
       isUpdated
     } = await file.edit();
@@ -63,22 +59,25 @@ const action = async ({
       // intentionally taking just first doc even if user will provide more in the same file while editing.
       const doc = (0, _utils.LEGACY_loadAndVerifySpecs)(file.path)[0];
       response = await service.put(`/management/v1alpha1/environments/${name}`, doc);
-      spinner && spinner.succeed((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been edited.}`); // render result if output flag has been provided
+      render.success((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been edited.}`); // render result if output flag has been provided
 
       output && (0, _resultsRenderers.renderResponse)(console, response, output);
     } else {
       log('no changes has been made to file');
-      spinner && spinner.warn((0, _cliKit.chalk)`{yellow Edit cancelled, no changes made.}`);
+      render.error('Edit cancelled, no changes made.');
       file.delete();
+      commandIsSuccessful = false;
     }
   } catch (e) {
     log('command error', e);
     file && console.log(`A copy of your changes has been stored to "${file.path}".`);
-    (0, _errorHandler.handleErrors)(console, e, spinner);
+    render.anyError(e);
+    commandIsSuccessful = false;
   } finally {
-    log('command successful');
-    file && file.delete();
-    spinner && spinner.stop();
+    log(`command finished, success = ${commandIsSuccessful}`);
+    file && commandIsSuccessful && file.delete();
+    render.stopSpin();
+    !commandIsSuccessful && process.exit(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/getters.js

@@ -19,19 +19,19 @@ const {
   log
 } = (0, _snooplogg.default)('central: install: agents: helpers');
 
-const getListByResource = async (client, defsManager, resourceType, resourceShortName, scopeName = '', query = '') => {
+const getListByResource = async input => {
   // NOTE: only a first found set is used
-  const defs = defsManager.findDefsByWord(resourceShortName);
+  const defs = input.defsManager.findDefsByWord(input.resourceShortName);
 
   if (!defs) {
-    throw Error(`the server doesn't have a resource type "${resourceType}"`);
+    throw Error(`the server doesn't have a resource type "${input.resourceType}"`);
   }
 
-  return client.getResourcesList({
+  return input.client.getResourcesList({
     resourceDef: defs[0].resource,
     scopeDef: defs[0].scope ? defs[0].scope : undefined,
-    scopeName: scopeName ? scopeName : undefined,
-    query: query
+    scopeName: input.scopeName,
+    query: input.query
   });
 }; // Note: forcing it to use apicentral client id
 

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.'));
@@ -189,21 +200,37 @@ const askEnvironmentName = async (client, defsManager, isAxwayManaged = null) =>
     // do not filter any environments
     const {
       data: allEnvs
-    } = await (0, _getters.getListByResource)(client, defsManager, 'Environment', 'env', '');
+    } = await (0, _getters.getListByResource)({
+      client,
+      defsManager,
+      resourceType: 'Environment',
+      resourceShortName: 'env'
+    });
     if (!allEnvs) throw Error(envMessages.getEnvironmentsError);
     envs = allEnvs;
   } else {
     // Get only the axway managed environments
     const {
       data: axwayManagedEnvs
-    } = await (0, _getters.getListByResource)(client, defsManager, 'Environment', 'env', '', 'spec.axwayManaged==true');
+    } = await (0, _getters.getListByResource)({
+      client,
+      defsManager,
+      resourceType: 'Environment',
+      resourceShortName: 'env',
+      query: 'spec.axwayManaged==true'
+    });
     if (!axwayManagedEnvs) throw Error(envMessages.getEnvironmentsError);
     envs = axwayManagedEnvs;
 
     if (!isAxwayManaged) {
       const {
         data: allEnvs
-      } = await (0, _getters.getListByResource)(client, defsManager, 'Environment', 'env', '');
+      } = await (0, _getters.getListByResource)({
+        client,
+        defsManager,
+        resourceType: 'Environment',
+        resourceShortName: 'env'
+      });
       if (!allEnvs) throw Error(envMessages.getEnvironmentsError); // Remove any axway managed envs from the array when isAxwayManaged is false
 
       envs = allEnvs.filter(env => {
@@ -243,7 +270,12 @@ exports.askEnvironmentName = askEnvironmentName;
 const askK8sClusterName = async (client, defsManager) => {
   const {
     data: k8sCluster
-  } = await (0, _getters.getListByResource)(client, defsManager, 'K8SCluster', 'k8sc');
+  } = await (0, _getters.getListByResource)({
+    client,
+    defsManager,
+    resourceType: 'K8SCluster',
+    resourceShortName: 'k8sc'
+  });
   if (!k8sCluster) throw Error(k8sClusterMessages.getK8sClustersError);
   const name = await (0, _basicPrompts.askInput)({
     msg: k8sClusterMessages.enterK8sClusterName,
@@ -258,14 +290,14 @@ exports.askK8sClusterName = askK8sClusterName;
 const askAgentName = async (client, defsManager, agentType, scopeName) => {
   var _agents;
 
-  let resourceLongName;
+  let resourceType;
   let resourceShortName;
   let msg;
 
   switch (agentType) {
     case _types.AgentTypes.da:
       {
-        resourceLongName = 'DiscoveryAgent';
+        resourceType = 'DiscoveryAgent';
         resourceShortName = 'da';
         msg = agentMessages.enterDiscoveryAgentName;
         break;
@@ -273,7 +305,7 @@ const askAgentName = async (client, defsManager, agentType, scopeName) => {
 
     case _types.AgentTypes.ta:
       {
-        resourceLongName = 'TraceabilityAgent';
+        resourceType = 'TraceabilityAgent';
         resourceShortName = 'ta';
         msg = agentMessages.enterTraceabilityAgentName;
         break;
@@ -282,13 +314,19 @@ const askAgentName = async (client, defsManager, agentType, scopeName) => {
 
   let {
     data: agents
-  } = await (0, _getters.getListByResource)(client, defsManager, resourceLongName, resourceShortName, scopeName); // if there are no agents scoped to the env, make the agents list blank to validate against
+  } = await (0, _getters.getListByResource)({
+    client,
+    defsManager,
+    resourceType,
+    resourceShortName,
+    scopeName
+  }); // if there are no agents scoped to the env, make the agents list blank to validate against
 
   agents = (_agents = agents) !== null && _agents !== void 0 ? _agents : [];
   const name = await (0, _basicPrompts.askInput)({
     msg: msg,
     defaultValue: cliNowString,
-    validate: (0, _basicPrompts.runValidations)((0, _basicPrompts.validateInputIsNew)(agents.map(a => a.name), agentMessages.agentAlreadyExists), (0, _basicPrompts.validateRegex)(_regex.resourceRegex, (0, _regex.invalidResourceMsg)(resourceLongName)))
+    validate: (0, _basicPrompts.runValidations)((0, _basicPrompts.validateInputIsNew)(agents.map(a => a.name), agentMessages.agentAlreadyExists), (0, _basicPrompts.validateRegex)(_regex.resourceRegex, (0, _regex.invalidResourceMsg)(resourceType)))
   });
   return name;
 };

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');