Add a secondary EventGroup pattern with MeasurementConsumer as the pa…

…rent.
world-federation-of-advertisers · Jun 13, 2023 · a0f5faa · a0f5faa
1 parent 3705b80
commit a0f5faa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -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.
   //