Merge pull request #53 from adobe-rnd/repoless-support

fix: repoless support

Author: dylandepass

src/steps/fetch-404.js

@@ -21,9 +21,9 @@ import { setProduct404CacheHeaders } from './set-cache-headers.js';
  */
 export default async function fetch404(state, req, res) {
   const {
-    owner, repo, ref,
+    owner, site, ref,
   } = state;
-  const ret = await fetch(`https://${ref}--${repo}--${owner}.aem.live/404.html`);
+  const ret = await fetch(`https://${ref}--${site}--${owner}.aem.live/404.html`);
   if (ret.status === 200) {
     // override last-modified if source-last-modified is set
     const lastModified = extractLastModified(ret.headers);

src/steps/fetch-edge-product.js

@@ -20,11 +20,11 @@ import { extractLastModified, recordLastModified } from '../utils/last-modified.
  */
 export default async function fetchEdgeContent(state, res) {
   const {
-    info, owner, repo, ref, log,
+    info, owner, site, ref, log,
   } = state;
   const { originalPath } = info;
 
-  const contentUrl = `https://${ref}--${repo}--${owner}.aem.live${originalPath}.plain.html`;
+  const contentUrl = `https://${ref}--${site}--${owner}.aem.live${originalPath}.plain.html`;
   try {
     const contentRes = await fetch(contentUrl);
     if (contentRes.status === 200) {

src/steps/fetch-media.js

@@ -19,11 +19,11 @@ import { extractLastModified, recordLastModified } from '../utils/last-modified.
  */
 export default async function fetchMedia(state, res) {
   const {
-    info, owner, repo,
+    info, owner, site,
   } = state;
   const bucketId = 'adobe-commerce-catalog';
 
-  const key = `${owner}/${repo}/media/${info.originalFilename}`;
+  const key = `${owner}/${site}/media/${info.originalFilename}`;
   const ret = await state.s3Loader.getObject(bucketId, key);
 
   if (ret.status === 200) {

src/steps/fetch-productbus.js

@@ -23,7 +23,7 @@ const INDEXER_URL_KEYS = ['index', 'merchant-center-feed', 'sitemap'];
  */
 export default async function fetchContent(state, req, res) {
   const {
-    info, owner, repo, config,
+    info, owner, site, config,
   } = state;
   const bucketId = 'adobe-commerce-catalog';
   const { route } = config;
@@ -39,7 +39,7 @@ export default async function fetchContent(state, req, res) {
   urlKey = urlKey?.replace(/\.xml$/, '');
 
   if (Object.keys(route.params).length === 1 && urlKey && !INDEXER_URL_KEYS.includes(urlKey)) {
-    const headKey = `${owner}/${repo}/${storeCode}/${storeViewCode}/urlkeys/${urlKey}`;
+    const headKey = `${owner}/${site}/${storeCode}/${storeViewCode}/urlkeys/${urlKey}`;
 
     const headRes = await state.s3Loader.headObject(bucketId, headKey);
 
@@ -58,12 +58,12 @@ export default async function fetchContent(state, req, res) {
   let key;
   if ((!sku && !INDEXER_URL_KEYS.includes(urlKey)) || (sku && !INDEXER_URL_KEYS.includes(sku))) {
     const slug = slugger(sku);
-    key = `${owner}/${repo}/${storeCode}/${storeViewCode}/products/${slug}.json`;
+    key = `${owner}/${site}/${storeCode}/${storeViewCode}/products/${slug}.json`;
   } else if (urlKey === 'index' || sku === 'index' || urlKey === 'sitemap' || sku === 'sitemap') {
     const id = req.params?.id ?? 'default';
-    key = `${owner}/${repo}/${storeCode}/${storeViewCode}/index/${id}.json`;
+    key = `${owner}/${site}/${storeCode}/${storeViewCode}/index/${id}.json`;
   } else if (urlKey === 'merchant-center-feed' || sku === 'merchant-center-feed') {
-    key = `${owner}/${repo}/${storeCode}/${storeViewCode}/merchant-feed/default.json`;
+    key = `${owner}/${site}/${storeCode}/${storeViewCode}/merchant-feed/default.json`;
   }
 
   const ret = await state.s3Loader.getObject(bucketId, key);

test/product-html-pipe.test.js

@@ -97,6 +97,46 @@ describe('Product HTML Pipe Test', () => {
     });
   });
 
+  it('renders a configurable product html from repoless site', async () => {
+    const s3Loader = new FileS3Loader();
+    const state = DEFAULT_STATE({
+      ...DEFAULT_CONFIG,
+      site: 'repoless-site',
+    }, {
+      log: console,
+      s3Loader,
+      ref: 'main',
+      path: '/products/product-configurable',
+      partition: 'live',
+      timer: {
+        update: () => { },
+      },
+    });
+
+    state.site = 'repoless-site';
+    state.info = getPathInfo('/products/product-configurable');
+    const resp = await productHTMLPipe(
+      state,
+      new PipelineRequest(
+        new URL('https://acme.com/products/product-configurable'),
+        {
+          headers: {
+            'x-byo-cdn-type': 'fastly',
+          },
+        },
+      ),
+    );
+    assert.strictEqual(resp.status, 200);
+    assert.ok(resp.body.includes('<h1 id="blitzmax-5000">BlitzMax 5000</h1>'));
+    assert.deepStrictEqual(Object.fromEntries(resp.headers.entries()), {
+      'cache-control': 'max-age=7200, must-revalidate',
+      'content-type': 'text/html; charset=utf-8',
+      'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
+      'surrogate-control': 'max-age=300, stale-while-revalidate=0',
+      'surrogate-key': 'aVjSNe6DuUvP6Qt0 _H4KMAHPxerU_zHx E2NdXMQ8Jp-cg0zr mkywV26m8w1sg6tA main--repoless-site--org mRN24kMQcclw-dMQ',
+    });
+  });
+
   it('renders a configurable product html with CDN cache control headers', async () => {
     const s3Loader = new FileS3Loader();
     const state = DEFAULT_STATE(DEFAULT_CONFIG, {
@@ -165,7 +205,7 @@ describe('Product HTML Pipe Test', () => {
     const dirname = path.dirname(fileURLToPath(import.meta.url));
     const fetchMockGlobal = fetchMock.mockGlobal();
     const html404 = await readFile(path.join(dirname, 'fixtures', 'product', '404.html'));
-    fetchMockGlobal.get('https://main--helix-pages--adobe.aem.live/404.html', {
+    fetchMockGlobal.get('https://main--site--adobe.aem.live/404.html', {
       body: html404,
       headers: {
         'cache-control': 'max-age=7200, must-revalidate',

test/product-index-pipe.test.js

@@ -151,7 +151,7 @@ describe('Product Index Pipe Test', () => {
 
     const result = await productIndexPipe(state, new PipelineRequest(new URL('https://acme.com/products/index.json?id=404')));
     assert.strictEqual(result.status, 404);
-    assert.strictEqual(result.headers.get('x-error'), 'failed to load adobe/helix-pages/main/default/index/404.json from product-bus: 404');
+    assert.strictEqual(result.headers.get('x-error'), 'failed to load adobe/site/main/default/index/404.json from product-bus: 404');
   });
 
   it('returns 404 for invalid path info', async () => {

test/rendering.test.js

@@ -32,6 +32,7 @@ const DEFAULT_CONFIG = {
   contentBusId: 'foo-id',
   owner: 'blendify',
   repo: 'website',
+  site: 'helix-pages',
   ref: 'main',
   cdn: {
     prod: {
@@ -110,7 +111,7 @@ describe('Rendering', () => {
     }
 
     const fetchMockGlobal = fetchMock.mockGlobal();
-    const productContentUrl = `https://${config.ref}--${config.repo}--${config.owner}.aem.live${url.pathname}.plain.html`;
+    const productContentUrl = `https://${config.ref}--${config.site}--${config.owner}.aem.live${url.pathname}.plain.html`;
     if (productContent) {
       const edgeHtml = await readFile(path.resolve(__testdir, 'fixtures', 'product', 'product-content.html'), 'utf-8');
       fetchMockGlobal.get(productContentUrl, {