@axway/axway-central-cli 3.7.0 → 3.8.0

package/dist/commands/apply/index.js

@@ -28,7 +28,8 @@ const action = async ({
     region,
     cache,
     yes,
-    language
+    language,
+    subresource
   } = argv;
   let isCmdError = false;
 
@@ -38,17 +39,7 @@ const action = async ({
   if (!file) throw new Error('File name is required, please provide -f, --file [path] option');
   log(`verifying file: ${file}`);
   (0, _utils.verifyFile)(file);
-  let results = {
-    created: {
-      success: [],
-      error: [],
-      warning: []
-    },
-    updated: {
-      success: [],
-      error: []
-    }
-  };
+  let results = [];
   const render = new _Renderer.default(console, output).startSpin('Creating or updating resource(s)');
   const client = new _ApiServerClient.ApiServerClient({
     baseUrl,
@@ -75,15 +66,18 @@ const action = async ({
       render.startSpin('Creating or updating resource(s)');
     }
     const sortedKindsMap = defsManager.getSortedKindsMap();
-    results = await client.bulkCreateOrUpdate(docs, sortedKindsMap, language);
-    render.bulkCreateOrUpdateResult(results, 'has successfully been created.', 'has successfully been updated.', 'was created with an autogenerated logical name.');
-    isCmdError = results.created.error.length > 0 || results.updated.error.length > 0;
+    results = await client.bulkCreateOrUpdate(docs, sortedKindsMap, language, subresource);
+    render.bulkCreateOrUpdateResult(results);
+    isCmdError = results.some(nextResult => {
+      var _nextResult$error$len, _nextResult$error;
+      return (_nextResult$error$len = (_nextResult$error = nextResult.error) === null || _nextResult$error === void 0 ? void 0 : _nextResult$error.length) !== null && _nextResult$error$len !== void 0 ? _nextResult$error$len : 0 > 0;
+    });
   } catch (e) {
     log('command error', e);
     isCmdError = true;
-    // if some calls completed, rendering the result
-    if (results.created.success.length || results.updated.success.length) {
-      render.bulkCreateOrUpdateResult(results, 'has successfully been created.', 'has successfully been updated.', 'was created with an autogenerated logical name.');
+    if (results.some(nextResult => nextResult.data)) {
+      // Render the results that have completed.
+      render.bulkCreateOrUpdateResult(results);
     }
     render.anyError(e);
   } finally {
@@ -109,6 +103,10 @@ const apply = exports.apply = {
     '--language=[langCode]': {
       desc: `Language Codes. One of: Comma Separated values of ${_types.LanguageTypes.French} | ${_types.LanguageTypes.US} | ${_types.LanguageTypes.German} | ${_types.LanguageTypes.Portugese}`,
       type: 'string'
+    },
+    '--subresource=[name]': {
+      desc: 'Name of the 1 subresource to update. Will prevent main resource and all other subresources from being updated.',
+      type: 'string'
     }
   }
 };

package/dist/common/ApiServerClient.js

@@ -130,6 +130,7 @@ class ApiServerClient {
    * @param {Object} args function expects arguments as an object
    * @param {GenericResource} args.resource resource input (not the APIs response)
    * @param {string} args.resourceName resource name
+   * @param {string} args.subResourceName subresource name
    * @param {ResourceDefinition} args.resourceDef resource definition
    * @param {string} [args.scopeName] scope name
    * @param {ResourceDefinition} [args.scopeDef] scope definition
@@ -140,6 +141,7 @@ class ApiServerClient {
   async generateSubResourcesRequests({
     resource,
     resourceName,
+    subResourceName,
     resourceDef,
     scopeDef,
     scopeName,
@@ -162,7 +164,12 @@ class ApiServerClient {
       version
     });
     const knownSubResourcesNames = (_resourceDef$spec$sub = (_resourceDef$spec$sub2 = resourceDef.spec.subResources) === null || _resourceDef$spec$sub2 === void 0 ? void 0 : _resourceDef$spec$sub2.names) !== null && _resourceDef$spec$sub !== void 0 ? _resourceDef$spec$sub : [];
-    const foundSubResources = (0, _pickBy.default)(resource, (_, key) => key.startsWith('x-') || knownSubResourcesNames.includes(key));
+    const foundSubResources = (0, _pickBy.default)(resource, (_, key) => {
+      if (key.startsWith('x-') || knownSubResourcesNames.includes(key)) {
+        return !subResourceName || subResourceName === key;
+      }
+      return false;
+    });
     if (language) {
       const langSubResourcesNames = (0, _utils.createLanguageSubresourceNames)(language);
       langSubResourcesNames.forEach(name => {
@@ -186,14 +193,15 @@ class ApiServerClient {
       });
     }
     return (0, _isEmpty.default)(foundSubResources) ? null : Object.keys(foundSubResources).map(key => {
-      return () => service.put(`${baseUrl}/${key}?fields=${key}`, {
-        [key]: foundSubResources[key]
-      })
-      // note: "catch" will not be needed if APIs will return the sub-resource name in error response
-      .catch(err => Promise.reject({
+      return {
         name: key,
-        requestError: err
-      }));
+        operation: () => service.put(`${baseUrl}/${key}?fields=${key}`, {
+          [key]: foundSubResources[key]
+        }).catch(err => Promise.reject({
+          name: key,
+          requestError: err
+        }))
+      };
     });
   }
 
@@ -207,34 +215,44 @@ class ApiServerClient {
    */
   async resolveSubResourcesRequests(mainResourceResponse, pendingCalls) {
     var _result$error2, _result$error3;
-    if (!pendingCalls) return {
-      data: mainResourceResponse,
-      error: null
-    };
+    if (!pendingCalls) {
+      return {
+        data: mainResourceResponse,
+        error: null
+      };
+    }
     log(`resolving sub-resources, pending calls = ${pendingCalls.length}.`);
     // note: errors set to an empty array initially, will reset to null if no errors found
     const result = {
       data: null,
+      updatedSubResourceNames: [],
       error: []
     };
-    const subResourcesCombined = (await Promise.allSettled(pendingCalls.map(call => call()))).reduce((a, c) => {
-      if (c.status === 'fulfilled') return {
-        ...a,
-        ...c.value
-      };else {
-        var _c$reason$requestErro;
-        // expecting only a valid ApiServer error response here
-        // re-throw if something different, so it should be handled by command's catch block.
-        if ((_c$reason$requestErro = c.reason.requestError) !== null && _c$reason$requestErro !== void 0 && _c$reason$requestErro.errors && Array.isArray(c.reason.requestError.errors)) {
-          var _result$error;
-          // note: if APIs are going to return more details this details override will not be needed, just push as in other methods
-          (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.push(...c.reason.requestError.errors.map(e => ({
-            ...e,
-            detail: `sub-resource "${c.reason.name}" ${e.detail}`
-          })));
-        } else throw c.reason;
+    const subResourcesCombined = (await Promise.allSettled(pendingCalls.map(async next => {
+      var _result$updatedSubRes;
+      const opResult = await next.operation();
+      (_result$updatedSubRes = result.updatedSubResourceNames) === null || _result$updatedSubRes === void 0 ? void 0 : _result$updatedSubRes.push(next.name);
+      return opResult;
+    }))).reduce((a, c) => {
+      var _c$reason$requestErro;
+      if (c.status === 'fulfilled') {
+        return {
+          ...a,
+          ...c.value
+        };
+      }
+      // expecting only a valid ApiServer error response here
+      // re-throw if something different, so it should be handled by command's catch block.
+      if ((_c$reason$requestErro = c.reason.requestError) !== null && _c$reason$requestErro !== void 0 && _c$reason$requestErro.errors && Array.isArray(c.reason.requestError.errors)) {
+        var _result$error;
+        // note: if APIs are going to return more details this details override will not be needed, just push as in other methods
+        (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.push(...c.reason.requestError.errors.map(e => ({
+          ...e,
+          detail: `sub-resource "${c.reason.name}" ${e.detail}`
+        })));
         return a;
       }
+      throw c.reason;
     }, {});
     result.data = (0, _assign.default)(mainResourceResponse, subResourcesCombined);
     if (!((_result$error2 = result.error) !== null && _result$error2 !== void 0 && _result$error2.length)) result.error = null; // reset errors to null if none encountered
@@ -245,8 +263,8 @@ class ApiServerClient {
   /**
    * Check if resources are deleted by making a fetch call for the resources
    */
-  checkForResources(sortedResources, sortedDefsArray) {
-    return Promise.all(sortedResources.map(resource => {
+  checkForResources(resources, sortedDefsArray) {
+    return Promise.all(resources.map(resource => {
       var _resource$metadata2, _resource$metadata3, _resource$metadata3$s;
       const resourceDef = sortedDefsArray.find(def => {
         var _def$spec$scope, _resource$metadata, _resource$metadata$sc;
@@ -282,7 +300,7 @@ class ApiServerClient {
     withSubResources = true,
     language
   }) {
-    log(`createResource, spec.kind = ${resourceDef.spec.kind}, name = ${resource.name}, withSubResources = ${withSubResources}`);
+    log(`createResource, spec.kind = ${resourceDef.spec.kind}, name = ${resource.name}`);
     const result = {
       data: null,
       error: null,
@@ -337,7 +355,9 @@ class ApiServerClient {
         result.error = e.errors;
       } else throw e;
     }
-    if (!!result.data) result.data = (0, _utils.sanitizeMetadata)(result.data);
+    if (!!result.data) {
+      result.data = (0, _utils.sanitizeMetadata)(result.data);
+    }
     return result;
   }
 
@@ -351,7 +371,7 @@ class ApiServerClient {
     scopeDef,
     scopeName,
     version = ApiServerVersions.v1alpha1,
-    withSubResources = true,
+    subResourceName,
     language
   }) {
     log(`updateResource, spec.kind = ${resourceDef.spec.kind}, name = ${resource.name}`);
@@ -360,32 +380,15 @@ class ApiServerClient {
       error: null,
       pending: null
     };
-    try {
-      const service = await (0, _dataService.dataService)({
-        baseUrl: this.baseUrl,
-        region: this.region,
-        account: this.account,
-        team: this.team
-      });
-      let pendingSubResources;
-      if (language) {
-        pendingSubResources = await this.generateSubResourcesRequests({
-          resource,
-          resourceName: resource.name,
-          resourceDef,
-          scopeDef,
-          scopeName,
-          version,
-          createAction: false,
-          language
-        });
-        result.data = (0, _utils.buildGenericResource)({
-          resourceName: resource.name,
-          resourceDef: resourceDef,
-          scopeName: scopeName
+    const canUpdateMainResource = !language && !subResourceName;
+    if (canUpdateMainResource) {
+      try {
+        const service = await (0, _dataService.dataService)({
+          baseUrl: this.baseUrl,
+          region: this.region,
+          account: this.account,
+          team: this.team
         });
-        result.pending = pendingSubResources;
-      } else {
         const url = this.buildResourceBaseUrl({
           resourceDef,
           resourceName: resource.name,
@@ -393,37 +396,46 @@ class ApiServerClient {
           scopeName,
           version
         });
-        const response = await service.put(url, (0, _utils.sanitizeMetadata)(resource));
-        pendingSubResources = await this.generateSubResourcesRequests({
-          resource,
-          resourceName: response.name,
-          resourceDef,
-          scopeDef,
-          scopeName,
-          createAction: false,
-          version
-        });
-        if (withSubResources) {
-          const {
-            data: subResData,
-            error: subResError
-          } = await this.resolveSubResourcesRequests(response, pendingSubResources);
-          result.data = subResData;
-          result.error = subResError;
+        result.data = await service.put(url, (0, _utils.sanitizeMetadata)(resource));
+      } catch (e) {
+        log('updateResource, error', e);
+        // expecting only a valid ApiServer error response here
+        // re-throw if something different, so it should be handled by command's catch block.
+        if (e.errors && Array.isArray(e.errors)) {
+          result.error = e.errors;
         } else {
-          result.data = response;
-          result.pending = pendingSubResources;
+          throw e;
         }
+        ;
       }
-    } catch (e) {
-      log('updateResource, error', e);
-      // expecting only a valid ApiServer error response here
-      // re-throw if something different, so it should be handled by command's catch block.
-      if (e.errors && Array.isArray(e.errors)) {
-        result.error = e.errors;
-      } else throw e;
     }
-    if (!!result.data) result.data = (0, _utils.sanitizeMetadata)(result.data);
+    result.pending = await this.generateSubResourcesRequests({
+      resource,
+      resourceName: resource.name,
+      subResourceName,
+      resourceDef,
+      scopeDef,
+      scopeName,
+      version,
+      createAction: false,
+      language
+    });
+    if (!result.data && !result.pending && subResourceName) {
+      result.error = [{
+        status: 0,
+        title: '',
+        detail: `sub-resource "${subResourceName}" not found.`,
+        meta: {
+          instanceId: '',
+          tenantId: '',
+          authenticatedUserId: '',
+          transactionId: ''
+        }
+      }];
+    }
+    if (result.data) {
+      result.data = (0, _utils.sanitizeMetadata)(result.data);
+    }
     return result;
   }
 
@@ -730,16 +742,14 @@ class ApiServerClient {
    */
   async bulkCreate(resources, sortedDefsMap, version) {
     log(`bulk create`);
-    // sort() is modifying the existing array so cloning it before use.
     const sortedDefsArray = Array.from(sortedDefsMap.values());
-    const sortedResources = [...resources].sort((0, _utils.compareResourcesByKindAsc)(sortedDefsArray));
     const pendingSubResources = [];
     const bulkResult = {
       success: [],
       error: [],
       warning: []
     };
-    for (const resource of sortedResources) {
+    for (const resource of resources) {
       var _resource$metadata7, _resource$metadata8, _resource$metadata8$s;
       const resourceDef = sortedDefsArray.find(def => {
         var _def$spec$scope2, _resource$metadata4, _resource$metadata4$s;
@@ -768,8 +778,7 @@ class ApiServerClient {
         resourceDef,
         scopeDef,
         scopeName,
-        version,
-        withSubResources: false
+        version
       });
       if (res.data && !res.error) {
         // note: bulk operation requires creation of sub-resources after all main resources created
@@ -821,35 +830,19 @@ class ApiServerClient {
    * sorting of the array of resources with "compareResourcesByKindAsc".
    * @param resources array of resources to create
    */
-  async bulkCreateOrUpdate(resources, sortedDefsMap, language, version) {
+  async bulkCreateOrUpdate(resources, sortedDefsMap, language, subResourceName, version) {
     log(`bulk create or update`);
-    // sort() is modifying the existing array so cloning it before use.
     const sortedDefsArray = Array.from(sortedDefsMap.values());
-    const sortedResources = [...resources].sort((0, _utils.compareResourcesByKindAsc)(sortedDefsArray));
-    const bulkResult = {
-      created: {
-        success: [],
-        error: [],
-        warning: []
-      },
-      updated: {
-        success: [],
-        error: []
-      }
-    };
-    const pendingSubResources = {
-      created: [],
-      updated: []
-    };
-    for (const resource of sortedResources) {
-      var _resource$metadata12, _resource$metadata13, _resource$metadata13$;
+    const applyResults = [];
+    for (const resource of resources) {
+      var _resource$metadata12, _resource$metadata13, _resource$metadata13$, _resource$name2, _singleResult$error, _applyResult$error3;
       const resourceDef = sortedDefsArray.find(def => {
         var _def$spec$scope3, _resource$metadata9, _resource$metadata9$s;
         return def.spec.kind === resource.kind && ((_def$spec$scope3 = def.spec.scope) === null || _def$spec$scope3 === void 0 ? void 0 : _def$spec$scope3.kind) === ((_resource$metadata9 = resource.metadata) === null || _resource$metadata9 === void 0 ? void 0 : (_resource$metadata9$s = _resource$metadata9.scope) === null || _resource$metadata9$s === void 0 ? void 0 : _resource$metadata9$s.kind);
       });
       // the check below is already happening when loading the specs but checking again just in case.
       if (!resourceDef) {
-        var _resource$metadata10, _resource$metadata10$;
+        var _resource$metadata10, _resource$metadata10$, _resource$name;
         let errorMessage = `No resource definition found for "kind/${resource.kind}"`;
         if (!!((_resource$metadata10 = resource.metadata) !== null && _resource$metadata10 !== void 0 && (_resource$metadata10$ = _resource$metadata10.scope) !== null && _resource$metadata10$ !== void 0 && _resource$metadata10$.kind)) {
           var _resource$metadata11, _resource$metadata11$;
@@ -857,15 +850,18 @@ class ApiServerClient {
         } else {
           errorMessage += ' with no scope.';
         }
-        bulkResult.created.error.push({
-          name: resource.name || 'Unknown name',
-          kind: resource.kind,
-          error: new Error(errorMessage)
+        applyResults.push({
+          error: [{
+            name: (_resource$name = resource.name) !== null && _resource$name !== void 0 ? _resource$name : 'Unknown name',
+            kind: resource.kind,
+            error: new Error(errorMessage)
+          }]
         });
         continue;
       }
       const scopeDef = !!((_resource$metadata12 = resource.metadata) !== null && _resource$metadata12 !== void 0 && _resource$metadata12.scope) ? sortedDefsArray.find(def => def.spec.kind === resource.metadata.scope.kind && !def.spec.scope) : undefined;
       const scopeName = (_resource$metadata13 = resource.metadata) === null || _resource$metadata13 === void 0 ? void 0 : (_resource$metadata13$ = _resource$metadata13.scope) === null || _resource$metadata13$ === void 0 ? void 0 : _resource$metadata13$.name;
+      const resourceName = (_resource$name2 = resource.name) !== null && _resource$name2 !== void 0 ? _resource$name2 : 'Unknown name';
 
       // only making getResource call if resource has a name
       let getResult = resource.name ? await this.getResourceByName({
@@ -876,73 +872,29 @@ class ApiServerClient {
       }) : null;
 
       // Create new resources first
-      if (!getResult || getResult !== null && getResult !== void 0 && getResult.error && getResult.error[0].status === 404) {
-        // Resource is not found, do the create
-
-        const res = await this.createResource({
+      let singleResult;
+      const shouldCreate = !getResult || !!(getResult !== null && getResult !== void 0 && getResult.error) && getResult.error[0].status === 404;
+      if (shouldCreate) {
+        // Resource not found. Create a new resource.
+        singleResult = await this.createResource({
           resource,
           resourceDef,
           scopeDef,
           scopeName,
           version,
-          withSubResources: false,
           language
         });
-        if (res.data && !res.error) {
-          // note: bulk operation requires creation of sub-resources after all main resources created
-          // since a sub-resource might have a reference to another resource.
-          if (!!res.pending) {
-            var _res$warning2;
-            pendingSubResources.created.push({
-              mainResult: res.data,
-              pendingCalls: res.pending,
-              withWarning: (_res$warning2 = res.warning) !== null && _res$warning2 !== void 0 ? _res$warning2 : false
-            });
-          } else {
-            var _bulkResult$created$w;
-            if (res.warning) (_bulkResult$created$w = bulkResult.created.warning) === null || _bulkResult$created$w === void 0 ? void 0 : _bulkResult$created$w.push(res.data);else bulkResult.created.success.push(res.data);
-          }
-        } else if (res.error) {
-          for (const nextError of res.error) {
-            bulkResult.created.error.push({
-              name: resource.name || 'Unknown name',
-              kind: resource.kind,
-              error: nextError
-            });
-          }
-        }
       } else if (getResult.data) {
-        // Resource found, do the update
-        const res = await this.updateResource({
+        // Resource found. Update the existing resource.
+        singleResult = await this.updateResource({
           resource: resource,
-          //we know that the resource exists and has a name if we've gotten to this point in th control flow
           resourceDef,
           scopeDef,
           scopeName,
           version,
-          withSubResources: false,
-          language
+          language,
+          subResourceName
         });
-        if (res.data && !res.error) {
-          if (!!res.pending) {
-            var _res$warning3;
-            pendingSubResources.updated.push({
-              mainResult: res.data,
-              pendingCalls: res.pending,
-              withWarning: (_res$warning3 = res.warning) !== null && _res$warning3 !== void 0 ? _res$warning3 : false
-            });
-          } else {
-            bulkResult.updated.success.push(res.data);
-          }
-        } else if (res.error) {
-          for (const nextError of res.error) {
-            bulkResult.updated.error.push({
-              name: resource.name,
-              kind: resource.kind,
-              error: nextError
-            });
-          }
-        }
       } else {
         // Something is going wrong - more than one error in api server response, re-throw in the same
         // structure as ApiServerErrorResponse so renderer.anyError can pick this up.
@@ -950,40 +902,54 @@ class ApiServerClient {
           errors: getResult.error
         };
       }
-    }
 
-    // creating sub-resources
-    for (const p of pendingSubResources.created) {
-      const subResResult = await this.resolveSubResourcesRequests(p.mainResult, p.pendingCalls);
-      if (subResResult.data && !subResResult.error) {
-        var _bulkResult$created$w2;
-        if (p.withWarning) (_bulkResult$created$w2 = bulkResult.created.warning) === null || _bulkResult$created$w2 === void 0 ? void 0 : _bulkResult$created$w2.push(subResResult.data);else bulkResult.created.success.push(subResResult.data);
-      } else if (subResResult.error) {
-        for (const nextError of subResResult.error) {
-          bulkResult.created.error.push({
-            name: p.mainResult.name,
-            kind: p.mainResult.kind,
-            error: nextError
-          });
+      // Store the results of the above create/update.
+      const applyResult = {
+        data: singleResult.data,
+        wasCreated: shouldCreate && !!singleResult.data,
+        wasAutoNamed: shouldCreate && singleResult.warning,
+        wasMainResourceChanged: !!singleResult.data,
+        error: []
+      };
+      (_singleResult$error = singleResult.error) === null || _singleResult$error === void 0 ? void 0 : _singleResult$error.forEach(nextError => {
+        var _applyResult$error;
+        return (_applyResult$error = applyResult.error) === null || _applyResult$error === void 0 ? void 0 : _applyResult$error.push({
+          name: resourceName,
+          kind: resource.kind,
+          error: nextError
+        });
+      });
+      applyResults.push(applyResult);
+
+      // Create or update any pending subresources.
+      if (singleResult.pending) {
+        var _singleResult$data, _subResResult$error;
+        const pendingData = (_singleResult$data = singleResult.data) !== null && _singleResult$data !== void 0 ? _singleResult$data : (0, _utils.sanitizeMetadata)((0, _utils.buildGenericResource)({
+          resourceName: resourceName,
+          resourceDef: resourceDef,
+          scopeName: scopeName
+        }));
+        const subResResult = await this.resolveSubResourcesRequests(pendingData, singleResult.pending);
+        if (subResResult.data) {
+          applyResult.data = subResResult.data;
         }
-      }
-    }
-    // creating sub-resources
-    for (const p of pendingSubResources.updated) {
-      const subResResult = await this.resolveSubResourcesRequests(p.mainResult, p.pendingCalls);
-      if (subResResult.data && !subResResult.error) {
-        bulkResult.updated.success.push(subResResult.data);
-      } else if (subResResult.error) {
-        for (const nextError of subResResult.error) {
-          bulkResult.created.error.push({
-            name: p.mainResult.name,
-            kind: p.mainResult.kind,
-            error: nextError
+        applyResult.updatedSubResourceNames = subResResult.updatedSubResourceNames;
+        (_subResResult$error = subResResult.error) === null || _subResResult$error === void 0 ? void 0 : _subResResult$error.forEach(error => {
+          var _applyResult$error2;
+          return (_applyResult$error2 = applyResult.error) === null || _applyResult$error2 === void 0 ? void 0 : _applyResult$error2.push({
+            name: resourceName,
+            kind: resource.kind,
+            error: error
           });
-        }
+        });
+      }
+
+      // Delete the result's error array if it is empty.
+      if (!((_applyResult$error3 = applyResult.error) !== null && _applyResult$error3 !== void 0 && _applyResult$error3.length)) {
+        delete applyResult.error;
       }
     }
-    return bulkResult;
+    return applyResults;
   }
 
   /**
@@ -993,14 +959,12 @@ class ApiServerClient {
    */
   async bulkDelete(resources, sortedDefsMap, wait, forceDelete, version) {
     log(`bulk delete`);
-    // sort() is modifying the existing array so cloning it before use.
     const sortedDefsArray = Array.from(sortedDefsMap.values());
-    const sortedResources = [...resources].sort((0, _utils.compareResourcesByKindDesc)(sortedDefsArray));
     const bulkResult = {
       success: [],
       error: []
     };
-    for (const resource of sortedResources) {
+    for (const resource of resources) {
       try {
         var _resource$metadata15, _resource$metadata16, _resource$metadata16$;
         const resourceDef = sortedDefsArray.find(def => {
@@ -1064,11 +1028,11 @@ class ApiServerClient {
     }
     if (wait) {
       let pendingResources = [];
-      pendingResources = await this.checkForResources(sortedResources, sortedDefsArray);
+      pendingResources = await this.checkForResources(resources, sortedDefsArray);
       const pendingDeletingResource = pendingResources.some(res => res === null || res === void 0 ? void 0 : res.data);
       if (pendingDeletingResource) {
         setTimeout(async () => {
-          pendingResources = await this.checkForResources(sortedResources, sortedDefsArray);
+          pendingResources = await this.checkForResources(resources, sortedDefsArray);
         }, _types.WAIT_TIMEOUT);
         const stillPending = pendingResources.some(res => res === null || res === void 0 ? void 0 : res.data);
         if (stillPending) {

package/dist/common/Renderer.js

@@ -118,6 +118,22 @@ class Renderer {
     return `"${resource.kind}/${resource.name}"${!!((_resource$metadata = resource.metadata) !== null && _resource$metadata !== void 0 && _resource$metadata.scope) ? ` in the scope "${resource.metadata.scope.kind}/${resource.metadata.scope.name}"` : ``}`;
   }
 
+  /**
+   * A helper returning `"<kind>/<name>" subresource "<subResourceNaem>" in the scope "<scopeKind>/<scopeName>"`
+   * string used to print bulk results (in "bulkResult" or "bulkCreateOrUpdateResult") or individually (see the "delete" cmd)
+   * @param {GenericResource} resource resource for witch the string should be created
+   * @param {string} subResourceName of the subresource that was updated
+   * @returns {string}
+   */
+  subResourceAndScopeKinds(resource, subResourceName) {
+    var _resource$metadata2;
+    let message = `"${resource.kind}/${resource.name}" subresource "${subResourceName}"`;
+    if ((_resource$metadata2 = resource.metadata) !== null && _resource$metadata2 !== void 0 && _resource$metadata2.scope) {
+      message += ` in the scope "${resource.metadata.scope.kind}/${resource.metadata.scope.name}"`;
+    }
+    return message;
+  }
+
   /**
    * Render bulk call result.
    * If error is happening - render as simple output (even if "output" param has been provided)
@@ -147,35 +163,35 @@ class Renderer {
   /**
    * Render bulk "apply" result (with different success messages).
    * If error is happening - render as simple output (even if "output" param has been provided)
-   * @param bulkResult bulk response from createOrUpdate ApiServerClient
-   * @param createSuccessMsg message to display for each created "kind/name"
-   * @param updateSuccessMsg message to display for each updated "kind/name"
+   * @param results array of responses from createOrUpdate ApiServerClient
    */
-  bulkCreateOrUpdateResult(bulkResult, createSuccessMsg, updateSuccessMsg, createWarningMsg) {
-    // if array passed, combine in a single ApiServerClientBulkResult, else use as-is
-    const bulkResultCombined = {
-      success: [...bulkResult.created.success, ...bulkResult.updated.success],
-      error: [...bulkResult.created.error, ...bulkResult.updated.error],
-      warning: [bulkResult.created.warning]
-    };
-    if (bulkResultCombined.error.length) {
-      var _bulkResult$created$w;
-      (_bulkResult$created$w = bulkResult.created.warning) === null || _bulkResult$created$w === void 0 ? void 0 : _bulkResult$created$w.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} ${createWarningMsg}`));
-      bulkResult.created.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${createSuccessMsg}`));
-      bulkResult.updated.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${updateSuccessMsg}`));
-      bulkResultCombined.error.forEach(r => this.anyError(r.error, `"${r.kind}/${r.name}" `, true));
-    } else if (this.output) {
-      var _bulkResult$created$w2;
-      let results = bulkResultCombined.success;
-      if ((_bulkResult$created$w2 = bulkResult.created.warning) !== null && _bulkResult$created$w2 !== void 0 && _bulkResult$created$w2.length) {
-        results = bulkResult.created.warning.concat(results);
-      }
-      (0, _resultsRenderers.renderResponse)(this._console, results, this.output);
+  bulkCreateOrUpdateResult(results) {
+    if (results.every(r => {
+      var _r$error$length, _r$error;
+      return ((_r$error$length = (_r$error = r.error) === null || _r$error === void 0 ? void 0 : _r$error.length) !== null && _r$error$length !== void 0 ? _r$error$length : 0) === 0;
+    }) && this.output) {
+      // Output responses as JSON/YAML, but only if no error responses were received.
+      const dataArray = results.map(r => r.data).filter(r => r != null);
+      (0, _resultsRenderers.renderResponse)(this._console, dataArray, this.output);
     } else {
-      var _bulkResult$created$w3;
-      (_bulkResult$created$w3 = bulkResult.created.warning) === null || _bulkResult$created$w3 === void 0 ? void 0 : _bulkResult$created$w3.forEach(r => this.warning(`${this.resourceAndScopeKinds(r)} ${createWarningMsg}`));
-      bulkResult.created.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${createSuccessMsg}`));
-      bulkResult.updated.success.forEach(r => this.success(`${this.resourceAndScopeKinds(r)} ${updateSuccessMsg}`));
+      // Log results.
+      for (const result of results) {
+        var _result$error;
+        if (result.data) {
+          if (result.wasAutoNamed) {
+            this.warning(this.resourceAndScopeKinds(result.data) + ' was created with an autogenerated logical name.');
+          } else if (result.wasCreated) {
+            this.success(this.resourceAndScopeKinds(result.data) + ' has successfully been created.');
+          } else if (result.wasMainResourceChanged) {
+            this.success(this.resourceAndScopeKinds(result.data) + ' has successfully been updated.');
+          }
+        }
+        (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.forEach(r => this.anyError(r.error, `"${r.kind}/${r.name}" `, true));
+        if (!result.wasMainResourceChanged && result.data) {
+          var _result$updatedSubRes;
+          (_result$updatedSubRes = result.updatedSubResourceNames) === null || _result$updatedSubRes === void 0 ? void 0 : _result$updatedSubRes.forEach(name => this.success(this.subResourceAndScopeKinds(result.data, name) + ' has successfully been updated.'));
+        }
+      }
     }
   }
   renderGetResults(bulkResultsArray, successMsg, langDef) {

package/package.json

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