Tolerant more changes from server response (#144)

SatoriCyber · Jun 10, 2024 · 9cecf0e · 9cecf0e
1 parent b26a966
commit 9cecf0e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 14 deletions.
diff --git a/src/helpers/datastores/data.rs b/src/helpers/datastores/data.rs
@@ -57,7 +57,12 @@ impl Hash for DatastoreInfo {
 impl TryFrom<DatastoreAccessDetails> for DatastoreInfo {
     type Error = ToDsInfoError;
     fn try_from(value: DatastoreAccessDetails) -> Result<Self, Self::Error> {
-        let deployment_type = value.datastore_settings.map(MongoDeploymentType::from);
+        let deployment_type = value.datastore_settings.map(MongoDeploymentType::try_from);
+        let deployment_type = match deployment_type {
+            Some(Ok(deployment_type)) => Some(deployment_type),
+            Some(Err(err)) => return Err(err),
+            None => None,
+        };
         let satori_host = value
             .satori_hostname
             .ok_or(ToDsInfoError::MissingSatoriHostname)?;
@@ -96,15 +101,13 @@ pub enum MongoDeploymentType {
     MongoDBSrv,
 }
 
-impl From<DatastoreSettings> for MongoDeploymentType {
-    fn from(value: DatastoreSettings) -> Self {
-        match value {
-            DatastoreSettings::MongoDeploymentType(SatoriConsoleMongoDeploymentType::MongoDb) => {
-                Self::MongoDB
-            }
-            DatastoreSettings::MongoDeploymentType(
-                SatoriConsoleMongoDeploymentType::MongoDbSrv,
-            ) => Self::MongoDBSrv,
+impl TryFrom<DatastoreSettings> for MongoDeploymentType {
+    type Error = ToDsInfoError;
+    fn try_from(value: DatastoreSettings) -> Result<Self, Self::Error> {
+        match value.deployment_type {
+            SatoriConsoleMongoDeploymentType::MongoDb => Ok(Self::MongoDB),
+            SatoriConsoleMongoDeploymentType::MongoDbSrv => Ok(Self::MongoDBSrv),
+            SatoriConsoleMongoDeploymentType::Unknown => Err(ToDsInfoError::UnknownDeploymentType),
         }
     }
 }
diff --git a/src/helpers/datastores/errors.rs b/src/helpers/datastores/errors.rs
@@ -28,4 +28,6 @@ pub enum GetHostError {
 pub enum ToDsInfoError {
     #[error("Missing satori hostname")]
     MissingSatoriHostname,
+    #[error("Unknown deployment type")]
+    UnknownDeploymentType,
 }
diff --git a/src/helpers/satori_console/data.rs b/src/helpers/satori_console/data.rs
@@ -79,9 +79,8 @@ impl Hash for DatastoreAccessDetails {
 
 #[derive(Debug, serde::Deserialize, Clone, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
-pub enum DatastoreSettings {
-    #[serde(rename = "deploymentType")]
-    MongoDeploymentType(MongoDeploymentType),
+pub struct DatastoreSettings {
+    pub deployment_type: MongoDeploymentType,
 }
 
 #[derive(Debug, serde::Deserialize, Clone, serde::Serialize)]
@@ -90,6 +89,8 @@ pub enum MongoDeploymentType {
     MongoDb,
     #[serde(rename = "MONGODB_SRV")]
     MongoDbSrv,
+    #[serde(other)]
+    Unknown,
 }
 
 #[derive(Debug, serde::Deserialize, Clone, Serialize, PartialEq, Eq)]
@@ -111,6 +112,8 @@ pub enum DatastoreType {
     S3,
     Mongo,
     Databricks,
+    #[serde(other)]
+    Unknown,
 }
 
 impl DatastoreType {
@@ -153,4 +156,11 @@ mod tests {
             include_str!("test_files/datastore_access_details_satori_hostname_null.json");
         serde_json::from_str::<DatastoreAccessDetails>(server_response).unwrap();
     }
+
+    #[test]
+    fn test_unknown_type() {
+        let as_str = "SOME_NEW_TYPE";
+        let as_type: DatastoreType = serde_json::from_str(&format!("\"{}\"", as_str)).unwrap();
+        assert_eq!(as_type, DatastoreType::Unknown);
+    }
 }
diff --git a/tests/server_responses/access_details_dbs/new_field_in_response.json b/tests/server_responses/access_details_dbs/new_field_in_response.json
@@ -0,0 +1,28 @@
+{
+    "records": [
+        {
+            "id": "account_id",
+            "name": "Mongo",
+            "description": "",
+            "dataStoreIds": [
+                "87547ac7-400e-4d8d-8333-95f52915ec62"
+            ]
+        }
+    ],
+    "count": 1,
+    "dataStoreDetails": [
+        {
+            "id": "87547ac7-400e-4d8d-8333-95f52915ec62",
+            "name": "mongo_datastore",
+            "type": "MONGO",
+            "satoriHostname": "mongo.example.com",
+            "port": 27017,
+            "satoriAuthEnabled": true,
+            "dataStoreSettings": {
+                "type": "MONGO",
+                "deploymentType": "MONGODB_SRV"
+            },
+            "dbs": []
+        }
+    ]
+}
diff --git a/tests/test_login.rs b/tests/test_login.rs
@@ -27,7 +27,8 @@ use crate::test_utils::{
     },
     datastores::{get_mock_datastores, write_datastores_temp_dir},
     mock_server::{
-        get_access_details_db_empty_response_path, get_access_details_db_single_response_path,
+        get_access_details_db_empty_response_path, get_access_details_db_path,
+        get_access_details_db_single_response_path,
     },
     temp_dir,
 };
@@ -144,6 +145,27 @@ async fn test_login_run_with_file_with_credentials_expire() {
     validate_credentials(&temp_dir, expected_credentials);
 }
 
+/// Test that a new field in datastore settings doesn't cause fails of deserialization of the server response
+#[tokio::test]
+async fn test_login_run_new_field_datastore_settings() {
+    let temp_dir = temp_dir::generate();
+    let datastores_entries_response = get_access_details_db_path("new_field_in_response.json");
+
+    run_login_with_server_assert_all(
+        &temp_dir,
+        &datastores_entries_response,
+        LoginBuilder::default(),
+        run_login,
+    )
+    .await;
+    let expected_credentials = get_new_credentials_expire_two_hours();
+    validate_credentials(&temp_dir, expected_credentials);
+
+    let expected_datastores_info = get_mock_datastores("mongo_datastores.json");
+    let results_datastores_info = get_result_datastores_info(&temp_dir);
+    assert_eq!(expected_datastores_info, results_datastores_info);
+}
+
 async fn run_login_with_server_assert_all<F, Fut>(
     temp_dir: &TempDir,
     datastores_info_file_path: &Path,