[PATCH datacenter-manager v3 06/21] pdm-config: remotes: rename trait methods to read/write/lock

[Lukas Wagner <l.wagner@proxmox.com>]

This makes the use of these less awkward when being called via the trait
object itself, e.g. on a dependency injected application context object:

  app.remote_config().read()
     instead of
  app.remote_config().config()

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 lib/pdm-config/src/remotes.rs          | 24 ++++++++++++------------
 server/src/test_support/fake_remote.rs |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/pdm-config/src/remotes.rs b/lib/pdm-config/src/remotes.rs
index a1004cfe..47754e9b 100644
--- a/lib/pdm-config/src/remotes.rs
+++ b/lib/pdm-config/src/remotes.rs
@@ -35,36 +35,36 @@ fn instance() -> &'static (dyn RemoteConfig + Send + Sync) {
 ///
 /// Will panic if the the remote config instance has not been set before.
 pub fn lock_config() -> Result<ApiLockGuard, Error> {
-    instance().lock_config()
+    instance().lock()
 }
 
 /// Return contents of the remotes config
 ///
 /// Will panic if the the remote config instance has not been set before.
 pub fn config() -> Result<(SectionConfigData<Remote>, ConfigDigest), Error> {
-    instance().config()
+    instance().read()
 }
 
 pub fn get_secret_token(remote: &Remote) -> Result<String, Error> {
-    instance().get_secret_token(remote)
+    instance().read_secret_token(remote)
 }
 
 /// Replace the currently persisted remotes config
 ///
 /// Will panic if the the remote config instance has not been set before.
 pub fn save_config(config: SectionConfigData<Remote>) -> Result<(), Error> {
-    instance().save_config(config)
+    instance().write(config)
 }
 
 pub trait RemoteConfig {
     /// Return contents of the remotes config
-    fn config(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error>;
+    fn read(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error>;
     /// Return contents of the remotes shadow config
-    fn get_secret_token(&self, remote: &Remote) -> Result<String, Error>;
+    fn read_secret_token(&self, remote: &Remote) -> Result<String, Error>;
     /// Lock the remotes config
-    fn lock_config(&self) -> Result<ApiLockGuard, Error>;
+    fn lock(&self) -> Result<ApiLockGuard, Error>;
     /// Replace the currently persisted remotes config
-    fn save_config(&self, remotes: SectionConfigData<Remote>) -> Result<(), Error>;
+    fn write(&self, remotes: SectionConfigData<Remote>) -> Result<(), Error>;
 }
 
 /// Default, production implementation for reading/writing the `remotes.cfg`
@@ -72,11 +72,11 @@ pub trait RemoteConfig {
 pub struct DefaultRemoteConfig;
 
 impl RemoteConfig for DefaultRemoteConfig {
-    fn lock_config(&self) -> Result<ApiLockGuard, Error> {
+    fn lock(&self) -> Result<ApiLockGuard, Error> {
         open_api_lockfile(REMOTES_CFG_LOCKFILE, None, true)
     }
 
-    fn config(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error> {
+    fn read(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error> {
         let content =
             proxmox_sys::fs::file_read_optional_string(REMOTES_CFG_FILENAME)?.unwrap_or_default();
 
@@ -86,7 +86,7 @@ impl RemoteConfig for DefaultRemoteConfig {
         Ok((data, digest.into()))
     }
 
-    fn save_config(&self, mut config: SectionConfigData<Remote>) -> Result<(), Error> {
+    fn write(&self, mut config: SectionConfigData<Remote>) -> Result<(), Error> {
         let shadow_content = proxmox_sys::fs::file_read_optional_string(REMOTES_SHADOW_FILENAME)?
             .unwrap_or_default();
 
@@ -135,7 +135,7 @@ impl RemoteConfig for DefaultRemoteConfig {
         replace_config(REMOTES_CFG_FILENAME, raw.as_bytes())
     }
 
-    fn get_secret_token(&self, remote: &Remote) -> Result<String, Error> {
+    fn read_secret_token(&self, remote: &Remote) -> Result<String, Error> {
         // not yet rewritten into shadow config
         if remote.token != "-" {
             return Ok(remote.token.clone());
diff --git a/server/src/test_support/fake_remote.rs b/server/src/test_support/fake_remote.rs
index e13ffa43..f387029f 100644
--- a/server/src/test_support/fake_remote.rs
+++ b/server/src/test_support/fake_remote.rs
@@ -35,7 +35,7 @@ pub struct FakeRemoteConfig {
 }
 
 impl RemoteConfig for FakeRemoteConfig {
-    fn config(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error> {
+    fn read(&self) -> Result<(SectionConfigData<Remote>, ConfigDigest), Error> {
         let mut section_config = SectionConfigData::default();
 
         for i in 0..self.nr_of_pve_remotes {
@@ -59,15 +59,15 @@ impl RemoteConfig for FakeRemoteConfig {
         Ok((section_config, digest))
     }
 
-    fn lock_config(&self) -> Result<ApiLockGuard, Error> {
+    fn lock(&self) -> Result<ApiLockGuard, Error> {
         unsafe { Ok(proxmox_product_config::create_mocked_lock()) }
     }
 
-    fn save_config(&self, _remotes: SectionConfigData<Remote>) -> Result<(), Error> {
+    fn write(&self, _remotes: SectionConfigData<Remote>) -> Result<(), Error> {
         Ok(())
     }
 
-    fn get_secret_token(&self, _remote: &Remote) -> Result<String, Error> {
+    fn read_secret_token(&self, _remote: &Remote) -> Result<String, Error> {
         Ok(String::new())
     }
 }
-- 
2.47.3