refactor(integration_tests): simplify templating and add storage tests

Author: cabljac

integration_test/cloudbuild.yaml

@@ -130,7 +130,7 @@ steps:
 
         node scripts/run-tests.js \
           --sequential \
-          v2_firestore v2_database \
+          v2_firestore v2_database v2_storage \
           --use-published-sdk=file:$$WHEEL_FILE
 
 # Artifacts to store

integration_test/config/suites.schema.json

@@ -211,6 +211,18 @@
                   "description": "Trigger type for the function",
                   "minLength": 1
                 },
+                "decorator": {
+                  "type": "string",
+                  "description": "Python decorator name (e.g., on_document_created, on_value_deleted)",
+                  "pattern": "^[a-z_]+$",
+                  "examples": ["on_document_created", "on_value_created", "on_object_archived"]
+                },
+                "eventType": {
+                  "type": "string",
+                  "description": "Event type suffix for CloudEvent type field (e.g., created, deleted, metadataUpdated)",
+                  "minLength": 1,
+                  "examples": ["created", "deleted", "updated", "written", "metadataUpdated", "archived", "finalized"]
+                },
                 "type": {
                   "type": "string",
                   "description": "Type field for identity platform functions",
@@ -254,10 +266,6 @@
                   "type": "string",
                   "description": "Type of alert for alert triggers"
                 },
