@axway/axway-central-cli 2.17.0-rc.5 → 2.17.0

package/dist/commands/install/awsAgents.js

@@ -4,32 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.testables = exports.installPreprocess = exports.gatewayConnectivity = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.DeploymentTypes = exports.ConfigFiles = exports.AWSPrompts = exports.AWSInstallMethods = void 0;
+
 var _chalk = _interopRequireDefault(require("chalk"));
+
 var _fs = _interopRequireDefault(require("fs"));
+
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
+
 var _basicPrompts = require("../../common/basicPrompts");
+
 var _dataService = require("../../common/dataService");
+
 var _types = require("../../common/types");
+
 var _utils = require("../../common/utils");
+
 var helpers = _interopRequireWildcard(require("./helpers"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+
+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 }; }
+
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: aws');
 const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AWS_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AWS_TA}`;
+const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AWS_TA}`; // DeploymentTypes - ways the agents may be deployed with an AWS APIGW setup
+
+let DeploymentTypes; // EC2InstanceTypes - instance types allowed in cloud formation document
+
+exports.DeploymentTypes = DeploymentTypes;
 
-// DeploymentTypes - ways the agents may be deployed with an AWS APIGW setup
-let DeploymentTypes = exports.DeploymentTypes = /*#__PURE__*/function (DeploymentTypes) {
+(function (DeploymentTypes) {
   DeploymentTypes["EC2"] = "EC2";
   DeploymentTypes["ECS_FARGATE"] = "ECS Fargate";
   DeploymentTypes["OTHER"] = "Other";
-  return DeploymentTypes;
-}({}); //Docker Container Only
-// EC2InstanceTypes - instance types allowed in cloud formation document
-var EC2InstanceTypes = /*#__PURE__*/function (EC2InstanceTypes) {
+})(DeploymentTypes || (exports.DeploymentTypes = DeploymentTypes = {}));
+
+var EC2InstanceTypes;
+
+(function (EC2InstanceTypes) {
   EC2InstanceTypes["T3_MICRO"] = "t3.micro";
   EC2InstanceTypes["T3_NAN0"] = "t3.nano";
   EC2InstanceTypes["T3_SMALL"] = "t3.small";
@@ -37,17 +53,16 @@ var EC2InstanceTypes = /*#__PURE__*/function (EC2InstanceTypes) {
   EC2InstanceTypes["T3_LARGE"] = "t3.large";
   EC2InstanceTypes["T3_XLARGE"] = "t3.xlarge";
   EC2InstanceTypes["T3_2XLARGE"] = "t3.2xlarge";
-  return EC2InstanceTypes;
-}(EC2InstanceTypes || {});
+})(EC2InstanceTypes || (EC2InstanceTypes = {}));
+
 const InvalidMsg = {
   S3_BUCKET: `S3 Bucket Name can contain digits '0-9', lower case letters 'a-z', hyphens '-', and periods '.' with 3-63 characters. Must begin and end with number or letter`,
   LOG_GROUP: `Log Group Name can contain digits '0-9', letters 'a-z' and 'A-Z', underscores '_', hyphens '-', forward slash '/', and periods '.' with a maximum length of 512 characters`,
   SQS_QUEUE: `SQS Queue Name can contain digits '0-9', letters 'a-z' and 'A-Z', underscores '_', and hyphens '-' with a maximum length of 80 characters`,
   CLUSTER_NAME: `ECS fargate cluster name can contain digits '0-9', letters 'a-z' and 'A-Z', underscores '_', and hyphens '-' with a maximum length of 255 characters`
-};
+}; // ConfigFiles - all the config file that are used in the setup
 
