diff --git a/aruna/api/google b/aruna/api/google index 5ea6eb06..0d4e8298 160000 --- a/aruna/api/google +++ b/aruna/api/google @@ -1 +1 @@ -Subproject commit 5ea6eb0611797d6f4add81b6df5cd2c1c71904db +Subproject commit 0d4e8298d8ef5795091daf28ed68719eaaf14521 diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto index b0f64e9d..9b29fbdc 100644 --- a/aruna/api/notification/services/v2/notification_service.proto +++ b/aruna/api/notification/services/v2/notification_service.proto @@ -57,32 +57,34 @@ message Resource { string resource_id = 1; string associated_id = 2; bool persistent_resource_id = 3; - storage.models.v2.ResourceVariant resource_variant = 4; + string checksum = 4; + storage.models.v2.ResourceVariant resource_variant = 5; } -message StreamTarget { +message ResourceTarget { + string resource_id = 1; + storage.models.v2.ResourceVariant resource_variant = 2; +} + +message CreateStreamConsumerRequest { oneof target { - Resource resource = 1; + ResourceTarget resource = 1; bool user = 2; bool anouncements = 3; bool all = 4; } -} - -message CreateStreamConsumerRequest { - StreamTarget target = 1; - bool include_subresources = 2; + bool include_subresources = 5; oneof stream_type { - StreamAll stream_all = 3; - StreamFromDate stream_from_date = 4; - StreamFromSequence stream_from_sequence = 5; + StreamAll stream_all = 6; + StreamFromDate stream_from_date = 7; + StreamFromSequence stream_from_sequence = 8; }; } -message CreateStreamConsumerResponse { string stream_group_id = 1; } +message CreateStreamConsumerResponse { string stream_consumer = 1; } message GetEventMessageBatchRequest { - string stream_group_id = 1; + string stream_consumer = 1; uint32 batch_size = 2; } @@ -91,7 +93,7 @@ message GetEventMessageBatchResponse { } message GetEventMessageBatchStreamRequest { - string stream_group_id = 1; + string stream_consumer = 1; uint32 batch_size = 2; } @@ -107,7 +109,7 @@ message AcknowledgeMessageBatchResponse {} message DeleteEventStreamingGroupRequest { - string stream_group_id = 1; + string stream_consumer = 1; } message DeleteEventStreamingGroupResponse {} @@ -143,7 +145,8 @@ message ResourceEvent { message UserEvent { string user_id = 1; EventVariant event_variant = 2; - Reply reply = 3; + string checksum = 3; + Reply reply = 4; } message Reply { diff --git a/aruna/api/storage/services/v2/endpoint_service.proto b/aruna/api/storage/services/v2/endpoint_service.proto index 56e9f926..39b8bdec 100644 --- a/aruna/api/storage/services/v2/endpoint_service.proto +++ b/aruna/api/storage/services/v2/endpoint_service.proto @@ -30,15 +30,14 @@ service EndpointService { } - // OnboardEndpoint + // FullSyncEndpoint // // Status: BETA // - // Registers a new Endpoint (Aruna DataProxy) to the server - // Needs admin permissions - rpc OnboardEndpoint(OnboardEndpointRequest) returns (OnboardEndpointResponse) { + // Requests a full sync of all endpoint related data + rpc FullSyncEndpoint(FullSyncEndpointRequest) returns (FullSyncEndpointResponse) { option (google.api.http) = { - get : "/v2/endpoint/onboard" + get : "/v2/endpoint/sync" }; } @@ -108,9 +107,9 @@ message CreateEndpointResponse { storage.models.v2.Endpoint endpoint = 1; } -message OnboardEndpointRequest {} +message FullSyncEndpointRequest {} -message OnboardEndpointResponse { +message FullSyncEndpointResponse { string url = 1; }