Skip to content
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

Jump to bottom

Change Eventfilters to a Record structure #1070

Merged
merged 3 commits into from Mar 31, 2022
Merged

Change Eventfilters to a Record structure #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6f3417
changing to a map
colerogers Mar 31, 2022
a352562
adding channel & changelog
colerogers Mar 31, 2022
1e2ea28
Merge branch 'master' into colerogers.change-eventfilters
taeold Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
@@ -0,0 +1 @@
- Changes internal structure to be more flexible (#1070).
9 changes: 3 additions & 6 deletions spec/runtime/loader.spec.ts
View file
Open in desktop
Expand Up @@ -122,12 +122,9 @@ describe('extractStack', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.pubsub.topic.publish',
eventFilters: [
{
attribute: 'resource',
value: 'projects/my-project/topics/my-topic',
},
],
eventFilters: {
resource: 'projects/my-project/topics/my-topic',
},
retry: false,
},
labels: {},
Expand Down
36 changes: 12 additions & 24 deletions spec/v1/cloud-functions.spec.ts
View file
Open in desktop
Expand Up @@ -62,12 +62,9 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
eventFilters: {
resource: 'resource',
},
retry: false,
},
labels: {},
Expand All @@ -89,12 +86,9 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'providers/provider/eventTypes/event',
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
eventFilters: {
resource: 'resource',
},
retry: false,
},
labels: {},
Expand Down Expand Up @@ -125,12 +119,9 @@ describe('makeCloudFunction', () => {
serviceAccountEmail: 'foo@google.com',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
eventFilters: {
resource: 'resource',
},
retry: false,
},
secretEnvironmentVariables: [{ secret: 'MY_SECRET', key: 'MY_SECRET' }],
Expand All @@ -152,12 +143,9 @@ describe('makeCloudFunction', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'mock.provider.mock.event',
eventFilters: [
{
attribute: 'resource',
value: 'resource',
},
],
eventFilters: {
resource: 'resource',
},
retry: true,
},
labels: {},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/analytics.spec.ts
View file
Open in desktop
Expand Up @@ -72,12 +72,9 @@ describe('Analytics Functions', () => {
expect(cloudFunction.__endpoint).to.deep.equal({
platform: 'gcfv1',
eventTrigger: {
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/events/first_open',
},
],
eventFilters: {
resource: 'projects/project1/events/first_open',
},
eventType:
'providers/google.firebase.analytics/eventTypes/event.log',
retry: false,
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/auth.spec.ts
View file
Open in desktop
Expand Up @@ -64,12 +64,9 @@ describe('Auth Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: [
{
attribute: 'resource',
value: `projects/${project}`,
},
],
eventFilters: {
resource: `projects/${project}`,
},
eventType: `providers/firebase.auth/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/database.spec.ts
View file
Open in desktop
Expand Up @@ -45,12 +45,9 @@ describe('Database Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: [
{
attribute: 'resource',
value: resource,
},
],
eventFilters: {
resource,
},
eventType: `providers/google.firebase.database/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/firestore.spec.ts
View file
Open in desktop
Expand Up @@ -107,12 +107,9 @@ describe('Firestore Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: [
{
attribute: 'resource',
value: resource,
},
],
eventFilters: {
resource,
},
eventType: `providers/cloud.firestore/eventTypes/${eventType}`,
retry: false,
},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/pubsub.spec.ts
View file
Open in desktop
Expand Up @@ -108,12 +108,9 @@ describe('Pubsub Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.pubsub.topic.publish',
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/topics/toppy',
},
],
eventFilters: {
resource: 'projects/project1/topics/toppy',
},
retry: false,
},
labels: {},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/remoteConfig.spec.ts
View file
Open in desktop
Expand Up @@ -68,12 +68,9 @@ describe('RemoteConfig Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.firebase.remoteconfig.update',
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1',
},
],
eventFilters: {
resource: 'projects/project1',
},
retry: false,
},
labels: {},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/storage.spec.ts
View file
Open in desktop
Expand Up @@ -42,12 +42,9 @@ describe('Storage Functions', () => {
return {
platform: 'gcfv1',
eventTrigger: {
eventFilters: [
{
attribute: 'resource',
value: `projects/_/buckets/${bucket}`,
},
],
eventFilters: {
resource: `projects/_/buckets/${bucket}`,
},
eventType: `google.storage.object.${eventType}`,
retry: false,
},
Expand Down
9 changes: 3 additions & 6 deletions spec/v1/providers/testLab.spec.ts
View file
Open in desktop
Expand Up @@ -50,12 +50,9 @@ describe('Test Lab Functions', () => {
platform: 'gcfv1',
eventTrigger: {
eventType: 'google.testing.testMatrix.complete',
eventFilters: [
{
attribute: 'resource',
value: 'projects/project1/testMatrices/{matrix}',
},
],
eventFilters: {
resource: 'projects/project1/testMatrices/{matrix}',
},
retry: false,
},
labels: {},
Expand Down
63 changes: 15 additions & 48 deletions spec/v2/providers/alerts/alerts.spec.ts
View file
Open in desktop
Expand Up @@ -6,6 +6,15 @@ import { FULL_ENDPOINT, FULL_OPTIONS } from '../helpers';
const ALERT_TYPE = 'new-alert-type';
const APPID = '123456789';

const ALERT_EVENT_FILTER = {
alerttype: ALERT_TYPE,
};

const ALERT_APP_EVENT_FILTER = {
alerttype: ALERT_TYPE,
appid: APPID,
};

describe('alerts', () => {
describe('onAlertPublished', () => {
it('should create the function without opts', () => {
Expand All @@ -16,12 +25,7 @@ describe('alerts', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
eventFilters: ALERT_EVENT_FILTER,
retry: false,
},
});
Expand All @@ -41,16 +45,7 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
eventFilters: ALERT_APP_EVENT_FILTER,
retry: false,
},
});
Expand Down Expand Up @@ -81,12 +76,7 @@ describe('alerts', () => {
labels: {},
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
eventFilters: ALERT_EVENT_FILTER,
retry: false,
},
});
Expand All @@ -99,12 +89,7 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
],
eventFilters: ALERT_EVENT_FILTER,
retry: false,
},
});
Expand All @@ -117,16 +102,7 @@ describe('alerts', () => {
...FULL_ENDPOINT,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
eventFilters: ALERT_APP_EVENT_FILTER,
retry: false,
},
});
Expand All @@ -153,16 +129,7 @@ describe('alerts', () => {
minInstances: 3,
eventTrigger: {
eventType: alerts.eventType,
eventFilters: [
{
attribute: 'alerttype',
value: ALERT_TYPE,
},
{
attribute: 'appid',
value: APPID,
},
],
eventFilters: ALERT_APP_EVENT_FILTER,
retry: false,
},
});
Expand Down