@axway/axway-central-cli 3.5.0 → 3.6.0-rc.0

package/dist/commands/delete/index.js

@@ -28,7 +28,8 @@ const action = async ({
     args,
     region,
     cache,
-    yes
+    yes,
+    forceDelete
   } = argv;
   let isCmdError = true; // let's be pessimistic.
   const typedResource = args[0];
@@ -114,13 +115,27 @@ ${defsManager.getDefsTableForHelpMsg()}`);
           process.exit(1);
         }
       }
+
+      // Ask user if it's okay to delete when "--forceDelete" option is set.
+      if (forceDelete) {
+        let result = _types.YesNo.Yes;
+        result = await (0, _basicPrompts.askList)({
+          msg: 'Are you sure you want to force delete this resource?',
+          choices: _types.YesNoChoices,
+          default: _types.YesNo.No
+        });
+        if (result === _types.YesNo.No) {
+          process.exit(1);
+        }
+      }
       render.startSpin(`Deleting resources${wait ? ' and waiting for them to be deleted' : ''}`);
       const results = await Promise.all(matchingDefs.map(async defs => client.deleteResourceByName({
         resourceDef: defs.resource,
         resourceName: typedName,
         scopeDef: defs.scope,
         scopeName: scope === null || scope === void 0 ? void 0 : scope.name,
-        wait
+        wait,
+        forceDelete
       })));
 
       // considering the command successful if at least 1 response found
@@ -139,7 +154,7 @@ ${defsManager.getDefsTableForHelpMsg()}`);
       const {
         docs
       } = await (0, _utils.loadAndVerifySpecs)(file, defsManager.getAllKindsList());
-      bulkResults = await client.bulkDelete(docs, defsManager.getSortedKindsMap(), wait);
+      bulkResults = await client.bulkDelete(docs, defsManager.getSortedKindsMap(), wait, forceDelete);
       render.bulkResult(bulkResults, 'has successfully been deleted.');
       isCmdError = !!bulkResults.error.length;
     }

package/dist/common/ApiServerClient.js

@@ -66,6 +66,7 @@ class ApiServerClient {
     scopeDef,
     scopeName,
     version = ApiServerVersions.v1alpha1,
+    forceDelete = false,
     expand,
     langDef
   }) {
@@ -77,12 +78,13 @@ class ApiServerClient {
     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}`;
+      return `${groupUrl}${scopeUrl}${resourceUrl}${nameUrl}${forceDeleteUrl}`;
     }
   }
 
@@ -494,7 +496,8 @@ class ApiServerClient {
     scopeDef,
     scopeName,
     wait,
-    version = ApiServerVersions.v1alpha1
+    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 = {
@@ -513,7 +516,8 @@ class ApiServerClient {
         resourceName,
         scopeDef,
         scopeName,
-        version
+        version,
+        forceDelete
       });
       const response = await service.delete(url);
       // note: delete "response" value from api-server is translated to an empty string currently.
@@ -987,7 +991,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, version) {
+  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());
@@ -1026,7 +1030,8 @@ class ApiServerClient {
           resourceDef,
           scopeDef,
           scopeName,
-          version
+          version,
+          forceDelete
         });
         if (res.error) {
           for (const nextError of res.error) {

package/dist/common/resultsRenderers.js

@@ -57,6 +57,7 @@ const parseAsTable = (response, columns) => {
     for (const col of columns) {
       // jsonPath starts with '.' so using the substring
       let value = (0, _get.default)(i, col.jsonPath.substring(1));
+      let deletingState = (0, _get.default)(i, "metadata.state");
       if (col.type === 'date') {
         value = (0, _dayjs.default)(value).fromNow();
       } else if (col.type === 'teamGuid' && !value) {
@@ -64,7 +65,11 @@ const parseAsTable = (response, columns) => {
       } else if (value && value.length > _types.MAX_TABLE_STRING_LENGTH + 3) {
         value = value.substring(0, _types.MAX_TABLE_STRING_LENGTH / 2) + '...' + value.substring(value.length - _types.MAX_TABLE_STRING_LENGTH / 2);
       }
-      t.cell(col.name.toUpperCase(), value);
+      if (deletingState) {
+        t.cell(col.name.toUpperCase(), _chalk.default.yellow(value));
+      } else {
+        t.cell(col.name.toUpperCase(), value);
+      }
     }
     t.newRow();
   }

package/dist/common/types.js

@@ -269,17 +269,16 @@ let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNa
   DataPlaneNames["GITHUB"] = "GitHub";
   DataPlaneNames["GITLAB"] = "GitLab";
   DataPlaneNames["AZURE"] = "Azure";
-  DataPlaneNames["EDGE"] = "Edge";
+  DataPlaneNames["EDGE"] = "APIM";
   DataPlaneNames["KAFKA"] = "Kafka";
   DataPlaneNames["GRAYLOG"] = "Graylog";
   DataPlaneNames["IBMAPICONNECT"] = "APIConnect";
   DataPlaneNames["KONG"] = "Kong";
-  DataPlaneNames["SOFTWAREAGWEBMETHODS"] = "Software AG WebMethods";
+  DataPlaneNames["SOFTWAREAGWEBMETHODS"] = "WebMethods";
   DataPlaneNames["SWAGGERHUB"] = "SwaggerHub";
   DataPlaneNames["TRACEABLE"] = "Traceable";
   DataPlaneNames["MULESOFT"] = "Mulesoft";
-  DataPlaneNames["WSO2"] = "WSO2";
-  DataPlaneNames["OTHER"] = "Other";
+  DataPlaneNames["OTHER"] = "Unidentified";
   return DataPlaneNames;
 }({});
 const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {

package/package.json

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