@axway/axway-central-cli 1.29.0-rc.9 → 2.1.0

package/README.md

@@ -8,7 +8,7 @@ Axway Central CLI package for managing Amplify Central resources and DevOps oper
 
 > **Note:**
 > OS support: Mac OS, Linux, Windows 10.
-> Node.js version support: >= 10.13
+> Node.js version support: >=12.13.0
 > Terminal shell support: Mac Terminal, Linux Terminal, Windows Command Prompt, Windows PowerShell.
 > Not supported: Cygwin(Windows), Git Bash(Windows).
 
@@ -22,7 +22,7 @@ Axway Central CLI package for managing Amplify Central resources and DevOps oper
 >
 > before following the instructions below to install this 'Axway Central CLI' package.
 
-Assuming you are familiar with [Node.js](https://nodejs.org) and [npm](https://npmjs.com), **ensure you have Node.js >= 10.13.0, and npm >= 6.9.0 installed**. Then, install the [Axway CLI](https://npmjs.com/package/axway), which will give you connectivity to the [Axway Amplify Platform](https://www.axway.com/en/products/amplify). Note that you must first have an account on [https://platform.axway.com](https://platform.axway.com/), and be provisioned in Amplify Central:
+Assuming you are familiar with [Node.js](https://nodejs.org) and [npm](https://npmjs.com), **ensure you have Node.js >= 12.13.0, and npm >= 6.12.0 installed**. Then, install the [Axway CLI](https://npmjs.com/package/axway), which will give you connectivity to the [Axway Amplify Platform](https://www.axway.com/en/products/amplify). Note that you must first have an account on [https://platform.axway.com](https://platform.axway.com/), and be provisioned in Amplify Central:
 
 ```bash
 $ [sudo] npm install -g axway

package/dist/commands/apply/index.js

@@ -19,12 +19,6 @@ var _utils = require("../../common/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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: create');
@@ -90,7 +84,7 @@ const action = async ({
 const apply = {
   action,
   desc: 'Update resources from a file',
-  options: _objectSpread(_objectSpread({}, _types.commonCmdArgsDescription), {}, {
+  options: { ..._types.commonCmdArgsDescription,
     '-o, --output [value]': {
       desc: `Additional output formats. One of: ${_types.OutputTypes.yaml} | ${_types.OutputTypes.json}`,
       type: 'string'
@@ -99,6 +93,6 @@ const apply = {
       desc: `Filename to use to create or update the resources. One of: yaml | json`,
       type: 'string'
     }
-  })
+  }
 };
 exports.apply = apply;

package/dist/commands/completion/index.js

@@ -7,9 +7,7 @@ exports.completion = void 0;
 
 var _cli = require("../../cli");
 
-var _utils = require("../../common/utils");
-
-const coreCliCmd = (0, _utils.isAmplifyCli)() ? 'amplify' : 'axway';
+const coreCliCmd = 'axway';
 const completionZsh = `###-begin-amplify-central-completions-###
 _amplify_central_completions()
 {

package/dist/commands/create/index.js

@@ -25,12 +25,6 @@ var _agentResource = require("./agentResource");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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: create');
@@ -91,7 +85,7 @@ const create = {
     'agent-resource': _agentResource.agentResource
   },
   desc: 'Create one or more resources from a file or stdin',
-  options: _objectSpread(_objectSpread({}, _types.commonCmdArgsDescription), {}, {
+  options: { ..._types.commonCmdArgsDescription,
     '-o, --output [value]': {
       desc: `Additional output formats. One of: ${_types.OutputTypes.yaml} | ${_types.OutputTypes.json}`,
       type: 'string'
@@ -101,6 +95,6 @@ const create = {
       desc: `Filename to use to create the resource`,
       type: 'string'
     }
-  })
+  }
 };
 exports.create = create;

package/dist/commands/delete/index.js

@@ -23,12 +23,6 @@ var _utils = require("../../common/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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: delete');
@@ -166,7 +160,7 @@ const deleteCmd = {
     required: false,
     type: 'string'
   }],
-  options: _objectSpread(_objectSpread({}, _types.commonCmdArgsDescription), {}, {
+  options: { ..._types.commonCmdArgsDescription,
     '-f, --file [path]': {
       desc: `Filename to use to delete the resource.`,
       type: 'string'
@@ -177,6 +171,6 @@ const deleteCmd = {
     },
     '-y, --yes': 'Automatically reply "yes" to any command prompts.',
     '--wait': 'Wait for the resources to be completely deleted.'
-  })
+  }
 };
 exports.deleteCmd = deleteCmd;

package/dist/commands/edit/index.js

@@ -11,12 +11,6 @@ var _environment = require("./environment");
 
 var _types = require("../../common/types");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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 edit = {
   action: ({
     console
@@ -28,11 +22,11 @@ const edit = {
     environment: _environment.environment
   },
   desc: 'Edit and update resources by using the default editor',
-  options: _objectSpread(_objectSpread({}, _types.commonCmdArgsDescription), {}, {
+  options: { ..._types.commonCmdArgsDescription,
     '-o, --output [value]': {
       desc: `Additional output formats. One of: ${_types.OutputTypes.yaml}|${_types.OutputTypes.json}`,
       type: 'string'
     }
-  })
+  }
 };
 exports.edit = edit;

package/dist/commands/get/index.js

@@ -21,12 +21,6 @@ var _utils = require("../../common/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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: get');
@@ -170,7 +164,7 @@ ${defsManager.getDefsTableForHelpMsg()}`);
     required: false,
     type: 'string'
   }],
-  options: _objectSpread(_objectSpread({}, _types.commonCmdArgsDescription), {}, {
+  options: { ..._types.commonCmdArgsDescription,
     '-o, --output [value]': {
       desc: `Additional output formats. One of: ${_types.OutputTypes.yaml} | ${_types.OutputTypes.json}`,
       type: 'string'
@@ -195,6 +189,6 @@ ${defsManager.getDefsTableForHelpMsg()}`);
       desc: `Tag of resource(s) to fetch`,
       type: 'string'
     }
-  })
+  }
 };
 exports.get = get;

