Merge api-v2 into software-service

rust/Cargo.toml

@@ -9,6 +9,7 @@ members = [
     "agama-network",
     "agama-server",
     "agama-software",
+    "agama-storage",
     "agama-utils",
     "xtask",
     "zypp-agama",

rust/agama-l10n/src/message.rs

@@ -55,17 +55,23 @@ impl Message for GetConfig {
 }
 
 pub struct SetConfig<T> {
-    pub config: T,
+    pub config: Option<T>,
 }
 
 impl<T: Send + 'static> Message for SetConfig<T> {
     type Reply = ();
 }
 
 impl<T> SetConfig<T> {
-    pub fn new(config: T) -> Self {
+    pub fn new(config: Option<T>) -> Self {
         Self { config }
     }
+
+    pub fn with(config: T) -> Self {
+        Self {
+            config: Some(config),
+        }
+    }
 }
 
 pub struct GetProposal;

rust/agama-l10n/src/service.rs

@@ -123,7 +123,7 @@ impl Service {
                 details: None,
                 source: IssueSource::Config,
                 severity: IssueSeverity::Error,
-                kind: "unknown_locale".to_string(),
+                class: "unknown_locale".to_string(),
             });
         }
 
@@ -133,7 +133,7 @@ impl Service {
                 details: None,
                 source: IssueSource::Config,
                 severity: IssueSeverity::Error,
-                kind: "unknown_keymap".to_string(),
+                class: "unknown_keymap".to_string(),
             });
         }
 
@@ -143,7 +143,7 @@ impl Service {
                 details: None,
                 source: IssueSource::Config,
                 severity: IssueSeverity::Error,
-                kind: "unknown_timezone".to_string(),
+                class: "unknown_timezone".to_string(),
             });
         }
 
