@axway/axway-central-cli 2.10.0 → 2.11.0-rc.1

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

@@ -112,7 +112,7 @@ const askDosaClientId = async (client, showWarning = true) => {
   } else {
     // We're using an existing service account. Notify user to make its keys available to the agents.
     if (showWarning) {
-      console.log(_chalk.default.yellow('Please make sure your "private_key.pem" and "public_key.pem" files for the selected service account are copied to the folder location of the agents.'));
+      console.log(_chalk.default.yellow('Please make sure your "private_key.pem" and "public_key.pem" files for the selected service account are in this installation folder.'));
     } // Fetch selected service account's client ID and return info about it.
 
 

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

@@ -191,9 +191,9 @@ env:
   CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
   CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
-  CENTRAL_ORGANIZATIONID: "{{centralConfig.ampcTeamName}}"
+  CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
-  CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   {{/compare}}
   CENTRAL_URL:  {{centralConfig.url}}
   EVENT_LOG_FILE_PATHS: /events/*.log
@@ -317,7 +317,7 @@ env:
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
-  CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   {{/compare}}
   CENTRAL_URL: {{centralConfig.url}}
   LOG_LEVEL: info

package/dist/commands/install/istioAgents.js

@@ -71,6 +71,7 @@ const istioPrompts = {
   enterCertificatePath: 'Enter the file path to the certificate',
   existingIstioPrompt: 'Use existing Istio installation?',
   askGatewayNamespace: 'Select the namespace where the Istio ingress gateway is running',
+  profilePrompt: 'Select the Istio profile to use',
   // kubernetes
   enterMeshAgentNamespace: 'Enter the namespace to use for the Amplify Istio Agents',
   alsModePrompt: 'Select Traceability Agent HTTP header publishing mode',
@@ -164,6 +165,11 @@ const askCertificateOption = async () => (0, _basicPrompts.askList)({
     name: 'Provide certificate',
     value: _types.Certificate.PROVIDE
   }]
+});
+
+const askIstioProfile = async () => (0, _basicPrompts.askList)({
+  msg: istioPrompts.profilePrompt,
+  choices: _types.IstioProfileChoices
 }); //Setup Overrides
 
 
@@ -181,6 +187,7 @@ const setupIstio = async istioValues => {
     return istioInstallValues;
   }
 
+  istioInstallValues.profile = await askIstioProfile();
   console.log(_chalk.default.gray('\nFor a Kubernetes cluster exposing HTTPS endpoints, you must own or be able to configure a certificate for the correspoinding fully qualified domain name\n'));
   istioInstallValues.host = (await askHost()).toLowerCase();
 
@@ -325,7 +332,7 @@ const createIstioOverride = overrides => {
   console.log(`\nIstio override file has been placed at ${process.cwd()}/${overrideFileName}`);
 
   if (overrides.istioInstallValues.isNewInstall) {
-    console.log('To complete the istio installation run the following command:', _chalk.default.cyan(`\n  istioctl install --set profile=demo -f ${overrideFileName}\n`));
+    console.log('To complete the istio installation run the following command:', _chalk.default.cyan(`\n  istioctl install --set profile=${overrides.istioInstallValues.profile} -f ${overrideFileName}\n`));
   } else {
     console.log(_chalk.default.cyan(`  Please merge the generated ${overrideFileName} file with your Istio configuration to allow the Traceability Agent to function.\n`));
   }

package/dist/common/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceabilityConfig = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.KindTypes = exports.Kind = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
+exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceabilityConfig = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.KindTypes = exports.Kind = exports.IstioProfileChoices = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
 
 var _dataService = require("./dataService");
 
@@ -203,6 +203,29 @@ const YesNoChoices = [{
   value: YesNo.No
 }];
 exports.YesNoChoices = YesNoChoices;
+const IstioProfileChoices = [{
+  name: 'default',
+  value: 'default'
+}, {
+  name: 'demo',
+  value: 'demo'
+}, {
+  name: 'empty',
+  value: 'empty'
+}, {
+  name: 'minimal',
+  value: 'minimal'
+}, {
+  name: 'openshift',
+  value: 'openshift'
+}, {
+  name: 'preview',
+  value: 'preview'
+}, {
+  name: 'remote',
+  value: 'remote'
+}];
+exports.IstioProfileChoices = IstioProfileChoices;
 // exporting for tests
 let AgentConfigTypes;
 exports.AgentConfigTypes = AgentConfigTypes;
@@ -712,20 +735,23 @@ class IstioInstallValues {
 
     _defineProperty(this, "protocol", void 0);
 
+    _defineProperty(this, "profile", void 0);
+
     _defineProperty(this, "targetPort", void 0);
 
     _defineProperty(this, "certificateOption", void 0);
 
     this.alsNamespace = 'amplify-agents';
+    this.certificateOption = '';
     this.enableAls = false;
     this.enableTracing = false;
     this.gatewayNamespace = 'istio-system';
     this.host = '';
     this.isNewInstall = true;
     this.port = 8080;
+    this.profile = 'demo';
     this.protocol = Protocol.HTTP;
     this.targetPort = 0;
-    this.certificateOption = '';
   }
 
 }

package/package.json

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