@adobe/helix-config 3.6.2 → 3.7.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.7.0](https://github.com/adobe/helix-config/compare/v3.6.3...v3.7.0) (2024-07-17)
+
+
+### Features
+
+* add more meaningful errors ([#136](https://github.com/adobe/helix-config/issues/136)) ([04bc71c](https://github.com/adobe/helix-config/commit/04bc71c1d95489f383bdbcedaaefd78cdfd13818)), closes [#116](https://github.com/adobe/helix-config/issues/116) [#130](https://github.com/adobe/helix-config/issues/130)
+
+## [3.6.3](https://github.com/adobe/helix-config/compare/v3.6.2...v3.6.3) (2024-07-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-storage to v1.0.3 ([57786d2](https://github.com/adobe/helix-config/commit/57786d222a5a6161957c5c57aa149b74000aea36))
+
 ## [3.6.2](https://github.com/adobe/helix-config/compare/v3.6.1...v3.6.2) (2024-07-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -62,7 +62,7 @@
     "@adobe/fetch": "4.1.8",
     "@adobe/helix-shared-config": "10.6.4",
     "@adobe/helix-shared-git": "3.0.12",
-    "@adobe/helix-shared-storage": "1.0.2",
+    "@adobe/helix-shared-storage": "1.0.3",
     "@adobe/helix-shared-utils": "3.0.2",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",

package/src/schemas/cdn-prod-akamai.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+module.exports = require('./cdn-prod-akamai.schema.json');

package/src/schemas/cdn-prod-akamai.schema.json

@@ -0,0 +1,55 @@
+{
+  "meta:license": [
+    "Copyright 2023 Adobe. All rights reserved.",
+    "This file is licensed to you under the Apache License, Version 2.0 (the \"License\");",
+    "you may not use this file except in compliance with the License. You may obtain a copy",
+    "of the License at http://www.apache.org/licenses/LICENSE-2.0",
+    "",
+    "Unless required by applicable law or agreed to in writing, software distributed under",
+    "the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS",
+    "OF ANY KIND, either express or implied. See the License for the specific language",
+    "governing permissions and limitations under the License."
+  ],
+  "$id": "https://ns.adobe.com/helix/config/cdn/prod/akamai",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Akamai CDN Config",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "akamai"
+    },
+    "host": {
+      "description": "production host",
+      "type": "string"
+    },
+    "route": {
+      "description": "Routes on the CDN that are rendered with Franklin",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "endpoint": {
+      "type": "string"
+    },
+    "clientSecret": {
+      "type": "string"
+    },
+    "clientToken": {
+      "type": "string"
+    },
+    "accessToken": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "type",
+    "host",
+    "endpoint",
+    "clientSecret",
+    "clientToken",
+    "accessToken"
+  ],
+  "additionalProperties": false
+}

package/src/schemas/cdn-prod-cloudflare.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+module.exports = require('./cdn-prod-cloudflare.schema.json');

package/src/schemas/cdn-prod-cloudflare.schema.json

@@ -0,0 +1,51 @@
+{
+  "meta:license": [
+    "Copyright 2023 Adobe. All rights reserved.",
+    "This file is licensed to you under the Apache License, Version 2.0 (the \"License\");",
+    "you may not use this file except in compliance with the License. You may obtain a copy",
+    "of the License at http://www.apache.org/licenses/LICENSE-2.0",
+    "",
+    "Unless required by applicable law or agreed to in writing, software distributed under",
+    "the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS",
+    "OF ANY KIND, either express or implied. See the License for the specific language",
+    "governing permissions and limitations under the License."
+  ],
+  "$id": "https://ns.adobe.com/helix/config/cdn/prod/cloudflare",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Cloudflare CDN Config",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "cloudflare"
+    },
+    "host": {
+      "description": "production host",
+      "type": "string"
+    },
+    "route": {
+      "description": "Routes on the CDN that are rendered with Franklin",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "plan": {
+      "type": "string"
+    },
+    "zoneId": {
+      "type": "string"
+    },
+    "apiToken": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "type",
+    "host",
+    "plan",
+    "zoneId",
+    "apiToken"
+  ],
+  "additionalProperties": false
+}

package/src/schemas/cdn-prod-cloudfront.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+module.exports = require('./cdn-prod-cloudfront.schema.json');

package/src/schemas/cdn-prod-cloudfront.schema.json

@@ -0,0 +1,51 @@
+{
+  "meta:license": [
+    "Copyright 2023 Adobe. All rights reserved.",
+    "This file is licensed to you under the Apache License, Version 2.0 (the \"License\");",
+    "you may not use this file except in compliance with the License. You may obtain a copy",
+    "of the License at http://www.apache.org/licenses/LICENSE-2.0",
+    "",
+    "Unless required by applicable law or agreed to in writing, software distributed under",
+    "the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS",
+    "OF ANY KIND, either express or implied. See the License for the specific language",
+    "governing permissions and limitations under the License."
+  ],
+  "$id": "https://ns.adobe.com/helix/config/cdn/prod/cloudfront",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Cloudfront CDN Config",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "cloudfront"
+    },
+    "host": {
+      "description": "production host",
+      "type": "string"
+    },
+    "route": {
+      "description": "Routes on the CDN that are rendered with Franklin",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "distributionId": {
+      "type": "string"
+    },
+    "accessKeyId": {
+      "type": "string"
+    },
+    "secretAccessKey": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "type",
+    "host",
+    "distributionId",
+    "accessKeyId",
+    "secretAccessKey"
+  ],
+  "additionalProperties": false
+}

