@axway/axway-central-cli 4.13.0-rc.0 → 4.13.0-rc.2

package/dist/commands/install/agents.js

@@ -254,9 +254,11 @@ const agents = exports.agents = {
 async function getAgentVersions(agentInstallFlow, installConfig, apiServerClient) {
   if (agentInstallFlow.AgentNameMap && !installConfig.switches.isHostedInstall && installConfig.switches.isDaEnabled) {
     installConfig.daVersion = await helpers.getLatestAgentVersion(apiServerClient, agentInstallFlow.AgentNameMap[_types.AgentTypes.da]);
+    installConfig.dockerRepoVersion = installConfig.daVersion.split('.').slice(0, 2).join('.');
   }
   if (agentInstallFlow.AgentNameMap && !installConfig.switches.isHostedInstall && installConfig.switches.isTaEnabled) {
     installConfig.taVersion = await helpers.getLatestAgentVersion(apiServerClient, agentInstallFlow.AgentNameMap[_types.AgentTypes.ta]);
+    installConfig.dockerRepoVersion = installConfig.taVersion.split('.').slice(0, 2).join('.');
   }
 }
 async function finishInstall(agentInstallFlow, installConfig, apiServerClient, platformClient, defsManager) {

package/dist/commands/install/akamaiAgents.js

@@ -20,7 +20,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: Akamai');
-const caImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AKAMAI_CA}`;
 const amplifyAgentsNs = exports.amplifyAgentsNs = 'amplify-agents';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -154,15 +153,19 @@ const gatewayConnectivity = async installConfig => {
   return akamaiAgentValues;
 };
 exports.gatewayConnectivity = gatewayConnectivity;
-const dockerSuccessMsg = installConfig => {
+const dockerSuccessMsg = async installConfig => {
   let dockerInfo;
   const runAgentLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.AGENT_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
   const runAgentWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.AGENT_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
   const startAgentLinuxMsg = `\nStart the Akamai Agent on a Linux based machine`;
   const startAgentWinMsg = `\nStart the Akamai Agent on a Windows machine`;
+  const caVersion = await helpers.getLatestAgentVersion(installConfig.centralConfig.apiServerClient, _types.AgentNames.AKAMAI_CA);
+  const dockerRepoVersion = caVersion.split('.').slice(0, 2).join('.');
+  const caImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${dockerRepoVersion}/${_types.AgentNames.AKAMAI_CA}`;
   dockerInfo = `To utilize the agent, pull the latest Docker image and run it using the appropriate supplied environment file, (${helpers.configFiles.AGENT_ENV_VARS}):`;
   console.log(_chalk.default.whiteBright(dockerInfo), '\n');
-  const caImageVersion = `${caImage}:${installConfig.caVersion}`;
+  const caImageVersion = `${caImage}:${caVersion}`;
+  helpers.dockerLoginInfo();
   console.log(_chalk.default.white('Pull the latest image of the Agent:'));
   console.log(_chalk.default.cyan(`docker pull ${caImageVersion}`));
   console.log(_chalk.default.white(_utils.isWindows ? startAgentWinMsg : startAgentLinuxMsg));

package/dist/commands/install/apigeexAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: apigeeX');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.APIGEEX_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.APIGEEX_TA}`;
 const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -144,6 +142,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.APIGEEX_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.APIGEEX_TA}`;
   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) {
@@ -152,6 +152,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/awsAgents.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testables = exports.gatewayConnectivity = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.DeploymentTypes = exports.ConfigFiles = exports.AWSPrompts = exports.AWSInstallMethods = void 0;
+exports.testables = exports.gatewayConnectivity = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.ConfigFiles = exports.AWSPrompts = exports.AWSInstallMethods = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 var _basicPrompts = require("../../common/basicPrompts");
@@ -15,27 +15,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: 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 STAGE_TAG_NAME_LENGTH = 127;
-
-// DeploymentTypes - ways the agents may be deployed with an AWS APIGW setup
-let DeploymentTypes = exports.DeploymentTypes = /*#__PURE__*/function (DeploymentTypes) {
-  DeploymentTypes["EC2"] = "EC2";
-  DeploymentTypes["ECS_FARGATE"] = "ECS Fargate";
-  DeploymentTypes["OTHER"] = "Other"; //Docker Container Only
-  return DeploymentTypes;
-}({}); // EC2InstanceTypes - instance types allowed in cloud formation document
-var EC2InstanceTypes = /*#__PURE__*/function (EC2InstanceTypes) {
-  EC2InstanceTypes["T3_MICRO"] = "t3.micro";
-  EC2InstanceTypes["T3_NAN0"] = "t3.nano";
-  EC2InstanceTypes["T3_SMALL"] = "t3.small";
-  EC2InstanceTypes["T3_MEDIUM"] = "t3.medium";
-  EC2InstanceTypes["T3_LARGE"] = "t3.large";
-  EC2InstanceTypes["T3_XLARGE"] = "t3.xlarge";
-  EC2InstanceTypes["T3_2XLARGE"] = "t3.2xlarge";
-  return 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`,
@@ -45,41 +25,15 @@ const InvalidMsg = {
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
-  DeployAllYAML: 'amplify-agents-deploy-all.yaml',
-  ResourcesYAML: 'amplify-agents-setup.yaml',
-  EC2DeployYAML: 'amplify-agents-ec2.yaml',
-  FargateDeployYAML: 'amplify-agents-ecs-fargate.yaml',
-  AgentConfigZip: 'aws_apigw_agent_config-latest.zip',
   DAEnvVars: `${helpers.configFiles.DA_ENV_VARS}`,
-  TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`,
-  CFProperties: 'cloudformation_properties.json'
+  TAEnvVars: `${helpers.configFiles.TA_ENV_VARS}`
 };
 
 // AWSPrompts - all prompts to the user for input
 const AWSPrompts = exports.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',
-  CONFIG_BUCKET_EXISTS: 'Does this bucket already exist on AWS, or will you create beforehand?',
-  CONFIG_SERVICE: 'Do you want to setup config service?',
-  DA_LOG_GROUP: 'Enter the log group name the discovery agent will log to',
   STAGE_TAG_NAME: 'Enter the name of the tag on AWS API Gateway Stage that holds mapped stage on Amplify Engage',
-  DA_QUEUE: 'Enter the discovery queue name',
-  DEPLOYMENT: 'Select the type of deployment you wish to configure',
-  EC2_TYPE: 'Select the EC2 instance type',
-  KEY_PAIR: 'Enter the EC2 KeyPair name that will be used to connect via SSH to the EC2 instance',
-  PUBLIC_IP: 'Assign a Public IP Address to this, only change if your VPC has a NAT Gateway',
-  SECURITY_GROUP: 'Enter the Security Group for the EC2 Instance of ECS Container',
-  SETUP_APIGW_CW: 'The Amazon API Gateway service requires a role to write usage logs to Cloud Watch. Do you want to configure that?',
-  SSH_LOCATION: 'Enter the IP address range that can be used to SSH to the EC2 instances',
-  SSM_PRIVATE: 'Enter the name of the SSM Parameter holding the Private Key',
-  SSM_PUBLIC: 'Enter the name of the SSM Parameter holding the Public Key',
-  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'
+  FULL_TRANSACTION_LOGGING: 'Do you want to enable Full Transaction Logging? Please note that CloudWatch costs would increase when Full Transaction Logging is enabled'
 };
 const askBundleType = async () => {
   return _types.BundleType.ALL_AGENTS;
@@ -89,190 +43,24 @@ const askConfigType = async () => {
   return _types.AgentConfigTypes.DOCKERIZED;
 };
 
-//
-// Complex prompts
-//
-exports.askConfigType = askConfigType;
-const askDeployment = async () => {
-  return (0, _basicPrompts.askList)({
-    msg: AWSPrompts.DEPLOYMENT,
-    choices: [{
-      name: DeploymentTypes.EC2,
-      value: DeploymentTypes.EC2
-    }, {
-      name: DeploymentTypes.ECS_FARGATE,
-      value: DeploymentTypes.ECS_FARGATE
-    }, {
-      name: 'Docker Container Only',
-      value: DeploymentTypes.OTHER
-    }],
-    default: DeploymentTypes.EC2
-  });
-};
-
-// 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,
-    choices: _types.YesNoChoices,
-    default: _types.YesNo.Yes
-  })) === _types.YesNo.Yes ? _types.TrueFalse.True.toLowerCase() : _types.TrueFalse.False.toLowerCase();
-};
-
-// 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,
-    choices: _types.YesNoChoices,
-    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,
-    choices: [{
-      name: EC2InstanceTypes.T3_MICRO,
-      value: EC2InstanceTypes.T3_MICRO
-    }, {
-      name: EC2InstanceTypes.T3_NAN0,
-      value: EC2InstanceTypes.T3_NAN0
-    }, {
-      name: EC2InstanceTypes.T3_SMALL,
-      value: EC2InstanceTypes.T3_SMALL
-    }, {
-      name: EC2InstanceTypes.T3_MEDIUM,
-      value: EC2InstanceTypes.T3_MEDIUM
-    }, {
-      name: EC2InstanceTypes.T3_LARGE,
-      value: EC2InstanceTypes.T3_LARGE
-    }, {
-      name: EC2InstanceTypes.T3_XLARGE,
-      value: EC2InstanceTypes.T3_XLARGE
-    }, {
-      name: EC2InstanceTypes.T3_2XLARGE,
-      value: EC2InstanceTypes.T3_2XLARGE
-    }],
-    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,
-    validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_SECURITY_GROUP, helpers.invalidValueExampleErrMsg('security group', 'sg-xxxxxxxxxx'))
-  });
-  awsAgentValues.cloudFormationConfig.Subnet = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.SUBNET,
-    validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_SUBNET, helpers.invalidValueExampleErrMsg('subnet ID', 'subnet-xxxxxxxxxx'))
-  });
-  return awsAgentValues;
-};
-async function configureEC2Deployment(awsAgentValues) {
-  // EC2 Instance type
-  awsAgentValues.cloudFormationConfig.EC2InstanceType = await askEC2InstanceType();
-
-  // 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
-  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
-  awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.SSM_PRIVATE,
-    defaultValue: awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter
-  });
-
-  // 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.cloudFormationConfig.SSMPrivateKeyParameter = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.SSM_PRIVATE,
-    defaultValue: awsAgentValues.cloudFormationConfig.SSMPrivateKeyParameter
-  });
-
-  // SSMPublicKeyParameter
-  awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.SSM_PUBLIC,
-    defaultValue: awsAgentValues.cloudFormationConfig.SSMPublicKeyParameter
-  });
-  return awsAgentValues;
-}
-
 // @ts-ignore
+exports.askConfigType = askConfigType;
 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.\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();
-  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;
-      }
-  }
+  let awsAgentValues = new helpers.AWSAgentValues();
+  console.log(_chalk.default.gray(`To access the AWS CLI, the AWS Access Key and AWS Secret Key credentials are required.\n`));
 
   // AWS Region
   awsAgentValues.region = await helpers.askAWSRegion();
 
-  // 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
-  awsAgentValues.cloudFormationConfig.APIGWCWRoleSetup = await askToCreateRoleSetup();
-
-  // APIGWTrafficLogGroupName
-  const apiGWTrafficLogGroupName = await (0, _basicPrompts.askInput)({
+  // LogGroupName
+  const logGroupName = await (0, _basicPrompts.askInput)({
     msg: AWSPrompts.APIGW_LOG_GROUP,
-    defaultValue: awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName,
+    defaultValue: awsAgentValues.logGroup,
     validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_LOG_GROUP_NAME, InvalidMsg.LOG_GROUP)
   });
-  awsAgentValues.logGroup = apiGWTrafficLogGroupName;
-  awsAgentValues.cloudFormationConfig.APIGWTrafficLogGroupName = apiGWTrafficLogGroupName;
+  awsAgentValues.logGroup = logGroupName;
 
   // StageTagName
   const stageTagName = await (0, _basicPrompts.askInput)({
@@ -288,74 +76,26 @@ const gatewayConnectivity = async installConfig => {
     default: _types.YesNo.No
   })) === _types.YesNo.Yes;
   awsAgentValues.fullTransactionLogging = fullTransactionLogging;
-
-  // set agent versions
-  awsAgentValues.cloudFormationConfig.DiscoveryAgentVersion = installConfig.daVersion;
-  awsAgentValues.cloudFormationConfig.TraceabilityAgentVersion = installConfig.taVersion;
-
-  // 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
-  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)
-  });
-
-  // TraceabilityAgentLogGroupName
-  awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName = await (0, _basicPrompts.askInput)({
-    msg: AWSPrompts.TA_LOG_GROUP,
-    defaultValue: awsAgentValues.cloudFormationConfig.TraceabilityAgentLogGroupName,
-    validate: (0, _basicPrompts.validateRegex)(helpers.AWSRegexPatterns.AWS_REGEXP_LOG_GROUP_NAME, InvalidMsg.LOG_GROUP)
-  });
   return awsAgentValues;
 };
 exports.gatewayConnectivity = gatewayConnectivity;
 const generateOutput = async installConfig => {
   const awsAgentValues = installConfig.gatewayConfig;
-  let s3BaseFiles = [ConfigFiles.DeployAllYAML, ConfigFiles.ResourcesYAML];
-  let additionalSteps = '';
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.AWS_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.AWS_TA}`;
   let dockerEnvConfig = '';
   let runCommands = '';
-  // Configure appropriate Gateway type
-  switch (awsAgentValues.cloudFormationConfig.DeploymentType) {
-    case DeploymentTypes.ECS_FARGATE:
-      {
-        // DeploymentTypes.ECS_FARGATE
-        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"`)}`;
-        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}" `);
-        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.
+  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 = `
   - Create AWS Access and Secret Keys and copy resulting ${_chalk.default.yellow(`"AccessKeyId"`)} & ${_chalk.default.yellow(`"SecretAccessKey"`)}:
 ${_chalk.default.cyan(`    aws iam create-access-key  --user-name AxwayAmplifyAgentsUser-${awsAgentValues.region} ${helpers.eolChar}
 	--query "AccessKey.{"AccessKeyId":AccessKeyId,"SecretAccessKey":SecretAccessKey}"`)}
   - Add "AccessKeyId" & "SecretAccessKey" variables to both agent .env files, ${ConfigFiles.DAEnvVars} & ${ConfigFiles.TAEnvVars}:
     AWS_AUTH_ACCESSKEY=${_chalk.default.yellow(`Your_AccessKeyId`)}
     AWS_AUTH_SECRETKEY=${_chalk.default.yellow(`Your_SecretAccessKey`)}`;
-        runCommands = `${_chalk.default.whiteBright(info)}
+  runCommands = `${_chalk.default.whiteBright(info)}
 
+${helpers.dockerLoginMsg()}
 Pull the latest image of the Discovery Agent:
 ${_chalk.default.cyan(`docker pull ${daImage}:${installConfig.daVersion}`)}
 
@@ -375,47 +115,7 @@ ${_chalk.default.cyan(`docker run --env-file ${helpers.pwdWin}/${ConfigFiles.TAE
 Start the Traceability agent on Linux based machine:
 ${_chalk.default.cyan(`docker run --env-file ${helpers.pwd}/${ConfigFiles.TAEnvVars} -v ${helpers.pwd}:/keys ${helpers.eolChar}
 	-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
-        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`)}
-  - If necessary, create EC2 KeyPair, for EC2 login:
-${_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"`)}`;
-        break;
-      }
-  }
-  let s3BaseIncludes = '';
-  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, first download and extract the CloudFormation templates:
-  - Download the CloudFormation package:
-${_chalk.default.cyan(`    curl -O https://repository.axway.com/artifactory/ampc-public-generic-release/aws-agents/aws_apigw_agent_config/latest/${ConfigFiles.AgentConfigZip}`)}
-  - Extract the package:
-${_chalk.default.cyan(`    unzip ${ConfigFiles.AgentConfigZip}`)}
-
-Then run the following AWS CLI commands:
-  - Create, if necessary, and upload all files to your S3 bucket
-${_chalk.default.cyan(`    aws s3api create-bucket --bucket ${awsAgentValues.cloudFormationConfig.AgentResourcesBucket} --create-bucket-configuration LocationConstraint=${awsAgentValues.region}`)}
-${_chalk.default.cyan(`    aws s3 sync --exclude "*" ${s3BaseIncludes} ./ s3://${awsAgentValues.cloudFormationConfig.AgentResourcesBucket}`)}
-${additionalSteps}
-  - Deploy the CloudFormation Stack:
-${_chalk.default.cyan(`    aws cloudformation create-stack --stack-name AxwayAmplifyAgents ${helpers.eolChar}
-        --template-url https://${awsAgentValues.cloudFormationConfig.AgentResourcesBucket}.${s3Region}.amazonaws.com/${ConfigFiles.DeployAllYAML} ${helpers.eolChar}
-        --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND CAPABILITY_NAMED_IAM --parameters "file:\/\/${ConfigFiles.CFProperties}"`)} 
-  - Check the CloudFormation Stack:
-${_chalk.default.cyan(`    aws cloudformation describe-stacks --stack-name AxwayAmplifyAgents ${helpers.eolChar}
-	--query "Stacks[].{\"Name\":StackName,\"Status\":StackStatus}"`)}
 ${dockerEnvConfig}
 
 ${runCommands}
@@ -433,23 +133,14 @@ const completeInstall = async installConfig => {
   awsAgentValues.centralConfig = installConfig.centralConfig;
   awsAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
   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) {
+  if (installConfig.switches.isDaEnabled) {
     log('GENERATING DA TEMPLATE');
     (0, _utils.writeTemplates)(ConfigFiles.DAEnvVars, awsAgentValues, helpers.awsDAEnvVarTemplate);
   }
-  if (installConfig.switches.isTaEnabled && DeploymentTypes.ECS_FARGATE !== awsAgentValues.cloudFormationConfig.DeploymentType) {
+  if (installConfig.switches.isTaEnabled) {
     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;
@@ -458,7 +149,7 @@ const AWSInstallMethods = exports.AWSInstallMethods = {
   GetDeploymentType: askConfigType,
   AskGatewayQuestions: gatewayConnectivity,
   FinalizeGatewayInstall: completeInstall,
-  ConfigFiles: [ConfigFiles.DAEnvVars, ConfigFiles.TAEnvVars, ConfigFiles.CFProperties],
+  ConfigFiles: [ConfigFiles.DAEnvVars, ConfigFiles.TAEnvVars],
   AgentNameMap: {
     [_types.AgentTypes.da]: _types.AgentNames.AWS_DA,
     [_types.AgentTypes.ta]: _types.AgentNames.AWS_TA
@@ -468,8 +159,6 @@ const AWSInstallMethods = exports.AWSInstallMethods = {
 
 // These are the items that are not exported, but need to be for testing
 const testables = exports.testables = {
-  DeploymentTypes,
   AWSPrompts,
-  EC2InstanceTypes,
   ConfigFiles
 };

package/dist/commands/install/azureAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: azure');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AZURE_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.AZURE_TA}`;
 const InvalidMessages = {
   enterApiManagementServiceName: `The API Management Service Name can contain only letters, numbers and hyphens. The first character must be a letter and last character must be a letter or a number.`
 };
@@ -147,6 +145,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.AZURE_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.AZURE_TA}`;
   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) {
@@ -155,6 +155,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/backstageAgents.js

@@ -18,7 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: backstage');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.BACKSTAGE_DA}`;
 const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -104,8 +103,10 @@ const dockerSuccessMsg = installConfig => {
   const runDaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.DA_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 daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.BACKSTAGE_DA}`;
   dockerInfo = `To utilize the agents, pull the latest Docker images and run them using the appropriate supplied environment files, (${helpers.configFiles.DA_ENV_VARS}:`;
   console.log(_chalk.default.whiteBright(dockerInfo), '\n');
+  helpers.dockerLoginInfo();
   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}`));

package/dist/commands/install/edgeAgents.js

@@ -25,8 +25,6 @@ const dockerPublicKey = exports.dockerPublicKey = '/keys/public_key.pem';
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: edge');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.EDGE_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.EDGE_TA}`;
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
@@ -263,6 +261,8 @@ const dockerSuccessMsg = (installConfig, eventLogPath) => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.EDGE_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.EDGE_TA}`;
   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) {
@@ -271,6 +271,7 @@ const dockerSuccessMsg = (installConfig, eventLogPath) => {
     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(_cliKit.chalk.whiteBright(dockerInfo), '\n');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_cliKit.chalk.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/gitLabAgents.js

@@ -17,7 +17,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: gitLab:');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.GITLAB_DA}`;
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
@@ -122,10 +121,12 @@ const dockerSuccessMsg = installConfig => {
   const runDaWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.DA_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 daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.GITLAB_DA}`;
   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}):`;
   }
   console.log(_chalk.default.whiteBright(dockerInfo), '\n');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

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

@@ -13,7 +13,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  */
 
 class AWSAgentValues {
-  constructor(awsDeployment) {
+  constructor() {
     _defineProperty(this, "accessKey", void 0);
     _defineProperty(this, "secretKey", void 0);
     _defineProperty(this, "logGroup", void 0);
@@ -23,19 +23,8 @@ class AWSAgentValues {
     _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.accessKey = awsDeployment === 'Other' ? '**Insert Access Key**' : '';
-    this.secretKey = awsDeployment === 'Other' ? '**Insert Secret Key**' : '';
+    this.accessKey = '**Insert Access Key**';
+    this.secretKey = '**Insert Secret Key**';
     this.logGroup = '';
     this.stageTagName = '';
     this.fullTransactionLogging = false;
@@ -43,7 +32,6 @@ class AWSAgentValues {
     this.apigwAgentConfigZipFile = '';
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
-    this.cloudFormationConfig = new _types.CloudFormationConfig();
   }
 }
 

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

@@ -3,9 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.helmInstallInfo = exports.helmImageSecretInfo = void 0;
+exports.helmInstallInfo = exports.helmImageSecretInfo = exports.dockerLoginMsg = exports.dockerLoginInfo = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const dockerLoginMsg = () => {
+  return `${_chalk.default.white('Login to the Axway Docker repository:')}
+${_chalk.default.cyan('docker login docker.repository.axway.com --username <client_id> --password <client_secret>')}
+${_chalk.default.white('* client_id - service account id for your Amplify Platform organization')}
+${_chalk.default.white('* client_secret - service account secret for your Amplify Platform organization')}
+`;
+};
+exports.dockerLoginMsg = dockerLoginMsg;
+const dockerLoginInfo = () => {
+  console.log(dockerLoginMsg());
+};
+exports.dockerLoginInfo = dockerLoginInfo;
 const helmImageSecretInfo = async namespace => {
   let dockerSecretCmd = `kubectl create secret docker-registry <image-pull-secret-name> --namespace ${namespace} \\`;
   dockerSecretCmd += `\n  --docker-server=docker.repository.axway.com \\`;

package/dist/commands/install/ibmAPIConnectAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: 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
@@ -124,6 +122,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.IBMAPICONNECT_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.IBMAPICONNECT_TA}`;
   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) {
@@ -132,6 +132,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/kafkaAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: kafka');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.KAFKA_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.KAFKA_TA}`;
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
@@ -245,6 +243,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.KAFKA_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.KAFKA_TA}`;
   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) {
@@ -253,6 +253,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/platform.js

@@ -9,7 +9,6 @@ var _basicPrompts = require("../../common/basicPrompts");
 var _CliConfigManager = require("../../common/CliConfigManager");
 var _CoreConfigController = require("../../common/CoreConfigController");
 var _types = require("../../common/types");
-var _awsAgents = require("./awsAgents");
 var helpers = _interopRequireWildcard(require("./helpers"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -37,7 +36,7 @@ const askIsProductionEnvironment = async () => {
 };
 const getTraceabilityConfig = async installConfig => {
   let traceabilityConfig = new _types.TraceabilityConfig();
-  if (installConfig.gatewayType === _types.GatewayTypes.AWS_GATEWAY && installConfig.gatewayConfig.cloudFormationConfig.DeploymentType === _awsAgents.DeploymentTypes.ECS_FARGATE) {
+  if (installConfig.gatewayType === _types.GatewayTypes.AWS_GATEWAY) {
     return traceabilityConfig;
   }
   traceabilityConfig.usageReportingOffline = installConfig.bundleType === _types.BundleType.TRACEABILITY_OFFLINE;

package/dist/commands/install/sapApiPortalAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: SAP API Portal');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SAPAPIPORTAL_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SAPAPIPORTAL_TA}`;
 const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -120,6 +118,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SAPAPIPORTAL_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SAPAPIPORTAL_TA}`;
   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) {
@@ -128,6 +128,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/sensediaAgents.js

@@ -17,8 +17,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('engage: install: agents: sensedia');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SENSEDIA_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SENSEDIA_TA}`;
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
@@ -141,6 +139,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SENSEDIA_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SENSEDIA_TA}`;
   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) {
@@ -149,6 +149,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/softwareAGWebMethodsAgents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: Software AG Web Methods');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SOFTWAREAGWEBMETHODS_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.SOFTWAREAGWEBMETHODS_TA}`;
 
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = exports.ConfigFiles = {
@@ -103,6 +101,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SOFTWAREAGWEBMETHODS_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.SOFTWAREAGWEBMETHODS_TA}`;
   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) {
@@ -111,6 +111,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/commands/install/traceableAgents.js

@@ -20,7 +20,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: Traceable');
-const caImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.TRACEABLE_CA}`;
 const amplifyAgentsNs = exports.amplifyAgentsNs = 'amplify-agents';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -153,15 +152,19 @@ const gatewayConnectivity = async installConfig => {
   return traceableAgentValues;
 };
 exports.gatewayConnectivity = gatewayConnectivity;
-const dockerSuccessMsg = installConfig => {
+const dockerSuccessMsg = async installConfig => {
   let dockerInfo;
   const runAgentLinuxMsg = `docker run -it --env-file ${helpers.pwd}/${helpers.configFiles.AGENT_ENV_VARS} -v ${helpers.pwd}:/keys ${helpers.eolChar}`;
   const runAgentWinMsg = `docker run -it --env-file ${helpers.pwdWin}/${helpers.configFiles.AGENT_ENV_VARS} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}`;
   const startAgentLinuxMsg = `\nStart the Traceable Agent on a Linux based machine`;
   const startAgentWinMsg = `\nStart the Traceable Agent on a Windows machine`;
+  const caVersion = await helpers.getLatestAgentVersion(installConfig.centralConfig.apiServerClient, _types.AgentNames.TRACEABLE_CA);
+  const dockerRepoVersion = caVersion.split('.').slice(0, 2).join('.');
+  const caImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${dockerRepoVersion}/${_types.AgentNames.TRACEABLE_CA}`;
   if (installConfig.switches.isTaEnabled) {
     dockerInfo = `To utilize the agent, pull the latest Docker image and run it using the appropriate supplied environment file, (${helpers.configFiles.AGENT_ENV_VARS}):`;
     console.log(_chalk.default.whiteBright(dockerInfo), '\n');
+    helpers.dockerLoginInfo();
     const caImageVersion = `${caImage}:${installConfig.taVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Agent:'));
     console.log(_chalk.default.cyan(`docker pull ${caImageVersion}`));

package/dist/commands/install/wso2Agents.js

@@ -18,8 +18,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: WSO2');
-const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.WSO2_DA}`;
-const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.WSO2_TA}`;
 const defaultLogFiles = exports.defaultLogFiles = '/group-*_instance-*.log';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -93,6 +91,8 @@ const dockerSuccessMsg = installConfig => {
   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`;
+  const daImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.WSO2_DA}`;
+  const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${installConfig.dockerRepoVersion}/${_types.AgentNames.WSO2_TA}`;
   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) {
@@ -101,6 +101,7 @@ const dockerSuccessMsg = installConfig => {
     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');
+  helpers.dockerLoginInfo();
   if (installConfig.switches.isDaEnabled) {
     const daImageVersion = `${daImage}:${installConfig.daVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Discovery Agent:'));

package/dist/common/types.js

@@ -38,14 +38,14 @@ let Kind = exports.Kind = /*#__PURE__*/function (Kind) {
  * NOTE: order of this array is used to orchestrate bulk api calls (see utils/compareDocsByKind)
  */
 const KindTypes = exports.KindTypes = [Kind.Environment, Kind.APIService, Kind.APIServiceRevision, Kind.APIServiceInstance, Kind.Secret, Kind.Webhook, Kind.ConsumerSubscriptionDefinition, Kind.ConsumerInstance];
-const PublicDockerRepoBaseUrl = exports.PublicDockerRepoBaseUrl = 'repository.axway.com/ampc-public-docker-release';
+const PublicDockerRepoBaseUrl = exports.PublicDockerRepoBaseUrl = 'docker.repository.axway.com';
 let BasePaths = exports.BasePaths = /*#__PURE__*/function (BasePaths) {
   BasePaths["ApiServer"] = "/apis";
   BasePaths["ApiCentral"] = "/api/v1";
   BasePaths["Platform"] = "/platform/api/v1";
   BasePaths["V7Agents"] = "/artifactory/ampc-public-generic-release/v7-agents";
   BasePaths["AWSAgents"] = "/artifactory/ampc-public-generic-release/aws-agents";
-  BasePaths["DockerAgentPublicRepo"] = "/agent";
+  BasePaths["DockerAgentPublicRepo"] = "/ampc-docker-prod";
   return BasePaths;
 }({});
 let ConfigTypes = exports.ConfigTypes = /*#__PURE__*/function (ConfigTypes) {
@@ -206,7 +206,7 @@ let BundleType = exports.BundleType = /*#__PURE__*/function (BundleType) {
   return BundleType;
 }({});
 let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
-  AgentNames["AKAMAI_CA"] = "akamai-compliance-agent";
+  AgentNames["AKAMAI_CA"] = "akamai-agent";
   AgentNames["AWS_DA"] = "aws-apigw-discovery-agent";
   AgentNames["AWS_TA"] = "aws-apigw-traceability-agent";
   AgentNames["GITHUB_DA"] = "github-discovery-agent";
@@ -221,10 +221,10 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
   AgentNames["KAFKA_DA"] = "kafka-discovery-agent";
   AgentNames["KAFKA_TA"] = "kafka-traceability-agent";
   AgentNames["SWAGGERHUB_DA"] = "swaggerhub-discovery-agent";
-  AgentNames["GRAYLOG_CA"] = "graylog-compliance-agent";
+  AgentNames["GRAYLOG_CA"] = "graylog-agent";
   AgentNames["IBMAPICONNECT_DA"] = "ibm-apiconnect-discovery-agent";
   AgentNames["IBMAPICONNECT_TA"] = "ibm-apiconnect-traceability-agent";
-  AgentNames["TRACEABLE_CA"] = "traceable-compliance-agent";
+  AgentNames["TRACEABLE_CA"] = "traceable-agent";
   AgentNames["SOFTWAREAGWEBMETHODS_DA"] = "software-ag-webmethods-discovery-agent";
   AgentNames["SOFTWAREAGWEBMETHODS_TA"] = "software-ag-webmethods-traceability-agent";
   AgentNames["BACKSTAGE_DA"] = "backstage-discovery-agent";
@@ -435,6 +435,7 @@ class AgentInstallConfig {
     _defineProperty(this, "daVersion", void 0);
     _defineProperty(this, "taVersion", void 0);
     _defineProperty(this, "caVersion", void 0);
+    _defineProperty(this, "dockerRepoVersion", void 0);
     _defineProperty(this, "gatewayConfig", void 0);
     _defineProperty(this, "idpConfig", void 0);
     _defineProperty(this, "traceabilityConfig", void 0);
@@ -448,6 +449,7 @@ class AgentInstallConfig {
     this.daVersion = 'latest';
     this.taVersion = 'latest';
     this.caVersion = 'latest';
+    this.dockerRepoVersion = '';
     this.switches = new AgentInstallSwitches();
     this.traceabilityConfig = new TraceabilityConfig();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "4.13.0-rc.0",
+	"version": "4.13.0-rc.2",
 	"description": "Manage APIs, services and publish to the Amplify Marketplace",
 	"homepage": "https://platform.axway.com",
 	"author": {