clever-tools 4.9.0 → 4.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Command Line Interface for Clever Cloud.",
   "keywords": [
     "cli",

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

@@ -113,6 +113,7 @@ clever addon providers [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)|
 
 ## ➡️ `clever addon providers show` <kbd>Since 0.2.3</kbd>
 
@@ -133,6 +134,7 @@ clever addon providers show <addon-provider> [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)|
 
 ## ➡️ `clever addon rename` <kbd>Since 0.3.0</kbd>
 

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

@@ -3,19 +3,22 @@ import { defineCommand } from '../../lib/define-command.js';
 import { styleText } from '../../lib/style-text.js';
 import { Logger } from '../../logger.js';
 import * as Addon from '../../models/addon.js';
-import { humanJsonOutputFormatOption } from '../global.options.js';
+import { getOwnerIdFromOrgIdOrName } from '../../models/ids-resolver.js';
+import { humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
 
 export const addonProvidersCommand = defineCommand({
   description: 'List available add-on providers',
   since: '0.2.3',
   options: {
+    org: orgaIdOrNameOption,
     format: humanJsonOutputFormatOption,
   },
   args: [],
   async handler(options) {
-    const { format } = options;
+    const { org: orgaIdOrName, format } = options;
 
-    const providers = await Addon.listProviders();
+    const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
+    const providers = await Addon.listProviders(ownerId);
 
     switch (format) {
       case 'json': {

package/src/commands/addon/addon.providers.show.command.js

@@ -2,20 +2,23 @@ import { defineCommand } from '../../lib/define-command.js';
 import { styleText } from '../../lib/style-text.js';
 import { Logger } from '../../logger.js';
 import * as Addon from '../../models/addon.js';
-import { humanJsonOutputFormatOption } from '../global.options.js';
+import { getOwnerIdFromOrgIdOrName } from '../../models/ids-resolver.js';
+import { humanJsonOutputFormatOption, orgaIdOrNameOption } from '../global.options.js';
 import { addonProviderArg } from './addon.args.js';
 
 export const addonProvidersShowCommand = defineCommand({
   description: 'Show information about an add-on provider',
   since: '0.2.3',
   options: {
+    org: orgaIdOrNameOption,
     format: humanJsonOutputFormatOption,
   },
   args: [addonProviderArg],
   async handler(options, providerName) {
-    const { format } = options;
+    const { org: orgaIdOrName, format } = options;
 
-    const provider = await Addon.getProvider(providerName);
+    const ownerId = await getOwnerIdFromOrgIdOrName(orgaIdOrName);
+    const provider = await Addon.getProvider(providerName, ownerId);
     const providerInfos = await Addon.getProviderInfos(providerName);
 
     const formattedPlans = [...provider.plans]

package/src/models/addon.js

@@ -15,12 +15,12 @@ import { Logger } from '../logger.js';
 import { resolveOwnerId } from './ids-resolver.js';
 import { sendToApi } from './send-to-api.js';
 
-export function listProviders() {
-  return getAllAddonProviders({}).then(sendToApi);
+export function listProviders(orgaId) {
+  return getAllAddonProviders({ orgaId }).then(sendToApi);
 }
 
-export async function getProvider(providerName) {
-  const providers = await listProviders();
+export async function getProvider(providerName, orgaId) {
+  const providers = await listProviders(orgaId);
   const provider = providers.find((p) => p.id === providerName);
   if (provider == null) {
     throw new Error(`Invalid provider name. Available providers: ${providers.map((p) => p.id).join(', ')}`);
@@ -129,7 +129,7 @@ function validateAddonVersionAndOptions(region, version, addonOptions, providerI
 
 export async function create({ ownerId, name, providerName, planName, region, version, addonOptions }) {
   // TODO: We should be able to use it without {}
-  const provider = await getProvider(providerName);
+  const provider = await getProvider(providerName, ownerId);
 
   if (!provider.regions.includes(region)) {
     throw new Error(`Invalid region name. Available regions: ${provider.regions.join(', ')}`);