Update docker url paths for all on-prem agents

Author: kasuvy

src/lib/engage/types.ts

@@ -391,7 +391,7 @@ export enum BasePaths {
 	Platform = '/platform/api/v1',
 	V7Agents = '/artifactory/ampc-public-generic-release/v7-agents',
 	AWSAgents = '/artifactory/ampc-public-generic-release/aws-agents',
-	DockerAgentPublicRepo = '/agent',
+	DockerAgentPublicRepo = '/ampc-docker-prod/1.2',
 }
 
 export interface ValidatedDocs {
@@ -897,7 +897,7 @@ export const GatewayTypeToDataPlane = {
 	[GatewayTypes.WSO2]: DataPlaneNames.WSO2,
 };
 
-export const PublicDockerRepoBaseUrl = 'repository.axway.com/ampc-public-docker-release';
+export const PublicDockerRepoBaseUrl = 'docker.repository.axway.com';
 
 export class DOSAConfigInfo {
 	clientId: string | null;

src/lib/engage/utils/agents/flows/akamaiAgent.ts

@@ -3,7 +3,7 @@ import { ApiServerClient } from '../../../clients-external/apiserverclient.js';
 import { DefinitionsManager } from '../../../results/DefinitionsManager.js';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, BasePaths, BundleType, GatewayTypes, GenericResource, InstallationFlowMethods, PublicDockerRepoBaseUrl, svcAccMsg, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, validateRegex, validateValueRange } from '../../basic-prompts.js';
-import { AgentHelmInfo, helmImageSecretInfo, helmInstallInfo, isWindows, writeTemplates } from '../../utils.js';
+import { AgentHelmInfo, helmImageSecretInfo, helmInstallInfo, isWindows, writeTemplates, dockerLoginInfo } from '../../utils.js';
 import { AkamaiAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 import { kubectl } from '../kubectl.js';
@@ -178,6 +178,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 	const dockerInfo = `To utilize the agent, pull the latest Docker image and run it using the appropriate supplied environment file, (${helpers.configFiles.AGENT_ENV_VARS}):`;
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
 	const caImageVersion = `${caImage}:${installConfig.caVersion}`;
+	dockerLoginInfo();
 	installConfig.log(chalk.white('Pull the latest image of the Agent:'));
 	installConfig.log(chalk.cyan(`docker pull ${caImageVersion}`));
 	installConfig.log(chalk.white(isWindows ? startAgentWinMsg : startAgentLinuxMsg));

src/lib/engage/utils/agents/flows/apigeexAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, ApigeeMetricsFilterConfig, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, svcAccMsg, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, validateRegex } from '../../basic-prompts.js';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 import { ApigeeXAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -177,6 +177,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 		dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;

src/lib/engage/utils/agents/flows/awsAgents.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import logger from '../../../../logger.js';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, AWSRegions, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, TrueFalse, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, validateInputLength, validateRegex } from '../../basic-prompts.js';
-import { isWindows, writeTemplates, writeToFile } from '../../utils.js';
+import { dockerLoginMsg, isWindows, writeTemplates, writeToFile } from '../../utils.js';
 import { AWSAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -432,7 +432,7 @@ ${chalk.cyan(`    aws iam create-access-key  --user-name AxwayAmplifyAgentsUser-
     AWS_AUTH_ACCESSKEY=${chalk.yellow('Your_AccessKeyId')}
     AWS_AUTH_SECRETKEY=${chalk.yellow('Your_SecretAccessKey')}`;
 			runCommands = `${chalk.whiteBright(info)}
-
+${dockerLoginMsg()}
 Pull the latest image of the Discovery Agent:
 ${chalk.cyan(`docker pull ${daImage}:${installConfig.daVersion}`)}
 

src/lib/engage/utils/agents/flows/azureAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, svcAccMsg } from '../../../types.js';
 import { askInput, askList, validateRegex } from '../../basic-prompts.js';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 import { AzureAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -196,7 +196,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 		dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
-
+	dockerLoginInfo();
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;
 		installConfig.log(chalk.white('Pull the latest image of the Discovery Agent:'));

src/lib/engage/utils/agents/flows/backstageAgents.ts

@@ -3,7 +3,7 @@ import { askInput, askList } from '../../basic-prompts.js';
 import { AuthMode, BackstageAgentValues, backstageDAEnvVarTemplate, UrlScheme } from '../templates/backstageTemplates.js';
 import * as helpers from '../index.js';
 import chalk from 'chalk';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 
 const daImage = `${PublicDockerRepoBaseUrl}${BasePaths.DockerAgentPublicRepo}/${AgentNames.BACKSTAGE_DA}`;
 
@@ -125,6 +125,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 
 	const dockerInfo = `To utilize the agents, pull the latest Docker images and run them using the appropriate supplied environment files, (${helpers.configFiles.DA_ENV_VARS}:`;
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	const daImageVersion = `${daImage}:${installConfig.daVersion}`;
 	installConfig.log(chalk.white('Pull the latest image of the Discovery Agent:'));

src/lib/engage/utils/agents/flows/edgeAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, localhost, LoggingSource, PublicDockerRepoBaseUrl, svcAccMsg, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, askUsernameAndPassword } from '../../basic-prompts.js';
-import { writeTemplates, isWindows, AgentHelmInfo, helmImageSecretInfo, helmInstallInfo } from '../../utils.js';
+import { writeTemplates, isWindows, AgentHelmInfo, helmImageSecretInfo, helmInstallInfo, dockerLoginInfo } from '../../utils.js';
 import { V7AgentValues } from '../index.js';
 import * as helpers from '../index.js';
 import { kubectl } from '../kubectl.js';
@@ -352,6 +352,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig, eventLogPath: strin
 		dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;

src/lib/engage/utils/agents/flows/gitLabAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, validateRegex } from '../../basic-prompts.js';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 import { GitLabAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -145,6 +145,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 		dockerInfo = `To utilize the discovery agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.DA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;

src/lib/engage/utils/agents/flows/ibmAPIConnetAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, svcAccMsg } from '../../../types.js';
 import { askInput, askList } from '../../basic-prompts.js';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 import { IBMAPIConnectAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -154,6 +154,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 		dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;

src/lib/engage/utils/agents/flows/kafkaAgents.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { AgentConfigTypes, AgentInstallConfig, AgentNames, AgentTypes, BasePaths, BundleType, GatewayTypes, InstallationFlowMethods, PublicDockerRepoBaseUrl, svcAccMsg, YesNo, YesNoChoices } from '../../../types.js';
 import { askInput, askList, validateRegex } from '../../basic-prompts.js';
-import { isWindows, writeTemplates } from '../../utils.js';
+import { dockerLoginInfo, isWindows, writeTemplates } from '../../utils.js';
 import { KafkaAgentValues } from '../index.js';
 import * as helpers from '../index.js';
 
@@ -282,6 +282,7 @@ const dockerSuccessMsg = (installConfig: AgentInstallConfig) => {
 		dockerInfo = `To utilize the traceability agent, pull the latest Docker image and run it using the supplied environment file, (${helpers.configFiles.TA_ENV_VARS}):`;
 	}
 	installConfig.log(chalk.whiteBright(dockerInfo) + '\n');
+	dockerLoginInfo();
 
 	if (installConfig.switches.isDaEnabled) {
 		const daImageVersion = `${daImage}:${installConfig.daVersion}`;