@adobe/helix-config 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.3.1](https://github.com/adobe/helix-config/compare/v1.3.0...v1.3.1) (2024-03-08)
+
+
+### Bug Fixes
+
+* config locations ([#27](https://github.com/adobe/helix-config/issues/27)) ([675fde2](https://github.com/adobe/helix-config/commit/675fde2f2beb8baa694b21bbc99e8d9bb128e5c4))
+
+# [1.3.0](https://github.com/adobe/helix-config/compare/v1.2.0...v1.3.0) (2024-03-08)
+
+
+### Features
+
+* add surrogate keys ([#25](https://github.com/adobe/helix-config/issues/25)) ([314c627](https://github.com/adobe/helix-config/commit/314c62736bd0cf63616da9b46cbf9544b9210ae1))
+
 # [1.2.0](https://github.com/adobe/helix-config/compare/v1.1.0...v1.2.0) (2024-03-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Helix Config",
   "main": "src/index.js",
   "type": "module",
@@ -48,6 +48,7 @@
     "*.cjs": "eslint"
   },
   "dependencies": {
-    "@adobe/helix-shared-config": "10.3.12"
+    "@adobe/helix-shared-config": "10.3.12",
+    "@adobe/helix-shared-utils": "3.0.1"
   }
 }

package/src/config-legacy.js

@@ -91,7 +91,7 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
       source,
     },
   };
-  const configAllPreview = await fetchConfigAll(ctx, config.contentBusId, 'preview');
+  const configAllPreview = await fetchConfigAll(ctx, config.content.contentBusId, 'preview');
   const { access } = configAllPreview?.config?.data || {};
   if (access) {
     config.access = access;
@@ -108,7 +108,7 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
         };
       }
     }
-    const configAllLive = await fetchConfigAll(ctx, config.contentBusId, 'live');
+    const configAllLive = await fetchConfigAll(ctx, config.content.contentBusId, 'live');
     if (configAllLive?.metadata) {
       config.metadata.live = configAllLive.metadata;
     }

package/src/config-view.js

@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import { ModifiersConfig } from '@adobe/helix-shared-config';
+import { computeSurrogateKey } from '@adobe/helix-shared-utils';
 import { PipelineResponse } from './PipelineResponse.js';
 import { SCOPE_ADMIN, SCOPE_PIPELINE, SCOPE_DELIVERY } from './ConfigContext.js';
 import { resolveLegacyConfig } from './config-legacy.js';
@@ -85,7 +86,7 @@ async function loadMetadata(ctx, config, partition) {
   // generate the metadata-all.json first
   const metadata = [];
   for (const path of paths) {
-    const key = `/${config.contentBusId}/${partition}${path}`;
+    const key = `/${config.content.contentBusId}/${partition}${path}`;
     // eslint-disable-next-line no-await-in-loop
     const buf = await contentBus.get(key);
     if (buf) {
@@ -109,7 +110,7 @@ async function loadMetadata(ctx, config, partition) {
 
 async function loadHeadHtml(ctx, config, ref) {
   const codeBus = ctx.storage.codeBus();
-  const key = `${config.owner}/${config.repo}/${ref}/head.html`;
+  const key = `${config.code.owner}/${config.code.repo}/${ref}/head.html`;
   const buf = await codeBus.get(key);
   if (buf) {
     return {
@@ -164,6 +165,13 @@ async function resolveConfig(ctx, rso, scope) {
   return config;
 }
 
+async function getSurrogateKey(opts) {
+  const { site, org } = opts;
+  const orgKey = await computeSurrogateKey(`${org}_config.json`);
+  const siteKey = await computeSurrogateKey(`${site}--${org}_config.json`);
+  return `${orgKey} ${siteKey}`;
+}
+
 export async function getConfigResponse(ctx, opts) {
   const {
     ref, site, org, scope,
@@ -194,11 +202,13 @@ export async function getConfigResponse(ctx, opts) {
 
   const headers = {
     'content-type': 'application/json',
+    'x-surrogate-key': await getSurrogateKey(opts),
   };
 
   if (opts.scope === SCOPE_DELIVERY) {
     return new PipelineResponse('', {
       headers: {
+        'x-surrogate-key': await getSurrogateKey(opts),
         'x-hlx-contentbus-id': config.content.contentBusId,
         'x-hlx-owner': config.code.owner,
         'x-hlx-repo': config.code.repo,