@axway/axway-central-cli 2.10.2 → 2.10.3

package/dist/commands/install/agents.js

@@ -119,7 +119,8 @@ const agents = {
       console.log(_chalk.default.gray(`This command configures and installs the agents so that you can manage your gateway environment within the Amplify Platform.\n`));
       let installConfig = new _types.AgentInstallConfig();
       installConfig.centralConfig.axwayManaged = !!axwayManaged;
-      installConfig.centralConfig.region = region ? region.toString() : _types.Regions.US; // gateway type
+      installConfig.centralConfig.region = region ? region.toString() : _types.Regions.US;
+      installConfig.centralConfig.singleEntryPointUrl = _types.SingleEntryPointUrls[installConfig.centralConfig.region]; // gateway type
 
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,

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

@@ -91,6 +91,7 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
@@ -143,6 +144,7 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 {{/compare}}

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

@@ -86,6 +86,7 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
@@ -135,6 +136,7 @@ CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}
 CENTRAL_ENVIRONMENT={{centralConfig.environment}}
 CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 {{/compare}}

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

@@ -127,6 +127,7 @@ CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 CENTRAL_DEPLOYMENT={{centralConfig.deployment}}
@@ -195,6 +196,7 @@ env:
   {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   {{/compare}}
+  CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
   CENTRAL_URL:  {{centralConfig.url}}
   EVENT_LOG_FILE_PATHS: /events/*.log
   LOG_LEVEL: info
@@ -268,6 +270,7 @@ CENTRAL_ORGANIZATIONID={{centralConfig.orgId}}
 {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
 CENTRAL_TEAM={{centralConfig.ampcTeamName}}
 {{/compare}}
+CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
 {{#compare . centralConfig.region "EU"}}
 CENTRAL_URL={{centralConfig.url}}
 {{/compare}}
@@ -319,6 +322,7 @@ env:
   {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   {{/compare}}
+  CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
   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',
@@ -168,6 +169,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
 
 
@@ -185,6 +191,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();
 
@@ -329,7 +336,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.SingleEntryPointUrls = 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");
 
@@ -84,6 +84,11 @@ exports.AuthUrls = AuthUrls;
   AuthUrls["Prod"] = "https://login.axway.com";
 })(AuthUrls || (exports.AuthUrls = AuthUrls = {}));
 
+const SingleEntryPointUrls = {
+  US: 'https://ingestion.platform.axway.com',
+  EU: 'https://ingestion-eu.platform.axway.com'
+};
+exports.SingleEntryPointUrls = SingleEntryPointUrls;
 let Regions;
 exports.Regions = Regions;
 
@@ -203,6 +208,26 @@ 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'
+}];
+exports.IstioProfileChoices = IstioProfileChoices;
 // exporting for tests
 let AgentConfigTypes;
 exports.AgentConfigTypes = AgentConfigTypes;
@@ -363,6 +388,8 @@ class CentralAgentConfig {
 
     _defineProperty(this, "host", void 0);
 
+    _defineProperty(this, "singleEntryPointUrl", void 0);
+
     _defineProperty(this, "scheme", void 0);
 
     _defineProperty(this, "production", void 0);
@@ -391,6 +418,7 @@ class CentralAgentConfig {
     [this.scheme, this.host] = this.url.split('://');
     this.production = false;
     this.axwayManaged = false;
+    this.singleEntryPointUrl = SingleEntryPointUrls[this.region];
   }
 
 }
@@ -712,20 +740,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.2",
+	"version": "2.10.3",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -41,43 +41,42 @@
 		"name": "central"
 	},
 	"dependencies": {
-		"@axway/amplify-cli-utils": "^5.0.8",
+		"@axway/amplify-cli-utils": "^5.0.9",
 		"chalk": "^4.1.2",
-		"cli-kit": "^1.15.0",
-		"dayjs": "^1.11.0",
+		"cli-kit": "^1.16.0",
+		"dayjs": "^1.11.2",
 		"easy-table": "^1.2.0",
 		"extract-zip": "^2.0.1",
 		"form-data": "^4.0.0",
-		"fs-extra": "^10.0.1",
-		"g": "^2.0.1",
+		"fs-extra": "^10.1.0",
 		"handlebars": "^4.7.7",
-		"inquirer": "^8.2.2",
+		"inquirer": "^8.2.4",
 		"js-yaml": "^4.1.0",
 		"lodash": "^4.17.21",
 		"node-cache": "^5.1.2",
-		"npm-check-updates": "^12.5.8",
+		"npm-check-updates": "^12.5.12",
 		"ora": "^5.4.1",
 		"promise-limit": "^2.7.0",
-		"semver": "^7.3.6",
+		"semver": "^7.3.7",
 		"snooplogg": "^3.0.2",
 		"tmp": "^0.2.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.17.6",
-		"@babel/core": "^7.17.9",
-		"@babel/plugin-proposal-class-properties": "^7.16.7",
-		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-		"@babel/plugin-proposal-optional-chaining": "^7.16.7",
-		"@babel/preset-env": "^7.16.11",
-		"@babel/preset-typescript": "^7.16.7",
-		"@types/chai": "^4.3.0",
+		"@babel/cli": "^7.17.10",
+		"@babel/core": "^7.18.0",
+		"@babel/plugin-proposal-class-properties": "^7.17.12",
+		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+		"@babel/plugin-proposal-optional-chaining": "^7.17.12",
+		"@babel/preset-env": "^7.18.0",
+		"@babel/preset-typescript": "^7.17.12",
+		"@types/chai": "^4.3.1",
 		"@types/chai-as-promised": "^7.1.5",
 		"@types/form-data": "^2.5.0",
 		"@types/fs-extra": "^9.0.13",
 		"@types/inquirer": "^8.2.1",
 		"@types/js-yaml": "^4.0.5",
-		"@types/lodash": "^4.14.181",
-		"@types/mocha": "^9.1.0",
+		"@types/lodash": "^4.14.182",
+		"@types/mocha": "^9.1.1",
 		"@types/node": "^17.0.23",
 		"@types/rx": "^4.1.2",
 		"@types/semver": "^7.3.9",
@@ -88,16 +87,16 @@
 		"babel-plugin-lodash": "^3.3.4",
 		"chai": "^4.3.6",
 		"chai-as-promised": "^7.1.1",
-		"core-js": "^3.21.1",
+		"core-js": "^3.22.5",
 		"mocha": "^9.2.2",
 		"nock": "^13.2.4",
-		"nodemon": "^2.0.15",
+		"nodemon": "^2.0.16",
 		"nyc": "^15.1.0",
 		"prettier": "^2.6.2",
 		"sinon": "^11.1.2",
 		"source-map-support": "^0.5.21",
-		"ts-mocha": "^9.0.2",
-		"typescript": "^4.6.3"
+		"ts-mocha": "^10.0.0",
+		"typescript": "^4.6.4"
 	},
 	"jest": {
 		"verbose": true,

package/renovate.json

@@ -3,6 +3,10 @@
   "extends": [
     "config:base"
   ],
+  "branchPrefix": "APIGOV-renovate-",
+  "commitMessagePrefix": "APIGOV-renovate -",
+  "onboardingBranch": "ConfigureRenovate",
+  "rangeStrategy": "bump",
   "prConcurrentLimit": 0,
-  "rangeStrategy": "replace"
+  "prHourlyLimit": 0
 }