-// ConfigFiles - all the config file that are used in the setup
-const ConfigFiles = exports.ConfigFiles = {
+const ConfigFiles = {
   ContinuousZip: 'cloudformation-continuous-discovery.zip',
   SynchronousZip: 'cloudformation-synchronous-discovery.zip',
   DeployAllYAML: 'amplify-agents-deploy-all.yaml',
@@ -59,10 +74,10 @@ const ConfigFiles = exports.ConfigFiles = {
   DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
   TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
   CFProperties: 'cloudformation_properties.json'
-};
+}; // AWSPrompts - all prompts to the user for input
 
-// AWSPrompts - all prompts to the user for input
-const AWSPrompts = exports.AWSPrompts = {
+exports.ConfigFiles = ConfigFiles;
+const AWSPrompts = {
   APIGW_LOG_GROUP: 'Enter the Log Group name to track API Gateway traffic events',
   CLUSTER_NAME: 'Enter the ECS fargate cluster name to deploy the ECS task for the agents',
   CONFIG_BUCKET: 'Enter the S3 bucket the config service will use to track config changes',
@@ -85,18 +100,23 @@ const AWSPrompts = exports.AWSPrompts = {
   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'
 };
+exports.AWSPrompts = AWSPrompts;
+
 const askBundleType = async () => {
   return _types.BundleType.ALL_AGENTS;
 };
+
 exports.askBundleType = askBundleType;
+
 const askConfigType = async () => {
   return _types.AgentConfigTypes.DOCKERIZED;
-};
-
-//
+}; //
 // Complex prompts
 //
+
+
 exports.askConfigType = askConfigType;
+
 const askDeployment = async () => {
   return (0, _basicPrompts.askList)({
     msg: AWSPrompts.DEPLOYMENT,
@@ -112,9 +132,9 @@ const askDeployment = async () => {
     }],
     default: DeploymentTypes.EC2
   });
-};
+}; // askToCreateRoleSetup - asks a Yes/No question for creating the APIGW IAM role, returns a True/False string for CloudFormation parameters
+
 
-// askToCreateRoleSetup - asks a Yes/No question for creating the APIGW IAM role, returns a True/False string for CloudFormation parameters
 const askToCreateRoleSetup = async () => {
   return (await (0, _basicPrompts.askList)({
     msg: AWSPrompts.SETUP_APIGW_CW,
@@ -122,18 +142,21 @@ 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,
@@ -142,10 +165,11 @@ const askConfigSvcSetup = async awsAgentValues => {
       })) === _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
+
 
-// askToUsePublicIpAddress - asks a Yes/No question for setting a public IP address, returns a True/False string for CloudFormation parameters
 const askToUsePublicIpAddress = async () => {
   return (await (0, _basicPrompts.askList)({
     msg: AWSPrompts.PUBLIC_IP,
@@ -153,6 +177,7 @@ const askToUsePublicIpAddress = async () => {
     default: _types.YesNo.Yes
   })) === _types.YesNo.Yes ? _types.TrueFalse.True.toLowerCase() : _types.TrueFalse.False.toLowerCase();
 };
+
 const askEC2InstanceType = async () => {
   return await (0, _basicPrompts.askList)({
     msg: AWSPrompts.EC2_TYPE,
@@ -181,19 +206,23 @@ const askEC2InstanceType = async () => {
     default: EC2InstanceTypes.T3_MICRO
   });
 };
+
 const askEC2VPCConfig = async awsAgentValues => {
   awsAgentValues.cloudFormationConfig.EC2VPCID = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.VPC_ID,
     allowEmptyInput: true,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_VPC_ID, helpers.invalidValueExampleErrMsg('VPC ID', 'vpc-xxxxxxxxxx'))
   });
+
   if (awsAgentValues.cloudFormationConfig.EC2VPCID !== '') {
     // EC2 Public IP Address
     awsAgentValues.cloudFormationConfig.EC2PublicIPAddress = await askToUsePublicIpAddress();
     await askSecurityGroupAndSubnet(awsAgentValues);
   }
+
   return awsAgentValues;
 };
+
 const askSecurityGroupAndSubnet = async awsAgentValues => {
   awsAgentValues.cloudFormationConfig.SecurityGroup = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SECURITY_GROUP,
@@ -205,105 +234,98 @@ const askSecurityGroupAndSubnet = async awsAgentValues => {
   });
   return awsAgentValues;
 };
