From 16250153216fb18cf310c45f63d444087e364703 Mon Sep 17 00:00:00 2001 From: St4NNi Date: Tue, 18 Jul 2023 16:47:58 +0200 Subject: [PATCH 1/5] feat: Added hash to resource message, rename stream_group to stream_consumer --- .../services/v2/notification_service.proto | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto index b0f64e9d..f489515b 100644 --- a/aruna/api/notification/services/v2/notification_service.proto +++ b/aruna/api/notification/services/v2/notification_service.proto @@ -57,7 +57,8 @@ message Resource { string resource_id = 1; string associated_id = 2; bool persistent_resource_id = 3; - storage.models.v2.ResourceVariant resource_variant = 4; + string resource_hash = 4; + storage.models.v2.ResourceVariant resource_variant = 5; } message StreamTarget { @@ -79,10 +80,10 @@ message CreateStreamConsumerRequest { }; } -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 +92,7 @@ message GetEventMessageBatchResponse { } message GetEventMessageBatchStreamRequest { - string stream_group_id = 1; + string stream_consumer = 1; uint32 batch_size = 2; } @@ -107,7 +108,7 @@ message AcknowledgeMessageBatchResponse {} message DeleteEventStreamingGroupRequest { - string stream_group_id = 1; + string stream_consumer = 1; } message DeleteEventStreamingGroupResponse {} From 9cd00e7fdf6ab61991e08975b9dd4045a0ec39fe Mon Sep 17 00:00:00 2001 From: St4NNi Date: Tue, 18 Jul 2023 16:58:05 +0200 Subject: [PATCH 2/5] feat: Rename hash in notification to checksum --- .../services/v2/notification_service.proto | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto index f489515b..9b29fbdc 100644 --- a/aruna/api/notification/services/v2/notification_service.proto +++ b/aruna/api/notification/services/v2/notification_service.proto @@ -57,26 +57,27 @@ message Resource { string resource_id = 1; string associated_id = 2; bool persistent_resource_id = 3; - string resource_hash = 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; }; } @@ -144,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 { From accba117399684eab17b64a5ba084c7f66886d2a Mon Sep 17 00:00:00 2001 From: St4NNi Date: Tue, 18 Jul 2023 17:01:15 +0200 Subject: [PATCH 3/5] feat: Rename onboard endpoint to full_sync --- .../api/storage/services/v2/endpoint_service.proto | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/aruna/api/storage/services/v2/endpoint_service.proto b/aruna/api/storage/services/v2/endpoint_service.proto index 56e9f926..ea16a1fb 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(FullSyncRequest) returns (FullSyncResponse) { 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 FullSyncRequest {} -message OnboardEndpointResponse { +message FullSyncResponse { string url = 1; } From f4b70024f194930631cbedc189fdac01a7d46b99 Mon Sep 17 00:00:00 2001 From: St4NNi Date: Tue, 18 Jul 2023 17:21:14 +0200 Subject: [PATCH 4/5] feat: Update google deps --- aruna/api/google | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b811e0e6c60a90ee6ed06e089184fcee234503a1 Mon Sep 17 00:00:00 2001 From: St4NNi Date: Tue, 18 Jul 2023 17:22:19 +0200 Subject: [PATCH 5/5] feat: Rename FullSync request to FullSyncEndpointRequest --- aruna/api/storage/services/v2/endpoint_service.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aruna/api/storage/services/v2/endpoint_service.proto b/aruna/api/storage/services/v2/endpoint_service.proto index ea16a1fb..39b8bdec 100644 --- a/aruna/api/storage/services/v2/endpoint_service.proto +++ b/aruna/api/storage/services/v2/endpoint_service.proto @@ -35,7 +35,7 @@ service EndpointService { // Status: BETA // // Requests a full sync of all endpoint related data - rpc FullSyncEndpoint(FullSyncRequest) returns (FullSyncResponse) { + rpc FullSyncEndpoint(FullSyncEndpointRequest) returns (FullSyncEndpointResponse) { option (google.api.http) = { get : "/v2/endpoint/sync" }; @@ -107,9 +107,9 @@ message CreateEndpointResponse { storage.models.v2.Endpoint endpoint = 1; } -message FullSyncRequest {} +message FullSyncEndpointRequest {} -message FullSyncResponse { +message FullSyncEndpointResponse { string url = 1; }