merge: Merge pull request #85 from ArunaStorage/dev

[fixes] Fixes from dev

Author: St4NNi

.codecov.yml

@@ -1,5 +1,15 @@
+codecov:
+  require_ci_to_pass: no
 coverage:
-    range: 60..100 # set a high standard for ourselves
+  range: 50..90 # coverage lower than 50 is red, higher than 90 green, between color code
+  status:
+    project: # settings affecting project coverage
+      enabled: yes
+      target: auto # auto % coverage target
+      threshold: 5%  # allow for 5% reduction of coverage without failing
+    # do not run coverage on patch nor changes
+    patch: no
+    changes: no
 ignore:
   - "src/bin" # don't consider binaries in coverage report
   - "src/api" # Ignore autogenerated api

migrations/2023-05-15-081831_indices/up.sql

@@ -6,4 +6,8 @@ CREATE INDEX objects_shared_single_idx ON objects (shared_revision_id);
 CREATE INDEX hashes_objects_idx ON hashes (object_id);
 CREATE INDEX object_key_value_objects_idx ON object_key_value (object_id);
 CREATE INDEX collection_objects_collection_idx ON collection_objects (collection_id);
-CREATE INDEX collection_objects_objects_idx ON collection_objects (object_id);
+CREATE INDEX collection_objects_objects_idx ON collection_objects (object_id);
+
+
+ALTER TABLE collections ADD CONSTRAINT uniqe_collection_name_project_id UNIQUE (project_id, name, version_id);
+ALTER TABLE collections ADD CONSTRAINT uniqe_collection_name_project_id_without_version UNIQUE (project_id, name) WHERE (version_id is NULL);

src/server/grpc_server.rs

@@ -162,6 +162,7 @@ impl ServiceServer {
         log::info!("ArunaServer (internal) listening on {}", other_addr);
         let internal_server = tokio::spawn(async move {
             Server::builder()
+                .http2_keepalive_interval(Some(std::time::Duration::from_secs(15)))
                 .add_service(InternalProxyNotifierServiceServer::new(
                     internal_proxy_notifier_service,
                 ))

tests/d1_collection_tests.rs

@@ -741,7 +741,7 @@ fn delete_collection_test() {
     let result = db.create_new_collection(request, creator).unwrap();
 
     let ref_col_request = CreateNewCollectionRequest {
-        name: "new-collection-update-delete".to_owned(),
+        name: "new-collection-update-delete-2".to_owned(),
         description: "this_is_a_demo_collection_delete".to_owned(),
         project_id: regular_project_ulid.to_string(),
         label_ontology: None,

tests/d2_collection_grpc_tests.rs

@@ -93,14 +93,15 @@ async fn create_collection_grpc_test() {
     };
 
     // Loop all permissions and validate error/success
-    for permission in vec![
+    for (i, permission) in vec![
         Permission::None,
         Permission::Read,
         Permission::Append,
         Permission::Modify,
         Permission::Admin,
     ]
     .iter()
+    .enumerate()
     {
         // Update collection description
         create_collection_request.description = format!(
@@ -109,6 +110,8 @@ async fn create_collection_grpc_test() {
         )
         .to_string();
 
+        create_collection_request.name = format!("col-{}", i).to_string();
+
         // Fast track permission edit
         assert!(common::functions::update_project_permission(
             random_project.id.as_str(),
@@ -134,6 +137,7 @@ async fn create_collection_grpc_test() {
             }
             Permission::Modify | Permission::Admin => {
                 // Validate correct collection creation
+                dbg!(&create_collection_response);
                 assert!(create_collection_response.is_ok());
                 let collection_id = create_collection_response
                     .unwrap()

tests/sources/up.sql

@@ -330,6 +330,9 @@ CREATE TABLE encryption_keys (
     FOREIGN KEY (object_id) REFERENCES objects(id),
     FOREIGN KEY (endpoint_id) REFERENCES endpoints(id)
 );
+
+ALTER TABLE collections ADD CONSTRAINT uniqe_collection_name_project_id UNIQUE (project_id, name, version_id);
+ALTER TABLE collections ADD CONSTRAINT uniqe_collection_name_project_id_without_version UNIQUE (project_id, name) WHERE (version_id is NULL);
 /* ----- Materialized Views --------------------------------------- */
 -- Materialized view for the collections table
 CREATE MATERIALIZED VIEW collection_stats AS