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

package/dist/commands/install/edgeAgents.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testables = exports.prompts = exports.installPreprocess = exports.gatewayConnectivity = exports.dockerPublicKey = exports.dockerPrivateKey = exports.defaultLogFiles = exports.completeInstall = exports.askIsGatewayOnlyMode = exports.askConfigType = exports.askBundleTypeGWOnly = exports.askBundleType = exports.EdgeInstallMethods = exports.EdgeGWOnlyInstallMethods = exports.ConfigFiles = void 0;
+exports.testables = exports.prompts = exports.installPreprocess = exports.gatewayConnectivity = exports.dockerPublicKey = exports.dockerPrivateKey = exports.completeInstall = exports.askIsGatewayOnlyMode = exports.askConfigType = exports.askBundleTypeGWOnly = exports.askBundleType = exports.EdgeInstallMethods = exports.EdgeGWOnlyInstallMethods = exports.ConfigFiles = void 0;
 
 var _cliKit = require("cli-kit");
 
@@ -36,7 +36,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const defaultLogFiles = '/group-*_instance-*.log';
-exports.defaultLogFiles = defaultLogFiles;
+const defaultOTLogFiles = '/group-*_instance-*_traffic*.log';
 const dockerPrivateKey = '/keys/private_key.pem';
 exports.dockerPrivateKey = dockerPrivateKey;
 const dockerPublicKey = '/keys/public_key.pem'; // @ts-ignore
@@ -65,7 +65,9 @@ const prompts = {
   askApiGatewayPort: 'Enter the API Gateway port',
   askApiManagerHost: 'Enter the API Manager hostname',
   askApiManagerPort: 'Enter the API Manager port',
+  askLoggingSource: 'What is the source of logging for the traceability agent',
   askEventsPath: 'Enter the path to the API Gateway event log directory',
+  askOpenTrafficPath: 'Enter the path to the API Gateway open traffic log directory',
   enterGatewayAgentNs: 'Enter the namespace to use for the Amplify Gateway Agents',
   enterGatewayManagerMode: 'Do you want to use API Manager with the API Gateway'
 };
