fix: ensure contentBusId is loaded properly

src/PipelineState.d.ts

@@ -46,7 +46,6 @@ declare interface PipelineOptions {
   ref: string;
   partition: string;
   path: string;
-  contentBusId: string;
   timer: PipelineTimer;
   env: object;
 }

src/PipelineState.js

@@ -29,8 +29,6 @@ export class PipelineState {
       env: opts.env,
       info: getPathInfo(opts.path),
       content: new PipelineContent(),
-      // todo: compute content-bus id from fstab
-      contentBusId: opts.contentBusId,
       owner: opts.owner,
       repo: opts.repo,
       ref: opts.ref,

src/json-pipe.js

@@ -98,7 +98,6 @@ async function computeSurrogateKeys(path, contentBusId) {
 export async function jsonPipe(state, req) {
   const { log } = state;
   state.type = 'json';
-  const { contentBusId } = state;
   const { extension } = state.info;
   const { searchParams } = req.url;
   const params = Object.fromEntries(searchParams.entries());
@@ -174,7 +173,7 @@ export async function jsonPipe(state, req) {
     });
 
     // set surrogate keys
-    const keys = await computeSurrogateKeys(state.info.path, contentBusId);
+    const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
     res.headers.set('x-surrogate-key', keys.join(' '));
 
     await setCustomResponseHeaders(state, req, res);
@@ -191,7 +190,7 @@ export async function jsonPipe(state, req) {
       await setCustomResponseHeaders(state, req, res);
     }
     if (res.status === 404) {
-      const keys = await computeSurrogateKeys(state.info.path, contentBusId);
+      const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
       res.headers.set('x-surrogate-key', keys.join(' '));
     }
     return res;

src/options-pipe.js

@@ -9,9 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
 import { PipelineResponse } from './PipelineResponse.js';
 import fetchConfigAll from './steps/fetch-config-all.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
+import fetchConfig from './steps/fetch-config.js';
+import { PipelineStatusError } from './PipelineStatusError.js';
 
 /**
  * Handles options requests
@@ -20,18 +23,39 @@ import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
  * @returns {Response} a response
  */
 export async function optionsPipe(state, request) {
-  // todo: improve
-  const response = new PipelineResponse('', {
-    status: 204,
-    headers: {
-      // Set preflight cache duration
-      'access-control-max-age': '86400',
-      // Allow content type header
-      'access-control-allow-headers': 'content-type',
-    },
-  });
-  await fetchConfigAll(state, request, response);
-  await setCustomResponseHeaders(state, request, response);
+  try {
+    await fetchConfig(state, request);
+    if (!state.contentBusId) {
+      return new PipelineResponse('', {
+        status: 400,
+        headers: {
+          'x-error': 'contentBusId missing',
+        },
+      });
+    }
 
-  return response;
+    // todo: improve
+    const res = new PipelineResponse('', {
+      status: 204,
+      headers: {
+        // Set preflight cache duration
+        'access-control-max-age': '86400',
+        // Allow content type header
+        'access-control-allow-headers': 'content-type',
+      },
+    });
+    await fetchConfigAll(state, request, res);
+    await setCustomResponseHeaders(state, request, res);
+
+    return res;
+  } catch (e) {
+    const res = new PipelineResponse('', {
+      status: e instanceof PipelineStatusError ? e.code : 500,
+    });
+    const level = res.status >= 500 ? 'error' : 'info';
+    state.log[level](`pipeline status: ${res.status} ${e.message}`);
+    res.headers.set('x-error', cleanupHeaderValue(e.message));
+    res.headers.set('cache-control', 'no-store, private, must-revalidate');
+    return res;
+  }
 }

test/fixtures/code/helix-config-head-with-script.json

@@ -13,5 +13,10 @@
       "/articles/": "/special/default-article",
       "/app": "/spa/index.html"
     }
+  },
+  "content": {
+    "/": {
+      "contentBusId": "foo-id"
+    }
   }
 }

test/fixtures/code/helix-config-no-head-html.json

@@ -1,4 +1,9 @@
 {
   "head": {
+  },
+  "content": {
+    "/": {
+      "contentBusId": "foo-id"
+    }
   }
 }

test/fixtures/code/helix-config-no-head.json

@@ -1,2 +1,7 @@
 {
+  "content": {
+    "/": {
+      "contentBusId": "foo-id"
+    }
+  }
 }

test/fixtures/code/helix-config.json

@@ -13,5 +13,10 @@
       "/articles/": "/special/default-article",
       "/app": "/spa/index.html"
     }
+  },
+  "content": {
+    "/": {
+      "contentBusId": "foo-id"
+    }
   }
 }

test/forms-pipe.test.js

@@ -256,7 +256,6 @@ describe('Form POST Requests', () => {
       ref: 'ref',
       partition: 'live',
       path: '/somepath/workbook.json',
-      contentBusId: 'foobus',
       log: console,
       s3Loader: mockHelixConfig(new StaticS3Loader()),
     });
