Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ message GetEventMessageStreamRequest {
}

message GetEventMessageStreamResponse {
EventMessage messages = 1;
EventMessage message = 1;
}

message AcknowledgeMessageBatchRequest {
Expand Down
5 changes: 5 additions & 0 deletions aruna/api/storage/models/v2/models.proto
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ message Token {
Permission permission = 5;
}

message Pubkey {
int32 id = 1;
string key = 2;
string location = 3;
}

message CustomAttributes {
string attribute_name = 1;
Expand Down
8 changes: 4 additions & 4 deletions aruna/api/storage/services/v2/authorization_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ service AuthorizationService {
//
// This creates a user-specific attribute that handles permission for a
// specific resource
rpc UpdateAuthorizations(UpdateAuthorizationsRequest)
returns (UpdateAuthorizationsResponse) {
rpc UpdateAuthorization(UpdateAuthorizationRequest)
returns (UpdateAuthorizationResponse) {
option (google.api.http) = {
patch : "/v2/auth"
body : "*"
Expand Down Expand Up @@ -109,12 +109,12 @@ message DeleteAuthorizationRequest {

message DeleteAuthorizationResponse {}

message UpdateAuthorizationsRequest {
message UpdateAuthorizationRequest {
string resource_id = 1;
string user_id = 2;
storage.models.v2.PermissionLevel permission_level = 3;
}

message UpdateAuthorizationsResponse {
message UpdateAuthorizationResponse {
UserPermission user_permission = 1;
}
8 changes: 6 additions & 2 deletions aruna/api/storage/services/v2/endpoint_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ service EndpointService {
// Status: BETA
//
// Requests a full sync of all endpoint related data
rpc FullSyncEndpoint(FullSyncEndpointRequest) returns (FullSyncEndpointResponse) {
rpc FullSyncEndpoint(FullSyncEndpointRequest) returns (stream FullSyncEndpointResponse) {
option (google.api.http) = {
get : "/v2/endpoint/sync"
};
Expand Down Expand Up @@ -110,7 +110,11 @@ message CreateEndpointResponse {
message FullSyncEndpointRequest {}

message FullSyncEndpointResponse {
string url = 1;
oneof target{
storage.models.v2.GenericResource generic_resource = 1;
storage.models.v2.User user = 2;
storage.models.v2.Pubkey pubkey = 3;
}
}

message GetEndpointRequest {
Expand Down
8 changes: 1 addition & 7 deletions aruna/api/storage/services/v2/info_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ message GetStorageStatusResponse {

message GetPubkeysRequest {}

message Pubkey {
int32 id = 1;
string key = 2;
string location = 3;
}

message GetPubkeysResponse {
repeated Pubkey pubkeys = 1;
repeated storage.models.v2.Pubkey pubkeys = 1;
}