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

package/dist/commands/install/agents.js

@@ -19,10 +19,14 @@ var _DefinitionsManager = require("../../common/DefinitionsManager");
 
 var _PlatformClient = require("../../common/PlatformClient");
 
+var _CliConfigManager = require("../../common/CliConfigManager");
+
 var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 
 var _types = require("../../common/types");
 
+var _utils = require("../../common/utils");
+
 var awsAgents = _interopRequireWildcard(require("./awsAgents"));
 
 var azureAgents = _interopRequireWildcard(require("./azureAgents"));
@@ -119,7 +123,10 @@ 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
+      let configurationRegion = (await (0, _utils.getConfig)())[_CliConfigManager.CliConfigKeys.REGION]; // top priority is region option on command line, second priority is region from config file, default is US
+
+      installConfig.centralConfig.region = region ? region.toString() : configurationRegion ? configurationRegion : _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/awsAgents.js

@@ -480,17 +480,17 @@ ${_chalk.default.cyan(`docker pull ${taImage}:${installConfig.taVersion}`)}
 ${_utils.isWindows ? `
 Start the Discovery agent on Windows machine (cmd.exe):
 ${_chalk.default.cyan(`docker run --env-file ${helpers.pwdWin}/${ConfigFiles.DAEnvVars} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}