-                "eventType": {
-                  "type": "string",
-                  "description": "Event type for EventArc triggers"
-                },
                 "database": {
                   "type": "string",
                   "description": "Realtime Database instance URL"

integration_test/config/suites.yaml

@@ -23,18 +23,26 @@ suites:
     functions:
       - name: firestoreOnDocumentCreated
         trigger: onDocumentCreated
+        decorator: on_document_created
+        eventType: created
         document: "tests/{testId}"
         collection: firestoreOnDocumentCreatedTests
       - name: firestoreOnDocumentDeleted
         trigger: onDocumentDeleted
+        decorator: on_document_deleted
+        eventType: deleted
         document: "tests/{testId}"
         collection: firestoreOnDocumentDeletedTests
       - name: firestoreOnDocumentUpdated
         trigger: onDocumentUpdated
+        decorator: on_document_updated
+        eventType: updated
         document: "tests/{testId}"
         collection: firestoreOnDocumentUpdatedTests
       - name: firestoreOnDocumentWritten
         trigger: onDocumentWritten
+        decorator: on_document_written
+        eventType: written
         document: "tests/{testId}"
         collection: firestoreOnDocumentWrittenTests
 
@@ -46,18 +54,26 @@ suites:
     functions:
       - name: databaseOnValueCreated
         trigger: onValueCreated
+        decorator: on_value_created
+        eventType: created
         path: "databaseCreatedTests/{testId}/start"
         collection: databaseCreatedTests
       - name: databaseOnValueDeleted
         trigger: onValueDeleted
+        decorator: on_value_deleted
+        eventType: deleted
         path: "databaseDeletedTests/{testId}/start"
         collection: databaseDeletedTests
       - name: databaseOnValueUpdated
         trigger: onValueUpdated
+        decorator: on_value_updated
+        eventType: updated
         path: "databaseUpdatedTests/{testId}/start"
         collection: databaseUpdatedTests
       - name: databaseOnValueWritten
         trigger: onValueWritten
+        decorator: on_value_written
+        eventType: written
         path: "databaseWrittenTests/{testId}/start"
         collection: databaseWrittenTests
 
@@ -79,16 +95,28 @@ suites:
     functions:
       - name: storageOnObjectArchived
         trigger: onObjectArchived
+        decorator: on_object_archived
+        eventType: archived
         bucket: "{{projectId}}.appspot.com"
+        collection: storageOnObjectArchivedTests
       - name: storageOnObjectDeleted
         trigger: onObjectDeleted
+        decorator: on_object_deleted
+        eventType: deleted
         bucket: "{{projectId}}.appspot.com"
+        collection: storageOnObjectDeletedTests
       - name: storageOnObjectFinalized
         trigger: onObjectFinalized
+        decorator: on_object_finalized
+        eventType: finalized
         bucket: "{{projectId}}.appspot.com"
+        collection: storageOnObjectFinalizedTests
       - name: storageOnObjectMetadataUpdated
         trigger: onObjectMetadataUpdated
+        decorator: on_object_metadata_updated
+        eventType: metadataUpdated
         bucket: "{{projectId}}.appspot.com"
+        collection: storageOnObjectMetadataUpdatedTests
 
   # V2 Scheduler triggers
   - name: v2_scheduler

integration_test/scripts/generate.js

@@ -25,23 +25,6 @@ Handlebars.registerHelper("unless", function (conditional, options) {
   return options.inverse(this);
 });
 
-// Python-specific trigger name mapping
-// Converts trigger names like "onDocumentCreated" or "onCreate" to "created"
-Handlebars.registerHelper("pythonTrigger", function(trigger) {
-  // Extract the action verb (last camelCase component after "on")
-  // Examples:
-  //   onDocumentCreated -> Created -> created
-  //   onValueDeleted -> Deleted -> deleted
-  //   onObjectFinalized -> Finalized -> finalized
-  //   beforeUserCreated -> Created -> created
-  const match = trigger.match(/(?:on|before)[A-Z][a-z]*([A-Z][a-z]+(?:ed|n))$/);
-  if (match) {
-    return match[1].toLowerCase();
-  }
-  // Fallback: just remove "on" and lowercase
-  return trigger.replace(/^on/, "").toLowerCase();
-});
-
 /**
  * Generate Python Firebase Functions from templates
  * @param {string[]} suitePatterns - Array of suite names or patterns

integration_test/templates/functions/src/v2/database_tests.py.hbs

@@ -12,7 +12,7 @@ from typing import Any
 REGION = "{{region}}"
 
 {{#each functions}}
-@db_fn.on_value_{{pythonTrigger trigger}}(
+@db_fn.{{decorator}}(
     reference="{{path}}",
     region=REGION,
     timeout_sec={{timeout}}
@@ -36,7 +36,7 @@ def {{name}}_{{../testRunId}}(event: {{#if (or (eq trigger "onValueUpdated") (eq
     context_data = {
         "id": event.id,
         "time": event.time,
-        "type": f"google.firebase.database.ref.v1.{{pythonTrigger trigger}}",
+        "type": f"google.firebase.database.ref.v1.{{eventType}}",
         "source": event.source,
         "resource": {
             "name": event.reference

integration_test/templates/functions/src/v2/firestore_tests.py.hbs

@@ -10,7 +10,7 @@ from utils import sanitize_data
 REGION = "{{region}}"
 
 {{#each functions}}
-@firestore_fn.on_document_{{pythonTrigger trigger}}(
+@firestore_fn.{{decorator}}(
     document="{{document}}",
     region=REGION,
     timeout_sec={{timeout}}
@@ -27,7 +27,7 @@ def {{name}}_{{../testRunId}}(event: {{#if (or (eq trigger "onDocumentUpdated")
     context_data = {
         "id": event.id,
         "time": event.time,
-        "type": f"google.cloud.firestore.document.v1.{{pythonTrigger trigger}}",
+        "type": f"google.cloud.firestore.document.v1.{{eventType}}",
         "source": event.source,
         "resource": {
             "name": f"projects/{event.project}/databases/{event.database}/documents/{event.document}"

integration_test/templates/functions/src/v2/storage_tests.py.hbs

@@ -0,0 +1,40 @@
+"""
+Storage trigger tests for v2
+Test Run ID: {{testRunId}}
+"""
+
+from firebase_admin import firestore
+from firebase_functions import storage_fn
+
+REGION = "{{region}}"
+
+{{#each functions}}
+@storage_fn.{{decorator}}(
+    bucket="{{../projectId}}.appspot.com",
+    region=REGION,
+    timeout_sec={{timeout}}
+)
+def {{name}}_{{../testRunId}}(event: storage_fn.CloudEvent[storage_fn.StorageObjectData]) -> None:
+    """
+    Test function: {{name}}
+    Trigger: {{trigger}}
+    Bucket: {{bucket}}
+    """
+    # Extract test_id from filename (assumes format: testId.txt)
+    filename = event.data.name
+    test_id = filename.replace('.txt', '') if filename.endswith('.txt') else filename
+
+    # Prepare context data for storage
+    context_data = {
+        "id": event.id,
+        "time": event.time,
+        "type": f"google.cloud.storage.object.v1.{{eventType}}",
+        "source": event.source,
+    }
+
+    # Store context in Firestore for verification
+    db = firestore.client()
+    collection_name = "{{#if collection}}{{collection}}{{else}}{{name}}{{/if}}"
+    db.collection(collection_name).document(test_id).set(context_data)
+
+{{/each}}