Skip to content

Commit a0e4df5

Browse files
authored
fix: Update legacy event conversion to set the correct types for firebase database events
1 parent 6446eb2 commit a0e4df5

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/conformance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
- name: Bundle install
2828
run: 'bundle install'
2929
- name: Run HTTP conformance tests
30-
uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
30+
uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
3131
with:
3232
functionType: 'http'
3333
useBuildpacks: false
3434
cmd: "'bundle exec functions-framework-ruby --source test/conformance/app.rb --target http_func --signature-type http'"
3535
- name: Run CloudEvent conformance tests
36-
uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
36+
uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
3737
with:
3838
functionType: 'cloudevent'
3939
useBuildpacks: false

functions_framework.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ version = ::FunctionsFramework::VERSION
4545
spec.executables = ["functions-framework", "functions-framework-ruby"]
4646

4747
spec.required_ruby_version = ">= 2.5.0"
48-
spec.add_dependency "cloud_events", ">= 0.5.1", "< 2.a"
48+
spec.add_dependency "cloud_events", ">= 0.6.0", "< 2.a"
4949
spec.add_dependency "puma", ">= 4.3.0", "< 6.a"
5050
spec.add_dependency "rack", "~> 2.1"
5151

lib/functions_framework/legacy_event_converter.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ def convert_data context, data
200200
"providers/firebase.auth/eventTypes/user.create" => "google.firebase.auth.user.v1.created",
201201
"providers/firebase.auth/eventTypes/user.delete" => "google.firebase.auth.user.v1.deleted",
202202
"providers/google.firebase.analytics/eventTypes/event.log" => "google.firebase.analytics.log.v1.written",
203-
"providers/google.firebase.database/eventTypes/ref.create" => "google.firebase.database.document.v1.created",
204-
"providers/google.firebase.database/eventTypes/ref.write" => "google.firebase.database.document.v1.written",
205-
"providers/google.firebase.database/eventTypes/ref.update" => "google.firebase.database.document.v1.updated",
206-
"providers/google.firebase.database/eventTypes/ref.delete" => "google.firebase.database.document.v1.deleted",
203+
"providers/google.firebase.database/eventTypes/ref.create" => "google.firebase.database.ref.v1.created",
204+
"providers/google.firebase.database/eventTypes/ref.write" => "google.firebase.database.ref.v1.written",
205+
"providers/google.firebase.database/eventTypes/ref.update" => "google.firebase.database.ref.v1.updated",
206+
"providers/google.firebase.database/eventTypes/ref.delete" => "google.firebase.database.ref.v1.deleted",
207207
"providers/cloud.storage/eventTypes/object.change" => "google.cloud.storage.object.v1.finalized"
208208
}.freeze
209209

test/test_legacy_event_converter.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def load_legacy_event filename_or_json, url_path: nil, encoding: "utf-8"
200200
assert_equal \
201201
"//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
202202
event.source.to_s
203-
assert_equal "google.firebase.database.document.v1.written", event.type
203+
assert_equal "google.firebase.database.ref.v1.written", event.type
204204
assert_equal "refs/gcf-test/xyz", event.subject
205205
assert_equal "2020-05-21T11:15:34+00:00", event.time.rfc3339
206206
assert_equal "other", event.data["delta"]["grandchild"]
@@ -213,7 +213,7 @@ def load_legacy_event filename_or_json, url_path: nil, encoding: "utf-8"
213213
assert_equal \
214214
"//firebasedatabase.googleapis.com/projects/_/locations/europe-west1/instances/my-project-id",
215215
event.source.to_s
216-
assert_equal "google.firebase.database.document.v1.deleted", event.type
216+
assert_equal "google.firebase.database.ref.v1.deleted", event.type
217217
assert_equal "refs/gcf-test/xyz", event.subject
218218
assert_equal "2020-05-21T11:53:45+00:00", event.time.rfc3339
219219
end
@@ -225,7 +225,7 @@ def load_legacy_event filename_or_json, url_path: nil, encoding: "utf-8"
225225
assert_equal \
226226
"//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
227227
event.source.to_s
228-
assert_equal "google.firebase.database.document.v1.deleted", event.type
228+
assert_equal "google.firebase.database.ref.v1.deleted", event.type
229229
assert_equal "refs/gcf-test/abc", event.subject
230230
assert_equal "2020-05-21T11:56:12+00:00", event.time.rfc3339
231231
end

0 commit comments

Comments
 (0)