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

package/dist/commands/edit/environment.js

@@ -12,8 +12,6 @@ var _resultsRenderers = require("../../common/resultsRenderers");
 var _TmpFile = _interopRequireDefault(require("../../common/TmpFile"));
 var _types = require("../../common/types");
 var _utils = require("../../common/utils");
-var _ApiServerClient = require("../../common/ApiServerClient");
-var _DefinitionsManager = require("../../common/DefinitionsManager");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
   log
@@ -27,35 +25,19 @@ const action = async ({
     account,
     name,
     output,
-    region,
-    cache
+    region
   } = argv;
   log(`editing ${name} env`);
   let file;
   let commandIsSuccessful = true;
   const render = new _Renderer.default(console, output).startSpin(`Fetching details of "environment/${name}".`);
   try {
-    var _defsManager$findDefs, _defsManager$findDefs2;
-    const client = new _ApiServerClient.ApiServerClient({
-      baseUrl,
-      account,
-      region,
-      useCache: cache
-    });
-    const defsManager = new _DefinitionsManager.DefinitionsManager(client);
-    await defsManager.init();
-    const def = (_defsManager$findDefs = defsManager.findDefsByWord('env')) === null || _defsManager$findDefs === void 0 ? void 0 : (_defsManager$findDefs2 = _defsManager$findDefs.find(def => def)) === null || _defsManager$findDefs2 === void 0 ? void 0 : _defsManager$findDefs2.resource;
     const service = await (0, _dataService.dataService)({
       baseUrl,
       account,
       region
     });
-    let response;
-    let version = "v1alpha1";
-    if (def) {
-      version = (0, _utils.getLatestServedAPIVersion)(def);
-    }
-    response = await service.get(`/management/${version}/environments/${name}`);
+    let response = await service.get(`/management/v1alpha1/environments/${name}`);
     file = new _TmpFile.default(response);
     // stop spinner or it will interfere stdio of editor
     render.stopSpin();
@@ -67,7 +49,7 @@ const action = async ({
       const {
         docs
       } = await (0, _utils.loadAndVerifySpecs)(file.path, new Set([_types.Kind.Environment]));
-      response = await service.put(`/management/${version}/environments/${name}`, docs[0]);
+      response = await service.put(`/management/v1alpha1/environments/${name}`, docs[0]);
       render.success((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been edited.}`);
       // render result if output flag has been provided
       output && (0, _resultsRenderers.renderResponse)(console, response, output);

package/dist/commands/get/index.js

@@ -16,14 +16,15 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: get');
-const getListOrByName = async (resourceDef, client, scopeName, resourceName, scopeDef, query, progressListener, expand, langDef) => {
+const getListOrByName = async (resourceDef, client, scopeName, resourceName, scopeDef, query, progressListener, expand, langDef, fieldSet) => {
   return resourceName ? await client.getResourceByName({
     resourceDef,
     resourceName,
     scopeDef,
     scopeName,
     expand,
-    langDef
+    langDef,
+    fieldSet
   }) : await client.getResourcesList({
     resourceDef,
     scopeDef,
@@ -31,7 +32,8 @@ const getListOrByName = async (resourceDef, client, scopeName, resourceName, sco
     query,
     progressListener,
     expand,
-    langDef
+    langDef,
+    fieldSet
   });
 };
 const get = exports.get = {
@@ -159,7 +161,7 @@ ${defsManager.getDefsTableForHelpMsg()}`);
          */
         if (scope) {
           const results = await Promise.all(defs.filter(defs => !scope.kind || !defs.scope || defs.scope.spec.kind === scope.kind).map(async defs => ({
-            response: await getListOrByName(defs.resource, client, scope.name, resourceName, defs.scope, query, progressListener, languageExpand, languageDefinition),
+            response: await getListOrByName(defs.resource, client, scope.name, resourceName, defs.scope, query, progressListener, languageExpand, languageDefinition, argv.output ? undefined : getFieldSetFromDefinitionColumns(defs)),
             cli: defs.cli
           })));
           results.forEach(({
@@ -179,7 +181,7 @@ ${defsManager.getDefsTableForHelpMsg()}`);
             }
           });
           const results = await Promise.all(Object.values(defsMatchingGroup).map(async defs => ({
-            response: await getListOrByName(defs.resource, client, undefined, resourceName, undefined, query, progressListener, languageExpand, languageDefinition),
+            response: await getListOrByName(defs.resource, client, undefined, resourceName, undefined, query, progressListener, languageExpand, languageDefinition, argv.output ? undefined : getFieldSetFromDefinitionColumns(defs)),
             cli: defs.cli
           })));
           results.forEach(({
@@ -248,4 +250,23 @@ ${defsManager.getDefsTableForHelpMsg()}`);
       desc: `Show the language definition constraint of the returned object. One of: Comma Separated values of ${_types.LanguageTypes.French} | ${_types.LanguageTypes.US} | ${_types.LanguageTypes.German} | ${_types.LanguageTypes.Portugese}`
     }
   }
-};
+};
+
+/**
+ * Gets the resource field names to be shown when outputting the resource as a table.
+ * These names are to be assigned to the api-server HTTP GET request's "fields" query param.
+ * @param def The resource definition providing the columns to be shown in the outputed table.
+ * @returns Returns a set set of field names.
+ */
+function getFieldSetFromDefinitionColumns(def) {
+  var _def$cli, _def$cli$spec, _def$cli$spec$columns;
+  const fieldSet = new Set();
+  (_def$cli = def.cli) === null || _def$cli === void 0 ? void 0 : (_def$cli$spec = _def$cli.spec) === null || _def$cli$spec === void 0 ? void 0 : (_def$cli$spec$columns = _def$cli$spec.columns) === null || _def$cli$spec$columns === void 0 ? void 0 : _def$cli$spec$columns.forEach(column => {
+    let fieldName = column.jsonPath;
+    if (fieldName.startsWith('.')) {
+      fieldName = fieldName.substring(1);
+    }
+    fieldSet.add(fieldName);
+  });
+  return fieldSet;
+}

package/dist/commands/install/awsSaasAgents.js

@@ -39,9 +39,9 @@ class AWSDataplaneConfig extends DataplaneConfig {
 class Sampling {
   constructor() {
     _defineProperty(this, "percentage", void 0);
-    _defineProperty(this, "allErrors", void 0);
+    _defineProperty(this, "onlyErrors", void 0);
     this.percentage = 1;
-    this.allErrors = true;
+    this.onlyErrors = true;
   }
 }
 class Sanitize {
@@ -156,7 +156,7 @@ const SaasPrompts = {
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
   SAMP_PERCENTAGE: 'Enter the percentage of transactions to sample',
-  SAMP_ALL_ERRS: 'Do you want to see all errors regardless of sampling',
+  SAMP_ONLY_ERRS: 'Do you want to sample only the error transactions for Business and Consumer Insights',
   REDACT_SHOW: 'Enter a regular expression for {0}s that may be shown',
   ENTER_SANITIZE_RULE: 'Do you want to add sanitization rules for {0}s',
   SANITIZE_KEY: 'Enter a regular expression for {0} keys that values should be sanitized',
@@ -266,9 +266,10 @@ const askForSampling = async hostedAgentValues => {
   });
 
   // ask sampling all errorsSN
-  hostedAgentValues.sampling.allErrors = (await (0, _basicPrompts.askList)({
-    msg: SaasPrompts.SAMP_ALL_ERRS,
-    choices: _types.YesNoChoices
+  hostedAgentValues.sampling.onlyErrors = (await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.SAMP_ONLY_ERRS,
+    choices: _types.YesNoChoices,
+    default: _types.YesNo.No
   })) === _types.YesNo.Yes;
   return hostedAgentValues;
 };

package/dist/commands/install/azureSaasAgents.js

@@ -54,9 +54,9 @@ class AzureDataplaneConfig extends DataplaneConfig {
 class Sampling {
   constructor() {
     _defineProperty(this, "percentage", void 0);
-    _defineProperty(this, "allErrors", void 0);
+    _defineProperty(this, "onlyErrors", void 0);
     this.percentage = 1;
-    this.allErrors = true;
+    this.onlyErrors = true;
   }
 }
 class Sanitize {
@@ -174,7 +174,7 @@ const SaasPrompts = {
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
   SAMP_PERCENTAGE: 'Enter the percentage of transactions to sample',
-  SAMP_ALL_ERRS: 'Do you want to see all errors regardless of sampling',
+  SAMP_ONLY_ERRS: 'Do you want to sample only the error transactions for Business and Consumer Insights',
   REDACT_SHOW: 'Enter a regular expression for {0}s that may be shown',
   ENTER_SANITIZE_RULE: 'Do you want to add sanitization rules for {0}s',
   SANITIZE_KEY: 'Enter a regular expression for {0} keys that values should be sanitized',
@@ -288,9 +288,10 @@ const askForSampling = async hostedAgentValues => {
   });
 
   // ask sampling all errorsSN
-  hostedAgentValues.sampling.allErrors = (await (0, _basicPrompts.askList)({
-    msg: SaasPrompts.SAMP_ALL_ERRS,
-    choices: _types.YesNoChoices
+  hostedAgentValues.sampling.onlyErrors = (await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.SAMP_ONLY_ERRS,
+    choices: _types.YesNoChoices,
+    default: _types.YesNo.No
   })) === _types.YesNo.Yes;
   return hostedAgentValues;
 };

package/dist/common/ApiServerClient.js

@@ -59,8 +59,9 @@ class ApiServerClient {
   /**
    * Build resource url based on its ResourceDefinition and passed scope def and name.
    * Note that for scope url part both name and def needed.
+   * The returned URL path is expected to be appended to the base URL.
    */
-  buildResourceBaseUrl({
+  buildResourceUrlPath({
     resourceDef,
     resourceName,
     scopeDef,
@@ -68,60 +69,51 @@ class ApiServerClient {
     version = ApiServerVersions.v1alpha1,
     forceDelete = false,
     expand,
-    langDef
+    langDef,
+    fieldSet
   }) {
     const groupUrl = `/${resourceDef.metadata.scope.name}/${version}`;
     const scopeUrl = scopeName && scopeDef ? `/${scopeDef.spec.plural}/${encodeURIComponent(scopeName)}` : '';
     const resourceUrl = `/${resourceDef.spec.plural}`;
     const nameUrl = resourceName ? `/${encodeURIComponent(resourceName)}` : '';
-    const expandUrl = expand ? `?expand=${expand}` : '';
-    const langDefUrl = langDef ? this.buildLanguageDefinitionUrl({
-      langCode: langDef
-    }) : '';
-    const forceDeleteUrl = forceDelete ? `?forceDelete=${forceDelete}` : '';
-    if (expand) {
-      return `${groupUrl}${scopeUrl}${resourceUrl}${nameUrl}${expandUrl}`;
-    } else if (langDef) {
-      return `${groupUrl}${scopeUrl}${resourceUrl}${nameUrl}${langDefUrl}`;
-    } else {
-      return `${groupUrl}${scopeUrl}${resourceUrl}${nameUrl}${forceDeleteUrl}`;
-    }
-  }
-
-  /**
-   * Build language definition url based on the language code.
-   */
-  buildLanguageDefinitionUrl({
-    langCode
-  }) {
-    let langDefUrl = '';
-    let i = 0;
-    let embed = '?embed=';
-    let expand = '&expand=languages,';
-    let fields = '&fields=languages,group,apiVersion,name,kind,metadata,';
-    const langCodeArr = langCode.split(',');
-    let languageTypesArr = [];
-    Object.keys(_types.LanguageTypes).forEach(key => languageTypesArr.push((0, _utils.ValueFromKey)(_types.LanguageTypes, key)));
-    langCodeArr.forEach(code => {
-      if (code.trim() != '') {
-        if (!languageTypesArr.includes(code)) {
+    const embedSet = new Set();
+    const expandSet = new Set(expand === null || expand === void 0 ? void 0 : expand.split(','));
+    if (langDef) {
+      var _fieldSet;
+      (_fieldSet = fieldSet) !== null && _fieldSet !== void 0 ? _fieldSet : fieldSet = new Set();
+      fieldSet.add('languages').add('group').add('apiVersion').add('name').add('kind').add('metadata');
+      expandSet.add('languages');
+      let languageTypesArr = [];
+      Object.keys(_types.LanguageTypes).forEach(key => languageTypesArr.push((0, _utils.ValueFromKey)(_types.LanguageTypes, key)));
+      langDef.split(',').forEach(code => {
+        if (languageTypesArr.includes(code)) {
+          embedSet.add(`languages-${code.trim()}.resource`);
+          expandSet.add(`languages-${code.trim()}`);
+          fieldSet.add(`languages-${code.trim()}.values`);
+        } else if (code.trim().length > 0) {
           console.log(_chalk.default.yellow(`\n\'${code}\' language code is not supported. Allowed language codes: ${_types.LanguageTypes.French} | ${_types.LanguageTypes.German} | ${_types.LanguageTypes.US} | ${_types.LanguageTypes.Portugese}.'`));
-        } else {
-          if (i < langCodeArr.length - 1) {
-            embed = embed + `languages-${code.trim()}.resource` + ",";
-            expand = expand + `languages-${code.trim()}` + ",";
-            fields = fields + `languages-${code.trim()}.values` + ",";
-          } else {
-            embed = embed + `languages-${code.trim()}.resource`;
-            expand = expand + `languages-${code.trim()}`;
-            fields = fields + `languages-${code.trim()}.values`;
-          }
         }
+      });
+    }
+    let url = `${groupUrl}${scopeUrl}${resourceUrl}${nameUrl}`;
+    if (forceDelete || embedSet.size || expandSet.size || fieldSet) {
+      const queryParams = [];
+      if (forceDelete) {
+        queryParams.push('forceDelete=true');
       }
-      i++;
-    });
-    langDefUrl = `${embed}${expand}${fields}`;
-    return langDefUrl;
+      if (embedSet.size) {
+        queryParams.push('embed=' + [...embedSet].join(','));
+      }
+      if (expandSet.size) {
+        queryParams.push('expand=' + [...expandSet].join(','));
+      }
+      if (fieldSet) {
+        // If field set is empty, then return no fields. This is intentional.
+        queryParams.push('fields=' + [...fieldSet].join(','));
+      }
+      url += '?' + queryParams.join('&');
+    }
+    return url;
   }
 
   /**
@@ -134,7 +126,7 @@ class ApiServerClient {
    * @param {ResourceDefinition} args.resourceDef resource definition
    * @param {string} [args.scopeName] scope name
    * @param {ResourceDefinition} [args.scopeDef] scope definition
-   * @param {string} [args.version] api's version
+   * @param {ApiServerVersions} [args.version] api's version
    * @returns {Promise<Array<() => Promise<any> | null>} returns an array of "request creators" functions
    * that will be used in {@link resolveSubResourcesRequests} to create sub-resources when needed
    */
@@ -145,7 +137,7 @@ class ApiServerClient {
     resourceDef,
     scopeDef,
     scopeName,
-    version,
+    version = ApiServerVersions.v1alpha1,
     createAction,
     language
   }) {
@@ -156,7 +148,7 @@ class ApiServerClient {
       account: this.account,
       team: this.team
     });
-    const baseUrl = this.buildResourceBaseUrl({
+    const urlPath = this.buildResourceUrlPath({
       resourceDef,
       resourceName,
       scopeDef,
@@ -195,7 +187,7 @@ class ApiServerClient {
     return (0, _isEmpty.default)(foundSubResources) ? null : Object.keys(foundSubResources).map(key => {
       return {
         name: key,
-        operation: () => service.put(`${baseUrl}/${key}?fields=${key}`, {
+        operation: () => service.put(`${urlPath}/${key}?fields=${key}`, {
           [key]: foundSubResources[key]
         }).catch(err => Promise.reject({
           name: key,
@@ -296,6 +288,7 @@ class ApiServerClient {
     resource,
     scopeDef,
     scopeName,
+    version = ApiServerVersions.v1alpha1,
     withSubResources = true,
     language
   }) {
@@ -313,14 +306,13 @@ class ApiServerClient {
         account: this.account,
         team: this.team
       });
-      const version = resource.apiVersion === undefined ? (0, _utils.getLatestServedAPIVersion)(resourceDef) : resource.apiVersion;
-      const url = this.buildResourceBaseUrl({
+      const urlPath = this.buildResourceUrlPath({
         resourceDef,
         scopeDef,
         scopeName,
         version
       });
-      const response = await service.post(url, (0, _utils.sanitizeMetadata)(resource));
+      const response = await service.post(urlPath, (0, _utils.sanitizeMetadata)(resource));
       if (!resource.name) {
         log('createResource, resource does not have a logical name');
         result.warning = true;
@@ -370,6 +362,7 @@ class ApiServerClient {
     resource,
     scopeDef,
     scopeName,
+    version = ApiServerVersions.v1alpha1,
     subResourceName,
     language
   }) {
@@ -380,7 +373,6 @@ class ApiServerClient {
       pending: null
     };
     const canUpdateMainResource = !language && !subResourceName;
-    const version = resource.apiVersion === undefined ? (0, _utils.getLatestServedAPIVersion)(resourceDef) : resource.apiVersion;
     if (canUpdateMainResource) {
       try {
         const service = await (0, _dataService.dataService)({
@@ -389,14 +381,14 @@ class ApiServerClient {
           account: this.account,
           team: this.team
         });
-        const url = this.buildResourceBaseUrl({
+        const urlPath = this.buildResourceUrlPath({
           resourceDef,
           resourceName: resource.name,
           scopeDef,
           scopeName,
           version
         });
-        result.data = await service.put(url, (0, _utils.sanitizeMetadata)(resource));
+        result.data = await service.put(urlPath, (0, _utils.sanitizeMetadata)(resource));
       } catch (e) {
         log('updateResource, error', e);
         // expecting only a valid ApiServer error response here
@@ -449,7 +441,8 @@ class ApiServerClient {
     resource,
     subResourceName,
     scopeDef,
-    scopeName
+    scopeName,
+    version = ApiServerVersions.v1alpha1
   }) {
     log(`updateSubResource, spec.kind = ${resourceDef.spec.kind}, name = ${resource.name}`);
     const result = {
@@ -457,7 +450,6 @@ class ApiServerClient {
       error: null,
       pending: null
     };
-    const version = (0, _utils.getLatestServedAPIVersion)(resourceDef);
     try {
       var _resourceDef$spec$sub3, _resourceDef$spec$sub4;
       const service = await (0, _dataService.dataService)({
@@ -469,14 +461,14 @@ class ApiServerClient {
       const knownSubResourcesNames = (_resourceDef$spec$sub3 = (_resourceDef$spec$sub4 = resourceDef.spec.subResources) === null || _resourceDef$spec$sub4 === void 0 ? void 0 : _resourceDef$spec$sub4.names) !== null && _resourceDef$spec$sub3 !== void 0 ? _resourceDef$spec$sub3 : [];
       const foundSubResources = (0, _pickBy.default)(resource, (_, key) => subResourceName == key && knownSubResourcesNames.includes(key));
       const resourceName = resource.name;
-      const baseUrl = this.buildResourceBaseUrl({
+      const urlPath = this.buildResourceUrlPath({
         resourceDef,
         resourceName,
         scopeDef,
         scopeName,
         version
       });
-      service.put(`${baseUrl}/${subResourceName}?fields=${subResourceName}`, {
+      service.put(`${urlPath}/${subResourceName}?fields=${subResourceName}`, {
         [subResourceName]: foundSubResources[subResourceName]
       });
     } catch (e) {
@@ -508,15 +500,14 @@ class ApiServerClient {
     scopeDef,
     scopeName,
     wait,
-    forceDelete = false,
-    resourceAPIVersion
+    version = ApiServerVersions.v1alpha1,
+    forceDelete = false
   }) {
     log(`deleteResourceByName, spec.kind = ${resourceDef.spec.kind}, name = ${resourceName}, scope.kind = ${scopeDef === null || scopeDef === void 0 ? void 0 : scopeDef.spec.kind}, scope.name = ${scopeName}`);
     const result = {
       data: null,
       error: null
     };
-    const version = resourceAPIVersion === undefined ? (0, _utils.getLatestServedAPIVersion)(resourceDef) : resourceAPIVersion;
     try {
       const service = await (0, _dataService.dataService)({
         baseUrl: this.baseUrl,
@@ -524,7 +515,7 @@ class ApiServerClient {
         account: this.account,
         team: this.team
       });
-      const url = this.buildResourceBaseUrl({
+      const urlPath = this.buildResourceUrlPath({
         resourceDef,
         resourceName,
         scopeDef,
@@ -532,7 +523,7 @@ class ApiServerClient {
         version,
         forceDelete
       });
-      const response = await service.delete(url);
+      const response = await service.delete(urlPath);
       // note: delete "response" value from api-server is translated to an empty string currently.
       // If its true, constructing a simple representation from provided data (definition, name, scope name)
       // and manually set it as the "data" key.
@@ -547,7 +538,8 @@ class ApiServerClient {
             resourceDef,
             resourceName,
             scopeDef,
-            scopeName
+            scopeName,
+            version
           });
           if (!!res.data) {
             result.data = null;
@@ -585,13 +577,14 @@ class ApiServerClient {
     resourceDef,
     scopeDef,
     scopeName,
+    version = ApiServerVersions.v1alpha1,
     query,
     progressListener,
     expand,
-    langDef
+    langDef,
+    fieldSet
   }) {
     log(`getResourcesList, spec.kind = ${resourceDef.spec.kind}`);
-    const version = (0, _utils.getLatestServedAPIVersion)(resourceDef);
     const result = {
       data: null,
       error: null
@@ -603,15 +596,16 @@ class ApiServerClient {
         account: this.account,
         team: this.team
       });
-      const url = this.buildResourceBaseUrl({
+      const urlPath = this.buildResourceUrlPath({
         resourceDef,
         scopeDef,
         scopeName,
         version,
         expand,
-        langDef
+        langDef,
+        fieldSet
       });
-      const response = await service.getWithPagination(url, query, 50, {}, progressListener);
+      const response = await service.getWithPagination(urlPath, query, 50, {}, progressListener);
       result.data = response;
     } catch (e) {
       log('getResourcesList, error: ', e);
@@ -639,12 +633,12 @@ class ApiServerClient {
     resourceName,
     scopeDef,
     scopeName,
+    version = ApiServerVersions.v1alpha1,
     expand,
     langDef,
-    resourceVersion
+    fieldSet
   }) {
     log(`getResourceByName, spec.kind = ${resourceDef.spec.kind}, name = ${resourceName}`);
-    const version = resourceVersion === undefined ? (0, _utils.getLatestServedAPIVersion)(resourceDef) : resourceVersion;
     const result = {
       data: null,
       error: null
@@ -656,16 +650,17 @@ class ApiServerClient {
         account: this.account,
         team: this.team
       });
-      const url = this.buildResourceBaseUrl({
+      const urlPath = this.buildResourceUrlPath({
         resourceDef,
         resourceName,
         scopeDef,
         scopeName,
         version,
         expand,
-        langDef
+        langDef,
+        fieldSet
       });
-      const response = await service.get(url);
+      const response = await service.get(urlPath);
       result.data = response;
     } catch (e) {
       log('getResourceByName, error: ', e);
@@ -741,7 +736,7 @@ class ApiServerClient {
    * sorting of the array of resources with "compareResourcesByKindAsc".
    * @param resources array of resources to create
    */
-  async bulkCreate(resources, sortedDefsMap) {
+  async bulkCreate(resources, sortedDefsMap, version) {
     log(`bulk create`);
     const sortedDefsArray = Array.from(sortedDefsMap.values());
     const pendingSubResources = [];
@@ -778,7 +773,8 @@ class ApiServerClient {
         resource,
         resourceDef,
         scopeDef,
-        scopeName
+        scopeName,
+        version
       });
       if (res.data && !res.error) {
         // note: bulk operation requires creation of sub-resources after all main resources created
@@ -830,7 +826,7 @@ class ApiServerClient {
    * sorting of the array of resources with "compareResourcesByKindAsc".
    * @param resources array of resources to create
    */
-  async bulkCreateOrUpdate(resources, sortedDefsMap, language, subResourceName) {
+  async bulkCreateOrUpdate(resources, sortedDefsMap, language, subResourceName, version) {
     log(`bulk create or update`);
     const sortedDefsArray = Array.from(sortedDefsMap.values());
     const applyResults = [];
@@ -868,8 +864,7 @@ class ApiServerClient {
         resourceDef,
         resourceName: resource.name,
         scopeDef,
-        scopeName,
-        resourceVersion: resource.apiVersion
+        scopeName
       }) : null;
 
       // Create new resources first
@@ -882,6 +877,7 @@ class ApiServerClient {
           resourceDef,
           scopeDef,
           scopeName,
+          version,
           language
         });
       } else if (getResult.data) {
@@ -891,6 +887,7 @@ class ApiServerClient {
           resourceDef,
           scopeDef,
           scopeName,
+          version,
           language,
           subResourceName
         });
@@ -956,7 +953,7 @@ class ApiServerClient {
    * Order of calls calculated by sorting of the array of resources with "compareResourcesByKindDesc".
    * @param resources array of resources to create
    */
-  async bulkDelete(resources, sortedDefsMap, wait, forceDelete) {
+  async bulkDelete(resources, sortedDefsMap, wait, forceDelete, version) {
     log(`bulk delete`);
     const sortedDefsArray = Array.from(sortedDefsMap.values());
     const bulkResult = {
@@ -993,8 +990,8 @@ class ApiServerClient {
           resourceDef,
           scopeDef,
           scopeName,
-          forceDelete,
-          resourceAPIVersion: resource.apiVersion
+          version,
+          forceDelete
         });
         if (res.error) {
           for (const nextError of res.error) {

package/dist/common/dataService.js

@@ -126,7 +126,7 @@ const dataService = async ({
     clientId,
     team
   });
-  const url = await getBaseUrl(baseUrl, basePath, region, orgRegion);
+  baseUrl = await getBaseUrl(baseUrl, basePath, region, orgRegion);
   const defaultHeaders = getDefaultHeaders({
     orgId,
     token
@@ -158,8 +158,8 @@ const dataService = async ({
   };
   return {
     postFormData: (route, body, headers = {}) => {
-      log(`POST (from data): ${url + route}`);
-      return fetch('post', url + route, {
+      log(`POST (from data): ${baseUrl + route}`);
+      return fetch('post', baseUrl + route, {
         headers: {
           ...defaultHeaders,
           ...body.getHeaders(),
@@ -169,9 +169,9 @@ const dataService = async ({
       }).then(handleResponse);
     },
     post: (route, data, headers = {}) => {
-      log(`POST: ${url + route}`);
+      log(`POST: ${baseUrl + route}`);
       log(data);
-      return fetch('post', url + route, {
+      return fetch('post', baseUrl + route, {
         headers: {
           ...defaultHeaders,
           ...headers
@@ -180,8 +180,8 @@ const dataService = async ({
       }).then(handleResponse);
     },
     put: (route, data, headers = {}) => {
-      log(`PUT: ${url + route}`);
-      return fetch('put', url + route, {
+      log(`PUT: ${baseUrl + route}`);
+      return fetch('put', baseUrl + route, {
         headers: {
           ...defaultHeaders,
           ...headers
@@ -194,8 +194,8 @@ const dataService = async ({
         ...defaultHeaders,
         ...headers
       };
-      log(`GET: ${url + route}`, h);
-      return fetch('get', url + route, {
+      log(`GET: ${baseUrl + route}`, h);
+      return fetch('get', baseUrl + route, {
         headers: h
       }).then(handleResponse);
     },
@@ -210,7 +210,10 @@ const dataService = async ({
      * @param progressListener invoked multiple times where argument is assigned progress value 0-100
      */
     getWithPagination: async function (route, queryParams = '', pageSize = 50, headers = {}, progressListener) {
-      const fullUrl = queryParams ? new _url.URL(url + route + '?query=' + queryParams) : new _url.URL(url + route);
+      const fullUrl = new _url.URL(baseUrl + route);
+      if (queryParams) {
+        fullUrl.searchParams.set('query', queryParams);
+      }
       fullUrl.searchParams.set('pageSize', `${pageSize}`);
       log(`GET (with auto-pagination): ${fullUrl.href}`);
       const response = await fetch('get', fullUrl.toString(), {
@@ -241,9 +244,9 @@ const dataService = async ({
         for (let pageIndex = 1; pageIndex < totalPages; pageIndex++) {
           const thisPageIndex = pageIndex;
           fullUrl.searchParams.set('page', `${thisPageIndex + 1}`);
-          const thisPageUrl = `${route}?${fullUrl.searchParams.toString()}`;
+          const nextRoute = fullUrl.href.substring(baseUrl.length);
           otherPagesCalls.push(limit(async () => {
-            allPages[thisPageIndex] = await this.get(thisPageUrl, headers);
+            allPages[thisPageIndex] = await this.get(nextRoute, headers);
             pageDownloadCount++;
             updateProgress();
           }));
@@ -253,8 +256,8 @@ const dataService = async ({
       return (0, _flatten.default)(allPages);
     },
     delete: (route, headers = {}) => {
-      log(`DELETE: ${url + route}`);
-      return fetch('delete', url + route, {
+      log(`DELETE: ${baseUrl + route}`);
+      return fetch('delete', baseUrl + route, {
         headers: {
           ...defaultHeaders,
           ...headers
@@ -264,8 +267,8 @@ const dataService = async ({
     download: async route => {
       try {
         return await new Promise((resolve, reject) => {
-          log(`DOWNLOAD: ${url + route}`);
-          const stream = got.stream(url + route, {
+          log(`DOWNLOAD: ${baseUrl + route}`);
+          const stream = got.stream(baseUrl + route, {
             retry: 0,
             timeout: _types.ABORT_TIMEOUT
           });

package/dist/common/utils.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.FormatString = FormatString;
 exports.KeyValueMapToNameValueArray = KeyValueMapToNameValueArray;
 exports.ValueFromKey = ValueFromKey;
-exports.parseScopeParam = exports.loadAndVerifySpecs = exports.loadAndVerifyApigeeXCredentialFile = exports.isWindows = exports.isValidJson = exports.isApiServerErrorType = exports.isApiServerErrorResponseType = exports.hbsCompare = exports.getLatestServedAPIVersion = exports.getConfig = exports.createLanguageSubresourceNames = exports.configFile = exports.compareResourcesByKindDesc = exports.compareResourcesByKindAsc = exports.buildTemplate = exports.buildGenericResource = void 0;
+exports.parseScopeParam = exports.loadAndVerifySpecs = exports.loadAndVerifyApigeeXCredentialFile = exports.isWindows = exports.isValidJson = exports.isApiServerErrorType = exports.isApiServerErrorResponseType = exports.hbsCompare = exports.getConfig = exports.createLanguageSubresourceNames = exports.configFile = exports.compareResourcesByKindDesc = exports.compareResourcesByKindAsc = exports.buildTemplate = exports.buildGenericResource = void 0;
 exports.sanitizeMetadata = sanitizeMetadata;
 exports.writeToFile = exports.writeTemplates = exports.verifyScopeParam = exports.verifyFile = exports.transformSimpleFilters = void 0;
 var _fsExtra = require("fs-extra");
@@ -14,7 +14,6 @@ var _handlebars = _interopRequireDefault(require("handlebars"));
 var _jsYaml = require("js-yaml");
 var _os = require("os");
 var _path = require("path");
-var _ApiServerClient = require("./ApiServerClient");
 var _CompositeError = require("./CompositeError");
 var _types = require("./types");
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -415,18 +414,4 @@ function ValueFromKey(stringEnum, key) {
     if (k === stringEnum[key]) return k;
   }
   return undefined;
-}
-const getLatestServedAPIVersion = resourceDef => {
-  let apiVersions = resourceDef.spec.apiVersions;
-  if (apiVersions && apiVersions.length > 0) {
-    for (const version of apiVersions) {
-      if (version.served && !version.deprecated) {
-        return version.name;
-      }
-    }
-    return _ApiServerClient.ApiServerVersions.v1alpha1;
-  }
-  // if the apiVersions are not set on the resource definition, fallback to v1alpha1 version
-  return _ApiServerClient.ApiServerVersions.v1alpha1;
-};
-exports.getLatestServedAPIVersion = getLatestServedAPIVersion;
+}

package/package.json

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