@axway/axway-central-cli 2.30.0-rc.0 → 2.30.0-rc.3

package/dist/commands/install/awsAgents.js

@@ -48,13 +48,10 @@ const InvalidMsg = {
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
-  ContinuousZip: 'cloudformation-continuous-discovery.zip',
-  SynchronousZip: 'cloudformation-synchronous-discovery.zip',
   DeployAllYAML: 'amplify-agents-deploy-all.yaml',
-  ResourcesYAML: 'amplify-agents-resources.yaml',
+  ResourcesYAML: 'amplify-agents-setup.yaml',
   EC2DeployYAML: 'amplify-agents-ec2.yaml',
   FargateDeployYAML: 'amplify-agents-ecs-fargate.yaml',
-  LambdaZip: 'traceability_lambda.zip',
   AgentConfigZip: 'aws_apigw_agent_config-latest.zip',
   DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
   TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
@@ -82,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'
 };
@@ -122,28 +120,6 @@ const askToCreateRoleSetup = async () => {
     default: _types.YesNo.Yes
   })) === _types.YesNo.Yes ? _types.TrueFalse.True.toLowerCase() : _types.TrueFalse.False.toLowerCase();
 };
-const askConfigSvcSetup = async awsAgentValues => {
-  awsAgentValues.cloudFormationConfig.ConfigServiceSetup = (await (0, _basicPrompts.askList)({
-    msg: AWSPrompts.CONFIG_SERVICE,
-    choices: _types.YesNoChoices,
-    default: _types.YesNo.Yes
-  })) === _types.YesNo.Yes ? _types.TrueFalse.True.toLowerCase() : _types.TrueFalse.False.toLowerCase();
-  if (awsAgentValues.cloudFormationConfig.ConfigServiceSetup === _types.TrueFalse.True.toLowerCase()) {
-    awsAgentValues.cloudFormationConfig.ConfigBucketName = await (0, _basicPrompts.askInput)({
-      msg: AWSPrompts.CONFIG_BUCKET,
-      defaultValue: awsAgentValues.cloudFormationConfig.AgentResourcesBucket,
-      validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP, InvalidMsg.S3_BUCKET)
-    });
-    if (awsAgentValues.cloudFormationConfig.ConfigBucketName !== awsAgentValues.cloudFormationConfig.AgentResourcesBucket) {
-      awsAgentValues.cloudFormationConfig.ConfigBucketExists = (await (0, _basicPrompts.askList)({
-        msg: AWSPrompts.CONFIG_BUCKET_EXISTS,
-        choices: _types.YesNoChoices,
-        default: _types.YesNo.Yes
-      })) === _types.YesNo.Yes ? _types.TrueFalse.True.toLowerCase() : _types.TrueFalse.False.toLowerCase();
-    }
-  }
-  return awsAgentValues;
-};
 
 // askToUsePublicIpAddress - asks a Yes/No question for setting a public IP address, returns a True/False string for CloudFormation parameters
 const askToUsePublicIpAddress = async () => {
@@ -300,27 +276,16 @@ const gatewayConnectivity = async installConfig => {
   awsAgentValues.logGroup = apiGWTrafficLogGroupName;
   awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName = apiGWTrafficLogGroupName;
 
-  // ConfigServiceSetup
-  awsAgentValues = await askConfigSvcSetup(awsAgentValues);
+  // 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;
 
-  // DiscoveryQueueName
-  const discoveryQueueName = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.DA_QUEUE,
-    defaultValue: awsAgentValues.cloudFormationConfig.DiscoveryQueueName,
-    validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP, InvalidMsg.SQS_QUEUE)
-  });
-  awsAgentValues.daQueueName = discoveryQueueName;
-  awsAgentValues.cloudFormationConfig.DiscoveryQueueName = discoveryQueueName;
+  // set agent versions
   awsAgentValues.cloudFormationConfig.DiscoveryAgentVersion = installConfig.daVersion;
