[feat] v2.0.0-beta.5

aruna/api/dataproxy/services/v2/bundler_service.proto

@@ -33,7 +33,8 @@ message CreateBundleRequest {
 }
 
 message CreateBundleResponse {
-    string bundle_url = 1;
+    string bundle_id = 1;
+    string bundle_url = 2;
 }
 
 message DeleteBundleRequest{

aruna/api/hooks/services/v2/hooks_service.proto

@@ -24,7 +24,7 @@ service HooksService {
     }
     rpc AddProjectsToHook(AddProjectsToHookRequest) returns (AddProjectsToHookResponse) {
 	option (google.api.http) = {
-	    post : "/v2/hook/{hook_id}/{project_id}"
+	    post : "/v2/hook/{hook_id}"
 	    body : "*"
 	};
     }
@@ -71,9 +71,8 @@ message ExternalHook {
     Credentials credentials = 2;
     // If empty a basic JSON template will be used
     optional string custom_template = 3; 
-    // Optional Project/Collection/Dataset where hooks can upload results.
-    optional string result_object = 4;
     Method method = 5;
+    // TODO: Optional request headers
 }
 
 enum Method {
@@ -155,6 +154,7 @@ message ListProjectHooksRequest{
 }
 
 message ListOwnedHooksRequest{
+    // ADMIN only
     string user_id = 1;
 }
 

aruna/api/storage/services/v2/collection_service.proto

@@ -45,7 +45,7 @@ service CollectionService {
   // Queries multiple collections by ID
   rpc GetCollections(GetCollectionsRequest) returns (GetCollectionsResponse) {
     option (google.api.http) = {
-      get : "/v2/collections/"
+      get : "/v2/collections"
     };
   }
 

aruna/api/storage/services/v2/dataset_service.proto

@@ -45,7 +45,7 @@ service DatasetService {
   // Queries multiple datasets by ID
   rpc GetDatasets(GetDatasetsRequest) returns (GetDatasetsResponse) {
     option (google.api.http) = {
-      get : "/v2/datasets/"
+      get : "/v2/datasets"
     };
   }
 

aruna/api/storage/services/v2/search_service.proto

@@ -98,6 +98,7 @@ message GetResourcesResponse {
 
 message RequestResourceAccessRequest {
   string resource_id = 1;
+  string message = 2;
 }
 
 

aruna/api/storage/services/v2/service_account_service.proto

@@ -135,7 +135,7 @@ service ServiceAccountService {
   rpc GetDataproxyTokenSvcAccount(GetDataproxyTokenSvcAccountRequest)
       returns (GetDataproxyTokenSvcAccountResponse) {
     option (google.api.http) = {
-      get : "/v2/user/{svc_account_id}/proxy_token"
+      get : "/v2/user/{user_id}/svc_proxy_token"
     };
   }
 }

aruna/api/storage/services/v2/user_service.proto

@@ -144,7 +144,7 @@ service UserService {
   rpc UpdateUserDisplayName(UpdateUserDisplayNameRequest)
       returns (UpdateUserDisplayNameResponse) {
     option (google.api.http) = {
-      patch : "/v2/user/{user_id}/display_name"
+      patch : "/v2/user/display_name"
       body : "*"
     };
   }
@@ -219,7 +219,7 @@ service UserService {
   rpc GetPersonalNotifications(GetPersonalNotificationsRequest)
       returns (GetPersonalNotificationsResponse) {
     option (google.api.http) = {
-      get : "/v2/user/{user_id}/notifications"
+      get : "/v2/user/notifications"
     };
   }
 
@@ -231,7 +231,7 @@ service UserService {
   rpc AcknowledgePersonalNotifications(AcknowledgePersonalNotificationsRequest)
       returns (AcknowledgePersonalNotificationsResponse) {
     option (google.api.http) = {
-      get : "/v2/user/{user_id}/acknowledge"
+      get : "/v2/user/acknowledge"
     };
   }
 
@@ -395,16 +395,14 @@ message GetDataproxyTokenUserResponse {
   string token = 1;
 }
 
-message GetPersonalNotificationsRequest {
-  string user_id = 1;
-}
+message GetPersonalNotificationsRequest {}
 
 message GetPersonalNotificationsResponse {
   repeated PersonalNotification notifications = 1;
 }
 
 message AcknowledgePersonalNotificationsRequest {
-  repeated string notification_id = 1;
+  repeated string notification_ids = 1;
 }
 
 message AcknowledgePersonalNotificationsResponse {}
@@ -415,9 +413,9 @@ enum ReferenceType {
   REFERENCE_TYPE_RESOURCE = 2;
 }
 
-message References {
+message Reference {
   ReferenceType ref_type = 1; 
-  string ref_name = 2; // "User A"
+  string ref_name = 2; // "User A" | file.txt
   string ref_value = 3; // 0123AAA123AAA (id)
 }
 
@@ -426,12 +424,13 @@ enum PersonalNotificationVariant {
   PERSONAL_NOTIFICATION_VARIANT_ACCESS_REQUESTED = 1;
   PERSONAL_NOTIFICATION_VARIANT_PERMISSION_GRANTED = 2;
   PERSONAL_NOTIFICATION_VARIANT_PERMISSION_REVOKED = 3;
-  PERSONAL_NOTIFICATION_VARIANT_ANNOUNCEMENT = 4;
+  PERSONAL_NOTIFICATION_VARIANT_PERMISSION_UPDATED = 4;
+  PERSONAL_NOTIFICATION_VARIANT_ANNOUNCEMENT = 5;
 }
 
 message PersonalNotification {
   string id = 1;
   PersonalNotificationVariant variant = 2;
   string message = 3; // User A has requested access for resource B
-  repeated References refs = 4; // References to resource in the "message"
+  repeated Reference refs = 4; // References to resource in the "message"
 }

aruna/api/storage/services/v2/workspace_service.proto

@@ -31,7 +31,6 @@ service WorkspaceService {
       returns (GetWorkspaceTemplateResponse) {
     option (google.api.http) = {
       get: "/v2/workspace/template/{template_id}"
-      body : "*"
     };
   }
   // ListOwnedWorkspaceTemplates
@@ -43,7 +42,6 @@ service WorkspaceService {
       returns (ListOwnedWorkspaceTemplatesResponse) {
     option (google.api.http) = {
       get: "/v2/workspace/template"
-      body : "*"
     };
   }
   // DeleteWorkspaceTemplates
@@ -125,7 +123,7 @@ message GetWorkspaceTemplateRequest {
   string template_id = 1;
 }
 message GetWorkspaceTemplateResponse {
-  WorkspaceInfo workspaces = 1;
+  WorkspaceInfo workspace = 1;
 }
 message DeleteWorkspaceTemplateRequest {
     string template_id = 1;