fix: update event conversion (GoogleCloudPlatform#154)

This commit fixes the failing conformance tests.

Author: matthewrobertson

.github/workflows/conformance.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Run HTTP conformance tests
       uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
       with:
-        version: 'v0.3.12'
+        version: 'v1.1.0'
         functionType: 'http'
         useBuildpacks: false
         validateMapping: false
@@ -35,7 +35,7 @@ jobs:
     - name: Run event conformance tests
       uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
       with:
-        version: 'v0.3.12'
+        version: 'v1.1.0'
         functionType: 'legacyevent'
         useBuildpacks: false
         validateMapping: true
@@ -44,7 +44,7 @@ jobs:
     - name: Run cloudevent conformance tests
       uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
       with:
-        version: 'v0.3.12'
+        version: 'v1.1.0'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true

src/functions_framework/event_conversion.py

@@ -42,10 +42,10 @@
     "providers/firebase.auth/eventTypes/user.create": "google.firebase.auth.user.v1.created",
     "providers/firebase.auth/eventTypes/user.delete": "google.firebase.auth.user.v1.deleted",
     "providers/google.firebase.analytics/eventTypes/event.log": "google.firebase.analytics.log.v1.written",
-    "providers/google.firebase.database/eventTypes/ref.create": "google.firebase.database.document.v1.created",
-    "providers/google.firebase.database/eventTypes/ref.write": "google.firebase.database.document.v1.written",
-    "providers/google.firebase.database/eventTypes/ref.update": "google.firebase.database.document.v1.updated",
-    "providers/google.firebase.database/eventTypes/ref.delete": "google.firebase.database.document.v1.deleted",
+    "providers/google.firebase.database/eventTypes/ref.create": "google.firebase.database.ref.v1.created",
+    "providers/google.firebase.database/eventTypes/ref.write": "google.firebase.database.ref.v1.written",
+    "providers/google.firebase.database/eventTypes/ref.update": "google.firebase.database.ref.v1.updated",
+    "providers/google.firebase.database/eventTypes/ref.delete": "google.firebase.database.ref.v1.deleted",
     "providers/cloud.storage/eventTypes/object.change": "google.cloud.storage.object.v1.finalized",
 }
 

tests/test_convert.py

@@ -404,7 +404,7 @@ def test_pubsub_emulator_request_with_invalid_message(
     "ce_event_type, ce_source, expected_type, expected_resource",
     [
         (
-            "google.firebase.database.document.v1.written",
+            "google.firebase.database.ref.v1.written",
             "//firebasedatabase.googleapis.com/projects/_/instances/my-project-id",
             "providers/google.firebase.database/eventTypes/ref.write",
             "projects/_/instances/my-project-id/my/subject",
@@ -436,7 +436,7 @@ def test_pubsub_emulator_request_with_invalid_message(
             "projects/my-project-id",
         ),
         (
-            "google.firebase.database.document.v1.written",
+            "google.firebase.database.ref.v1.written",
             "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
             "providers/google.firebase.database/eventTypes/ref.write",
             "projects/_/instances/my-project-id/my/subject",
@@ -561,7 +561,7 @@ def test_cloudevent_to_legacy_event_with_invalid_event(
     exception_message,
 ):
     headers = create_ce_headers(
-        "google.firebase.database.document.v1.written",
+        "google.firebase.database.ref.v1.written",
         "//firebasedatabase.googleapis.com/projects/_/instances/my-project-id",
     )
     for k, v in header_overrides.items():

tests/test_data/firebase-db-cloudevent-output.json

@@ -1,6 +1,6 @@
 {
     "specversion": "1.0",
-    "type": "google.firebase.database.document.v1.written",
+    "type": "google.firebase.database.ref.v1.written",
     "source": "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
     "subject": "refs/gcf-test/xyz",
     "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",

tests/test_functions.py

@@ -582,7 +582,7 @@ def test_errorhandler(monkeypatch):
         "google.firebase.analytics.log.v1.written",
         "google.firebase.auth.user.v1.created",
         "google.firebase.auth.user.v1.deleted",
-        "google.firebase.database.document.v1.written",
+        "google.firebase.database.ref.v1.written",
     ],
 )
 def tests_cloud_to_background_event_client(