clever-tools 3.11.0 → 3.12.0

package/bin/clever.js

@@ -16,7 +16,7 @@ import * as Application from '../src/models/application.js';
 import { AVAILABLE_ZONES } from '../src/models/application.js';
 import { EXPERIMENTAL_FEATURES } from '../src/experimental-features.js';
 import { getExitOnOption, getOutputFormatOption, getSameCommitPolicyOption } from '../src/command-options.js';
-import { getFeatures } from '../src/models/configuration.js';
+import { getFeatures, conf } from '../src/models/configuration.js';
 
 import * as Addon from '../src/models/addon.js';
 import * as ApplicationConfiguration from '../src/models/application_configuration.js';
@@ -44,6 +44,7 @@ import * as login from '../src/commands/login.js';
 import * as logout from '../src/commands/logout.js';
 import * as logs from '../src/commands/logs.js';
 import * as makeDefault from '../src/commands/makeDefault.js';
+import * as ng from '../src/commands/ng.js';
 import * as notifyEmail from '../src/commands/notify-email.js';
 import * as open from '../src/commands/open.js';
 import * as consoleModule from '../src/commands/console.js';
@@ -56,6 +57,7 @@ import * as ssh from '../src/commands/ssh.js';
 import * as status from '../src/commands/status.js';
 import * as stop from '../src/commands/stop.js';
 import * as tcpRedirs from '../src/commands/tcp-redirs.js';
+import * as tokens from '../src/commands/tokens.js';
 import * as unlink from '../src/commands/unlink.js';
 import * as version from '../src/commands/version.js';
 import * as webhooks from '../src/commands/webhooks.js';
