@axway/axway-central-cli 2.29.0-rc.5 → 2.29.0-rc.6

package/dist/commands/install/agents.js

@@ -28,6 +28,7 @@ var azureSaasAgents = _interopRequireWildcard(require("./azureSaasAgents"));
 var kafkaAgents = _interopRequireWildcard(require("./kafkaAgents"));
 var swaggerHubAgents = _interopRequireWildcard(require("./swaggerHubSaasAgents"));
 var graylogAgent = _interopRequireWildcard(require("./graylogAgent"));
+var ibmAPIConnectAgent = _interopRequireWildcard(require("./ibmAPIConnectAgents"));
 var platform = _interopRequireWildcard(require("./platform"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -48,7 +49,8 @@ const agentInstallFlows = {
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.ISTIO]: istioAgents.IstioInstallMethods,
   [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods,
-  [_types.GatewayTypes.GRAYLOG]: graylogAgent.GraylogInstallMethods
+  [_types.GatewayTypes.GRAYLOG]: graylogAgent.GraylogInstallMethods,
+  [_types.GatewayTypes.IBMAPICONNECT]: ibmAPIConnectAgent.IBMAPIConnectInstallMethods
 };
 const saasAgentInstallFlows = {
   [_types.SaaSGatewayTypes.AWS_GATEWAY]: awsSaaSAgents.AWSSaaSInstallMethods,
@@ -112,16 +114,9 @@ const agents = exports.agents = {
       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`));
       let installConfig = new _types.AgentInstallConfig();
       installConfig.centralConfig.axwayManaged = !!axwayManaged;
-      let orgRegion = '';
-      orgRegion = region;
-
-      // if region cmd arg is not passed in, then consider the region from the account info
-      if (region === undefined) {
-        orgRegion = accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.org.region;
-      }
 
       // top priority is region option on command line, second priority is region from config file, default is US
-      installConfig.centralConfig.region = await determineRegion(orgRegion);
+      installConfig.centralConfig.region = await determineRegion(region);
       installConfig.centralConfig.singleEntryPointUrl = _types.SingleEntryPointUrls[installConfig.centralConfig.region];
       let gatewayTypeChoices = [];
       Object.values(_types.GatewayTypes).forEach(v => gatewayTypeChoices.push(v));

package/dist/commands/install/awsAgents.js

@@ -260,7 +260,7 @@ async function configureECSDeployment(awsAgentValues) {
 // @ts-ignore
 const gatewayConnectivity = async installConfig => {
   console.log('\nCONNECTION TO AMAZON API GATEWAY:');
-  console.log(_chalk.default.gray(`You need credentials for executing the AWS CLI commands.\n` + `The Discovery Agent needs 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 forwarded to the Amplify Central Observer.\n` + `We recommend to use two different set of credentials: one for AWS CLI and one for the agents`));
+  console.log(_chalk.default.gray(`You need credentials for executing the AWS CLI commands.\n` + `The Discovery Agent needs to connect to the Amazon (AWS) API Gateway to discover API's for publishing to Amplify.\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 forwarded to the Business Insights.\n` + `We recommend to use two different set of credentials: one for AWS CLI and one for the agents`));
 
   // DeploymentType
   const deploymentType = await askDeployment();

package/dist/commands/install/azureAgents.js

@@ -99,7 +99,7 @@ const askAzurePolicyKey = async () => await (0, _basicPrompts.askInput)({
 const gatewayConnectivity = async installConfig => {
   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`));
+  console.log(_chalk.default.gray(`The discovery agent needs to connect to the Azure API Gateway to discover API's for publishing to Amplify.\nThe traceability agent needs to connect to an Azure Event Hub for collecting APIs transactions. These will be forwarded to the Business Insights.\n`));
 
   // Azure Discovery Agent Prompts
   if (installConfig.switches.isDaEnabled) {

package/dist/commands/install/edgeAgents.js

@@ -179,7 +179,7 @@ const gatewayConnectivity = async installConfig => {
   }
   if (!installConfig.switches.isGatewayOnly || installConfig.switches.isDaEnabled) {
     console.log('\nCONNECTION TO API MANAGER:');
-    console.log(_cliKit.chalk.gray(`The agents need to connect to the Axway API Manager to discover APIs for publishing to Amplify Central and/or the Unified Catalog.\n` + `Use the credentials of an API Manager Administrator user or an Organization Administrator user.`));
+    console.log(_cliKit.chalk.gray(`The agents need to connect to the Axway API Manager to discover APIs for publishing to Amplify.\n` + `Use the credentials of an API Manager Administrator user or an Organization Administrator user.`));
     if (installConfig.switches.isHelmInstall) {
       console.log(_cliKit.chalk.white(`Please use the name of the API Manager Service as hostname.`));
     }

package/dist/commands/install/gitLabAgents.js

@@ -106,7 +106,7 @@ const gatewayConnectivity = async installConfig => {
   let gitLabAgentValues = new _gitLabTemplates.GitLabAgentValues();
   if (installConfig.switches.isDockerInstall) {
     console.log('\nCONNECTION TO GitHub API GATEWAY:');
-    console.log(_chalk.default.gray("The Discovery Agent needs to connect to the GitHub API Gateway to discover API's for publishing to Amplify Central"));
+    console.log(_chalk.default.gray("The Discovery Agent needs to connect to the GitHub API Gateway to discover API's for publishing to Amplify Central."));
     gitLabAgentValues.token = await askForGitLabToken();
     gitLabAgentValues.baseURL = await askForGitLabBaseURL();
     gitLabAgentValues.repositoryID = await askForGitLabRepositoryID();

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

@@ -164,6 +164,18 @@ Object.keys(_graylogTemplates).forEach(function (key) {
     }
   });
 });
+var _ibmAPIConnectTemplates = require("./templates/ibmAPIConnectTemplates");
+Object.keys(_ibmAPIConnectTemplates).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _ibmAPIConnectTemplates[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ibmAPIConnectTemplates[key];
+    }
+  });
+});
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const streamPipeline = exports.streamPipeline = _util.default.promisify(_stream.default.pipeline);
 const unzip = async filePath => {
@@ -193,7 +205,8 @@ const agentsDocsUrl = exports.agentsDocsUrl = {
   AWS: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_aws_gateway/index.html',
   AZURE: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_azure_gateway/index.html',
   ISTIO: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html',
-  GRAYLOG: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html'
+  GRAYLOG: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html',
+  IBMAPICONNECT: ''
 };
 
 // export * from './updaters';

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

@@ -77,8 +77,16 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
 
+TRACEABILITY_HOST={{traceabilityConfig.host}}
+{{/compare}}
+{{#compare . centralConfig.region "US"}}
+
+{{/compare}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
@@ -120,7 +128,10 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+{{/compare}}
 
 # Logging configs
 # Define the logging level: info, debug, error

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

@@ -70,8 +70,16 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
 
+TRACEABILITY_HOST={{traceabilityConfig.host}}
+{{/compare}}
+{{#compare . centralConfig.region "US"}}
+
+{{/compare}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
@@ -110,7 +118,10 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+{{/compare}}
 
 # Logging configs
 # Define the logging level: info, debug, error

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

@@ -112,7 +112,16 @@ CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
+
+TRACEABILITY_HOST={{traceabilityConfig.host}}
+{{/compare}}
+{{#compare . centralConfig.region "US"}}
+
+{{/compare}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}
@@ -156,7 +165,10 @@ statusPort: 8990
 env:
   LOG_LEVEL: info 
   CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
-  CENTRAL_REGION: {{centralConfig.region}}
+  CENTRAL_URL: {{centralConfig.url}}
+  CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
+  CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
   CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
@@ -170,6 +182,7 @@ env:
   # API Gateway event logs
   EVENT_LOG_PATHS: /events/*.log
   {{/if}}
+  TRACEABILITY_HOST: {{traceabilityConfig.host}}
   TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
   TRACEABILITY_SAMPLING_PERCENTAGE: {{traceabilityConfig.samplingPercentage}}
   TRACEABILITY_SAMPLING_REPORTALLERRORS: {{traceabilityConfig.samplingReportAllErrors}}
@@ -266,7 +279,10 @@ CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+{{/compare}}
 
 # Logging configs
 # Define the logging level: info, debug, error
@@ -305,7 +321,9 @@ statusPort: 8989
 env:
   LOG_LEVEL: info
   CENTRAL_AGENTNAME: {{centralConfig.daAgentName}}
-  CENTRAL_REGION: {{centralConfig.region}}
+  CENTRAL_URL: {{centralConfig.url}}
+  CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
   CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}

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

@@ -54,7 +54,10 @@ CENTRAL_GRPC_ENABLED=true
 {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+{{/compare}}
 
 # Logging configs
 # Define the logging level: info, debug, error

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

@@ -54,12 +54,16 @@ secrets:
     name: {{agentKeysSecret}}
   
 env:
-  CENTRAL_REGION={{centralConfig.region}}
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
+  CENTRAL_URL: {{centralConfig.url}}
+  CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
+  CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
   CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+  TRACEABILITY_HOST: {{traceabilityConfig.host}}
   TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
 `;
 };

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

@@ -0,0 +1,121 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ibmAPIConnectTAEnvVarTemplate = exports.ibmAPIConnectDAEnvVarTemplate = exports.IBMAPIConnectAgentValues = void 0;
+var _types = require("../../../../common/types");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+/**
+ * @description Parameters to provide to the IBM API Connect handlebars templates.
+ */
+class IBMAPIConnectAgentValues {
+  constructor() {
+    _defineProperty(this, "apiConnectURL", void 0);
+    _defineProperty(this, "apiConnectOrgName", void 0);
+    _defineProperty(this, "apiConnectCatalogName", void 0);
+    _defineProperty(this, "apiConnectAuthAPIKey", void 0);
+    _defineProperty(this, "apiConnectAuthClientID", void 0);
+    _defineProperty(this, "apiConnectAuthClientSecret", void 0);
+    _defineProperty(this, "apiConnectConsumerOrgOwnerUser", void 0);
+    _defineProperty(this, "apiConnectConsumerOrgOwnerRegistry", void 0);
+    _defineProperty(this, "apiConnectAnalyticsServerName", void 0);
+    _defineProperty(this, "centralConfig", void 0);
+    _defineProperty(this, "traceabilityConfig", void 0);
+    this.apiConnectURL = '';
+    this.apiConnectOrgName = '';
+    this.apiConnectCatalogName = '';
+    this.apiConnectAuthAPIKey = '';
+    this.apiConnectAuthClientID = '';
+    this.apiConnectAuthClientSecret = '';
+    this.apiConnectConsumerOrgOwnerUser = '';
+    this.apiConnectConsumerOrgOwnerRegistry = '';
+    this.apiConnectAnalyticsServerName = '';
+    this.centralConfig = new _types.CentralAgentConfig();
+    this.traceabilityConfig = new _types.TraceabilityConfig();
+  }
+}
+
+/**
+ * @description Generates the IBM API Connect DA env vars file.
+ */
+exports.IBMAPIConnectAgentValues = IBMAPIConnectAgentValues;
+const ibmAPIConnectDAEnvVarTemplate = () => {
+  return `# IBM API Connect configs
+APICONNECT_URL={{apiConnectURL}}
+APICONNECT_ORGANIZATIONNAME={{apiConnectOrgName}}
+APICONNECT_CATALOGNAME={{apiConnectCatalogName}}
+APICONNECT_AUTH_APIKEY={{apiConnectAuthAPIKey}}
+APICONNECT_AUTH_CLIENTID={{apiConnectAuthClientID}}
+APICONNECT_AUTH_CLIENTSECRET={{apiConnectAuthClientSecret}}
+APICONNECT_CONSUMERORGOWNER_USER={{apiConnectConsumerOrgOwnerUser}}
+APICONNECT_CONSUMERORGOWNER_REGISTRY={{apiConnectConsumerOrgOwnerRegistry}}
+
+# Amplify Central configs
+CENTRAL_AGENTNAME={{centralConfig.daAgentName}}
+CENTRAL_AUTH_CLIENTID={{centralConfig.dosaAccount.clientId}}
+CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
+CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
+CENTRAL_ENVIRONMENT={{centralConfig.environment}}
+CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_REGION={{centralConfig.region}}
+
+# Logging configs
+# Define the logging level: info, debug, error
+LOG_LEVEL=info
+# Specify where to send the log: stdout, file, both
+LOG_OUTPUT=stdout
+# Define where the log files are written
+LOG_FILE_PATH=logs
+`;
+};
+
+/**
+ * @description Generates the IBM API Connect TA env vars file.
+ */
+exports.ibmAPIConnectDAEnvVarTemplate = ibmAPIConnectDAEnvVarTemplate;
+const ibmAPIConnectTAEnvVarTemplate = () => {
+  return `# IBM API Connect configs
+APICONNECT_URL={{apiConnectURL}}
+APICONNECT_ORGANIZATIONNAME={{apiConnectOrgName}}
+APICONNECT_CATALOGNAME={{apiConnectCatalogName}}
+APICONNECT_AUTH_APIKEY={{apiConnectAuthAPIKey}}
+APICONNECT_AUTH_CLIENTID={{apiConnectAuthClientID}}
+APICONNECT_AUTH_CLIENTSECRET={{apiConnectAuthClientSecret}}
+APICONNECT_ANALYTICSSERVERNAME={{apiConnectAnalyticsServerName}}
+
+# Amplify Central configs
+{{#if traceabilityConfig.usageReportingOffline}}
+CENTRAL_USAGEREPORTING_OFFLINE={{traceabilityConfig.usageReportingOffline}}
+CENTRAL_ENVIRONMENTID={{centralConfig.environmentId}}
+CENTRAL_AGENTNAME={{centralConfig.taAgentName}}
+{{else}}
+CENTRAL_AGENTNAME={{centralConfig.taAgentName}}
+CENTRAL_AUTH_CLIENTID={{centralConfig.dosaAccount.clientId}}
+CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
+CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
+CENTRAL_ENVIRONMENT={{centralConfig.environment}}
+CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
+CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_REGION={{centralConfig.region}}
+
+{{#compare . traceabilityConfig.protocol "https"}}
+TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
+{{/compare}}
+TRACEABILITY_SAMPLING_PERCENTAGE={{traceabilityConfig.samplingPercentage}}
+TRACEABILITY_SAMPLING_REPORTALLERRORS={{traceabilityConfig.samplingReportAllErrors}}
+{{/if}}
+
+# Logging configs
+# Define the logging level: info, debug, error
+LOG_LEVEL=info
+# Specify where to send the log: stdout, file, both
+LOG_OUTPUT=stdout
+# Define where the log files are written
+LOG_FILE_PATH=logs
+`;
+};
+exports.ibmAPIConnectTAEnvVarTemplate = ibmAPIConnectTAEnvVarTemplate;

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

@@ -99,7 +99,10 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+{{/compare}}
 
 # Logging configs
 # Define the logging level: info, debug, error
@@ -142,7 +145,16 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
-CENTRAL_REGION={{centralConfig.region}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
+{{#compare . centralConfig.region "US" operator="!="}}
+CENTRAL_URL={{centralConfig.url}}
+CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
+
+TRACEABILITY_HOST={{traceabilityConfig.host}}
+{{/compare}}
+{{#compare . centralConfig.region "US"}}
+
+{{/compare}}
 {{#compare . traceabilityConfig.protocol "https"}}
 TRACEABILITY_PROTOCOL={{traceabilityConfig.protocol}}
 {{/compare}}

package/dist/commands/install/ibmAPIConnectAgents.js

@@ -0,0 +1,214 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testables = exports.gatewayConnectivity = exports.defaultLogFiles = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.IBMAPIConnectInstallMethods = exports.ConfigFiles = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _snooplogg = _interopRequireDefault(require("snooplogg"));
+var _basicPrompts = require("../../common/basicPrompts");
+var _types = require("../../common/types");
+var _utils = require("../../common/utils");
+var helpers = _interopRequireWildcard(require("./helpers"));
+var _ibmAPIConnectTemplates = require("./helpers/templates/ibmAPIConnectTemplates");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-ignore
+const {
+  log
+} = (0, _snooplogg.default)('central: install: agents: ibmAPIConnect');
+const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.IBMAPICONNECT_DA}`;
+const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.IBMAPICONNECT_TA}`;
+const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
+
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = exports.ConfigFiles = {
+  DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
+  TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
+  IBMAPIConnectDABinaryFile: 'discovery_agent',
+  IBMAPIConnectDAYaml: 'discovery_agent.yml',
+  IBMAPIConnectTABinaryFile: 'traceability_agent',
+  IBMAPIConnectTAYaml: 'traceability_agent.yml'
+};
+
+// IBMAPIConnectPrompts - prompts for user inputs
+const IBMAPIConnectPrompts = {
+  configTypeMsg: 'Select the mode of installation',
+  enterApiConnectURL: 'Enter the IBM API Connect URL',
+  enterApiConnectOrgName: 'Enter the IBM API Connect Organization Name',
+  enterApiConnectCatalogName: 'Enter the IBM API Connect Catalog Name',
+  enterApiConnectAuthAPIKey: 'Enter the IBM API Connect Auth API Key',
+  enterApiConnectAuthClientID: 'Enter the IBM API Connect Client ID',
+  enterApiConnectAuthClientSecret: 'Enter the IBM API Connect Client Secret',
+  enterApiConnectConsumerOrgOwnerUser: 'Enter the IBM API Connect Consumer Organization Owner User',
+  enterApiConnectConsumerOrgOwnerRegistry: 'Enter the IBM API Connect Consumer Organization Owner User Registry',
+  enterApiConnectAnalyticsServerName: 'Enter the IBM API Connect Analytics Server Name'
+};
+const askBundleType = async () => {
+  return await (0, _basicPrompts.askList)({
+    msg: helpers.agentMessages.selectAgentType,
+    choices: [_types.BundleType.ALL_AGENTS, _types.BundleType.DISCOVERY, _types.BundleType.TRACEABILITY]
+  });
+};
+exports.askBundleType = askBundleType;
+const askConfigType = async () => {
+  return _types.AgentConfigTypes.DOCKERIZED;
+};
+
+//
+// Questions for the configuration of IBM API Connect agents
+//
+exports.askConfigType = askConfigType;
+const askIBMAPIConnectURL = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectURL
+});
+const askIBMAPIConnectOrgName = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectOrgName
+});
+const askIBMAPIConnectCatalogName = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectCatalogName
+});
+const askIBMAPIConnectAuthAPIKey = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectAuthAPIKey
+});
+const askIBMAPIConnectClientID = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectAuthClientID
+});
+const askIBMAPIConnectClientSecret = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectAuthClientSecret
+});
+const askIBMAPIConnectOrgOwnerUser = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectConsumerOrgOwnerUser
+});
+const askIBMAPIConnectOrgOwnerRegistry = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectConsumerOrgOwnerRegistry
+});
+const askIBMAPIConnectAnalyticsServerName = async () => await (0, _basicPrompts.askInput)({
+  msg: IBMAPIConnectPrompts.enterApiConnectAnalyticsServerName
+});
+const gatewayConnectivity = async installConfig => {
+  const ibmAPIConnectAgentValues = new _ibmAPIConnectTemplates.IBMAPIConnectAgentValues();
+  console.log('\nCONNECTION TO IBM API Connect:');
+  console.log(_chalk.default.gray(`The discovery agent needs to connect to the IBM API Connect Gateway to discover API's for publishing to Amplify.\nThe traceability agent needs to connect to IBM API Connect for collecting APIs transactions. These will be forwarded to the Business Insights.\n`));
+  await askCommonPrompts(ibmAPIConnectAgentValues);
+
+  // IBM API Connect Discovery Agent Prompts
+  if (installConfig.switches.isDaEnabled) {
+    console.log(_chalk.default.gray(`\nDiscovery Agent Configuration\n`));
+    await askDiscoveryPrompts(ibmAPIConnectAgentValues);
+  }
+
+  // IBM API Connect Traceability Agent Prompts
+  if (installConfig.switches.isTaEnabled) {
+    console.log(_chalk.default.gray(`\nTraceability Agent Configuration\n`));
+    await askTraceabilityPrompts(ibmAPIConnectAgentValues);
+  }
+  return ibmAPIConnectAgentValues;
+};
+exports.gatewayConnectivity = gatewayConnectivity;
+const generateSuccessHelpMsg = installConfig => {
+  if (installConfig.centralConfig.ampcDosaInfo.isNew && !installConfig.switches.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.'));
+  }
+  dockerSuccessMsg(installConfig);
+  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.IBMAPICONNECT}`));
+};
+const dockerSuccessMsg = installConfig => {
+  let dockerInfo;
+  const runDaLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.DA_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
+  const runDaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.DA_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
+  const runTaLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.TA_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
+  const runTaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.TA_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
+  const startDaLinuxMsg = `\nStart the Discovery Agent on a Linux based machine`;
+  const startDaWinMsg = `\nStart the Discovery Agent on a Windows machine`;
+  const startTaLinuxMsg = `\nStart the Traceability Agent on a Linux based machine`;
+  const startTaWinMsg = `\nStart the Traceability Agent on a Windows machine`;
+  if (installConfig.switches.isDaEnabled && installConfig.switches.isTaEnabled) {
+    dockerInfo = `To utilize the agents, pull the latest Docker images and run them using the appropriate supplied environment files, (${helpers.configFiles.DA_ENV_VARS} & ${helpers.configFiles.TA_ENV_VARS}):`;
+  } else if (installConfig.switches.isDaEnabled) {
+    dockerInfo = `To utilize the discovery agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.DA_ENV_VARS}):`;
+  } else {
+    dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
+  }
+  console.log(_chalk.default.whiteBright(dockerInfo), '\n');
+  if (installConfig.switches.isDaEnabled) {
+    const daImageVersion = `${daImage}:${installConfig.daVersion}`;
+    console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));
+    console.log(_chalk.default.cyan(`docker pull ${daImageVersion}`));
+    console.log(_chalk.default.white(_utils.isWindows ? startDaWinMsg : startDaLinuxMsg));
+    console.log(_chalk.default.cyan(_utils.isWindows ? runDaWinMsg : runDaLinuxMsg));
+    console.log('\t', _chalk.default.cyan(`-v /data ${daImageVersion}`), '\n');
+  }
+  if (installConfig.switches.isTaEnabled) {
+    const taImageVersion = `${taImage}:${installConfig.taVersion}`;
+    console.log(_chalk.default.white('Pull the latest image of the Traceability Agent:'));
+    console.log(_chalk.default.cyan(`docker pull ${taImageVersion}`));
+    console.log(_chalk.default.white(_utils.isWindows ? startTaWinMsg : startTaLinuxMsg));
+    console.log(_chalk.default.cyan(_utils.isWindows ? runTaWinMsg : runTaLinuxMsg));
+    console.log('\t', _chalk.default.cyan(`-v /data ${taImageVersion}`), '\n');
+  }
+};
+async function askCommonPrompts(ibmAPIConnectAgentValues) {
+  // IBM API Connect URL
+  ibmAPIConnectAgentValues.apiConnectURL = await askIBMAPIConnectURL();
+  // IBM API Connect Org Name
+  ibmAPIConnectAgentValues.apiConnectOrgName = await askIBMAPIConnectOrgName();
+  // IBM API Connect Catalog Name
+  ibmAPIConnectAgentValues.apiConnectCatalogName = await askIBMAPIConnectCatalogName();
+  // IBM API Connect Auth API Key
+  ibmAPIConnectAgentValues.apiConnectAuthAPIKey = await askIBMAPIConnectAuthAPIKey();
+  // IBM API Connect Auth Client ID
+  ibmAPIConnectAgentValues.apiConnectAuthClientID = await askIBMAPIConnectClientID();
+  // IBM API Connect Auth Client Secret
+  ibmAPIConnectAgentValues.apiConnectAuthClientSecret = await askIBMAPIConnectClientSecret();
+}
+
+// IBM API Connect DA prompts
+async function askDiscoveryPrompts(ibmAPIConnectAgentValues) {
+  // IBM API Connect Consumer Org Owner User
+  ibmAPIConnectAgentValues.apiConnectConsumerOrgOwnerUser = await askIBMAPIConnectOrgOwnerUser();
+  // IBM API Connect Consumer Org Owner Registry
+  ibmAPIConnectAgentValues.apiConnectConsumerOrgOwnerRegistry = await askIBMAPIConnectOrgOwnerRegistry();
+}
+async function askTraceabilityPrompts(ibmAPIConnectAgentValues) {
+  // IBM API Connect Analytics Server Name
+  ibmAPIConnectAgentValues.apiConnectAnalyticsServerName = await askIBMAPIConnectAnalyticsServerName();
+}
+const completeInstall = async installConfig => {
+  /**
+   * Create agent resources
+   */
+  const ibmAPIConnectAgentValues = installConfig.gatewayConfig;
+
+  // Add final settings to ibmAPIConnectAgentValues
+  ibmAPIConnectAgentValues.centralConfig = installConfig.centralConfig;
+  ibmAPIConnectAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
+  console.log('Generating the configuration file(s)...');
+  if (installConfig.switches.isDaEnabled) {
+    (0, _utils.writeTemplates)(ConfigFiles.DAEnvVars, ibmAPIConnectAgentValues, helpers.ibmAPIConnectDAEnvVarTemplate);
+  }
+  if (installConfig.switches.isTaEnabled) {
+    (0, _utils.writeTemplates)(ConfigFiles.TAEnvVars, ibmAPIConnectAgentValues, helpers.ibmAPIConnectTAEnvVarTemplate);
+  }
+  console.log('Configuration file(s) have been successfully created.\n');
+  generateSuccessHelpMsg(installConfig);
+};
+exports.completeInstall = completeInstall;
+const IBMAPIConnectInstallMethods = exports.IBMAPIConnectInstallMethods = {
+  GetBundleType: askBundleType,
+  GetDeploymentType: askConfigType,
+  AskGatewayQuestions: gatewayConnectivity,
+  FinalizeGatewayInstall: completeInstall,
+  ConfigFiles: Object.values(ConfigFiles),
+  AgentNameMap: {
+    [_types.AgentTypes.da]: _types.AgentNames.IBMAPICONNECT_DA,
+    [_types.AgentTypes.ta]: _types.AgentNames.IBMAPICONNECT_TA
+  },
+  GatewayDisplay: _types.GatewayTypes.IBMAPICONNECT
+};
+const testables = exports.testables = {
+  IBMAPIConnectPrompts,
+  ConfigFiles,
+  defaultLogFiles
+};

package/dist/commands/install/platform.js

@@ -9,6 +9,7 @@ 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");
 var _awsAgents = require("./awsAgents");
 var helpers = _interopRequireWildcard(require("./helpers"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -68,6 +69,7 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
   let centralConfig = installConfig.centralConfig;
   await centralConfig.setBaseHost();
   centralConfig.authUrl = `${_CoreConfigController.CoreConfigController.getAuthUrl()}/auth`;
+  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

package/dist/common/types.js

@@ -225,6 +225,8 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
   AgentNames["KAFKA_TA"] = "kafka-traceability-agent";
   AgentNames["SWAGGERHUB_DA"] = "swaggerhub-discovery-agent";
   AgentNames["GRAYLOG_TA"] = "graylog-agent";
+  AgentNames["IBMAPICONNECT_DA"] = "ibm-apiconnect-discovery-agent";
+  AgentNames["IBMAPICONNECT_TA"] = "ibm-apiconnect-traceability-agent";
   return AgentNames;
 }({});
 let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
@@ -236,6 +238,7 @@ let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
   GatewayTypes["EDGE_GATEWAY_ONLY"] = "Amplify API Gateway only";
   GatewayTypes["KAFKA"] = "Kafka";
   GatewayTypes["GRAYLOG"] = "Graylog";
+  GatewayTypes["IBMAPICONNECT"] = "IBM API Connect";
   return GatewayTypes;
 }({});
 let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGatewayTypes) {
@@ -254,6 +257,7 @@ let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNa
   DataPlaneNames["EDGE"] = "Edge";
   DataPlaneNames["KAFKA"] = "Kafka";
   DataPlaneNames["GRAYLOG"] = "Graylog";
+  DataPlaneNames["IBMAPICONNECT"] = "APIConnect";
   DataPlaneNames["KONG"] = "Kong";
   DataPlaneNames["SWAGGERHUB"] = "SwaggerHub";
   DataPlaneNames["MULESOFT"] = "Mulesoft";
@@ -272,7 +276,8 @@ const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
   [SaaSGatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
   [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA,
   [SaaSGatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB,
-  [GatewayTypes.GRAYLOG]: DataPlaneNames.GRAYLOG
+  [GatewayTypes.GRAYLOG]: DataPlaneNames.GRAYLOG,
+  [GatewayTypes.IBMAPICONNECT]: DataPlaneNames.IBMAPICONNECT
 };
 let AgentResourceKind = exports.AgentResourceKind = /*#__PURE__*/function (AgentResourceKind) {
   AgentResourceKind["da"] = "DiscoveryAgent";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.29.0-rc.5",
+	"version": "2.29.0-rc.6",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {