From a0f5faaed7e89d19442eac34b710c60b9e30332b Mon Sep 17 00:00:00 2001 From: Sanjay Vasandani Date: Tue, 13 Jun 2023 13:44:25 -0700 Subject: [PATCH] Add a secondary EventGroup pattern with MeasurementConsumer as the parent. --- .../proto/wfa/measurement/api/v2alpha/event_group.proto | 3 +++ .../measurement/api/v2alpha/event_groups_service.proto | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/proto/wfa/measurement/api/v2alpha/event_group.proto b/src/main/proto/wfa/measurement/api/v2alpha/event_group.proto index d43593b0b..1555719ad 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/event_group.proto +++ b/src/main/proto/wfa/measurement/api/v2alpha/event_group.proto @@ -31,11 +31,14 @@ message EventGroup { option (google.api.resource) = { type: "halo.wfanet.org/EventGroup" pattern: "dataProviders/{data_provider}/eventGroups/{event_group}" + pattern: "measurementConsumers/{measurement_consumer}/eventGroups/{event_group}" singular: "eventGroup" plural: "eventGroups" }; // Resource name. + // + // Canonical format: dataProviders/{data_provider}/eventGroups/{event_group} string name = 1; // Resource name of the `MeasurementConsumer` associated with this diff --git a/src/main/proto/wfa/measurement/api/v2alpha/event_groups_service.proto b/src/main/proto/wfa/measurement/api/v2alpha/event_groups_service.proto index 18c48f1fc..d8e7ba3dd 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/event_groups_service.proto +++ b/src/main/proto/wfa/measurement/api/v2alpha/event_groups_service.proto @@ -112,11 +112,9 @@ message DeleteEventGroupRequest { // Request message for `ListEventGroups` method. message ListEventGroupsRequest { - // Resource name of the parent `DataProvider`. The wildcard ID (`-`) may be - // used in place of the `DataProvider` ID to list across `DataProvider`s, in - // which case a filter should be specified. + // Resource name of the parent. string parent = 1 [ - (google.api.resource_reference).type = "halo.wfanet.org/DataProvider", + (google.api.resource_reference).child_type = "halo.wfanet.org/EventGroup", (google.api.field_behavior) = REQUIRED ]; @@ -137,6 +135,9 @@ message ListEventGroupsRequest { repeated string measurement_consumers = 1 [(google.api.resource_reference).type = "halo.wfanet.org/MeasurementConsumer"]; + // Matches against the parent `DataProvider`. + repeated string data_providers = 6 + [(google.api.resource_reference).type = "halo.wfanet.org/DataProvider"]; } // Filter criteria for this request. //