-
-  // TraceabilityQueueName
-  const traceabilityQueueName = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.TA_QUEUE,
-    defaultValue: awsAgentValues.cloudFormationConfig.TraceabilityQueueName,
-    validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP, InvalidMsg.SQS_QUEUE)
-  });
-  awsAgentValues.taQueueName = traceabilityQueueName;
-  awsAgentValues.cloudFormationConfig.TraceabilityQueueName = traceabilityQueueName;
   awsAgentValues.cloudFormationConfig.TraceabilityAgentVersion = installConfig.taVersion;
 
   // Configure appropriate Gateway type
@@ -344,7 +309,7 @@ const gatewayConnectivity = async installConfig => {
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_LOG_GROUP_NAME, InvalidMsg.LOG_GROUP)
   });
 
-  // TraceabilityQueueName
+  // TraceabilityAgentLogGroupName
   awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.TA_LOG_GROUP,
     defaultValue: awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName,
@@ -355,7 +320,7 @@ const gatewayConnectivity = async installConfig => {
 exports.gatewayConnectivity = gatewayConnectivity;
 const generateOutput = async installConfig => {
   const awsAgentValues = installConfig.gatewayConfig;
-  let s3BaseFiles = [ConfigFiles.LambdaZip, ConfigFiles.DeployAllYAML, ConfigFiles.ResourcesYAML];
+  let s3BaseFiles = [ConfigFiles.DeployAllYAML, ConfigFiles.ResourcesYAML];
   let additionalSteps = '';
   let dockerEnvConfig = '';
   let runCommands = '';
@@ -479,26 +444,9 @@ const downloadAPIGWAgentConfigZip = async () => {
 const unzipAPIGWAgentConfigZip = async zipFile => {
   await helpers.unzip(zipFile);
   _fs.default.unlinkSync(zipFile);
-  _fs.default.existsSync(ConfigFiles.ContinuousZip);
-  return await unzipCFContinuousDiscoveryZip(ConfigFiles.ContinuousZip);
-};
-
-// Unzip Cloud Formation continuous zip
-const unzipCFContinuousDiscoveryZip = async zipFile => {
-  await helpers.unzip(zipFile);
-  try {
-    _fs.default.unlinkSync(zipFile);
-    // remove synchronous zip that was extracted from cloudformation-continuous-discovery.zip
-    if (_fs.default.existsSync(ConfigFiles.SynchronousZip)) {
-      _fs.default.unlinkSync(ConfigFiles.SynchronousZip);
-    }
-  } catch (e) {
-    // May need to manually remove - cloudformation-synchronous-discovery.zip, cloudformation-continuous-discovery.zip
-    console.log(_chalk.default.gray(`The ${ConfigFiles.ContinuousZip} and / or the ${ConfigFiles.SynchronousZip} may not have been removed.\n` + `   You can manually remove them if you wish`));
-  }
   const isCloudFormation = _fs.default.existsSync(ConfigFiles.DeployAllYAML);
   if (!isCloudFormation) {
-    console.log(`${ConfigFiles.DeployAllYAML} was not extracted from ${ConfigFiles.ContinuousZip}`);
+    console.log(`${ConfigFiles.DeployAllYAML} was not extracted from ${ConfigFiles.AgentConfigZip}`);
     return false;
   }
   return true;
@@ -566,6 +514,5 @@ const testables = exports.testables = {
   DeploymentTypes,
   AWSPrompts,
   EC2InstanceTypes,
-  unzipCFContinuousDiscoveryZip,
   ConfigFiles
 };

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,31 +17,27 @@ 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, "daQueueName", void 0);
-    _defineProperty(this, "taQueueName", 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.ECSCentralURL = this.centralConfig.url;
-        this.cloudFormationConfig.ECSCentralDeployment = this.centralConfig.deployment;
-        this.cloudFormationConfig.ECSCentralTraceabilityHost = _types.IngestionHosts[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.daQueueName = '';
-    this.taQueueName = '';
     this.apigwAgentConfigZipFile = '';
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
@@ -56,13 +52,15 @@ exports.AWSAgentValues = AWSAgentValues;
 const awsTAEnvVarTemplate = () => {
   return `# AWS configs
 AWS_REGION={{region}}
-AWS_QUEUENAME={{taQueueName}}
 {{#if accessKey}}
 AWS_AUTH_ACCESSKEY={{accessKey}}
 {{/if}}
 {{#if secretKey}}
 AWS_AUTH_SECRETKEY={{secretKey}}
 {{/if}}
+{{#if fullTransactionLogging}}
+AWS_FULLTRANSACTIONLOGGING={{fullTransactionLogging}}
+{{/if}}
 
 # Amplify Central configs
 {{#if traceabilityConfig.usageReportingOffline}}
@@ -103,7 +101,6 @@ exports.awsTAEnvVarTemplate = awsTAEnvVarTemplate;
 const awsDAEnvVarTemplate = () => {
   return `# AWS configs
 AWS_REGION={{region}}
-AWS_QUEUENAME={{daQueueName}}
 {{#if accessKey}}
 AWS_AUTH_ACCESSKEY={{accessKey}}
 {{/if}}

package/dist/common/types.js

@@ -485,11 +485,6 @@ class CloudFormationConfig {
     _defineProperty(this, "AgentResourcesBucket", void 0);
     _defineProperty(this, "APIGWCWRoleSetup", void 0);
     _defineProperty(this, "APIGWTrafficLogGroupName", void 0);
-    _defineProperty(this, "ConfigServiceSetup", void 0);
-    _defineProperty(this, "ConfigBucketName", void 0);
-    _defineProperty(this, "ConfigBucketExists", void 0);
-    _defineProperty(this, "DiscoveryQueueName", void 0);
-    _defineProperty(this, "TraceabilityQueueName", void 0);
     _defineProperty(this, "DeploymentType", void 0);
     _defineProperty(this, "EC2VPCID", void 0);
     _defineProperty(this, "EC2KeyName", void 0);
@@ -502,9 +497,7 @@ class CloudFormationConfig {
     _defineProperty(this, "ECSCentralDiscoveryAgentName", void 0);
     _defineProperty(this, "ECSCentralTraceabilityAgentName", void 0);
     _defineProperty(this, "ECSCentralClientID", void 0);
-    _defineProperty(this, "ECSCentralURL", void 0);
-    _defineProperty(this, "ECSCentralDeployment", void 0);
-    _defineProperty(this, "ECSCentralTraceabilityHost", void 0);
+    _defineProperty(this, "ECSCentralRegion", void 0);
     _defineProperty(this, "DiscoveryAgentLogGroupName", void 0);
     _defineProperty(this, "DiscoveryAgentVersion", void 0);
     _defineProperty(this, "TraceabilityAgentLogGroupName", void 0);
@@ -516,11 +509,6 @@ class CloudFormationConfig {
     this.AgentResourcesBucket = '';
     this.APIGWCWRoleSetup = 'true';
     this.APIGWTrafficLogGroupName = 'aws-apigw-traffic-logs';
-    this.ConfigServiceSetup = 'true';
-    this.ConfigBucketName = '';
-    this.ConfigBucketExists = 'true';
-    this.DiscoveryQueueName = 'aws-apigw-discovery';
-    this.TraceabilityQueueName = 'aws-apigw-traceability';
     this.DeploymentType = 'EC2';
     this.EC2VPCID = '';
     this.EC2KeyName = '';
@@ -533,9 +521,7 @@ class CloudFormationConfig {
     this.ECSCentralClientID = '';
     this.ECSCentralDiscoveryAgentName = '';
     this.ECSCentralTraceabilityAgentName = '';
-    this.ECSCentralURL = '';
-    this.ECSCentralDeployment = '';
-    this.ECSCentralTraceabilityHost = '';
+    this.ECSCentralRegion = '';
     this.DiscoveryAgentLogGroupName = 'amplify-discovery-agent-logs';
     this.DiscoveryAgentVersion = 'latest';
     this.TraceabilityAgentLogGroupName = 'amplify-traceability-agent-logs';

package/package.json

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