Remove scope from HTTP API

Author: joseivanlopez

rust/agama-manager/src/lib.rs

@@ -24,9 +24,6 @@ pub use start::start;
 pub mod service;
 pub use service::Service;
 
-mod scope;
-pub use scope::{ConfigScope, Scope};
-
 mod system_info;
 pub use system_info::SystemInfo;
 

rust/agama-manager/src/message.rs

@@ -18,9 +18,7 @@
 // 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, proposal::Proposal, scope::ConfigScope, scope::Scope, service, system_info::SystemInfo,
-};
+use crate::{l10n, proposal::Proposal, service, system_info::SystemInfo};
 use agama_lib::{install_settings::InstallSettings, issue::Issue};
 use agama_utils::{actor::Message, progress::Progress};
 use serde::{Deserialize, Serialize};
@@ -61,22 +59,6 @@ impl Message for GetExtendedConfig {
     type Reply = InstallSettings;
 }
 
-/// Gets a scope from the full config.
-#[derive(Debug)]
-pub struct GetExtendedConfigScope {
-    pub scope: Scope,
-}
-
-impl GetExtendedConfigScope {
-    pub fn new(scope: Scope) -> Self {
-        Self { scope }
-    }
-}
-
-impl Message for GetExtendedConfigScope {
-    type Reply = Option<ConfigScope>;
-}
-
 /// Gets the current config set by the user.
 #[derive(Debug)]
 pub struct GetConfig;
@@ -117,54 +99,6 @@ impl Message for UpdateConfig {
     type Reply = ();
 }
 
-/// Gets a scope from the config.
-#[derive(Debug)]
-pub struct GetConfigScope {
-    pub scope: Scope,
-}
-
-impl GetConfigScope {
-    pub fn new(scope: Scope) -> Self {
-        Self { scope }
-    }
-}
-
-impl Message for GetConfigScope {
-    type Reply = Option<ConfigScope>;
-}
-
-/// Sets a config scope
-#[derive(Debug)]
-pub struct SetConfigScope {
-    pub config: ConfigScope,
-}
-
-impl SetConfigScope {
-    pub fn new(config: ConfigScope) -> Self {
-        Self { config }
-    }
-}
-
-impl Message for SetConfigScope {
-    type Reply = ();
-}
-
-/// Updates a config scope
-#[derive(Debug)]
-pub struct UpdateConfigScope {
-    pub config: ConfigScope,
-}
-
-impl UpdateConfigScope {
-    pub fn new(config: ConfigScope) -> Self {
-        Self { config }
-    }
-}
-
-impl Message for UpdateConfigScope {
-    type Reply = ();
-}
-
 /// Gets the proposal.
 #[derive(Debug)]
 pub struct GetProposal;

rust/agama-manager/src/scope.rs

@@ -22,7 +22,6 @@ use crate::{
     l10n,
     message::{self, Action},
     proposal::Proposal,
-    scope::{ConfigScope, Scope},
     system_info::SystemInfo,
 };
 use agama_lib::install_settings::InstallSettings;
@@ -147,23 +146,6 @@ impl MessageHandler<message::GetExtendedConfig> for Service {
     }
 }
 
-#[async_trait]
-impl MessageHandler<message::GetExtendedConfigScope> for Service {
-    /// It returns the configuration for the given scope.
-    async fn handle(
-        &mut self,
-        message: message::GetExtendedConfigScope,
-    ) -> Result<Option<ConfigScope>, Error> {
-        let option = match message.scope {
-            Scope::L10n => {
-                let l10n_config = self.l10n.call(l10n::message::GetConfig).await?;
-                Some(ConfigScope::L10n(l10n_config))
-            }
-        };
-        Ok(option)
-    }
-}
-
 #[async_trait]
 impl MessageHandler<message::GetConfig> for Service {
     /// Gets the current configuration set by the user.
@@ -205,63 +187,6 @@ impl MessageHandler<message::UpdateConfig> for Service {
     }
 }
 
-#[async_trait]
-impl MessageHandler<message::GetConfigScope> for Service {
-    /// It returns the configuration set by the user for the given scope.
-    async fn handle(
-        &mut self,
-        message: message::GetConfigScope,
-    ) -> Result<Option<ConfigScope>, Error> {
-        // FIXME: implement this logic at InstallSettings level: self.get_config().by_scope(...)
-        // It would allow us to drop this method.
-        let option = match message.scope {
-            Scope::L10n => self
-                .config
-                .localization
-                .clone()
-                .map(|c| ConfigScope::L10n(c)),
-        };
-        Ok(option)
-    }
-}
-
-#[async_trait]
-impl MessageHandler<message::SetConfigScope> for Service {
-    /// Sets the user configuration within the given scope.
-    ///
-    /// It replaces the current configuration with the given one and calculates a
-    /// new proposal. Only the configuration in the given scope is affected.
-    async fn handle(&mut self, message: message::SetConfigScope) -> Result<(), Error> {
-        match message.config {
-            ConfigScope::L10n(l10n_config) => {
-                self.l10n
-                    .call(l10n::message::SetConfig::new(l10n_config.clone()))
-                    .await?;
-                self.config.localization = Some(l10n_config);
-            }
-        }
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl MessageHandler<message::UpdateConfigScope> for Service {
-    /// Patches the user configuration within the given scope.
-    ///
-    /// It merges the current configuration with the given one.
-    async fn handle(&mut self, message: message::UpdateConfigScope) -> Result<(), Error> {
-        match message.config {
-            ConfigScope::L10n(l10n_config) => {
-                let base_config = self.config.localization.clone().unwrap_or_default();
-                let config = merge(&base_config, &l10n_config).map_err(|_| Error::MergeConfig)?;
-                self.handle(message::SetConfigScope::new(ConfigScope::L10n(config)))
-                    .await?;
-            }
-        }
-        Ok(())
-    }
-}
-
 #[async_trait]
 impl MessageHandler<message::GetProposal> for Service {
     /// It returns the current proposal, if any.