@@ -321,15 +320,15 @@ describe('Form POST Requests', () => {
     };
 
     it('valid json body', async () => {
-      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultRequest,
         body: JSON.stringify(validBody),
       }), defaultContext);
       assert.deepStrictEqual(res, validBody);
     });
 
     it('valid urlencoded body', async () => {
-      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', defaultFormUrlEncodedRequest), defaultContext);
+      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/', defaultFormUrlEncodedRequest), defaultContext);
       assert.deepEqual(res, {
         data: {
           firstname: 'bruce',
@@ -341,7 +340,7 @@ describe('Form POST Requests', () => {
     it('valid urlencoded body, duplicate keys', async () => {
       const body = 'foo=bar&foo=zoo&firstname=bruce&lastname=banner';
 
-      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = await extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultFormUrlEncodedRequest,
         body,
       }), defaultContext);
@@ -356,7 +355,7 @@ describe('Form POST Requests', () => {
 
     it('invalid json body', async () => {
       const body = 'foobar';
-      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultRequest,
         body,
       }), defaultContext);
@@ -365,7 +364,7 @@ describe('Form POST Requests', () => {
 
     it('empty json body', async () => {
       const body = '{}';
-      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultRequest,
         body,
       }), defaultContext);
@@ -374,7 +373,7 @@ describe('Form POST Requests', () => {
 
     it('unsupported type', async () => {
       const body = '<foo></foo>';
-      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultRequest,
         body,
         headers: { 'content-type': 'application/xml' },
@@ -384,7 +383,7 @@ describe('Form POST Requests', () => {
 
     it('invalid urlencoded body, sent json instead', async () => {
       const body = '[object Object]';
-      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/?contentBusId=foobus', {
+      const res = extractBodyData(new PipelineRequest('https://helix-pipeline.com/', {
         ...defaultFormUrlEncodedRequest,
         body,
       }), defaultContext);

test/html-pipe.test.js

@@ -15,7 +15,10 @@ import assert from 'assert';
 import esmock from 'esmock';
 import { UnsecuredJWT } from 'jose';
 import { FileS3Loader } from './FileS3Loader.js';
-import { htmlPipe, PipelineRequest, PipelineState } from '../src/index.js';
+import {
+  htmlPipe, PipelineRequest, PipelineResponse, PipelineState,
+} from '../src/index.js';
+import { StaticS3Loader } from './StaticS3Loader.js';
 
 describe('HTML Pipe Test', () => {
   it('responds with 404 for invalid path', async () => {
@@ -37,7 +40,6 @@ describe('HTML Pipe Test', () => {
         ref: 'super-test',
         partition: 'live',
         path: '/',
-        contentBusId: 'foo-id',
       }),
       new PipelineRequest(new URL('https://www.hlx.live/'), {
         headers: {
@@ -61,7 +63,6 @@ describe('HTML Pipe Test', () => {
         ref: 'super-test',
         partition: 'live',
         path: '/',
-        contentBusId: 'foo-id',
       }),
       new PipelineRequest(new URL('https://www.hlx.live/')),
     );
@@ -79,7 +80,7 @@ describe('HTML Pipe Test', () => {
     });
 
     const resp = await mockPipe(
-      new PipelineState({ contentBusId: 'foo', s3Loader: new FileS3Loader() }),
+      new PipelineState({ s3Loader: new FileS3Loader() }),
       new PipelineRequest(new URL('https://www.hlx.live/')),
     );
     assert.strictEqual(resp.status, 500);
@@ -105,7 +106,7 @@ describe('HTML Pipe Test', () => {
     });
 
     const resp = await htmlPipe(
-      new PipelineState({ path: '/.auth', contentBusId: 'foo', s3Loader: new FileS3Loader() }),
+      new PipelineState({ path: '/.auth', s3Loader: new FileS3Loader() }),
       req,
     );
     assert.strictEqual(resp.status, 302);
@@ -114,7 +115,7 @@ describe('HTML Pipe Test', () => {
 
   it('handles .auth partition', async () => {
     const resp = await htmlPipe(
-      new PipelineState({ partition: '.auth', contentBusId: 'foo', s3Loader: new FileS3Loader() }),
+      new PipelineState({ partition: '.auth', s3Loader: new FileS3Loader() }),
       new PipelineRequest(new URL('https://www.hlx.live/')),
     );
     assert.strictEqual(resp.status, 401);
@@ -123,7 +124,17 @@ describe('HTML Pipe Test', () => {
 
   it('responds with 400 for missing contentBusId', async () => {
     const resp = await htmlPipe(
-      new PipelineState({ s3Loader: new FileS3Loader() }),
+      new PipelineState({
+        owner: 'owner',
+        repo: 'repo',
+        ref: 'ref',
+        s3Loader: new StaticS3Loader()
+          .reply(
+            'helix-code-bus',
+            'owner/repo/ref/helix-config.json',
+            new PipelineResponse('{}'),
+          ),
+      }),
       new PipelineRequest(new URL('https://www.hlx.live/')),
     );
     assert.strictEqual(resp.status, 400);
@@ -140,7 +151,6 @@ describe('HTML Pipe Test', () => {
       ref: 'super-test',
       partition: 'live',
       path: '/index.md',
-      contentBusId: 'foo-id',
       timer: {
         update: () => { },
       },