feat: update server configuration and testing utilities for improved API testing

Author: max-ostapenko

src/__tests__/routes.test.js

@@ -80,7 +80,9 @@ jest.unstable_mockModule('../utils/db.js', () => {
 });
 
 // Import app after mocking
-const { app } = await import('../index.js');
+await import('../index.js');
+import { getTestServer } from '@google-cloud/functions-framework/testing';
+const app = getTestServer('app');
 
 describe('API Routes', () => {
   describe('Health Check', () => {

src/index.js

@@ -1,5 +1,3 @@
-import http from 'http';
-import url from 'url';
 import crypto from 'crypto';
 import functions from '@google-cloud/functions-framework';
 
@@ -85,20 +83,10 @@ const sendJSONResponse = (res, data, statusCode = 200) => {
 
 // Helper function to check if resource is modified
 const isModified = (req, etag) => {
-  const ifNoneMatch = req.headers['if-none-match'];
+  const ifNoneMatch = req.headers['if-none-match'] || req.get('if-none-match');
   return !ifNoneMatch || ifNoneMatch !== `"${etag}"`;
 };
 
-// Helper function to parse query parameters
-const parseQuery = (queryString) => {
-  const params = new URLSearchParams(queryString);
-  const result = {};
-  for (const [key, value] of params) {
-    result[key] = value;
-  }
-  return result;
-};
-
 // Route handler function
 const handleRequest = async (req, res) => {
   try {
@@ -119,13 +107,8 @@ const handleRequest = async (req, res) => {
       return;
     }
 
-    // Parse URL
-    const parsedUrl = url.parse(req.url, true);
-    const pathname = parsedUrl.pathname;
-    const query = parsedUrl.query;
-
-    // Add query to req object for compatibility with existing controllers
-    req.query = query;
+    // Parse URL path
+    const pathname = req.path;
 
     // Route handling
     if (pathname === '/' && req.method === 'GET') {
@@ -186,22 +169,8 @@ const handleRequest = async (req, res) => {
   }
 };
 
-// Create HTTP server
-const server = http.createServer(handleRequest);
-
-// Export the server for testing
-export { server as app };
-
-// Register with Functions Framework for Cloud Functions
+// Register with Functions Framework
 functions.http('app', handleRequest);
 
-// For standalone server mode (local development)
-// Note: In ES modules, there's no require.main === module equivalent
-// We'll use import.meta.url to check if this is the main module
-const isMain = import.meta.url === `file://${process.argv[1]}`;
-if (isMain) {
-  const PORT = process.env.PORT || 3000;
-  server.listen(PORT, () => {
-    console.log(`Server running on port ${PORT}`);
-  });
-}
+// Export for testing using Functions Framework testing utilities
+export { handleRequest as app };

src/package.json

@@ -8,7 +8,7 @@
     "node": ">=22.0.0"
   },
   "scripts": {
-    "start": "export DATABASE=tech-report-api-prod && node index.js",
+    "start": "DATABASE=tech-report-api-prod functions-framework --target=app",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:live": "bash ../test-api.sh"
   },

terraform/modules/run-service/variables.tf

@@ -33,7 +33,7 @@ variable "available_cpu" {
 }
 variable "ingress_settings" {
   type        = string
-  default     = "ALLOW_INTERNAL_AND_GCLB"
+  default     = "ALLOW_ALL"
   description = "String value that controls what traffic can reach the function. Allowed values are ALLOW_ALL, ALLOW_INTERNAL_AND_GCLB and ALLOW_INTERNAL_ONLY. Check ingress documentation to see the impact of each settings value. Changes to this field will recreate the cloud function."
 }
 variable "vpc_connector_egress_settings" {

test-api.sh

@@ -4,7 +4,7 @@
 test_endpoint() {
   local endpoint=$1
   local params=$2
-  local url="http://localhost:3000${endpoint}${params}"
+  local url="http://localhost:8080${endpoint}${params}"
 
   echo "Testing endpoint: ${url}"
   response=$(curl -s -w "\n%{http_code}" "${url}")
@@ -27,7 +27,7 @@ test_endpoint() {
 # Function to test CORS preflight with OPTIONS request
 test_cors_preflight() {
   local endpoint=$1
-  local url="http://localhost:3000${endpoint}"
+  local url="http://localhost:8080${endpoint}"
 
   echo "Testing CORS preflight for: ${url}"