[RFC] Feat/preparation v2

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

@@ -0,0 +1,43 @@
+syntax = "proto3";
+
+package aruna.api.dataproxy.services.v2;
+option go_package = "github.com/ArunaStorage/go-api/aruna/api/dataproxy/services/v2";
+option java_multiple_files = true;
+option java_package = "com.github.ArunaStorage.java_api.aruna.api.dataproxy.services.v2";
+option java_outer_classname = "BundlerService";
+
+import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
+
+
+service BundlerService {
+    rpc CreateBundle(CreateBundleRequest) returns (CreateBundleResponse) {
+        option (google.api.http) = {
+            post : "/v2/bundle"
+            body : "*"
+        };
+    }
+    rpc DeleteBundle(DeleteBundleRequest) returns (DeleteBundleResponse) {
+        option (google.api.http) = {
+            delete : "/v2/bundle"
+            body : "*"
+        };
+    }
+}
+
+
+message CreateBundleRequest {
+    repeated string resource_id = 1;
+    string filename = 2; // .tar.gz / .zip
+    google.protobuf.Timestamp expires_at = 3; // Default 1 Month
+}
+
+message CreateBundleResponse {
+    string bundle_url = 1;
+}
+
+message DeleteBundleRequest{
+    string bundle_id = 1;
+}
+
+message DeleteBundleResponse {}

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

@@ -0,0 +1,163 @@
+syntax = "proto3";
+
+package aruna.api.dataproxy.services.v2;
+option go_package = "github.com/ArunaStorage/go-api/aruna/api/dataproxy/services/v2";
+option java_multiple_files = true;
+option java_package = "com.github.ArunaStorage.java_api.aruna.api.dataproxy.services.v2";
+option java_outer_classname = "DataProxyService";
+
+import "google/api/annotations.proto";
+
+
+
+service DataproxyService {
+
+    // RequestReplication
+    //
+    // Status: BETA
+    //
+    // Creates a replication request
+    rpc RequestReplication(RequestReplicationRequest) returns (RequestReplicationResponse) {}
+
+    // InitReplication
+    //
+    // Status: BETA
+    //
+    // Provides the necessary url to init replication
+    rpc InitReplication(InitReplicationRequest) returns (InitReplicationResponse) {}
+}
+
+service DataproxyUserService {
+    // GetCredentials
+    //
+    // Status: BETA
+    //
+    // Authorized method that needs a aruna-token to exchange for dataproxy
+    // specific S3AccessKey and S3SecretKey
+    rpc GetCredentials(GetCredentialsRequest) returns (GetCredentialsResponse) {
+        option (google.api.http) = {
+            post : "/v2/credentials"
+            body : "*"
+        };
+    }
+    // PushReplica
+    //
+    // Status: BETA
+    //
+    // Manually transfers a replica to another data-proxy
+    rpc PushReplica(PushReplicaRequest) returns (PushReplicaResponse) {
+        option (google.api.http) = {
+            post : "/v2/replica/push"
+            body : "*"
+        };
+    }
+    // PullReplica
+    //
+    // Status: BETA
+    //
+    // Manually request data to be transferred to this data-proxy
+    rpc PullReplica(PullReplicaRequest) returns (PullReplicaResponse) {
+        option (google.api.http) = {
+            post : "/v2/replica/pull"
+            body : "*"
+        };
+    }
+    // PullReplica
+    //
+    // Status: BETA
+    //
+    // Status of the previous replication request
+    rpc ReplicationStatus(ReplicationStatusRequest) returns (ReplicationStatusResponse) {
+        option (google.api.http) = {
+            get : "/v2/replica/status"
+        };
+    }
+}
+
+message DataProxyInfo {
+    string dataproxy_id = 1;
+    int64 available_space = 2;
+}
+
+message RequestReplicationRequest {
+    DataProxyInfo info = 1;
+    bool user_initialized = 2;
+}
+
+message DataInfo {
+    string object_id = 1;
+    string download_url = 2;
+    string encryption_key = 3;
+    bool is_compressed = 4;
+}
+
+message DataInfos {
+    repeated DataInfo data_info = 1;
+}
+
+message RequestReplicationResponse {
+    oneof response {
+        DataInfos data_infos = 1;
+        bool ack = 2; 
+    }
+}
+
+message InitReplicationRequest {
+    DataInfos data_infos = 1;
+}
+
+message InitReplicationResponse {
+    bool ack = 1;
+}
+
+message GetCredentialsRequest {}
+
+message GetCredentialsResponse {
+    string access_key = 1;
+    string secret_key = 2;
+}
+
+message S3Path {
+    string bucket = 1;
+    string key = 2;
+}
+
+message PushReplicaRequest {
+    oneof resource {
+        string resource_id = 1;
+        S3Path s3_path = 2;
+    }
+    string target_location = 3;
+}
+
+message PushReplicaResponse {
+    string replication_id = 1;
+}
+
+message PullReplicaRequest {
+    oneof resource {
+        string resource_id = 1;
+        S3Path s3_path = 2;
+    }
+}
+
+message PullReplicaResponse {
+    string replication_id = 1;
+}
+
+message ReplicationStatusRequest {
+    string replication_id = 1;
+}
+
+enum ReplicationStatus {
+    REPLICATION_STATUS_UNSPECIFIED = 0;
+    REPLICATION_STATUS_PENDING = 1;
+    REPLICATION_STATUS_RUNNING = 2;
+    REPLICATION_STATUS_FINISHED = 3;
+    REPLICATION_STATUS_ERROR = 4;
+}
+
+message ReplicationStatusResponse {
+    ReplicationStatus status = 1;
+    string message = 2;
+}

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

