clever-tools 4.10.0 → 5.0.0

package/bin/clever.js

@@ -14,7 +14,7 @@ import {
   verboseOption,
   versionOption,
 } from '../src/commands/global.options.js';
-import { EXPERIMENTAL_FEATURES, getFeatures } from '../src/config/features.js';
+import { EXPERIMENTAL_FEATURES, isFeatureEnabled } from '../src/config/features.js';
 import { cliparse } from '../src/lib/cliparse-patched.js';
 import { styleText } from '../src/lib/style-text.js';
 import { getDefault, getEnumValues, isBoolean, isRequired } from '../src/lib/zod-utils.js';
@@ -47,14 +47,10 @@ if (process.argv[2] === 'curl') {
 }
 
 async function run() {
-  // Get enabled experimental features
-  /** @type {Record<string, boolean>} */
-  const featuresFromConf = await getFeatures();
-
   // Build all commands from globalCommands
   const commands = [];
   for (const [name, entry] of /** @type {[string, CommandEntry][]} */ (Object.entries(globalCommands))) {
-    const command = buildCommand(name, entry, featuresFromConf);
+    const command = buildCommand(name, entry);
     if (command != null) {
       commands.push(command);
     }
@@ -96,10 +92,9 @@ async function run() {
  * Recursively build commands from the global commands structure
  * @param {string} name - Command name
  * @param {CommandEntry} commandEntry - Command entry (either a command object or [command, subcommands])
- * @param {Record<string, boolean>} featuresFromConf - Enabled features configuration
  * @returns {Object|null} cliparse command or null if filtered out
  */
-function buildCommand(name, commandEntry, featuresFromConf) {
+function buildCommand(name, commandEntry) {
   /** @type {CommandDefinition} */
   let commandDef;
   /** @type {Record<string, CommandEntry>} */
@@ -113,14 +108,14 @@ function buildCommand(name, commandEntry, featuresFromConf) {
   }
 
   // Check if this is an experimental feature that needs to be enabled
-  if (commandDef.featureFlag && !featuresFromConf[commandDef.featureFlag]) {
+  if (commandDef.featureFlag && !isFeatureEnabled(commandDef.featureFlag)) {
     return null;
   }
 
   // Build subcommands recursively
   const subcommands = [];
   for (const [subName, subEntry] of Object.entries(subcommandsMap)) {
-    const subcommand = buildCommand(subName, subEntry, featuresFromConf);
+    const subcommand = buildCommand(subName, subEntry);
     if (subcommand != null) {
       subcommands.push(subcommand);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "4.10.0",
+  "version": "5.0.0",
   "description": "Command Line Interface for Clever Cloud.",
   "keywords": [
     "cli",
@@ -49,56 +49,56 @@
     "typecheck": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@babel/traverse": "7.28.5",
-    "@clevercloud/client": "12.0.0",
-    "@inquirer/prompts": "7.8.4",
+    "@clevercloud/client": "12.6.3",
+    "@inquirer/prompts": "8.7.2",
     "char-regex": "2.0.2",
     "cliparse": "0.5.0",
-    "dedent": "1.7.0",
+    "dedent": "1.7.2",
     "eventsource": "4.1.0",
     "ioredis": "5.8.2",
-    "iso8601-duration": "2.1.3",
-    "isomorphic-git": "1.35.1",
+    "iso8601-duration": "2.1.4",
+    "isomorphic-git": "1.41.9",
     "linux-release-info": "3.0.0",
-    "lodash": "4.17.21",
-    "open": "10.2.0",
-    "semver": "7.7.3",
-    "simple-git": "3.30.0",
-    "slugify": "1.6.6",
-    "tldts": "7.0.19",
+    "lodash": "4.18.1",
+    "open": "11.0.2",
+    "semver": "7.8.5",
+    "simple-git": "3.36.0",
+    "slugify": "1.6.9",
+    "tldts": "7.4.12",
+    "undici": "8.10.2",
     "update-notifier": "7.3.1",
     "xdg": "0.1.1",
-    "zod": "4.1.13"
+    "zod": "4.5.4"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.940.0",
+    "@aws-sdk/client-s3": "3.1128.0",
     "@clevercloud/eslint-config": "1.1.0",
-    "@commitlint/cli": "19.8.1",
-    "@commitlint/config-conventional": "19.8.1",
-    "@eslint/compat": "1.3.2",
-    "@rollup/plugin-commonjs": "28.0.6",
+    "@commitlint/cli": "21.2.2",
+    "@commitlint/config-conventional": "21.2.2",
+    "@eslint/compat": "2.1.1",
+    "@rollup/plugin-commonjs": "29.0.3",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "16.0.3",
     "@types/mime-types": "3.0.1",
-    "@types/picomatch": "4.0.2",
-    "@yao-pkg/pkg": "6.10.1",
+    "@types/picomatch": "4.0.3",
+    "@yao-pkg/pkg": "6.22.0",
     "eslint": "9.39.1",
-    "globals": "16.5.0",
+    "globals": "17.12.0",
     "mime-types": "3.0.2",
-    "prettier": "3.7.3",
+    "prettier": "3.9.6",
     "prettier-plugin-organize-imports": "4.3.0",
     "remark-parse": "11.0.0",
     "remark-stringify": "11.0.0",
-    "rollup": "4.53.3",
-    "tinyglobby": "0.2.15",
+    "rollup": "4.63.1",
+    "tinyglobby": "0.2.17",
     "typescript": "5.9.3",
     "unified": "11.0.5"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   },
   "volta": {
-    "node": "22.17.0",
+    "node": "24.18.1",
     "npm": "11.6.2"
   }
 }

package/src/clever-client/drains.js

@@ -108,3 +108,20 @@ export function enableDrain(params) {
     // no body
   });
 }
+
+/**
+ * POST /v4/drains/organisations/{ownerId}/resources/{resourceId}/drains/{drainId}/check
+ * @param {Object} params
+ * @param {String} params.ownerId
+ * @param {String} params.resourceId
+ * @param {String} params.drainId
+ */
+export function checkDrain(params) {
+  // no multipath for /self or /organisations/{id}
+  return Promise.resolve({
+    method: 'post',
+    url: `/v4/drains/organisations/${params.ownerId}/resources/${params.resourceId}/drains/${params.drainId}/check`,
+    headers: { Accept: 'application/json' },
+    // no body
+  });
+}

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

@@ -1,5 +1,7 @@
 import { ApplicationAccessLogStream } from '@clevercloud/client/esm/streams/access-logs.js';
 import { formatTable } from '../../format-table.js';
+import { formatClf } from '../../lib/access-logs-clf.js';
+import { guessAccessLogTransport } from '../../lib/access-logs-transport.js';
 import { defineCommand } from '../../lib/define-command.js';
 import { styleText } from '../../lib/style-text.js';
 import { Logger } from '../../logger.js';
@@ -8,12 +10,12 @@ import { JsonArray } from '../../models/json-array.js';
 import { getHostAndTokens } from '../../models/send-to-api.js';
 import { truncateWithEllipsis } from '../../models/utils.js';
 import {
+  accessLogsFormatOption,
   addonIdOrRealIdOption,
   afterOption,
   aliasOption,
   appIdOrNameOption,
   beforeOption,
-  logsFormatOption,
 } from '../global.options.js';
 
 const THROTTLE_ELEMENTS = 2000;
@@ -22,28 +24,40 @@ const THROTTLE_PER_IN_MILLISECONDS = 100;
 
 const CITY_MAX_LENGTH = 20;
 
+/**
+ * Format an access log as a human readable table row.
+ *
+ * Non-HTTP access logs (TCP redirections, SSH connections, or HTTP connections cut before the
+ * proxy could answer) have no `http` section: their status and request columns are omitted.
+ *
+ * @param {object} log an access log, as emitted by `ApplicationAccessLogStream`
+ * @returns {string}
+ */
 function formatHuman(log) {
   const { date, http, source } = log;
   const country = source.countryCode ?? '(unknown)';
   const hasSourceCity = source.city ?? '';
 
-  return formatTable(
-    [
-      [
-        styleText('grey', date.toISOString(date)),
-        source.ip,
-        `${country}${hasSourceCity ? '/' + truncateWithEllipsis(CITY_MAX_LENGTH, source.city) : ''}`,
-        colorStatusCode(http.response.statusCode),
-        http.request.method.toString().padEnd(4, ' ') + ' ' + http.request.path,
-      ],
-    ],
-
-    ACCESSLOG_COLUMN_WIDTHS,
-  );
+  const columns = [
+    styleText('grey', date.toISOString(date)),
+    guessAccessLogTransport(log),
+    source.ip,
+    `${country}${hasSourceCity ? '/' + truncateWithEllipsis(CITY_MAX_LENGTH, source.city) : ''}`,
+  ];
+
+  if (http != null) {
+    columns.push(colorStatusCode(http.response.statusCode));
+    columns.push(http.request.method);
+    columns.push(http.request.path);
+  }
+
+  return formatTable([columns], ACCESSLOG_COLUMN_WIDTHS);
 }
 
 const ACCESSLOG_COLUMN_WIDTHS = [
   '2024-06-24T08:05:43.880Z',
+  // longest transport name
+  'HTTP',
   '255.255.255.255',
   // country / city
   2 + 1 + CITY_MAX_LENGTH,
@@ -76,7 +90,7 @@ export const accesslogsCommand = defineCommand({
   options: {
     alias: aliasOption,
     app: appIdOrNameOption,
-    format: logsFormatOption,
+    format: accessLogsFormatOption,
     before: beforeOption,
     after: afterOption,
     addon: addonIdOrRealIdOption,
@@ -132,13 +146,16 @@ export const accesslogsCommand = defineCommand({
           case 'json-stream':
             Logger.printJson(log);
             break;
-          case 'human':
-          default:
-            // when the connection is cut too early, or for TCP redirections, we don't have HTTP section
+          case 'clf':
+            // CLF only describes HTTP requests, so logs without an HTTP section are skipped
             if (log.http == null) {
               break;
             }
 
+            Logger.println(formatClf(log));
+            break;
+          case 'human':
+          default:
             Logger.println(formatHuman(log));
             break;
         }

package/src/commands/accesslogs/accesslogs.docs.md

@@ -17,4 +17,4 @@ clever accesslogs [options]
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
 |`--before`, `--until` `<before>`|Fetch logs before this date/time (ISO8601 date, positive number in seconds or duration, e.g.: 1h)|
-|`-F`, `--format` `<format>`|Output format (human, json, json-stream) (default: human)|
+|`-F`, `--format` `<format>`|Output format (clf only outputs HTTP access logs) (human, json, json-stream, clf) (default: human)|

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

@@ -55,7 +55,7 @@ clever addon delete <addon-id|addon-name> [options]
 
 |Name|Description|
 |---|---|
-|`addon-id|addon-name`|Add-on ID (or name, if unambiguous)|
+|`addon-id\|addon-name`|Add-on ID (or name, if unambiguous)|
 
 ### ⚙️ Options
 
@@ -148,7 +148,7 @@ clever addon rename <addon-id|addon-name> <addon-name> [options]
 
 |Name|Description|
 |---|---|
-|`addon-id|addon-name`|Add-on ID (or name, if unambiguous)|
+|`addon-id\|addon-name`|Add-on ID (or name, if unambiguous)|
 |`addon-name`|Add-on name|
 
 ### ⚙️ Options

package/src/commands/config-provider/config-provider.docs.md

@@ -20,7 +20,7 @@ clever config-provider get <addon-id|config-provider-id|addon-name> [options]
 
 |Name|Description|
 |---|---|
-|`addon-id|config-provider-id|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
+|`addon-id\|config-provider-id\|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
 
 ### ⚙️ Options
 
@@ -41,7 +41,7 @@ clever config-provider import <addon-id|config-provider-id|addon-name> [options]
 
 |Name|Description|
 |---|---|
-|`addon-id|config-provider-id|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
+|`addon-id\|config-provider-id\|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
 
 ### ⚙️ Options
 
@@ -75,7 +75,7 @@ clever config-provider open <addon-id|config-provider-id|addon-name>
 
 |Name|Description|
 |---|---|
-|`addon-id|config-provider-id|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
+|`addon-id\|config-provider-id\|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
 
 ## ➡️ `clever config-provider rm` <kbd>Since 4.6.0</kbd>
 
@@ -89,7 +89,7 @@ clever config-provider rm <addon-id|config-provider-id|addon-name> <variable-nam
 
 |Name|Description|
 |---|---|
-|`addon-id|config-provider-id|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
+|`addon-id\|config-provider-id\|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
 |`variable-name`|Name of the environment variable|
 
 ## ➡️ `clever config-provider set` <kbd>Since 4.6.0</kbd>
@@ -104,6 +104,6 @@ clever config-provider set <addon-id|config-provider-id|addon-name> <variable-na
 
 |Name|Description|
 |---|---|
-|`addon-id|config-provider-id|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
+|`addon-id\|config-provider-id\|addon-name`|Add-on ID, real ID (config_xxx) or name (if unambiguous)|
 |`variable-name`|Name of the environment variable|
 |`variable-value`|Value of the environment variable|

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

@@ -9,6 +9,7 @@ import { Logger } from '../../logger.js';
 import * as AppConfig from '../../models/app_configuration.js';
 import * as Application from '../../models/application.js';
 import { AVAILABLE_ZONES, listAvailableTypes, listAvailableZones } from '../../models/application.js';
+import { LinkedWorktreeNotSupportedError } from '../../models/git-isomorphic.js';
 import { Git } from '../../models/git.js';
 import { aliasCreationOption, humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
 
@@ -54,7 +55,13 @@ async function displayAppCreation(app, alias, github, taskCommand) {
       Logger.println(`    ${shellCommand('git commit -m "Initial commit"')}`);
       Logger.println();
     } else {
-      const isClean = await git.isGitWorkingDirectoryClean();
+      // Best-effort hint: if we can't tell because of a linked worktree on the JS backend, don't nag
+      const isClean = await git.isGitWorkingDirectoryClean().catch((error) => {
+        if (error instanceof LinkedWorktreeNotSupportedError) {
+          return true;
+        }
+        throw error;
+      });
       if (!isClean) {
         Logger.println(`  ${styleText('yellow', '!')} Commit your changes first:`);
         Logger.println(`    ${shellCommand('git add .')}`);

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

@@ -20,7 +20,7 @@ clever database backups <database-id|addon-id> [options]
 
 |Name|Description|
 |---|---|
-|`database-id|addon-id`|Any database ID (format: addon_UUID, postgresql_UUID, mysql_UUID, ...)|
+|`database-id\|addon-id`|Any database ID (format: addon_UUID, postgresql_UUID, mysql_UUID, ...)|
 
 ### ⚙️ Options
 
@@ -41,7 +41,7 @@ clever database backups download <database-id|addon-id> <backup-id> [options]
 
 |Name|Description|
 |---|---|
-|`database-id|addon-id`|Any database ID (format: addon_UUID, postgresql_UUID, mysql_UUID, ...)|
+|`database-id\|addon-id`|Any database ID (format: addon_UUID, postgresql_UUID, mysql_UUID, ...)|
 |`backup-id`|A Database backup ID (format: UUID)|
 
 ### ⚙️ Options

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

@@ -23,20 +23,21 @@ clever deploy [options]
 
 ### 🧪 Experimental: System git backend
 
-Clever Tools uses a current JS implementation for git operations. This works without requiring git to be installed on your system, but has some limitations:
+Clever Tools uses the `git` command installed on your system for git operations (it must be in your `PATH` environment variable).
+
+If `git` is not available, or you experience an issue with this backend, you can fall back to the previous pure JS implementation. This works without requiring git to be installed on your system, but has some limitations:
 
 * **HTTP-only**: cannot use SSH-based git protocols
 * **Slow performance** on repositories with rewritten history (rebases, squashes)
 * **Connection timeouts** on large repositories or when pushing big files, due to HTTP-based transfers
-
-If you experience any of these issues, you can enable the **system git backend** which uses the `git` command installed on your system (it must be in your `PATH` environment variable).
+* **No git worktree support**: deploying from a linked git worktree (`git worktree add`) fails with `Could not find HEAD`
 
 ```bash
-clever features enable system-git
+clever features disable system-git
 ```
 
-To disable and return to the current JS implementation:
+To switch back to the system git backend:
 
 ```bash
-clever features disable system-git
+clever features enable system-git
 ```

package/src/commands/drain/drain.args.js

@@ -6,3 +6,9 @@ export const drainIdArg = defineArgument({
   description: 'Drain ID',
   placeholder: 'drain-id',
 });
+
+export const drainUrlArg = defineArgument({
+  schema: z.string(),
+  description: 'Drain URL',
+  placeholder: 'drain-url',
+});

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

@@ -0,0 +1,43 @@
+import { checkDrain } from '../../clever-client/drains.js';
+import { defineCommand } from '../../lib/define-command.js';
+import { styleText } from '../../lib/style-text.js';
+import { Logger } from '../../logger.js';
+import { resolveDrainResource } from '../../models/drain.js';
+import { sendToApi } from '../../models/send-to-api.js';
+import {
+  addonIdOrRealIdOption,
+  aliasOption,
+  appIdOrNameOption,
+  humanJsonOutputFormatOption,
+} from '../global.options.js';
+import { drainIdArg } from './drain.args.js';
+
+export const drainCheckCommand = defineCommand({
+  description: "Check that a drain's recipient is reachable and accepts deliveries",
+  since: '4.11.0',
+  options: {
+    alias: aliasOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
+    format: humanJsonOutputFormatOption,
+  },
+  args: [drainIdArg],
+  async handler(options, drainId) {
+    const { alias, appIdOrName, addonIdOrRealId, format } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
+
+    const probe = await checkDrain({ ownerId, resourceId, drainId }).then(sendToApi);
+    switch (format) {
+      case 'json': {
+        Logger.printJson({ ok: probe.ok, message: probe.message });
+        break;
+      }
+      case 'human':
+      default: {
+        const status = probe.ok ? styleText(['bold', 'green'], 'OK') : styleText(['bold', 'red'], 'FAILED');
+        Logger.println(`Probe: ${status}`);
+        Logger.println(probe.message);
+      }
+    }
+  },
+});

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

@@ -0,0 +1,36 @@
+import { z } from 'zod';
+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 { createLogDrain, resolveDrainResource } from '../../models/drain.js';
+import { addonIdOrRealIdOption, aliasOption, appIdOrNameOption } from '../global.options.js';
+import { drainUrlArg } from './drain.args.js';
+
+export const drainCreateBetterstackCommand = defineCommand({
+  description: 'Create a Better Stack drain',
+  since: '4.11.0',
+  options: {
+    sourceToken: defineOption({
+      name: 'source-token',
+      schema: z.string().min(1),
+      description: 'Source token',
+      aliases: ['t'],
+      placeholder: 'source-token',
+    }),
+    alias: aliasOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
+  },
+  args: [drainUrlArg],
+  async handler(options, url) {
+    const { alias, appIdOrName, addonIdOrRealId, sourceToken } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
+
+    const drain = await createLogDrain('BETTERSTACK', ownerId, resourceId, url, { sourceToken });
+
+    Logger.printSuccess(
+      `Better Stack drain ${styleText(['bold', 'green'], drain.id)} has been successfully created and enabled!`,
+    );
+  },
+});

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

@@ -1,124 +1,6 @@
-import { z } from 'zod';
-import { createDrain } from '../../clever-client/drains.js';
-import { defineArgument } from '../../lib/define-argument.js';
 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 { DRAIN_TYPE_CLI_CODES, DRAIN_TYPES, resolveDrainResource } from '../../models/drain.js';
-import { sendToApi } from '../../models/send-to-api.js';
-import { addonIdOrRealIdOption, aliasOption, appIdOrNameOption } from '../global.options.js';
 
 export const drainCreateCommand = defineCommand({
   description: 'Create a drain',
   since: '0.9.0',
-  options: {
-    username: defineOption({
-      name: 'username',
-      schema: z.string().optional(),
-      description: 'Basic auth username (for elasticsearch or raw-http)',
-      aliases: ['u'],
-      placeholder: 'username',
-    }),
-    password: defineOption({
-      name: 'password',
-      schema: z.string().optional(),
-      description: 'Basic auth password (for elasticsearch or raw-http)',
-      aliases: ['p'],
-      placeholder: 'password',
-    }),
-    apiKey: defineOption({
-      name: 'api-key',
-      schema: z.string().optional(),
-      description: 'API key (for newrelic)',
-      aliases: ['k'],
-      placeholder: 'api-key',
-    }),
-    indexPrefix: defineOption({
-      name: 'index-prefix',
-      schema: z.string().optional(),
-      description: 'Optional index prefix (for elasticsearch), `logstash` value is used if not set',
-      aliases: ['i'],
-      placeholder: 'index-prefix',
-    }),
-    rfc5424StructuredDataParameters: defineOption({
-      name: 'sd-params',
-      schema: z.string().optional(),
-      description: 'RFC5424 structured data parameters (for ovh-tcp), e.g.: `X-OVH-TOKEN=\\\"REDACTED\\\"`',
-      aliases: ['s'],
-      placeholder: 'sd-params',
-    }),
-    alias: aliasOption,
-    appIdOrName: appIdOrNameOption,
-    addonIdOrRealId: addonIdOrRealIdOption,
-  },
-  args: [
-    defineArgument({
-      schema: z.enum(DRAIN_TYPE_CLI_CODES),
-      description: 'Drain type',
-      placeholder: 'drain-type',
-    }),
-    defineArgument({
-      schema: z.string(),
-      description: 'Drain URL',
-      placeholder: 'drain-url',
-    }),
-  ],
-  async handler(options, drainTypeCliCode, url) {
-    const { alias, appIdOrName, addonIdOrRealId } = options;
-    const { username, password, apiKey, indexPrefix, rfc5424StructuredDataParameters } = options;
-
-    const drainType = Object.values(DRAIN_TYPES).find((drainType) => drainType.cliCode === drainTypeCliCode);
-
-    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
-
-    const body = {
-      kind: 'LOG',
-      recipient: {
-        type: drainType.apiCode,
-        url,
-      },
-    };
-
-    if (drainTypeCliCode === DRAIN_TYPES.ELASTICSEARCH.cliCode) {
-      if (!indexPrefix) {
-        throw new Error(
-          `${DRAIN_TYPES.ELASTICSEARCH.cliCode} drains require an index prefix (--index-prefix) to be set`,
-        );
-      }
-      if (!url.endsWith('/_bulk')) {
-        throw new Error(`${DRAIN_TYPES.ELASTICSEARCH.cliCode} drain URL must end with '/_bulk'`);
-      }
-      body.recipient.index = indexPrefix;
-    }
-
-    if (drainTypeCliCode === DRAIN_TYPES.ELASTICSEARCH.cliCode || drainTypeCliCode === DRAIN_TYPES.RAW_HTTP.cliCode) {
-      if (username) {
-        body.recipient.username = username;
-      }
-      if (password) {
-        body.recipient.password = password;
-      }
-    }
-
-    if (drainTypeCliCode === DRAIN_TYPES.NEWRELIC.cliCode) {
-      if (!apiKey) {
-        throw new Error(`${DRAIN_TYPES.NEWRELIC.cliCode} drains require an API key (--api-key) to be set`);
-      }
-      body.recipient.apiKey = apiKey;
-    }
-
-    if (
-      drainTypeCliCode === DRAIN_TYPES.OVH_TCP.cliCode ||
-      drainTypeCliCode === DRAIN_TYPES.SYSLOG_TCP.cliCode ||
-      drainTypeCliCode === DRAIN_TYPES.SYSLOG_UDP.cliCode
-    ) {
-      if (rfc5424StructuredDataParameters) {
-        body.recipient.rfc5424StructuredDataParameters = rfc5424StructuredDataParameters;
-      }
-    }
-
-    const drain = await createDrain({ ownerId, resourceId, body }).then(sendToApi);
-    Logger.printSuccess(`Drain ${styleText(['bold', 'green'], drain.id)} has been successfully created and enabled!`);
-  },
 });

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

@@ -0,0 +1,27 @@
+import { defineCommand } from '../../lib/define-command.js';
+import { styleText } from '../../lib/style-text.js';
+import { Logger } from '../../logger.js';
+import { createLogDrain, resolveDrainResource } from '../../models/drain.js';
+import { addonIdOrRealIdOption, aliasOption, appIdOrNameOption } from '../global.options.js';
+import { drainUrlArg } from './drain.args.js';
+
+export const drainCreateDatadogCommand = defineCommand({
+  description: 'Create a Datadog drain',
+  since: '0.9.0',
+  options: {
+    alias: aliasOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
+  },
+  args: [drainUrlArg],
+  async handler(options, url) {
+    const { alias, appIdOrName, addonIdOrRealId } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
+
+    const drain = await createLogDrain('DATADOG', ownerId, resourceId, url);
+
+    Logger.printSuccess(
+      `Datadog drain ${styleText(['bold', 'green'], drain.id)} has been successfully created and enabled!`,
+    );
+  },
+});