package/src/schemas/cdn-prod-fastly.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+module.exports = require('./cdn-prod-fastly.schema.json');

package/src/schemas/cdn-prod-fastly.schema.json

@@ -0,0 +1,50 @@
+{
+  "meta:license": [
+    "Copyright 2023 Adobe. All rights reserved.",
+    "This file is licensed to you under the Apache License, Version 2.0 (the \"License\");",
+    "you may not use this file except in compliance with the License. You may obtain a copy",
+    "of the License at http://www.apache.org/licenses/LICENSE-2.0",
+    "",
+    "Unless required by applicable law or agreed to in writing, software distributed under",
+    "the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS",
+    "OF ANY KIND, either express or implied. See the License for the specific language",
+    "governing permissions and limitations under the License."
+  ],
+  "$id": "https://ns.adobe.com/helix/config/cdn/prod/fastly",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Fastly CDN Config",
+  "type": "object",
+  "description": "Production CDN configuration for Fastly",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "fastly"
+    },
+    "host": {
+      "description": "production host",
+      "type": "string"
+    },
+    "route": {
+      "description": "Routes on the CDN that are rendered with Franklin",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "serviceId": {
+      "description": "The Fastly Service ID",
+      "type": "string"
+    },
+    "authToken": {
+      "description": "A Fastly token for purging",
+      "type": "string"
+    }
+  },
+  "required": [
+    "type",
+    "host",
+    "serviceId",
+    "authToken"
+  ],
+  "additionalProperties": false
+}

package/src/schemas/cdn-prod-managed.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+module.exports = require('./cdn-prod-managed.schema.json');

package/src/schemas/cdn-prod-managed.schema.json

