@adobe/helix-config 5.6.8 → 5.6.10

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.6.10](https://github.com/adobe/helix-config/compare/v5.6.9...v5.6.10) (2025-11-05)
+
+
+### Bug Fixes
+
+* merge secretIds and apiKeyIds ([#333](https://github.com/adobe/helix-config/issues/333)) ([bb96631](https://github.com/adobe/helix-config/commit/bb966319e7e6a58ec6c5005e65277eacc991eeff))
+
+## [5.6.9](https://github.com/adobe/helix-config/compare/v5.6.8...v5.6.9) (2025-10-24)
+
+
+### Bug Fixes
+
+* return 404 if legacy config has no contentBusId ([#328](https://github.com/adobe/helix-config/issues/328)) ([a532acd](https://github.com/adobe/helix-config/commit/a532acd172af2755e20aca25058aaa9097041360))
+
 ## [5.6.8](https://github.com/adobe/helix-config/compare/v5.6.7...v5.6.8) (2025-10-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.6.8",
+  "version": "5.6.10",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/adobe/helix-config"
+    "url": "https://github.com/adobe/helix-config.git"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -35,20 +35,20 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.10",
-    "@eslint/config-helpers": "0.3.1",
+    "@adobe/eslint-config-helix": "3.0.13",
+    "@eslint/config-helpers": "0.4.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "12.0.2",
+    "@semantic-release/npm": "13.1.1",
     "c8": "10.1.3",
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "16.1.6",
-    "mocha": "11.7.2",
+    "lint-staged": "16.2.5",
+    "mocha": "11.7.4",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.6.0",
-    "semantic-release": "24.2.8"
+    "semantic-release": "25.0.1"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/config-legacy.js

@@ -14,17 +14,10 @@ import {
 } from './ConfigContext.js';
 import { ConfigObject } from './config-object.js';
 import { contentConfigMerge } from './legacy-config-merge.js';
-import { prune } from './utils.js';
+import { prune, toArray } from './utils.js';
 
 const HELIX_CODE_BUS = 'helix-code-bus';
 
-export function toArray(v) {
-  if (!v) {
-    return [];
-  }
-  return Array.isArray(v) ? v : [v];
-}
-
 /**
  * Retrieves the helix-config.json which is an aggregate from fstab.yaml and head.html.
  *
@@ -114,6 +107,9 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
   }
   const helixConfig = cfg.data;
   const { contentBusId } = helixConfig.content.data['/'];
+  if (!contentBusId) {
+    return null;
+  }
   const fstab = helixConfig.fstab?.data || helixConfig.fstab;
   if (!fstab) {
     return null;

package/src/config-view.js

@@ -18,8 +18,10 @@ import {
   SCOPE_DELIVERY,
   SCOPE_RAW, SCOPE_PUBLIC,
 } from './ConfigContext.js';
-import { resolveLegacyConfig, fetchRobotsTxt, toArray } from './config-legacy.js';
-import { deepGetOrCreate, prune } from './utils.js';
+import { resolveLegacyConfig, fetchRobotsTxt } from './config-legacy.js';
+import {
+  canonicalArrayString, deepGetOrCreate, prune, uniqueArray,
+} from './utils.js';
 import { ConfigObject } from './config-object.js';
 import { ModifiersConfig } from './ModifiersConfig.js';
 import { StatusCodeError } from './status-code-error.js';
@@ -61,23 +63,6 @@ const VALID_ORG_SCOPES = [
   SCOPE_ADMIN,
 ];
 
-/**
- * Creates a string representation of the given array that is suitable for substring matching by
- * delimiting each entry with `,` eg: ,foo@adobe.com,bar@adobe.com,
- * @param {object} root object
- * @param {string} partition property partition
- * @param {string} prop name of the property
- * @returns {string}
- */
-export function canonicalArrayString(root, partition, prop) {
-  const value = root?.[partition]?.[prop];
-  if (!value || value.length === 0) {
-    return '';
-  }
-  value.sort((s1, s2) => s1.localeCompare(s2));
-  return `,${value.join(',')},`;
-}
-
 /**
  * Returns the hash of the global delivery token if defined.
  * @param ctx
@@ -122,6 +107,7 @@ async function getGlobalTokenHash(ctx, rso) {
  * @returns {string|null}
  */
 function lookupSecret(config, orgConfig, id, hashed = false) {
+  /* c8 ignore next 3 */
   if (!id) {
     return null;
   }
@@ -162,11 +148,18 @@ function resolveSecret(object, idProp, dstProp, siteConfig, orgConfig) {
  */
 export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
   const { access = {} } = config;
+  // get the (legacy) apiKeyIds or secretIds from the partition specific config
   const pAccess = access[partition] ?? {};
-  const secretId = toArray(
-    pAccess.apiKeyId ?? pAccess.secretId ?? access.site?.apiKeyId ?? access.site?.secretId,
-  );
-  const allow = toArray(pAccess.allow ?? access.site?.allow);
+  let secretId = uniqueArray(pAccess.apiKeyId, pAccess.secretId);
+  if (secretId.length === 0) {
+    // if empty, also check the access.site configs
+    secretId = uniqueArray(access.site?.apiKeyId, access.site?.secretId);
+  }
+  // same for 'allow'
+  let allow = uniqueArray(pAccess.allow);
+  if (allow.length === 0) {
+    allow = uniqueArray(access.site?.allow);
+  }
   const cfg = {
     secretId,
     allow,
@@ -334,6 +327,8 @@ async function resolveConfig(ctx, rso, scope) {
       preview: await loadMetadata(ctx, config, 'preview'),
       live: await loadMetadata(ctx, config, 'live'),
     };
+  }
+  if (scope === SCOPE_PIPELINE || scope === SCOPE_RAW) {
     if (!config.robots) {
       ctx.timer?.update('robots-txt');
       const robots = await fetchRobotsTxt(ctx, config.code.owner, config.code.repo);
@@ -341,8 +336,6 @@ async function resolveConfig(ctx, rso, scope) {
         config.robots = robots;
       }
     }
-  }
-  if (scope === SCOPE_PIPELINE || scope === SCOPE_DELIVERY) {
     ctx.timer?.update('head.html');
     config.head = await loadHeadHtml(ctx, config, rso.ref);
   }

package/src/utils.js

@@ -50,7 +50,7 @@ export function prune(obj, path = '') {
         // eslint-disable-next-line no-param-reassign
         delete obj[key];
       }
-    } else if (typeof prop === 'object') {
+    } else if (prop && typeof prop === 'object') {
       prune(prop, itemPath);
       if (Object.keys(prop).length === 0) {
         // eslint-disable-next-line no-param-reassign
@@ -60,3 +60,53 @@ export function prune(obj, path = '') {
   }
   return obj;
 }
+
+/**
+ * Creates a string representation of the given array that is suitable for substring matching by
+ * delimiting each entry with `,` eg: ,foo@adobe.com,bar@adobe.com,
+ * @param {object} root object
+ * @param {string} partition property partition
+ * @param {string} prop name of the property
+ * @returns {string}
+ */
+export function canonicalArrayString(root, partition, prop) {
+  const value = root?.[partition]?.[prop];
+  if (!value || value.length === 0) {
+    return '';
+  }
+  value.sort((s1, s2) => s1.localeCompare(s2));
+  return `,${value.join(',')},`;
+}
+
+/**
+ * wraps the given value in an array if not already one.
+ * @param v
+ * @returns {*|*[]}
+ */
+export function toArray(v) {
+  if (!v) {
+    return [];
+  }
+  return Array.isArray(v) ? v : [v];
+}
+
+/**
+ * Creates a unique, sorted array of the given arguments. array arguments are unzipped, undefined or
+ * null arguments are skipped
+ * @param from
+ * @returns {any[]}
+ */
+export function uniqueArray(...from) {
+  const res = new Set();
+  const traverse = (v) => {
+    if (Array.isArray(v)) {
+      for (const e of v) {
+        traverse(e);
+      }
+    } else if (v !== null && v !== undefined && v !== '') {
+      res.add(v);
+    }
+  };
+  traverse(from);
+  return Array.from(res.values()).sort();
+}