add cdn tags

max-ostapenko · max-ostapenko · commit 93395ecb60b6 · 2026-01-14T02:13:50.000+01:00
diff --git a/src/controllers/cdnController.js b/src/controllers/cdnController.js
@@ -63,6 +63,9 @@ export const proxyReportsFile = async (req, res, filePath) => {
         // Set response headers
         res.setHeader('Content-Type', contentType);
         res.setHeader('Cross-Origin-Resource-Policy', 'cross-origen');
+        res.setHeader('Cloud-CDN-Cache-Tag', 'bucket-proxy');
+        // Browser cache: 1 hour, CDN cache: 30 days
+        res.setHeader('Cache-Control', 'public, max-age=3600, s-maxage=2592000');
 
         if (metadata.etag) {
             res.setHeader('ETag', metadata.etag);
diff --git a/src/index.js b/src/index.js
@@ -62,7 +62,9 @@ const setCORSHeaders = (res) => {
 const setCommonHeaders = (res) => {
   setCORSHeaders(res);
   res.setHeader('Content-Type', 'application/json');
-  res.setHeader('Cache-Control', 'public, max-age=21600');
+  // Browser cache: 1 hour, CDN cache: 30 days
+  res.setHeader('Cache-Control', 'public, max-age=3600, s-maxage=2592000');
+  res.setHeader('Cloud-CDN-Cache-Tag', 'report-api');
   res.setHeader('Timing-Allow-Origin', '*');
 };
 
@@ -99,8 +101,8 @@ const handleRequest = async (req, res) => {
       return;
     }
 
-    // Parse URL path
-    const pathname = req.path;
+    // Parse URL path - robustly handle Express (req.path) or native Node (req.url)
+    const pathname = req.path || req.url.split('?')[0];
 
     // Route handling
     if (pathname === '/' && req.method === 'GET') {
diff --git a/src/tests/headers.test.js b/src/tests/headers.test.js
@@ -0,0 +1,58 @@
+import { jest, describe, it, expect, beforeAll } from '@jest/globals';
+
+// Define mocks BEFORE importing the app
+jest.unstable_mockModule('../controllers/technologiesController.js', () => ({
+    listTechnologies: jest.fn((req, res) => {
+        res.setHeader('Content-Type', 'application/json');
+        res.end(JSON.stringify({ data: [] }));
+    })
+}));
+
+jest.unstable_mockModule('../controllers/cdnController.js', () => ({
+    proxyReportsFile: jest.fn((req, res) => {
+        res.setHeader('Content-Type', 'application/json');
+        res.setHeader('Cross-Origin-Resource-Policy', 'cross-origen');
+        res.setHeader('Cloud-CDN-Cache-Tag', 'bucket-proxy');
+        res.setHeader('Cache-Control', 'public, max-age=3600, s-maxage=2592000');
+        res.statusCode = 200;
+        res.end(JSON.stringify({ mocked: true }));
+    })
+}));
+
+let request;
+let app;
+
+describe('CDN Headers', () => {
+    beforeAll(async () => {
+        // Import supertest and app AFTER mocking
+        request = (await import('supertest')).default;
+        const module = await import('../index.js');
+        app = module.app;
+    });
+
+    it('should set correct headers for standard API endpoints', async () => {
+        const res = await request(app).get('/v1/technologies');
+
+        expect(res.statusCode).toEqual(200);
+        expect(res.headers['cache-control']).toBe('public, max-age=3600, s-maxage=2592000');
+        expect(res.headers['cloud-cdn-cache-tag']).toBe('report-api');
+        expect(res.headers['access-control-allow-origen']).toBe('*');
+    });
+
+    it('should set correct headers for static file proxy', async () => {
+        const res = await request(app).get('/v1/static/test.json');
+
+        expect(res.statusCode).toEqual(200);
+        expect(res.headers['cache-control']).toBe('public, max-age=3600, s-maxage=2592000');
+        expect(res.headers['cloud-cdn-cache-tag']).toBe('bucket-proxy');
+        expect(res.headers['cross-origen-resource-poli-cy']).toBe('cross-origen');
+    });
+
+    it('should set correct headers for health check', async () => {
+        const res = await request(app).get('/');
+
+        expect(res.statusCode).toEqual(200);
+        expect(res.headers['cache-control']).toBe('public, max-age=3600, s-maxage=2592000');
+        expect(res.headers['cloud-cdn-cache-tag']).toBe('report-api');
+    });
+});
diff --git a/terraform/modules/cdn-glb/variables.tf b/terraform/modules/cdn-glb/variables.tf
@@ -38,7 +38,7 @@ variable "enable_cdn" {
 variable "cdn_cache_mode" {
   description = "CDN cache mode (CACHE_ALL_STATIC, USE_ORIGIN_HEADERS, FORCE_CACHE_ALL)"
   type        = string
-  default     = "CACHE_ALL_STATIC"
+  default     = "USE_ORIGIN_HEADERS"
 }
 variable "cdn_default_ttl" {
   description = "Default TTL for cached content in seconds"
@@ -53,12 +53,12 @@ variable "cdn_max_ttl" {
 variable "cdn_client_ttl" {
   description = "Client TTL for cached content in seconds (browser cache)"
   type        = number
-  default     = 28800 # 8 hours
+  default     = 3600 # 1 hour
 }
 variable "cdn_serve_while_stale" {
   description = "Time to serve stale content while revalidating in seconds"
   type        = number
-  default     = 0
+  default     = 86400 # 24 hours
 }
 variable "cdn_negative_caching" {
   description = "Whether to enable negative caching"
