Merge pull request #1318 from johngian/inject-cache-control

pcs: Ensure cache control injection is applied
wikimedia · Mar 29, 2023 · 451a258 · 451a258
2 parents 399e648 + 80b106f
commit 451a258
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/config.fullstack.test.yaml b/config.fullstack.test.yaml
@@ -19,7 +19,7 @@ default_project: &default_project
                   mobileapps:
                     host: https://mobileapps.wmcloud.org
                   wikifeeds:
-                    host: https://wikifeeds.wmflabs.org
+                    host: https://wikifeeds-beta.wmflabs.org
                   summary:
                     protocol: https
                     implementation: mcs

diff --git a/test/features/feed.js b/test/features/feed.js
@@ -10,7 +10,7 @@ describe('Featured feed', () => {
     after(() => server.stop());
 
     function assertMCSRequest(content, date, expected) {
-        const serviceURI = 'https://wikifeeds.wmflabs.org';
+        const serviceURI = 'https://wikifeeds-beta.wmflabs.org';
         let path = `/${server.config.defaultDomain}/v1/${content}`;
         if (date) {
             path += `/${date}`;

diff --git a/test/features/pcs.js b/test/features/pcs.js
@@ -31,6 +31,7 @@ describe('Page Content Service: /page/media-list', () => {
                 assert.deepEqual(/^application\/json/.test(res.headers['content-type']), true);
                 assert.deepEqual(!!res.body.items, true);
                 assert.deepEqual(!!res.headers.etag, true);
+                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
             });
     });
 
@@ -45,6 +46,7 @@ describe('Page Content Service: /page/media-list', () => {
                 assert.deepEqual(res.headers['x-restbase-sunset'] || null, 'true');
                 assert.deepEqual(!!res.body.items, true);
                 assert.deepEqual(!!res.headers.etag, true);
+                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
             });
     });
 
@@ -57,6 +59,7 @@ describe('Page Content Service: /page/media-list', () => {
                 assert.deepEqual(/^application\/json/.test(res.headers['content-type']), true);
                 assert.deepEqual(!!res.body.items, true);
                 assert.deepEqual(new RegExp(`^(?:W\/)?"${pageRev}\/.+"$`).test(res.headers.etag), true);
+                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
             });
     });
 });
@@ -84,6 +87,7 @@ describe('Page Content Service: /page/mobile-html', () => {
                 assert.deepEqual(res.status, 200);
                 assert.deepEqual(/^text\/html/.test(res.headers['content-type']), true);
                 assert.deepEqual(res.headers['x-restbase-sunset'] || null, null);
+                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
             });
     });
 
@@ -98,6 +102,7 @@ describe('Page Content Service: /page/mobile-html', () => {
                 assert.deepEqual(res.status, 200);
                 assert.deepEqual(/^text\/html/.test(res.headers['content-type']), true);
                 assert.deepEqual(res.headers['x-restbase-sunset'] || null, 'true');
+                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
             });
     });
 });

diff --git a/v1/pcs/stored_endpoint.js b/v1/pcs/stored_endpoint.js
@@ -26,7 +26,7 @@ class PCSEndpoint {
             return this._fetchFromPCS(hyper, req)
             .tap((res) => {
                 res.headers['x-restbase-sunset'] = true;
-                this._injectCacheControl.bind(this);
+                this._injectCacheControl.bind(this)(res);
                 hyper.metrics.endTiming([
                     'pcs_getContent_latency',
                     'pcs_getContent_latency_no_storage',
@@ -37,8 +37,8 @@ class PCSEndpoint {
 
         if (mwUtils.isNoCacheRequest(req)) {
             return this._fetchFromPCSAndStore(hyper, req)
-            .tap(() => {
-                this._injectCacheControl.bind(this);
+            .tap((res) => {
+                this._injectCacheControl.bind(this)(res);
                 hyper.metrics.endTiming([
                     'pcs_getContent_latency',
                     'pcs_getContent_latency_no_cache',
@@ -58,8 +58,8 @@ class PCSEndpoint {
             return this._fetchFromPCS(hyper, req);
         })
         .catch({ status: 404 }, () => this._fetchFromPCSAndStore(hyper, req))
-        .tap(() => {
-            this._injectCacheControl.bind(this);
+        .tap((res) => {
+            this._injectCacheControl.bind(this)(res);
             hyper.metrics.endTiming([
                 'pcs_getContent_latency',
                 'pcs_getContent_latency_cached',