@adobe/helix-config 3.11.0 → 3.12.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.12.0](https://github.com/adobe/helix-config/compare/v3.11.1...v3.12.0) (2024-07-31)
+
+
+### Features
+
+* enforce original-site for admin config ([#157](https://github.com/adobe/helix-config/issues/157)) ([366328f](https://github.com/adobe/helix-config/commit/366328f8a918341d61239b7d32205eea1fa09f02))
+
+## [3.11.1](https://github.com/adobe/helix-config/compare/v3.11.0...v3.11.1) (2024-07-29)
+
+
+### Bug Fixes
+
+* fix schema and add validator ([#155](https://github.com/adobe/helix-config/issues/155)) ([4235141](https://github.com/adobe/helix-config/commit/42351418b61a1e83ee476d241875aa63fd520ae7))
+
 # [3.11.0](https://github.com/adobe/helix-config/compare/v3.10.1...v3.11.0) (2024-07-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -11,7 +11,7 @@
   "type": "module",
   "scripts": {
     "test": "c8 mocha --spec 'test/**/*.test.js'",
-    "lint": "eslint .",
+    "lint": "eslint . && ./validate-json-schemas.sh",
     "docs:types": "node ./test/dev/generate-types.js",
     "semantic-release": "semantic-release",
     "semantic-release-dry": "semantic-release --dry-run --branches $CI_BRANCH",
@@ -41,11 +41,12 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
+    "ajv-cli": "5.0.0",
     "c8": "10.1.2",
     "eslint": "8.57.0",
     "husky": "9.1.3",
     "json-schema-to-typescript": "15.0.0",
-    "junit-report-builder": "3.2.1",
+    "junit-report-builder": "4.0.0",
     "lint-staged": "15.2.7",
     "mocha": "10.7.0",
     "mocha-multi-reporters": "1.5.1",

package/src/config-view.js

@@ -185,6 +185,23 @@ async function loadMetadata(ctx, config, partition) {
   };
 }
 
+/**
+ * loads the original site information from the `.hlx.json` file
+ * @param ctx the context
+ * @param contentBusId the content bus id
+ * @returns {Promise<string>} the original site.
+ */
+async function fetchOriginalSite(ctx, contentBusId) {
+  const key = `${contentBusId}/.hlx.json`;
+  const res = await ctx.loader.getObject(HELIX_CONTENT_BUS, key);
+  if (res.body) {
+    const json = res.json();
+    return json['original-site'] || json['original-repository'] || '';
+  }
+  ctx.log.error(`failed to load ${key}: ${res.status}`);
+  return '';
+}
+
 async function loadHeadHtml(ctx, config, ref) {
   const key = `${config.code.owner}/${config.code.repo}/${ref}/head.html`;
   const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
@@ -387,6 +404,24 @@ export async function getConfigResponse(ctx, opts) {
       },
     });
   }
+  // validate original-site
+  if (!config.legacy) {
+    const originalSite = await fetchOriginalSite(ctx, config.content.contentBusId);
+    if (originalSite && originalSite !== `${org}/${site}`) {
+      ctx.log.error(`original site ${originalSite} does not match requested ${org}/${site}.`);
+      if (scope === SCOPE_ADMIN) {
+        return new PipelineResponse('', {
+          status: 403,
+          headers: {
+            'x-error': 'original site mismatch',
+            ...surrogateHeaders,
+          },
+        });
+      }
+      // todo: also send 403 for all scopes....but first observe only
+    }
+  }
+
   if (config.extends && scope !== SCOPE_RAW) {
     delete config.extends;
   }

package/src/schemas/access-admin.schema.json

@@ -1,17 +1,7 @@
 {
-  "meta:license": [
-    "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/access/admin",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Admin Access Config",
   "type": "object",
   "properties": {

package/src/schemas/access-site.schema.json

@@ -1,17 +1,7 @@
 {
-  "meta:license": [
-    "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/access/site",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Site Access Config",
   "type": "object",
   "properties": {

package/src/schemas/access.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/access",
   "type": "object",
   "title": "Access",

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

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn/prod/akamai",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Akamai CDN Config",
   "type": "object",
   "properties": {

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

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn/prod/cloudflare",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Cloudflare CDN Config",
   "type": "object",
   "properties": {

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

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn/prod/cloudfront",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Cloudfront CDN Config",
   "type": "object",
   "properties": {

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

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn/prod/fastly",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Fastly CDN Config",
   "type": "object",
   "description": "Production CDN configuration for Fastly",

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

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn/prod/managed",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "Managed CDN Config",
   "type": "object",
   "properties": {

package/src/schemas/cdn.schema.json

@@ -1,17 +1,7 @@
 {
-  "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/cdn",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "title": "CDN Config",
   "type": "object",
   "properties": {
@@ -49,6 +39,7 @@
       ]
     },
     "live": {
+      "type": "object",
       "properties": {
         "host": {
           "description": "Sidekick config to override the default preview host. it supports parameters $owner and $repo",
@@ -64,6 +55,7 @@
       "additionalProperties": false
     },
     "preview": {
+      "type": "object",
       "properties": {
         "host": {
           "description": "Sidekick config to override the default live host. it supports parameters $owner and $repo",

package/src/schemas/code.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/code",
   "title": "Code source",
   "type": "object",

package/src/schemas/common.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/common",
   "definitions": {
     "title": {

package/src/schemas/content-source-google.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/content-source/google",
   "title": "Google Content Source",
   "type": "object",

package/src/schemas/content-source-markup.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/content-source/markup",
   "title": "Markup Content Source",
   "type": "object",

package/src/schemas/content-source-onedrive.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/content-source/onedrive",
   "title": "Onedrive Content Source",
   "type": "object",

package/src/schemas/content.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/content",
   "type": "object",
   "title": "Content source",

package/src/schemas/folders.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/folders",
   "type": "object",
   "title": "folders",

package/src/schemas/groups.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/groups",
   "type": "object",
   "title": "Groups",

package/src/schemas/headers.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/headers",
   "type": "object",
   "title": "Helix Headers Config",

package/src/schemas/metadata-source.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/metadata-source",
   "type": "object",
   "title": "metadata",

package/src/schemas/org.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/org",
   "title": "Helix Org Config",
   "type": "object",

package/src/schemas/profile.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/profile",
   "title": "Helix Profile Config",
   "type": "object",

package/src/schemas/profiles.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/profiles",
   "title": "Helix Profiles List",
   "type": "object",

package/src/schemas/public.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/public",
   "type": "object",
   "title": "public",

package/src/schemas/robots.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/robots",
   "type": "object",
   "title": "robots",

package/src/schemas/sidekick.schema.json

@@ -1,17 +1,7 @@
 {
-  "meta:license": [
-    "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."
-  ],
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
   "$id": "https://ns.adobe.com/helix/config/sidekick",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "definitions": {
     "sidekickPlugin": {
       "type": "object",
@@ -73,13 +63,11 @@
         },
         "isPalette": {
           "type": "boolean",
-          "description": "Opens the URL in a palette instead of a new tab",
-          "dependentRequired": ["url"]
+          "description": "Opens the URL in a palette instead of a new tab"
         },
         "paletteRect": {
           "type": "string",
-          "description": "he dimensions and position of a palette box",
-          "dependentRequired": ["isPalette"]
+          "description": "he dimensions and position of a palette box"
         },
         "titleI18n": {
           "type": "object",
@@ -104,7 +92,11 @@
       },
       "required": [
         "id"
-      ]
+      ],
+      "dependentRequired": {
+        "isPalette": ["url"],
+        "paletteRect": ["isPalette"]
+      }
     }
   },
   "title": "Sidekick Config",

package/src/schemas/site.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/site",
   "title": "Helix Site Config",
   "type": "object",

package/src/schemas/sites.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/sites",
   "title": "Helix Sites List",
   "type": "object",

package/src/schemas/tokens.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/tokens",
   "title": "tokens",
   "type": "object",

package/src/schemas/user.schema.json

@@ -1,16 +1,6 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/user",
   "title": "user",
   "type": "object",

package/src/schemas/users.schema.json

@@ -1,21 +1,10 @@
 {
-  "meta:license": [
-    "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."
-  ],
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$comment": "https://github.com/adobe/helix-config/blob/main/LICENSE.txt",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
   "$id": "https://ns.adobe.com/helix/config/users",
   "title": "users",
   "type": "array",
   "items": {
     "$ref": "https://ns.adobe.com/helix/config/user"
-  },
-  "additionalProperties": false
+  }
 }

package/src/storage/config-validator.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import Ajv from 'ajv';
+import Ajv2019 from 'ajv/dist/2019.js';
 import ajvFormats from 'ajv-formats';
 import { ValidationError } from './ValidationError.js';
 
@@ -94,8 +94,7 @@ export async function validate(config, type) {
   if (!schema) {
     throw new Error(`no such type: ${type}`);
   }
-
-  const ajv = new Ajv({
+  const ajv = new Ajv2019({
     allErrors: true,
     verbose: true,
     useDefaults: true,

package/validate-json-schemas.sh

@@ -0,0 +1,32 @@
+# the need the proper file order to compile the schemas.
+npx ajv-cli --spec=draft2019 -c ajv-formats compile \
+-s src/schemas/common.schema.json \
+-s src/schemas/access-admin.schema.json \
+-s src/schemas/access-site.schema.json \
+-s src/schemas/access.schema.json \
+-s src/schemas/cdn-prod-akamai.schema.json \
+-s src/schemas/cdn-prod-cloudflare.schema.json \
+-s src/schemas/cdn-prod-cloudfront.schema.json \
+-s src/schemas/cdn-prod-fastly.schema.json \
+-s src/schemas/cdn-prod-managed.schema.json \
+-s src/schemas/cdn.schema.json \
+-s src/schemas/code.schema.json \
+-s src/schemas/content-source-google.schema.json \
+-s src/schemas/content-source-markup.schema.json \
+-s src/schemas/content-source-onedrive.schema.json \
+-s src/schemas/content.schema.json \
+-s src/schemas/folders.schema.json \
+-s src/schemas/groups.schema.json \
+-s src/schemas/headers.schema.json \
+-s src/schemas/metadata-source.schema.json \
+-s src/schemas/user.schema.json \
+-s src/schemas/users.schema.json \
+-s src/schemas/org.schema.json \
+-s src/schemas/tokens.schema.json \
+-s src/schemas/sidekick.schema.json \
+-s src/schemas/robots.schema.json \
+-s src/schemas/public.schema.json \
+-s src/schemas/profile.schema.json \
+-s src/schemas/profiles.schema.json \
+-s src/schemas/site.schema.json \
+-s src/schemas/sites.schema.json