package/dist/commands/install/agents.js

@@ -41,12 +41,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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: install: agents');
@@ -64,7 +58,7 @@ const agentInstallFlows = {
 
 const createConfigBackup = async (configFiles, gatewayType) => {
   // If current configurations exist, back them up
-  let configsExist = await helpers.createBackUpConfigs(configFiles);
+  const configsExist = await helpers.createBackUpConfigs(configFiles);
 
   if (configsExist) {
     console.log(`\nCreated configuration backups for ${gatewayType}`);
@@ -150,6 +144,7 @@ const agents = {
     }
   },
   desc: 'Amplify API Gateway / Amazon API Gateway / Azure API Gateway / Istio',
-  options: _objectSpread({}, _types.commonCmdArgsDescription)
+  options: { ..._types.commonCmdArgsDescription
+  }
 };
 exports.agents = agents;

package/dist/commands/install/awsAgents.js

@@ -161,17 +161,16 @@ const askAWSRegion = async (region = '') => {
   });
 
   if (answer === 'CREATE_NEW') {
-    const name = await (0, _basicPrompts.askInput)({
+    return await (0, _basicPrompts.askInput)({
       msg: AWSPrompts.REGION_INPUT
     });
-    return name;
   } else {
     return answer;
   }
 };
 
 const askDeployment = async () => {
-  let answer = await (0, _basicPrompts.askList)({
+  return (0, _basicPrompts.askList)({
     msg: AWSPrompts.DEPLOYMENT,
     choices: [{
       name: DeploymentTypes.EC2,
@@ -185,7 +184,6 @@ const askDeployment = async () => {
     }],
     default: DeploymentTypes.EC2
   });
-  return answer;
 }; // askToCreateRoleSetup - asks a Yes/No question for creating the APIGW IAM role, returns a True/False string for CloudFormation parameters
 
 
@@ -340,7 +338,7 @@ async function configureECSDeployment(awsAgentValues) {
 
 const gatewayConnectivity = async installConfig => {
   console.log('\nCONNECTION TO AMAZON API GATEWAY:');
-  console.log(_chalk.default.gray(`The agents need to connect to the Amazon (AWS) API Gateway to discover API's for publishing to Amplify Central and/or the Unified Catalog.\n` + `Use two credentials, one for executing the AWS CLI commands and one for the agents to connect to the AWS API Gateway.\n` + `The traceability Agent needs to connect to the AWS API Gateway for the collection of transaction headers.\n` + `These will be formatted to the Amplify Central Observer.\n`)); // DeploymentType
+  console.log(_chalk.default.gray(`You need credentials for executing the AWS CLI commands.\n` + `The Discovery Agents need to connect to the Amazon (AWS) API Gateway to discover API's for publishing to Amplify Central and/or the Unified Catalog.\n` + `The Traceability Agent needs to connect to the AWS API Gateway for the collection of transaction headers.\n` + `These headers will be formatted and fowarded to the Amplify Central Observer.\n` + `We recommend to use two different set of credentials: one for AWS CLI and one for the agents`)); // DeploymentType
 
   const deploymentType = await askDeployment();
   let awsAgentValues = new helpers.AWSAgentValues(deploymentType);
@@ -543,14 +541,16 @@ const downloadAPIGWAgentConfigZip = async () => {
     baseUrl: _types.PublicRepoUrl,
     basePath: _types.BasePaths.AWSAgents
   });
-  const response = await service.download(url);
 
-  if (!response.ok) {
-    throw new Error(`Unexpected response while downloading the agent ${response.statusText} `);
+  try {
+    const {
+      stream
+    } = await service.download(url);
+    await helpers.streamPipeline(stream, _fs.default.createWriteStream(ConfigFiles.AgentConfigZip));
+    return ConfigFiles.AgentConfigZip;
+  } catch (err) {
+    throw new Error(`Failed to download the agent: ${err.message}`);
   }
-
-  await helpers.streamPipeline(response.body, _fs.default.createWriteStream(ConfigFiles.AgentConfigZip));
-  return ConfigFiles.AgentConfigZip;
 }; // Unzip latest aws apigw config zip
 
 

package/dist/commands/install/azureAgents.js

@@ -122,7 +122,7 @@ const askAzurePolicyKey = async () => await (0, _basicPrompts.askInput)({
 });
 
 const gatewayConnectivity = async installConfig => {
-  let azureAgentValues = new _azureTemplates.AzureAgentValues();
+  const azureAgentValues = new _azureTemplates.AzureAgentValues();
   console.log('\nCONNECTION TO AZURE:');
   console.log(_chalk.default.gray(`The discovery agent needs to connect to the Azure API Gateway to discover API's for publishing to Amplify Central and/or the Unified Catalog.\nThe traceability agent needs to connect to an Azure Event Hub for collecting APIs transactions. These will be forwarded to the Amplify Central Observer.\n`)); // Azure Discovery Agent Prompts
 
@@ -156,7 +156,7 @@ const generateSuccessHelpMsg = (configType, agentType, isNewDosaAccount) => {
   }
 
   dockerSuccessMsg(isDaEnabled, isTaEnabled);
-  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.V7}`));
+  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.AZURE}`));
 };
 
 const dockerSuccessMsg = (isDaEnabled, isTaEnabled) => {

package/dist/commands/install/edgeAgents.js

@@ -77,10 +77,16 @@ const downloadV7AgentBundle = async type => {
     baseUrl: _types.PublicRepoUrl,
     basePath: _types.BasePaths.V7Agents
   });
-  const response = await service.download(url);
-  if (!response.ok) throw new Error(`Unexpected response while downloading the agent ${response.statusText}`);
-  await helpers.streamPipeline(response.body, _fs.default.createWriteStream(fileName));
-  return fileName;
+
+  try {
+    const {
+      stream
+    } = await service.download(url);
+    await helpers.streamPipeline(stream, _fs.default.createWriteStream(fileName));
+    return fileName;
+  } catch (err) {
+    throw new Error(`Failed to download the agent: ${err.message}`);
+  }
 };
 
 const downloadBinary = async bundleType => {

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

@@ -9,8 +9,6 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
 var _bashCommands = require("../../../common/bashCommands");
 
 var _Kubectl = require("../../../common/Kubectl");
@@ -19,10 +17,6 @@ var _types = require("../../../common/types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const {
-  log
-} = (0, _snooplogg.default)('central: install: agents: helpers');
-
 const createBackUpConfigs = async configFiles => {
   let fileExist = false;
   let dateTimeStamp = new Date().toISOString().slice(0, 10).concat(' ').concat(new Date().toLocaleTimeString('it-IT')).replace(/:\s*/g, '.');
@@ -127,7 +121,6 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
     scopeDef: defs[0].scope ? defs[0].scope : undefined,
     scopeName: envName
   });
-  log(result.data);
 
   if (!result.data) {
     var _result$error3;

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

@@ -3,23 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAuthUrl = exports.getEnv = exports.getIngestionHost = exports.getEnvironmentId = exports.getCurrentUserOrgId = exports.getListByResource = void 0;
-
-var _get = _interopRequireDefault(require("lodash/get"));
-
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
+exports.getIngestionHost = exports.getEnvironmentId = exports.getCurrentUserOrgId = exports.getListByResource = void 0;
 
 var _CoreConfigController = require("../../../common/CoreConfigController");
 
 var _types = require("../../../common/types");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// @ts-ignore
-const {
-  log
-} = (0, _snooplogg.default)('central: install: agents: central');
-
 const getListByResource = async (client, defsManager, resourceType, resourceShortName, scopeName = '') => {
   // NOTE: only a first found set is used
   const defs = defsManager.findDefsByWord(resourceShortName);
@@ -110,12 +99,4 @@ const getIngestionHost = (region, env, apicDeployment, protocol = _types.Ingesti
   return hosts[protocol][region][env][apicDeployment] || _types.IngestionHosts.US;
 };
 
-exports.getIngestionHost = getIngestionHost;
-
-const getEnv = () => (0, _get.default)(_CoreConfigController.CoreConfigController, 'devOpsAccount.auth.env', _types.Platforms.prod);
-
-exports.getEnv = getEnv;
-
-const getAuthUrl = () => (0, _get.default)(_CoreConfigController.CoreConfigController, 'devOpsAccount.auth.baseUrl', _types.AuthUrls.Prod);
-
-exports.getAuthUrl = getAuthUrl;
+exports.getIngestionHost = getIngestionHost;

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

@@ -9,8 +9,6 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 var _inquirer = _interopRequireDefault(require("inquirer"));
 
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
 var _basicPrompts = require("../../../common/basicPrompts");
 
 var _Kubectl = require("../../../common/Kubectl");
@@ -23,10 +21,6 @@ var _regex = require("./regex");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// @ts-ignore
-const {
-  log
-} = (0, _snooplogg.default)('central: install: agents: helpers');
 const cliNowString = `cli-${Date.now()}`;
 const envMessages = {
   createNewEnvironment: 'Create a new environment',
@@ -72,8 +66,7 @@ const enterServiceAccountName = 'Enter a new service account name';
 exports.enterServiceAccountName = enterServiceAccountName;
 const enterPublicKeyPath = 'Enter the file path to the public key';
 exports.enterPublicKeyPath = enterPublicKeyPath;
-const enterPrivateKeyPath = 'Enter the file path to the private key'; // export const enterSecretName = 'Enter the name of the secret to store your public and private keys';
-
+const enterPrivateKeyPath = 'Enter the file path to the private key';
 exports.enterPrivateKeyPath = enterPrivateKeyPath;
 const selectIngestionProtocol = 'Select Traceability protocol';
 exports.selectIngestionProtocol = selectIngestionProtocol;

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

@@ -65,6 +65,9 @@ als:
   # Name of the k8scluster
   clusterName: {{istioAgentValues.clusterName}}
 
+  # agent name
+  agentName: {{centralConfig.taAgentName}}
+  
   # distinguishes events between apic deployments
   apicDeployment: {{centralConfig.deployment}}
 

package/dist/commands/install/index.js

@@ -13,12 +13,6 @@ var _agents = require("./agents");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-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 install = {
   action({
     console
@@ -42,6 +36,7 @@ To install agents in interactive mode:\t"axway central install agents"
     required: false,
     type: 'string'
   }],
-  options: _objectSpread({}, _types.commonCmdArgsDescription)
+  options: { ..._types.commonCmdArgsDescription
+  }
 };
 exports.install = install;

package/dist/commands/install/istioAgents.js

@@ -110,12 +110,12 @@ https://docs.axway.com/bundle/axway-open-docs/page/docs/central/mesh_management/
   installConfig.gatewayConfig = istioValues; // Set up the following values from installConfig to be used in setupKubernetes
 
   istioValues.istioAgentValues.alsEnabled = installConfig.switches.isTaEnabled;
+  istioValues.istioAgentValues.discoveryEnabled = installConfig.switches.isDaEnabled;
   const hybridOverrides = await setupKubernetes(istioValues, apiServerClient, defsManager);
   hybridOverrides.envoyFilterNamespace = istioOverrides.gatewayNamespace;
   istioOverrides.alsNamespace = hybridOverrides.namespace.name;
   istioOverrides.enableAls = hybridOverrides.alsMode === AlsMode.Verbose;
   istioOverrides.enableTracing = hybridOverrides.alsEnabled;
-  await completeIstio(istioOverrides);
   return istioValues;
 }; // Questions for the istio configuration
 
@@ -222,7 +222,7 @@ const completeIstio = async istioOverrides => {
 
 
 const askALSMode = async () => {
-  let ask = (0, _basicPrompts.askList)({
+  return (0, _basicPrompts.askList)({
     msg: istioPrompts.alsModePrompt,
     choices: [{
       name: AlsMode.Default.charAt(0).toUpperCase() + AlsMode.Default.slice(1),
@@ -232,7 +232,6 @@ const askALSMode = async () => {
       value: AlsMode.Verbose
     }]
   });
-  return ask;
 };
 
 const askEnableDemoSvc = async () => {
@@ -320,16 +319,6 @@ const getCondorHost = (region, env, apicDeployment) => {
 
 exports.getCondorHost = getCondorHost;
 
-const generateSuccessHelpMsg = (configType, isNewDosaAccount) => {
-  const isHelmInstall = configType === _types.AgentConfigTypes.HELM;
-
-  if (isNewDosaAccount && !isHelmInstall) {
-    console.log(_chalk.default.yellow('\nPlease make sure to copy the "private_key.pem" and "public_key.pem" files for the existing service account you selected.'));
-  }
-
-  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.ISTIO}`));
-};
-
 const createIstioOverride = overrides => {
   const overrideFileName = ConfigFiles.IstioOverrideFile;
   (0, _utils.writeTemplates)(overrideFileName, overrides, helpers.istioInstallTemplate);
@@ -400,7 +389,6 @@ exports.generateSpecDiscoverySpec = generateSpecDiscoverySpec;
 
 const createHybridOverride = overrides => {
   const overrideFileName = ConfigFiles.HybridOverrideFile;
-  console.log(`Shane - keySecretName ${overrides.istioAgentValues.keysSecretName}`);
   (0, _utils.writeTemplates)(overrideFileName, overrides, helpers.istioAgentsTemplate);
   console.log(`Istio agent override file has been placed at ${process.cwd()}/${overrideFileName}`);
   const installCmd = `helm upgrade --install --namespace ${overrides.istioAgentValues.namespace.name} ampc-hybrid axway/ampc-hybrid -f ${overrideFileName}`;
@@ -428,6 +416,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
 
   istioValues.centralConfig = installConfig.centralConfig;
   istioValues.traceabilityConfig = installConfig.traceabilityConfig;
+  await completeIstio(istioValues.istioInstallValues);
 
   if (istioValues.istioAgentValues.namespace.isNew) {
     await helpers.createNamespace(istioValues.istioAgentValues.namespace.name);
@@ -450,7 +439,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   createIstioOverride(istioValues);
   createHybridOverride(istioValues);
   console.log('Configuration file(s) have been successfully created.\n');
-  generateSuccessHelpMsg(installConfig.deploymentType, installConfig.centralConfig.ampcDosaInfo.isNew);
+  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.ISTIO}`));
 };
 
 exports.completeInstall = completeInstall;

package/dist/commands/install/platform.js

@@ -7,12 +7,12 @@ exports.getApicDeployment = exports.finalizeCentralInstall = exports.getCentralC
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
 var _basicPrompts = require("../../common/basicPrompts");
 
 var _CliConfigManager = require("../../common/CliConfigManager");
 
+var _CoreConfigController = require("../../common/CoreConfigController");
+
 var _types = require("../../common/types");
 
 var _utils = require("../../common/utils");
@@ -25,13 +25,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// @ts-ignore
-const {
-  log
-} = (0, _snooplogg.default)('central: install: agents: central'); //
+//
 // Complex prompts
 //
-
 const askTeamName = async client => {
   var _res$data$result$find;
 
@@ -49,20 +45,23 @@ 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:');
-    const {
-      enabled,
-      samplingPercentage,
-      shouldReportAllErrors
-    } = await helpers.askToEnableTransactionLogging();
-    traceabilityConfig.enabled = enabled;
-    traceabilityConfig.samplingPercentage = samplingPercentage;
-    traceabilityConfig.samplingReportAllErrors = shouldReportAllErrors;
+    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;
+    }
 
     if (traceabilityConfig.enabled) {
       const traceabilityProtocol = await helpers.askIngestionProtocol();
       traceabilityConfig.protocol = traceabilityProtocol;
-      traceabilityConfig.host = helpers.getIngestionHost(installConfig.centralConfig.region, helpers.getEnv(), installConfig.centralConfig.deployment, traceabilityProtocol);
+      traceabilityConfig.host = helpers.getIngestionHost(installConfig.centralConfig.region, _CoreConfigController.CoreConfigController.getEnv(), installConfig.centralConfig.deployment, traceabilityProtocol);
     }
   }
 
@@ -75,12 +74,9 @@ const getCentralConfig = async (apiCentralClient, apiServerClient, platformClien
   // initiate CentralAgentConfig
   let centralConfig = new _types.CentralAgentConfig();
   await centralConfig.setBaseHost();
-  centralConfig.authUrl = `${helpers.getAuthUrl()}/auth`;
+  centralConfig.authUrl = `${_CoreConfigController.CoreConfigController.getAuthUrl()}/auth`;
   centralConfig.region = String(apiCentralClient.region || (await (0, _utils.getConfig)())[_types.ConfigTypes.REGION] || _types.Regions.US).toUpperCase();
-  centralConfig.url = _types.ProdBaseUrls[centralConfig.region];
-  log(apicDeployment);
-  log(getApicDeployment(centralConfig.region, helpers.getEnv()));
-  centralConfig.deployment = apicDeployment || getApicDeployment(centralConfig.region, helpers.getEnv()); // apic config
+  centralConfig.deployment = apicDeployment || getApicDeployment(centralConfig.region, _CoreConfigController.CoreConfigController.getEnv()); // apic config
 
   console.log('\nCONNECTION TO AMPLIFY PLATFORM:');
   console.log(_chalk.default.gray(`The agents need access to the Amplify Platform to register services.`)); // create/find environment
@@ -99,9 +95,9 @@ const getCentralConfig = async (apiCentralClient, apiServerClient, platformClien
   } // Get the DA Agent name
 
 
-  centralConfig.daAgentName = '';
+  centralConfig.daAgentName = ''; // ISTIO will not prompt for agent name.  Remove when that ability exists
 
-  if (installConfig.switches.isDaEnabled) {
+  if (installConfig.switches.isDaEnabled && installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
     centralConfig.daAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.da, centralConfig.ampcEnvInfo.name);
   } // Get the TA Agent name
 
@@ -131,10 +127,12 @@ const finalizeCentralInstall = async (apiCentralClient, apiServerClient, platfor
 
   installConfig.centralConfig.dosaAccount.updateKeyTemplateValues(installConfig.deploymentType); // environment name
 
-  installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env') : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource
+  installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env') : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource unless gateway type is ISTIO.  This can be removed when this is available for ISTIO
 
-  if (installConfig.centralConfig.daAgentName != '') {
-    installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.daAgentName);
+  if (installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
+    if (installConfig.centralConfig.daAgentName != '') {
+      installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.daAgentName);
+    }
   } // Create TraceabilityAgent Resource