clever-tools 4.7.1 → 4.8.0

package/bin/clever.js

@@ -17,7 +17,7 @@ import {
 import { EXPERIMENTAL_FEATURES, getFeatures } from '../src/config/features.js';
 import { cliparse } from '../src/lib/cliparse-patched.js';
 import { styleText } from '../src/lib/style-text.js';
-import { getDefault, isBoolean, isRequired } from '../src/lib/zod-utils.js';
+import { getDefault, getEnumValues, isBoolean, isRequired } from '../src/lib/zod-utils.js';
 
 /**
  * @typedef {import('../src/lib/define-command.types.js').CommandDefinition} CommandDefinition
@@ -199,6 +199,11 @@ function convertOption(option) {
   }
   if (option.complete != null) {
     cliparseConfig.complete = option.complete;
+  } else {
+    const enumValues = getEnumValues(option.schema);
+    if (enumValues != null) {
+      cliparseConfig.complete = enumValues;
+    }
   }
 
   // Use Zod's safeParse for validation (handles coercion, enums, refinements, etc.)
@@ -242,6 +247,11 @@ function convertArgument(arg) {
 
   if (arg.complete) {
     cliparseConfig.complete = arg.complete;
+  } else {
+    const enumValues = getEnumValues(arg.schema);
+    if (enumValues != null) {
+      cliparseConfig.complete = enumValues;
+    }
   }
 
   // Use Zod's safeParse for validation (handles coercion, enums, refinements, etc.)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "4.7.1",
+  "version": "4.8.0",
   "description": "Command Line Interface for Clever Cloud.",
   "keywords": [
     "cli",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@babel/traverse": "7.28.5",
-    "@clevercloud/client": "11.3.0",
+    "@clevercloud/client": "12.0.0",
     "@inquirer/prompts": "7.8.4",
     "char-regex": "2.0.2",
     "cliparse": "0.5.0",

package/src/clever-client/drains.js

@@ -1,10 +1,10 @@
 // TODO: Move this to the Clever Cloud JS Client
 
 /**
- * GET /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains?status={status}&executionStatus={executionStatus}&executionStatusNotIn={executionStatusNotIn}
+ * GET /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains?status={status}&executionStatus={executionStatus}&executionStatusNotIn={executionStatusNotIn}
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {String} params.status
  * @param {String} params.executionStatus
  * @param {String} params.executionStatusNotIn
@@ -13,7 +13,7 @@ export function getDrains(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'get',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains`,
     headers: { Accept: 'application/json' },
     queryParams: {
       status: params.status,
@@ -25,85 +25,85 @@ export function getDrains(params) {
 }
 
 /**
- * POST /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains
+ * POST /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {Object} params.body
  */
 export function createDrain(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'post',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains`,
     headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
     body: params.body,
   });
 }
 
 /**
- * DELETE /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains/{drainId}
+ * DELETE /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains/{drainId}
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {String} params.drainId
  */
 export function deleteDrain(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'delete',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains/${params.drainId}`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains/${params.drainId}`,
     headers: { Accept: 'application/json' },
     // no body
   });
 }
 
 /**
- * GET /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains/{drainId}
+ * GET /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains/{drainId}
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {String} params.drainId
  */
 export function getDrain(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'get',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains/${params.drainId}`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains/${params.drainId}`,
     headers: { Accept: 'application/json' },
     // no body
   });
 }
 
 /**
- * PUT /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains/{drainId}/disable
+ * PUT /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains/{drainId}/disable
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {String} params.drainId
  */
 export function disableDrain(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'put',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains/${params.drainId}/disable`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains/${params.drainId}/disable`,
     headers: { Accept: 'application/json' },
     // no body
   });
 }
 
 /**
- * PUT /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains/{drainId}/enable
+ * PUT /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains/{drainId}/enable
  * @param {Object} params
  * @param {String} params.ownerId
- * @param {String} params.applicationId
+ * @param {String} params.resourceId
  * @param {String} params.drainId
  */
 export function enableDrain(params) {
   // no multipath for /self or /organisations/{id}
   return Promise.resolve({
     method: 'put',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains/${params.drainId}/enable`,
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains/${params.drainId}/enable`,
     headers: { Accept: 'application/json' },
     // no body
   });

package/src/commands/README.md

@@ -47,6 +47,7 @@ These options are available for all commands:
 |[`clever matomo`](./matomo/matomo.docs.md)|Manage Clever Cloud Matomo services|
 |[`clever metabase`](./metabase/metabase.docs.md)|Manage Clever Cloud Metabase services|
 |[`clever ng`](./ng/ng.docs.md)|List Network Groups|
+|[`clever oauth-consumers`](./oauth-consumers/oauth-consumers.docs.md)|Manage OAuth consumers used with a Clever Cloud login|
 |[`clever notify-email`](./notify-email/notify-email.docs.md)|Manage email notifications|
 |[`clever open`](./open/open.docs.md)|Open an application in the Console|
 |[`clever otoroshi`](./otoroshi/otoroshi.docs.md)|Manage Clever Cloud Otoroshi services|

package/src/commands/accesslogs/accesslogs.command.js

@@ -8,7 +8,7 @@ import { JsonArray } from '../../models/json-array.js';
 import { getHostAndTokens } from '../../models/send-to-api.js';
 import { truncateWithEllipsis } from '../../models/utils.js';
 import {
-  addonIdOption,
+  addonIdOrRealIdOption,
   afterOption,
   aliasOption,
   appIdOrNameOption,
@@ -79,7 +79,7 @@ export const accesslogsCommand = defineCommand({
     format: logsFormatOption,
     before: beforeOption,
     after: afterOption,
-    addon: addonIdOption,
+    addon: addonIdOrRealIdOption,
   },
   args: [],
   async handler(options) {

package/src/commands/activity/activity.command.js

@@ -174,7 +174,7 @@ export const activityCommand = defineCommand({
     format: defineOption({
       name: 'format',
       schema: z.enum(['human', 'json', 'json-stream']).default('human'),
-      description: 'Output format (human, json, json-stream)',
+      description: 'Output format',
       aliases: ['F'],
       placeholder: 'format',
     }),

package/src/commands/addon/addon.create.command.js

@@ -10,9 +10,8 @@ import * as Addon from '../../models/addon.js';
 import { completePlan, completeRegion, parseAddonOptions } from '../../models/addon.js';
 import * as AppConfig from '../../models/app_configuration.js';
 import { listAvailableAliases } from '../../models/application.js';
-import * as Organisation from '../../models/organisation.js';
+import { getOwnerIdFromOrgIdOrName } from '../../models/ids-resolver.js';
 import { sendToApi } from '../../models/send-to-api.js';
-import * as User from '../../models/user.js';
 import { addonOptions } from '../../parsers.js';
 import { humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
 import { addonNameArg, addonProviderArg } from './addon.args.js';
@@ -130,7 +129,7 @@ export const addonCreateCommand = defineCommand({
       addonOptions: parseAddonOptions(addonOptions),
     };
 
-    const ownerId = orgaIdOrName != null ? await Organisation.getId(orgaIdOrName) : await User.getCurrentId();
+    const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
     if (linkedAppAlias != null) {
       const linkedAppData = await AppConfig.getAppDetails({ alias: linkedAppAlias });
       if (orgaIdOrName != null && linkedAppData.ownerId !== ownerId && format === 'human') {

package/src/commands/addon/addon.delete.command.js

@@ -3,14 +3,14 @@ import { Logger } from '../../logger.js';
 import * as Addon from '../../models/addon.js';
 import * as Organisation from '../../models/organisation.js';
 import { addonIdOrNameArg } from '../global.args.js';
-import { confirmAddonDeletionOption, orgaIdOrNameOption } from '../global.options.js';
+import { orgaIdOrNameOption, skipConfirmationOption } from '../global.options.js';
 
 export const addonDeleteCommand = defineCommand({
   description: 'Delete an add-on',
   since: '0.2.3',
   options: {
     org: orgaIdOrNameOption,
-    yes: confirmAddonDeletionOption,
+    yes: skipConfirmationOption,
   },
   args: [addonIdOrNameArg],
   async handler(options, addon) {

package/src/commands/addon/addon.docs.md

@@ -62,7 +62,7 @@ clever addon delete <addon-id|addon-name> [options]
 |Name|Description|
 |---|---|
 |`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous)|
-|`-y`, `--yes`|Skip confirmation and delete the add-on directly|
+|`-y`, `--yes`|Skip confirmation and proceed with deletion directly|
 
 ## ➡️ `clever addon env` <kbd>Since 2.11.0</kbd>
 
@@ -83,7 +83,7 @@ clever addon env <addon-id> [options]
 |Name|Description|
 |---|---|
 |`-F`, `--format` `<format>`|Output format (human, json, shell) (default: human)|
-|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous)|
+|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous) *(deprecated, organisation is now resolved automatically)*|
 
 ## ➡️ `clever addon list` <kbd>Since 0.2.3</kbd>
 