@@ -94,6 +96,39 @@ async function run () {
     kvIdOrName: cliparse.argument('kv-id', {
       description: 'Add-on/Real ID (or name, if unambiguous) of a Materia KV or Redis® add-on',
     }),
+    apiTokenId: cliparse.argument('api-token-id', { description: 'API token ID' }),
+    apiTokenName: cliparse.argument('api-token-name', { description: 'API token name' }),
+    ngId: cliparse.argument('id', {
+      description: 'Network Group ID',
+      parser: Parsers.ngResourceType,
+    }),
+    ngLabel: cliparse.argument('ng-label', {
+      description: 'Network Group label',
+      parser: Parsers.ngResourceType,
+    }),
+    ngIdOrLabel: cliparse.argument('ng-id-or-label', {
+      description: 'Network Group ID or label',
+      parser: Parsers.ngResourceType,
+    }),
+    ngDescription: cliparse.argument('ng-description', {
+      description: 'Network Group description',
+    }),
+    ngExternalPeerLabel: cliparse.argument('external-peer-label', {
+      description: 'External peer label',
+      parser: Parsers.ngResourceType,
+    }),
+    ngExternalIdOrLabel: cliparse.argument('external-peer-id-or-label', {
+      description: 'External peer ID or label',
+      parser: Parsers.ngResourceType,
+    }),
+    ngAnyIdOrLabel: cliparse.argument('id-or-label', {
+      description: 'ID or Label of a Network group, a member or an (external) peer',
+      parser: Parsers.ngResourceType,
+    }),
+    wgPublicKey: cliparse.argument('public-key', {
+      metavar: 'public_key',
+      description: 'Wireguard public key of the external peer to link to a Network Group',
+    }),
     addonIdOrName: cliparse.argument('addon-id', {
       description: 'Add-on ID (or name, if unambiguous)',
       parser: Parsers.addonIdOrName,
@@ -147,6 +182,36 @@ async function run () {
 
   // OPTIONS
   const opts = {
+    apiTokenExpiration: cliparse.option('expiration', {
+      aliases: ['e'],
+      metavar: 'expiration',
+      parser: Parsers.futureDateOrDuration,
+      description: 'Duration until API token expiration (e.g.: 1h, 4d, 2w, 6M), default 1y',
+    }),
+    // Network Groups options
+    ngDescription: cliparse.option('description', {
+      metavar: 'description',
+      description: 'Network Group description',
+    }),
+    ngMembersIdsToLink: cliparse.option('link', {
+      metavar: 'members_ids',
+      description: "Comma separated list of members IDs to link to a Network Group ('app_xxx', 'addon_xxx', 'external_xxx')",
+      parser: Parsers.commaSeparated,
+    }),
+    ngMemberLabel: cliparse.option('label', {
+      required: false,
+      metavar: 'member_label',
+      description: 'The member label',
+      parser: Parsers.ngResourceType,
+    }),
+    ngPeerGetConfig: cliparse.flag('config', {
+      description: 'Get the Wireguard configuration of an external peer',
+    }),
+    ngResourceType: cliparse.option('type', {
+      metavar: 'type',
+      description: 'Type of resource to look for (NetworkGroup, Member, CleverPeer, ExternalPeer)',
+      parser: Parsers.ngValidType,
+    }),
     sourceableEnvVarsList: cliparse.flag('add-export', { description: 'Display sourceable env variables setting' }),
     logsFormat: getOutputFormatOption(['json-stream']),
     activityFormat: getOutputFormatOption(['json-stream']),
@@ -746,6 +811,56 @@ async function run () {
     args: [args.alias],
   }, makeDefault.makeDefault);
 
+  // NETWORK GROUP COMMANDS
+  const ngCreateExternalPeerCommand = cliparse.command('external', {
+    description: 'Create an external peer in a Network Group',
+    args: [args.ngExternalPeerLabel, args.ngIdOrLabel, args.wgPublicKey],
+  }, ng.createExternalPeer);
+  const ngDeleteExternalPeerCommand = cliparse.command('external', {
+    description: 'Delete an external peer from a Network Group',
+    args: [args.ngExternalIdOrLabel, args.ngIdOrLabel],
+  }, ng.deleteExternalPeer);
+  const ngCreateCommand = cliparse.command('create', {
+    description: 'Create a Network Group',
+    args: [args.ngLabel],
+    privateOptions: [opts.ngMembersIdsToLink, opts.ngDescription, opts.optTags],
+    commands: [ngCreateExternalPeerCommand],
+  }, ng.createNg);
+  const ngDeleteCommand = cliparse.command('delete', {
+    description: 'Delete a Network Group',
+    args: [args.ngIdOrLabel],
+    commands: [ngDeleteExternalPeerCommand],
+  }, ng.deleteNg);
+  const ngLinkCommand = cliparse.command('link', {
+    description: 'Link an application or a database add-on by its ID to a Network Group',
+    args: [args.ngAnyIdOrLabel, args.ngIdOrLabel],
+  }, ng.linkToNg);
+  const ngUnlinkCommand = cliparse.command('unlink', {
+    description: 'Unlink an application or a database add-on by its ID from a Network Group',
+    args: [args.ngAnyIdOrLabel, args.ngIdOrLabel],
+  }, ng.unlinkFromNg);
+  const ngGetCommand = cliparse.command('get', {
+    description: 'Get details about a Network Group, a member or a peer',
+    args: [args.ngAnyIdOrLabel],
+    options: [opts.ngResourceType, opts.humanJsonOutputFormat],
+  }, ng.get);
+  const ngGetConfigCommand = cliparse.command('get-config', {
+    description: 'Get the Wireguard configuration of a peer in a Network Group',
+    args: [args.ngExternalIdOrLabel, args.ngIdOrLabel],
+    options: [opts.humanJsonOutputFormat],
+  }, ng.getPeerConfig);
+  const ngSearchCommand = cliparse.command('search', {
+    description: 'Search Network Groups, members or peers and get their details',
+    args: [args.ngAnyIdOrLabel],
+    options: [opts.ngResourceType, opts.humanJsonOutputFormat],
+  }, ng.search);
+  const networkGroupsCommand = cliparse.command('ng', {
+    description: 'List Network Groups',
+    options: [opts.orgaIdOrName],
+    privateOptions: [opts.humanJsonOutputFormat],
+    commands: [ngCreateCommand, ngDeleteCommand, ngLinkCommand, ngUnlinkCommand, ngGetCommand, ngGetConfigCommand, ngSearchCommand],
+  }, ng.listNg);
+
   // NOTIFY-EMAIL COMMAND
   const addEmailNotificationCommand = cliparse.command('add', {
     description: 'Add a new email notification',
@@ -880,6 +995,22 @@ async function run () {
     commands: [tcpRedirsListNamespacesCommand, tcpRedirsAddCommand, tcpRedirsRemoveCommand],
   }, tcpRedirs.list);
 
+  // TOKENS COMMANDS
+  const apiTokenCreateCommand = cliparse.command('create', {
+    description: 'Create an API token',
+    args: [args.apiTokenName],
+    options: [opts.apiTokenExpiration, opts.humanJsonOutputFormat],
+  }, tokens.create);
+  const apiTokenRevokeCommand = cliparse.command('revoke', {
+    description: 'Revoke an API token',
+    args: [args.apiTokenId],
+  }, tokens.revoke);
+  const tokensCommands = cliparse.command('tokens', {
+    description: `Manage API tokens to query Clever Cloud API from ${conf.AUTH_BRIDGE_HOST}`,
+    commands: [apiTokenCreateCommand, apiTokenRevokeCommand],
+    privateOptions: [opts.humanJsonOutputFormat],
+  }, tokens.list);
+
   // UNLINK COMMAND
   const appUnlinkCommand = cliparse.command('unlink', {
     description: 'Unlink this repo from an existing application',
@@ -982,6 +1113,14 @@ async function run () {
     commands.push(colorizeExperimentalCommand(kvRawCommand, 'kv'));
   }
 
+  if (featuresFromConf.tokens) {
+    commands.push(colorizeExperimentalCommand(tokensCommands, 'tokens'));
+  }
+
+  if (featuresFromConf.ng) {
+    commands.push(colorizeExperimentalCommand(networkGroupsCommand, 'ng'));
+  }
+
   // CLI PARSER
   const cliParser = cliparse.cli({
     name: 'clever',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "type": "module",
@@ -26,12 +26,13 @@
     "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "9.1.0",
+    "@clevercloud/client": "9.2.0",
+    "@inquirer/prompts": "7.3.2",
     "cliparse": "0.5.0",
     "colors": "1.4.0",
     "common-env": "6.4.0",
     "curlconverter": "3.21.0",
-    "duration-js": "4.0.0",
+    "dedent": "1.5.3",
     "eventsource": "1.1.0",
     "ioredis": "5.4.1",
     "iso8601-duration": "2.1.2",

package/src/clever-client/auth-bridge.js

@@ -0,0 +1,61 @@
+export function createApiToken ({ email, password, mfaCode, name, description, expirationDate }) {
+  return Promise.resolve({
+    method: 'post',
+    url: '/api-tokens',
+    headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
+    body: { email, password, mfaCode, name, description, expirationDate },
+  });
+}
+
+export function listApiTokens () {
+  return Promise.resolve({
+    method: 'get',
+    url: '/api-tokens',
+    headers: { Accept: 'application/json' },
+  });
+}
+
+export function updateApiToken (apiTokenId, { name, description }) {
+  return Promise.resolve({
+    method: 'put',
+    url: `/api-tokens/${apiTokenId}`,
+    headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
+    body: { name, description },
+  });
+}
+
+export function deleteApiToken (apiTokenId) {
+  return Promise.resolve({
+    method: 'delete',
+    url: `/api-tokens/${apiTokenId}`,
+    headers: { Accept: 'application/json' },
+  });
+}
+
+export function addOauthHeaderPlaintext (tokens) {
+
+  return async function (requestParams) {
+
+    const authorizationHeader = (
+      'OAuth '
+      + [
+        `oauth_consumer_key="${tokens.OAUTH_CONSUMER_KEY}"`,
+        `oauth_token="${tokens.API_OAUTH_TOKEN}"`,
+        // %26 is URL escaped character "&"
+        `oauth_signature="${tokens.OAUTH_CONSUMER_SECRET}%26${tokens.API_OAUTH_TOKEN_SECRET}"`,
+        // oauth_nonce is not mandatory
+        // oauth_signature_method is not mandatory, it defaults to PLAINTEXT
+        // oauth_timestamp is not mandatory
+        // oauth_version is not mandatory, it defaults to 1.0
+      ].join(', ')
+    );
+
+    return {
+      ...requestParams,
+      headers: {
+        authorization: authorizationHeader,
+        ...requestParams.headers,
+      },
+    };
+  };
+}

package/src/clever-client/ng.js

@@ -0,0 +1,18 @@
+// TODO: Move this to the Clever Cloud JS Client
+
+/**
+ * GET /networkgroups/organisations/{ownerId}/networkgroups/search?query
+ * @param {Object} params
+ * @param {String} params.ownerId
+ * @param {String} params.query
+ */
+export function searchNetworkGroupOrResource (params) {
+  // no multipath for /self or /organisations/{id}
+  return Promise.resolve({
+    method: 'get',
+    url: `/v4/networkgroups/organisations/${params.ownerId}/networkgroups/search`,
+    headers: { Accept: 'application/json' },
+    queryParams: { query: params.query },
+    // no body
+  });
+}

package/src/commands/addon.js

@@ -12,6 +12,7 @@ import { sendToApi } from '../models/send-to-api.js';
 import { toNameEqualsValueString } from '@clevercloud/client/esm/utils/env-vars.js';
 import { resolveAddonId } from '../models/ids-resolver.js';
 import { conf } from '../models/configuration.js';
+import dedent from 'dedent';
 
 const formatTable = initFormatTable();
 
@@ -124,42 +125,42 @@ function displayAddon (format, addon, providerName, message) {
   const WIP_PROVIDERS = {
     keycloak: {
       status: 'beta',
-      postCreateInstructions: [
-        `Learn more about Keycloak on Clever Cloud: ${conf.DOC_URL}/addons/keycloak/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        Learn more about Keycloak on Clever Cloud: ${conf.DOC_URL}/addons/keycloak/,
+      `,
     },
     kv: {
       status: 'alpha',
-      postCreateInstructions: [
-        colors.yellow('You can easily use Materia KV with \'redis-cli\', with such commands:'),
-        colors.blue(`source <(clever addon env ${addon.id} -F shell)`),
-        colors.blue('redis-cli -h $KV_HOST -p $KV_PORT --tls'),
-        `Learn more about Materia KV on Clever Cloud: ${conf.DOC_URL}/addons/materia-kv/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        ${colors.yellow('You can easily use Materia KV with \'redis-cli\', with such commands:')}
+        ${colors.blue(`source <(clever addon env ${addon.id} -F shell)`)}
+        ${colors.blue('redis-cli -h $KV_HOST -p $KV_PORT --tls')}
+        Learn more about Materia KV on Clever Cloud: ${conf.DOC_URL}/addons/materia-kv/
+      `,
     },
     'addon-matomo': {
       status: 'beta',
-      postCreateInstructions: [
-        `Learn more about Matomo on Clever Cloud: ${conf.DOC_URL}/addons/matomo/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        Learn more about Matomo on Clever Cloud: ${conf.DOC_URL}/addons/matomo/
+      `,
     },
     metabase: {
       status: 'beta',
-      postCreateInstructions: [
-        `Learn more about Metabase on Clever Cloud: ${conf.DOC_URL}/addons/metabase/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        Learn more about Metabase on Clever Cloud: ${conf.DOC_URL}/addons/metabase/
+      `,
     },
     otoroshi: {
       status: 'beta',
-      postCreateInstructions: [
-        `Learn more about Otoroshi with LLM on Clever Cloud: ${conf.DOC_URL}/addons/otoroshi/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        Learn more about Otoroshi with LLM on Clever Cloud: ${conf.DOC_URL}/addons/otoroshi/
+      `,
     },
     'addon-pulsar': {
       status: 'beta',
-      postCreateInstructions: [
-        `Learn more about Pulsar on Clever Cloud: ${conf.DOC_URL}/addons/pulsar/`,
-      ].join('\n'),
+      postCreateInstructions: dedent`
+        Learn more about Pulsar on Clever Cloud: ${conf.DOC_URL}/addons/pulsar/
+      `,
     },
   };
 

package/src/commands/config.js

@@ -1,4 +1,4 @@
-import * as application from '@clevercloud/client/esm/api/v2/application.js';
+import { update as updateApplication } from '@clevercloud/client/esm/api/v2/application.js';
 
 import * as Application from '../models/application.js';
 import * as ApplicationConfiguration from '../models/application_configuration.js';
@@ -26,7 +26,7 @@ export async function set (params) {
   const config = ApplicationConfiguration.getById(configurationName);
 
   if (config != null) {
-    const app = await application.update({ id: ownerId, appId }, { [config.name]: ApplicationConfiguration.parse(config, configurationValue) }).then(sendToApi);
+    const app = await updateApplication({ id: ownerId, appId }, { [config.name]: ApplicationConfiguration.parse(config, configurationValue) }).then(sendToApi);
 
     ApplicationConfiguration.printById(app, configurationName);
   }
@@ -41,7 +41,7 @@ export async function update (params) {
     throw new Error('No configuration to update');
   }
 
-  const app = await application.update({ id: ownerId, appId }, options).then(sendToApi);
+  const app = await updateApplication({ id: ownerId, appId }, options).then(sendToApi);
 
   for (const configName of Object.keys(options)) {
     ApplicationConfiguration.printByName(app, configName);

package/src/commands/curl.js

@@ -1,9 +1,10 @@
 import { spawn } from 'node:child_process';
-import { loadOAuthConf, conf } from '../models/configuration.js';
+import { conf, loadOAuthConf } from '../models/configuration.js';
 import { addOauthHeader } from '@clevercloud/client/esm/oauth.js';
 import { Logger } from '../logger.js';
 import colors from 'colors/safe.js';
 import curlconverter from 'curlconverter';
+import dedent from 'dedent';
 
 async function loadTokens () {
   const tokens = await loadOAuthConf();
@@ -16,22 +17,21 @@ async function loadTokens () {
 }
 
 function printCleverCurlHelp () {
-  const apiDocUrlv2 = `${conf.API_DOC_URL}/v2/`;
-  const apiDocUrlv4 = `${conf.API_DOC_URL}/v4/`;
-
-  Logger.println(`Usage: clever curl
-Query Clever Cloud's API using Clever Tools credentials. For example:
-
-  clever curl ${conf.API_HOST}/v2/self
-  clever curl ${conf.API_HOST}/v2/summary
-  clever curl ${conf.API_HOST}/v4/products/zones
-  clever curl ${conf.API_HOST}/v2/organisations/<ORGANISATION_ID>/applications | jq '.[].id'
-  clever curl ${conf.API_HOST}/v4/billing/organisations/<ORGANISATION_ID>/<INVOICE_NUMBER>.pdf > invoice.pdf
-
-Our API documentation is available here :
-
-  ${apiDocUrlv2}
-  ${apiDocUrlv4}`);
+  Logger.println(dedent`
+    Usage: clever curl
+    Query Clever Cloud's API using Clever Tools credentials. For example:
+    
+      clever curl ${conf.API_HOST}/v2/self
+      clever curl ${conf.API_HOST}/v2/summary
+      clever curl ${conf.API_HOST}/v4/products/zones
+      clever curl ${conf.API_HOST}/v2/organisations/<ORGANISATION_ID>/applications | jq '.[].id'
+      clever curl ${conf.API_HOST}/v4/billing/organisations/<ORGANISATION_ID>/<INVOICE_NUMBER>.pdf > invoice.pdf
+    
+    Our API documentation is available here :
+    
+      ${conf.API_DOC_URL}/v2/
+      ${conf.API_DOC_URL}/v4/
+  `);
 }
 
 export async function curl () {

package/src/commands/database.js

@@ -2,8 +2,8 @@ import { sendToApi } from '../models/send-to-api.js';
 import { getBackups } from '@clevercloud/client/esm/api/v2/backups.js';
 import { Logger } from '../logger.js';
 import { formatTable as initFormatTable } from '../format-table.js';
-import superagent from 'superagent';
 import fs from 'node:fs';
+import { Writable } from 'node:stream';
 import { findOwnerId } from '../models/addon.js';
 import { resolveRealId, resolveAddonId } from '../models/ids-resolver.js';
 
@@ -80,14 +80,14 @@ export async function downloadBackups (params) {
     throw new Error('no backup with this ID');
   }
 
-  const res = await superagent
-    .get(backup.download_url)
-    .responseType('blob');
-
-  if (output) {
-    fs.writeFileSync(output, res.body);
-    return;
+  const response = await globalThis.fetch(backup.download_url);
+  if (!response.ok) {
+    throw new Error('Failed to download backup');
   }
 
-  process.stdout.write(res.body);
+  await response
+    .body
+    .pipeTo(
+      Writable.toWeb(output ? fs.createWriteStream(output) : process.stdout),
+    );
 }

package/src/commands/domain.js

@@ -9,7 +9,7 @@ import {
   removeDomain,
   unmarkFavouriteDomain,
 } from '@clevercloud/client/esm/api/v2/application.js';
-import { getSummary } from '@clevercloud/client/cjs/api/v2/user.js';
+import { getSummary } from '@clevercloud/client/esm/api/v2/user.js';
 import { sendToApi } from '../models/send-to-api.js';
 import colors from 'colors/safe.js';
 import { parse as parseDomain } from 'tldts';
@@ -17,6 +17,7 @@ import { diagDomainConfig } from '@clevercloud/client/esm/utils/diag-domain-conf
 import { sortDomains } from '@clevercloud/client/esm/utils/domains.js';
 import { DnsResolver } from '../models/node-dns-resolver.js';
 import _ from 'lodash';
+import { getDefaultLoadBalancersDnsInfo } from '@clevercloud/client/esm/api/v4/load-balancers.js';
 
 /**
  * @typedef {import('@clevercloud/client/esm/utils/diag-domain-config.types.js').DomainInfo} DomainInfo
@@ -110,7 +111,7 @@ export async function diagApplication (params) {
   let hasError = false;
 
   const app = await getApp({ id: ownerId, appId }).then(sendToApi);
-  const expectedDnsForPublicLoadBalancer = await getDefaultLoadBalancersDnsInfo({ id: ownerId, appId }).then(sendToApi);
+  const expectedDnsForPublicLoadBalancer = await getDefaultLoadBalancersDnsInfo({ ownerId, appId }).then(sendToApi);
 
   const loadBalancerDnsConfig = {
     aRecords: expectedDnsForPublicLoadBalancer[0].dns.a,
@@ -181,7 +182,16 @@ export async function overview (params) {
 
   const applicationsWithDomains = await Promise.all(
     applications.map(async (app) => {
-      const domains = await getAllDomains({ id: app.ownerId, appId: app.id }).then(sendToApi);
+      const domains = await getAllDomains({ id: app.ownerId, appId: app.id })
+        .then(sendToApi)
+        .catch((error) => {
+          // if the user cannot access application domains, we simply act as if there were no domains
+          if (error?.response?.status === 403) {
+            Logger.printErrorLine(`You cannot list domains for application ${app.name} (${app.id})`);
+            return [];
+          }
+          throw error;
+        });
       return { app, domains };
     }),
   );
@@ -351,19 +361,6 @@ function reportDomainDiagnostics ({ hostname, pathPrefix, resolvedDnsConfig, dia
   }
 }
 
-// TODO: put in clever client
-function getDefaultLoadBalancersDnsInfo (params) {
-  return Promise.resolve({
-    method: 'get',
-    url: `/v4/load-balancers/organisations/${params.id}/applications/${params.appId}/load-balancers/default`,
-    headers: {
-      Accept: 'application/json',
-    },
-    // no query params
-    // no body
-  });
-}
-
 /**
  * Parses domain information from vhosts array
  *

package/src/commands/env.js

@@ -4,16 +4,23 @@ import colors from 'colors/safe.js';
 import * as variables from '../models/variables.js';
 import { sendToApi } from '../models/send-to-api.js';
 import { toNameEqualsValueString, validateName } from '@clevercloud/client/esm/utils/env-vars.js';
-import * as application from '@clevercloud/client/esm/api/v2/application.js';
+import {
+  getAllEnvVars,
+  getAllEnvVarsForAddons,
+  getAllEnvVarsForDependencies,
+  updateEnvVar,
+  updateAllEnvVars,
+  removeEnvVar,
+} from '@clevercloud/client/esm/api/v2/application.js';
 
 export async function list (params) {
   const { alias, app: appIdOrName, 'add-export': addExportsOption, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
   const [envFromApp, envFromAddons, envFromDeps] = await Promise.all([
-    application.getAllEnvVars({ id: ownerId, appId }).then(sendToApi),
-    application.getAllEnvVarsForAddons({ id: ownerId, appId }).then(sendToApi),
-    application.getAllEnvVarsForDependencies({ id: ownerId, appId }).then(sendToApi),
+    getAllEnvVars({ id: ownerId, appId }).then(sendToApi),
+    getAllEnvVarsForAddons({ id: ownerId, appId }).then(sendToApi),
+    getAllEnvVarsForDependencies({ id: ownerId, appId }).then(sendToApi),
   ]);
 
   switch (format) {
@@ -69,7 +76,7 @@ export async function set (params) {
 
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
-  await application.updateEnvVar({ id: ownerId, appId, envName }, { value }).then(sendToApi);
+  await updateEnvVar({ id: ownerId, appId, envName }, { value }).then(sendToApi);
 
   Logger.println('Your environment variable has been successfully saved');
 };
@@ -79,7 +86,7 @@ export async function rm (params) {
   const { alias, app: appIdOrName } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
-  await application.removeEnvVar({ id: ownerId, appId, envName }).then(sendToApi);
+  await removeEnvVar({ id: ownerId, appId, envName }).then(sendToApi);
 
   Logger.println('Your environment variable has been successfully removed');
 };
@@ -90,7 +97,7 @@ export async function importEnv (params) {
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
   const envVars = await variables.readVariablesFromStdin(format);
-  await application.updateAllEnvVars({ id: ownerId, appId }, envVars).then(sendToApi);
+  await updateAllEnvVars({ id: ownerId, appId }, envVars).then(sendToApi);
 
   Logger.println('Environment variables have been set');
 };
@@ -110,7 +117,7 @@ export async function importVarsFromLocalEnv (params) {
 
   for (const envName of envNames) {
     const value = process.env[envName] || '';
-    await application.updateEnvVar({ id: ownerId, appId, envName }, { value }).then(sendToApi);
+    await updateEnvVar({ id: ownerId, appId, envName }, { value }).then(sendToApi);
   }
 
   Logger.println('Your environment variables have been successfully saved');

package/src/commands/kv.js

@@ -2,7 +2,7 @@ import Redis from 'ioredis';
 import colors from 'colors/safe.js';
 import { Logger } from '../logger.js';
 import { sendToApi } from '../models/send-to-api.js';
-import { getAllEnvVars } from '@clevercloud/client/cjs/api/v2/addon.js';
+import { getAllEnvVars } from '@clevercloud/client/esm/api/v2/addon.js';
 import { findAddonsByNameOrId } from '../models/ids-resolver.js';
 
 const URL_ENV_KEY = 'REDIS_URL';

package/src/commands/link.js

@@ -7,9 +7,11 @@ export async function link (params) {
 
   if (app.app_id != null && orgaIdOrName != null) {
     Logger.warn('You\'ve specified a unique application ID, organisation option will be ignored');
+    await Application.linkRepo(app, null, alias);
+  }
+  else {
+    await Application.linkRepo(app, orgaIdOrName, alias);
   }
-
-  await Application.linkRepo(app, orgaIdOrName, alias);
 
   Logger.println('Your application has been successfully linked!');
 }