-	${daImage}:${installConfig.daVersion}`)}` : `
+	-v /data ${daImage}:${installConfig.daVersion}`)}` : `
 Start the Discovery agent on Linux based machine:
 ${_chalk.default.cyan(`docker run --env-file ${helpers.pwd}/${ConfigFiles.DAEnvVars} -v ${helpers.pwd}:/keys ${helpers.eolChar}
-	${daImage}:${installConfig.daVersion}`)}`}
+	-v /data ${daImage}:${installConfig.daVersion}`)}`}
 ${_utils.isWindows ? `
 Start the Traceability agent on Windows machine (cmd.exe):
 ${_chalk.default.cyan(`docker run --env-file ${helpers.pwdWin}/${ConfigFiles.TAEnvVars} -v ${helpers.pwdWin}:/keys ${helpers.eolCharWin}
-	${taImage}:${installConfig.taVersion}`)}` : `
+	-v /data ${taImage}:${installConfig.taVersion}`)}` : `
 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}
-	${taImage}:${installConfig.taVersion}`)}`}`;
+	-v /data ${taImage}:${installConfig.taVersion}`)}`}`;
         break;
       }
 

package/dist/commands/install/azureAgents.js

@@ -182,7 +182,7 @@ const dockerSuccessMsg = installConfig => {
     console.log(_chalk.default.cyan(`docker pull ${daImageVersion}`));
     console.log(_chalk.default.white(_utils.isWindows ? startDaWinMsg : startDaLinuxMsg));
     console.log(_chalk.default.cyan(_utils.isWindows ? runDaWinMsg : runDaLinuxMsg));
-    console.log(_chalk.default.cyan(daImageVersion), '\n');
+    console.log('\t', _chalk.default.cyan(`-v /data ${daImageVersion}`), '\n');
   }
 
   if (installConfig.switches.isTaEnabled) {
@@ -191,7 +191,7 @@ const dockerSuccessMsg = installConfig => {
     console.log(_chalk.default.cyan(`docker pull ${taImageVersion}`));
     console.log(_chalk.default.white(_utils.isWindows ? startTaWinMsg : startTaLinuxMsg));
     console.log(_chalk.default.cyan(_utils.isWindows ? runTaWinMsg : runTaLinuxMsg));
-    console.log(_chalk.default.cyan(taImageVersion), '\n');
+    console.log('\t', _chalk.default.cyan(`-v /data ${taImageVersion}`), '\n');
   }
 }; // Azure DA prompts
 

package/dist/commands/install/edgeAgents.js

@@ -392,7 +392,7 @@ const dockerSuccessMsg = (installConfig, eventLogPath) => {
     console.log(_cliKit.chalk.cyan(`docker pull ${daImageVersion}`));
     console.log(_cliKit.chalk.white(_utils.isWindows ? startDaWinMsg : startDaLinuxMsg));
     console.log(_cliKit.chalk.cyan(_utils.isWindows ? runDaWinMsg : runDaLinuxMsg));
-    console.log('\t', _cliKit.chalk.cyan(daImageVersion), '\n');
+    console.log('\t', _cliKit.chalk.cyan(`-v /data ${daImageVersion}`));
   }
 
   if (installConfig.switches.isTaEnabled) {

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/helpers/templates/istioTemplates.js

@@ -89,7 +89,8 @@ als:
   keysSecretName: {{istioAgentValues.keysSecretName}}
   publishHeaders: true
 
-  envoyFilterNamespace: {{istioAgentValues.envoyFilterNamespace}}
+  istioGatewayNamespaces:
+  - {{istioAgentValues.envoyFilterNamespace}}
 
 # discovers API Documentation
 ada:

package/dist/commands/install/istioAgents.js

@@ -106,7 +106,11 @@ https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/m
   const {
     error
   } = await _Kubectl.kubectl.isInstalled();
-  if (error) throw new Error(`Kubectl is required to fill out the following prompts. It appears to be missing or misconfigured.\n${error}`);
+
+  if (error) {
+    throw new Error(`Kubectl is required to fill out the following prompts. It appears to be missing or misconfigured.\n${error}`);
+  }
+
   const istioOverrides = await setupIstio(istioValues);
   installConfig.gatewayConfig = istioValues; // Set up the following values from installConfig to be used in setupKubernetes
 

package/dist/commands/install/platform.js

@@ -113,7 +113,7 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
   } // Get the DA Agent name
 
 
-  centralConfig.daAgentName = ''; // ISTIO will not prompt for agent name.  Remove when that ability exists
+  centralConfig.daAgentName = ''; // Istio will not prompt for agent name.  Remove when that ability exists
 
   if (installConfig.switches.isDaEnabled && installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
     centralConfig.daAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.da, centralConfig.ampcEnvInfo.name);
@@ -148,7 +148,7 @@ const finalizeCentralInstall = async (apiServerClient, platformClient, defsManag
   installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', {
     axwayManaged: installConfig.centralConfig.axwayManaged,
     production: installConfig.centralConfig.production
-  }) : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource unless gateway type is ISTIO.  This can be removed when this is available for ISTIO
+  }) : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource unless gateway type is Istio.  This can be removed when this is available for Istio
 
   if (installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
     if (installConfig.centralConfig.daAgentName != '') {

package/dist/common/Kubectl.js

@@ -63,10 +63,15 @@ class Kubectl {
   }
 
   async execKubectl(action, resource) {
-    const {
+    let {
       stdout,
       stderr
     } = await exec(`kubectl ${action} | awk ${quotes}{print $1}${quotes}`);
+
+    if (stderr.includes('WARNING')) {
+      stderr = '';
+    }
+
     return stderr ? {
       data: null,
       error: `K8S ${resource}: ${stderr}`

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.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;
+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;
 
@@ -221,9 +226,6 @@ const IstioProfileChoices = [{
 }, {
   name: 'preview',
   value: 'preview'
-}, {
-  name: 'remote',
-  value: 'remote'
 }];
 exports.IstioProfileChoices = IstioProfileChoices;
 // exporting for tests
@@ -304,7 +306,7 @@ const GatewayTypeToDataPlane = {
   [GatewayTypes.EDGE_GATEWAY_ONLY]: DataPlaneNames.EDGE,
   [GatewayTypes.AWS_GATEWAY]: DataPlaneNames.AWS,
   [GatewayTypes.AZURE_GATEWAY]: DataPlaneNames.AZURE,
-  [GatewayTypes.ISTIO]: 'ISTIO'
+  [GatewayTypes.ISTIO]: 'Istio'
 };
 exports.GatewayTypeToDataPlane = GatewayTypeToDataPlane;
 let AgentResourceKind;
@@ -386,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);
@@ -414,6 +418,7 @@ class CentralAgentConfig {
     [this.scheme, this.host] = this.url.split('://');
     this.production = false;
     this.axwayManaged = false;
+    this.singleEntryPointUrl = SingleEntryPointUrls[this.region];
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.11.0-rc.1",
+	"version": "2.12.0",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -21,7 +21,7 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://git.ecd.axway.int/apigov/apicentral-cli"
+		"url": "https://git.ecd.axway.org/apigov/apicentral-cli.git"
 	},
 	"scripts": {
 		"build": "babel src --extensions .ts -d dist --ignore src/**/*.spec.ts,src/**/*.spec.js",
@@ -41,46 +41,45 @@
 		"name": "central"
 	},
 	"dependencies": {
-		"@axway/amplify-cli-utils": "^5.0.7",
+		"@axway/amplify-cli-utils": "^5.0.10",
 		"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.1",
+		"inquirer": "^8.2.4",
 		"js-yaml": "^4.1.0",
 		"lodash": "^4.17.21",
 		"node-cache": "^5.1.2",
-		"npm-check-updates": "^12.5.4",
+		"npm-check-updates": "^12.5.12",
 		"ora": "^5.4.1",
 		"promise-limit": "^2.7.0",
-		"semver": "^7.3.5",
+		"semver": "^7.3.7",
 		"snooplogg": "^3.0.2",
 		"tmp": "^0.2.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.17.6",
-		"@babel/core": "^7.17.8",
-		"@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.2",
+		"@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.2",
+		"@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.0",
+		"@types/inquirer": "^8.2.1",
 		"@types/js-yaml": "^4.0.5",
-		"@types/lodash": "^4.14.180",
-		"@types/mocha": "^9.1.0",
-		"@types/node": "^17.0.22",
+		"@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",
+		"@types/semver": "^7.3.10",
 		"@types/sinon": "^10.0.11",
 		"@types/tmp": "^0.2.3",
 		"@types/update-notifier": "^5.1.0",
@@ -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.8",
 		"mocha": "^9.2.2",
 		"nock": "^13.2.4",
-		"nodemon": "^2.0.15",
+		"nodemon": "^2.0.18",
 		"nyc": "^15.1.0",
-		"prettier": "^2.6.0",
+		"prettier": "^2.6.2",
 		"sinon": "^11.1.2",
 		"source-map-support": "^0.5.21",
-		"ts-mocha": "^9.0.2",
-		"typescript": "^4.6.2"
+		"ts-mocha": "^10.0.0",
+		"typescript": "^4.7.2"
 	},
 	"jest": {
 		"verbose": true,

package/renovate.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "branchPrefix": "APIGOV-renovate-",
+  "commitMessagePrefix": "APIGOV-renovate -",
+  "onboardingBranch": "ConfigureRenovate",
+  "rangeStrategy": "bump",
+  "prConcurrentLimit": 0,
+  "prHourlyLimit": 0
+}