clever-tools 3.14.0 → 4.0.0

package/src/parsers.js

@@ -1,11 +1,10 @@
 import cliparse from 'cliparse';
-
-import * as Application from './models/application.js';
 import ISO8601 from 'iso8601-duration';
+import * as Application from './models/application.js';
 
 const addonOptionsRegex = /^[\w-]+=.+$/;
 
-export function addonOptions (options) {
+export function addonOptions(options) {
   const optionsArray = typeof options === 'string' ? [options] : options;
   for (const option of optionsArray) {
     if (!option.match(addonOptionsRegex)) {
@@ -15,7 +14,7 @@ export function addonOptions (options) {
   return cliparse.parsers.success(optionsArray.join(','));
 }
 
-export function flavor (flavor) {
+export function flavor(flavor) {
   const flavors = Application.listAvailableFlavors();
   if (flavors.includes(flavor)) {
     return cliparse.parsers.success(flavor);
@@ -23,14 +22,14 @@ export function flavor (flavor) {
   return cliparse.parsers.error('Invalid value: ' + flavor);
 }
 
-export function buildFlavor (flavorOrDisabled) {
+export function buildFlavor(flavorOrDisabled) {
   if (flavorOrDisabled === 'disabled') {
     return cliparse.parsers.success(flavorOrDisabled);
   }
   return flavor(flavorOrDisabled);
 }
 
-export function instances (instances) {
+export function instances(instances) {
   const parsedInstances = parseInt(instances, 10);
   if (isNaN(parsedInstances)) {
     return cliparse.parsers.error('Invalid number: ' + instances);
@@ -41,7 +40,7 @@ export function instances (instances) {
   return cliparse.parsers.success(parsedInstances);
 }
 
-export function date (dateString) {
+export function date(dateString) {
   const date = new Date(dateString);
   if (isNaN(dateString) && !isNaN(date.getTime())) {
     return cliparse.parsers.success(date);
@@ -49,13 +48,13 @@ export function date (dateString) {
 
   const duration = durationInSeconds(dateString);
   if (duration.success) {
-    return cliparse.parsers.success(new Date(Date.now() - (duration.success * 1000)));
+    return cliparse.parsers.success(new Date(Date.now() - duration.success * 1000));
   }
 
   return duration;
 }
 
-export function futureDateOrDuration (dateString) {
+export function futureDateOrDuration(dateString) {
   const date = new Date(dateString);
   if (isNaN(dateString) && !isNaN(date.getTime())) {
     return cliparse.parsers.success(date);
@@ -63,7 +62,7 @@ export function futureDateOrDuration (dateString) {
 
   const duration = durationInSeconds(dateString);
   if (duration.success) {
-    return cliparse.parsers.success(new Date(Date.now() + (duration.success * 1000)));
+    return cliparse.parsers.success(new Date(Date.now() + duration.success * 1000));
   }
 
   return duration;
@@ -72,7 +71,7 @@ export function futureDateOrDuration (dateString) {
 // This simple regex is enough for our use cases
 const emailRegex = /^\S+@\S+\.\S+$/g;
 
-export function email (string) {
+export function email(string) {
   if (string.match(emailRegex)) {
     return cliparse.parsers.success(string);
   }
@@ -81,7 +80,7 @@ export function email (string) {
 
 const appIdRegex = /^app_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
-export function appIdOrName (string) {
+export function appIdOrName(string) {
   if (string.match(appIdRegex)) {
     return cliparse.parsers.success({ app_id: string });
   }
@@ -90,7 +89,7 @@ export function appIdOrName (string) {
 
 const orgaIdRegex = /^(user_|orga_)[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
-export function orgaIdOrName (string) {
+export function orgaIdOrName(string) {
   if (string.match(orgaIdRegex)) {
     return cliparse.parsers.success({ orga_id: string });
   }
@@ -98,9 +97,10 @@ export function orgaIdOrName (string) {
 }
 
 const addonIdRegex = /^addon_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-const operatorIdRegex = /^(keycloak|otoroshi|matomo|metabase)_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const operatorIdRegex =
+  /^(keycloak|otoroshi|matomo|metabase)_[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
-export function addonIdOrName (string) {
+export function addonIdOrName(string) {
   if (string.match(addonIdRegex)) {
     return cliparse.parsers.success({ addon_id: string });
   }
@@ -110,11 +110,11 @@ export function addonIdOrName (string) {
   return cliparse.parsers.success({ addon_name: string });
 }
 
-export function commaSeparated (string) {
+export function commaSeparated(string) {
   return cliparse.parsers.success(string.split(','));
 }
 
-export function integer (string) {
+export function integer(string) {
   const integer = parseInt(string);
   if (isNaN(integer)) {
     return cliparse.parsers.error('Invalid number: ' + string);
@@ -122,7 +122,7 @@ export function integer (string) {
   return cliparse.parsers.success(integer);
 }
 
-export function nonEmptyString (string) {
+export function nonEmptyString(string) {
   if (typeof string !== 'string' || string === '') {
     return cliparse.parsers.error('Invalid string, it should not be empty');
   }
@@ -132,14 +132,14 @@ export function nonEmptyString (string) {
 // /^[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?$/i;
 const tagRegex = /^[^,\s]+$/;
 
-export function tag (string) {
+export function tag(string) {
   if (string.match(tagRegex)) {
     return cliparse.parsers.success(string);
   }
   return cliparse.parsers.error(`Invalid tag '${string}'. Should match ${tagRegex}`);
 }
 
-export function tags (string) {
+export function tags(string) {
   if (String(string).length === 0) {
     return cliparse.parsers.success([]);
   }
@@ -152,9 +152,10 @@ 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 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) {
+export function ipAddress(string) {
   if (string.match(ipAddressRegex)) {
     return cliparse.parsers.success(string);
   }
@@ -163,7 +164,7 @@ export function ipAddress (string) {
 
 export const portNumberRegex = /^\d{1,5}$/;
 
-export function portNumber (number) {
+export function portNumber(number) {
   if (String(number).match(portNumberRegex)) {
     return cliparse.parsers.success(number);
   }
@@ -176,15 +177,16 @@ export function portNumber (number) {
  * @param {string} durationStr an ISO8601, 1h or a positive number
  * @returns {number} number of seconds
  */
-export function durationInSeconds (durationStr = '') {
-  const failed = cliparse.parsers.error(`Invalid duration: "${durationStr}", expect (IS0 8601 duration / a "1h, 1m, 30s" like duration / a positive number in seconds)`);
+export function durationInSeconds(durationStr = '') {
+  const failed = cliparse.parsers.error(
+    `Invalid duration: "${durationStr}", expect (IS0 8601 duration / a "1h, 1m, 30s" like duration / a positive number in seconds)`,
+  );
 
   if (durationStr.startsWith('P')) {
     try {
       const d = ISO8601.parse(durationStr);
       return cliparse.parsers.success(ISO8601.toSeconds(d));
-    }
-    catch (err) {
+    } catch {
       return failed;
     }
   }
@@ -192,8 +194,7 @@ export function durationInSeconds (durationStr = '') {
   try {
     const durationInSeconds = parseSimpleDuration(durationStr);
     return cliparse.parsers.success(durationInSeconds);
-  }
-  catch (err) {
+  } catch {
     const n = Number.parseInt(durationStr);
     if (isNaN(n) || n < 0) {
       return failed;
@@ -214,7 +215,7 @@ const SHORT_UNITS_TO_ISO = {
   y: (v) => `P${v}Y`,
 };
 
-function parseSimpleDuration (durationStr) {
+function parseSimpleDuration(durationStr) {
   const { rawValue, unit } = durationStr.match(/^(?<rawValue>\d+)(?<unit>.*)$/)?.groups ?? {};
   if (unit in SHORT_UNITS_TO_ISO) {
     const value = Number(rawValue);
@@ -225,7 +226,7 @@ function parseSimpleDuration (durationStr) {
 }
 
 // Network groups parsers
-export function ngResourceType (string) {
+export function ngResourceType(string) {
   if (string.startsWith('ng_')) {
     return cliparse.parsers.success({ ngId: string });
   }
@@ -235,11 +236,10 @@ export function ngResourceType (string) {
   return cliparse.parsers.success({ ngResourceLabel: string });
 }
 
-export function ngValidType (string) {
+export function ngValidType(string) {
   if (string === 'NetworkGroup' || string === 'Member' || string === 'CleverPeer' || string === 'ExternalPeer') {
     return cliparse.parsers.success(string);
-  }
-  else {
+  } else {
     return cliparse.parsers.error(`Invalid Network Group resource type: ${string}`);
   }
 }

package/src/load-package-json.cjs

@@ -1,5 +0,0 @@
-const pkg = require('../package.json');
-
-module.exports.getPackageJson = function getPackageJson () {
-  return pkg;
-};