Move system info to api

Author: joseivanlopez

rust/agama-manager/src/lib.rs

@@ -24,11 +24,7 @@ pub use start::start;
 pub mod service;
 pub use service::Service;
 
-mod system_info;
-pub use system_info::SystemInfo;
-
 pub mod message;
-
 mod proposal;
 
 pub use agama_l10n as l10n;

rust/agama-manager/src/message.rs

@@ -20,10 +20,9 @@
 
 use crate::l10n;
 use crate::proposal::Proposal;
-use crate::system_info::SystemInfo;
 use agama_lib::install_settings::InstallSettings;
 use agama_utils::actor::Message;
-use agama_utils::api::{Scope, Status};
+use agama_utils::api::{Scope, Status, SystemInfo};
 use agama_utils::issue::Issue;
 use serde::Deserialize;
 use std::collections::HashMap;

rust/agama-manager/src/service.rs

@@ -21,11 +21,10 @@
 use crate::l10n;
 use crate::message::{self, Action};
 use crate::proposal::Proposal;
-use crate::system_info::SystemInfo;
 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, Scope, Status};
+use agama_utils::api::{event, Event, Scope, Status, SystemInfo};
 use agama_utils::issue;
 use agama_utils::progress;
 use async_trait::async_trait;

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

@@ -24,10 +24,9 @@ use crate::server::types::{ConfigPatch, IssuesMap};
 use agama_lib::error::ServiceError;
 use agama_lib::install_settings::InstallSettings;
 use agama_manager::message;
-use agama_manager::SystemInfo;
 use agama_manager::{self as manager};
 use agama_utils::actor::Handler;
-use agama_utils::api::{event, Status};
+use agama_utils::api::{event, Status, SystemInfo};
 use anyhow;
 use axum::extract::State;
 use axum::response::{IntoResponse, Response};

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

@@ -162,10 +162,12 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema_from::<crate::server::types::IssuesMap>()
             .schema_from::<crate::software::web::SoftwareProposal>()
             .schema_from::<agama_manager::message::Action>()
-            .schema_from::<agama_utils::api::progress::Progress>()
-            .schema_from::<agama_utils::api::status::Status>()
+            .schema_from::<agama_utils::api::Progress>()
+            .schema_from::<agama_utils::api::Status>()
             .schema_from::<agama_utils::api::status::State>()
-            .schema_from::<agama_utils::api::scope::Scope>()
+            .schema_from::<agama_utils::api::Scope>()
+            .schema_from::<agama_utils::api::SystemInfo>()
+            .schema_from::<agama_utils::api::l10n::SystemInfo>()
             .schema_from::<agama_utils::api::l10n::Config>()
             .build()
     }

rust/agama-utils/src/api.rs

@@ -33,4 +33,7 @@ pub use scope::Scope;
 pub mod status;
 pub use status::Status;
 
+pub mod system_info;
+pub use system_info::SystemInfo;
+
 pub mod l10n;

rust/agama-manager/src/system_info.rs rust/agama-utils/src/api/system_info.rsrust/agama-manager/src/system_info.rs renamed to rust/agama-utils/src/api/system_info.rs

@@ -18,10 +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 agama_utils::api::l10n;
+use crate::api::l10n;
 use serde::Serialize;
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Serialize, utoipa::ToSchema)]
 pub struct SystemInfo {
     pub localization: l10n::SystemInfo,
 }