clever-tools 3.9.0 → 3.10.0

package/bin/clever.js

@@ -342,6 +342,7 @@ function run () {
     }),
     addonOptions: cliparse.option('option', {
       metavar: 'option',
+      parser: Parsers.addonOptions,
       description: 'Option to enable for the add-on. Multiple --option argument can be passed to enable multiple options',
     }),
     region: cliparse.option('region', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "type": "module",

package/src/commands/domain.js

@@ -192,7 +192,8 @@ export async function overview (params) {
         .filter((domain) => filter == null || domain.fqdn.includes(filter))
         .map((domain) => {
 
-          const parsedDomain = parseDomain(domain.fqdn);
+          // `validateHostname` is set to `false` so that wildcard domains may be parsed correctly
+          const parsedDomain = parseDomain(domain.fqdn, { validateHostname: false });
           const pathname = new URL('https://' + domain.fqdn).pathname;
           const subdomains = parsedDomain.subdomain !== '' ? parsedDomain.subdomain.split('.') : [];
 
@@ -337,7 +338,7 @@ function reportDomainDiagnostics ({ hostname, pathPrefix, resolvedDnsConfig, dia
 
     unknownDiags.forEach((diag) => {
       const source = hasCnameRecord ? `(from CNAME ${resolvedDnsConfig.cnameRecords[0]}.)` : '';
-      printlnWithIndent(diag.record.value + source, 6);
+      printlnWithIndent(`${diag.record.value} ${source}`, 6);
     });
   }
 
@@ -395,7 +396,12 @@ function recursiveSort (obj) {
   }
 
   const sortedObj = {};
-  Object.keys(obj).sort((a, b) => a.localeCompare(b)).forEach((key) => {
+  Object.keys(obj).sort((a, b) => {
+    // if the domain contains a wildcard, we want it to be the first of subdomains
+    const aWithReplacedWildcard = a.replace(/^\*/, 'a');
+    const bWithReplacedWildcard = b.replace(/^\*/, 'a');
+    return aWithReplacedWildcard.localeCompare(bWithReplacedWildcard);
+  }).forEach((key) => {
     sortedObj[key] = recursiveSort(obj[key]);
   });
 

package/src/models/addon.js

@@ -274,10 +274,14 @@ export function parseAddonOptions (options) {
     return {};
   }
 
-  return options.split(',').reduce((options, option) => {
-    const [key, value] = option.split('=');
+  const pairs = options.split(/,(?=\w+=)/) || [];
+
+  return pairs.reduce((options, pair) => {
+    const [key, ...valueParts] = pair.split('=');
+    const value = valueParts.join('=');
+
     if (value == null) {
-      throw new Error("Options are malformed. Usage is '--option name=enabled|disabled|true|false'");
+      throw new Error("Options are malformed. Usage is '--option name=enabled|disabled|true|false|plugin1,plugin2'");
     }
 
     let formattedValue = value;

package/src/parsers.js

@@ -4,6 +4,17 @@ import * as Application from './models/application.js';
 import ISO8601 from 'iso8601-duration';
 import Duration from 'duration-js';
 
+const addonOptionsRegex = /^\w+=.+$/;
+
+export function addonOptions (options) {
+  for (const option of options) {
+    if (!option.match(addonOptionsRegex)) {
+      return cliparse.parsers.error('Invalid option: ' + option);
+    }
+  }
+  return cliparse.parsers.success(options.join(','));
+}
+
 export function flavor (flavor) {
   const flavors = Application.listAvailableFlavors();
   if (flavors.includes(flavor)) {