@@ -0,0 +1,39 @@
+{
+  "meta:license": [
+    "Copyright 2023 Adobe. All rights reserved.",
+    "This file is licensed to you under the Apache License, Version 2.0 (the \"License\");",
+    "you may not use this file except in compliance with the License. You may obtain a copy",
+    "of the License at http://www.apache.org/licenses/LICENSE-2.0",
+    "",
+    "Unless required by applicable law or agreed to in writing, software distributed under",
+    "the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS",
+    "OF ANY KIND, either express or implied. See the License for the specific language",
+    "governing permissions and limitations under the License."
+  ],
+  "$id": "https://ns.adobe.com/helix/config/cdn/prod/managed",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Managed CDN Config",
+  "type": "object",
+  "properties": {
+    "type": {
+      "type": "string",
+      "const": "managed"
+    },
+    "host": {
+      "description": "production host",
+      "type": "string"
+    },
+    "route": {
+      "description": "Routes on the CDN that are rendered with Franklin",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "required": [
+    "type",
+    "host"
+  ],
+  "additionalProperties": false
+}

package/src/schemas/cdn.schema.json

@@ -18,189 +18,19 @@
     "prod": {
       "oneOf": [
         {
-          "type": "object",
-          "title": "FastlyConfig",
-          "description": "Production CDN configuration for Fastly",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "fastly"
-            },
-            "host": {
-              "description": "production host",
-              "type": "string"
-            },
-            "route": {
-              "description": "Routes on the CDN that are rendered with Franklin",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "serviceId": {
-              "description": "The Fastly Service ID",
-              "type": "string"
-            },
-            "authToken": {
-              "description": "A Fastly token for purging",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "host",
-            "serviceId",
-            "authToken"
-          ],
-          "additionalProperties": false
+          "$ref": "https://ns.adobe.com/helix/config/cdn/prod/fastly"
         },
         {
-          "type": "object",
-          "title": "AkamaiConfig",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "akamai"
-            },
-            "host": {
-              "description": "production host",
-              "type": "string"
-            },
-            "route": {
-              "description": "Routes on the CDN that are rendered with Franklin",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "endpoint": {
-              "type": "string"
-            },
-            "clientSecret": {
-              "type": "string"
-            },
-            "clientToken": {
-              "type": "string"
-            },
-            "accessToken": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "host",
-            "endpoint",
-            "clientSecret",
-            "clientToken",
-            "accessToken"
-          ],
-          "additionalProperties": false
+          "$ref": "https://ns.adobe.com/helix/config/cdn/prod/cloudflare"
         },
         {
-          "type": "object",
-          "title": "CloudflareConfig",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "cloudflare"
-            },
-            "host": {
-              "description": "production host",
-              "type": "string"
-            },
-            "route": {
-              "description": "Routes on the CDN that are rendered with Franklin",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "origin": {
-              "type": "string"
-            },
-            "plan": {
-              "type": "string"
-            },
-            "zoneId": {
-              "type": "string"
-            },
-            "apiToken": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "host",
-            "origin",
-            "plan",
-            "zoneId",
-            "apiToken"
-          ],
-          "additionalProperties": false
+          "$ref": "https://ns.adobe.com/helix/config/cdn/prod/akamai"
         },
         {
-          "type": "object",
-          "title": "ManagedConfig",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "managed"
-            },
-            "host": {
-              "description": "production host",
-              "type": "string"
-            },
-            "route": {
-              "description": "Routes on the CDN that are rendered with Franklin",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "type",
-            "host"
-          ],
-          "additionalProperties": false
+          "$ref": "https://ns.adobe.com/helix/config/cdn/prod/managed"
         },
         {
-          "type": "object",
-          "title": "CloudfrontConfig",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "cloudfront"
-            },
-            "host": {
-              "description": "production host",
-              "type": "string"
-            },
-            "route": {
-              "description": "Routes on the CDN that are rendered with Franklin",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "distributionId": {
-              "type": "string"
-            },
-            "accessKeyId": {
-              "type": "string"
-            },
-            "secretAccessKey": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "host",
-            "distributionId",
-            "accessKeyId",
-            "secretAccessKey"
-          ],
-          "additionalProperties": false
+          "$ref": "https://ns.adobe.com/helix/config/cdn/prod/cloudfront"
         },
         {
           "type": "object",
@@ -249,8 +79,5 @@
       "additionalProperties": false
     }
   },
-  "required": [
-    "prod"
-  ],
   "additionalProperties": false
 }

package/src/schemas/code.schema.json

