clever-tools 4.4.0 → 4.4.1

package/bin/clever.js

@@ -206,9 +206,6 @@ async function run() {
       aliases: ['w'],
       description: 'Watch the deployment until the cluster is deployed',
     }),
-    kubeConfigForceDownload: cliparse.flag('force', {
-      description: 'Force the download of the kubeconfig file, even if it already exists',
-    }),
     targetVersion: cliparse.option('target', {
       metavar: 'version',
       description: 'Target version to upgrade to (e.g.: 24, 2.4, 2.4.1)',

package/package.json

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

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

@@ -15,15 +15,6 @@ export function listApiTokens() {
   });
 }
 
-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',

package/src/clever-client/drains.js

@@ -108,20 +108,3 @@ export function enableDrain(params) {
     // no body
   });
 }
-
-/**
- * PATCH /v4/drains/organisations/{ownerId}/applications/{applicationId}/drains/{drainId}/reset-cursor
- * @param {Object} params
- * @param {String} params.ownerId
- * @param {String} params.applicationId
- * @param {String} params.drainId
- */
-export function resetDrainCursor(params) {
-  // no multipath for /self or /organisations/{id}
-  return Promise.resolve({
-    method: 'patch',
-    url: `/v4/drains/organisations/${params.ownerId}/applications/${params.applicationId}/drains/${params.drainId}/reset-cursor`,
-    headers: { Accept: 'application/json' },
-    // no body
-  });
-}

package/src/clever-client/operators.js

@@ -130,7 +130,7 @@ export function getOtoroshiConfig(params) {
   return Promise.resolve({
     method: 'get',
     url: `/v4/addon-providers/addon-otoroshi/addons/${params.realId}/config.yaml`,
-    // headers: { Accept: 'application/yaml' },
+    headers: { Accept: 'application/yaml' },
     // no queryParams
     // no body
   });

package/src/commands/k8s.js

@@ -73,7 +73,7 @@ export async function del(params) {
   const [clusterIdOrName] = params.args;
   const { org: orgIdOrName, yes: confirmDeletion } = params.options;
 
-  let proceedDeletion = false;
+  let proceedDeletion;
   if (confirmDeletion) {
     proceedDeletion = true;
   } else {

package/src/commands/otoroshi.js

@@ -58,7 +58,6 @@ export async function get(params) {
  */
 export async function getConfig(params) {
   const [addonIdOrName] = params.args;
-  const { format } = params.options;
   await operatorPrint('otoroshi', addonIdOrName, 'otoroshictl');
 }
 

package/src/lib/k8s.js

@@ -42,7 +42,7 @@ export async function k8sCreate(name, ownerId) {
  * @param {string} format The output format
  * @returns {Promise<void>}
  */
-export async function k8sList(orgIdOrName, format) {
+export async function k8sList(orgIdOrName) {
   const ownerId = await getOwnerIdFromOrgIdOrName(orgIdOrName);
   const deployed = await listK8sClusters({ ownerId }).then(sendToApi);
 

package/src/models/addon.js

@@ -228,22 +228,6 @@ export function completePlan() {
   return cliparse.autocomplete.words(['dev', 's', 'm', 'l', 'xl', 'xxl']);
 }
 
-export async function findById(addonId) {
-  const { user, organisations } = await getSummary({}).then(sendToApi);
-  for (const orga of [user, ...organisations]) {
-    for (const simpleAddon of orga.addons) {
-      if (simpleAddon.id === addonId) {
-        const addon = await getAddon({ id: orga.id, addonId }).then(sendToApi);
-        return {
-          ...addon,
-          orgaId: orga.id,
-        };
-      }
-    }
-  }
-  throw new Error(`Could not find add-on with ID: ${addonId}`);
-}
-
 export async function findByName(addonName) {
   const { user, organisations } = await getSummary({}).then(sendToApi);
   for (const orga of [user, ...organisations]) {

package/src/models/app_configuration.js

@@ -131,27 +131,6 @@ function findDefaultApp(config) {
   );
 }
 
-async function getAppDetailsForId(appId) {
-  const config = await loadApplicationConf();
-
-  if (_.isEmpty(config.apps)) {
-    throw new Error('There is no linked or targeted application. Use `--app` option or `clever link` command.');
-  }
-
-  const [appById, secondAppById] = _.filter(config.apps, { app_id: appId });
-  if (appById == null) {
-    throw new Error(`There are no applications matching id '${appId}'`);
-  }
-  if (secondAppById != null) {
-    throw new Error(
-      `There are several applications matching id '${appId}'.` +
-        'This should not happen, your `.clever.json` should be fixed.',
-    );
-  }
-
-  return appById;
-}
-
 export async function getAppDetails({ alias }) {
   const config = await loadApplicationConf();
   const app = findApp(config, alias);
@@ -165,15 +144,6 @@ export async function getAppDetails({ alias }) {
   };
 }
 
-export async function getMostNaturalName(appId) {
-  try {
-    const details = await getAppDetailsForId(appId);
-    return details.alias || details.name || appId;
-  } catch {
-    return appId;
-  }
-}
-
 function persistConfig(modifiedConfig) {
   const jsonContents = JSON.stringify(modifiedConfig, null, 2);
   return fs.writeFile(conf.APP_CONFIGURATION_FILE, jsonContents);

package/src/models/log-v4.js

@@ -134,11 +134,17 @@ export async function watchDeploymentAndDisplayLogs(options) {
   }
 
   if (deploymentEnded.state === 'OK') {
-    const favouriteDomain = await getBest(appId, ownerId);
     Logger.println('');
-    Logger.println(
-      `${styleText(['bold', 'green'], '✓ Access your application:')} ${styleText(['underline', 'bold'], `https://${favouriteDomain.fqdn}`)}`,
-    );
+
+    // There can be applications without any domain, so we don't fail if we can't get one
+    const favouriteDomain = await getBest(appId, ownerId).catch(() => null);
+
+    if (favouriteDomain) {
+      Logger.println(
+        `${styleText(['bold', 'green'], '✓ Access your application:')} ${styleText(['underline', 'bold'], `https://${favouriteDomain.fqdn}`)}`,
+      );
+    }
+
     Logger.println(
       `${styleText(['bold', 'blue'], '→ Manage your application:')} ${styleText(['underline', 'bold'], `${conf.GOTO_URL}/${appId}`)}`,
     );

package/src/parsers.js

@@ -154,25 +154,6 @@ export function tags(string) {
   return cliparse.parsers.success(tags);
 }
 
-export const ipAddressRegex =
-  /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$/;
-
-export function ipAddress(string) {
-  if (string.match(ipAddressRegex)) {
-    return cliparse.parsers.success(string);
-  }
-  return cliparse.parsers.error(`Invalid IP address '${string}'. Should match ${ipAddressRegex}`);
-}
-
-export const portNumberRegex = /^\d{1,5}$/;
-
-export function portNumber(number) {
-  if (String(number).match(portNumberRegex)) {
-    return cliparse.parsers.success(number);
-  }
-  return cliparse.parsers.error(`Invalid port number '${number}'. Should match ${portNumberRegex}`);
-}
-
 /**
  * Parse a duration into seconds
  * A Zero seconds duration is allowed