Move action to api

Author: joseivanlopez

rust/agama-l10n/src/message.rs

@@ -22,7 +22,6 @@ use agama_locale_data::{KeymapId, LocaleId};
 use agama_utils::actor::Message;
 use agama_utils::api;
 use agama_utils::api::l10n::{Proposal, SystemInfo};
-use serde::Deserialize;
 
 #[derive(Clone)]
 pub struct GetSystem;
@@ -45,12 +44,6 @@ impl<T> SetSystem<T> {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, utoipa::ToSchema)]
-pub struct SystemConfig {
-    pub locale: Option<String>,
-    pub keymap: Option<String>,
-}
-
 pub struct GetConfig;
 
 impl Message for GetConfig {

rust/agama-l10n/src/service.rs

@@ -25,7 +25,7 @@ use agama_locale_data::{InvalidKeymapId, InvalidLocaleId, InvalidTimezoneId, Key
 use agama_utils::actor::{self, Actor, Handler, MessageHandler};
 use agama_utils::api;
 use agama_utils::api::event::{self, Event};
-use agama_utils::api::l10n::{Proposal, SystemInfo};
+use agama_utils::api::l10n::{Proposal, SystemConfig, SystemInfo};
 use agama_utils::api::scope::Scope;
 use agama_utils::issue::{self, Issue};
 use async_trait::async_trait;
@@ -157,11 +157,8 @@ impl MessageHandler<message::GetSystem> for Service {
 }
 
 #[async_trait]
-impl MessageHandler<message::SetSystem<message::SystemConfig>> for Service {
-    async fn handle(
-        &mut self,
-        message: message::SetSystem<message::SystemConfig>,
-    ) -> Result<(), Error> {
+impl MessageHandler<message::SetSystem<SystemConfig>> for Service {
+    async fn handle(&mut self, message: message::SetSystem<SystemConfig>) -> Result<(), Error> {
         let config = &message.config;
         if let Some(locale) = &config.locale {
             self.model.set_locale(locale.parse()?)?;

rust/agama-manager/src/message.rs

@@ -18,12 +18,10 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::l10n;
 use agama_lib::install_settings::InstallSettings;
 use agama_utils::actor::Message;
-use agama_utils::api::{Proposal, Scope, Status, SystemInfo};
+use agama_utils::api::{Action, Proposal, Scope, Status, SystemInfo};
 use agama_utils::issue::Issue;
-use serde::Deserialize;
 use std::collections::HashMap;
 
 /// Gets the installation status.
@@ -121,11 +119,3 @@ impl RunAction {
 impl Message for RunAction {
     type Reply = ();
 }
-
-#[derive(Debug, Deserialize, utoipa::ToSchema)]
-pub enum Action {
-    #[serde(rename = "configureL10n")]
-    ConfigureL10n(l10n::message::SystemConfig),
-    #[serde(rename = "install")]
-    Install,
-}

rust/agama-manager/src/service.rs

@@ -19,11 +19,11 @@
 // find current contact information at www.suse.com.
 
 use crate::l10n;
-use crate::message::{self, Action};
+use crate::message;
 use agama_lib::install_settings::InstallSettings;
 use agama_utils::actor::{self, Actor, Handler, MessageHandler};
 use agama_utils::api::status::State;
-use agama_utils::api::{event, Event, Proposal, Scope, Status, SystemInfo};
+use agama_utils::api::{event, Action, Event, Proposal, Scope, Status, SystemInfo};
 use agama_utils::issue;
 use agama_utils::progress;
 use async_trait::async_trait;

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

@@ -26,7 +26,7 @@ use agama_lib::install_settings::InstallSettings;
 use agama_manager::message;
 use agama_manager::{self as manager};
 use agama_utils::actor::Handler;
-use agama_utils::api::{event, Status, SystemInfo};
+use agama_utils::api::{event, Action, Status, SystemInfo};
 use anyhow;
 use axum::extract::State;
 use axum::response::{IntoResponse, Response};
@@ -242,12 +242,12 @@ async fn get_issues(State(state): State<ServerState>) -> ServerResult<Json<Issue
         (status = 400, description = "Not possible to run the action.", body = Object)
     ),
     params(
-        ("action" = message::Action, description = "Description of the action to run."),
+        ("action" = Action, description = "Description of the action to run."),
     )
 )]
 async fn run_action(
     State(state): State<ServerState>,
-    Json(action): Json<message::Action>,
+    Json(action): Json<Action>,
 ) -> ServerResult<()> {
     state.manager.call(message::RunAction::new(action)).await?;
     Ok(())

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

@@ -46,7 +46,6 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema("IpAddr", schemas::ip_addr())
             .schema("IpInet", schemas::ip_inet())
             .schema("macaddr.MacAddr6", schemas::mac_addr6())
-            .schema_from::<agama_l10n::message::SystemConfig>()
             .schema_from::<agama_lib::bootloader::model::BootloaderSettings>()
             .schema_from::<agama_lib::file_source::FileSource>()
             .schema_from::<agama_lib::files::model::UserFile>()
@@ -161,13 +160,14 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema_from::<crate::server::types::ConfigPatch>()
             .schema_from::<crate::server::types::IssuesMap>()
             .schema_from::<crate::software::web::SoftwareProposal>()
-            .schema_from::<agama_manager::message::Action>()
             .schema_from::<agama_utils::api::Status>()
-            .schema_from::<agama_utils::api::Progress>()
             .schema_from::<agama_utils::api::status::State>()
+            .schema_from::<agama_utils::api::Progress>()
             .schema_from::<agama_utils::api::Scope>()
+            .schema_from::<agama_utils::api::Action>()
             .schema_from::<agama_utils::api::SystemInfo>()
             .schema_from::<agama_utils::api::l10n::SystemInfo>()
+            .schema_from::<agama_utils::api::l10n::SystemConfig>()
             .schema_from::<agama_utils::api::l10n::LocaleEntry>()
             .schema_from::<agama_utils::api::l10n::Keymap>()
             .schema_from::<agama_utils::api::l10n::TimezoneEntry>()

rust/agama-utils/src/api.rs

@@ -33,10 +33,13 @@ pub use scope::Scope;
 pub mod status;
 pub use status::Status;
 
-pub mod system_info;
+mod system_info;
 pub use system_info::SystemInfo;
 
-pub mod proposal;
+mod proposal;
 pub use proposal::Proposal;
 
+mod action;
+pub use action::Action;
+
 pub mod l10n;

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

@@ -0,0 +1,30 @@
+// 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::l10n;
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, utoipa::ToSchema)]
+pub enum Action {
+    #[serde(rename = "configureL10n")]
+    ConfigureL10n(l10n::SystemConfig),
+    #[serde(rename = "install")]
+    Install,
+}

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

@@ -27,5 +27,8 @@ pub use config::Config;
 mod system_info;
 pub use system_info::{Keymap, LocaleEntry, SystemInfo, TimezoneEntry};
 
+mod system_config;
+pub use system_config::SystemConfig;
+
 mod proposal;
 pub use proposal::Proposal;

rust/agama-utils/src/api/l10n/system_config.rs

@@ -0,0 +1,27 @@
+// 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 serde::Deserialize;
+
+#[derive(Clone, Debug, Deserialize, utoipa::ToSchema)]
+pub struct SystemConfig {
+    pub locale: Option<String>,
+    pub keymap: Option<String>,
+}