+
 async function configureEC2Deployment(awsAgentValues) {
   // EC2 Instance type
-  awsAgentValues.cloudFormationConfig.EC2InstanceType = await askEC2InstanceType();
+  awsAgentValues.cloudFormationConfig.EC2InstanceType = await askEC2InstanceType(); // EC2 Key Name
 
-  // EC2 Key Name
   console.log(_chalk.default.gray(`A SSH key pair is required to access the EC2 instance. An example CLI command will be given at the end, if needed`));
   awsAgentValues.cloudFormationConfig.EC2KeyName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.KEY_PAIR
-  });
+  }); // EC2 VPC Config
 
-  // EC2 VPC Config
   awsAgentValues = await askEC2VPCConfig(awsAgentValues);
   awsAgentValues.cloudFormationConfig.EC2SSHLocation = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SSH_LOCATION,
     defaultValue: awsAgentValues.cloudFormationConfig.EC2SSHLocation,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_SSH_LOCATION, helpers.invalidValueExampleErrMsg('IP Range/Mask', '1.2.3.4/0'))
-  });
+  }); // SSMPrivateKeyParameter
 
-  // SSMPrivateKeyParameter
   awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SSM_PRIVATE,
     defaultValue: awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter
-  });
+  }); // SSMPublicKeyParameter
 
-  // SSMPublicKeyParameter
   awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SSM_PUBLIC,
     defaultValue: awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter
   });
   return awsAgentValues;
 }
+
 async function configureECSDeployment(awsAgentValues) {
   // ECS Cluster name
   awsAgentValues.cloudFormationConfig.ECSClusterName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.CLUSTER_NAME,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP, InvalidMsg.CLUSTER_NAME)
   });
-  awsAgentValues = await askSecurityGroupAndSubnet(awsAgentValues);
-  // SSMPrivateKeyParameter
+  awsAgentValues = await askSecurityGroupAndSubnet(awsAgentValues); // SSMPrivateKeyParameter
+
   awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SSM_PRIVATE,
     defaultValue: awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter
-  });
+  }); // SSMPublicKeyParameter
 
-  // SSMPublicKeyParameter
   awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.SSM_PUBLIC,
     defaultValue: awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter
   });
   return awsAgentValues;
-}
+} // @ts-ignore
+
 
-// @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 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`)); // DeploymentType
 
-  // DeploymentType
   const deploymentType = await askDeployment();
   let awsAgentValues = new helpers.AWSAgentValues(deploymentType);
   awsAgentValues.cloudFormationConfig.DeploymentType = deploymentType;
+
   switch (awsAgentValues.cloudFormationConfig.DeploymentType) {
     case DeploymentTypes.ECS_FARGATE:
       {
         console.log(_chalk.default.gray(`To deploy the Agents to ECS Fargate you will need an ECS Cluster Name, Security Group, and Subnet. The coming questions will ask those values.\n`));
         break;
       }
+
     case DeploymentTypes.OTHER:
       {
         console.log(_chalk.default.gray(`To access the AWS CLI, the AWS Access Key and AWS Secret Key credentials are required.\n`));
         break;
       }
-  }
+  } // AWS Region
+
 
-  // AWS Region
-  awsAgentValues.region = await helpers.askAWSRegion();
+  awsAgentValues.region = await helpers.askAWSRegion(); // S3 bucket
 
-  // S3 bucket
   awsAgentValues.cloudFormationConfig.AgentResourcesBucket = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.S3_BUCKET,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP, InvalidMsg.S3_BUCKET)
-  });
+  }); // APIGWCWRoleSetup
 
-  // APIGWCWRoleSetup
-  awsAgentValues.cloudFormationConfig.APIGWCWRoleSetup = await askToCreateRoleSetup();
+  awsAgentValues.cloudFormationConfig.APIGWCWRoleSetup = await askToCreateRoleSetup(); // APIGWTrafficLogGroupName
 
-  // APIGWTrafficLogGroupName
   const apiGWTrafficLogGroupName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.APIGW_LOG_GROUP,
     defaultValue: awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_LOG_GROUP_NAME, InvalidMsg.LOG_GROUP)
   });
   awsAgentValues.logGroup = apiGWTrafficLogGroupName;
-  awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName = apiGWTrafficLogGroupName;
+  awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName = apiGWTrafficLogGroupName; // ConfigServiceSetup
 
