@axway/axway-central-cli 2.30.0-rc.2 → 2.31.0

package/dist/commands/install/awsAgents.js

@@ -52,7 +52,7 @@ const ConfigFiles = exports.ConfigFiles = {
   ResourcesYAML: 'amplify-agents-setup.yaml',
   EC2DeployYAML: 'amplify-agents-ec2.yaml',
   FargateDeployYAML: 'amplify-agents-ecs-fargate.yaml',
-  AgentConfigZip: 'aws_apigw_agent_config-v1.1.60-alpha4.zip',
+  AgentConfigZip: 'aws_apigw_agent_config-latest.zip',
   DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
   TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
   CFProperties: 'cloudformation_properties.json'
@@ -79,6 +79,7 @@ const AWSPrompts = exports.AWSPrompts = {
   SUBNET: 'Enter the Subnet for the EC2 Instance of ECS Container',
   S3_BUCKET: 'Enter the existing S3 bucket, within your region, where the agent resources will be uploaded',
   TA_LOG_GROUP: 'Enter the log group name the traceability agent will log to',
+  FULL_TRANSACTION_LOGGING: 'Do you want to enable Full Transaction Logging? Please note that CloudWatch costs would increase when Full Transaction Logging is enabled',
   TA_QUEUE: 'Enter the traceability queue name',
   VPC_ID: 'Enter the VPC ID to deploy the EC2 instance to. Leave blank to create entire infrastructure'
 };
@@ -275,6 +276,14 @@ const gatewayConnectivity = async installConfig => {
   awsAgentValues.logGroup = apiGWTrafficLogGroupName;
   awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName = apiGWTrafficLogGroupName;
 
+  // FullTransactionLogging
+  const fullTransactionLogging = (await (0, _basicPrompts.askList)({
+    msg: AWSPrompts.FULL_TRANSACTION_LOGGING,
+    choices: _types.YesNoChoices,
+    default: _types.YesNo.No
+  })) === _types.YesNo.Yes;
+  awsAgentValues.fullTransactionLogging = fullTransactionLogging;
+
   // set agent versions
   awsAgentValues.cloudFormationConfig.DiscoveryAgentVersion = installConfig.daVersion;
   awsAgentValues.cloudFormationConfig.TraceabilityAgentVersion = installConfig.taVersion;
@@ -415,7 +424,7 @@ ${_chalk.default.gray(`Additional information about agent features can be found
 
 // Download latest aws apigw config zip
 const downloadAPIGWAgentConfigZip = async () => {
-  const url = `/aws_apigw_agent_config/${ConfigFiles.AgentConfigZip}`;
+  const url = `/aws_apigw_agent_config/latest/${ConfigFiles.AgentConfigZip}`;
   const service = await (0, _dataService.dataService)({
     baseUrl: _types.PublicRepoUrl,
     basePath: _types.BasePaths.AWSAgents

package/dist/commands/install/awsSaasAgents.js

@@ -27,10 +27,12 @@ class DataplaneConfig {
   }
 }
 class AWSDataplaneConfig extends DataplaneConfig {
-  constructor(arn) {
+  constructor(arn, enableFullTransactionLogging) {
     super('AWS');
     _defineProperty(this, "accessLogARN", void 0);
+    _defineProperty(this, "fullTransactionLogging", void 0);
     this.accessLogARN = arn;
+    this.fullTransactionLogging = enableFullTransactionLogging;
   }
 }
 class Sampling {
@@ -102,6 +104,7 @@ class SaasAWSAgentValues extends SaasAgentValues {
     _defineProperty(this, "assumeRole", void 0);
     _defineProperty(this, "externalID", void 0);
     _defineProperty(this, "accessLogARN", void 0);
+    _defineProperty(this, "fullTransactionLogging", void 0);
     this.authType = AWSAuthType.ASSUME;
     this.accessKey = '';
     this.secretKey = '';
@@ -109,6 +112,7 @@ class SaasAWSAgentValues extends SaasAgentValues {
     this.assumeRole = '';
     this.externalID = '';
     this.accessLogARN = '';
+    this.fullTransactionLogging = false;
   }
   getAccessData() {
     let data = JSON.stringify({
@@ -143,6 +147,7 @@ const SaasPrompts = {
   ASSUME_ROLE: 'Enter the Role ARN that the agent will Assume',
   EXTERNAL_ID: 'Enter the External ID the Assume Role expects',
   ACCESS_LOG_ARN: 'Enter the ARN for the Access Log that the Discovery will add and the Traceability will use',
+  FULL_TRANSACTION_LOGGING: 'Do you want to enable Full Transaction Logging? Please note that CloudWatch costs would increase when Full Transaction Logging is enabled',
   DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
@@ -346,6 +351,11 @@ const gatewayConnectivity = async installConfig => {
         msg: SaasPrompts.ACCESS_LOG_ARN,
         validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_ACCESS_LOG_ARN, helpers.invalidValueExampleErrMsg('access log arn', 'arn:aws:logs:region:000000000000:log-group:log-group-name'))
       });
+      hostedAgentValues.fullTransactionLogging = (await (0, _basicPrompts.askList)({
+        msg: SaasPrompts.FULL_TRANSACTION_LOGGING,
+        default: _types.YesNo.No,
+        choices: _types.YesNoChoices
+      })) === _types.YesNo.Yes;
     }
   }
 
@@ -407,7 +417,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   }) : installConfig.centralConfig.ampcEnvInfo.name;
   if (installConfig.gatewayType === _types.GatewayTypes.AWS_GATEWAY) {
     if (installConfig.switches.isTaEnabled) {
-      awsAgentValues.dataplaneConfig = new AWSDataplaneConfig(awsAgentValues.accessLogARN);
+      awsAgentValues.dataplaneConfig = new AWSDataplaneConfig(awsAgentValues.accessLogARN, awsAgentValues.fullTransactionLogging);
     } else {
       awsAgentValues.dataplaneConfig = new DataplaneConfig('AWS');
     }

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

@@ -17,24 +17,26 @@ class AWSAgentValues {
     _defineProperty(this, "accessKey", void 0);
     _defineProperty(this, "secretKey", void 0);
     _defineProperty(this, "logGroup", void 0);
+    _defineProperty(this, "fullTransactionLogging", void 0);
     _defineProperty(this, "region", void 0);
     _defineProperty(this, "apigwAgentConfigZipFile", void 0);
     _defineProperty(this, "centralConfig", void 0);
     _defineProperty(this, "traceabilityConfig", void 0);
     _defineProperty(this, "cloudFormationConfig", void 0);
     _defineProperty(this, "updateCloudFormationConfig", () => {
+      this.cloudFormationConfig.ECSCentralRegion = this.centralConfig.region;
       if (this.cloudFormationConfig.DeploymentType === 'ECS Fargate') {
         this.cloudFormationConfig.ECSCentralOrganizationID = this.centralConfig.orgId;
         this.cloudFormationConfig.ECSCentralEnvironmentName = this.centralConfig.environment;
         this.cloudFormationConfig.ECSCentralClientID = this.centralConfig.dosaAccount.clientId;
         this.cloudFormationConfig.ECSCentralDiscoveryAgentName = this.centralConfig.daAgentName;
         this.cloudFormationConfig.ECSCentralTraceabilityAgentName = this.centralConfig.taAgentName;
-        this.cloudFormationConfig.ECSCentralRegion = this.centralConfig.region;
       }
     });
     this.accessKey = awsDeployment === 'Other' ? '**Insert Access Key**' : '';
     this.secretKey = awsDeployment === 'Other' ? '**Insert Secret Key**' : '';
     this.logGroup = '';
+    this.fullTransactionLogging = false;
     this.region = '';
     this.apigwAgentConfigZipFile = '';
     this.centralConfig = new _types.CentralAgentConfig();
@@ -56,6 +58,9 @@ AWS_AUTH_ACCESSKEY={{accessKey}}
 {{#if secretKey}}
 AWS_AUTH_SECRETKEY={{secretKey}}
 {{/if}}
+{{#if fullTransactionLogging}}
+AWS_FULLTRANSACTIONLOGGING={{fullTransactionLogging}}
+{{/if}}
 
 # Amplify Central configs
 {{#if traceabilityConfig.usageReportingOffline}}

package/package.json

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