@@ -12,7 +12,7 @@
   ],
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://ns.adobe.com/helix/config/code",
-  "title": "Code Bus",
+  "title": "Code source",
   "type": "object",
   "description": "Defines the code bus location and source.",
   "properties": {

package/src/schemas/content.schema.json

@@ -13,7 +13,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://ns.adobe.com/helix/config/content",
   "type": "object",
-  "title": "Content Bus",
+  "title": "Content source",
   "description": "Defines the content bus location and source.",
   "properties": {
     "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },

package/src/storage/ValidationError.js

@@ -9,38 +9,87 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-/* eslint-disable max-classes-per-file */
 
-export class ValidationError extends Error {
-  constructor(
-    msg,
-    errors = [],
-    mapError = ValidationError.mapError,
-    prettyname = ValidationError.prettyname,
-  ) {
-    const detail = errors.map((e) => mapError(e, prettyname)).join('\n');
-    super(`Invalid configuration:
-${detail}
-
-${msg}`);
-    this._errors = errors;
+/* eslint-disable no-continue,no-param-reassign */
+
+function removeByPrefix(byPath, prefix) {
+  Object.keys(byPath).forEach((path) => {
+    if (path.startsWith(prefix)) {
+      delete byPath[path];
+    }
+  });
+}
+
+function handleContentSource(byPath, msg) {
+  if (byPath['/content/source']) {
+    const type = byPath['/content/source']?.[0]?.data?.type;
+    if (!['onedrive', 'google', 'markup'].includes(type)) {
+      msg.push('/content/source/type must be one of [onedrive, google, markup]');
+      removeByPrefix(byPath, '/content/source');
+      return;
+    }
+
+    // remove other content source errors
+    delete byPath['/content/source'];
+    delete byPath['/content/source/type'];
   }
+}
 
-  static prettyname(path, schema) {
-    /* c8 ignore next */
-    return path ? `${schema.title || schema.$id} ${path}` : `${schema.title || schema.$id}`;
+function handleCDNProd(byPath, msg) {
+  const cdnErrors = byPath['/cdn/prod'];
+  if (cdnErrors) {
+    const type = byPath['/cdn/prod']?.[0]?.data?.type;
+    if (type && !['fastly', 'cloudflare', 'akamai', 'managed', 'cloudfront'].includes(type)) {
+      msg.push('/cdn/prod/type must be one of [fastly, cloudflare, akamai, managed, cloudfront]');
+      removeByPrefix(byPath, '/cdn/prod');
+      return;
+    }
+    delete byPath['/cdn/prod/type'];
+    // if the type is specified, filter errors from other schemas
+    if (type) {
+      byPath[`/cdn/prod['${type}']`] = cdnErrors.filter(({ parentSchema }) => parentSchema?.$id?.endsWith(type));
+      delete byPath['/cdn/prod'];
+    }
   }
+}
 
-  static mapError({
-    keyword, dataPath, message, data, params, parentSchema,
-  }, prettyname) {
-    /* c8 ignore next 7 */
-    if (keyword === 'additionalProperties') {
-      return `${prettyname(dataPath, parentSchema)} has unknown property '${params.additionalProperty}'`;
+export class ValidationError extends Error {
+  constructor(msg, errors = []) {
+    super(ValidationError.generateErrorDetail(errors));
+    this._errors = errors;
+  }
+
+  static generateErrorDetail(ajvErrors) {
+    const msg = [];
+    // group errors by instance
+    const byPath = {};
+    for (const error of ajvErrors) {
+      const id = error.instancePath || 'data';
+      if (!byPath[id]) {
+        byPath[id] = [];
+      }
+      byPath[id].push(error);
     }
-    if (keyword === 'required') {
-      return `${prettyname(dataPath, parentSchema)} ${message}`;
+
+    // handle special locations
+    handleContentSource(byPath, msg);
+    handleCDNProd(byPath, msg);
+
+    for (const [id, errors] of Object.entries(byPath)) {
+      // create required properties message
+      const reqErrors = errors.filter((e) => e.keyword === 'required');
+      if (reqErrors.length) {
+        msg.push(`${id} must have required properties: [${reqErrors.map((e) => e.params.missingProperty).join(', ')}]`);
+      }
+
+      // create other errors
+      const otherErrors = errors.filter((e) => e.keyword !== 'required');
+      // make unique messages
+      const uniqueErrors = new Set(otherErrors.map((e) => e.message));
+      if (uniqueErrors.size) {
+        msg.push(`${id} ${Array.from(uniqueErrors).join(', ')}`);
+      }
     }
-    return `${prettyname(dataPath, parentSchema)} ${message}: ${keyword}(${JSON.stringify(data)}, ${JSON.stringify(params)})`;
+    return msg.join('; ');
   }
 }

package/src/storage/config-validator.js

@@ -17,6 +17,11 @@ import accessAdminSchema from '../schemas/access-admin.schema.cjs';
 import accessSchema from '../schemas/access.schema.cjs';
 import accessSiteSchema from '../schemas/access-site.schema.cjs';
 import cdnSchema from '../schemas/cdn.schema.cjs';
+import cdnProdFastlySchema from '../schemas/cdn-prod-fastly.schema.cjs';
+import cdnProdCloudflareSchema from '../schemas/cdn-prod-cloudflare.schema.cjs';
+import cdnProdAkamaiSchema from '../schemas/cdn-prod-akamai.schema.cjs';
+import cdnProdManagedSchema from '../schemas/cdn-prod-managed.schema.cjs';
+import cdnProdCloudfrontSchema from '../schemas/cdn-prod-cloudfront.schema.cjs';
 import commonSchema from '../schemas/common.schema.cjs';
 import codeSchema from '../schemas/code.schema.cjs';
 import contentSchema from '../schemas/content.schema.cjs';
@@ -65,6 +70,11 @@ export const SCHEMAS = [
   tokensSchema,
   userSchema,
   usersSchema,
+  cdnProdFastlySchema,
+  cdnProdCloudflareSchema,
+  cdnProdAkamaiSchema,
+  cdnProdManagedSchema,
+  cdnProdCloudfrontSchema,
 ];
 
 const SCHEMA_TYPES = {
@@ -80,6 +90,11 @@ const SCHEMA_TYPES = {
  * @returns {object} The validated configuration
  */
 export async function validate(config, type) {
+  const schema = SCHEMA_TYPES[type];
+  if (!schema) {
+    throw new Error(`no such type: ${type}`);
+  }
+
   const ajv = new Ajv({
     allErrors: true,
     verbose: true,
@@ -90,7 +105,7 @@ export async function validate(config, type) {
   ajvFormats(ajv);
 
   ajv.addSchema(SCHEMAS);
-  const res = ajv.validate(SCHEMA_TYPES[type], config);
+  const res = ajv.validate(schema, config);
   if (res) {
     return res;
   }

package/types/profile-config.d.ts

@@ -22,8 +22,8 @@ export interface HelixProfileConfig {
    * description for clarity. has no influence on the configuration.
    */
   description?: string;
-  content?: ContentBus;
-  code?: CodeBus;
+  content?: ContentSource;
+  code?: CodeSource;
   folders?: Folders;
   headers?: HelixHeadersConfig;
   cdn?: CDNConfig;
@@ -36,7 +36,7 @@ export interface HelixProfileConfig {
 /**
  * Defines the content bus location and source.
  */
-export interface ContentBus {
+export interface ContentSource {
   /**
    * human readable title. has no influence on the configuration.
    */
@@ -73,7 +73,7 @@ export interface MarkupContentSource {
 /**
  * Defines the code bus location and source.
  */
-export interface CodeBus {
+export interface CodeSource {
   /**
    * human readable title. has no influence on the configuration.
    */
@@ -109,7 +109,7 @@ export interface KeyValuePair {
   value: string;
 }
 export interface CDNConfig {
-  prod: FastlyConfig | AkamaiConfig | CloudflareConfig | ManagedConfig | CloudfrontConfig | EmptyConfig;
+  prod?: FastlyCDNConfig | CloudflareCDNConfig | AkamaiCDNConfig | ManagedCDNConfig | CloudfrontCDNConfig | EmptyConfig;
   live?: {
     /**
      * Sidekick config to override the default preview host. it supports parameters $owner and $repo
@@ -126,7 +126,7 @@ export interface CDNConfig {
 /**
  * Production CDN configuration for Fastly
  */
-export interface FastlyConfig {
+export interface FastlyCDNConfig {
   type: 'fastly';
   /**
    * production host
@@ -145,8 +145,8 @@ export interface FastlyConfig {
    */
   authToken: string;
 }
-export interface AkamaiConfig {
-  type: 'akamai';
+export interface CloudflareCDNConfig {
+  type: 'cloudflare';
   /**
    * production host
    */
@@ -155,13 +155,12 @@ export interface AkamaiConfig {
    * Routes on the CDN that are rendered with Franklin
    */
   route?: string[];
-  endpoint: string;
-  clientSecret: string;
-  clientToken: string;
-  accessToken: string;
+  plan: string;
+  zoneId: string;
+  apiToken: string;
 }
-export interface CloudflareConfig {
-  type: 'cloudflare';
+export interface AkamaiCDNConfig {
+  type: 'akamai';
   /**
    * production host
    */
@@ -170,12 +169,12 @@ export interface CloudflareConfig {
    * Routes on the CDN that are rendered with Franklin
    */
   route?: string[];
-  origin: string;
-  plan: string;
-  zoneId: string;
-  apiToken: string;
+  endpoint: string;
+  clientSecret: string;
+  clientToken: string;
+  accessToken: string;
 }
-export interface ManagedConfig {
+export interface ManagedCDNConfig {
   type: 'managed';
   /**
    * production host
@@ -186,7 +185,7 @@ export interface ManagedConfig {
    */
   route?: string[];
 }
-export interface CloudfrontConfig {
+export interface CloudfrontCDNConfig {
   type: 'cloudfront';
   /**
    * production host

package/types/site-config.d.ts

@@ -26,8 +26,8 @@ export interface HelixSiteConfig {
    * description for clarity. has no influence on the configuration.
    */
   description?: string;
-  content: ContentBus;
-  code: CodeBus;
+  content: ContentSource;
+  code: CodeSource;
   folders?: Folders;
   headers?: HelixHeadersConfig;
   cdn?: CDNConfig;
@@ -44,7 +44,7 @@ export interface HelixSiteConfig {
 /**
  * Defines the content bus location and source.
  */
-export interface ContentBus {
+export interface ContentSource {
   /**
    * human readable title. has no influence on the configuration.
    */
@@ -81,7 +81,7 @@ export interface MarkupContentSource {
 /**
  * Defines the code bus location and source.
  */
-export interface CodeBus {
+export interface CodeSource {
   /**
    * human readable title. has no influence on the configuration.
    */
@@ -117,7 +117,7 @@ export interface KeyValuePair {
   value: string;
 }
 export interface CDNConfig {
-  prod: FastlyConfig | AkamaiConfig | CloudflareConfig | ManagedConfig | CloudfrontConfig | EmptyConfig;
+  prod?: FastlyCDNConfig | CloudflareCDNConfig | AkamaiCDNConfig | ManagedCDNConfig | CloudfrontCDNConfig | EmptyConfig;
   live?: {
     /**
      * Sidekick config to override the default preview host. it supports parameters $owner and $repo
@@ -134,7 +134,7 @@ export interface CDNConfig {
 /**
  * Production CDN configuration for Fastly
  */
-export interface FastlyConfig {
+export interface FastlyCDNConfig {
   type: 'fastly';
   /**
    * production host
@@ -153,8 +153,8 @@ export interface FastlyConfig {
    */
   authToken: string;
 }
-export interface AkamaiConfig {
-  type: 'akamai';
+export interface CloudflareCDNConfig {
+  type: 'cloudflare';
   /**
    * production host
    */
@@ -163,13 +163,12 @@ export interface AkamaiConfig {
    * Routes on the CDN that are rendered with Franklin
    */
   route?: string[];
-  endpoint: string;
-  clientSecret: string;
-  clientToken: string;
-  accessToken: string;
+  plan: string;
+  zoneId: string;
+  apiToken: string;
 }
-export interface CloudflareConfig {
-  type: 'cloudflare';
+export interface AkamaiCDNConfig {
+  type: 'akamai';
   /**
    * production host
    */
@@ -178,12 +177,12 @@ export interface CloudflareConfig {
    * Routes on the CDN that are rendered with Franklin
    */
   route?: string[];
-  origin: string;
-  plan: string;
-  zoneId: string;
-  apiToken: string;
+  endpoint: string;
+  clientSecret: string;
+  clientToken: string;
+  accessToken: string;
 }
-export interface ManagedConfig {
+export interface ManagedCDNConfig {
   type: 'managed';
   /**
    * production host
@@ -194,7 +193,7 @@ export interface ManagedConfig {
    */
   route?: string[];
 }
-export interface CloudfrontConfig {
+export interface CloudfrontCDNConfig {
   type: 'cloudfront';
   /**
    * production host