-  // ConfigServiceSetup
-  awsAgentValues = await askConfigSvcSetup(awsAgentValues);
+  awsAgentValues = await askConfigSvcSetup(awsAgentValues); // DiscoveryQueueName
 
-  // DiscoveryQueueName
   const discoveryQueueName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.DA_QUEUE,
     defaultValue: awsAgentValues.cloudFormationConfig.DiscoveryQueueName,
@@ -311,9 +333,8 @@ const gatewayConnectivity = async installConfig => {
   });
   awsAgentValues.daQueueName = discoveryQueueName;
   awsAgentValues.cloudFormationConfig.DiscoveryQueueName = discoveryQueueName;
-  awsAgentValues.cloudFormationConfig.DiscoveryAgentVersion = installConfig.daVersion;
+  awsAgentValues.cloudFormationConfig.DiscoveryAgentVersion = installConfig.daVersion; // TraceabilityQueueName
 
-  // TraceabilityQueueName
   const traceabilityQueueName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.TA_QUEUE,
     defaultValue: awsAgentValues.cloudFormationConfig.TraceabilityQueueName,
@@ -321,30 +342,29 @@ const gatewayConnectivity = async installConfig => {
   });
   awsAgentValues.taQueueName = traceabilityQueueName;
   awsAgentValues.cloudFormationConfig.TraceabilityQueueName = traceabilityQueueName;
-  awsAgentValues.cloudFormationConfig.TraceabilityAgentVersion = installConfig.taVersion;
+  awsAgentValues.cloudFormationConfig.TraceabilityAgentVersion = installConfig.taVersion; // Configure appropriate Gateway type
 
-  // Configure appropriate Gateway type
   switch (awsAgentValues.cloudFormationConfig.DeploymentType) {
     case DeploymentTypes.ECS_FARGATE:
       {
         awsAgentValues = await configureECSDeployment(awsAgentValues);
         break;
       }
+
     case DeploymentTypes.EC2:
       {
         awsAgentValues = await configureEC2Deployment(awsAgentValues);
         break;
       }
-  }
+  } // DiscoveryAgentLogGroupName
+
 
-  // DiscoveryAgentLogGroupName
   awsAgentValues.cloudFormationConfig.DiscoveryAgentLogGroupName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.DA_LOG_GROUP,
     defaultValue: awsAgentValues.cloudFormationConfig.DiscoveryAgentLogGroupName,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_LOG_GROUP_NAME, InvalidMsg.LOG_GROUP)
-  });
+  }); // TraceabilityQueueName
 
-  // TraceabilityQueueName
   awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.TA_LOG_GROUP,
     defaultValue: awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName,
@@ -352,14 +372,16 @@ const gatewayConnectivity = async installConfig => {
   });
   return awsAgentValues;
 };
+
 exports.gatewayConnectivity = gatewayConnectivity;
