test: simplify

Author: Manuthor

.rustfmt.toml

@@ -39,9 +39,9 @@ opt-level = 0
 
 [workspace.dependencies]
 clap = { version = "4.5", default-features = false }
-cosmian_kms_cli = { git = "https://www.github.com/Cosmian/kms", branch = "develop" }
-cosmian_findex_cli = { git = "https://www.github.com/Cosmian/findex-server", branch = "develop" }
-cosmian_config_utils = { git = "https://www.github.com/Cosmian/http_client_server", branch = "develop" }
+cosmian_kms_cli = { git = "https://www.github.com/Cosmian/kms", branch = "docs/reviewed" }
+cosmian_findex_cli = { git = "https://www.github.com/Cosmian/findex-server", branch = "fix/return_index_id" }
+cosmian_config_utils = { git = "https://www.github.com/Cosmian/http_client_server", branch = "fix/config_utils_trait" }
 cosmian_http_client = { git = "https://www.github.com/Cosmian/http_client_server", branch = "develop" }
 cosmian_logger = { git = "https://www.github.com/Cosmian/http_client_server", branch = "develop" }
 hex = { version = "0.4", default-features = false }

Cargo.lock

@@ -49,6 +49,7 @@ actix-rt = "2.10"
 actix-server = { version = "2.5", default-features = false }
 assert_cmd = "2.0"
 const-oid = { version = "0.9", features = ["db"] }
+lazy_static = "1.4"
 openssl = { workspace = true }
 predicates = "3.1"
 regex = { version = "1.11", default-features = false }

Cargo.toml

@@ -6,13 +6,13 @@ use std::{
 
 use clap::Parser;
 use cosmian_findex_cli::{
-    actions::findex::{FindexParameters, instantiate_findex},
+    actions::findex::{instantiate_findex, FindexParameters},
     reexports::{
         cloudproof_findex::reexport::cosmian_findex::{
             Data, IndexedValue, IndexedValueToKeywordsMap, Keyword, Keywords,
         },
         cosmian_findex_client::FindexRestClient,
-        cosmian_findex_structs::EncryptedEntries,
+        cosmian_findex_structs::{EncryptedEntries, Uuids},
     },
 };
 use cosmian_kms_cli::{
@@ -271,7 +271,7 @@ impl EncryptAndIndexAction {
         &self,
         findex_rest_client: &FindexRestClient,
         kms_rest_client: &KmsClient,
-    ) -> CosmianResult<()> {
+    ) -> CosmianResult<Uuids> {
         let nonce = self
             .nonce
             .as_deref()
@@ -332,6 +332,6 @@ impl EncryptAndIndexAction {
         let uuids = encrypted_entries.get_uuids();
         println!("Data behind those UUIDS were encrypted and indexed: {uuids}");
 
-        Ok(())
+        Ok(uuids)
     }
 }

crate/cli/Cargo.toml

@@ -1,18 +1,14 @@
 use clap::Subcommand;
-use cosmian_findex_cli::{CoreFindexActions, reexports::cosmian_findex_client::FindexRestClient};
+use cosmian_findex_cli::{reexports::cosmian_findex_client::FindexRestClient, CoreFindexActions};
 use cosmian_kms_cli::reexport::cosmian_kms_client::KmsClient;
 
-use super::{
-    delete_datasets::DeleteDatasetAction, encrypt_and_index::EncryptAndIndexAction,
-    search_and_decrypt::SearchAndDecryptAction,
-};
-use crate::error::{CosmianError, result::CosmianResult};
+use super::{encrypt_and_index::EncryptAndIndexAction, search_and_decrypt::SearchAndDecryptAction};
+use crate::error::{result::CosmianResult, CosmianError};
 
 #[derive(Subcommand)]
 pub enum FindexActions {
     EncryptAndIndex(EncryptAndIndexAction),
     SearchAndDecrypt(SearchAndDecryptAction),
-    DeleteDataset(DeleteDatasetAction),
     #[clap(flatten)]
     Findex(CoreFindexActions),
 }
@@ -33,9 +29,14 @@ impl FindexActions {
                 .run(findex_rest_client)
                 .await
                 .map_err(CosmianError::from),
-            Self::EncryptAndIndex(action) => action.run(findex_rest_client, kms_rest_client).await,
-            Self::SearchAndDecrypt(action) => action.run(findex_rest_client, kms_rest_client).await,
-            Self::DeleteDataset(action) => action.run(findex_rest_client).await,
+            Self::EncryptAndIndex(action) => {
+                action.run(findex_rest_client, kms_rest_client).await?;
+                Ok(())
+            }
+            Self::SearchAndDecrypt(action) => {
+                action.run(findex_rest_client, kms_rest_client).await?;
+                Ok(())
+            }
         }
     }
 }

crate/cli/src/actions/delete_datasets.rs

@@ -1,6 +1,6 @@
 use std::{fmt::Write, fs::File, io::Write as io_Write, path::PathBuf};
 
-use clap::{Command, Parser, builder::StyledStr};
+use clap::{builder::StyledStr, Command, Parser};
 
 use crate::error::result::CosmianResult;
 

crate/cli/src/actions/encrypt_and_index.rs

@@ -1,4 +1,3 @@
-pub mod delete_datasets;
 pub mod encrypt_and_index;
 pub mod findex;
 pub mod markdown;

crate/cli/src/actions/findex.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use cosmian_findex_cli::{
-    actions::findex::{FindexParameters, instantiate_findex},
+    actions::findex::{instantiate_findex, FindexParameters},
     reexports::{
         cloudproof_findex::reexport::cosmian_findex::{Keyword, Keywords},
         cosmian_findex_client::FindexRestClient,
@@ -73,7 +73,7 @@ impl SearchAndDecryptAction {
         &self,
         findex_rest_client: &FindexRestClient,
         kms_rest_client: &KmsClient,
-    ) -> CosmianResult<()> {
+    ) -> CosmianResult<Vec<String>> {
         let results = instantiate_findex(findex_rest_client, &self.findex_parameters.index_id)
             .await?
             .search(
@@ -154,6 +154,6 @@ impl SearchAndDecryptAction {
 
         println!("Decrypted records: {results:?}");
 
-        Ok(())
+        Ok(results)
     }
 }