Skip to content

Migrate endpoint annotation eventTrigger.eventFilters to list of filters #1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 7, 2022
Merged

Migrate endpoint annotation eventTrigger.eventFilters to list of filters #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
baaddd6
Update __endpoint annoation to generate list of eventFilters.
taeold Mar 2, 2022
531e3d7
Fix tests.
taeold Mar 2, 2022
0ed597b
Add operator property to eventFilter.
taeold Mar 2, 2022
a124123
Add missing changelog.
taeold Mar 2, 2022
d342ebc
Lowercase alertType and appId eventfilter attribute names.
taeold Mar 2, 2022
e3e250e
Merge branch 'dl-cf3v2-eventfitlers' of https://github.com/firebase/f…
taeold Mar 2, 2022
44c8909
Cleanup manifest type def.
taeold Mar 2, 2022
aad1ba2
Merge branch 'master' into dl-cf3v2-eventfitlers
taeold Mar 4, 2022
8aa1ccd
Fix bad merge.
taeold Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Add support for more regions and memory for v2 functions (#1037).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a changelog entry for this PR too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose not to since this change is refactoring non-user facing APIs. Let me know if you disagree.

7 changes: 6 additions & 1 deletion spec/runtime/loader.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ describe('extractStack', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.pubsub.topic.publish',
eventFilters: { resource: 'projects/my-project/topics/my-topic' },
eventFilters: [
{
attribute: 'resource',
value: 'projects/my-project/topics/my-topic',
},
],
retry: false,
},
labels: {},
Expand Down
36 changes: 24 additions & 12 deletions spec/v1/cloud-functions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: {
resource: 'resource',
},
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
retry: false,
},
labels: {},
Expand All @@ -86,9 +89,12 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'providers/provider/eventTypes/event',
eventFilters: {
resource: 'resource',
},
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
retry: false,
},
labels: {},
Expand Down Expand Up @@ -119,9 +125,12 @@ describe('makeCloudFunction', () => {
serviceAccountEmail: 'foo@google.com',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: {
resource: 'resource',
},
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
retry: false,
},
secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }],
Expand All @@ -143,9 +152,12 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: {
resource: 'resource',
},
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
retry: true,
},
labels: {},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/analytics.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ describe('Analytics Functions', () => {
expect(cloudFunction.__endpoint).to.deep.equal({
platform: 'gcfv1',
eventTrigger: {
eventFilters: {
resource: 'projects/project1/events/first_open',
},
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/events/first_open',
},
],
eventType:
'providers/google.firebase.analytics/eventTypes/event.log',
retry: false,
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/auth.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,12 @@ describe('Auth Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: {
resource: `projects/${project}`,
},
eventFilters: [
{
attribute: 'resource',
value: `projects/${project}`,
},
],
eventType: `providers/firebase.auth/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/database.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ describe('Database Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: {
resource,
},
eventFilters: [
{
attribute: 'resource',
value: resource,
},
],
eventType: `providers/google.firebase.database/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/firestore.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,12 @@ describe('Firestore Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: {
resource,
},
eventFilters: [
{
attribute: 'resource',
value: resource,
},
],
eventType: `providers/cloud.firestore/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/pubsub.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,12 @@ describe('Pubsub Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.pubsub.topic.publish',
eventFilters: {
resource: 'projects/project1/topics/toppy',
},
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/topics/toppy',
},
],
retry: false,
},
labels: {},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/remoteConfig.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@ describe('RemoteConfig Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.firebase.remoteconfig.update',
eventFilters: {
resource: 'projects/project1',
},
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1',
},
],
retry: false,
},
labels: {},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/storage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ describe('Storage Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: {
resource: `projects/_/buckets/${bucket}`,
},
eventFilters: [
{
attribute: 'resource',
value: `projects/_/buckets/${bucket}`,
},
],
eventType: `google.storage.object.${eventType}`,
retry: false,
},
Expand Down
9 changes: 6 additions & 3 deletions spec/v1/providers/testLab.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@ describe('Test Lab Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.testing.testMatrix.complete',
eventFilters: {
resource: 'projects/project1/testMatrices/{matrix}',
},
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/testMatrices/{matrix}',
},
],
retry: false,
},
labels: {},
Expand Down
69 changes: 48 additions & 21 deletions spec/v2/providers/alerts/alerts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ describe('alerts', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
retry: false,
},
});
Expand All @@ -38,10 +41,16 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
appId: APPID,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
retry: false,
},
});
Expand Down Expand Up @@ -72,9 +81,12 @@ describe('alerts', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
retry: false,
},
});
Expand All @@ -87,9 +99,12 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
retry: false,
},
});
Expand All @@ -102,10 +117,16 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
appId: APPID,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
retry: false,
},
});
Expand All @@ -132,10 +153,16 @@ describe('alerts', () => {
minInstances: 3,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: ALERT_TYPE,
appId: APPID,
},
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
retry: false,
},
});
Expand Down
46 changes: 32 additions & 14 deletions spec/v2/providers/alerts/appDistribution.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ describe('appDistribution', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: appDistribution.newTesterIosDeviceAlert,
appId: APPID,
},
eventFilters: [
{
attribute: 'alerttype',
value: appDistribution.newTesterIosDeviceAlert,
},
{
attribute: 'appid',
value: APPID,
},
],
retry: false,
},
});
Expand All @@ -38,9 +44,12 @@ describe('appDistribution', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: appDistribution.newTesterIosDeviceAlert,
},
eventFilters: [
{
attribute: 'alerttype',
value: appDistribution.newTesterIosDeviceAlert,
},
],
retry: false,
},
});
Expand All @@ -56,10 +65,16 @@ describe('appDistribution', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: appDistribution.newTesterIosDeviceAlert,
appId: APPID,
},
eventFilters: [
{
attribute: 'alerttype',
value: appDistribution.newTesterIosDeviceAlert,
},
{
attribute: 'appid',
value: APPID,
},
],
retry: false,
},
});
Expand All @@ -73,9 +88,12 @@ describe('appDistribution', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: {
alertType: appDistribution.newTesterIosDeviceAlert,
},
eventFilters: [
{
attribute: 'alerttype',
value: appDistribution.newTesterIosDeviceAlert,
},
],
retry: false,
},
});
Expand Down
Loading