test: run all tests on ubuntu runners

Author: Manuthor

.github/scripts/cargo_build.sh

@@ -80,8 +80,10 @@ rm -f /tmp/*.json /tmp/*.toml
 cargo build --target $TARGET $RELEASE $FEATURES
 
 export RUST_LOG="cosmian_cli=trace,cosmian_findex_client=trace,cosmian_kmip=error,cosmian_kms_rest_client=info"
+# Retry once if the test fails
 # shellcheck disable=SC2086
-cargo test --target $TARGET $RELEASE $FEATURES --workspace -- --nocapture $SKIP_SERVICES_TESTS
+cargo test --target $TARGET $RELEASE $FEATURES --workspace -- --nocapture $SKIP_SERVICES_TESTS ||
+  cargo test --target $TARGET $RELEASE $FEATURES --workspace -- --nocapture $SKIP_SERVICES_TESTS
 
 # while true; do
 #   sleep 1

.github/workflows/build_all.yml

@@ -32,8 +32,7 @@ jobs:
             target: x86_64-unknown-linux-gnu
             prerequisites: |
               sudo apt install librust-atk-sys-dev librust-gdk-sys-dev pkg-config
-            skip_services_tests: --skip test_encrypt --skip test_create
-            docker_compose: false
+            docker_compose: true
 
           - distribution: ubuntu-22.04
             archive-name: ubuntu_22_04
@@ -48,8 +47,7 @@ jobs:
             prerequisites: |
               sudo apt update
               sudo apt install libgtk-3-dev libglib2.0-dev pkg-config
-            skip_services_tests: --skip test_encrypt --skip test_create
-            docker_compose: false
+            docker_compose: true
 
           - distribution: macos-13
             archive-name: macos_intel

crate/cli/src/actions/encrypt_and_index.rs

@@ -6,7 +6,7 @@ use std::{
 
 use clap::Parser;
 use cosmian_findex_cli::{
-    actions::findex::{instantiate_findex, FindexParameters},
+    actions::findex::{FindexParameters, instantiate_findex},
     reexports::{
         cloudproof_findex::reexport::cosmian_findex::{
             Data, IndexedValue, IndexedValueToKeywordsMap, Keyword, Keywords,
@@ -28,8 +28,8 @@ use crate::{
 
 /// Encrypt entries and index the corresponding database UUIDs with the Findex.
 ///
-/// First the CSV file is read and encrypted on client-side with KEM-DEM crypto-system
-/// KEM: Key Encapsulation Mechanism
+/// First the CSV file is read and encrypted on client-side with KEM-DEM
+/// crypto-system KEM: Key Encapsulation Mechanism
 /// DEM: Data Encapsulation Mechanism
 #[derive(Parser, Debug)]
 #[clap(verbatim_doc_comment)]
@@ -42,9 +42,11 @@ pub struct EncryptAndIndexAction {
     pub(crate) csv_path: PathBuf,
 
     /// The key encryption key (KEK) unique identifier.
-    /// If provided, all encryption is done client side. The KEK is first exported locally and is used in the KEM to encapsulates the ephemeral Data Encryption Key (DEK).
-    /// This KEK has been created in KMS and provides the Key Encapsulation Mechanism (KEM) parameters such as algorithm and mode.
-    /// KEM supported are:
+    /// If provided, all encryption is done client side. The KEK is first
+    /// exported locally and is used in the KEM to encapsulates the ephemeral
+    /// Data Encryption Key (DEK). This KEK has been created in KMS and
+    /// provides the Key Encapsulation Mechanism (KEM) parameters such as
+    /// algorithm and mode. KEM supported are:
     /// - RFC5649
     /// - AES-GCM
     /// - RSA PKCS#1 v1.5
@@ -53,8 +55,8 @@ pub struct EncryptAndIndexAction {
     /// - Salsa Sealed Box
     /// - ECIES
     ///
-    /// If no key encryption key is specified, the data will be sent to the server
-    /// and will be encrypted server side.
+    /// If no key encryption key is specified, the data will be sent to the
+    /// server and will be encrypted server side.
     #[clap(long = "kek-id", group = "kem", conflicts_with = "dem")]
     pub(crate) key_encryption_key_id: Option<String>,
 

crate/cli/src/actions/findex.rs

@@ -1,9 +1,9 @@
 use clap::Subcommand;
-use cosmian_findex_cli::{reexports::cosmian_findex_client::FindexRestClient, CoreFindexActions};
+use cosmian_findex_cli::{CoreFindexActions, reexports::cosmian_findex_client::FindexRestClient};
 use cosmian_kms_cli::reexport::cosmian_kms_client::KmsClient;
 
 use super::{encrypt_and_index::EncryptAndIndexAction, search_and_decrypt::SearchAndDecryptAction};
-use crate::error::{result::CosmianResult, CosmianError};
+use crate::error::{CosmianError, result::CosmianResult};
 
 #[derive(Subcommand)]
 pub enum FindexActions {

crate/cli/src/actions/markdown.rs

@@ -1,6 +1,6 @@
 use std::{fmt::Write, fs::File, io::Write as io_Write, path::PathBuf};
 
-use clap::{builder::StyledStr, Command, Parser};
+use clap::{Command, Parser, builder::StyledStr};
 
 use crate::error::result::CosmianResult;
 
@@ -17,7 +17,8 @@ impl MarkdownAction {
     ///
     /// # Errors
     ///
-    /// Returns an error if there is an issue creating or writing to the markdown file.
+    /// Returns an error if there is an issue creating or writing to the
+    /// markdown file.
     #[allow(clippy::print_stdout)]
     pub fn process(&self, cmd: &Command) -> CosmianResult<()> {
         let mut output = String::new();

crate/cli/src/actions/search_and_decrypt.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use cosmian_findex_cli::{
-    actions::findex::{instantiate_findex, FindexParameters},
+    actions::findex::{FindexParameters, instantiate_findex},
     reexports::{
         cloudproof_findex::reexport::cosmian_findex::{Keyword, Keywords},
         cosmian_findex_client::FindexRestClient,
@@ -51,8 +51,8 @@ pub struct SearchAndDecryptAction {
     /// The data encryption algorithm.
     /// If not specified, aes-gcm is used.
     ///
-    /// If no key encryption algorithm is specified, the data will be sent to the server
-    /// and will be decrypted server side.
+    /// If no key encryption algorithm is specified, the data will be sent to
+    /// the server and will be decrypted server side.
     #[clap(
         long = "data-encryption-algorithm",
         short = 'd',

crate/cli/src/commands.rs

@@ -1,8 +1,8 @@
 use std::path::PathBuf;
 
 use clap::{CommandFactory, Parser, Subcommand};
-use cosmian_findex_cli::{reexports::cosmian_findex_client::FindexRestClient, CoreFindexActions};
-use cosmian_kms_cli::{reexport::cosmian_kms_client::KmsClient, KmsActions};
+use cosmian_findex_cli::{CoreFindexActions, reexports::cosmian_findex_client::FindexRestClient};
+use cosmian_kms_cli::{KmsActions, reexport::cosmian_kms_client::KmsClient};
 use cosmian_logger::log_init;
 use tracing::{info, trace};
 
@@ -32,8 +32,8 @@ pub struct Cli {
 
     /// Allow to connect using a self-signed cert or untrusted cert chain
     ///
-    /// `accept_invalid_certs` is useful if the CLI needs to connect to an HTTPS KMS server
-    /// running an invalid or insecure SSL certificate
+    /// `accept_invalid_certs` is useful if the CLI needs to connect to an HTTPS
+    /// KMS server running an invalid or insecure SSL certificate
     #[arg(long)]
     pub kms_accept_invalid_certs: bool,
 
@@ -49,8 +49,8 @@ pub struct Cli {
 
     /// Allow to connect using a self-signed cert or untrusted cert chain
     ///
-    /// `accept_invalid_certs` is useful if the CLI needs to connect to an HTTPS KMS server
-    /// running an invalid or insecure SSL certificate
+    /// `accept_invalid_certs` is useful if the CLI needs to connect to an HTTPS
+    /// KMS server running an invalid or insecure SSL certificate
     #[arg(long)]
     pub findex_accept_invalid_certs: bool,
 }
@@ -65,16 +65,18 @@ pub enum CliCommands {
     #[command(subcommand)]
     FindexServer(FindexActions),
     /// Action to auto-generate doc in Markdown format
-    /// Run `cargo run --bin cosmian -- markdown documentation/docs/cli/main_commands.md`
+    /// Run `cargo run --bin cosmian -- markdown
+    /// documentation/docs/cli/main_commands.md`
     #[clap(hide = true)]
     Markdown(MarkdownAction),
 }
 
 /// Main function for the CKMS CLI application.
 ///
-/// This function initializes logging, parses command-line arguments, and executes the appropriate
-/// command based on the provided arguments. It supports various subcommands for interacting with
-/// the CKMS, such as login, logout, locating objects, and more.
+/// This function initializes logging, parses command-line arguments, and
+/// executes the appropriate command based on the provided arguments. It
+/// supports various subcommands for interacting with the CKMS, such as login,
+/// logout, locating objects, and more.
 ///
 /// # Errors
 ///

crate/cli/src/config.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use cosmian_config_utils::{location, ConfigUtils};
+use cosmian_config_utils::{ConfigUtils, location};
 use cosmian_findex_cli::reexports::cosmian_findex_client::FindexClientConfig;
 use cosmian_kms_cli::reexport::cosmian_kms_client::KmsClientConfig;
 use serde::{Deserialize, Serialize};
@@ -31,7 +31,8 @@ impl ClientConf {
     /// Load the default location of the configuration file.
     ///
     /// # Errors
-    /// Return an error if the configuration file is not found or if the file is not a valid toml file.
+    /// Return an error if the configuration file is not found or if the file is
+    /// not a valid toml file.
     pub fn location(conf: Option<PathBuf>) -> Result<PathBuf, CosmianError> {
         Ok(location(
             conf,
@@ -43,7 +44,8 @@ impl ClientConf {
 
     /// Load the configuration from a toml file.
     /// # Errors
-    /// Return an error if the configuration file is not found or if the file is not a valid toml file.
+    /// Return an error if the configuration file is not found or if the file is
+    /// not a valid toml file.
     pub fn load(conf_path: Option<PathBuf>) -> Result<Self, CosmianError> {
         let conf_path_buf = Self::location(conf_path)?;
         println!("Loading configuration from: {conf_path_buf:?}");
@@ -60,7 +62,8 @@ impl ClientConf {
     /// Save the configuration to a toml file.
     ///
     /// # Errors
-    /// Return an error if the configuration file is not found or if the file is not a valid toml file.
+    /// Return an error if the configuration file is not found or if the file is
+    /// not a valid toml file.
     pub fn save(&self, conf_path: Option<PathBuf>) -> Result<(), CosmianError> {
         let conf_path_buf = Self::location(conf_path)?;
         println!("Saving configuration to: {conf_path_buf:?}");
@@ -77,10 +80,10 @@ impl ConfigUtils for ClientConf {}
 mod tests {
     use std::{env, fs, path::PathBuf};
 
-    use cosmian_config_utils::{get_default_conf_path, ConfigUtils};
+    use cosmian_config_utils::{ConfigUtils, get_default_conf_path};
     use cosmian_logger::log_init;
 
-    use super::{ClientConf, COSMIAN_CLI_CONF_ENV};
+    use super::{COSMIAN_CLI_CONF_ENV, ClientConf};
     use crate::config::COSMIAN_CLI_CONF_PATH;
 
     #[test]
@@ -109,9 +112,11 @@ mod tests {
             get_default_conf_path(COSMIAN_CLI_CONF_PATH).unwrap(),
         ));
         assert!(ClientConf::load(None).is_ok());
-        assert!(get_default_conf_path(COSMIAN_CLI_CONF_PATH)
-            .unwrap()
-            .exists());
+        assert!(
+            get_default_conf_path(COSMIAN_CLI_CONF_PATH)
+                .unwrap()
+                .exists()
+        );
 
         // invalid conf
         unsafe {

crate/cli/src/error/mod.rs

@@ -12,7 +12,8 @@ use thiserror::Error;
 
 pub mod result;
 
-// Each error type must have a corresponding HTTP status code (see `kmip_endpoint.rs`)
+// Each error type must have a corresponding HTTP status code (see
+// `kmip_endpoint.rs`)
 #[derive(Error, Debug)]
 pub enum CosmianError {
     // When a user requests an endpoint which does not exist

crate/cli/src/lib.rs

@@ -32,7 +32,7 @@ pub mod commands;
 pub mod config;
 pub mod error;
 
-pub use commands::{cosmian_main, Cli, CliCommands};
+pub use commands::{Cli, CliCommands, cosmian_main};
 
 #[cfg(test)]
 mod tests;