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

package/dist/commands/get/index.js

@@ -47,6 +47,12 @@ const get = {
     argv,
     console
   }) {
+    if (!argv.team && argv.owner === false) {
+      // no --team set and --no-owner was set, so we set the team to `null` which will know
+      // to get teams that do not have an owner
+      argv.team = null;
+    }
+
     const {
       args,
       attribute,
@@ -204,7 +210,8 @@ ${defsManager.getDefsTableForHelpMsg()}`);
     '--tag [tag]': {
       desc: 'Tag of resource(s) to fetch'
     },
-    '--team [guid|name]': 'The team name or guid to use'
+    '--team [guid|name]': 'The team name or guid to use',
+    '--no-owner': 'Returns resources which do not have an owner'
   }
 };
 exports.get = get;

package/dist/commands/install/agents.js

@@ -47,7 +47,7 @@ const {
 const localhost = 'localhost';
 exports.localhost = localhost;
 const prompts = {
-  selectGatewayType: 'TESTING_Select the type of gateway you want to connect'
+  selectGatewayType: 'Select the type of gateway you want to connect'
 };
 exports.prompts = prompts;
 const agentInstallFlows = {
@@ -118,7 +118,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; // gateway type
+      installConfig.centralConfig.axwayManaged = !!axwayManaged;
+      installConfig.centralConfig.region = region ? region.toString() : _types.Regions.US; // gateway type
 
       let gatewayType = await (0, _basicPrompts.askList)({
         msg: prompts.selectGatewayType,
@@ -173,7 +174,7 @@ const agents = {
 
       createConfigBackup(agentInstallFlow.ConfigFiles, agentInstallFlow.GatewayDisplay); // run any install preprocess steps
 
-      if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize platform setup
+      if (agentInstallFlow.InstallPreprocess) installConfig = await agentInstallFlow.InstallPreprocess(installConfig); // finalize Platform setup
 
       installConfig = await platform.finalizeCentralInstall(apiServerClient, platformClient, defsManager, installConfig); // finalize gateway setup and output
 

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/common/CoreConfigController.js

@@ -161,6 +161,8 @@ class CoreConfigController {
       }
 
       result.teamGuid = teamObj.guid;
+    } else if (team === null) {
+      result.teamGuid = null;
     }
 
     log(`getAuthInfo, returning account = ${devOpsAccount.name}`);

package/dist/common/dataService.js

@@ -154,9 +154,9 @@ const dataService = async ({
   const fetch = async (method, url, params = {}) => {
     try {
       // add the team guid
-      if (teamGuid) {
+      if (teamGuid !== undefined) {
         const parsed = new _url.URL(url);
-        parsed.searchParams.set('query', `owner.id==${teamGuid}`);
+        parsed.searchParams.set('query', teamGuid ? `owner.id==${teamGuid},(owner.id==null;metadata.scope.owner.id==${teamGuid})` : 'owner.id==null');
         url = parsed.toString();
       }
 

package/dist/common/resultsRenderers.js

@@ -167,16 +167,22 @@ async function resolveTeamNames({
   const targetJsonPath = jsonPath.split('.').slice(0, -1).join('.') + '.teamName';
   column.jsonPath = `.${targetJsonPath}`; // next loop over data and set the team name
 
-  for (const {
+  for (let {
     data
   } of results) {
-    if (Array.isArray(data)) {
-      for (const obj of data) {
-        const value = (0, _get.default)(obj, jsonPath, null);
+    if (!data || typeof data !== 'object') {
+      continue;
+    }
+
+    if (!Array.isArray(data)) {
+      data = [data];
+    }
+
+    for (const obj of data) {
+      const value = (0, _get.default)(obj, jsonPath, null);
 
-        if (value !== null) {
-          (0, _set.default)(obj, targetJsonPath, value && teamNames[value] || value || '');
-        }
+      if (value !== null) {
+        (0, _set.default)(obj, targetJsonPath, value && teamNames[value] || value || '');
       }
     }
   }

package/dist/common/types.js

@@ -370,7 +370,7 @@ class CentralAgentConfig {
     _defineProperty(this, "axwayManaged", void 0);
 
     _defineProperty(this, "setBaseHost", async () => {
-      this.url = await (0, _dataService.getBaseUrl)();
+      this.url = await (0, _dataService.getBaseUrl)(undefined, undefined, this.region);
       [this.scheme, this.host] = this.url.split('://');
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.10.0-rc.1",
+	"version": "2.10.1",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -41,19 +41,21 @@
 		"name": "central"
 	},
 	"dependencies": {
-		"@axway/amplify-cli-utils": "^5.0.6",
+		"@axway/amplify-cli-utils": "^5.0.7",
 		"chalk": "^4.1.2",
 		"cli-kit": "^1.15.0",
-		"dayjs": "^1.10.7",
+		"dayjs": "^1.11.0",
 		"easy-table": "^1.2.0",
 		"extract-zip": "^2.0.1",
 		"form-data": "^4.0.0",
-		"fs-extra": "^10.0.0",
+		"fs-extra": "^10.0.1",
+		"g": "^2.0.1",
 		"handlebars": "^4.7.7",
-		"inquirer": "^8.2.0",
+		"inquirer": "^8.2.1",
 		"js-yaml": "^4.1.0",
 		"lodash": "^4.17.21",
 		"node-cache": "^5.1.2",
+		"npm-check-updates": "^12.5.4",
 		"ora": "^5.4.1",
 		"promise-limit": "^2.7.0",
 		"semver": "^7.3.5",
@@ -61,41 +63,41 @@
 		"tmp": "^0.2.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.16.8",
-		"@babel/core": "^7.16.12",
+		"@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",
-		"@types/chai-as-promised": "^7.1.4",
+		"@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/js-yaml": "^4.0.5",
-		"@types/lodash": "^4.14.178",
+		"@types/lodash": "^4.14.180",
 		"@types/mocha": "^9.1.0",
-		"@types/node": "^17.0.14",
+		"@types/node": "^17.0.22",
 		"@types/rx": "^4.1.2",
 		"@types/semver": "^7.3.9",
-		"@types/sinon": "^10.0.9",
+		"@types/sinon": "^10.0.11",
 		"@types/tmp": "^0.2.3",
 		"@types/update-notifier": "^5.1.0",
 		"@types/uuid": "^8.3.4",
 		"babel-plugin-lodash": "^3.3.4",
 		"chai": "^4.3.6",
 		"chai-as-promised": "^7.1.1",
-		"core-js": "^3.21.0",
-		"mocha": "^9.2.0",
-		"nock": "^13.2.2",
+		"core-js": "^3.21.1",
+		"mocha": "^9.2.2",
+		"nock": "^13.2.4",
 		"nodemon": "^2.0.15",
 		"nyc": "^15.1.0",
-		"prettier": "^2.5.1",
+		"prettier": "^2.6.0",
 		"sinon": "^11.1.2",
 		"source-map-support": "^0.5.21",
 		"ts-mocha": "^9.0.2",
-		"typescript": "^4.5.5"
+		"typescript": "^4.6.2"
 	},
 	"jest": {
 		"verbose": true,