clever-tools 4.7.1 → 4.9.0

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

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

@@ -2,9 +2,9 @@ import { disableDrain } 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 * as Application from '../../models/application.js';
+import { 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';
 import { drainIdArg } from './drain.args.js';
 
 export const drainDisableCommand = defineCommand({
@@ -12,15 +12,15 @@ export const drainDisableCommand = defineCommand({
   since: '0.9.0',
   options: {
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
   },
   args: [drainIdArg],
   async handler(options, drainId) {
-    const { alias, app: appIdOrName } = options;
+    const { alias, appIdOrName, addonIdOrRealId } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
 
-    const { ownerId, appId: applicationId } = await Application.resolveId(appIdOrName, alias);
-
-    await disableDrain({ ownerId, applicationId, drainId }).then(sendToApi);
+    await disableDrain({ ownerId, resourceId, drainId }).then(sendToApi);
 
     Logger.printSuccess(`Drain ${styleText(['bold', 'green'], drainId)} has been successfully disabled!`);
   },

package/src/commands/drain/drain.docs.md

@@ -12,6 +12,7 @@ clever drain [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
 |`-F`, `--format` `<format>`|Output format (human, json) (default: human)|
@@ -35,6 +36,7 @@ clever drain create <drain-type> <drain-url> [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`-k`, `--api-key` `<api-key>`|API key (for newrelic)|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
@@ -61,6 +63,7 @@ clever drain disable <drain-id> [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
 
@@ -82,6 +85,7 @@ clever drain enable <drain-id> [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
 
@@ -103,6 +107,7 @@ clever drain get <drain-id> [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|
 |`-F`, `--format` `<format>`|Output format (human, json) (default: human)|
@@ -125,5 +130,6 @@ clever drain remove <drain-id> [options]
 
 |Name|Description|
 |---|---|
+|`--addon` `<addon-id>`|Add-on ID or real ID|
 |`-a`, `--alias` `<alias>`|Short name for the application|
 |`--app` `<app-id\|app-name>`|Application to manage by its ID (or name, if unambiguous)|

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

@@ -2,9 +2,9 @@ import { enableDrain } 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 * as Application from '../../models/application.js';
+import { 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';
 import { drainIdArg } from './drain.args.js';
 
 export const drainEnableCommand = defineCommand({
@@ -12,15 +12,15 @@ export const drainEnableCommand = defineCommand({
   since: '0.9.0',
   options: {
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
   },
   args: [drainIdArg],
   async handler(options, drainId) {
-    const { alias, app: appIdOrName } = options;
+    const { alias, appIdOrName, addonIdOrRealId } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
 
-    const { ownerId, appId: applicationId } = await Application.resolveId(appIdOrName, alias);
-
-    await enableDrain({ ownerId, applicationId, drainId }).then(sendToApi);
+    await enableDrain({ ownerId, resourceId, drainId }).then(sendToApi);
 
     Logger.printSuccess(`Drain ${styleText(['bold', 'green'], drainId)} has been successfully enabled!`);
   },

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

@@ -1,10 +1,14 @@
 import { getDrain } 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';
 import { drainIdArg } from './drain.args.js';
 
 export const drainGetCommand = defineCommand({
@@ -12,16 +16,16 @@ export const drainGetCommand = defineCommand({
   since: '0.9.0',
   options: {
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
     format: humanJsonOutputFormatOption,
   },
   args: [drainIdArg],
   async handler(options, drainId) {
-    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 drain = await getDrain({ ownerId, applicationId, drainId }).then(sendToApi);
+    const drain = await getDrain({ ownerId, resourceId, drainId }).then(sendToApi);
 
     switch (format) {
       case 'json': {

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

@@ -2,9 +2,9 @@ import { deleteDrain } 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 * as Application from '../../models/application.js';
+import { 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';
 import { drainIdArg } from './drain.args.js';
 
 export const drainRemoveCommand = defineCommand({
@@ -12,15 +12,15 @@ export const drainRemoveCommand = defineCommand({
   since: '0.9.0',
   options: {
     alias: aliasOption,
-    app: appIdOrNameOption,
+    appIdOrName: appIdOrNameOption,
+    addonIdOrRealId: addonIdOrRealIdOption,
   },
   args: [drainIdArg],
   async handler(options, drainId) {
-    const { alias, app: appIdOrName } = options;
+    const { alias, appIdOrName, addonIdOrRealId } = options;
+    const { ownerId, resourceId } = await resolveDrainResource(alias, appIdOrName, addonIdOrRealId);
 
-    const { ownerId, appId: applicationId } = await Application.resolveId(appIdOrName, alias);
-
-    await deleteDrain({ ownerId, applicationId, drainId }).then(sendToApi);
+    await deleteDrain({ ownerId, resourceId, drainId }).then(sendToApi);
     Logger.printSuccess(`Drain ${styleText(['bold', 'green'], drainId)} has been successfully removed!`);
   },
 });

package/src/commands/emails/emails.open.command.js

@@ -7,9 +7,6 @@ export const emailsOpenCommand = defineCommand({
   options: {},
   args: [],
   handler() {
-    return openBrowser(
-      '/users/me/emails',
-      'Opening the email addresses management page of the Console in your browser',
-    );
+    return openBrowser('/users/me/emails', 'Opening the emails page in the browser…');
   },
 });

package/src/commands/global.commands.js

@@ -62,6 +62,7 @@ import { featuresEnableCommand } from './features/features.enable.command.js';
 import { featuresInfoCommand } from './features/features.info.command.js';
 import { featuresListCommand } from './features/features.list.command.js';
 import { helpCommand } from './help/help.command.js';
+import { k8sActivityCommand } from './k8s/k8s.activity.command.js';
 import { k8sAddPersistentStorageCommand } from './k8s/k8s.add-persistent-storage.command.js';
 import { k8sCommand } from './k8s/k8s.command.js';
 import { k8sCreateCommand } from './k8s/k8s.create.command.js';
@@ -69,6 +70,17 @@ import { k8sDeleteCommand } from './k8s/k8s.delete.command.js';
 import { k8sGetKubeconfigCommand } from './k8s/k8s.get-kubeconfig.command.js';
 import { k8sGetCommand } from './k8s/k8s.get.command.js';
 import { k8sListCommand } from './k8s/k8s.list.command.js';
+import { k8sNodeGroupCommand } from './k8s/k8s.nodegroups.command.js';
+import { k8sNodeGroupCreateCommand } from './k8s/k8s.nodegroups.create.command.js';
+import { k8sNodeGroupDeleteCommand } from './k8s/k8s.nodegroups.delete.command.js';
+import { k8sNodeGroupGetCommand } from './k8s/k8s.nodegroups.get.command.js';
+import { k8sNodeGroupListCommand } from './k8s/k8s.nodegroups.list.command.js';
+import { k8sNodeGroupUpdateCommand } from './k8s/k8s.nodegroups.update.command.js';
+import { k8sQuotaCommand } from './k8s/k8s.quota.command.js';
+import { k8sUpdateCommand } from './k8s/k8s.update.command.js';
+import { k8sVersionCheckCommand } from './k8s/k8s.version.check.command.js';
+import { k8sVersionCommand } from './k8s/k8s.version.command.js';
+import { k8sVersionUpdateCommand } from './k8s/k8s.version.update.command.js';
 import { keycloakCommand } from './keycloak/keycloak.command.js';
 import { keycloakDisableNgCommand } from './keycloak/keycloak.disable-ng.command.js';
 import { keycloakEnableNgCommand } from './keycloak/keycloak.enable-ng.command.js';
@@ -117,6 +129,13 @@ import { ngUnlinkCommand } from './ng/ng.unlink.command.js';
 import { notifyEmailAddCommand } from './notify-email/notify-email.add.command.js';
 import { notifyEmailCommand } from './notify-email/notify-email.command.js';
 import { notifyEmailRemoveCommand } from './notify-email/notify-email.remove.command.js';
+import { oauthConsumersCommand } from './oauth-consumers/oauth-consumers.command.js';
+import { oauthConsumersCreateCommand } from './oauth-consumers/oauth-consumers.create.command.js';
+import { oauthConsumersDeleteCommand } from './oauth-consumers/oauth-consumers.delete.command.js';
+import { oauthConsumersGetCommand } from './oauth-consumers/oauth-consumers.get.command.js';
+import { oauthConsumersListCommand } from './oauth-consumers/oauth-consumers.list.command.js';
+import { oauthConsumersOpenCommand } from './oauth-consumers/oauth-consumers.open.command.js';
+import { oauthConsumersUpdateCommand } from './oauth-consumers/oauth-consumers.update.command.js';
 import { openCommand } from './open/open.command.js';
 import { otoroshiCommand } from './otoroshi/otoroshi.command.js';
 import { otoroshiDisableNgCommand } from './otoroshi/otoroshi.disable-ng.command.js';
@@ -125,6 +144,7 @@ import { otoroshiGetConfigCommand } from './otoroshi/otoroshi.get-config.command
 import { otoroshiGetCommand } from './otoroshi/otoroshi.get.command.js';
 import { otoroshiOpenCommand } from './otoroshi/otoroshi.open.command.js';
 import { otoroshiOpenLogsCommand } from './otoroshi/otoroshi.open.logs.command.js';
+import { otoroshiOpenSwaggeruiCommand } from './otoroshi/otoroshi.open.swaggerui.command.js';
 import { otoroshiOpenWebuiCommand } from './otoroshi/otoroshi.open.webui.command.js';
 import { otoroshiRebuildCommand } from './otoroshi/otoroshi.rebuild.command.js';
 import { otoroshiRestartCommand } from './otoroshi/otoroshi.restart.command.js';
@@ -287,12 +307,32 @@ export const globalCommands = {
   k8s: [
     k8sCommand,
     {
+      activity: k8sActivityCommand,
       'add-persistent-storage': k8sAddPersistentStorageCommand,
       create: k8sCreateCommand,
       delete: k8sDeleteCommand,
       get: k8sGetCommand,
       'get-kubeconfig': k8sGetKubeconfigCommand,
       list: k8sListCommand,
+      nodegroups: [
+        k8sNodeGroupCommand,
+        {
+          create: k8sNodeGroupCreateCommand,
+          delete: k8sNodeGroupDeleteCommand,
+          get: k8sNodeGroupGetCommand,
+          list: k8sNodeGroupListCommand,
+          update: k8sNodeGroupUpdateCommand,
+        },
+      ],
+      quota: k8sQuotaCommand,
+      update: k8sUpdateCommand,
+      version: [
+        k8sVersionCommand,
+        {
+          check: k8sVersionCheckCommand,
+          update: k8sVersionUpdateCommand,
+        },
+      ],
     },
   ],
   keycloak: [
@@ -384,6 +424,17 @@ export const globalCommands = {
       unlink: ngUnlinkCommand,
     },
   ],
+  'oauth-consumers': [
+    oauthConsumersCommand,
+    {
+      create: oauthConsumersCreateCommand,
+      delete: oauthConsumersDeleteCommand,
+      get: oauthConsumersGetCommand,
+      list: oauthConsumersListCommand,
+      open: oauthConsumersOpenCommand,
+      update: oauthConsumersUpdateCommand,
+    },
+  ],
   'notify-email': [
     notifyEmailCommand,
     {
@@ -403,6 +454,7 @@ export const globalCommands = {
         otoroshiOpenCommand,
         {
           logs: otoroshiOpenLogsCommand,
+          swaggerui: otoroshiOpenSwaggeruiCommand,
           webui: otoroshiOpenWebuiCommand,
         },
       ],

package/src/commands/global.options.js

@@ -23,7 +23,7 @@ export const appIdOrNameOption = defineOption({
 export const logsFormatOption = 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',
 });
@@ -44,7 +44,7 @@ export const afterOption = defineOption({
   placeholder: 'after',
 });
 
-export const addonIdOption = defineOption({
+export const addonIdOrRealIdOption = defineOption({
   name: 'addon',
   schema: z.string().optional(),
   description: 'Add-on ID or real ID',
@@ -62,22 +62,22 @@ export const orgaIdOrNameOption = defineOption({
 export const humanJsonOutputFormatOption = defineOption({
   name: 'format',
   schema: z.enum(['human', 'json']).default('human'),
-  description: 'Output format (human, json)',
+  description: 'Output format',
   aliases: ['F'],
   placeholder: 'format',
 });
 
-export const confirmAddonDeletionOption = defineOption({
+export const skipConfirmationOption = defineOption({
   name: 'yes',
   schema: z.boolean().default(false),
-  description: 'Skip confirmation and delete the add-on directly',
+  description: 'Skip confirmation prompts',
   aliases: ['y'],
 });
 
 export const envFormatOption = defineOption({
   name: 'format',
   schema: z.enum(['human', 'json', 'shell']).default('human'),
-  description: 'Output format (human, json, shell)',
+  description: 'Output format',
   aliases: ['F'],
   placeholder: 'format',
 });
@@ -107,7 +107,7 @@ export const followDeployLogsOption = defineOption({
 export const exitOnDeployOption = defineOption({
   name: 'exit-on',
   schema: z.enum(['deploy-start', 'deploy-end', 'never']).default('deploy-end'),
-  description: 'Step at which the logs streaming is ended, steps are: deploy-start, deploy-end, never',
+  description: 'Step at which the logs streaming is ended',
   aliases: ['e'],
   placeholder: 'step',
 });

package/src/commands/help/help.command.js

@@ -3,7 +3,4 @@ import { defineCommand } from '../../lib/define-command.js';
 export const helpCommand = defineCommand({
   description: 'Display help about the Clever Cloud CLI',
   since: '0.1.0',
-  options: {},
-  args: [],
-  handler: null,
 });

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

@@ -0,0 +1,53 @@
+import { z } from 'zod';
+import { defineCommand } from '../../lib/define-command.js';
+import { defineOption } from '../../lib/define-option.js';
+import { k8sListActivity } from '../../lib/k8s.js';
+import { Logger } from '../../logger.js';
+import { humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
+import { k8sIdOrNameArg } from './k8s.args.js';
+
+export const k8sActivityCommand = defineCommand({
+  description: 'Show recent deployment events of a Kubernetes cluster',
+  since: '4.9.0',
+  options: {
+    org: orgaIdOrNameOption,
+    format: humanJsonOutputFormatOption,
+    limit: defineOption({
+      name: 'limit',
+      schema: z.coerce.number().int().min(1).max(1000).default(50),
+      description: 'Number of events to fetch (1 to 1000)',
+      placeholder: 'limit',
+    }),
+  },
+  args: [k8sIdOrNameArg],
+  async handler(options, clusterIdOrName) {
+    const { format, org: orgIdOrName, limit } = options;
+    const events = await k8sListActivity(orgIdOrName, clusterIdOrName, limit);
+
+    switch (format) {
+      case 'json':
+        Logger.printJson(events);
+        break;
+      case 'human':
+      default:
+        if (events.length === 0) {
+          Logger.println('🔎 No deployment event found');
+          return;
+        }
+        console.table(
+          events.map((e) => ({
+            Date: formatDate(e.createdAt),
+            Operation: e.operation,
+            Step: e.stepName ?? '-',
+            Status: e.status,
+          })),
+        );
+        break;
+    }
+  },
+});
+
+function formatDate(iso) {
+  if (iso == null) return '-';
+  return `${iso.slice(0, 19).replace('T', ' ')}Z`;
+}

package/src/commands/k8s/k8s.args.js

@@ -7,3 +7,9 @@ export const k8sIdOrNameArg = defineArgument({
   description: 'Kubernetes cluster ID or name',
   placeholder: 'cluster-id|cluster-name',
 });
+
+export const k8sNodeGroupIdOrNameArg = defineArgument({
+  schema: z.string(),
+  description: 'Kubernetes node group ID or name',
+  placeholder: 'nodegroup-id|nodegroup-name',
+});

package/src/commands/k8s/k8s.command.js

@@ -5,8 +5,4 @@ export const k8sCommand = defineCommand({
   since: '4.3.0',
   isExperimental: true,
   featureFlag: 'k8s',
-  options: {},
-  args: [],
-  // Parent command - no handler, only contains subcommands
-  handler: null,
 });