clever-tools 4.1.0 → 4.3.0

package/src/models/ng.js

@@ -9,17 +9,20 @@ import crypto from 'node:crypto';
 import { searchNetworkGroupOrResource } from '../clever-client/ng.js';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
+import { getOwnerIdFromOrgIdOrName } from './ids-resolver.js';
 import { checkMembersToLink } from './ng-resources.js';
-import * as Organisation from './organisation.js';
 import { sendToApi } from './send-to-api.js';
-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',
 };
 
@@ -34,10 +37,10 @@ const TYPE_PREFIXES = {
  */
 export async function create(label, description, tags, membersIds, orgaIdOrName) {
   const id = `ng_${crypto.randomUUID()}`;
-  const ownerId = await getOwnerIdFromOrgaIdOrName(orgaIdOrName);
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
 
   if (membersIds?.length > 0) {
-    await checkMembersToLink(membersIds, ownerId);
+    checkMembersToLink(membersIds);
   }
 
   const members = constructMembers(id, membersIds || []);
@@ -72,11 +75,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,13 +119,13 @@ 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
  */
 export async function getNG(networkGroupId, orgaIdOrName) {
-  const ownerId = await getOwnerIdFromOrgaIdOrName(orgaIdOrName);
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
 
   Logger.info(`Get Network Group ${networkGroupId} for owner ${ownerId}`);
   const result = await getNetworkGroup({ networkGroupId, ownerId }).then(sendToApi);
@@ -137,7 +140,7 @@ export async function getNG(networkGroupId, orgaIdOrName) {
  * @returns {Promise<Array<Object>>} The Network Groups
  */
 export async function getAllNGs(orgaIdOrName) {
-  const ownerId = await getOwnerIdFromOrgaIdOrName(orgaIdOrName);
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
 
   Logger.info(`Listing Network Groups from owner ${ownerId}`);
   const result = await listNetworkGroups({ ownerId }).then(sendToApi);
@@ -155,7 +158,7 @@ export async function getAllNGs(orgaIdOrName) {
  * @returns {Promise<Object>} Found results
  */
 export async function searchNgOrResource(idOrLabel, orgaIdOrName, type = 'all', exactMatch = true) {
-  const ownerId = await getOwnerIdFromOrgaIdOrName(orgaIdOrName);
+  const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
 
   // If idOrLabel is a string we use it, or we look through multiple keys
   const query =
@@ -187,7 +190,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 +206,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 };
   });
 }
 
@@ -266,12 +264,3 @@ async function pollNetworkGroup(ownerId, ngId, { waitForMembers = null, waitForD
     pollOnce();
   });
 }
-
-/**
- * Get the owner ID from an Organisation ID or name
- * @param {object} orgaIdOrName The Organisation ID or name
- * @returns {Promise<string>} The owner ID
- */
-async function getOwnerIdFromOrgaIdOrName(orgaIdOrName) {
-  return orgaIdOrName != null ? Organisation.getId(orgaIdOrName) : User.getCurrentId();
-}

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-]+=.+$/;
 
@@ -99,12 +100,13 @@ export function orgaIdOrName(string) {
 const addonIdRegex = /^addon_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const operatorIdRegex =
   /^(keycloak|otoroshi|matomo|metabase)_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const ulidRegex = /^(kubernetes)_[0-9A-HJ-NP-TV-Z]{26}$/i;
 
 export function addonIdOrName(string) {
   if (string.match(addonIdRegex)) {
     return cliparse.parsers.success({ addon_id: string });
   }
-  if (string.match(operatorIdRegex)) {
+  if (string.match(operatorIdRegex) || string.match(ulidRegex)) {
     return cliparse.parsers.success({ operator_id: string });
   }
   return cliparse.parsers.success({ addon_name: string });
@@ -225,12 +227,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 });