clever-tools 4.0.2 → 4.2.0

package/src/commands/domain.js

@@ -39,15 +39,24 @@ function getFavouriteDomain({ ownerId, appId }) {
 }
 
 export async function list(params) {
-  const { alias, app: appIdOrName } = params.options;
+  const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
   const app = await getApp({ id: ownerId, appId }).then(sendToApi);
   const favouriteDomain = await getFavouriteDomain({ ownerId, appId });
-  return app.vhosts.forEach(({ fqdn }) => {
-    const prefix = fqdn === favouriteDomain ? '* ' : '  ';
-    Logger.println(prefix + fqdn);
-  });
+
+  const domains = app.vhosts.map((vhost) => getDomainObject(vhost.fqdn, favouriteDomain));
+
+  switch (format) {
+    case 'json':
+      Logger.printJson(domains);
+      break;
+    default:
+      domains.forEach((domain) => {
+        Logger.println(`${domain.isFavourite ? '* ' : '  '}${domain.domainWithPathPrefix}`);
+      });
+      break;
+  }
 }
 
 export async function add(params) {
@@ -61,16 +70,23 @@ export async function add(params) {
 }
 
 export async function getFavourite(params) {
-  const { alias, app: appIdOrName } = params.options;
+  const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
   const favouriteDomain = await getFavouriteDomain({ ownerId, appId });
 
-  if (favouriteDomain == null) {
-    return Logger.println('No favourite domain set');
+  switch (format) {
+    case 'json':
+      const domain = getDomainObject(favouriteDomain, favouriteDomain);
+      Logger.printJson(domain);
+      break;
+    default:
+      if (favouriteDomain == null) {
+        return Logger.println('No favourite domain set');
+      }
+      Logger.println(favouriteDomain);
+      break;
   }
-
-  return Logger.println(favouriteDomain);
 }
 
 export async function setFavourite(params) {
@@ -258,6 +274,21 @@ export async function overview(params) {
   }
 }
 
+function getDomainObject(domainWithPathPrefix, favouriteDomain) {
+  const parsed = parseDomain(domainWithPathPrefix, { validateHostname: false });
+  return {
+    domainWithPathPrefix,
+    domain: parsed.domain,
+    domainWithoutSuffix: parsed.domainWithoutSuffix,
+    hostname: parsed.hostname,
+    publicSuffix: parsed.publicSuffix,
+    subdomain: parsed.subdomain,
+    isApex: parsed.subdomain === '',
+    pathPrefix: new URL('https://' + domainWithPathPrefix).pathname,
+    isFavourite: domainWithPathPrefix === favouriteDomain,
+  };
+}
+
 /** @param {DomainDiag & { resolvedDnsConfig: ResolveDnsResult }} domainDiag */
 function reportDomainDiagnostics({ hostname, pathPrefix, resolvedDnsConfig, diagDetails, diagSummary }) {
   const validDiags = diagDetails.filter((diag) => diag.code === 'valid-a');
@@ -274,20 +305,20 @@ function reportDomainDiagnostics({ hostname, pathPrefix, resolvedDnsConfig, diag
 
   switch (diagSummary) {
     case 'managed':
-      printlnWithIndent(styleText('green', '✔ Managed by Clever Cloud'), 2);
-      printlnWithIndent('ⓘ cleverapps.io domains should only be used for testing purposes', 2);
+      Logger.printlnWithIndent(styleText('green', '✔ Managed by Clever Cloud'), 2);
+      Logger.printlnWithIndent('ⓘ cleverapps.io domains should only be used for testing purposes', 2);
       break;
     case 'no-config':
-      printlnWithIndent(styleText('red', '✘ No DNS configuration found'), 2);
+      Logger.printlnWithIndent(styleText('red', '✘ No DNS configuration found'), 2);
       break;
     case 'valid':
-      printlnWithIndent(styleText('green', '✔ Your configuration is valid'), 2);
+      Logger.printlnWithIndent(styleText('green', '✔ Your configuration is valid'), 2);
       break;
     case 'invalid':
-      printlnWithIndent(styleText('red', '✘ Something is wrong with your configuration'), 2);
+      Logger.printlnWithIndent(styleText('red', '✘ Something is wrong with your configuration'), 2);
       break;
     case 'incomplete':
-      printlnWithIndent(styleText('yellow', '⚠ Your configuration is incomplete'), 2);
+      Logger.printlnWithIndent(styleText('yellow', '⚠ Your configuration is incomplete'), 2);
       break;
   }
 
@@ -296,15 +327,15 @@ function reportDomainDiagnostics({ hostname, pathPrefix, resolvedDnsConfig, diag
     Logger.println('');
     validDiags.forEach((diag) => {
       const source = hasCnameRecord ? `(from CNAME ${resolvedDnsConfig.cnameRecords[0]}.)` : '';
-      printlnWithIndent(`${diag.record.value} ${styleText('green', '✔ A Record OK')} ${source}`, 2);
+      Logger.printlnWithIndent(`${diag.record.value} ${styleText('green', '✔ A Record OK')} ${source}`, 2);
     });
   }
 
   // Replace A with CNAME
   if (diagSummary === 'valid' && suggestedCname != null) {
     Logger.println('');
-    printlnWithIndent('ⓘ You can replace your A records with this CNAME:', 2);
-    printlnWithIndent(suggestedCname.record.value, 6);
+    Logger.printlnWithIndent('ⓘ You can replace your A records with this CNAME:', 2);
+    Logger.printlnWithIndent(suggestedCname.record.value, 6);
   }
 
   // Replace A Records with CNAME
@@ -312,51 +343,51 @@ function reportDomainDiagnostics({ hostname, pathPrefix, resolvedDnsConfig, diag
     const cnameToUse = suggestedCname != null ? suggestedCname.record.value : missingCname.record.value;
 
     Logger.println('');
-    printlnWithIndent('⇄ Replace your A records with this CNAME:', 2);
-    printlnWithIndent(cnameToUse, 6);
+    Logger.printlnWithIndent('⇄ Replace your A records with this CNAME:', 2);
+    Logger.printlnWithIndent(cnameToUse, 6);
     Logger.println('');
-    printlnWithIndent('or:', 2);
+    Logger.printlnWithIndent('or:', 2);
   }
 
   // Replace unknown CNAME with missing CNAME
   if (diagSummary === 'invalid' && missingCname != null && unknownCname != null) {
     Logger.println('');
-    printlnWithIndent('➖Remove this CNAME record:', 2);
-    printlnWithIndent(unknownCname.record.value + '. ', 6);
+    Logger.printlnWithIndent('➖Remove this CNAME record:', 2);
+    Logger.printlnWithIndent(unknownCname.record.value + '. ', 6);
     Logger.println('');
-    printlnWithIndent('➕Add this CNAME record instead:', 2);
-    printlnWithIndent(missingCname.record.value, 6);
+    Logger.printlnWithIndent('➕Add this CNAME record instead:', 2);
+    Logger.printlnWithIndent(missingCname.record.value, 6);
 
     if (hasARecords) {
       Logger.println('');
-      printlnWithIndent('or:', 2);
+      Logger.printlnWithIndent('or:', 2);
     }
   }
 
   // Add CNAME
   if (diagSummary === 'no-config' && missingCname != null) {
     Logger.println('');
-    printlnWithIndent('➕Add this CNAME record:', 2);
-    printlnWithIndent(missingCname.record.value, 6);
+    Logger.printlnWithIndent('➕Add this CNAME record:', 2);
+    Logger.printlnWithIndent(missingCname.record.value, 6);
   }
 
   // Remove Unknown records
   if (unknownDiags.length > 0) {
     Logger.println('');
-    printlnWithIndent('➖Remove these A records:', 2);
+    Logger.printlnWithIndent('➖Remove these A records:', 2);
 
     unknownDiags.forEach((diag) => {
       const source = hasCnameRecord ? `(from CNAME ${resolvedDnsConfig.cnameRecords[0]}.)` : '';
-      printlnWithIndent(`${diag.record.value} ${source}`, 6);
+      Logger.printlnWithIndent(`${diag.record.value} ${source}`, 6);
     });
   }
 
   // Add missing A records
   if (missingDiags.length > 0) {
     Logger.println('');
-    printlnWithIndent('➕Add these A records:', 2);
+    Logger.printlnWithIndent('➕Add these A records:', 2);
 
-    missingDiags.forEach((missingDiag) => printlnWithIndent(missingDiag.record.value, 6));
+    missingDiags.forEach((missingDiag) => Logger.printlnWithIndent(missingDiag.record.value, 6));
   }
 }
 
@@ -375,16 +406,6 @@ function getParsedDomains(vhosts) {
   });
 }
 
-/**
- * Prints a line of text with specified indentation.
- *
- * @param {string} text - The text to be printed.
- * @param {number} indentLevel - The number of spaces to indent the text.
- */
-function printlnWithIndent(text, indentLevel) {
-  Logger.println(' '.repeat(indentLevel) + text);
-}
-
 function recursiveSort(obj) {
   if (typeof obj === 'object' && obj.appId != null) {
     return obj;
@@ -407,15 +428,15 @@ function recursiveSort(obj) {
 
 function recursiveDisplay(obj, indentLevel = 0) {
   if (typeof obj === 'object' && obj.appId != null) {
-    printlnWithIndent(`${obj.ownerName} | ${obj.appName} (${obj.appVariantSlug})`, indentLevel);
-    printlnWithIndent(styleText('blue', obj.appConsoleUrl), indentLevel);
+    Logger.printlnWithIndent(`${obj.ownerName} | ${obj.appName} (${obj.appVariantSlug})`, indentLevel);
+    Logger.printlnWithIndent(styleText('blue', obj.appConsoleUrl), indentLevel);
     return;
   }
 
   for (const [propertyPath, subObj] of Object.entries(obj)) {
     if (propertyPath !== '/') {
       Logger.println('');
-      printlnWithIndent(styleText('yellow', propertyPath), indentLevel);
+      Logger.printlnWithIndent(styleText('yellow', propertyPath), indentLevel);
       recursiveDisplay(subObj, indentLevel + 2);
     } else {
       recursiveDisplay(subObj, indentLevel);

package/src/commands/emails.js

@@ -1,13 +1,12 @@
 import {
   todo_addEmailAddress as addEmailAddress,
-  todo_getEmailAddresses as getEmailAddresses,
   todo_removeEmailAddress as removeEmailAddress,
 } from '@clevercloud/client/esm/api/v2/user.js';
 import { confirm } from '../lib/prompts.js';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
+import { getUserEmailAddresses } from '../models/emails.js';
 import { sendToApi } from '../models/send-to-api.js';
-import * as User from '../models/user.js';
 import { openBrowser } from '../models/utils.js';
 
 /**
@@ -155,16 +154,3 @@ export async function removeAllSecondary(params) {
 export function openConsole() {
   return openBrowser('/users/me/emails', 'Opening the email addresses management page of the Console in your browser');
 }
-
-/**
- * Get the primary and secondary email addresses of the current user
- * @returns {Promise<{ primary: string, secondary: string[] }>} The primary and secondary email addresses of the current user
- */
-async function getUserEmailAddresses() {
-  const currentUser = await User.getCurrent();
-  const secondaryAddresses = await getEmailAddresses().then(sendToApi);
-  return {
-    primary: currentUser.email,
-    secondary: secondaryAddresses.sort(),
-  };
-}

package/src/commands/link.js

@@ -6,15 +6,15 @@ export async function link(params) {
   const [app] = params.args;
   const { org: orgaIdOrName, alias } = params.options;
 
+  let appConfigEntry;
   if (app.app_id != null && orgaIdOrName != null) {
     Logger.warn("You've specified a unique application ID, organisation option will be ignored");
-    await Application.linkRepo(app, null, alias);
+    appConfigEntry = await Application.linkRepo(app, null, alias);
   } else {
-    await Application.linkRepo(app, orgaIdOrName, alias);
+    appConfigEntry = await Application.linkRepo(app, orgaIdOrName, alias);
   }
 
-  const linkedMessage = alias ? ` to local alias ${styleText('green', alias)}` : '';
   Logger.printSuccess(
-    `Application ${styleText('green', app.app_name || app.app_id)} has been successfully linked${linkedMessage}!`,
+    `Application ${styleText('green', appConfigEntry.app_id)} has been successfully linked to local alias ${styleText('green', appConfigEntry.alias)}!`,
   );
 }

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/commands/ssh-keys.js

@@ -1,14 +1,11 @@
-import {
-  todo_addSshKey as addSshKey,
-  todo_getSshKeys as getSshKeys,
-  todo_removeSshKey as removeSshKey,
-} from '@clevercloud/client/esm/api/v2/user.js';
+import { todo_addSshKey as addSshKey, todo_removeSshKey as removeSshKey } from '@clevercloud/client/esm/api/v2/user.js';
 import dedent from 'dedent';
 import fs from 'node:fs';
 import { confirm } from '../lib/prompts.js';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import { sendToApi } from '../models/send-to-api.js';
+import { getUserSshKeys } from '../models/ssh-keys.js';
 import { openBrowser } from '../models/utils.js';
 
 /**
@@ -145,11 +142,3 @@ export async function removeAll(params) {
 export function openConsole() {
   return openBrowser('/users/me/ssh-keys', 'Opening the SSH keys management page of the Console in your browser');
 }
-
-/**
- * @return {Promise<Array<{ name: string, key: string, fingerprint: string }>>}
- */
-async function getUserSshKeys() {
-  const rawKeys = await getSshKeys().then(sendToApi);
-  return rawKeys.sort((a, b) => a.name.localeCompare(b.name));
-}

package/src/commands/status.js

@@ -27,6 +27,7 @@ export async function status(params) {
           : styleText(['bold', 'red'], 'stopped');
 
       Logger.println(`${status.name}: ${statusMessage}`);
+      Logger.println(`Type: ${status.type.name}`);
       Logger.println(`Executed as: ${styleText('bold', status.lifetime)}`);
       if (status.deploymentInProgress) {
         Logger.println(
@@ -67,6 +68,10 @@ function computeStatus(instances, app) {
   const status = {
     id: app.id,
     name: app.name,
+    type: {
+      name: app.instance.variant.name,
+      slug: app.instance.variant.slug,
+    },
     lifetime: app.instance.lifetime,
     status: isUp ? 'running' : 'stopped',
     commit: upCommit,

package/src/commands/tcp-redirs.js

@@ -1,6 +1,4 @@
 import { addTcpRedir, getTcpRedirs, removeTcpRedir } from '@clevercloud/client/esm/api/v2/application.js';
-import { confirm } from '../lib/prompts.js';
-import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import * as Application from '../models/application.js';
 import * as Namespaces from '../models/namespaces.js';
@@ -64,37 +62,10 @@ export async function list(params) {
   }
 }
 
-async function acceptPayment(result, skipConfirmation) {
-  if (!skipConfirmation) {
-    result.lines.forEach(({ description, VAT, price }) =>
-      Logger.println(`${description}\tVAT: ${VAT}%\tPrice: ${price}€`),
-    );
-    Logger.println(`Total (without taxes): ${result.totalHT}€`);
-    Logger.println(styleText('bold', `Total (with taxes): ${result.totalTTC}€`));
-
-    await confirm(
-      `You're about to pay ${result.totalTTC}€, confirm?`,
-      'No confirmation, aborting TCP redirection creation',
-    );
-  }
-}
-
 export async function add(params) {
-  const { alias, app: appIdOrName, namespace, yes: skipConfirmation } = params.options;
+  const { alias, app: appIdOrName, namespace } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
-
-  const { port } = await addTcpRedir({ id: ownerId, appId }, { namespace })
-    .then(sendToApi)
-    .catch((error) => {
-      if (error.status === 402) {
-        return acceptPayment(error.response.body, skipConfirmation).then(() => {
-          return addTcpRedir({ id: ownerId, appId, payment: 'accepted' }, { namespace }).then(sendToApi);
-        });
-      } else {
-        throw error;
-      }
-    });
-
+  const { port } = await addTcpRedir({ id: ownerId, appId }, { namespace }).then(sendToApi);
   Logger.println('Successfully added tcp redirection on port: ' + port);
 }
 

package/src/commands/tokens.js

@@ -1,5 +1,6 @@
 import dedent from 'dedent';
 import { createApiToken, deleteApiToken, listApiTokens } from '../clever-client/auth-bridge.js';
+import { formatDate } from '../lib/format-date.js';
 import { promptSecret } from '../lib/prompts.js';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
@@ -141,7 +142,3 @@ export async function revoke(params) {
 
   Logger.println(styleText('green', '✔'), 'API token successfully revoked!');
 }
-
-function formatDate(dateInput) {
-  return new Date(dateInput).toISOString().substring(0, 16).replace('T', ' ');
-}

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/lib/format-date.js

@@ -0,0 +1,3 @@
+export function formatDate(dateInput) {
+  return new Date(dateInput).toISOString().substring(0, 16).replace('T', ' ');
+}

package/src/logger.js

@@ -58,6 +58,16 @@ export const Logger = _(['debug', 'info', 'warn', 'error'])
 // No decoration for Logger.println
 Logger.println = console.log;
 
+/**
+ * Prints a line of text with specified indentation.
+ *
+ * @param {string} text - The text to be printed.
+ * @param {number} indentLevel - The number of spaces to indent the text.
+ */
+Logger.printlnWithIndent = (text, indentLevel) => {
+  Logger.println(' '.repeat(indentLevel) + text);
+};
+
 // Logger for success with a green check before the message
 Logger.printSuccess = (message) => console.log(`${styleText(['bold', 'green'], '✓')} ${message}`);
 

package/src/models/app_configuration.js

@@ -2,6 +2,7 @@ import _ from 'lodash';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { slugify } from '../lib/slugify.js';
+import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import { conf } from './configuration.js';
 import * as User from './user.js';
@@ -39,14 +40,17 @@ export async function addLinkedApplication(appData, alias, ignoreParentConfig) {
   };
 
   const isPresent = currentConfig.apps.find((app) => app.app_id === appEntry.app_id) != null;
-
-  // ToDo see what to do when there is a conflict between an existing entry
-  // and the entry we want to add (same app_id, different other values)
-  if (!isPresent) {
-    currentConfig.apps.push(appEntry);
+  if (isPresent) {
+    throw new Error(
+      `Application ${styleText('red', appEntry.app_id)} is already linked with alias ${styleText('red', appEntry.alias)}`,
+    );
   }
 
-  return persistConfig(currentConfig);
+  currentConfig.apps.push(appEntry);
+
+  return persistConfig(currentConfig).then(() => {
+    return appEntry;
+  });
 }
 
 export async function removeLinkedApplication({ appId, alias }) {

package/src/models/emails.js

@@ -0,0 +1,16 @@
+import { todo_getEmailAddresses as getEmailAddresses } from '@clevercloud/client/esm/api/v2/user.js';
+import { sendToApi } from './send-to-api.js';
+import * as User from './user.js';
+
+/**
+ * Get the primary and secondary email addresses of the current user
+ * @returns {Promise<{ primary: string, secondary: string[] }>} The primary and secondary email addresses of the current user
+ */
+export async function getUserEmailAddresses() {
+  const currentUser = await User.getCurrent();
+  const secondaryAddresses = await getEmailAddresses().then(sendToApi);
+  return {
+    primary: currentUser.email,
+    secondary: secondaryAddresses.sort(),
+  };
+}

package/src/models/log-v4.js

@@ -17,7 +17,8 @@ const THROTTLE_PER_IN_MILLISECONDS = 100;
 
 const retryConfiguration = {
   enabled: true,
-  maxRetryCount: 6,
+  initRetryTimeout: 3000,
+  maxRetryCount: 10,
 };
 
 export async function displayLogs(params) {
@@ -64,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`,
     );
   }
 }