@axway/axway-central-cli 3.7.0-rc.2 → 3.7.0

package/dist/commands/install/edgeAgents.js

@@ -355,19 +355,28 @@ const binarySuccessMsg = (isNewDosa, isDaEnabled, isTaEnabled) => {
   }
 };
 const helmSuccessMsg = (namespace, isDaEnabled, isTaEnabled) => {
-  let finishUp = 'helm repo update\n';
+  const imagePullOverrides = `--set image.pullSecret=<image-pull-secret-name>`;
+  let agentHelmInfo = new Set();
   if (isDaEnabled) {
     console.log(_cliKit.chalk.white(`Discovery Agent override file has been placed at ${process.cwd()}/${ConfigFiles.DAHelmOverride}`));
-    finishUp += `helm upgrade --install --namespace ${namespace} v7-discovery axway/v7-discovery -f ${ConfigFiles.DAHelmOverride}\n`;
+    agentHelmInfo.add({
+      helmReleaseName: 'v7-discovery',
+      helmChartName: 'axway/v7-discovery',
+      overrideFileName: ConfigFiles.DAHelmOverride,
+      imageSecretOverrides: imagePullOverrides
+    });
   }
   if (isTaEnabled) {
     console.log(_cliKit.chalk.white(`Traceability Agent override file has been placed at ${process.cwd()}/${ConfigFiles.TAHelmOverride}`));
-    finishUp += `helm upgrade --install --namespace ${namespace} v7-traceability axway/v7-traceability -f ${ConfigFiles.TAHelmOverride}`;
+    agentHelmInfo.add({
+      helmReleaseName: 'v7-traceability',
+      helmChartName: 'axway/v7-traceability',
+      overrideFileName: ConfigFiles.TAHelmOverride,
+      imageSecretOverrides: imagePullOverrides
+    });
   }
-  console.log(_cliKit.chalk.white('\nTo deploy the Agents run the following commands\n'));
-  console.log(_cliKit.chalk.cyan('helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'));
-  console.log(_cliKit.chalk.cyan(finishUp));
-  console.log(_cliKit.chalk.white(`\n* client_id - service account id for your Amplify Platform organization`), _cliKit.chalk.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
+  helpers.helmImageSecretInfo(namespace);
+  helpers.helmInstallInfo('Edge', namespace, agentHelmInfo);
 };
 const edgeAgentNameMap = {
   [_types.AgentTypes.da]: _types.AgentNames.EDGE_DA,

package/dist/commands/install/graylogAgent.js

@@ -81,10 +81,17 @@ const gatewayConnectivity = async _installConfig => {
   return graylogAgentValues;
 };
 exports.gatewayConnectivity = gatewayConnectivity;
-const generateSuccessHelpMsg = graylogAgentValues => {
+const generateSuccessHelpMsg = namespace => {
   console.log(`Graylog Agent override file has been placed at ${process.cwd()}/${ConfigFiles.helmOverride}`);
-  const installCmd = `helm upgrade --install --namespace ${graylogAgentValues.namespace.name} graylog-agent axway/graylog-agent -f ${ConfigFiles.helmOverride}`;
-  console.log('To complete the Graylog Agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
+  helpers.helmImageSecretInfo(namespace);
+  let agentHelmInfo = new Set();
+  agentHelmInfo.add({
+    helmReleaseName: 'graylog-agent',
+    helmChartName: 'axway/graylog-agent',
+    overrideFileName: ConfigFiles.helmOverride,
+    imageSecretOverrides: `--set image.pullSecret=<image-pull-secret-name>`
+  });
+  helpers.helmInstallInfo('Graylog', namespace, agentHelmInfo);
   console.log('Configuration file(s) have been successfully created.\n');
   console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.GRAYLOG}`));
 };
@@ -110,7 +117,7 @@ const completeInstall = async installConfig => {
   graylogAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
   console.log('Generating the configuration file(s)...');
   (0, _utils.writeTemplates)(ConfigFiles.helmOverride, graylogAgentValues, helpers.graylogHelmOverrideTemplate);
-  generateSuccessHelpMsg(graylogAgentValues);
+  generateSuccessHelpMsg(graylogAgentValues.namespace.name);
 };
 exports.completeInstall = completeInstall;
 const createGraylogCredsSecret = async (namespace, secretName, user, password) => {

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

@@ -141,7 +141,7 @@ const createNewAgentResource = async (client, defsManager, envName, dataPlaneTyp
   queue ? agentResource === _types.AgentResourceKind.da ? dataplane.queueDiscovery = queue : dataplane.queueTrafficCollection = queue : null;
   config ? null : config = {
     owningTeam: owningTeam,
-    filter: dataPlaneType === _types.DataPlaneNames.AWS || _types.DataPlaneNames.AZURE ? filterDA : undefined
+    filter: dataPlaneType === _types.DataPlaneNames.AWS || _types.DataPlaneNames.AZURE ? filterDA === null || filterDA === void 0 ? void 0 : filterDA.trim() : ''
   };
   const result = await client.createResource({
     // @ts-ignore payload

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

@@ -200,6 +200,18 @@ Object.keys(_traceableTemplates).forEach(function (key) {
     }
   });
 });
+var _util2 = require("./util");
+Object.keys(_util2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _util2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _util2[key];
+    }
+  });
+});
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const streamPipeline = exports.streamPipeline = _util.default.promisify(_stream.default.pipeline);
 const unzip = async filePath => {

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

@@ -31,9 +31,7 @@ const envMessages = exports.envMessages = {
   selectTeam: 'Select a team'
 };
 const k8sClusterMessages = exports.k8sClusterMessages = {
-  enterK8sClusterName: 'Enter a unique k8s cluster name',
-  getK8sClustersError: 'Get k8sCluster error.',
-  k8sClusterAlreadyExists: 'k8sCluster already exists. Please enter a new name.'
+  enterK8sClusterName: 'Enter a unique k8s cluster name'
 };
 const agentMessages = exports.agentMessages = {
   enterDiscoveryAgentName: 'Enter a new discovery agent name',
@@ -311,20 +309,11 @@ const askReferencedEnvironments = async (client, defsManager, envInfo) => {
   return selectedRefEnv;
 };
 exports.askReferencedEnvironments = askReferencedEnvironments;
-const askK8sClusterName = async (client, defsManager) => {
-  const {
-    data: k8sCluster
-  } = await (0, _getters.getListByResource)({
-    client,
-    defsManager,
-    resourceType: 'K8SCluster',
-    resourceShortName: 'k8sc'
-  });
-  if (!k8sCluster) throw Error(k8sClusterMessages.getK8sClustersError);
+const askK8sClusterName = async () => {
   const name = await (0, _basicPrompts.askInput)({
     msg: k8sClusterMessages.enterK8sClusterName,
     defaultValue: cliNowString,
-    validate: (0, _basicPrompts.runValidations)((0, _basicPrompts.validateInputIsNew)(k8sCluster.map(k8sCluster => k8sCluster.name), k8sClusterMessages.k8sClusterAlreadyExists), (0, _basicPrompts.validateRegex)(_regex.resourceRegex, (0, _regex.invalidResourceMsg)('K8sCluster')))
+    validate: (0, _basicPrompts.runValidations)((0, _basicPrompts.validateRegex)(_regex.resourceRegex, (0, _regex.invalidResourceMsg)('K8sCluster')))
   });
   return name;
 };

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

@@ -136,11 +136,16 @@ exports.v7TAEnvVarTemplate = v7TAEnvVarTemplate;
 const v7TAHelmOverrideTemplate = () => {
   return `---
 replicaCount: 1
-image:
-  repository: axway.jfrog.io/ampc-public-docker-release/agent/v7-traceability-agent
-  pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "{{taVersion}}" 
+
+# Traceability Agent image overrides
+# image:
+#   fullPath:
+#   registry: docker.repository.axway.com
+#   repository: ampc-beano-docker-prod/1.2
+#   name: v7-traceability-agent
+#   tag: "{{taVersion}}"
+#   pullPolicy: IfNotPresent
+#   pullSecret:
 
 imagePullSecrets: []
 nameOverride: ""
@@ -284,13 +289,16 @@ const v7DAHelmOverrideTemplate = () => {
   return `---
 replicaCount: 1
 
-image:
-  repository: axway.jfrog.io/ampc-public-docker-release/agent/v7-discovery-agent
-  pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "{{daVersion}}" 
+# Discovery Agent image overrides
+# image:
+#   fullPath:
+#   registry: docker.repository.axway.com
+#   repository: ampc-beano-docker-prod/1.2
+#   name: v7-discovery-agent
+#   tag: "{{daVersion}}"
+#   pullPolicy: IfNotPresent
+#   pullSecret:
 
-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 

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

@@ -43,6 +43,16 @@ class GraylogAgentValues {
 exports.GraylogAgentValues = GraylogAgentValues;
 const graylogHelmOverrideTemplate = () => {
   return `---
+# Graylog Agent image overrides
+# image:
+#   fullPath:
+#   registry: docker.repository.axway.com
+#   repository: ampc-beano-docker-prod/1.1
+#   name: graylog-agent
+#   tag:
+#   pullPolicy: IfNotPresent
+#   pullSecret:
+
 graylog:
   url: {{url}}
   basePathSegmentLen: {{basePathSegmentLen}}
@@ -54,7 +64,7 @@ secrets:
     name: {{agentKeysSecret}}
   
 env:
-  CENTRAL_REGION={{centralConfig.region}}
+  CENTRAL_REGION: {{centralConfig.region}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}

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

@@ -30,97 +30,113 @@ class IstioValues {
 exports.IstioValues = IstioValues;
 const istioAgentsTemplate = () => {
   return `---
-  global:
-    # Amplify Central config
-    central:
-      url:  {{centralConfig.scheme}}://{{centralConfig.host}}
-      clientTimeout: 10s
-      envID: {{centralConfig.environmentId}}
-      envName: "{{centralConfig.environment}}"
-      tenantID: "{{centralConfig.orgId}}"
-      auth:
-        baseUrl: "{{centralConfig.authUrl}}"
-        clientTimeout: 10s
-
-  # Config for creating the K8S Secret that holds the Amplify Platform service account details as part of the helm chart deployment
-  secret:
-    # Set to true, and provide the following values to enable the creation of the K8S Secret
-    create: false
-    name: ""
-    password: ""
-    publicKey: ""
-    privateKey: ""
-
-  # Traceability agent config
-  als:
-    enabled: {{istioAgentValues.alsEnabled}}
-    # Header publishing mode. Set to default or verbose.
-    mode: {{istioAgentValues.alsMode}}
-    # Name of the k8scluster
-    clusterName: {{istioAgentValues.clusterName}}
-    # Name of the traceability agent resource
-    agentName: {{centralConfig.taAgentName}}
-    # Amplify Central Deployment (prod, prod-eu)
-    apicDeployment: {{centralConfig.deployment}}
-    # Amplify Platform service account client ID
-    clientID: {{centralConfig.dosaAccount.clientId}}
-    # Amplify ingestion service endpoint
-    condorUrl: {{traceabilityConfig.host}}
-    condorSslVerification: full
-    # Sampling config
-    sampling:
-      percentage: {{traceabilityConfig.samplingPercentage}}
-      per_api: true
-    # Name of the secret containing the public & private keys used by the provided service account client ID
-    keysSecretName: {{istioAgentValues.keysSecretName}}
-    publishHeaders: true
-    # List of namespaces where the ALS Envoy filters should be applied
-    envoyFilterNamespaces:
-    - {{istioAgentValues.envoyFilterNamespace}}
-
-  # Discovery agent config
-  da:
-    enabled: {{istioAgentValues.discoveryEnabled}}
-    # Name of the discovery agent resource
-    agentName: {{centralConfig.daAgentName}}
-    # Amplify Platform service account client ID
-    clientID: {{centralConfig.dosaAccount.clientId}}
-    # Name of the secret containing the public & private keys used by the provided service account client ID
-    keysSecretName: {{istioAgentValues.keysSecretName}}
-    # Name of the K8SCluster the agent is connected to
-    clusterName: {{istioAgentValues.clusterName}}
-    # Polling interval for K8S events
-    pollInterval: "60s"
-    # Resource discovery config
-    discovery:
-      # List of http endpoints to discover api specs from
-      specEndpoints:
-      - /apidoc/swagger.json
-      - /swagger.json
-      - /api/v1/docs
-      - /apis/docs
-      virtualService:
-        # List of namespaces that will be used by agent to discover VirtualService resources
-        namespaces:
-        {{#each istioAgentValues.discoveryNamespaces}}
-        - {{this}}
-        {{/each}}
-        # List of labels that will be used by agent to filter VirtualService resources
-        labels: []
-      requestAuth:
-        # List of namespaces that will be used by agent to discover RequestAuthentication resources
-        namespaces:
-        {{#each istioAgentValues.discoveryNamespaces}}
-        - {{this}}
-        {{/each}}
-        # List of labels that will be used by agent to filter RequestAuthentication resources
-        labels: []
-    # IDP Provider config
-    idpProviders:
-
-  # Deploy the chart with an optional demo service
-  list:
-    enabled: {{istioAgentValues.demoSvcEnabled}}`;
+# Config for creating the K8S Secret that holds the Amplify Platform service account details as part of the helm chart deployment
+secret:
+  # Set to true, and provide the following values to enable the creation of the K8S Secret
+  create: false
+  name: ""
+  password: ""
+  publicKey: ""
+  privateKey: ""
+
+# Traceability agent config
+als:
+  enabled: {{istioAgentValues.alsEnabled}}
+
+  # # Traceability Agent image overrides
+  # image:
+  #   fullPath:
+  #   registry: docker.repository.axway.com
+  #   repository: ampc-beano-docker-prod/2.1
+  #   name: als-traceability-agent
+  #   tag:
+  #   pullPolicy: IfNotPresent
+  #   pullSecret:
+
+  # Header publishing mode. Set to default or verbose.
+  mode: {{istioAgentValues.alsMode}}
+
+  # Name of the k8scluster
+  clusterName: {{istioAgentValues.clusterName}}
+
+  # Name of the secret containing the public & private keys used by the provided service account client ID
+  keysSecretName: {{istioAgentValues.keysSecretName}}
+
+
+  # List of namespaces where the ALS Envoy filters should be applied
+  envoyFilterNamespaces:
+  - {{istioAgentValues.envoyFilterNamespace}}
+  publishHeaders: true
+
+  # Amplify config overrides
+  env:
+    LOG_LEVEL: info 
+    CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
+    CENTRAL_REGION: {{centralConfig.region}}
+    CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
+    CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+    CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
+    CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+    CENTRAL_TEAM: "{{centralConfig.ampcTeamName}}"
+    TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
+    TRACEABILITY_SAMPLING_PERCENTAGE: {{traceabilityConfig.samplingPercentage}}
+
+# Discovery agent config
+da:
+  enabled: {{istioAgentValues.discoveryEnabled}}
+
+  # # Discovery Agent image overrides
+  # image:
+  #   fullPath:
+  #   registry: docker.repository.axway.com
+  #   repository: ampc-beano-docker-prod/1.1
+  #   name: istio-discovery-agent
+  #   tag:
+  #   pullPolicy: IfNotPresent
+  #   pullSecret:
+
+  # Name of the secret containing the public & private keys used by the provided service account client ID
+  keysSecretName: {{istioAgentValues.keysSecretName}}
+
+  # Name of the K8SCluster the agent is connected to
+  clusterName: {{istioAgentValues.clusterName}}
+
+  # Resource discovery config
+  discovery:
+    # List of http endpoints to discover api specs from
+    virtualService:
+      # List of namespaces that will be used by agent to discover VirtualService resources
+      namespaces:
+      {{#each istioAgentValues.discoveryNamespaces}}
+      - {{this}}
+      {{/each}}
+      # List of labels that will be used by agent to filter VirtualService resources
+      labels: []
+    requestAuth:
+      # List of namespaces that will be used by agent to discover RequestAuthentication resources
+      namespaces:
+      {{#each istioAgentValues.discoveryNamespaces}}
+      - {{this}}
+      {{/each}}
+      # List of labels that will be used by agent to filter RequestAuthentication resources
+      labels: []
+
+  # IDP Provider config
+  idpProviders:
+
+  # Amplify config overrides
+  env:
+    LOG_LEVEL: info
+    CENTRAL_AGENTNAME: {{centralConfig.daAgentName}}
+    CENTRAL_REGION: {{centralConfig.region}}
+    CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+    CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
+    CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+    CENTRAL_TEAM: "{{centralConfig.ampcTeamName}}"
+
+# Deploy the chart with an optional demo service
+list:
+  enabled: {{istioAgentValues.demoSvcEnabled}}`;
 };
 
 /**

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

@@ -21,6 +21,8 @@ class TraceableAgentValues {
     _defineProperty(this, "basePathSegmentLen", void 0);
     _defineProperty(this, "centralConfig", void 0);
     _defineProperty(this, "traceabilityConfig", void 0);
+    _defineProperty(this, "traceableSecret", void 0);
+    _defineProperty(this, "agentKeysSecret", void 0);
     this.namespace = {
       name: '',
       isNew: false
@@ -32,6 +34,8 @@ class TraceableAgentValues {
     this.basePathSegmentLen = 2;
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
+    this.traceableSecret = '';
+    this.agentKeysSecret = '';
   }
 }
 
@@ -41,6 +45,22 @@ class TraceableAgentValues {
 exports.TraceableAgentValues = TraceableAgentValues;
 const traceableHelmOverrideTemplate = () => {
   return `---
+# Traceable Agent image overrides
+# image:
+#   fullPath:
+#   registry: docker.repository.axway.com
+#   repository: ampc-beano-docker-prod/1.1
+#   name: graylog-agent
+#   tag:
+#   pullPolicy: IfNotPresent
+#   pullSecret:
+
+secrets:
+  traceable:
+    name: {{traceableSecret}}
+  agent:
+    name: {{agentKeysSecret}}
+
 traceable:
   token: {{traceableToken}}
   {{#compare . environments.length 0 operator="!=" }}

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

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.helmInstallInfo = exports.helmImageSecretInfo = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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 \\`;
+  dockerSecretCmd += `\n  --docker-username=<client_id> \\`;
+  dockerSecretCmd += `\n  --docker-password=<client_secret>`;
+  console.log('\nTo setup docker image secret for the pulling the agent docker images, run the following command:', _chalk.default.cyan(`\n${dockerSecretCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`), _chalk.default.white(`\n* image-pull-secret - Kubernetes secret name with docker config to pull images`));
+};
+exports.helmImageSecretInfo = helmImageSecretInfo;
+const helmInstallInfo = async (agentType, namespace, agentInfo) => {
+  let helmInstallCmd = "";
+  agentInfo.forEach(function (entry) {
+    helmInstallCmd += `helm upgrade --install --namespace ${namespace} ${entry.helmReleaseName} ${entry.helmChartName} \\`;
+    helmInstallCmd += `\n  -f ${entry.overrideFileName} \\`;
+    helmInstallCmd += `\n  ${entry.imageSecretOverrides}\n`;
+  });
+  console.log(`\nTo complete the ${agentType} Agent installation run the following commands:`, _chalk.default.cyan('\nhelm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\nhelm repo update\n${helmInstallCmd}`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`), _chalk.default.white(`\n* image-pull-secret - Kubernetes secret name with docker config to pull images`));
+};
+exports.helmInstallInfo = helmInstallInfo;

package/dist/commands/install/istioAgents.js

@@ -65,7 +65,7 @@ const askConfigType = async () => {
   return _types.AgentConfigTypes.DOCKERIZED;
 };
 exports.askConfigType = askConfigType;
-const gatewayConnectivity = async (installConfig, apiServerClient, defsManager) => {
+const gatewayConnectivity = async installConfig => {
   let istioValues = new _istioTemplates.IstioValues();
   console.log('\nCONNECTING A KUBERNETES CLUSTER TO AMPLIFY CENTRAL\n');
   console.log(_chalk.default.gray(`The Amplify Istio Discovery Agent needs to be deployed to your Kubernetes cluster to discover APIs for publishing to Amplify Central and/or the Amplify Marketplace.
@@ -86,7 +86,7 @@ https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/m
   // Set up the following values from installConfig to be used in setupKubernetes
   istioValues.istioAgentValues.alsEnabled = installConfig.switches.isTaEnabled;
   istioValues.istioAgentValues.discoveryEnabled = installConfig.switches.isDaEnabled;
-  const hybridOverrides = await setupKubernetes(istioValues, apiServerClient, defsManager);
+  const hybridOverrides = await setupKubernetes(istioValues);
   hybridOverrides.envoyFilterNamespace = istioOverrides.envoyFilterNamespace;
   istioOverrides.alsNamespace = hybridOverrides.namespace.name;
   istioOverrides.enableAls = hybridOverrides.alsMode === AlsMode.Verbose;
@@ -215,7 +215,7 @@ const askEnableDemoSvc = async () => {
 };
 
 //Setup Overrides
-const setupKubernetes = async (istioValues, apiServerClient, defsManager) => {
+const setupKubernetes = async istioValues => {
   let istioAgentValues = istioValues.istioAgentValues;
   console.log(_chalk.default.gray(`\nThere are several steps to prepare a Kubernetes cluster for the Amplify Istio Agents.\nThe following questions collect the namespace and secret to use for the Istio gateway.\n`));
   if (istioAgentValues.alsEnabled) {
@@ -234,7 +234,7 @@ const setupKubernetes = async (istioValues, apiServerClient, defsManager) => {
 
   // set keySecretName
   istioAgentValues.keysSecretName = helpers.amplifyAgentsKeysSecret;
-  istioAgentValues.clusterName = await (0, _helpers.askK8sClusterName)(apiServerClient, defsManager);
+  istioAgentValues.clusterName = await (0, _helpers.askK8sClusterName)();
   return istioAgentValues;
 };
 exports.setupKubernetes = setupKubernetes;
@@ -316,8 +316,15 @@ const createHybridOverride = overrides => {
   const overrideFileName = ConfigFiles.HybridOverrideFile;
   (0, _utils.writeTemplates)(overrideFileName, overrides, helpers.istioAgentsTemplate);
   console.log(`Istio agent override file has been placed at ${process.cwd()}/${overrideFileName}`);
-  const installCmd = `helm upgrade --install --namespace ${overrides.istioAgentValues.namespace.name} ampc-hybrid axway/ampc-hybrid -f ${overrideFileName}`;
-  console.log('To complete the Istio agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
+  helpers.helmImageSecretInfo(overrides.istioAgentValues.namespace.name);
+  let agentHelmInfo = new Set();
+  agentHelmInfo.add({
+    helmReleaseName: 'ampc-hybrid',
+    helmChartName: 'axway/ampc-hybrid',
+    overrideFileName: overrideFileName,
+    imageSecretOverrides: `--set da.image.pullSecret=<image-pull-secret-name> --set als.image.pullSecret=<image-pull-secret-name>`
+  });
+  helpers.helmInstallInfo('Istio', overrides.istioAgentValues.namespace.name, agentHelmInfo);
 };
 exports.createHybridOverride = createHybridOverride;
 const installPreprocess = async installConfig => {
@@ -331,7 +338,7 @@ const installPreprocess = async installConfig => {
   return installConfig;
 };
 exports.installPreprocess = installPreprocess;
-const completeInstall = async (installConfig, apiServerClient, defsManager) => {
+const completeInstall = async installConfig => {
   // Contents of completeKubernetes moved here.
 
   const istioValues = installConfig.gatewayConfig;
@@ -349,9 +356,6 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
     }
     await helpers.createAmplifyAgentKeysSecret(istioValues.istioAgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, 'publicKey', istioValues.centralConfig.dosaAccount.publicKey, 'privateKey', istioValues.centralConfig.dosaAccount.privateKey);
   });
-  if (installConfig.switches.isDaEnabled) {
-    await createEnvResources(apiServerClient, defsManager, istioValues.istioAgentValues.clusterName);
-  }
   console.log('Generating the configuration file(s)...');
   createIstioOverride(istioValues);
   createHybridOverride(istioValues);

package/dist/commands/install/traceableAgents.js

@@ -148,8 +148,15 @@ const dockerSuccessMsg = installConfig => {
 };
 const helmSuccessMsg = namespace => {
   console.log(`Traceable Agent override file has been placed at ${process.cwd()}/${ConfigFiles.helmOverride}`);
-  const installCmd = `helm upgrade --install --namespace ${namespace} Traceable-agent axway/Traceable-agent -f ${ConfigFiles.helmOverride}`;
-  console.log('To complete the Traceable Agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
+  helpers.helmImageSecretInfo(namespace);
+  let agentHelmInfo = new Set();
+  agentHelmInfo.add({
+    helmReleaseName: 'traceable-agent',
+    helmChartName: ' axway/traceable-agent',
+    overrideFileName: ConfigFiles.helmOverride,
+    imageSecretOverrides: `--set image.pullSecret=<image-pull-secret-name>`
+  });
+  helpers.helmInstallInfo('Traceable', namespace, agentHelmInfo);
 };
 const generateSuccessHelpMsg = installConfig => {
   const traceableAgentValues = installConfig.gatewayConfig;
@@ -171,6 +178,8 @@ const completeInstall = async installConfig => {
   traceableAgentValues.centralConfig = installConfig.centralConfig;
   traceableAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
   if (installConfig.switches.isHelmInstall) {
+    traceableAgentValues.traceableSecret = helpers.amplifyAgentsCredsSecret;
+    traceableAgentValues.agentKeysSecret = helpers.amplifyAgentsKeysSecret;
     if (traceableAgentValues.namespace.isNew) {
       await helpers.createNamespace(traceableAgentValues.namespace.name);
     }

package/package.json

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