+
 const generateOutput = async installConfig => {
   const awsAgentValues = installConfig.gatewayConfig;
   let s3BaseFiles = [ConfigFiles.LambdaZip, ConfigFiles.DeployAllYAML, ConfigFiles.ResourcesYAML];
   let additionalSteps = '';
   let dockerEnvConfig = '';
-  let runCommands = '';
-  // Configure appropriate Gateway type
+  let runCommands = ''; // Configure appropriate Gateway type
+
   switch (awsAgentValues.cloudFormationConfig.DeploymentType) {
     case DeploymentTypes.ECS_FARGATE:
       {
@@ -367,22 +389,25 @@ const generateOutput = async installConfig => {
         s3BaseFiles.push(ConfigFiles.FargateDeployYAML);
         additionalSteps = `  - Create the SSM parameter:
 ${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter} --value "file:\/\/private_key.pem"`)}
-${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter} --value "file:\/\/public_key.pem"`)}`;
-        // Cleanup EC2 file
+${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter} --value "file:\/\/public_key.pem"`)}`; // Cleanup EC2 file
+
         _fs.default.unlinkSync(ConfigFiles.EC2DeployYAML);
+
         break;
       }
+
     case DeploymentTypes.OTHER:
       {
         // DeploymentTypes.OTHER for Docker Container Only
         // These files need to be put in a resources dir on S3
         let s3ResourcesIncludes = '';
-        [ConfigFiles.DAEnvVars, ConfigFiles.TAEnvVars].forEach(value => s3ResourcesIncludes += `--include "${value}" `);
+        [ConfigFiles.DAEnvVars, ConfigFiles.TAEnvVars].forEach(value => s3ResourcesIncludes += `--include "${value}" `); // Cleanup EC2 file
+
+        _fs.default.unlinkSync(ConfigFiles.EC2DeployYAML); // Cleanup ECS Fargate file
+
 
-        // Cleanup EC2 file
-        _fs.default.unlinkSync(ConfigFiles.EC2DeployYAML);
-        // Cleanup ECS Fargate file
         _fs.default.unlinkSync(ConfigFiles.FargateDeployYAML);
+
         const info = `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}):`;
         dockerEnvConfig = `Wait for the CloudFormation Stack to complete.
   - Create AWS Access and Secret Keys and copy resulting ${_chalk.default.yellow(`"AccessKeyId"`)} & ${_chalk.default.yellow(`"SecretAccessKey"`)}:
@@ -414,11 +439,12 @@ ${_chalk.default.cyan(`docker run --env-file ${helpers.pwd}/${ConfigFiles.TAEnvV
 	-v /data ${taImage}:${installConfig.taVersion}`)}`}`;
         break;
       }
+
     default:
       {
         // DeploymentTypes.EC2
-        s3BaseFiles.push(ConfigFiles.EC2DeployYAML);
-        // These files need to be put in a resources dir on S3
+        s3BaseFiles.push(ConfigFiles.EC2DeployYAML); // These files need to be put in a resources dir on S3
+
         let s3ResourcesIncludes = '';
         [ConfigFiles.DAEnvVars, ConfigFiles.TAEnvVars].forEach(value => s3ResourcesIncludes += `--include "${value}" `);
         additionalSteps = `${_chalk.default.cyan(`    aws s3 sync --exclude "*" ${s3ResourcesIncludes} ./ s3://${awsAgentValues.cloudFormationConfig.AgentResourcesBucket}/resources`)}
@@ -426,15 +452,17 @@ ${_chalk.default.cyan(`docker run --env-file ${helpers.pwd}/${ConfigFiles.TAEnvV
 ${_chalk.default.cyan(`    aws ec2 create-key-pair --key-name ${awsAgentValues.cloudFormationConfig.EC2KeyName} --query KeyMaterial --output text > MyKeyPair.pem`)}
   - Create the SSM parameter:
 ${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter} --value "file:\/\/private_key.pem"`)}
-${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter} --value "file:\/\/public_key.pem"`)}`;
-        // Cleanup Fargate file
+${_chalk.default.cyan(`    aws ssm put-parameter --type SecureString --name ${awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter} --value "file:\/\/public_key.pem"`)}`; // Cleanup Fargate file
+
         _fs.default.unlinkSync(ConfigFiles.FargateDeployYAML);
+
         break;
       }
   }
+
   let s3BaseIncludes = '';
-  s3BaseFiles.forEach(value => s3BaseIncludes += `--include "${value}" `);
-  // if region is AWS default, 'us-east-1', region unnecessary in cloudformation template url
+  s3BaseFiles.forEach(value => s3BaseIncludes += `--include "${value}" `); // if region is AWS default, 'us-east-1', region unnecessary in cloudformation template url
+
   const s3Region = awsAgentValues.region === _types.AWSRegions.US_EAST_1 ? `s3` : `s3.${awsAgentValues.region}`;
   return `
 To complete the install, run the following AWS CLI command:
@@ -455,15 +483,16 @@ ${runCommands}
 
 ${_chalk.default.gray(`Additional information about agent features can be found here:\n${helpers.agentsDocsUrl.AWS}`)}\n
 `;
-};
+}; // Download latest aws apigw config zip
+
 
-// Download latest aws apigw config zip
 const downloadAPIGWAgentConfigZip = async () => {
   const url = `/aws_apigw_agent_config/latest/${ConfigFiles.AgentConfigZip}`;
   const service = await (0, _dataService.dataService)({
     baseUrl: _types.PublicRepoUrl,
     basePath: _types.BasePaths.AWSAgents
   });
+
   try {
     const {
       stream
@@ -473,22 +502,27 @@ const downloadAPIGWAgentConfigZip = async () => {
   } catch (err) {
     throw new Error(`Failed to download the agent: ${err.message}`);
   }
-};
+}; // Unzip latest aws apigw config zip
+
 
-// Unzip latest aws apigw config zip
 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
+
 
-// 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
+    _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);
     }
@@ -496,58 +530,73 @@ const unzipCFContinuousDiscoveryZip = async zipFile => {
     // 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}`);
     return false;
   }
