clever-tools 4.1.0 → 4.2.0

package/bin/clever.js

@@ -79,6 +79,10 @@ process.stdout.on('error', (error) => {
 const cliparseCommand = cliparse.command;
 
 cliparse.command = function (name, options, commandFunction) {
+  if (commandFunction == null) {
+    return cliparseCommand(name, options);
+  }
+
   return cliparseCommand(name, options, (...args) => {
     const promise = commandFunction(...args);
     handleCommandPromise(promise);
@@ -120,12 +124,16 @@ async function run() {
       parser: Parsers.ngResourceType,
     }),
     ngAnyIdOrLabel: cliparse.argument('id-or-label', {
-      description: 'ID or Label of a Network group, a member or an (external) peer',
+      description: 'ID or Label of a Network Group, a member or an (external) peer',
+      parser: Parsers.ngResourceType,
+    }),
+    ngResourceId: cliparse.argument('id', {
+      description: 'ID of a resource to (un)link to a Network Group',
       parser: Parsers.ngResourceType,
     }),
     wgPublicKey: cliparse.argument('public-key', {
       metavar: 'public_key',
-      description: 'Wireguard public key of the external peer to link to a Network Group',
+      description: 'WireGuard public key of the external peer to link to a Network Group',
     }),
     email: cliparse.argument('email', {
       description: 'Email address',
@@ -206,7 +214,7 @@ async function run() {
     ngMembersIdsToLink: cliparse.option('link', {
       metavar: 'members_ids',
       description:
-        "Comma separated list of members IDs to link to a Network Group ('app_xxx', 'addon_xxx', 'external_xxx')",
+        'Comma separated list of members IDs to link to a Network Group (app_xxx, external_xxx, mysql_xxx, postgresql_xxx, redis_xxx, etc.)',
       parser: Parsers.commaSeparated,
     }),
     ngResourceType: cliparse.option('type', {
@@ -1413,16 +1421,18 @@ async function run() {
   const ngLinkCommand = cliparse.command(
     'link',
     {
-      description: 'Link an application or a database add-on by its ID to a Network Group',
-      args: [args.ngAnyIdOrLabel, args.ngIdOrLabel],
+      description:
+        'Link a resource by its ID (app_xxx, external_xxx, mysql_xxx, postgresql_xxx, redis_xxx, etc.) to a Network Group',
+      args: [args.ngResourceId, args.ngIdOrLabel],
     },
     ng.linkToNg,
   );
   const ngUnlinkCommand = cliparse.command(
     'unlink',
     {
-      description: 'Unlink an application or a database add-on by its ID from a Network Group',
-      args: [args.ngAnyIdOrLabel, args.ngIdOrLabel],
+      description:
+        'Unlink a resource by its ID (app_xxx, external_xxx, mysql_xxx, postgresql_xxx, redis_xxx, etc.) from a Network Group',
+      args: [args.ngResourceId, args.ngIdOrLabel],
     },
     ng.unlinkFromNg,
   );
@@ -1438,7 +1448,7 @@ async function run() {
   const ngGetConfigCommand = cliparse.command(
     'get-config',
     {
-      description: 'Get the Wireguard configuration of a peer in a Network Group',
+      description: 'Get the WireGuard configuration of a peer in a Network Group',
       args: [args.ngExternalIdOrLabel, args.ngIdOrLabel],
       options: [opts.humanJsonOutputFormat],
     },
@@ -1977,18 +1987,10 @@ async function run() {
     },
     database.listBackups,
   );
-  const databaseCommand = cliparse.command(
-    'database',
-    {
-      description: 'List available databases',
-      commands: [backupsCommand],
-    },
-    async () => {
-      console.info('This command is not available, you can try the following commands:');
-      console.info('clever database backups');
-      console.info('clever database backups download');
-    },
-  );
+  const databaseCommand = cliparse.command('database', {
+    description: 'Manage databases and backups',
+    commands: [backupsCommand],
+  });
 
   // Patch help command description
   cliparseCommands.helpCommand.description = 'Display help about the Clever Cloud CLI';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Command Line Interface for Clever Cloud.",
   "keywords": [
     "cli",

package/src/commands/addon.js

@@ -3,6 +3,7 @@ import { styleText } from '../lib/style-text.js';
 import { getAllEnvVars } from '@clevercloud/client/esm/api/v2/addon.js';
 import { toNameEqualsValueString } from '@clevercloud/client/esm/utils/env-vars.js';
 import dedent from 'dedent';
+import { getOperator } from '../clever-client/operators.js';
 import { formatTable } from '../format-table.js';
 import { Logger } from '../logger.js';
 import * as Addon from '../models/addon.js';
@@ -53,6 +54,45 @@ export async function list(params) {
   }
 }
 
+const ADDON_PROVIDERS = {
+  keycloak: {
+    name: 'Keycloak',
+    isOperator: true,
+    postCreateInstructions: `Learn more about Keycloak on Clever Cloud: ${conf.DOC_URL}/addons/keycloak/`,
+  },
+  kv: {
+    name: 'Materia KV',
+    isOperator: false,
+    status: 'beta',
+    postCreateInstructions: (addonId) => dedent`
+      ${styleText('yellow', "You can easily use Materia KV with 'redis-cli', with such commands:")}
+      ${styleText('blue', `source <(clever addon env ${addonId} -F shell)`)}
+      ${styleText('blue', 'redis-cli -h $KV_HOST -p $KV_PORT --tls')}
+      Learn more about Materia KV on Clever Cloud: ${conf.DOC_URL}/addons/materia-kv/
+    `,
+  },
+  'addon-matomo': {
+    name: 'Matomo',
+    isOperator: true,
+    postCreateInstructions: `Learn more about Matomo on Clever Cloud: ${conf.DOC_URL}/addons/matomo/`,
+  },
+  metabase: {
+    name: 'Metabase',
+    isOperator: true,
+    postCreateInstructions: `Learn more about Metabase on Clever Cloud: ${conf.DOC_URL}/addons/metabase/`,
+  },
+  otoroshi: {
+    name: 'Otoroshi with LLM',
+    isOperator: true,
+    postCreateInstructions: `Learn more about Otoroshi with LLM on Clever Cloud: ${conf.DOC_URL}/addons/otoroshi/`,
+  },
+  'addon-pulsar': {
+    name: 'Pulsar',
+    isOperator: false,
+    postCreateInstructions: `Learn more about Pulsar on Clever Cloud: ${conf.DOC_URL}/addons/pulsar/`,
+  },
+};
+
 export async function create(params) {
   const [providerName, name] = params.args;
   const {
@@ -62,23 +102,21 @@ export async function create(params) {
     yes: skipConfirmation,
     org: orgaIdOrName,
     format,
+    'addon-version': version,
+    option: addonOptions,
   } = params.options;
-  const version = params.options['addon-version'];
-  const addonOptions = parseAddonOptions(params.options.option);
-
-  const ownerId = orgaIdOrName != null ? await Organisation.getId(orgaIdOrName) : await User.getCurrentId();
 
   const addonToCreate = {
-    ownerId,
     name,
     providerName,
     planName,
     region,
     skipConfirmation,
     version,
-    addonOptions,
+    addonOptions: parseAddonOptions(addonOptions),
   };
 
+  const ownerId = orgaIdOrName != null ? await Organisation.getId(orgaIdOrName) : await User.getCurrentId();
   if (linkedAppAlias != null) {
     const linkedAppData = await AppConfig.getAppDetails({ alias: linkedAppAlias });
     if (orgaIdOrName != null && linkedAppData.ownerId !== ownerId && format === 'human') {
@@ -86,163 +124,98 @@ export async function create(params) {
         'The specified application does not belong to the specified organisation. Ignoring the `--org` option',
       );
     }
-    const newAddon = await Addon.create({
-      ...addonToCreate,
-      ownerId: linkedAppData.ownerId,
-    });
-    await Addon.link(linkedAppData.ownerId, linkedAppData.appId, { addon_id: newAddon.id });
-    displayAddon(
-      format,
-      newAddon,
-      providerName,
-      `Add-on created and linked to application ${linkedAppAlias} successfully!`,
-    );
+    addonToCreate.ownerId = linkedAppData.ownerId;
   } else {
-    const newAddon = await Addon.create(addonToCreate);
-    displayAddon(format, newAddon, providerName, 'Add-on created successfully!');
+    addonToCreate.ownerId = ownerId;
   }
-}
 
-function displayAddon(format, addon, providerName, message) {
-  const PROVIDERS_WITH_URL = {
-    keycloak: {
-      name: 'Keycloak',
-      urlEnv: 'CC_KEYCLOAK_URL',
-    },
-    'addon-matomo': {
-      name: 'Matomo',
-      urlEnv: 'MATOMO_URL',
-    },
-    metabase: {
-      name: 'Metabase',
-      urlEnv: 'METABASE_URL',
-    },
-    otoroshi: {
-      name: 'Otoroshi with LLM',
-      urlEnv: 'CC_OTOROSHI_URL',
-    },
-  };
+  const newAddon = await Addon.create(addonToCreate);
 
-  const WIP_PROVIDERS = {
-    keycloak: {
-      status: '',
-      postCreateInstructions: dedent`
-        Learn more about Keycloak on Clever Cloud: ${conf.DOC_URL}/addons/keycloak/,
-      `,
-    },
-    kv: {
-      status: 'alpha',
-      postCreateInstructions: dedent`
-        ${styleText('yellow', "You can easily use Materia KV with 'redis-cli', with such commands:")}
-        ${styleText('blue', `source <(clever addon env ${addon.id} -F shell)`)}
-        ${styleText('blue', 'redis-cli -h $KV_HOST -p $KV_PORT --tls')}
-        Learn more about Materia KV on Clever Cloud: ${conf.DOC_URL}/addons/materia-kv/
-      `,
-    },
-    'addon-matomo': {
-      status: '',
-      postCreateInstructions: dedent`
-        Learn more about Matomo on Clever Cloud: ${conf.DOC_URL}/addons/matomo/
-      `,
-    },
-    metabase: {
-      status: '',
-      postCreateInstructions: dedent`
-        Learn more about Metabase on Clever Cloud: ${conf.DOC_URL}/addons/metabase/
-      `,
-    },
-    otoroshi: {
-      status: '',
-      postCreateInstructions: dedent`
-        Learn more about Otoroshi with LLM on Clever Cloud: ${conf.DOC_URL}/addons/otoroshi/
-      `,
-    },
-    'addon-pulsar': {
-      status: 'beta',
-      postCreateInstructions: dedent`
-        Learn more about Pulsar on Clever Cloud: ${conf.DOC_URL}/addons/pulsar/
-      `,
-    },
-  };
+  if (linkedAppAlias != null) {
+    const linkedAppData = await AppConfig.getAppDetails({ alias: linkedAppAlias });
+    await Addon.link(linkedAppData.ownerId, linkedAppData.appId, { addon_id: newAddon.id });
+  }
 
-  let providerNameToShow = '';
+  const provider = ADDON_PROVIDERS[providerName];
   let statusMessage = '';
-  if (providerName in WIP_PROVIDERS && WIP_PROVIDERS[providerName].status !== '') {
-    providerNameToShow = providerName === 'kv' ? 'Materia KV' : providerName;
+  if (provider?.status) {
+    statusMessage = `The ${provider.name} provider is in ${provider.status} testing phase`;
+    if (provider.status === 'alpha') {
+      statusMessage += ". Don't store sensitive or production grade data.";
+    }
+  }
+
+  // JSON format
+  if (format === 'json') {
+    const jsonAddon = {
+      id: newAddon.id,
+      realId: newAddon.realId,
+      name: newAddon.name,
+      env: newAddon.env,
+    };
+
+    if (provider?.status) {
+      jsonAddon.availability = provider.status;
+      jsonAddon.message = statusMessage;
+    }
 
-    statusMessage = `The ${providerNameToShow} provider is in ${WIP_PROVIDERS[providerName].status} testing phase`;
-    statusMessage +=
-      WIP_PROVIDERS[providerName].status === 'alpha' ? ". Don't store sensitive or production grade data." : '';
+    Logger.printJson(jsonAddon);
+    return;
   }
 
-  switch (format) {
-    case 'json': {
-      const jsonAddon = {
-        id: addon.id,
-        realId: addon.realId,
-        name: addon.name,
-        env: addon.env,
-      };
+  // Human format
+  if (linkedAppAlias != null) {
+    Logger.println(`Add-on created and linked to application ${linkedAppAlias} successfully!`);
+  } else {
+    Logger.println('Add-on created successfully!');
+  }
 
-      Logger.printJson(
-        WIP_PROVIDERS[providerName] != null
-          ? { ...jsonAddon, availability: WIP_PROVIDERS[providerName].status, message: statusMessage }
-          : jsonAddon,
-      );
-      break;
-    }
+  Logger.println(`ID: ${newAddon.id}`);
+  Logger.println(`Real ID: ${newAddon.realId}`);
+  Logger.println(`Name: ${newAddon.name}`);
 
-    case 'human':
-    default:
-      Logger.println([message, `ID: ${addon.id}`, `Real ID: ${addon.realId}`, `Name: ${addon.name}`].join('\n'));
-
-      if (providerName in PROVIDERS_WITH_URL) {
-        const provider = PROVIDERS_WITH_URL[providerName];
-        const urlEnv = addon.env.find((entry) => entry.name === provider.urlEnv);
-        const urlToShow = urlEnv.value;
-        const urlToShowWithHttps = urlToShow.startsWith('http') ? urlToShow : `https://${urlToShow}`;
-
-        if (urlEnv) {
-          Logger.println();
-          Logger.println(`Your ${provider.name} is starting:`);
-          Logger.println(` - Access it: ${urlToShowWithHttps}`);
-          Logger.println(` - Manage it: ${conf.GOTO_URL}/${addon.id}`);
-        }
+  const operator = ADDON_PROVIDERS[providerName]?.isOperator
+    ? await getOperator({ provider: providerName, realId: newAddon.realId }).then(sendToApi)
+    : null;
 
-        if (providerName === 'keycloak') {
-          Logger.println();
-          Logger.println(
-            "An initial account has been created, you'll be invited to change the password at first login:",
-          );
-          Logger.println(` - Admin user name: ${addon.env.find((e) => e.name === 'CC_KEYCLOAK_ADMIN').value}`);
-          Logger.println(
-            ` - Temporary password: ${addon.env.find((e) => e.name === 'CC_KEYCLOAK_ADMIN_DEFAULT_PASSWORD').value}`,
-          );
-        }
+  if (operator) {
+    if (operator.accessUrl) {
+      Logger.println();
+      Logger.println(`Your ${ADDON_PROVIDERS[providerName].name} is starting:`);
+      Logger.println(` - Access it: ${operator.accessUrl}`);
+      Logger.println(` - Manage it: ${conf.GOTO_URL}/${newAddon.id}`);
+    }
 
-        if (providerName === 'otoroshi') {
-          Logger.println();
-          Logger.println(
-            'An initial account has been created, change the password at first login (Security -> Administrators -> Edit user):',
-          );
-          Logger.println(
-            ` - Admin user name: ${addon.env.find((e) => e.name === 'CC_OTOROSHI_INITIAL_ADMIN_LOGIN').value}`,
-          );
-          Logger.println(
-            ` - Initial password: ${addon.env.find((e) => e.name === 'CC_OTOROSHI_INITIAL_ADMIN_PASSWORD').value}`,
-          );
-        }
+    if (operator.initialCredentials) {
+      if (providerName === 'keycloak') {
+        Logger.println();
+        Logger.println("An initial account has been created, you'll be invited to change the password at first login:");
+        Logger.println(` - Admin user name: ${operator.initialCredentials.user}`);
+        Logger.println(` - Temporary password: ${operator.initialCredentials.password}`);
       }
-
-      if (providerName in WIP_PROVIDERS) {
+      if (providerName === 'otoroshi') {
         Logger.println();
+        Logger.println(
+          'An initial account has been created, change the password at first login (Security -> Administrators -> Edit user):',
+        );
+        Logger.println(` - Admin user name: ${operator.initialCredentials.user}`);
+        Logger.println(` - Password: ${operator.initialCredentials.password}`);
+      }
+    }
+  }
 
-        if (statusMessage !== '') {
-          Logger.println(styleText('yellow', `/!\\ ${statusMessage}`));
-        }
+  if (provider?.postCreateInstructions) {
+    Logger.println();
 
-        Logger.println(WIP_PROVIDERS[providerName].postCreateInstructions);
-      }
+    if (statusMessage !== '') {
+      Logger.println(styleText('yellow', `/!\\ ${statusMessage}`));
+    }
+
+    if (typeof provider.postCreateInstructions === 'function') {
+      Logger.println(provider.postCreateInstructions(newAddon.id));
+    } else {
+      Logger.println(provider.postCreateInstructions);
+    }
   }
 }
 

package/src/commands/diag.js

@@ -17,11 +17,9 @@ export async function diag(params) {
     if (authDetails.token == null) {
       return 'not connected';
     }
-
     if (userId == null) {
       return 'authentication failed';
     }
-
     return 'authenticated';
   }
 
@@ -32,7 +30,8 @@ export async function diag(params) {
     platform: os.platform(),
     release: os.release(),
     arch: process.arch,
-    shell: process.env.SHELL,
+    shell: getShell(),
+    terminal: getTerminal(),
     isPackaged: process.pkg != null,
     execPath: process.execPath,
     configFile: conf.CONFIGURATION_FILE,
@@ -69,7 +68,8 @@ export async function diag(params) {
         Logger.println('Linux         ' + styleText('green', formattedDiag.linuxInfos));
       }
       Logger.println('Shell         ' + styleText('green', formattedDiag.shell));
-      Logger.println('Packaged      ' + styleText('green', String(formattedDiag.isPackaged)));
+      Logger.println('Terminal      ' + styleText('green', formattedDiag.terminal));
+      Logger.println('Packaged      ' + styleText('green', formattedDiag.isPackaged));
       Logger.println('Exec path     ' + styleText('green', formattedDiag.execPath));
       Logger.println('Config file   ' + styleText('green', formattedDiag.configFile));
 
@@ -95,3 +95,32 @@ export async function diag(params) {
     }
   }
 }
+
+function getShell() {
+  const platform = os.platform();
+
+  if (platform === 'win32') {
+    if (process.env.PSModulePath) {
+      if (process.env.WT_SESSION) {
+        return 'PowerShell (Windows Terminal)';
+      }
+      if (process.env.PSVersionTable || process.env.POWERSHELL_DISTRIBUTION_CHANNEL) {
+        return 'PowerShell Core';
+      }
+      return 'Windows PowerShell';
+    }
+    if (process.env.WT_SESSION) {
+      return 'Windows Terminal (cmd)';
+    }
+    return process.env.ComSpec || 'cmd.exe';
+  }
+
+  return process.env.SHELL || 'unknown';
+}
+
+function getTerminal() {
+  if (process.env.WT_SESSION) {
+    return 'Windows Terminal';
+  }
+  return process.env.TERM_PROGRAM || process.env.TERMINAL_EMULATOR || process.env.TERM;
+}

package/src/commands/ng.js

@@ -47,7 +47,7 @@ export async function deleteNg(params) {
  * @param {Object} params
  * @param {Object} params.args[0] External peer ID or label
  * @param {Object} params.args[1] Network Group ID or label
- * @param {string} params.args[2] Wireguard public key
+ * @param {string} params.args[2] WireGuard public key
  * @param {Object} params.options.org Organisation ID or name
  */
 export async function createExternalPeer(params) {

package/src/experimental-features.js

@@ -3,7 +3,7 @@ import { conf } from './models/configuration.js';
 
 export const EXPERIMENTAL_FEATURES = {
   kv: {
-    status: 'alpha',
+    status: 'beta',
     description:
       'Send commands to databases such as Materia KV or Redis® directly from Clever Tools, without other dependencies',
     instructions: dedent`
@@ -20,20 +20,20 @@ export const EXPERIMENTAL_FEATURES = {
   },
   ng: {
     status: 'beta',
-    description: 'Manage Network Groups to manage applications, add-ons, external peers through a Wireguard network',
+    description: 'Manage Network Groups to manage applications, add-ons, external peers through a WireGuard network',
     instructions: dedent`
       - Create a Network Group:
           clever ng create myNG
       - Create a Network Group with members (application, database add-on):
-          clever ng create myNG --link app_xxx,addon_xxx
+          clever ng create myNG --link app_xxx,postgresql_xxx
       - List Network Groups:
           clever ng
       - Delete a Network Group:
           clever ng delete myNG
       - (Un)Link an application or a database add-on to an existing Network Group:
           clever ng link app_xxx myNG
-          clever ng unlink addon_xxx myNG
-      - Get the Wireguard configuration of a peer:
+          clever ng unlink postgresql_xxx myNG
+      - Get the WireGuard configuration of a peer:
           clever ng get-config peerIdOrLabel myNG
       - Get details about a Network Group, a member or a peer:
           clever ng get myNg

package/src/models/log-v4.js

@@ -65,7 +65,7 @@ export async function displayLogs(params) {
           jsonArray.push(log);
           return;
         case 'json-stream':
-          Logger.printJson(log);
+          Logger.println(JSON.stringify(log));
           return;
         case 'human':
         default:

package/src/models/ng-resources.js

@@ -1,10 +1,10 @@
-import { getSummary } from '@clevercloud/client/esm/api/v2/user.js';
 import * as networkGroupApi from '@clevercloud/client/esm/api/v4/network-group.js';
 import crypto from 'node:crypto';
 import { setTimeout } from 'node:timers/promises';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import * as networkGroup from './ng.js';
+import { NG_MEMBER_PREFIXES } from './ng.js';
 import { sendToApi } from './send-to-api.js';
 
 /**
@@ -128,14 +128,16 @@ export async function deleteExternalPeerWithParent(ngIdOrLabel, peerIdOrLabel, o
 
 /**
  * Link a Member to a Network Group
- * @param {object} ngIdOrLabel The Network group ID or Label
+ * @param {object} ngIdOrLabel The Network Group ID or Label
  * @param {string} memberId ID of the Member to link
  * @param {object} org Organisation ID or name
  * @param {string} label Label of the Member
  */
 export async function linkMember(ngIdOrLabel, memberId, org, label) {
   if (!memberId) {
-    throw new Error('A valid member ID is required (addon_xxx, app_xxx, external_xxx)');
+    throw new Error(
+      'A valid member ID is required (app_xxx, external_xxx, mysql_xxx, postgresql_xxx, redis_xxx, etc.)',
+    );
   }
 
   const [ng] = await networkGroup.searchNgOrResource(ngIdOrLabel, org, 'NetworkGroup');
@@ -144,7 +146,7 @@ export async function linkMember(ngIdOrLabel, memberId, org, label) {
     throw new Error(`Network Group ${styleText('red', ngIdOrLabel.ngId || ngIdOrLabel.ngResourceLabel)} not found`);
   }
 
-  await checkMembersToLink([memberId], ng.ownerId);
+  checkMembersToLink([memberId]);
 
   const alreadyMember = ng.members.find((m) => m.id === memberId);
   if (alreadyMember) {
@@ -186,7 +188,9 @@ export async function linkMember(ngIdOrLabel, memberId, org, label) {
  */
 export async function unlinkMember(ngIdOrLabel, memberId, org) {
   if (!memberId) {
-    throw new Error('A valid member ID is required (addon_xxx, app_xxx, external_xxx)');
+    throw new Error(
+      'A valid member ID is required (app_xxx, external_xxx, mysql_xxx, postgresql_xxx, redis_xxx, etc.)',
+    );
   }
 
   const [ng] = await networkGroup.searchNgOrResource(ngIdOrLabel, org, 'NetworkGroup');
@@ -215,39 +219,23 @@ export async function unlinkMember(ngIdOrLabel, memberId, org) {
 
 /**
  * Check if members can be linked to a Network Group
- * @param {Array<string>} members Members to check
+ * @param {Array<string>} memberIds Members to check
  * @throws {Error} If members can't be linked to a Network Group
  */
-export async function checkMembersToLink(members, ownerId) {
-  const VALID_ADDON_PROVIDERS = ['es-addon', 'mongodb-addon', 'mysql-addon', 'postgresql-addon', 'redis-addon'];
-
-  const summary = await getSummary().then(sendToApi);
-
-  let data = summary.user;
-  if (summary.user.id !== ownerId) {
-    data = summary.organisations.find((o) => o.id === ownerId);
-  }
-
+export function checkMembersToLink(memberIds) {
+  const validPrefixes = Object.keys(NG_MEMBER_PREFIXES);
   const membersNotOK = [];
-  let source = data.applications;
-
-  for (const memberId of members) {
-    if (memberId.startsWith('addon_')) {
-      source = data.addons;
-    }
-
-    const foundRessource = source.find((r) => r.id === memberId);
 
-    if (foundRessource && memberId.startsWith('addon_') && !VALID_ADDON_PROVIDERS.includes(foundRessource.providerId)) {
-      membersNotOK.push(memberId);
-    } else if (!foundRessource && !memberId.startsWith('external_')) {
+  for (const memberId of memberIds) {
+    const hasValidPrefix = validPrefixes.some((prefix) => memberId.startsWith(prefix));
+    if (!hasValidPrefix) {
       membersNotOK.push(memberId);
     }
   }
 
   if (membersNotOK.length > 0) {
     throw new Error(
-      `Member(s) ${styleText('red', membersNotOK.join(', '))} can't be linked to the Network Group, check Organisation ID or name`,
+      `Member(s) ${styleText('red', membersNotOK.join(', '))} can't be linked to the Network Group, check member ID format`,
     );
   }
 }

package/src/models/ng.js

@@ -17,9 +17,13 @@ import * as User from './user.js';
 export const POLLING_TIMEOUT_MS = 30_000;
 export const POLLING_INTERVAL_MS = 1000;
 export const DOMAIN = 'cc-ng.cloud';
-const TYPE_PREFIXES = {
+export const NG_MEMBER_PREFIXES = {
   app_: 'APPLICATION',
-  addon_: 'ADDON',
+  elasticsearch_: 'ADDON',
+  mongodb_: 'ADDON',
+  mysql_: 'ADDON',
+  postgresql_: 'ADDON',
+  redis_: 'ADDON',
   external_: 'EXTERNAL',
 };
 
@@ -37,7 +41,7 @@ export async function create(label, description, tags, membersIds, orgaIdOrName)
   const ownerId = await getOwnerIdFromOrgaIdOrName(orgaIdOrName);
 
   if (membersIds?.length > 0) {
-    await checkMembersToLink(membersIds, ownerId);
+    checkMembersToLink(membersIds);
   }
 
   const members = constructMembers(id, membersIds || []);
@@ -72,11 +76,11 @@ export async function destroy(ngIdOrLabel, orgaIdOrName) {
 }
 
 /**
- * Get the Wireguard configuration of a Network Group peer
+ * Get the WireGuard configuration of a Network Group peer
  * @param {object} peerIdOrLabel The Peer ID or Label
  * @param {object} ngIdOrLabel The Network Group ID or Label
  * @param {object} orgaIdOrName The owner ID or name
- * @returns {Promise<Object>} The Peer Wireguard configuration
+ * @returns {Promise<Object>} The Peer WireGuard configuration
  * @throws {Error} If the Peer is not found
  * @throws {Error} If the Network Group is not found
  * @throws {Error} If the Peer is not in the Network Group
@@ -116,7 +120,7 @@ export async function getPeerConfig(peerIdOrLabel, ngIdOrLabel, orgaIdOrName) {
 }
 
 /**
- * Get a Network group from an owner with members and peers
+ * Get a Network Group from an owner with members and peers
  * @param {string} networkGroupId The Network Group ID
  * @param {string} orgaIdOrName The owner ID or name
  * @returns {Promise<Array<Object>>} The Network Groups
@@ -187,7 +191,7 @@ export async function searchNgOrResource(idOrLabel, orgaIdOrName, type = 'all',
 
   if (filtered.length > 1 && type !== 'all') {
     throw new Error(`Multiple resources found for ${styleText('red', query)}, use ID instead:
-${filtered.map((f) => ` • ${f.id} ${styleText('grey', `(${f.label} - ${f.type})`)}`).join('\n')}`);
+${filtered.map((f) => ` • ${f.id} ${styleText('grey', `(${f.domainName || f.label} - ${f.type})`)}`).join('\n')}`);
   }
 
   // Deduplicate results
@@ -203,14 +207,9 @@ ${filtered.map((f) => ` • ${f.id} ${styleText('grey', `(${f.label} - ${f.type}
 export function constructMembers(ngId, membersIds) {
   return membersIds.map((id) => {
     const domainName = `${id}.m.${ngId}.${DOMAIN}`;
-    const prefixToType = TYPE_PREFIXES;
-
-    return {
-      id,
-      domainName,
-      // Get kind from prefix match in id (app_*, addon_*, external_*) or default to 'APPLICATION'
-      kind: prefixToType[Object.keys(prefixToType).find((p) => id.startsWith(p))] ?? TYPE_PREFIXES.app_,
-    };
+    const prefix = Object.keys(NG_MEMBER_PREFIXES).find((p) => id.startsWith(p));
+    const kind = NG_MEMBER_PREFIXES[prefix];
+    return { id, domainName, kind };
   });
 }
 

package/src/parsers.js

@@ -1,6 +1,7 @@
 import cliparse from 'cliparse';
 import ISO8601 from 'iso8601-duration';
 import * as Application from './models/application.js';
+import { NG_MEMBER_PREFIXES } from './models/ng.js';
 
 const addonOptionsRegex = /^[\w-]+=.+$/;
 
@@ -225,12 +226,12 @@ function parseSimpleDuration(durationStr) {
   }
 }
 
-// Network groups parsers
+// Network Groups parsers
 export function ngResourceType(string) {
   if (string.startsWith('ng_')) {
     return cliparse.parsers.success({ ngId: string });
   }
-  if (string.startsWith('app_') || string.startsWith('addon_') || string.startsWith('external_')) {
+  if (Object.keys(NG_MEMBER_PREFIXES).some((prefix) => string.startsWith(prefix))) {
     return cliparse.parsers.success({ memberId: string });
   }
   return cliparse.parsers.success({ ngResourceLabel: string });