From 41304492161c29a5a38ddcef01ca8b34a8e45d3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:09:41 +0000 Subject: [PATCH 1/4] Update version to 1.1.0-rc.3 --- aruna/api/google | 2 +- aruna/api/storage/services/v1/project_service.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aruna/api/google b/aruna/api/google index 5d285a64..06f7999f 160000 --- a/aruna/api/google +++ b/aruna/api/google @@ -1 +1 @@ -Subproject commit 5d285a6449c121ece5ee29305f4856464648fa96 +Subproject commit 06f7999f85dfe75fffaf30c5ca4d9aa6b58669f8 diff --git a/aruna/api/storage/services/v1/project_service.proto b/aruna/api/storage/services/v1/project_service.proto index 93715f7c..b83105c6 100644 --- a/aruna/api/storage/services/v1/project_service.proto +++ b/aruna/api/storage/services/v1/project_service.proto @@ -14,7 +14,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Aruna Object Storage (AOS) REST API"; - version: "1.1.0-rc.2" + version: "1.1.0-rc.3" }; // Overwriting host entry breaks tests, so this is not done here. schemes: HTTPS; From 29a3c9bf7dc432da2608c5fa790f5224f4a9648d Mon Sep 17 00:00:00 2001 From: St4NNi Date: Wed, 21 Jun 2023 14:00:11 +0200 Subject: [PATCH 2/4] feat: Added AddKeyValueToCollection request --- .../services/v1/collection_service.proto | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/aruna/api/storage/services/v1/collection_service.proto b/aruna/api/storage/services/v1/collection_service.proto index 505ee1be..653de87d 100644 --- a/aruna/api/storage/services/v1/collection_service.proto +++ b/aruna/api/storage/services/v1/collection_service.proto @@ -107,6 +107,19 @@ service CollectionService { body : "*" }; } + + // AddKeyValueToCollection + // + // Status: BETA + // + // Adds key values (labels / hooks) to a collection + rpc AddKeyValueToCollection(AddKeyValueToCollectionRequest) + returns (AddKeyValueToCollectionResponse) { + option (google.api.http) = { + patch : "/v1/collection/{collection_id}/add_key_value" + body : "*" + }; + } } @@ -303,4 +316,10 @@ message DeleteCollectionRequest { bool force = 3; } -message DeleteCollectionResponse {} \ No newline at end of file +message DeleteCollectionResponse {} + + +message AddKeyValueToCollectionRequest { + repeated storage.models.v1.KeyValue labels = 1; + repeated storage.models.v1.KeyValue hooks = 2; +} \ No newline at end of file From 5f0bdaee51c41fa3234245e130c7de43a54be6f7 Mon Sep 17 00:00:00 2001 From: St4NNi Date: Wed, 21 Jun 2023 14:02:37 +0200 Subject: [PATCH 3/4] fix: Added missing AddKeyValueToCollectionResponse --- aruna/api/storage/services/v1/collection_service.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aruna/api/storage/services/v1/collection_service.proto b/aruna/api/storage/services/v1/collection_service.proto index 653de87d..05a4e808 100644 --- a/aruna/api/storage/services/v1/collection_service.proto +++ b/aruna/api/storage/services/v1/collection_service.proto @@ -322,4 +322,9 @@ message DeleteCollectionResponse {} message AddKeyValueToCollectionRequest { repeated storage.models.v1.KeyValue labels = 1; repeated storage.models.v1.KeyValue hooks = 2; +} + +message AddKeyValueToCollectionResponse { + // New collection overview + storage.models.v1.CollectionOverview collection = 1; } \ No newline at end of file From 24fc061dd1efcc18cf4e1bd68ca04c792e52b35d Mon Sep 17 00:00:00 2001 From: St4NNi Date: Wed, 21 Jun 2023 14:24:17 +0200 Subject: [PATCH 4/4] fix: Fixed naming to AddKeyValue + s --- aruna/api/storage/services/v1/collection_service.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aruna/api/storage/services/v1/collection_service.proto b/aruna/api/storage/services/v1/collection_service.proto index 05a4e808..94133782 100644 --- a/aruna/api/storage/services/v1/collection_service.proto +++ b/aruna/api/storage/services/v1/collection_service.proto @@ -113,8 +113,8 @@ service CollectionService { // Status: BETA // // Adds key values (labels / hooks) to a collection - rpc AddKeyValueToCollection(AddKeyValueToCollectionRequest) - returns (AddKeyValueToCollectionResponse) { + rpc AddKeyValuesToCollection(AddKeyValuesToCollectionRequest) + returns (AddKeyValuesToCollectionResponse) { option (google.api.http) = { patch : "/v1/collection/{collection_id}/add_key_value" body : "*" @@ -319,12 +319,12 @@ message DeleteCollectionRequest { message DeleteCollectionResponse {} -message AddKeyValueToCollectionRequest { +message AddKeyValuesToCollectionRequest { repeated storage.models.v1.KeyValue labels = 1; repeated storage.models.v1.KeyValue hooks = 2; } -message AddKeyValueToCollectionResponse { +message AddKeyValuesToCollectionResponse { // New collection overview storage.models.v1.CollectionOverview collection = 1; } \ No newline at end of file