+
   return true;
 };
+
 const installPreprocess = async installConfig => {
   // attempt to download the cloud formation files
   console.log(_chalk.default.gray(`Downloading the latest Cloud formation template...`));
   let apigwAgentConfigZipFile = await downloadAPIGWAgentConfigZip();
+
   if (apigwAgentConfigZipFile !== '') {
     console.log(_chalk.default.gray(`\nSuccess`));
   }
+
   installConfig.gatewayConfig.apigwAgentConfigZipFile = apigwAgentConfigZipFile;
   return installConfig;
 };
+
 exports.installPreprocess = installPreprocess;
+
 const completeInstall = async installConfig => {
   /**
    * Create agent resources
    */
-  const awsAgentValues = installConfig.gatewayConfig;
+  const awsAgentValues = installConfig.gatewayConfig; // Add final settings to awsAgentsValues
 
-  // Add final settings to awsAgentsValues
   awsAgentValues.centralConfig = installConfig.centralConfig;
   awsAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
   const unpackZip = await unzipAPIGWAgentConfigZip(awsAgentValues.apigwAgentConfigZipFile);
+
   if (unpackZip) {
     console.log('\nCreating the agent environment files for AWS...');
   }
+
   console.log('Generating the configuration file(s)...');
   console.log('Generating the cloud formation parameters file...');
   let paramStrings = [];
   awsAgentValues.updateCloudFormationConfig();
+
   for (let [key, value] of Object.entries(awsAgentValues.cloudFormationConfig)) {
     paramStrings.push(`{"ParameterKey": "${key}", "ParameterValue": "${value}"}`);
   }
+
   (0, _utils.writeToFile)(ConfigFiles.CFProperties, `[\n${paramStrings.join(',\n')}\n]`);
+
   if (installConfig.switches.isDaEnabled && DeploymentTypes.ECS_FARGATE !== awsAgentValues.cloudFormationConfig.DeploymentType) {
     log('GENERATING DA TEMPLATE');
     (0, _utils.writeTemplates)(ConfigFiles.DAEnvVars, awsAgentValues, helpers.awsDAEnvVarTemplate);
   }
+
   if (installConfig.switches.isTaEnabled && DeploymentTypes.ECS_FARGATE !== awsAgentValues.cloudFormationConfig.DeploymentType) {
     log('GENERATING TA TEMPLATE');
     (0, _utils.writeTemplates)(ConfigFiles.TAEnvVars, awsAgentValues, helpers.awsTAEnvVarTemplate);
   }
+
   console.log('Configuration file(s) have been successfully created.\n');
   console.log(await generateOutput(installConfig));
 };
+
 exports.completeInstall = completeInstall;
-const AWSInstallMethods = exports.AWSInstallMethods = {
+const AWSInstallMethods = {
   GetBundleType: askBundleType,
   GetDeploymentType: askConfigType,
   AskGatewayQuestions: gatewayConnectivity,
@@ -559,13 +608,14 @@ const AWSInstallMethods = exports.AWSInstallMethods = {
     [_types.AgentTypes.ta]: _types.AgentNames.AWS_TA
   },
   GatewayDisplay: _types.GatewayTypes.AWS_GATEWAY
-};
+}; // These are the items that are not exported, but need to be for testing
 
-// These are the items that are not exported, but need to be for testing
-const testables = exports.testables = {
+exports.AWSInstallMethods = AWSInstallMethods;
+const testables = {
   DeploymentTypes,
   AWSPrompts,
   EC2InstanceTypes,
   unzipCFContinuousDiscoveryZip,
   ConfigFiles
-};
+};
+exports.testables = testables;