clever-tools 4.1.0 → 4.3.0

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/k8s.js

@@ -0,0 +1,193 @@
+import { typewriterLogo } from '../lib/ascii.js';
+import {
+  getK8sCluster,
+  isK8sClusterActive,
+  k8sAddPersistentStorage,
+  k8sCreate,
+  k8sDelete,
+  k8sGetConfig,
+  k8sList,
+} from '../lib/k8s.js';
+import { confirm } from '../lib/prompts.js';
+import { styleText } from '../lib/style-text.js';
+import { Logger } from '../logger.js';
+
+const DEPLOY_POLL_DELAY_MS = 10000;
+
+export async function create(params) {
+  const clusterName = params.args[0];
+  const orgIdOrName = params.options.org;
+
+  try {
+    const cluster = await k8sCreate(clusterName, orgIdOrName);
+
+    if (params.options.watch) {
+      await typewriterLogo();
+
+      let deployedCluster = cluster;
+      while (deployedCluster.status !== 'ACTIVE' && deployedCluster.status !== 'FAILED') {
+        Logger.println(
+          `⏳ Cluster status: ${styleText('yellow', deployedCluster.status)}. Waiting for ${DEPLOY_POLL_DELAY_MS / 1000}s before checking again...`,
+        );
+        await new Promise((resolve) => setTimeout(resolve, DEPLOY_POLL_DELAY_MS));
+
+        deployedCluster = await getK8sCluster(orgIdOrName, cluster.id);
+      }
+
+      Logger.println('');
+      switch (deployedCluster.status) {
+        case 'ACTIVE':
+          Logger.printSuccess(
+            `Cluster ${styleText('green', `${deployedCluster.name} (${deployedCluster.id})`)} deployed successfully`,
+          );
+          break;
+        case 'FAILED':
+          throw new Error(
+            `Cluster ${styleText('red', `${deployedCluster.name} (${deployedCluster.id})`)} deployment failed`,
+          );
+        default:
+          throw new Error(`Unexpected cluster status: ${deployedCluster.status}`);
+      }
+    } else {
+      Logger.println(`🚀 Cluster ${styleText('white', `${cluster.name} (${cluster.id})`)} is being deployed`);
+    }
+
+    const orgMessageComplement = orgIdOrName ? `--org "${orgIdOrName.orga_id || orgIdOrName.orga_name}"` : '';
+
+    Logger.println('');
+    Logger.println(
+      `You can get its information with ${styleText('blue', `clever k8s get ${cluster.id} ${orgMessageComplement}`)}`,
+    );
+  } catch (error) {
+    if (error.responseBody?.code === 'clever.core.quota-exceeded') {
+      throw new Error(
+        'Failed to create Kubernetes cluster: your quota exceeded, contact support to increase your quota',
+      );
+    } else {
+      throw new Error(error.message);
+    }
+  }
+}
+
+export async function del(params) {
+  const [clusterIdOrName] = params.args;
+  const { org: orgIdOrName, yes: confirmDeletion } = params.options;
+
+  let proceedDeletion = false;
+  if (confirmDeletion) {
+    proceedDeletion = true;
+  } else {
+    proceedDeletion = await confirm(
+      `Are you sure you want to delete the Kubernetes cluster ${styleText(
+        'blue',
+        clusterIdOrName.addon_name || clusterIdOrName.operator_id,
+      )}?`,
+      'Kubernetes cluster deletion cancelled.',
+    );
+  }
+
+  if (proceedDeletion) {
+    await k8sDelete(orgIdOrName, clusterIdOrName);
+    Logger.printSuccess(
+      `Kubernetes cluster ${styleText('green', clusterIdOrName.addon_name || clusterIdOrName.operator_id)} successfully deleted`,
+    );
+  }
+}
+
+export async function list(params) {
+  const { format, org: orgIdOrName } = params.options;
+  const clusters = await k8sList(orgIdOrName, format);
+
+  switch (format) {
+    case 'json':
+      Logger.printJson(clusters);
+      break;
+    case 'human':
+    default:
+      if (clusters.length === 0) {
+        Logger.println(`🔎 No cluster found, create one with ${styleText('blue', `clever k8s create`)} command`);
+        return;
+      }
+
+      Logger.println(`🔎 Found ${clusters.length} cluster${clusters.length > 1 ? 's' : ''}:`);
+
+      Object.values(clusters).forEach((c) => {
+        Logger.println(`  • ${styleText('white', `${c.name} (${c.id})`)} - ${c.status}`);
+      });
+      break;
+  }
+}
+
+export async function get(params) {
+  const [clusterIdOrName] = params.args;
+  const { format, org: orgIdOrName } = params.options;
+
+  const k8sInfo = await getK8sCluster(orgIdOrName, clusterIdOrName);
+
+  switch (format) {
+    case 'json':
+      Logger.printJson(k8sInfo);
+      break;
+    case 'human':
+    default:
+      console.table({
+        Name: k8sInfo.name,
+        ID: k8sInfo.id,
+        Version: k8sInfo.version,
+        Status: k8sInfo.status,
+      });
+
+      Logger.println('');
+      const orgMessageComplement = orgIdOrName ? `--org "${orgIdOrName.orga_id || orgIdOrName.orga_name}"` : '';
+
+      Logger.println(
+        `Once ACTIVE, get the kubeconfig with ${styleText('blue', `clever k8s get-kubeconfig ${k8sInfo.id} ${orgMessageComplement}`)}`,
+      );
+      break;
+  }
+}
+
+export async function addPersistentStorage(params) {
+  const [clusterIdOrName] = params.args;
+  const orgIdOrName = params.options.org;
+
+  if ((await isK8sClusterActive(orgIdOrName, clusterIdOrName)) === false) {
+    Logger.printInfo(
+      'Persistent storage can only be added to deployed clusters, wait for the deployment to finish and try again',
+    );
+
+    const orgMessageComplement = orgIdOrName ? `--org "${orgIdOrName.orga_id || orgIdOrName.orga_name}"` : '';
+    Logger.println(
+      `Check with ${styleText('blue', `clever k8s get ${clusterIdOrName.addon_name || clusterIdOrName.operator_id} ${orgMessageComplement}`)}`,
+    );
+    return;
+  }
+
+  try {
+    await k8sAddPersistentStorage(orgIdOrName, clusterIdOrName);
+    Logger.printSuccess(
+      `Persistent storage successfully activated on cluster ${styleText('green', clusterIdOrName.addon_name || clusterIdOrName.operator_id)}`,
+    );
+  } catch (error) {
+    Logger.error("Failed to add persistent storage, check if it's not already activated");
+  }
+}
+
+export async function getConfig(params) {
+  const [clusterIdOrName] = params.args;
+  const orgIdOrName = params.options.org;
+
+  if ((await isK8sClusterActive(orgIdOrName, clusterIdOrName)) !== true) {
+    Logger.printInfo(
+      'Kubeconfig can only be retrieved from deployed clusters, wait for the deployment to finish and try again',
+    );
+
+    const orgMessageComplement = orgIdOrName ? `--org "${orgIdOrName.orga_id || orgIdOrName.orga_name}"` : '';
+    Logger.println(
+      `Check with ${styleText('blue', `clever k8s get ${clusterIdOrName.addon_name || clusterIdOrName.operator_id} ${orgMessageComplement}`)}`,
+    );
+    return;
+  }
+
+  console.log(await k8sGetConfig(orgIdOrName, clusterIdOrName));
+}

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