@@ -149,10 +151,19 @@ const askConfigType = async () => {
 
 exports.askConfigType = askConfigType;
 
-const askEventsPath = async () => {
+const askLoggingSource = async () => {
+  console.log(_cliKit.chalk.white(`\nThe API Gateway can provide the API traffic either within event logs or open traffic logs.`));
+  return (await (0, _basicPrompts.askList)({
+    msg: prompts.askLoggingSource,
+    default: _types.LoggingSource.Event,
+    choices: [_types.LoggingSource.Event, _types.LoggingSource.OpenTraffic]
+  })) === _types.LoggingSource.OpenTraffic;
+};
+
+const askEventsPath = async isOpenTraffic => {
   return await (0, _basicPrompts.askInput)({
-    msg: prompts.askEventsPath,
-    defaultValue: '/apigateway/events',
+    msg: isOpenTraffic ? prompts.askOpenTrafficPath : prompts.askEventsPath,
+    defaultValue: isOpenTraffic ? '/apigateway/logs/opentraffic' : '/apigateway/events',
     type: 'string'
   });
 };
@@ -216,24 +227,28 @@ const gatewayConnectivity = async installConfig => {
   }
 
   if (installConfig.switches.isTaEnabled) {
-    console.log('\nCONNECTION TO API GATEWAY:');
-    console.log(_cliKit.chalk.gray(`The traceability agent needs to connect to Axway API Gateway.\n` + `Use the credentials of an Operator user.`));
+    v7AgentValues.isOpenTraffic = await askLoggingSource();
 
-    if (installConfig.switches.isHelmInstall) {
-      console.log(_cliKit.chalk.white(`Please use the name of the API Gateway Service as hostname.`));
-    }
+    if (!v7AgentValues.isOpenTraffic) {
+      console.log('\nCONNECTION TO API GATEWAY:');
+      console.log(_cliKit.chalk.gray(`The traceability agent needs to connect to Axway API Gateway.\n` + `Use the credentials of an Operator user.`));
 
-    v7AgentValues.apiGatewayHost = await askApiGatewayHost();
-    v7AgentValues.apiGatewayPort = await askApiGatewayPort();
-    const apigwCreds = await (0, _basicPrompts.askUsernameAndPassword)('the API Gateway', 'admin');
-    v7AgentValues.apiGatewayAuthUser = apigwCreds.username;
-    v7AgentValues.apiGatewayAuthPass = apigwCreds.password;
+      if (installConfig.switches.isHelmInstall) {
+        console.log(_cliKit.chalk.white(`Please use the name of the API Gateway Service as hostname.`));
+      }
+
+      v7AgentValues.apiGatewayHost = await askApiGatewayHost();
+      v7AgentValues.apiGatewayPort = await askApiGatewayPort();
+      const apigwCreds = await (0, _basicPrompts.askUsernameAndPassword)('the API Gateway', 'admin');
+      v7AgentValues.apiGatewayAuthUser = apigwCreds.username;
+      v7AgentValues.apiGatewayAuthPass = apigwCreds.password;
+    }
 
     if (installConfig.switches.isBinaryInstall || installConfig.switches.isDockerInstall) {
-      const eventLogPaths = await askEventsPath();
+      const eventLogPaths = await askEventsPath(v7AgentValues.isOpenTraffic);
       const trimmedDir = eventLogPaths.trim();
       v7AgentValues.eventLogPath = eventLogPaths ? trimmedDir[trimmedDir.length - 1] === '/' ? `${trimmedDir.slice(0, -1)}` : `${trimmedDir}` : '';
-      v7AgentValues.eventLogPathTemplate = installConfig.switches.isBinaryInstall ? `${v7AgentValues.eventLogPath}${defaultLogFiles}` : '';
+      v7AgentValues.eventLogPathTemplate = installConfig.switches.isBinaryInstall ? `${v7AgentValues.eventLogPath}${v7AgentValues.isOpenTraffic ? defaultOTLogFiles : defaultLogFiles}` : '';
     }
   }
 
@@ -458,6 +473,7 @@ exports.EdgeGWOnlyInstallMethods = EdgeGWOnlyInstallMethods;
 const testables = {
   prompts,
   ConfigFiles,
-  defaultLogFiles
+  defaultLogFiles,
+  defaultOTLogFiles
 };
 exports.testables = testables;

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

@@ -51,7 +51,7 @@ const transactionLoggingMessages = {
   transactionLoggingInfoMsg: 'Transaction logging is optional and not required for usage and metrics logging.\nTurning on transaction logging can have an impact on performance.',
   enterSamplingPercentage: 'What sampling rate would you like to use? (1-100)',
   samplingPercentageInfoMsg: 'A sampling rate of 1 will log 1% of transactions, a sampling rate of 100 will log all transactions.\nWe recommend a sampling rate of 1% which can be increased if needed.',
-  askReportAllErrors: 'Would you like to reports all errors?',
+  askReportAllErrors: 'Would you like to report all errors?',
   reportAllErrorsMsg: 'The agents can take out the error transactions from the sampling rate.'
 };
 exports.transactionLoggingMessages = transactionLoggingMessages;

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

@@ -42,6 +42,8 @@ class V7AgentValues {
 
     _defineProperty(this, "isGatewayOnly", void 0);
 
+    _defineProperty(this, "isOpenTraffic", void 0);
+
     _defineProperty(this, "namespace", void 0);
 
     _defineProperty(this, "centralConfig", void 0);
@@ -61,6 +63,7 @@ class V7AgentValues {
     this.eventLogPath = '';
     this.eventLogPathTemplate = '';
     this.isGatewayOnly = false;
+    this.isOpenTraffic = false;
     this.namespace = {
       name: '',
       isNew: false
@@ -86,6 +89,7 @@ APIMANAGER_HOST={{apiManagerHost}}
 APIMANAGER_PORT={{apiManagerPort}}
 
 {{/unless}}
+{{#unless isOpenTraffic}}
 # API Gateway configs
 APIGATEWAY_AUTH_PASSWORD={{apiGatewayAuthPass}}
 APIGATEWAY_AUTH_USERNAME={{apiGatewayAuthUser}}
@@ -94,11 +98,19 @@ APIGATEWAY_PORT={{apiGatewayPort}}
 {{#if isGatewayOnly}}
 APIGATEWAY_ONLY={{isGatewayOnly}}
 {{/if}}
+{{/unless}}
 {{#if eventLogPathTemplate}}
+{{#if isOpenTraffic}}
+# API Gateway open traffic logs
+EVENT_LOG_INPUT=false
+OPENTRAFFIC_LOG_INPUT=true
+OPENTRAFFIC_LOG_PATHS={{eventLogPathTemplate}}
+{{else}}
 
 # API Gateway event logs
 EVENT_LOG_PATHS={{eventLogPathTemplate}}
 {{/if}}
+{{/if}}
 
 # Amplify Central configs
 {{#if traceabilityConfig.usageReportingOffline}}

package/dist/common/ApiCentralClient.js

@@ -55,7 +55,7 @@ class ApiCentralClient {
       });
       const payload = {
         generateKeypair: false,
-        pemEncodedPublicKey: publicKey.replace(/(\r\n)/gm, ''),
+        pemEncodedPublicKey: publicKey.replace(/(\r\n)/gm, '\n'),
         serviceAccountName: accountName,
         serviceAccountType: 'DOSA'
       };

package/dist/common/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.docsUrl = exports.defaultClientId = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceabilityConfig = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.KindTypes = exports.Kind = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
+exports.docsUrl = exports.defaultClientId = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceabilityConfig = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.KindTypes = exports.Kind = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
 
 var _dataService = require("./dataService");
 
@@ -223,6 +223,14 @@ exports.GatewayMode = GatewayMode;
   GatewayMode["GatewayOnlyMode"] = "Gateway only";
 })(GatewayMode || (exports.GatewayMode = GatewayMode = {}));
 
+let LoggingSource;
+exports.LoggingSource = LoggingSource;
+
+(function (LoggingSource) {
+  LoggingSource["Event"] = "event";
+  LoggingSource["OpenTraffic"] = "open traffic";
+})(LoggingSource || (exports.LoggingSource = LoggingSource = {}));
+
 let BundleType;
 exports.BundleType = BundleType;
 

package/package.json

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