Set storage config

Author: joseivanlopez

rust/agama-manager/src/service.rs

@@ -153,7 +153,8 @@ impl MessageHandler<message::GetExtendedConfig> for Service {
         Ok(Config {
             l10n: Some(l10n),
             questions: Some(questions),
-            storage,
+            storage: storage.as_ref().and_then(|c| c.storage.clone()),
+            legacy_autoyast_storage: storage.and_then(|c| c.legacy_autoyast_storage),
         })
     }
 }
@@ -172,17 +173,21 @@ impl MessageHandler<message::GetConfig> for Service {
 impl MessageHandler<message::SetConfig> for Service {
     /// Sets the config.
     async fn handle(&mut self, message: message::SetConfig) -> Result<(), Error> {
+        let config = message.config;
+
         self.l10n
-            .call(l10n::message::SetConfig::new(message.config.l10n.clone()))
+            .call(l10n::message::SetConfig::new(config.l10n.clone()))
             .await?;
 
         self.questions
-            .call(question::message::SetConfig::new(
-                message.config.questions.clone(),
-            ))
+            .call(question::message::SetConfig::new(config.questions.clone()))
+            .await?;
+
+        self.storage
+            .call(storage::message::SetConfig::new((&config).try_into().ok()))
             .await?;
 
-        self.config = message.config;
+        self.config = config;
         Ok(())
     }
 }
@@ -208,6 +213,12 @@ impl MessageHandler<message::UpdateConfig> for Service {
                 .await?;
         }
 
+        if let Some(storage) = (&config).try_into().ok() {
+            self.storage
+                .call(storage::message::SetConfig::with(storage))
+                .await?;
+        }
+
         self.config = config;
         Ok(())
     }

rust/agama-storage/src/client.rs

@@ -20,7 +20,7 @@
 
 //! Implements a client to access Agama's storage service.
 
-use agama_utils::api::storage::Config;
+use crate::config::Config;
 use serde_json::{value::RawValue, Value};
 use zbus::{names::BusName, zvariant::OwnedObjectPath, Connection, Message};
 
@@ -78,9 +78,7 @@ impl Client {
 
     pub async fn get_config(&self) -> Result<Option<Config>, Error> {
         let message = self.call("GetConfig", &()).await?;
-        let value: String = message.body().deserialize()?;
-        let config = serde_json::from_str(value.as_str())?;
-        Ok(config)
+        self.json_from(message)
     }
 
     pub async fn get_config_model(&self) -> Result<Option<Box<RawValue>>, Error> {
@@ -104,8 +102,10 @@ impl Client {
         Ok(())
     }
 
-    pub async fn set_config(&self, config: Box<RawValue>) -> Result<(), Error> {
-        self.call("SetConfig", &(config.to_string())).await?;
+    pub async fn set_config(&self, config: Option<Config>) -> Result<(), Error> {
+        let config = config.filter(|c| c.is_some());
+        let json = serde_json::to_string(&config)?;
+        self.call("SetConfig", &(json)).await?;
         Ok(())
     }
 
@@ -140,17 +140,21 @@ impl Client {
             .map_err(|e| e.into())
     }
 
-    fn json_from(&self, message: Message) -> Result<Option<Box<RawValue>>, Error> {
+    fn json_from<T: serde::de::DeserializeOwned>(
+        &self,
+        message: Message,
+    ) -> Result<Option<T>, Error> {
         let value: String = message.body().deserialize()?;
         if self.is_null(value.as_str()) {
             return Ok(None);
         }
-        let json = RawValue::from_string(value)?;
+        let json = serde_json::from_str(value.as_str())?;
         Ok(Some(json))
     }
 
     fn is_null(&self, value: &str) -> bool {
-        match serde_json::from_str::<Value>(value) {
+        let value = serde_json::from_str::<Value>(value);
+        match value {
             Ok(Value::Null) => true,
             Ok(_) => false,
             Err(_) => false,

…st/agama-utils/src/api/storage/config.rs rust/agama-storage/src/config.rsrust/agama-utils/src/api/storage/config.rs renamed to rust/agama-storage/src/config.rs rust/agama-utils/src/api/storage/config.rs renamed to rust/agama-storage/src/config.rs

@@ -18,18 +18,36 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
+use agama_utils::api;
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Config {
-    #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[schema(value_type = Object)]
     pub storage: Option<Box<RawValue>>,
-    #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[schema(value_type = Object)]
     pub legacy_autoyast_storage: Option<Box<RawValue>>,
 }
+
+impl Config {
+    pub fn is_some(&self) -> bool {
+        self.storage.is_some() || self.legacy_autoyast_storage.is_some()
+    }
+}
+
+impl TryFrom<&api::Config> for Config {
+    type Error = ();
+
+    fn try_from(config: &api::Config) -> Result<Self, Self::Error> {
+        if config.storage.is_none() && config.legacy_autoyast_storage.is_none() {
+            Err(())
+        } else {
+            Ok(Config {
+                storage: config.storage.clone(),
+                legacy_autoyast_storage: config.legacy_autoyast_storage.clone(),
+            })
+        }
+    }
+}

rust/agama-storage/src/lib.rs

@@ -18,12 +18,15 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
+pub mod start;
+pub use start::start;
+
 pub mod service;
 pub use service::Service;
 
+mod config;
+pub use config::Config;
+
 mod client;
 pub mod message;
 mod monitor;
-
-pub mod start;
-pub use start::start;

rust/agama-storage/src/message.rs

@@ -18,7 +18,8 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use agama_utils::{actor::Message, api::storage::Config};
+use crate::config::Config;
+use agama_utils::actor::Message;
 use serde_json::value::RawValue;
 
 #[derive(Clone)]
@@ -94,13 +95,19 @@ impl Message for SetProduct {
 
 #[derive(Clone)]
 pub struct SetConfig {
-    pub config: Box<RawValue>,
+    pub config: Option<Config>,
 }
 
 impl SetConfig {
-    pub fn new(config: Box<RawValue>) -> Self {
+    pub fn new(config: Option<Config>) -> Self {
         Self { config }
     }
+
+    pub fn with(config: Config) -> Self {
+        Self {
+            config: Some(config),
+        }
+    }
 }
 
 impl Message for SetConfig {

rust/agama-storage/src/service.rs

@@ -18,12 +18,12 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::client::{self, Client};
-use crate::message;
-use agama_utils::{
-    actor::{self, Actor, MessageHandler},
-    api::storage::Config,
+use crate::{
+    client::{self, Client},
+    config::Config,
+    message,
 };
+use agama_utils::actor::{self, Actor, MessageHandler};
 use async_trait::async_trait;
 use serde_json::value::RawValue;
 

rust/agama-utils/src/api.rs

@@ -50,4 +50,3 @@ pub use action::Action;
 
 pub mod l10n;
 pub mod question;
-pub mod storage;

rust/agama-utils/src/api/config.rs

@@ -18,8 +18,9 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::api::{l10n, question, storage};
+use crate::api::{l10n, question};
 use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -29,8 +30,12 @@ pub struct Config {
     pub l10n: Option<l10n::Config>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub questions: Option<question::Config>,
-    #[serde(flatten)]
-    pub storage: Option<storage::Config>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[schema(value_type = Object)]
+    pub storage: Option<Box<RawValue>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[schema(value_type = Object)]
+    pub legacy_autoyast_storage: Option<Box<RawValue>>,
 }
 
 /// Patch for the config.