Skip to content

Commit 1dc9060

Browse files
joseivanlopezjoseivanlopez
committed
Move issue to api
1 parent 531c66b commit 1dc9060

File tree

12 files changed

+50
-40
lines changed

12 files changed

+50
-40
lines changed

‎rust/agama-l10n/src/service.rs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ use crate::model::ModelAdapter;
2424
use agama_locale_data::{InvalidKeymapId, InvalidLocaleId, InvalidTimezoneId, KeymapId, LocaleId};
2525
use agama_utils::actor::{self, Actor, Handler, MessageHandler};
2626
use agama_utils::api;
27-
use agama_utils::api::event::{self, Event};
27+
use agama_utils::api::event;
28+
use agama_utils::api::event::Event;
2829
use agama_utils::api::l10n::{Proposal, SystemConfig, SystemInfo};
29-
use agama_utils::api::scope::Scope;
30-
use agama_utils::issue::{self, Issue};
30+
use agama_utils::api::{Issue, IssueSeverity, IssueSource, Scope};
31+
use agama_utils::issue;
3132
use async_trait::async_trait;
3233
use tokio::sync::broadcast;
3334

@@ -48,7 +49,9 @@ pub enum Error {
4849
#[error(transparent)]
4950
Event(#[from] broadcast::error::SendError<Event>),
5051
#[error(transparent)]
51-
Issue(#[from] issue::service::Error),
52+
Issue(#[from] api::issue::Error),
53+
#[error(transparent)]
54+
IssueService(#[from] issue::service::Error),
5255
#[error(transparent)]
5356
Actor(#[from] actor::Error),
5457
#[error(transparent)]
@@ -115,8 +118,8 @@ impl Service {
115118
issues.push(Issue {
116119
description: format!("Locale '{}' is unknown", &config.locale),
117120
details: None,
118-
source: issue::IssueSource::Config,
119-
severity: issue::IssueSeverity::Error,
121+
source: IssueSource::Config,
122+
severity: IssueSeverity::Error,
120123
kind: "unknown_locale".to_string(),
121124
});
122125
}
@@ -125,8 +128,8 @@ impl Service {
125128
issues.push(Issue {
126129
description: format!("Keymap '{}' is unknown", &config.keymap),
127130
details: None,
128-
source: issue::IssueSource::Config,
129-
severity: issue::IssueSeverity::Error,
131+
source: IssueSource::Config,
132+
severity: IssueSeverity::Error,
130133
kind: "unknown_keymap".to_string(),
131134
});
132135
}
@@ -135,8 +138,8 @@ impl Service {
135138
issues.push(Issue {
136139
description: format!("Timezone '{}' is unknown", &config.timezone),
137140
details: None,
138-
source: issue::IssueSource::Config,
139-
severity: issue::IssueSeverity::Error,
141+
source: IssueSource::Config,
142+
severity: IssueSeverity::Error,
140143
kind: "unknown_timezone".to_string(),
141144
});
142145
}

‎rust/agama-manager/src/message.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
// find current contact information at www.suse.com.
2020

2121
use agama_utils::actor::Message;
22-
use agama_utils::api::{Action, Config, Proposal, Scope, Status, SystemInfo};
23-
use agama_utils::issue::Issue;
22+
use agama_utils::api::{Action, Config, Issue, Proposal, Scope, Status, SystemInfo};
2423
use std::collections::HashMap;
2524

2625
/// Gets the installation status.

‎rust/agama-manager/src/service.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::message;
2323
use agama_utils::actor::{self, Actor, Handler, MessageHandler};
2424
use agama_utils::api::event;
2525
use agama_utils::api::status::State;
26-
use agama_utils::api::{Action, Config, Event, Proposal, Scope, Status, SystemInfo};
26+
use agama_utils::api::{Action, Config, Event, Issue, Proposal, Scope, Status, SystemInfo};
2727
use agama_utils::issue;
2828
use agama_utils::progress;
2929
use async_trait::async_trait;
@@ -44,7 +44,7 @@ pub enum Error {
4444
#[error(transparent)]
4545
L10n(#[from] l10n::service::Error),
4646
#[error(transparent)]
47-
Issues(#[from] agama_utils::issue::service::Error),
47+
IssueService(#[from] issue::service::Error),
4848
}
4949

5050
pub struct Service {
@@ -190,7 +190,7 @@ impl MessageHandler<message::GetIssues> for Service {
190190
async fn handle(
191191
&mut self,
192192
_message: message::GetIssues,
193-
) -> Result<HashMap<Scope, Vec<issue::Issue>>, Error> {
193+
) -> Result<HashMap<Scope, Vec<Issue>>, Error> {
194194
Ok(self.issues.call(issue::message::Get).await?)
195195
}
196196
}

‎rust/agama-server/src/server/types.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
//! This module defines some ancillary types for the HTTP API.
2222
23-
use agama_utils::api::Scope;
24-
use agama_utils::issue;
23+
use agama_utils::api::{Issue, Scope};
2524
use serde::{Deserialize, Serialize};
2625
use std::collections::HashMap;
2726

@@ -30,26 +29,26 @@ use std::collections::HashMap;
3029
pub struct IssuesMap {
3130
/// iSCSI issues.
3231
#[serde(skip_serializing_if = "Vec::is_empty")]
33-
pub iscsi: Vec<issue::Issue>,
32+
pub iscsi: Vec<Issue>,
3433
/// Localization issues.
3534
#[serde(skip_serializing_if = "Vec::is_empty")]
36-
pub localization: Vec<issue::Issue>,
35+
pub localization: Vec<Issue>,
3736
/// Product related issues (product selection, registration, etc.).
3837
#[serde(skip_serializing_if = "Vec::is_empty")]
39-
pub product: Vec<issue::Issue>,
38+
pub product: Vec<Issue>,
4039
/// Storage related issues.
4140
#[serde(skip_serializing_if = "Vec::is_empty")]
42-
pub storage: Vec<issue::Issue>,
41+
pub storage: Vec<Issue>,
4342
/// Software management issues.
4443
#[serde(skip_serializing_if = "Vec::is_empty")]
45-
pub software: Vec<issue::Issue>,
44+
pub software: Vec<Issue>,
4645
/// First user and authentication issues.
4746
#[serde(skip_serializing_if = "Vec::is_empty")]
48-
pub users: Vec<issue::Issue>,
47+
pub users: Vec<Issue>,
4948
}
5049

51-
impl From<HashMap<Scope, Vec<issue::Issue>>> for IssuesMap {
52-
fn from(mut value: HashMap<Scope, Vec<issue::Issue>>) -> Self {
50+
impl From<HashMap<Scope, Vec<Issue>>> for IssuesMap {
51+
fn from(mut value: HashMap<Scope, Vec<Issue>>) -> Self {
5352
Self {
5453
iscsi: value.remove(&Scope::Iscsi).unwrap_or_default(),
5554
localization: value.remove(&Scope::L10n).unwrap_or_default(),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
5151
.schema_from::<agama_lib::files::model::UserFile>()
5252
.schema_from::<agama_lib::hostname::model::HostnameSettings>()
5353
.schema_from::<agama_lib::install_settings::InstallSettings>()
54-
.schema_from::<agama_lib::issue::Issue>()
55-
.schema_from::<agama_lib::issue::IssueSeverity>()
56-
.schema_from::<agama_lib::issue::IssueSource>()
5754
.schema_from::<agama_lib::network::NetworkSettings>()
5855
.schema_from::<agama_lib::network::model::AccessPoint>()
5956
.schema_from::<agama_lib::network::model::BondConfig>()
@@ -167,6 +164,9 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
167164
.schema_from::<agama_utils::api::SystemInfo>()
168165
.schema_from::<agama_utils::api::Config>()
169166
.schema_from::<agama_utils::api::config::Patch>()
167+
.schema_from::<agama_utils::api::Issue>()
168+
.schema_from::<agama_utils::api::IssueSeverity>()
169+
.schema_from::<agama_utils::api::IssueSource>()
170170
.schema_from::<agama_utils::api::l10n::SystemInfo>()
171171
.schema_from::<agama_utils::api::l10n::SystemConfig>()
172172
.schema_from::<agama_utils::api::l10n::LocaleEntry>()

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ pub use scope::Scope;
3333
pub mod status;
3434
pub use status::Status;
3535

36+
pub mod issue;
37+
pub use issue::{Issue, IssueSeverity, IssueSource};
38+
3639
mod system_info;
3740
pub use system_info::SystemInfo;
3841

rust/agama-utils/src/issue/model.rs renamed to rust/agama-utils/src/api/issue.rs

File renamed without changes.

‎rust/agama-utils/src/issue.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
//!
4545
//! ```
4646
47-
pub mod model;
48-
pub use model::{Issue, IssueSeverity, IssueSource};
49-
5047
pub mod service;
5148
pub use service::Service;
5249

‎rust/agama-utils/src/issue/message.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
// find current contact information at www.suse.com.
2020

2121
use crate::actor::Message;
22+
use crate::api::issue::Issue;
2223
use crate::api::Scope;
23-
use crate::issue::Issue;
2424
use std::collections::HashMap;
2525

2626
pub struct Get;

‎rust/agama-utils/src/issue/monitor.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
// find current contact information at www.suse.com.
2020

2121
use crate::actor::Handler;
22+
use crate::api::issue;
23+
use crate::api::issue::Issue;
2224
use crate::api::scope::Scope;
2325
use crate::dbus::build_properties_changed_stream;
24-
use crate::issue::{self, message, model, Issue, Service};
26+
use crate::issue::message;
27+
use crate::issue::service;
28+
use crate::issue::Service;
2529
use tokio_stream::StreamExt;
2630
use zbus::fdo::PropertiesChanged;
2731
use zbus::names::BusName;
@@ -37,9 +41,9 @@ pub enum Error {
3741
#[error(transparent)]
3842
DBus(#[from] zbus::Error),
3943
#[error(transparent)]
40-
Issue(#[from] issue::service::Error),
44+
Service(#[from] service::Error),
4145
#[error(transparent)]
42-
Model(#[from] model::Error),
46+
Issue(#[from] issue::Error),
4347
}
4448

4549
/// Listens the D-Bus server and updates the list of issues.

0 commit comments

Comments
 (0)