@@ -1,28 +1,47 @@
 syntax = "proto3";
 
-package aruna.api.hooks.services.v1;
-option go_package = "github.com/ArunaStorage/go-api/aruna/api/storage/services/v1";
+package aruna.api.hooks.services.v2;
+option go_package = "github.com/ArunaStorage/go-api/aruna/api/storage/services/v2";
 option java_multiple_files = true;
-option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.services.v1";
+option java_package = "com.github.ArunaStorage.java_api.aruna.api.storage.services.v2";
 option java_outer_classname = "HooksService";
+import "google/api/annotations.proto";
 
-import "aruna/api/storage/models/v1/models.proto";
+import "aruna/api/storage/models/v2/models.proto";
 
 // HooksService
 //
 // Status: ALPHA
 //
 // A service that enables automatic Hook scheduling
 service HooksService {
-    rpc CreateHook(CreateHookRequest) returns (CreateHookResponse) {}
-    rpc ListHooks(ListHooksRequest) returns (ListHooksResponse) {}
-    rpc DeleteHook(DeleteHookRequest) returns (DeleteHookResponse) {}
-    rpc HookCallback(HookCallbackRequest) returns (HookCallbackResponse) {}
+    rpc CreateHook(CreateHookRequest) returns (CreateHookResponse) {
+        option (google.api.http) = {
+            post : "/v2/hook"
+            body : "*"
+          };
+    }
+    rpc ListHooks(ListHooksRequest) returns (ListHooksResponse) {
+        option (google.api.http) = {
+            get : "/v2/hooks/project/{project_id}"
+        };
+    }
+    rpc DeleteHook(DeleteHookRequest) returns (DeleteHookResponse) {
+        option (google.api.http) = {
+            delete : "/v2/hook/{hook_id}"
+        };
+    }
+    rpc HookCallback(HookCallbackRequest) returns (HookCallbackResponse) {
+        option (google.api.http) = {
+            delete : "/v2/hook/callback"
+        };
+    }
 }
 
 enum TriggerType {
     TRIGGER_TYPE_UNSPECIFIED = 0;
     TRIGGER_TYPE_HOOK_ADDED = 1;
+    TRIGGER_TYPE_OBJECT_CREATED = 2;
 }
 
 message Trigger {
@@ -41,8 +60,7 @@ enum InternalAction {
     INTERNAL_ACTION_UNSPECIFIED = 0;
     INTERNAL_ACTION_ADD_LABEL = 1;
     INTERNAL_ACTION_ADD_HOOK = 2;
-    INTERNAL_ACTION_CREATE_READ_REFERENCE = 3;
-    INTERNAL_ACTION_CREATE_WRITE_REFERENCE = 4;
+    INTERNAL_ACTION_CREATE_RELATION = 3;
 }
 
 message InternalHook {
@@ -60,7 +78,7 @@ message Hook {
     }
 }
 
-// Will be updated with additional credential types
+// Will be expanded with additional credential types
 message Credentials {
     string token = 1;
 }
@@ -83,8 +101,8 @@ message DeleteHookResponse {}
 
 message HookCallbackRequest {
     bool success = 1;
-    repeated aruna.api.storage.models.v1.KeyValue labels = 2;
-    repeated aruna.api.storage.models.v1.KeyValue hooks = 3;
+    repeated aruna.api.storage.models.v2.KeyValue add_key_values = 2;
+    repeated aruna.api.storage.models.v2.KeyValue remove_key_values = 3;
 }
 
 message HookCallbackResponse{}
@@ -93,7 +111,6 @@ message ListHooksRequest{
     string project_id = 1;
 }
 
-
 message HookInfo {
     string hook_id = 1;
     Hook hook = 2;