diff --git a/src/main/proto/wfa/measurement/api/v2alpha/BUILD.bazel b/src/main/proto/wfa/measurement/api/v2alpha/BUILD.bazel index 6c6ad597e..9051050e6 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/BUILD.bazel +++ b/src/main/proto/wfa/measurement/api/v2alpha/BUILD.bazel @@ -496,15 +496,6 @@ proto_library( ], ) -proto_library( - name = "recurring_exchanges_service_proto", - srcs = ["recurring_exchanges_service.proto"], - deps = [ - ":recurring_exchange_proto", - "@com_google_googleapis//google/api:resource_proto", - ], -) - proto_library( name = "exchanges_service_proto", srcs = ["exchanges_service.proto"], @@ -530,7 +521,6 @@ proto_library( deps = [ ":exchange_step_attempt_proto", "@com_google_googleapis//google/api:resource_proto", - "@com_google_protobuf//:timestamp_proto", ], ) diff --git a/src/main/proto/wfa/measurement/api/v2alpha/exchange_step_attempts_service.proto b/src/main/proto/wfa/measurement/api/v2alpha/exchange_step_attempts_service.proto index 339f131dd..3f650f4fc 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/exchange_step_attempts_service.proto +++ b/src/main/proto/wfa/measurement/api/v2alpha/exchange_step_attempts_service.proto @@ -17,7 +17,6 @@ syntax = "proto3"; package wfa.measurement.api.v2alpha; import "google/api/resource.proto"; -import "google/protobuf/timestamp.proto"; import "wfa/measurement/api/v2alpha/exchange_step_attempt.proto"; option java_package = "org.wfanet.measurement.api.v2alpha"; @@ -29,14 +28,6 @@ option java_outer_classname = "ExchangeStepAttemptsServiceProto"; // The only way to create an ExchangeStepAttempt is through the // /ExchangeSteps.ClaimReadyExchangeStep method. service ExchangeStepAttempts { - // Returns the `ExchangeStepAttempt` with the specified resource key. - rpc GetExchangeStepAttempt(GetExchangeStepAttemptRequest) - returns (ExchangeStepAttempt); - - // Lists `ExchangeStepAttempts`. - rpc ListExchangeStepAttempts(ListExchangeStepAttemptsRequest) - returns (ListExchangeStepAttemptsResponse); - // Adds a log entry to an `ExchangeStepAttempt`. rpc AppendLogEntry(AppendLogEntryRequest) returns (ExchangeStepAttempt); @@ -48,58 +39,6 @@ service ExchangeStepAttempts { returns (ExchangeStepAttempt); } -// Request message for `GetExchangeStepAttempt` method. -message GetExchangeStepAttemptRequest { - // Resource name. - string name = 1 [(google.api.resource_reference).type = - "halo.wfanet.org/ExchangeStepAttempt"]; -} - -// Request message for `ListExchangeStepAttempts` method. -message ListExchangeStepAttemptsRequest { - // The parent `ExchangeStep`. If blank, `ListExchangeSteps` will consider all - // ExchangeStepAttempts belonging to the caller. - string parent = 1 - [(google.api.resource_reference).type = "halo.wfanet.org/Exchange"]; - - // The maximum number of `ExchangeStepAttempt`s to return. - // The service may return fewer than this value. - // If unspecified, at most 50 `ExchangeStepAttempt`s will be returned. - // The maximum value is 1000; values above 1000 will be coerced to 1000. - // - // Typically, an ExchangeStep will only have 0 or 1 ExchangeStepAttempts, so - // most of the time this can be omitted and all results will fit in a single - // response. - int32 page_size = 2; - - // A page token, received from a previous `ListExchangeStepAttemptsRequest` - // call. Provide this to retrieve the subsequent page. - // - // When paginating, all other parameters provided to - // `ListExchangeStepAttemptsRequest` must match the call that provided the - // page token. - string page_token = 3; - - // Filter criteria. Repeated fields are treated as logical ORs, and multiple - // fields specified as logical ANDs. - message Filter { - repeated ExchangeStepAttempt.State state = 1; - google.protobuf.Timestamp created_before = 2; - google.protobuf.Timestamp created_on_or_after = 3; - } - Filter filter = 4; -} - -// Response message for `ListExchangeStepAttempts` method. -message ListExchangeStepAttemptsResponse { - // Page of `ExchangeStepAttempt`s. - repeated ExchangeStepAttempt exchange_step_attempts = 1; - - // A token, which can be sent as `page_token` to retrieve the next page. - // If this field is omitted, there are no subsequent pages. - string next_page_token = 2; -} - // Request message for `AppendLogEntry` method. message AppendLogEntryRequest { // The `ExchangeStepAttempt` to append the entry to. It must be in a valid, diff --git a/src/main/proto/wfa/measurement/api/v2alpha/exchange_steps_service.proto b/src/main/proto/wfa/measurement/api/v2alpha/exchange_steps_service.proto index 5c1e26ccd..332d8775f 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/exchange_steps_service.proto +++ b/src/main/proto/wfa/measurement/api/v2alpha/exchange_steps_service.proto @@ -26,9 +26,6 @@ option java_outer_classname = "ExchangeStepsServiceProto"; // Service for interacting with `ExchangeStep` resources. service ExchangeSteps { - // Returns the `ExchangeStep` with the specified resource key. - rpc GetExchangeStep(GetExchangeStepRequest) returns (ExchangeStep); - // Claims a single ExchangeStep that is ready to be worked on and creates an // initial ExchangeStepAttempt for it. // @@ -43,13 +40,6 @@ service ExchangeSteps { returns (ListExchangeStepsResponse); } -// Request message for `GetExchangeStep` method. -message GetExchangeStepRequest { - // Resource name. - string name = 1 - [(google.api.resource_reference).type = "halo.wfanet.org/ExchangeStep"]; -} - // Request message for `ClaimReadyExchangeStep` method. message ClaimReadyExchangeStepRequest { // If an `ExchangeStep` is returned, it should be executed by this party. @@ -122,4 +112,4 @@ message ListExchangeStepsResponse { // A token, which can be sent as `page_token` to retrieve the next page. // If this field is omitted, there are no subsequent pages. string next_page_token = 2; -} \ No newline at end of file +} diff --git a/src/main/proto/wfa/measurement/api/v2alpha/exchanges_service.proto b/src/main/proto/wfa/measurement/api/v2alpha/exchanges_service.proto index 4762bd40d..e7ff05829 100644 --- a/src/main/proto/wfa/measurement/api/v2alpha/exchanges_service.proto +++ b/src/main/proto/wfa/measurement/api/v2alpha/exchanges_service.proto @@ -27,14 +27,6 @@ option java_outer_classname = "ExchangesServiceProto"; service Exchanges { // Returns the `Exchange` with the specified resource key. rpc GetExchange(GetExchangeRequest) returns (Exchange); - - // Lists `Exchanges`. - rpc ListExchanges(ListExchangesRequest) returns (ListExchangesResponse); - - // Uploads an encrypted audit trail for the exchange. - // Only the EDP will be authorized to call this method. - // Multiple calls to this will only save the latest complete audit trail. - rpc UploadAuditTrail(stream UploadAuditTrailRequest) returns (Exchange); } // Request message for `GetExchange` method. @@ -51,50 +43,3 @@ message GetExchangeRequest { "halo.wfanet.org/ModelProvider"]; } } - -// Request message for `ListExchanges` method. -message ListExchangesRequest { - // TODO(efoxepstein): add fields - - // The maximum number of `Exchange`s to return. - // The service may return fewer than this value. - // If unspecified, at most 50 `Exchange`s will be returned. - // The maximum value is 1000; values above 1000 will be coerced to 1000. - int32 page_size = 2; - - // A page token, received from a previous `ListExchangesRequest` call. - // Provide this to retrieve the subsequent page. - // - // When paginating, all other parameters provided to `ListExchangesRequest` - // must match the call that provided the page token. - string page_token = 3; -} - -// Response message for `ListExchanges` method. -message ListExchangesResponse { - // Page of `Exchange`s. - repeated Exchange exchanges = 1; - - // A token, which can be sent as `page_token` to retrieve the next page. - // If this field is omitted, there are no subsequent pages. - string next_page_token = 2; -} - -// Request message for `UpdateAuditTrail` method. -message UploadAuditTrailRequest { - // The first streamed message in a request must specify a `header`; subsequent - // messages must specify `audit_trail_data`. - oneof payload { - // First message that identifies the `Exchange`. - Header header = 1; - - // Encrypted bytes of the audit trail. - bytes audit_trail_data = 2; - } - - message Header { - // The `Exchange` to upload the data to. - string name = 1 - [(google.api.resource_reference).type = "halo.wfanet.org/Exchange"]; - } -} \ No newline at end of file diff --git a/src/main/proto/wfa/measurement/api/v2alpha/recurring_exchanges_service.proto b/src/main/proto/wfa/measurement/api/v2alpha/recurring_exchanges_service.proto deleted file mode 100644 index cd6a6f589..000000000 --- a/src/main/proto/wfa/measurement/api/v2alpha/recurring_exchanges_service.proto +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2021 The Cross-Media Measurement Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package wfa.measurement.api.v2alpha; - -import "google/api/resource.proto"; -import "wfa/measurement/api/v2alpha/recurring_exchange.proto"; - -option java_package = "org.wfanet.measurement.api.v2alpha"; -option java_multiple_files = true; -option java_outer_classname = "RecurringExchangesServiceProto"; - -// Service for interacting with `RecurringExchange` resources. -service RecurringExchanges { - // Returns the `RecurringExchange` with the specified resource key. - rpc GetRecurringExchange(GetRecurringExchangeRequest) - returns (RecurringExchange); - - // Creates a `RecurringExchange`. - rpc CreateRecurringExchange(CreateRecurringExchangeRequest) - returns (RecurringExchange); - - // Lists `RecurringExchanges`. - rpc ListRecurringExchanges(ListRecurringExchangesRequest) - returns (ListRecurringExchangesResponse); - - // Updates a `RecurringExchange`'s state to RETIRED. - rpc RetireRecurringExchange(RetireRecurringExchangeRequest) - returns (RecurringExchange); -} - -// Request message for `GetRecurringExchange` method. -message GetRecurringExchangeRequest { - // Resource name. - string name = 1 [(google.api.resource_reference).type = - "halo.wfanet.org/RecurringExchange"]; -} - -// Request message for `CreateRecurringExchange` method. -message CreateRecurringExchangeRequest { - // The `RecurringExchange` to create. Required. The `key` field will be - // ignored, and the system will assign an ID. - RecurringExchange recurring_exchange = 1; -} - -// Request message for `ListRecurringExchanges` method. -message ListRecurringExchangesRequest { - // The maximum number of `RecurringExchange`s to return. - // The service may return fewer than this value. - // If unspecified, at most 50 `RecurringExchange`s will be returned. - // The maximum value is 1000; values above 1000 will be coerced to 1000. - int32 page_size = 1; - - // A page token, received from a previous `ListRecurringExchangesRequest` - // call. Provide this to retrieve the subsequent page. - // - // When paginating, all other parameters provided to - // `ListRecurringExchangesRequest` must match the call that provided the page - // token. - string page_token = 2; - - // Limits the results to those that match ALL of the specified criteria. Unset - // fields are ignored (i.e. treated like wildcards). - message Filter { - string data_provider = 1 - [(google.api.resource_reference).type = "halo.wfanet.org/DataProvider"]; - string model_provider = 2 [(google.api.resource_reference).type = - "halo.wfanet.org/ModelProvider"]; - } - - // Restrictions on the RecurringExchanges listed. It is an error to request - // RecurringExchanges that are not associated with the caller, so at least - // one of `data_provider` or `model_provider` should be specified. - Filter filter = 3; -} - -message ListRecurringExchangesResponse { - // Page of `RecurringExchange`s. - repeated RecurringExchange resources = 1; - - // A token, which can be sent as `page_token` to retrieve the next page. - // If this field is omitted, there are no subsequent pages. - string next_page_token = 2; -} - -message RetireRecurringExchangeRequest { - // Resource name. - string name = 1 [(google.api.resource_reference).type = - "halo.wfanet.org/RecurringExchange"]; -}