From 248fb0b52192706de8a97cd4975be1bdaebfccc0 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 13:41:24 +0200
Subject: [PATCH 01/10] feat: Added visibility filter for SERVER / PROXY

---
 aruna/api/dataproxy/services/v2/bundler_service.proto   | 2 ++
 aruna/api/dataproxy/services/v2/dataproxy_service.proto | 5 ++++-
 aruna/api/hooks/services/v2/hooks_service.proto         | 3 +++
 aruna/api/storage/services/v2/workspace_service.proto   | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/aruna/api/dataproxy/services/v2/bundler_service.proto b/aruna/api/dataproxy/services/v2/bundler_service.proto
index 3f908a13..852d13fd 100644
--- a/aruna/api/dataproxy/services/v2/bundler_service.proto
+++ b/aruna/api/dataproxy/services/v2/bundler_service.proto
@@ -7,10 +7,12 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.dataproxy.serv
 option java_outer_classname = "BundlerService";
 
 import "google/protobuf/timestamp.proto";
+import "google/api/visibility.proto";
 import "google/api/annotations.proto";
 
 
 service BundlerService {
+    option (google.api.api_visibility).restriction = "PROXY";
     rpc CreateBundle(CreateBundleRequest) returns (CreateBundleResponse) {
         option (google.api.http) = {
             post : "/v2/bundle"
diff --git a/aruna/api/dataproxy/services/v2/dataproxy_service.proto b/aruna/api/dataproxy/services/v2/dataproxy_service.proto
index 9bcfde57..c613e519 100644
--- a/aruna/api/dataproxy/services/v2/dataproxy_service.proto
+++ b/aruna/api/dataproxy/services/v2/dataproxy_service.proto
@@ -7,10 +7,11 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.dataproxy.serv
 option java_outer_classname = "DataProxyService";
 
 import "google/api/annotations.proto";
-
+import "google/api/visibility.proto";
 
 
 service DataproxyService {
+    option (google.api.api_visibility).restriction = "PROXY";
     
     // RequestReplication
     //
@@ -29,6 +30,7 @@ service DataproxyService {
 
 
 service DataproxyBackendService {
+    option (google.api.api_visibility).restriction = "PROXY";
     rpc PutObject(stream PutObjectRequest) returns (PutObjectResponse) {}
     rpc GetObject(GetObjectRequest) returns (stream GetObjectResponse) {}
     rpc HeadObject(HeadObjectRequest) returns (HeadObjectResponse) {}
@@ -42,6 +44,7 @@ service DataproxyBackendService {
 }
 
 service DataproxyUserService {
+    option (google.api.api_visibility).restriction = "PROXY";
     // GetCredentials
     //
     // Status: BETA
diff --git a/aruna/api/hooks/services/v2/hooks_service.proto b/aruna/api/hooks/services/v2/hooks_service.proto
index c2571684..34052f4c 100644
--- a/aruna/api/hooks/services/v2/hooks_service.proto
+++ b/aruna/api/hooks/services/v2/hooks_service.proto
@@ -7,6 +7,7 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.servic
 option java_outer_classname = "HooksService"; 
 import "google/api/annotations.proto";
 import "aruna/api/storage/models/v2/models.proto";
+import "google/api/visibility.proto";
 
 
 // HooksService
@@ -15,6 +16,8 @@ import "aruna/api/storage/models/v2/models.proto";
 //
 // A service that enables automatic Hook scheduling
 service HooksService {
+    option (google.api.api_visibility).restriction = "SERVER";
+
     // Created Hooks are always associated with the owner that creates the hook
     rpc CreateHook(CreateHookRequest) returns (CreateHookResponse) {
         option (google.api.http) = {
diff --git a/aruna/api/storage/services/v2/workspace_service.proto b/aruna/api/storage/services/v2/workspace_service.proto
index 76d06b3a..f69d4fd4 100644
--- a/aruna/api/storage/services/v2/workspace_service.proto
+++ b/aruna/api/storage/services/v2/workspace_service.proto
@@ -6,9 +6,11 @@ option java_multiple_files = true;
 option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.services.v2";
 option java_outer_classname = "WorkspaceService";
 import "google/api/annotations.proto";
+import "google/api/visibility.proto";
 
 // Service to manage "special" anonymous collections / workspaces 
 service WorkspaceService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreatesNewWorkspaceTemplate
   //

From c1bfe3df94283bf3360ca235381f4dfc1310c8a6 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 13:57:08 +0200
Subject: [PATCH 02/10] feat: Added gateway annotation for notifications

---
 .../services/v2/notification_service.proto    | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index b2a0cd65..12149835 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -7,7 +7,9 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.notification.s
 option java_outer_classname = "UpdateNotificationServices";
 
 import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
 import "aruna/api/storage/models/v2/models.proto";
+import "google/api/visibility.proto";
 
 
 
@@ -20,7 +22,12 @@ service EventNotificationService {
   //
   // Creates a new event stream consumer.
   rpc CreateStreamConsumer(CreateStreamConsumerRequest)
-      returns (CreateStreamConsumerResponse) {}
+      returns (CreateStreamConsumerResponse) {
+        option (google.api.http) = {
+          post : "/v2/notifications"
+          body : "*"
+        };
+      }
 
   // GetEventMessageBatch
   //
@@ -28,7 +35,11 @@ service EventNotificationService {
   // Each message contains a separate acknowledgement message thatis protected by a salt and an hmac for verification.
   // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message.
   rpc GetEventMessageBatch(GetEventMessageBatchRequest) 
-      returns (GetEventMessageBatchResponse) {}
+      returns (GetEventMessageBatchResponse) {
+        option (google.api.http) = {
+          get : "/v2/notifications/{stream_consumer}/batch"
+        };
+      }
 
   // GetEventMessageBatch
   //
@@ -36,20 +47,33 @@ service EventNotificationService {
   // Each message contains a separate acknowledgement message that is protected by a salt and an hmac for verification.
   // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message.
   rpc GetEventMessageStream(GetEventMessageStreamRequest) 
-      returns (stream GetEventMessageStreamResponse) {}
+      returns (stream GetEventMessageStreamResponse) {
+        option (google.api.http) = {
+          get : "/v2/notifications/{stream_consumer}/stream"
+        };
+      }
 
   // AcknowledgeMessageBatch
   //
   // List of messages to acknowledge
   // Each reply is protected by a salt and and hmac that verifies the message
   rpc AcknowledgeMessageBatch(AcknowledgeMessageBatchRequest) 
-      returns (AcknowledgeMessageBatchResponse) {}
+      returns (AcknowledgeMessageBatchResponse) {
+        option (google.api.http) = {
+          patch : "/v2/notifications/{stream_consumer}/ack"
+          body: "*"
+        };
+      }
 
   // DeleteEventStreamingGroup
   //
   // Deletes an existing event stream consumer by ID.
   rpc DeleteStreamConsumer(DeleteStreamConsumerRequest)
-      returns (DeleteStreamConsumerResponse) {}
+      returns (DeleteStreamConsumerResponse) {
+        option (google.api.http) = {
+          delete : "/v2/notifications/{stream_consumer}"
+        };
+      }
 }
 
 

From 936f3595f157b6ff8a6bee91b55931548575d34d Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 13:58:14 +0200
Subject: [PATCH 03/10] chore: Fix naming in GetAPITokensResponse

---
 .../api/storage/services/v2/service_account_service.proto  | 7 ++++---
 aruna/api/storage/services/v2/user_service.proto           | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/aruna/api/storage/services/v2/service_account_service.proto b/aruna/api/storage/services/v2/service_account_service.proto
index c730a12c..62579785 100644
--- a/aruna/api/storage/services/v2/service_account_service.proto
+++ b/aruna/api/storage/services/v2/service_account_service.proto
@@ -8,7 +8,7 @@ option java_outer_classname = "ServiceAccountService";
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
-
+import "google/api/visibility.proto";
 
 // ServiceAccountService
 //
@@ -16,6 +16,7 @@ import "google/protobuf/timestamp.proto";
 // project specific (or global) and can be used for automation. 
 // Service account users will always contain (bot) behind their name
 service ServiceAccountService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreateServiceAccount
   //
@@ -30,7 +31,7 @@ service ServiceAccountService {
       body : "*"
     };
   }
-  
+
   // CreateServiceAccountToken
   //
   // Status: BETA
@@ -197,7 +198,7 @@ message GetServiceAccountTokensRequest {
 
 message GetServiceAccountTokensResponse {
     // This contains only the token description
-    repeated storage.models.v2.Token token = 1;
+    repeated storage.models.v2.Token tokens = 1;
 }
 
 message DeleteServiceAccountTokenRequest {
diff --git a/aruna/api/storage/services/v2/user_service.proto b/aruna/api/storage/services/v2/user_service.proto
index 06ea9fb3..ee460472 100644
--- a/aruna/api/storage/services/v2/user_service.proto
+++ b/aruna/api/storage/services/v2/user_service.proto
@@ -9,14 +9,14 @@ option java_outer_classname = "UserService";
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
-
+import "google/api/visibility.proto";
 
 // UserService
 //
 // Contains all methods that get/create or update Users and associated resource
 // including all autorization methods
 service UserService {
-
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // RegisterUser
   //
@@ -285,7 +285,7 @@ message GetAPITokensRequest {}
 
 message GetAPITokensResponse {
   // List of API tokens with redacted actual token
-  repeated storage.models.v2.Token token = 1;
+  repeated storage.models.v2.Token tokens = 1;
 }
 
 message DeleteAPITokenRequest {

From 875d30263aaa690eefddf1538ee31fb6efa84bd6 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 15:09:28 +0200
Subject: [PATCH 04/10] feat: Added LicenseService

---
 aruna/api/storage/models/v2/models.proto      | 16 ++++
 .../storage/services/v2/license_service.proto | 94 +++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 aruna/api/storage/services/v2/license_service.proto

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index d89f1f0c..3be6e85c 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -261,6 +261,18 @@ message Context {
   }
 }
 
+message License {
+  string tag = 1; // CC-BY-SA-4.0
+  string name = 2; // Creative Commons Attribution-ShareAlike 4.0 International
+  string text = 3; 
+  // url is optional
+  string url = 4; // https://creativecommons.org/licenses/by-sa/4.0/
+}
+
+message Licenses {
+  string metadata_license_tag = 1;
+  string data_license_tag = 2;
+}
 
 // ------ Resources ----------
 
@@ -288,6 +300,7 @@ message Project {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
+  Licenses licenses = 13;
 }
 
 
@@ -306,6 +319,7 @@ message Collection {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
+  Licenses licenses = 13;
 }
 
 message Dataset {
@@ -323,6 +337,7 @@ message Dataset {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
+  Licenses licenses = 13;
 }
 
 message Object {
@@ -342,4 +357,5 @@ message Object {
   repeated DataEndpoint endpoints = 12;
   // Object specific attributes
   repeated Hash hashes = 13;  
+  Licenses licenses = 14;
 }
diff --git a/aruna/api/storage/services/v2/license_service.proto b/aruna/api/storage/services/v2/license_service.proto
new file mode 100644
index 00000000..c9f2d909
--- /dev/null
+++ b/aruna/api/storage/services/v2/license_service.proto
@@ -0,0 +1,94 @@
+syntax = "proto3";
+
+package aruna.api.storage.services.v2;
+option go_package = "github.com/ArunaStorage/go-api/v2/aruna/api/storage/services/v2";
+option java_multiple_files = true;
+option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.services.v2";
+option java_outer_classname = "LicenseService";
+import "aruna/api/storage/models/v2/models.proto";
+import "google/api/annotations.proto";
+import "google/api/visibility.proto";
+
+// AuthorizationService
+//
+// Contains all methods to edit and change user authorization
+service LicenseService {
+    option (google.api.api_visibility).restriction = "SERVER";
+    // CreateLicense
+    //
+    // Status: BETA
+    //
+    // This creates a new license
+    rpc CreateLicense(CreateLicenseRequest) returns (CreateLicenseResponse) {
+        option (google.api.http) = {
+        post : "/v2/license"
+        body : "*"
+        };
+    }
+
+        // GetLicense
+    //
+    // Status: BETA
+    //
+    // This returns the license for a given tag
+    rpc GetLicense(GetLicenseRequest) returns (GetLicenseResponse) {
+        option (google.api.http) = {
+        get : "/v2/license/{tag}"
+        };
+    }
+
+    // ListLicense
+    //
+    // Status: BETA
+    //
+    // This returns a list of all licenses
+    rpc ListLicense(ListLicenseRequest) returns (ListLicenseResponse) {
+        option (google.api.http) = {
+        get : "/v2/license"
+        };
+    }
+}
+
+// CreateLicenseRequest
+//
+// Request object for CreateLicense
+message CreateLicenseRequest {
+    string tag = 1; // CC-BY-SA-4.0
+    string name = 2; // Creative Commons Attribution-ShareAlike 4.0 International
+    string text = 3; 
+    // url is optional
+    string url = 4; // https://creativecommons.org/licenses/by-sa/4.0/
+}
+
+// CreateLicenseResponse
+//
+// Response object for CreateLicense
+message CreateLicenseResponse {
+    string tag = 1; // CC-BY-SA-4.0
+}
+
+// GetLicenseRequest
+//
+// Request object for GetLicense
+message GetLicenseRequest {
+    string tag = 1; // 1234567890abcdef
+}
+
+// GetLicenseResponse
+//
+// Response object for GetLicense
+message GetLicenseResponse {
+    storage.models.v2.License license = 1;
+}
+
+// ListLicenseRequest
+//
+// Request object for ListLicense
+message ListLicenseRequest {}
+
+// ListLicenseResponse
+//
+// Response object for ListLicense
+message ListLicenseResponse {    
+    repeated storage.models.v2.License licenses = 1;
+}
\ No newline at end of file

From 13b2904175a477d766c64d7ee14e86afeb3a9222 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 16:55:19 +0200
Subject: [PATCH 05/10] feat: Added license to objects

---
 aruna/api/storage/models/v2/models.proto      | 17 +++++-----
 .../services/v2/collection_service.proto      | 30 ++++++++++++++++--
 .../storage/services/v2/dataset_service.proto | 30 ++++++++++++++++--
 .../storage/services/v2/object_service.proto  | 11 +++++--
 .../storage/services/v2/project_service.proto | 31 +++++++++++++++++--
 5 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index 3be6e85c..3e6a8a21 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -269,11 +269,6 @@ message License {
   string url = 4; // https://creativecommons.org/licenses/by-sa/4.0/
 }
 
-message Licenses {
-  string metadata_license_tag = 1;
-  string data_license_tag = 2;
-}
-
 // ------ Resources ----------
 
 message GenericResource {
@@ -300,7 +295,8 @@ message Project {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
-  Licenses licenses = 13;
+  string metadata_license_tag = 13;
+  string default_data_license_tag = 14;
 }
 
 
@@ -319,7 +315,8 @@ message Collection {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
-  Licenses licenses = 13;
+  string metadata_license_tag = 13;
+  string default_data_license_tag = 14;
 }
 
 message Dataset {
@@ -337,7 +334,8 @@ message Dataset {
   Status status = 10;
   bool dynamic = 11;
   repeated DataEndpoint endpoints = 12;
-  Licenses licenses = 13;
+  string metadata_license_tag = 13;
+  string default_data_license_tag = 14;
 }
 
 message Object {
@@ -357,5 +355,6 @@ message Object {
   repeated DataEndpoint endpoints = 12;
   // Object specific attributes
   repeated Hash hashes = 13;  
-  Licenses licenses = 14;
+  string metadata_license_tag = 14;
+  string default_data_license_tag = 15;
 }
diff --git a/aruna/api/storage/services/v2/collection_service.proto b/aruna/api/storage/services/v2/collection_service.proto
index a8bcc899..6c2e491a 100644
--- a/aruna/api/storage/services/v2/collection_service.proto
+++ b/aruna/api/storage/services/v2/collection_service.proto
@@ -7,11 +7,13 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.servic
 option java_outer_classname = "CollectionService";
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
+import "google/api/visibility.proto";
 
 // CollectionService
 //
 // Contains all methods that get/create or update Collection and associated resources
 service CollectionService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreateNewCollection
   //
@@ -120,6 +122,18 @@ service CollectionService {
       body : "*"
     };
   }
+
+  // UpdateLicenses
+  //
+  // Status: BETA
+  //
+  // Updates the collections metadata license and/or default data license.
+  rpc UpdateCollectionLicenses(UpdateCollectionLicensesRequest) returns (UpdateCollectionLicensesResponse) {
+    option (google.api.http) = {
+      patch : "/v2/collection/{collection_id}/licenses"
+      body : "*"
+    };
+  }
 }
 
 message CreateCollectionRequest {
@@ -130,13 +144,15 @@ message CreateCollectionRequest {
   // collection specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
   // External relations (URLs / IDs from external sources)
-  repeated storage.models.v2.ExternalRelation external_relations = 4;
+  repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
-  // Parent_id MUST be collection
+  // Parent_id MUST be project
   oneof parent {
     string project_id = 6;
   }
+  string metadata_license_tag = 7;
+  string default_data_license_tag = 8;
 }
 
 message CreateCollectionResponse {
@@ -213,4 +229,14 @@ message SnapshotCollectionRequest {
 message SnapshotCollectionResponse {
   // This collection will be returned via an Persistent Identifier! Updates will be impossible
   storage.models.v2.Collection collection = 1;
+}
+
+message UpdateCollectionLicensesRequest {
+  string collection_id = 1;
+  string metadata_license_tag = 2;
+  string default_data_license_tag = 3;
+}
+
+message UpdateCollectionLicensesResponse {
+  storage.models.v2.Collection collection = 1;
 }
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/dataset_service.proto b/aruna/api/storage/services/v2/dataset_service.proto
index caf2a964..21872aec 100644
--- a/aruna/api/storage/services/v2/dataset_service.proto
+++ b/aruna/api/storage/services/v2/dataset_service.proto
@@ -7,11 +7,13 @@ option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.servic
 option java_outer_classname = "DatasetService";
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
+import "google/api/visibility.proto";
 
 // DatasetService
 //
 // Contains all methods that get/create or update Dataset and associated resources
 service DatasetService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreateNewDataset
   //
@@ -120,6 +122,18 @@ service DatasetService {
       body : "*"
     };
   }
+
+  // UpdateLicenses
+  //
+  // Status: BETA
+  //
+  // Updates the dataset metadata license and/or default data license.
+  rpc UpdateDatasetLicenses(UpdateDatasetLicensesRequest) returns (UpdateDatasetLicensesResponse) {
+    option (google.api.http) = {
+      patch : "/v2/dataset/{dataset_id}/licenses"
+      body : "*"
+    };
+  }
 }
 
 message CreateDatasetRequest {
@@ -129,8 +143,8 @@ message CreateDatasetRequest {
   string description = 2;
   // dataset specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External relations (URLs / IDs from external sources)
-  repeated storage.models.v2.ExternalRelation external_relations = 4;
+  // External / Internal relations (URLs / IDs from external sources)
+  repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
   // Parent_id MUST be dataset
@@ -138,6 +152,8 @@ message CreateDatasetRequest {
     string project_id = 6;
     string collection_id = 7;
   }
+  string metadata_license_tag = 8;
+  string default_data_license_tag = 9;
 }
 
 message CreateDatasetResponse {
@@ -214,4 +230,14 @@ message SnapshotDatasetRequest {
 message SnapshotDatasetResponse {
   // This dataset will be returned via an Persistent Identifier! Updates will be impossible
   storage.models.v2.Dataset dataset = 1;
+}
+
+message UpdateDatasetLicensesRequest {
+  string dataset_id = 1;
+  string metadata_license_tag = 2;
+  string default_data_license_tag = 3;
+}
+
+message UpdateDatasetLicensesResponse {
+  storage.models.v2.Dataset dataset = 1;
 }
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/object_service.proto b/aruna/api/storage/services/v2/object_service.proto
index 4f8a936f..e2928b94 100644
--- a/aruna/api/storage/services/v2/object_service.proto
+++ b/aruna/api/storage/services/v2/object_service.proto
@@ -8,11 +8,14 @@ option java_outer_classname = "ObjectService";
 
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
+import "google/api/visibility.proto";
 
 // ObjectService
 //
 // Contains all methods that get/create or update Objects and associated resources
 service ObjectService {
+  option (google.api.api_visibility).restriction = "SERVER";
+
 
   // CreateObject
   //
@@ -147,8 +150,8 @@ message CreateObjectRequest {
   string description = 2;
   // collection specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External relations (URLs / IDs from external sources)
-  repeated storage.models.v2.ExternalRelation external_relations = 4;
+  // External / Internal relations (URLs / IDs from external sources)
+  repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
   // Parent can be one of all other resources
@@ -158,6 +161,8 @@ message CreateObjectRequest {
     string dataset_id = 8;
   }
   repeated storage.models.v2.Hash hashes = 9;
+  string metadata_license_tag = 10;
+  string data_license_tag = 11;
 }
 
 message CreateObjectResponse {
@@ -236,6 +241,8 @@ message UpdateObjectRequest {
   repeated storage.models.v2.Hash hashes = 12;
   // Force new object revision
   bool force_revision = 13;
+  string metadata_license_tag = 14;
+  string data_license_tag = 15;
 }
 
 message UpdateObjectResponse {
diff --git a/aruna/api/storage/services/v2/project_service.proto b/aruna/api/storage/services/v2/project_service.proto
index 60564131..89ed9466 100644
--- a/aruna/api/storage/services/v2/project_service.proto
+++ b/aruna/api/storage/services/v2/project_service.proto
@@ -9,6 +9,7 @@ option java_outer_classname = "ProjectService";
 import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
+import "google/api/visibility.proto";
 
 option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 	info: {
@@ -43,6 +44,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 //
 // Contains all methods that get/create or update Projects and associated resources
 service ProjectService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreateProject
   //
@@ -137,6 +139,18 @@ service ProjectService {
     };
   }
 
+  // UpdateLicense
+  //
+  // Status: BETA
+  //
+  // Updates the project license. All (meta) data will be overwritten.
+  rpc UpdateProjectLicenses(UpdateProjectLicensesRequest) returns (UpdateProjectLicensesResponse) {
+    option (google.api.http) = {
+      patch : "/v2/project/{project_id}/licenses"
+      body : "*"
+    };
+  }
+
   // ArchiveProjectRequest
   //
   // Status: BETA
@@ -157,12 +171,15 @@ message CreateProjectRequest {
   string description = 2;
   // Project specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External relations (URLs / IDs from external sources)
-  repeated storage.models.v2.ExternalRelation external_relations = 4;
+  // External / Internal relations (URLs / IDs from external sources)
+  repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
   // Preferred endpoint
   string preferred_endpoint = 6;
+  // 
+  string metadata_license_tag = 7;
+  string default_data_license_tag = 8;
 }
 
 message CreateProjectResponse {
@@ -243,4 +260,14 @@ message ArchiveProjectRequest {
 message ArchiveProjectResponse {
   // This project will be returned via an Persistent Identifier! Updates will be impossible
   storage.models.v2.Project project = 1;
+}
+
+message UpdateLicensesRequest {
+  string project_id = 1;
+  string metadata_license_tag = 2;
+  string default_data_license_tag = 3;
+}
+
+message UpdateLicensesResponse {
+  storage.models.v2.Project project = 1;
 }
\ No newline at end of file

From d8621b55ebc27e07e570763e99c2fe0553a669ff Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 16:56:54 +0200
Subject: [PATCH 06/10] fix: Fix typo in UpdateProjectLicense

---
 aruna/api/storage/services/v2/project_service.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aruna/api/storage/services/v2/project_service.proto b/aruna/api/storage/services/v2/project_service.proto
index 89ed9466..a8d3207b 100644
--- a/aruna/api/storage/services/v2/project_service.proto
+++ b/aruna/api/storage/services/v2/project_service.proto
@@ -262,12 +262,12 @@ message ArchiveProjectResponse {
   storage.models.v2.Project project = 1;
 }
 
-message UpdateLicensesRequest {
+message UpdateProjectLicensesRequest {
   string project_id = 1;
   string metadata_license_tag = 2;
   string default_data_license_tag = 3;
 }
 
-message UpdateLicensesResponse {
+message UpdateProjectLicensesResponse {
   storage.models.v2.Project project = 1;
 }
\ No newline at end of file

From 6cbcccbbc42aa422220575ce607294debad6ff61 Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 17:06:32 +0200
Subject: [PATCH 07/10] fix: Visibility annotation in notifications

---
 aruna/api/notification/services/v2/notification_service.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index 12149835..693abe59 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -17,6 +17,7 @@ import "google/api/visibility.proto";
 //
 // A service to receive events in the AOS storage
 service EventNotificationService {
+  option (google.api.api_visibility).restriction = "SERVER";
 
   // CreateStreamConsumer
   //

From 61075d5c4a1da200361bc8267c6a287cd7553adc Mon Sep 17 00:00:00 2001
From: St4NNi <sb@pus.de>
Date: Thu, 19 Oct 2023 17:29:12 +0200
Subject: [PATCH 08/10] chore: Upgrade dependencies

---
 Cargo.lock | 593 ++++++++++++++++++++++++++++-------------------------
 Cargo.toml |  14 +-
 2 files changed, 316 insertions(+), 291 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d40c353d..db598043 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,11 +2,35 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "aruna_api_buildtests"
@@ -19,15 +43,37 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.74"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn",
 ]
 
 [[package]]
@@ -38,13 +84,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http",
@@ -81,11 +127,26 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base64"
-version = "0.21.1"
+version = "0.21.4"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bitflags"
@@ -93,17 +154,26 @@ version = "1.3.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"
@@ -113,39 +183,31 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.0.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fixedbitset"
@@ -200,20 +262,26 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
 [[package]]
 name = "h2"
-version = "0.3.19"
+version = "0.3.21"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
 dependencies = [
  "bytes",
  "fnv",
@@ -221,7 +289,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -234,6 +302,12 @@ version = "0.12.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.1"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -241,10 +315,13 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.1"
+name = "home"
+version = "0.5.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
 
 [[package]]
 name = "http"
@@ -276,15 +353,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.27"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -297,7 +374,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -323,82 +400,63 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
+name = "indexmap"
+version = "2.0.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
+ "equivalent",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.11.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
+version = "1.0.9"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.149"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.10"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.20"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "matchit"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "mime"
@@ -406,16 +464,24 @@ version = "0.3.17"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -424,53 +490,62 @@ version = "0.8.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 2.0.2",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -486,28 +561,28 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.1.25"
+version = "0.2.15"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.58"
+version = "1.0.69"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prost"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -515,53 +590,53 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
+checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac"
 dependencies = [
  "bytes",
  "heck",
  "itertools",
- "lazy_static",
  "log",
  "multimap",
+ "once_cell",
  "petgraph",
  "prettyplease",
  "prost",
  "prost-types",
  "regex",
- "syn 1.0.109",
+ "syn",
  "tempfile",
  "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
 dependencies = [
  "anyhow",
  "itertools",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.11.9"
+version = "0.12.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
 dependencies = [
  "prost",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.33"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -602,55 +677,88 @@ version = "0.3.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.2"
+version = "1.10.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.37.19"
+version = "0.38.20"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.189"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.189"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -666,21 +774,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "1.0.109"
+name = "socket2"
+version = "0.5.4"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "libc",
+ "windows-sys",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.16"
+version = "2.0.38"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -695,31 +802,30 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "tempfile"
-version = "3.5.0"
+version = "3.8.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.28.1"
+version = "1.33.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
+ "socket2 0.5.4",
+ "windows-sys",
 ]
 
 [[package]]
@@ -732,17 +838,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "2.1.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.16",
-]
-
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -756,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
 dependencies = [
  "bytes",
  "futures-core",
@@ -770,16 +865,15 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.9.2"
+version = "0.10.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
 dependencies = [
+ "async-stream",
  "async-trait",
  "axum",
  "base64",
  "bytes",
- "futures-core",
- "futures-util",
  "h2",
  "http",
  "http-body",
@@ -798,15 +892,15 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.9.2"
+version = "0.10.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "prost-build",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -817,7 +911,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap",
+ "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
  "rand",
@@ -843,11 +937,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -855,20 +948,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.16",
+ "syn",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
 ]
@@ -881,23 +974,22 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -909,13 +1001,14 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "which"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
  "either",
- "libc",
+ "home",
  "once_cell",
+ "rustix",
 ]
 
 [[package]]
@@ -940,134 +1033,68 @@ version = "0.4.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
diff --git a/Cargo.toml b/Cargo.toml
index 46d8c76e..152b2923 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,17 @@
 [package]
 authors = ["Sebastian Beyvers <sebastian.beyvers@computational.bio.uni-giessen.de>"]
 description = "Tests building the Rust grpc stubs for ArunaAPI"
-edition = "2018"
+edition = "2021"
 name = "aruna_api_buildtests"
 version = "2.0.0"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [[bin]]
 name = "aruna_api_buildtests"
 path = "./tests/build.rs"
 
 [dependencies]
-bytes = "1.4.0"
-tonic = "0.9.0"
-prost = "0.11.0"
-tonic-build = "0.9.0"
-uuid = "1.4.0"
+bytes = "1.5.0"
+tonic = "0.10.2"
+prost = "0.12.1"
+tonic-build = "0.10.2"
+uuid = "1.5.0"

From da8d87e25c0dc48b75abf4fb316a06c0d845fc0d Mon Sep 17 00:00:00 2001
From: Sebastian Beyvers <St4NNi@users.noreply.github.com>
Date: Fri, 20 Oct 2023 09:36:21 +0200
Subject: [PATCH 09/10] chore: Rename notifications openapi path

Co-authored-by: Jannis Hochmuth <jannis.hochmuth@gmail.com>
---
 aruna/api/notification/services/v2/notification_service.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index 693abe59..746541b1 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -25,7 +25,7 @@ service EventNotificationService {
   rpc CreateStreamConsumer(CreateStreamConsumerRequest)
       returns (CreateStreamConsumerResponse) {
         option (google.api.http) = {
-          post : "/v2/notifications"
+          post : "/v2/notifications/consumer"
           body : "*"
         };
       }

From 9ff2fb122c3a3d4aba99cb1420bc396ca6f25e36 Mon Sep 17 00:00:00 2001
From: Sebastian Beyvers <St4NNi@users.noreply.github.com>
Date: Fri, 20 Oct 2023 09:38:32 +0200
Subject: [PATCH 10/10] chore: Apply naming suggestions

Co-authored-by: Jannis Hochmuth <jannis.hochmuth@gmail.com>
---
 aruna/api/storage/models/v2/models.proto         |  2 +-
 .../storage/services/v2/collection_service.proto |  2 +-
 .../storage/services/v2/dataset_service.proto    |  2 +-
 .../storage/services/v2/license_service.proto    | 16 ++++++++--------
 .../api/storage/services/v2/object_service.proto |  2 +-
 .../storage/services/v2/project_service.proto    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index 3e6a8a21..9fab1d0a 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -356,5 +356,5 @@ message Object {
   // Object specific attributes
   repeated Hash hashes = 13;  
   string metadata_license_tag = 14;
-  string default_data_license_tag = 15;
+  string data_license_tag = 15;
 }
diff --git a/aruna/api/storage/services/v2/collection_service.proto b/aruna/api/storage/services/v2/collection_service.proto
index 6c2e491a..1e09d1ec 100644
--- a/aruna/api/storage/services/v2/collection_service.proto
+++ b/aruna/api/storage/services/v2/collection_service.proto
@@ -143,7 +143,7 @@ message CreateCollectionRequest {
   string description = 2;
   // collection specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External relations (URLs / IDs from external sources)
+  // Internal /External relations (URLs / IDs from external sources)
   repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
diff --git a/aruna/api/storage/services/v2/dataset_service.proto b/aruna/api/storage/services/v2/dataset_service.proto
index 21872aec..705f2538 100644
--- a/aruna/api/storage/services/v2/dataset_service.proto
+++ b/aruna/api/storage/services/v2/dataset_service.proto
@@ -143,7 +143,7 @@ message CreateDatasetRequest {
   string description = 2;
   // dataset specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External / Internal relations (URLs / IDs from external sources)
+  // Internal / External relations (URLs / IDs from external sources)
   repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
diff --git a/aruna/api/storage/services/v2/license_service.proto b/aruna/api/storage/services/v2/license_service.proto
index c9f2d909..665025d6 100644
--- a/aruna/api/storage/services/v2/license_service.proto
+++ b/aruna/api/storage/services/v2/license_service.proto
@@ -9,9 +9,9 @@ import "aruna/api/storage/models/v2/models.proto";
 import "google/api/annotations.proto";
 import "google/api/visibility.proto";
 
-// AuthorizationService
+// LicenseService
 //
-// Contains all methods to edit and change user authorization
+// Contains all methods to add, get or list licenses
 service LicenseService {
     option (google.api.api_visibility).restriction = "SERVER";
     // CreateLicense
@@ -37,14 +37,14 @@ service LicenseService {
         };
     }
 
-    // ListLicense
+    // ListLicenses
     //
     // Status: BETA
     //
     // This returns a list of all licenses
-    rpc ListLicense(ListLicenseRequest) returns (ListLicenseResponse) {
+    rpc ListLicenses(ListLicensesRequest) returns (ListLicensesResponse) {
         option (google.api.http) = {
-        get : "/v2/license"
+        get : "/v2/licenses"
         };
     }
 }
@@ -81,14 +81,14 @@ message GetLicenseResponse {
     storage.models.v2.License license = 1;
 }
 
-// ListLicenseRequest
+// ListLicensesRequest
 //
 // Request object for ListLicense
-message ListLicenseRequest {}
+message ListLicensesRequest {}
 
 // ListLicenseResponse
 //
 // Response object for ListLicense
-message ListLicenseResponse {    
+message ListLicensesResponse {    
     repeated storage.models.v2.License licenses = 1;
 }
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/object_service.proto b/aruna/api/storage/services/v2/object_service.proto
index e2928b94..ca7507b6 100644
--- a/aruna/api/storage/services/v2/object_service.proto
+++ b/aruna/api/storage/services/v2/object_service.proto
@@ -150,7 +150,7 @@ message CreateObjectRequest {
   string description = 2;
   // collection specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External / Internal relations (URLs / IDs from external sources)
+  // Internal / External relations (URLs / IDs from external sources)
   repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
diff --git a/aruna/api/storage/services/v2/project_service.proto b/aruna/api/storage/services/v2/project_service.proto
index a8d3207b..649fe08c 100644
--- a/aruna/api/storage/services/v2/project_service.proto
+++ b/aruna/api/storage/services/v2/project_service.proto
@@ -171,7 +171,7 @@ message CreateProjectRequest {
   string description = 2;
   // Project specific labels / hooks
   repeated storage.models.v2.KeyValue key_values = 3;
-  // External / Internal relations (URLs / IDs from external sources)
+  // Internal / External relations (URLs / IDs from external sources)
   repeated storage.models.v2.Relation relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;