After merge fixups

agama-project · Sep 30, 2024 · 90797dc · 90797dc
1 parent 6a6232b
commit 90797dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/rust/agama-cli/src/config.rs b/rust/agama-cli/src/config.rs
@@ -26,7 +26,7 @@ use std::{
 
 use crate::show_progress;
 use agama_lib::{
-    base_http_client::BaseHTTPClient, connection, install_settings::InstallSettings,
+    base_http_client::BaseHTTPClient, install_settings::InstallSettings,
     Store as SettingsStore,
 };
 use anyhow::anyhow;
@@ -63,7 +63,7 @@ pub enum ConfigCommands {
 }
 
 pub async fn run(http_client: BaseHTTPClient, subcommand: ConfigCommands) -> anyhow::Result<()> {
-    let store = SettingsStore::new(connection().await?, http_client).await?;
+    let store = SettingsStore::new(http_client).await?;
 
     match subcommand {
         ConfigCommands::Show => {

diff --git a/rust/agama-cli/src/profile.rs b/rust/agama-cli/src/profile.rs
@@ -20,7 +20,6 @@
 
 use agama_lib::{
     base_http_client::BaseHTTPClient,
-    connection,
     install_settings::InstallSettings,
     profile::{AutoyastProfile, ProfileEvaluator, ProfileValidator, ValidationResult},
     Store as SettingsStore,
@@ -167,7 +166,7 @@ async fn import(url_string: String, dir: Option<PathBuf>) -> anyhow::Result<()>
 }
 
 async fn store_settings<P: AsRef<Path>>(path: P) -> anyhow::Result<()> {
-    let store = SettingsStore::new(connection().await?, BaseHTTPClient::new()?).await?;
+    let store = SettingsStore::new(BaseHTTPClient::new()?).await?;
     let settings = InstallSettings::from_file(&path)?;
     store.store(&settings).await?;
     Ok(())

diff --git a/rust/agama-lib/src/store.rs b/rust/agama-lib/src/store.rs
@@ -44,18 +44,17 @@ pub struct Store {
     localization: LocalizationStore,
 }
 
-impl<'a> Store<'a> {
+impl Store {
     pub async fn new(
-        connection: Connection,
         http_client: BaseHTTPClient,
-    ) -> Result<Store<'a>, ServiceError> {
+    ) -> Result<Store, ServiceError> {
         Ok(Self {
             localization: LocalizationStore::new(http_client.clone())?,
             users: UsersStore::new(http_client.clone())?,
             network: NetworkStore::new(http_client.clone()).await?,
-            product: ProductStore::new(connection.clone()).await?,
-            software: SoftwareStore::new(connection.clone()).await?,
-            storage: StorageStore::new(connection).await?,
+            product: ProductStore::new()?,
+            software: SoftwareStore::new()?,
+            storage: StorageStore::new()?,
         })
     }