@@ -2,8 +2,35 @@ import dedent from 'dedent';
 import { conf } from './models/configuration.js';
 
 export const EXPERIMENTAL_FEATURES = {
+  k8s: {
+    status: 'beta',
+    description: 'Deploy and manage Kubernetes clusters on Clever Cloud',
+    instructions: dedent`
+      - Create a Kubernetes cluster:
+          clever k8s create my-cluster
+          clever k8s create my-cluster --org myOrg
+
+      - List Kubernetes clusters:
+          clever k8s list
+
+      - Get details about a Kubernetes cluster:
+          clever k8s get my-cluster
+
+      - Get kubeconfig file for a Kubernetes cluster:
+          clever k8s get-kubeconfig my-cluster
+          clever k8s get-kubeconfig my-cluster > ~/.kube/config
+
+      - Activate persistent storage on a Kubernetes cluster:
+          clever k8s add-persistent-storage my-cluster
+
+      - Delete a Kubernetes cluster:
+          clever k8s delete my-cluster
+
+      Learn more about Clever Kubernetes: ${conf.DOC_URL}/kubernetes/
+    `,
+  },
   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 +47,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/ascii.js

@@ -0,0 +1,48 @@
+import { styleText } from './style-text.js';
+
+const LOGO = styleText(
+  'green',
+  `
+ ██████╗██╗     ███████╗██╗   ██╗███████╗██████╗     ██╗  ██╗ █████╗ ███████╗
+██╔════╝██║     ██╔════╝██║   ██║██╔════╝██╔══██╗    ██║ ██╔╝██╔══██╗██╔════╝
+██║     ██║     █████╗  ██║   ██║█████╗  ██████╔╝    █████╔╝ ╚█████╔╝███████╗
+██║     ██║     ██╔══╝  ╚██╗ ██╔╝██╔══╝  ██╔══██╗    ██╔═██╗ ██╔══██╗╚════██║
+╚██████╗███████╗███████╗ ╚████╔╝ ███████╗██║  ██║    ██║  ██╗╚█████╔╝███████║
+ ╚═════╝╚══════╝╚══════╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝    ╚═╝  ╚═╝ ╚════╝ ╚══════╝
+
+ Your Clever Cloud Kubernetes cluster has been successfully created, it's now starting up!
+
+ It will take about 1 minute. To manage it, use the following commands:
+   - clever k8s list                                  List your Kubernetes clusters
+   - clever k8s get <cluster-id-or-name>              Get information about a specific cluster
+   - clever k8s get-kubeconfig <cluster-id-or-name>   Get the kubeconfig file for your cluster
+   - clever k8s delete <cluster-id-or-name>           Delete a specific cluster
+
+ Learn more about commands with 'clever k8s --help'
+
+ For more information, read the documentation https://www.clever.cloud/developers/doc/kubernetes/
+
+ Enjoy!
+`,
+);
+
+// const clearScreen = () => process.stdout.write('\x1B[2J\x1B[0f');
+const hideCursor = () => process.stdout.write('\x1B[?25l');
+const showCursor = () => process.stdout.write('\x1B[?25h');
+const sleep = (ms = 42) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export async function typewriterLogo() {
+  hideCursor();
+
+  const lines = LOGO.split('\n');
+
+  for (const line of lines) {
+    for (const char of line) {
+      process.stdout.write(char);
+      await sleep();
+    }
+    console.log();
+  }
+
+  showCursor();
+}

package/src/lib/k8s.js

@@ -0,0 +1,126 @@
+import { styleText } from './style-text.js';
+
+import {
+  addK8sPersistentStorage,
+  createK8sCluster,
+  deleteK8sCluster,
+  getK8sAddon,
+  getK8sConfig,
+  listK8sClusters,
+} from '../clever-client/k8s.js';
+import { getOwnerIdFromOrgIdOrName } from '../models/ids-resolver.js';
+import { sendToApi } from '../models/send-to-api.js';
+
+/**
+ * Check if a Kubernetes cluster status is ACTIVE
+ * @param {string} orgIdOrName The organisation ID or name
+ * @param {string} clusterIdOrName The cluster ID or name
+ * @returns {Promise<boolean>} True if the cluster is deployed, false otherwise
+ */
+export async function isK8sClusterActive(orgIdOrName, clusterIdOrName) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const clusterId = await getClusterIdFromAddonIdOrName(clusterIdOrName, ownerId);
+  const cluster = await getK8sAddon({ ownerId, clusterId }).then(sendToApi);
+
+  return cluster.status === 'ACTIVE';
+}
+
+/**
+ * Create a kubernetes cluster
+ * @param {string} name The name of the cluster
+ * @param {string} ownerId The owner ID
+ * @returns {Promise<void>}
+ */
+export async function k8sCreate(name, ownerId) {
+  ownerId = await getOwnerIdFromOrgIdOrName(ownerId);
+
+  return createK8sCluster({ ownerId }, { name }).then(sendToApi);
+}
+
+/**
+ * List all kubernetes addons
+ * @param {string} format The output format
+ * @returns {Promise<void>}
+ */
+export async function k8sList(orgIdOrName, format) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const deployed = await listK8sClusters({ ownerId }).then(sendToApi);
+
+  return deployed.filter((op) => op.status != 'DELETED');
+}
+
+/**
+ * Get information about a kubernetes cluster
+ * @param {string} orgIdOrName The organisation ID or name
+ * @param {string} clusterIdOrName The cluster ID or name
+ * @returns {Promise<object>} The kubernetes cluster information
+ */
+export async function getK8sCluster(orgIdOrName, clusterIdOrName) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const clusterId = await getClusterIdFromAddonIdOrName(clusterIdOrName, ownerId);
+
+  return getK8sAddon({ ownerId, clusterId }).then(sendToApi);
+}
+
+/**
+ * Get Kubernetes cluster configuration
+ * @param {string} orgIdOrName The organisation ID or name
+ * @param {string} clusterIdOrName The cluster ID or name
+ * @returns {Promise<string>} The kubeconfig.yaml content
+ */
+export async function k8sGetConfig(orgIdOrName, clusterIdOrName) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const clusterId = await getClusterIdFromAddonIdOrName(clusterIdOrName, ownerId);
+
+  return getK8sConfig({ ownerId, clusterId }).then(sendToApi);
+}
+
+/**
+ * Delete a kubernetes cluster
+ * @param {string} orgIdOrName The organisation ID or name
+ * @param {string} clusterIdOrName The cluster ID or name
+ * @returns {Promise<void>}
+ */
+export async function k8sDelete(orgIdOrName, clusterIdOrName) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const clusterId = await getClusterIdFromAddonIdOrName(clusterIdOrName, ownerId);
+
+  return deleteK8sCluster({ ownerId, clusterId }).then(sendToApi);
+}
+
+/**
+ * Get Kubernetes cluster ID from an addon ID or name
+ * @param {string|object} addonIdOrName The addon ID or name
+ * @param {string} ownerId The owner ID
+ * @returns {Promise<string>} The Kubernetes cluster ID
+ */
+export async function getClusterIdFromAddonIdOrName(addonIdOrName, ownerId) {
+  if (typeof addonIdOrName === 'string') {
+    return addonIdOrName;
+  } else if (typeof addonIdOrName === 'object' && addonIdOrName.operator_id) {
+    return addonIdOrName.operator_id;
+  } else if (typeof addonIdOrName === 'object' && addonIdOrName.addon_name) {
+    const clusters = await listK8sClusters({ ownerId }).then(sendToApi);
+    const matchingCluster = clusters.find((cluster) => cluster.name === addonIdOrName.addon_name);
+    if (matchingCluster) {
+      return matchingCluster.id;
+    } else {
+      throw new Error(`No Kubernetes cluster found with the name ${styleText('red', addonIdOrName.addon_name)}`);
+    }
+  } else {
+    throw new Error('Invalid Kubernetes Cluster identifier provided');
+  }
+}
+
+/**
+ * Add persistent storage to a deployed Kubernetes cluster
+ * @param {string} orgIdOrName The organisation ID or name
+ * @param {string} clusterIdOrName The cluster ID or name
+ * @returns {Promise<void>}
+ */
+export async function k8sAddPersistentStorage(orgIdOrName, clusterIdOrName) {
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
+  const clusterId = await getClusterIdFromAddonIdOrName(clusterIdOrName, ownerId);
+
+  return addK8sPersistentStorage({ ownerId, clusterId }).then(sendToApi);
+}

package/src/lib/prompts.js

@@ -9,6 +9,8 @@ export async function confirm(message, rejectionMessage) {
   if (!answer) {
     throw new Error(rejectionMessage);
   }
+
+  return answer;
 }
 
 export async function confirmAnswer(message, rejectionMessage, expectedAnswer) {

package/src/models/ids-resolver.js

@@ -1,6 +1,8 @@
 import { getSummary } from '@clevercloud/client/esm/api/v2/user.js';
 import { Logger } from '../logger.js';
+import * as User from '../models/user.js';
 import { loadIdsCache, writeIdsCache } from './configuration.js';
+import * as Organisation from './organisation.js';
 import { sendToApi } from './send-to-api.js';
 
 /*
@@ -171,3 +173,12 @@ export async function findAddonsByAddonProvider(provider) {
 
   return candidates;
 }
+
+/**
+ * Get the owner ID from an Organisation ID or name
+ * @param {object} orgIdOrName The Organisation ID or name
+ * @returns {Promise<string>} The owner ID
+ */
+export async function getOwnerIdFromOrgIdOrName(orgIdOrName) {
+  return orgIdOrName != null ? Organisation.getId(orgIdOrName) : User.getCurrentId();
+}

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`,
     );
   }
 }