8000 fix: update event conversion (#154) · jrmfg/functions-framework-python@135f328 · GitHub
[go: up one dir, main page]
Skip to content

Commit 135f328

Browse files
matthewrobertsonmatthewrobertson
authored
fix: update event conversion (GoogleCloudPlatform#154)
This commit fixes the failing conformance tests.
1 parent e7afc7d commit 135f328

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎.github/workflows/conformance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run HTTP conformance tests
2727
uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
2828
with:
29-
version: 'v0.3.12'
29+
version: 'v1.1.0'
3030
functionType: 'http'
3131
useBuildpacks: false
3232
validateMapping: false
@@ -35,7 +35,7 @@ jobs:
3535
- name: Run event conformance tests
3636
uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
3737
with:
38-
version: 'v0.3.12'
38+
version: 'v1.1.0'
3939
functionType: 'legacyevent'
4040
useBuildpacks: false
4141
validateMapping: true
@@ -44,7 +44,7 @@ jobs:
4444
- name: Run cloudevent conformance tests
4545
uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.1.0
4646
with:
47-
version: 'v0.3.12'
47+
version: 'v1.1.0'
4848
functionType: 'cloudevent'
4949
useBuildpacks: false
5050
validateMapping: true

‎src/functions_framework/event_conversion.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
"providers/firebase.auth/eventTypes/user.create": "google.firebase.auth.user.v1.created",
4343
"providers/firebase.auth/eventTypes/user.delete": "google.firebase.auth.user.v1.deleted",
4444
"providers/google.firebase.analytics/eventTypes/event.log": "google.firebase.analytics.log.v1.written",
45-
"providers/google.firebase.database/eventTypes/ref.create": "google.firebase.database.document.v1.created",
46-
"providers/google.firebase.database/eventTypes/ref.write": "google.firebase.database.document.v1.written",
47-
"providers/google.firebase.database/eventTypes/ref.update": "google.firebase.database.document.v1.updated",
48-
"providers/google.firebase.database/eventTypes/ref.delete": "google.firebase.database.document.v1.deleted",
45+
"providers/google.firebase.database/eventTypes/ref.create": "google.firebase.database.ref.v1.created",
46+
"providers/google.firebase.database/eventTypes/ref.write": "google.firebase.database.ref.v1.written",
47+
"providers/google.firebase.database/eventTypes/ref.update": "google.firebase.database.ref.v1.updated",
48+
"providers/google.firebase.database/eventTypes/ref.delete": "google.firebase.database.ref.v1.deleted",
4949
"providers/cloud.storage/eventTypes/object.change": "google.cloud.storage.object.v1.finalized",
5050
}
5151

‎tests/test_convert.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def test_pubsub_emulator_request_with_invalid_message(
404404
"ce_event_type, ce_source, expected_type, expected_resource",
405405
[
406406
(
407-
"google.firebase.database.document.v1.written",
407+
"google.firebase.database.ref.v1.written",
408408
"//firebasedatabase.googleapis.com/projects/_/instances/my-project-id",
409409
"providers/google.firebase.database/eventTypes/ref.write",
410410
"projects/_/instances/my-project-id/my/subject",
@@ -436,7 +436,7 @@ def test_pubsub_emulator_request_with_invalid_message(
436436
"projects/my-project-id",
437437
),
438438
(
439-
"google.firebase.database.document.v1.written",
439+
"google.firebase.database.ref.v1.written",
440440
"//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
441441
"providers/google.firebase.database/eventTypes/ref.write",
442442
"projects/_/instances/my-project-id/my/subject",
@@ -561,7 +561,7 @@ def test_cloudevent_to_legacy_event_with_invalid_event(
561561
exception_message,
562562
):
563563
headers = create_ce_headers(
564-
"google.firebase.database.document.v1.written",
564+
"google.firebase.database.ref.v1.written",
565565
"//firebasedatabase.googleapis.com/projects/_/instances/my-project-id",
566566
)
567567
for k, v in header_overrides.items():

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"specversion": "1.0",
3-
"type": "google.firebase.database.document.v1.written",
3+
"type": "google.firebase.database.ref.v1.written",
44
"source": "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
55
"subject": "refs/gcf-test/xyz",
66
"id": "aaaaaa-1111-bbbb-2222-cccccccccccc",

‎tests/test_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ def test_errorhandler(monkeypatch):
582582
"google.firebase.analytics.log.v1.written",
583583
"google.firebase.auth.user.v1.created",
584584
"google.firebase.auth.user.v1.deleted",
585-
"google.firebase.database.document.v1.written",
585+
"google.firebase.database.ref.v1.written",
586586
],
587587
)
588588
def tests_cloud_to_background_event_client(

0 commit comments

Comments
 (0)
0