Fix OpenAPI for api-v2

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

@@ -28,8 +28,6 @@ mod storage;
 pub use storage::StorageApiDocBuilder;
 mod bootloader;
 pub use bootloader::BootloaderApiDocBuilder;
-mod software;
-pub use software::SoftwareApiDocBuilder;
 mod profile;
 pub use profile::ProfileApiDocBuilder;
 mod manager;

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

@@ -183,7 +183,7 @@ impl ApiDocBuilder for ConfigApiDocBuilder {
             .schema_from::<agama_utils::api::question::SelectionOption>()
             .schema_from::<agama_utils::api::question::UpdateQuestion>()
             .schema_from::<agama_utils::api::status::State>()
-            .schema_from::<crate::software::web::SoftwareProposal>()
+            .schema_from::<agama_utils::api::storage::Config>()
             .build()
     }
 }

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

@@ -23,6 +23,7 @@ use serde::{Deserialize, Serialize};
 /// Localization config.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
+#[schema(as = l10n::Config)]
 pub struct Config {
     /// Locale (e.g., "en_US.UTF-8").
     #[serde(skip_serializing_if = "Option::is_none")]

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

@@ -25,6 +25,7 @@ use serde_with::{serde_as, DisplayFromStr};
 /// Describes what Agama proposes for the target system.
 #[serde_as]
 #[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
+#[schema(as = l10n::Proposal)]
 pub struct Proposal {
     /// Keymap (e.g., "us", "cz(qwerty)", etc.).
     #[serde_as(as = "DisplayFromStr")]

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

@@ -21,6 +21,7 @@
 use serde::Deserialize;
 
 #[derive(Clone, Debug, Deserialize, utoipa::ToSchema)]
+#[schema(as = l10n::SystemConfig)]
 pub struct SystemConfig {
     pub locale: Option<String>,
     pub keymap: Option<String>,

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

@@ -27,6 +27,7 @@ use serde_with::{serde_as, DisplayFromStr};
 /// Localization-related information of the system where the installer is running.
 #[serde_as]
 #[derive(Clone, Default, Debug, Serialize, utoipa::ToSchema)]
+#[schema(as = l10n::SystemInfo)]
 pub struct SystemInfo {
     /// List of know locales.
     pub locales: Vec<LocaleEntry>,

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

@@ -31,6 +31,7 @@ pub enum Error {
 /// Questions configuration.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
+#[schema(as = questions::Config)]
 pub struct Config {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub policy: Option<Policy>,

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

@@ -23,6 +23,7 @@ use serde_json::Value;
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
+#[schema(as = storage::Config)]
 pub struct Config {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub storage: Option<Value>,

rust/xtask/src/main.rs

@@ -6,8 +6,8 @@ mod tasks {
     use agama_cli::Cli;
     use agama_server::web::docs::{
         ApiDocBuilder, ConfigApiDocBuilder, HostnameApiDocBuilder, ManagerApiDocBuilder,
-        MiscApiDocBuilder, ProfileApiDocBuilder, ScriptsApiDocBuilder, SoftwareApiDocBuilder,
-        StorageApiDocBuilder, UsersApiDocBuilder,
+        MiscApiDocBuilder, ProfileApiDocBuilder, ScriptsApiDocBuilder, StorageApiDocBuilder,
+        UsersApiDocBuilder,
     };
     use clap::CommandFactory;
     use clap_complete::aot;
@@ -70,7 +70,6 @@ mod tasks {
         write_openapi(MiscApiDocBuilder {}, out_dir.join("misc.json"))?;
         write_openapi(ProfileApiDocBuilder {}, out_dir.join("profile.json"))?;
         write_openapi(ScriptsApiDocBuilder {}, out_dir.join("scripts.json"))?;
-        write_openapi(SoftwareApiDocBuilder {}, out_dir.join("software.json"))?;
         write_openapi(StorageApiDocBuilder {}, out_dir.join("storage.json"))?;
         write_openapi(UsersApiDocBuilder {}, out_dir.join("users.json"))?;
         println!(