feat(service): add --format json|human option

Fixes #589
CleverCloud · Jul 1, 2024 · 0f23885 · 0f23885
1 parent 8dd42c9
commit 0f23885
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/bin/clever.js b/bin/clever.js
@@ -1015,6 +1015,7 @@ function run () {
   const serviceCommands = cliparse.command('service', {
     description: 'Manage service dependencies',
     options: [opts.alias, opts.appIdOrName, opts.onlyApps, opts.onlyAddons, opts.showAll],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [serviceLinkAppCommand, serviceUnlinkAppCommand, serviceLinkAddonCommand, serviceUnlinkAddonCommand],
   }, service('list'));
 

diff --git a/src/commands/service.js b/src/commands/service.js
@@ -5,23 +5,51 @@ const Application = require('../models/application.js');
 const Logger = require('../logger.js');
 
 async function list (params) {
-  const { alias, app: appIdOrName, 'show-all': showAll, 'only-apps': onlyApps, 'only-addons': onlyAddons } = params.options;
+  const { alias, app: appIdOrName, 'show-all': showAll, 'only-apps': onlyApps, 'only-addons': onlyAddons, format } = params.options;
   if (onlyApps && onlyAddons) {
     throw new Error('--only-apps and --only-addons are mutually exclusive');
   }
 
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
+  const formattedServices = {};
+
   if (!onlyAddons) {
     const apps = await Application.listDependencies(ownerId, appId, showAll);
-    Logger.println('Applications:');
-    apps.forEach(({ isLinked, name }) => Logger.println(`${isLinked ? '*' : ' '} ${name}`));
+    formattedServices.applications = apps.map((app) => ({
+      id: app.id,
+      name: app.name,
+      isLinked: app.isLinked,
+    }));
   }
 
   if (!onlyApps) {
     const addons = await Addon.list(ownerId, appId, showAll);
-    Logger.println('Addons:');
-    addons.forEach(({ isLinked, name, realId }) => Logger.println(`${isLinked ? '*' : ' '} ${name} (${realId})`));
+    formattedServices.addons = addons.map((addon) => ({
+      id: addon.id,
+      realId: addon.realId,
+      name: addon.name,
+      isLinked: addon.isLinked,
+    }));
+  }
+
+  switch (format) {
+    case 'json': {
+      Logger.printJson(formattedServices);
+      break;
+    }
+    case 'human':
+    default: {
+      if (formattedServices.applications) {
+        Logger.println('Applications:');
+        formattedServices.applications.forEach(({ isLinked, name }) => Logger.println(`${isLinked ? '*' : ' '} ${name}`));
+      }
+
+      if (formattedServices.addons) {
+        Logger.println('Addons:');
+        formattedServices.addons.forEach(({ isLinked, name, realId }) => Logger.println(`${isLinked ? '*' : ' '} ${name} (${realId})`));
+      }
+    }
   }
 }
 

diff --git a/src/models/application.js b/src/models/application.js
@@ -273,7 +273,7 @@ async function listDependencies (ownerId, appId, showAll) {
   const applicationDeps = await application.getAllDependencies({ id: ownerId, appId }).then(sendToApi);
 
   if (!showAll) {
-    return applicationDeps;
+    return applicationDeps.map((app) => ({ ...app, isLinked: true }));
   }
 
   const allApps = await application.getAll({ id: ownerId }).then(sendToApi);