Extract patch

Author: joseivanlopez

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,
@@ -39,7 +39,7 @@ pub enum QuestionsHTTPClientError {
     #[error("Unknown question with ID {0}")]
     UnknownQuestion(u32),
     #[error(transparent)]
-    Json(#[from] serde_json::Error),
+    Patch(#[from] patch::Error),
 }
 
 pub struct HTTPClient {
@@ -101,9 +101,7 @@ impl HTTPClient {
             ..Default::default()
         };
 
-        let patch = Patch {
-            update: Some(serde_json::to_value(config)?),
-        };
+        let patch = Patch::with_update(&config)?;
 
         _ = self.client.patch_void("/v2/config", &patch).await?;
         Ok(())
@@ -122,9 +120,7 @@ impl HTTPClient {
             ..Default::default()
         };
 
-        let patch = Patch {
-            update: Some(serde_json::to_value(config)?),
-        };
+        let patch = Patch::with_update(&config)?;
         self.client.patch_void("/v2/config", &patch).await?;
         Ok(())
     }

rust/agama-server/src/server/web.rs

@@ -26,9 +26,9 @@ use agama_manager::{self as manager, message};
 use agama_utils::{
     actor::Handler,
     api::{
-        config, event,
+        event,
         question::{Question, QuestionSpec, UpdateQuestion},
-        Action, Config, IssueMap, Status, SystemInfo,
+        Action, Config, IssueMap, Patch, Status, SystemInfo,
     },
     question,
 };
@@ -206,12 +206,12 @@ async fn put_config(State(state): State<ServerState>, Json(json): Json<Value>) -
         (status = 400, description = "Not possible to patch the configuration.")
     ),
     params(
-        ("config" = config::Patch, description = "Changes in the configuration.")
+        ("patch" = Patch, description = "Changes in the configuration.")
     )
 )]
 async fn patch_config(
     State(state): State<ServerState>,
-    Json(patch): Json<config::Patch>,
+    Json(patch): Json<Patch>,
 ) -> ServerResult<()> {
     if let Some(json) = patch.update {
         config_schema::check(&json)?;

rust/agama-server/src/web/docs/config.rs

@@ -164,7 +164,7 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema_from::<agama_utils::api::Scope>()
             .schema_from::<agama_utils::api::Status>()
             .schema_from::<agama_utils::api::SystemInfo>()
-            .schema_from::<agama_utils::api::config::Patch>()
+            .schema_from::<agama_utils::api::Patch>()
             .schema_from::<agama_utils::api::l10n::Config>()
             .schema_from::<agama_utils::api::l10n::Keymap>()
             .schema_from::<agama_utils::api::l10n::LocaleEntry>()

rust/agama-utils/src/api.rs

@@ -42,6 +42,9 @@ pub use system_info::SystemInfo;
 pub mod config;
 pub use config::Config;
 
+pub mod patch;
+pub use patch::Patch;
+
 mod proposal;
 pub use proposal::Proposal;
 

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

@@ -20,7 +20,7 @@
 
 use crate::api::{l10n, question};
 use serde::{Deserialize, Serialize};
-use serde_json::{value::RawValue, Value};
+use serde_json::value::RawValue;
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -37,11 +37,3 @@ pub struct Config {
     #[schema(value_type = Object)]
     pub legacy_autoyast_storage: Option<Box<RawValue>>,
 }
-
-/// Patch for the config.
-#[derive(Deserialize, Serialize, utoipa::ToSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct Patch {
-    /// Update for the current config.
-    pub update: Option<Value>,
-}

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

@@ -0,0 +1,45 @@
+// Copyright (c) [2025] SUSE LLC
+//
+// All Rights Reserved.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, contact SUSE LLC.
+//
+// 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::config::Config;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    Json(#[from] serde_json::Error),
+}
+
+/// Patch for the config.
+#[derive(Deserialize, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Patch {
+    /// Update for the current config.
+    pub update: Option<Value>,
+}
+
+impl Patch {
+    pub fn with_update(config: &Config) -> Result<Self, Error> {
+        Ok(Self {
+            update: Some(serde_json::to_value(config)?),
+        })
+    }
+}