package/src/commands/addon/addon.env.command.js

@@ -4,8 +4,7 @@ import { z } from 'zod';
 import { defineArgument } from '../../lib/define-argument.js';
 import { defineCommand } from '../../lib/define-command.js';
 import { Logger } from '../../logger.js';
-import { findOwnerId } from '../../models/addon.js';
-import { resolveAddonId } from '../../models/ids-resolver.js';
+import { resolveAddon } from '../../models/ids-resolver.js';
 import { sendToApi } from '../../models/send-to-api.js';
 import { envFormatOption, orgaIdOrNameOption } from '../global.options.js';
 
@@ -13,7 +12,7 @@ export const addonEnvCommand = defineCommand({
   description: 'List environment variables for an add-on',
   since: '2.11.0',
   options: {
-    org: orgaIdOrNameOption,
+    org: { ...orgaIdOrNameOption, deprecated: 'organisation is now resolved automatically' },
     format: envFormatOption,
   },
   args: [
@@ -24,10 +23,9 @@ export const addonEnvCommand = defineCommand({
     }),
   ],
   async handler(options, addonIdOrRealId) {
-    const { org, format } = options;
+    const { format } = options;
 
-    const addonId = await resolveAddonId(addonIdOrRealId);
-    const ownerId = await findOwnerId(org, addonId);
+    const { ownerId, addonId } = await resolveAddon(addonIdOrRealId);
 
     const envFromAddon = await getAllEnvVars({ id: ownerId, addonId }).then(sendToApi);
 

package/src/commands/config-provider/config-provider.command.js

@@ -3,8 +3,4 @@ import { defineCommand } from '../../lib/define-command.js';
 export const configProviderCommand = defineCommand({
   description: 'Manage configuration providers',
   since: '4.6.0',
-  options: {},
-  args: [],
-  // Parent command - no handler, only contains subcommands
-  handler: null,
 });

package/src/commands/config-provider/config-provider.import.command.js

@@ -11,7 +11,7 @@ import { configProviderIdOrNameArg } from './config-provider.args.js';
 const importFormatOption = defineOption({
   name: 'format',
   schema: z.enum(['name-equals-value', 'json']).default('name-equals-value'),
-  description: 'Input format (name-equals-value, json)',
+  description: 'Input format',
   aliases: ['F'],
   placeholder: 'format',
 });

package/src/commands/config-provider/config-provider.list.command.js

@@ -1,5 +1,5 @@
 import { defineCommand } from '../../lib/define-command.js';
-import { styleText } from '../../lib/style-text.js';
+import { printItemsByOwner } from '../../lib/print-items-by-owner.js';
 import { Logger } from '../../logger.js';
 import { findAddonsByAddonProvider } from '../../models/ids-resolver.js';
 import { humanJsonOutputFormatOption } from '../global.options.js';
@@ -14,30 +14,19 @@ export const configProviderListCommand = defineCommand({
   async handler(options) {
     const { format } = options;
     const deployed = await findAddonsByAddonProvider('config-provider');
-    const providersPerOwner = Object.groupBy(deployed, (provider) => provider.ownerId);
 
     switch (format) {
-      case 'json':
+      case 'json': {
+        const providersPerOwner = Object.groupBy(deployed, (p) => p.ownerId);
         Logger.printJson(providersPerOwner);
         break;
+      }
       case 'human':
       default:
-        if (deployed.length === 0) {
-          Logger.println(
-            `No configuration provider found, create one with ${styleText('blue', 'clever addon create config-provider')} command`,
-          );
-          return;
-        }
-
-        Logger.println(`Found ${deployed.length} configuration provider${deployed.length > 1 ? 's' : ''}:`);
-        Logger.println();
-
-        Object.values(providersPerOwner).forEach((providers) => {
-          Logger.println(`${styleText('bold', `${providers[0].ownerId} (${providers[0].ownerName})`)}`);
-          providers.forEach((provider) => {
-            Logger.println(`  ${provider.name} ${styleText('grey', `(${provider.realId})`)}`);
-          });
-          Logger.println();
+        printItemsByOwner(deployed, {
+          itemName: 'configuration provider',
+          emptyCommand: 'clever addon create config-provider',
+          getItemId: (p) => p.realId,
         });
         break;
     }

package/src/commands/config-provider/config-provider.open.command.js

@@ -12,6 +12,6 @@ export const configProviderOpenCommand = defineCommand({
   args: [configProviderIdOrNameArg],
   async handler(_options, addonIdOrRealIdOrName) {
     const { addonId } = await resolveConfigProviderId(addonIdOrRealIdOrName);
-    await openBrowser(`${config.GOTO_URL}/${addonId}`, `Opening ${styleText('blue', addonId)} in the browser...`);
+    await openBrowser(`${config.GOTO_URL}/${addonId}`, `Opening ${styleText('blue', addonId)} in the browser…`);
   },
 });

package/src/commands/console/console.command.js

@@ -1,4 +1,5 @@
 import { defineCommand } from '../../lib/define-command.js';
+import { styleText } from '../../lib/style-text.js';
 import * as AppConfig from '../../models/app_configuration.js';
 import * as Application from '../../models/application.js';
 import { openBrowser } from '../../models/utils.js';
@@ -18,7 +19,7 @@ export const consoleCommand = defineCommand({
     const { apps } = await AppConfig.loadApplicationConf();
     // If no app is linked or asked, open the Console without any context
     if (apps.length === 0 && !appIdOrName) {
-      await openBrowser('/', 'Opening the Console in your browser');
+      await openBrowser('/', 'Opening the Console in the browser…');
       return;
     }
 
@@ -26,6 +27,6 @@ export const consoleCommand = defineCommand({
     const prefixPath = ownerId.startsWith('user_') ? 'users/me' : `organisations/${ownerId}`;
     const consolePath = `/${prefixPath}/applications/${appId}`;
 
-    await openBrowser(consolePath, `Opening the Console in your browser for application ${appId}`);
+    await openBrowser(consolePath, `Opening ${styleText('blue', appId)} in the browser…`);
   },
 });

package/src/commands/curl/curl.command.js

@@ -73,5 +73,4 @@ export async function curl() {
 export const curlCommand = defineCommand({
   description: "Query Clever Cloud's API using Clever Tools credentials",
   since: '2.10.0',
-  handler: null,
 });

package/src/commands/database/database.backups.command.js

@@ -2,8 +2,7 @@ import { getBackups } from '@clevercloud/client/esm/api/v2/backups.js';
 import { formatTable } from '../../format-table.js';
 import { defineCommand } from '../../lib/define-command.js';
 import { Logger } from '../../logger.js';
-import { findOwnerId } from '../../models/addon.js';
-import { resolveAddonId, resolveRealId } from '../../models/ids-resolver.js';
+import { resolveAddon } from '../../models/ids-resolver.js';
 import { sendToApi } from '../../models/send-to-api.js';
 import { humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
 import { databaseIdArg } from './database.args.js';
@@ -12,16 +11,14 @@ export const databaseBackupsCommand = defineCommand({
   description: 'List available database backups',
   since: '2.10.0',
   options: {
-    org: orgaIdOrNameOption,
+    org: { ...orgaIdOrNameOption, deprecated: 'organisation is now resolved automatically' },
     format: humanJsonOutputFormatOption,
   },
   args: [databaseIdArg],
   async handler(options, addonIdOrRealId) {
-    const { org, format } = options;
+    const { format } = options;
 
-    const realId = await resolveRealId(addonIdOrRealId);
-    const addonId = await resolveAddonId(addonIdOrRealId);
-    const ownerId = await findOwnerId(org, realId);
+    const { ownerId, addonId, realId } = await resolveAddon(addonIdOrRealId);
 
     const backups = await getBackups({ ownerId, ref: realId }).then(sendToApi);
 

package/src/commands/database/database.backups.download.command.js

@@ -6,8 +6,7 @@ import { z } from 'zod';
 import { defineArgument } from '../../lib/define-argument.js';
 import { defineCommand } from '../../lib/define-command.js';
 import { defineOption } from '../../lib/define-option.js';
-import { findOwnerId } from '../../models/addon.js';
-import { resolveRealId } from '../../models/ids-resolver.js';
+import { resolveAddon } from '../../models/ids-resolver.js';
 import { sendToApi } from '../../models/send-to-api.js';
 import { orgaIdOrNameOption } from '../global.options.js';
 import { databaseIdArg } from './database.args.js';
@@ -23,7 +22,7 @@ export const databaseBackupsDownloadCommand = defineCommand({
       aliases: ['out'],
       placeholder: 'file-path',
     }),
-    org: orgaIdOrNameOption,
+    org: { ...orgaIdOrNameOption, deprecated: 'organisation is now resolved automatically' },
   },
   args: [
     databaseIdArg,
@@ -34,12 +33,11 @@ export const databaseBackupsDownloadCommand = defineCommand({
     }),
   ],
   async handler(options, addonIdOrRealId, backupId) {
-    const { org, output } = options;
+    const { output } = options;
 
-    const addonId = await resolveRealId(addonIdOrRealId);
-    const ownerId = await findOwnerId(org, addonId);
+    const { ownerId, realId } = await resolveAddon(addonIdOrRealId);
 
-    const backups = await getBackups({ ownerId, ref: addonId }).then(sendToApi);
+    const backups = await getBackups({ ownerId, ref: realId }).then(sendToApi);
     const backup = backups.find((backup) => backup.backup_id === backupId);
 
     if (backup == null) {

package/src/commands/database/database.command.js

@@ -3,8 +3,4 @@ import { defineCommand } from '../../lib/define-command.js';
 export const databaseCommand = defineCommand({
   description: 'Manage databases and backups',
   since: '2.10.0',
-  options: {},
-  args: [],
-  // Parent command - no handler, only contains subcommands
-  handler: null,
 });

package/src/commands/database/database.docs.md

@@ -27,7 +27,7 @@ clever database backups <database-id|addon-id> [options]
 |Name|Description|
 |---|---|
 |`-F`, `--format` `<format>`|Output format (human, json) (default: human)|
-|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous)|
+|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous) *(deprecated, organisation is now resolved automatically)*|
 
 ## ➡️ `clever database backups download` <kbd>Since 2.10.0</kbd>
 
@@ -48,5 +48,5 @@ clever database backups download <database-id|addon-id> <backup-id> [options]
 
 |Name|Description|
 |---|---|
-|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous)|
+|`-o`, `--org`, `--owner` `<org-id\|org-name>`|Organisation to target by its ID (or name, if unambiguous) *(deprecated, organisation is now resolved automatically)*|
 |`--output`, `--out` `<file-path>`|Redirect the output of the command in a file|

package/src/commands/deploy/deploy.command.js

@@ -67,7 +67,7 @@ export const deployCommand = defineCommand({
     sameCommitPolicy: defineOption({
       name: 'same-commit-policy',
       schema: z.enum(['error', 'ignore', 'restart', 'rebuild']).default('error'),
-      description: 'What to do when local and remote commit are identical (error, ignore, restart, rebuild)',
+      description: 'What to do when local and remote commit are identical',
       aliases: ['p'],
       placeholder: 'policy',
     }),

package/src/commands/deploy/deploy.docs.md

@@ -14,7 +14,7 @@ clever deploy [options]
 |---|---|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`-b`, `--branch` `<branch>`|Branch to push (current branch by default)|
-|`-e`, `--exit-on` `<step>`|Step at which the logs streaming is ended, steps are: deploy-start, deploy-end, never (default: deploy-end)|
+|`-e`, `--exit-on` `<step>`|Step at which the logs streaming is ended (deploy-start, deploy-end, never) (default: deploy-end)|
 |`--follow`|Continue to follow logs after deployment has ended *(deprecated, use `--exit-on never` instead)*|
 |`-f`, `--force`|Force deploy even if it's not fast-forwardable|
 |`-q`, `--quiet`|Don't show logs during deployment|

package/src/commands/drain/drain.command.js

@@ -1,26 +1,30 @@
 import { getDrains } from '../../clever-client/drains.js';
 import { defineCommand } from '../../lib/define-command.js';
 import { Logger } from '../../logger.js';
-import * as Application from '../../models/application.js';
-import { formatDrain } from '../../models/drain.js';
+import { formatDrain, resolveDrainResource } from '../../models/drain.js';
 import { sendToApi } from '../../models/send-to-api.js';
-import { aliasOption, appIdOrNameOption, humanJsonOutputFormatOption } from '../global.options.js';
+import {
+  addonIdOrRealIdOption,
+  aliasOption,
+  appIdOrNameOption,
+  humanJsonOutputFormatOption,
+} from '../global.options.js';
 
 export const drainCommand = defineCommand({
   description: 'Manage drains',
   since: '0.9.0',
   options: {
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
     format: humanJsonOutputFormatOption,
   },
   args: [],
   async handler(options) {
-    const { alias, app: appIdOrName, format } = options;
+    const { alias, appIdOrName, addonIdOrRealId, format } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
 
-    const { ownerId, appId: applicationId } = await Application.resolveId(appIdOrName, alias);
-
-    const drains = await getDrains({ ownerId, applicationId }).then(sendToApi);
+    const drains = await getDrains({ ownerId, resourceId }).then(sendToApi);
 
     switch (format) {
       case 'json': {
@@ -30,7 +34,8 @@ export const drainCommand = defineCommand({
       case 'human':
       default: {
         if (drains.length === 0) {
-          Logger.println(`There are no drains for ${applicationId}`);
+          const resourceLabel = addonIdOrRealId ?? appIdOrName ?? resourceId;
+          Logger.println(`There are no drains for ${resourceLabel}`);
           return;
         }
 

package/src/commands/drain/drain.create.command.js

@@ -5,10 +5,9 @@ import { defineCommand } from '../../lib/define-command.js';
 import { defineOption } from '../../lib/define-option.js';
 import { styleText } from '../../lib/style-text.js';
 import { Logger } from '../../logger.js';
-import * as Application from '../../models/application.js';
-import { DRAIN_TYPE_CLI_CODES, DRAIN_TYPES } from '../../models/drain.js';
+import { DRAIN_TYPE_CLI_CODES, DRAIN_TYPES, resolveDrainResource } from '../../models/drain.js';
 import { sendToApi } from '../../models/send-to-api.js';
-import { aliasOption, appIdOrNameOption } from '../global.options.js';
+import { addonIdOrRealIdOption, aliasOption, appIdOrNameOption } from '../global.options.js';
 
 export const drainCreateCommand = defineCommand({
   description: 'Create a drain',
@@ -50,14 +49,14 @@ export const drainCreateCommand = defineCommand({
       placeholder: 'sd-params',
     }),
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
   },
   args: [
     defineArgument({
-      schema: z.string(),
-      description: `Drain type (${DRAIN_TYPE_CLI_CODES.join(', ')})`,
+      schema: z.enum(DRAIN_TYPE_CLI_CODES),
+      description: 'Drain type',
       placeholder: 'drain-type',
-      complete: DRAIN_TYPE_CLI_CODES,
     }),
     defineArgument({
       schema: z.string(),
@@ -66,15 +65,12 @@ export const drainCreateCommand = defineCommand({
     }),
   ],
   async handler(options, drainTypeCliCode, url) {
-    const { alias, app: appIdOrName } = options;
+    const { alias, appIdOrName, addonIdOrRealId } = options;
     const { username, password, apiKey, indexPrefix, rfc5424StructuredDataParameters } = options;
 
     const drainType = Object.values(DRAIN_TYPES).find((drainType) => drainType.cliCode === drainTypeCliCode);
-    if (!drainType) {
-      throw new Error(`Invalid drain type. Supported types are: ${DRAIN_TYPE_CLI_CODES.join(', ')}`);
-    }
 
-    const { ownerId, appId: applicationId } = await Application.resolveId(appIdOrName, alias);
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
 
     const body = {
       kind: 'LOG',
@@ -122,7 +118,7 @@ export const drainCreateCommand = defineCommand({
       }
     }
 
-    const drain = await createDrain({ ownerId, applicationId, body }).then(sendToApi);
+    const drain = await createDrain({ ownerId, resourceId, body }).then(sendToApi);
     Logger.printSuccess(`Drain ${styleText(['bold', 'green'], drain.id)} has been successfully created and enabled!`);
   },
 });