@@ -195,16 +195,22 @@ impl MessageHandler<message::SetConfig<api::l10n::Config>> for Service {
         &mut self,
         message: message::SetConfig<api::l10n::Config>,
     ) -> Result<(), Error> {
-        let config = Config::new_from(&self.system);
-        let merged = config.merge(&message.config)?;
-        if merged == self.config {
+        let base_config = Config::new_from(&self.system);
+
+        let config = if let Some(config) = &message.config {
+            base_config.merge(config)?
+        } else {
+            base_config
+        };
+
+        if config == self.config {
             return Ok(());
         }
 
-        self.config = merged;
+        self.config = config;
         let issues = self.find_issues();
         self.issues
-            .cast(issue::message::Update::new(Scope::L10n, issues))?;
+            .cast(issue::message::Set::new(Scope::L10n, issues))?;
         self.events
             .send(Event::ProposalChanged { scope: Scope::L10n })?;
         Ok(())

rust/agama-l10n/src/start.rs

@@ -71,12 +71,16 @@ mod tests {
     use crate::model::{KeymapsDatabase, LocalesDatabase, ModelAdapter, TimezonesDatabase};
     use crate::service::{self, Service};
     use agama_locale_data::{KeymapId, LocaleId};
-    use agama_utils::actor::{self, Handler};
-    use agama_utils::api;
-    use agama_utils::api::event::{self, Event};
-    use agama_utils::api::l10n::{Keymap, LocaleEntry, TimezoneEntry};
-    use agama_utils::api::scope::Scope;
-    use agama_utils::issue;
+    use agama_utils::{
+        actor::{self, Handler},
+        api::{
+            self,
+            event::{self, Event},
+            l10n::{Keymap, LocaleEntry, TimezoneEntry},
+            scope::Scope,
+        },
+        issue, test,
+    };
     use tokio::sync::broadcast;
 
     pub struct TestModel {
@@ -145,7 +149,8 @@ mod tests {
     async fn start_testing_service() -> (event::Receiver, Handler<Service>, Handler<issue::Service>)
     {
         let (events_tx, events_rx) = broadcast::channel::<Event>(16);
-        let issues = issue::start(events_tx.clone(), None).await.unwrap();
+        let dbus = test::dbus::connection().await.unwrap();
+        let issues = issue::start(events_tx.clone(), dbus).await.unwrap();
 
         let model = build_adapter();
         let service = Service::new(model, issues.clone(), events_tx);
@@ -167,7 +172,7 @@ mod tests {
             timezone: Some("Atlantic/Canary".to_string()),
         };
         handler
-            .call(message::SetConfig::new(input_config.clone()))
+            .call(message::SetConfig::with(input_config.clone()))
             .await?;
 
         let updated = handler.call(message::GetConfig).await?;
@@ -190,7 +195,7 @@ mod tests {
 
         // Use system info for missing values.
         handler
-            .call(message::SetConfig::new(input_config.clone()))
+            .call(message::SetConfig::with(input_config.clone()))
             .await?;
 
         let updated = handler.call(message::GetConfig).await?;
@@ -206,6 +211,25 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test]
+    async fn test_reset_config() -> Result<(), Box<dyn std::error::Error>> {
+        let (mut _events_rx, handler, _issues) = start_testing_service().await;
+
+        handler.call(message::SetConfig::new(None)).await?;
+
+        let config = handler.call(message::GetConfig).await?;
+        assert_eq!(
+            config,
+            api::l10n::Config {
+                locale: Some("en_US.UTF-8".to_string()),
+                keymap: Some("us".to_string()),
+                timezone: Some("Europe/Berlin".to_string()),
+            }
+        );
+
+        Ok(())
+    }
+
     #[tokio::test]
     async fn test_set_invalid_config() -> Result<(), Box<dyn std::error::Error>> {
         let (_events_rx, handler, _issues) = start_testing_service().await;
@@ -216,7 +240,7 @@ mod tests {
         };
 
         let result = handler
-            .call(message::SetConfig::new(input_config.clone()))
+            .call(message::SetConfig::with(input_config.clone()))
             .await;
         assert!(matches!(result, Err(service::Error::InvalidLocale(_))));
         Ok(())
@@ -228,7 +252,7 @@ mod tests {
 
         let config = handler.call(message::GetConfig).await?;
         assert_eq!(config.locale, Some("en_US.UTF-8".to_string()));
-        let message = message::SetConfig::new(config.clone());
+        let message = message::SetConfig::with(config.clone());
         handler.call(message).await?;
         // Wait until the action is dispatched.
         let _ = handler.call(message::GetConfig).await?;
@@ -247,7 +271,7 @@ mod tests {
             locale: Some("xx_XX.UTF-8".to_string()),
             timezone: Some("Unknown/Unknown".to_string()),
         };
-        let _ = handler.call(message::SetConfig::new(config)).await?;
+        let _ = handler.call(message::SetConfig::with(config)).await?;
 
         let found_issues = issues.call(issue::message::Get).await?;
         let l10n_issues = found_issues.get(&Scope::L10n).unwrap();
@@ -277,7 +301,7 @@ mod tests {
             keymap: Some("es".to_string()),
             timezone: Some("Atlantic/Canary".to_string()),
         };
-        let message = message::SetConfig::new(input_config.clone());
+        let message = message::SetConfig::with(input_config.clone());
         handler.call(message).await?;
 
         let proposal = handler

rust/agama-lib/share/examples/profile_tw.json

@@ -2,7 +2,7 @@
   "localization": {
     "keyboard": "es",
     "language": "es_ES.UTF-8",
-    "keymap": "es_ES.UTF-8"
+    "timezone": "Europe/Berlin"
   },
   "software": {
     "patterns": ["gnome"],

rust/agama-lib/share/profile.schema.json

@@ -785,9 +785,33 @@
         }
       }
     },
-    "localization": {
+    "l10n": {
       "title": "Localization settings",
       "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "locale": {
+          "title": "Locale ID",
+          "type": "string",
+          "examples": ["en_US.UTF-8", "en_US"]
+        },
+        "keymap": {
+          "title": "Keymap ID",
+          "type": "string",
+          "examples": ["us", "en", "es"]
+        },
+        "timezone": {
+          "title": "Time zone ID",
+          "type": "string",
+          "examples": ["Europe/Berlin"]
+        }
+      }
+    },
+    "localization": {
+      "deprecated": true,
+      "title": "Localization settings (old schema)",
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
         "language": {
           "title": "System language ID",

rust/agama-lib/src/questions/http_client.rs

@@ -21,7 +21,7 @@
 use std::time::Duration;
 
 use agama_utils::api::{
-    config::Patch,
+    patch::{self, Patch},
     question::{
         Answer, AnswerRule, Config as QuestionsConfig, Policy, Question, QuestionSpec,
         UpdateQuestion,
@@ -38,6 +38,8 @@ pub enum QuestionsHTTPClientError {
     HTTP(#[from] BaseHTTPClientError),
     #[error("Unknown question with ID {0}")]
     UnknownQuestion(u32),
+    #[error(transparent)]
+    Patch(#[from] patch::Error),
 }
 
 pub struct HTTPClient {
@@ -99,9 +101,7 @@ impl HTTPClient {
             ..Default::default()
         };
 
-        let patch = Patch {
-            update: Some(config),
-        };
+        let patch = Patch::with_update(&config)?;
 
         _ = self.client.patch_void("/v2/config", &patch).await?;
         Ok(())
@@ -120,9 +120,7 @@ impl HTTPClient {
             ..Default::default()
         };
 
-        let patch = Patch {
-            update: Some(config),
-        };
+        let patch = Patch::with_update(&config)?;
         self.client.patch_void("/v2/config", &patch).await?;
         Ok(())
     }

rust/agama-manager/Cargo.toml

@@ -8,11 +8,13 @@ edition.workspace = true
 agama-utils = { path = "../agama-utils" }
 agama-l10n = { path = "../agama-l10n" }
 agama-software = { path = "../agama-software" }
+agama-storage = { path = "../agama-storage" }
 thiserror = "2.0.12"
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread", "sync"] }
 async-trait = "0.1.83"
 zbus = { version = "5", default-features = false, features = ["tokio"] }
 merge-struct = "0.1.0"
+serde_json = "1.0.140"
 
 [dev-dependencies]
 tokio-test = "0.4.4"

rust/agama-manager/src/lib.rs

@@ -28,3 +28,4 @@ pub mod message;
 
 pub use agama_l10n as l10n;
 pub use agama_software as software;
+pub use agama_storage as storage;

rust/agama-manager/src/message.rs

@@ -22,6 +22,7 @@ use agama_utils::{
     actor::Message,
     api::{Action, Config, IssueMap, Proposal, Status, SystemInfo},
 };
+use serde_json::Value;
 
 /// Gets the installation status.
 pub struct GetStatus;
@@ -118,3 +119,25 @@ impl RunAction {
 impl Message for RunAction {
     type Reply = ();
 }
+
+// Gets the storage model.
+pub struct GetStorageModel;
+
+impl Message for GetStorageModel {
+    type Reply = Option<Value>;
+}
+
+// Sets the storage model.
+pub struct SetStorageModel {
+    pub model: Value,
+}
+
+impl SetStorageModel {
+    pub fn new(model: Value) -> Self {
+        Self { model }
+    }
+}
+
+impl Message for SetStorageModel {
+    type Reply = ();
+}