refactor(aggregator-client): minor adjustement following first usage in follower aggregator

- use an arc for the `ApiVersionProvider` so it fit with our current DI
  systems

Author: Alenar

internal/mithril-aggregator-client/src/builder.rs

@@ -2,6 +2,7 @@ use anyhow::Context;
 use reqwest::{Client, IntoUrl, Proxy, Url};
 use slog::{Logger, o};
 use std::collections::HashMap;
+use std::sync::Arc;
 use std::time::Duration;
 
 use mithril_common::StdResult;
@@ -12,7 +13,7 @@ use crate::client::AggregatorClient;
 /// A builder of [AggregatorClient]
 pub struct AggregatorClientBuilder {
     aggregator_url_result: reqwest::Result<Url>,
-    api_version_provider: Option<APIVersionProvider>,
+    api_version_provider: Option<Arc<APIVersionProvider>>,
     additional_headers: Option<HashMap<String, String>>,
     timeout_duration: Option<Duration>,
     relay_endpoint: Option<String>,
@@ -41,7 +42,10 @@ impl AggregatorClientBuilder {
     }
 
     /// Set the [APIVersionProvider] to use.
-    pub fn with_api_version_provider(mut self, api_version_provider: APIVersionProvider) -> Self {
+    pub fn with_api_version_provider(
+        mut self,
+        api_version_provider: Arc<APIVersionProvider>,
+    ) -> Self {
         self.api_version_provider = Some(api_version_provider);
         self
     }
@@ -59,8 +63,8 @@ impl AggregatorClientBuilder {
     }
 
     /// Set the address of the relay
-    pub fn with_relay_endpoint(mut self, relay_endpoint: String) -> Self {
-        self.relay_endpoint = Some(relay_endpoint);
+    pub fn with_relay_endpoint(mut self, relay_endpoint: Option<String>) -> Self {
+        self.relay_endpoint = relay_endpoint;
         self
     }
 

internal/mithril-aggregator-client/src/client.rs

@@ -2,6 +2,7 @@ use anyhow::{Context, anyhow};
 use reqwest::{IntoUrl, Response, Url, header::HeaderMap};
 use semver::Version;
 use slog::{Logger, error, warn};
+use std::sync::Arc;
 use std::time::Duration;
 
 use mithril_common::MITHRIL_API_VERSION_HEADER;
@@ -17,7 +18,7 @@ const API_VERSION_MISMATCH_WARNING_MESSAGE: &str = "OpenAPI version may be incom
 /// A client to send HTTP requests to a Mithril Aggregator
 pub struct AggregatorClient {
     pub(super) aggregator_endpoint: Url,
-    pub(super) api_version_provider: APIVersionProvider,
+    pub(super) api_version_provider: Arc<APIVersionProvider>,
     pub(super) additional_headers: HeaderMap,
     pub(super) timeout_duration: Option<Duration>,
     pub(super) client: reqwest::Client,
@@ -240,8 +241,9 @@ mod tests {
     #[tokio::test]
     async fn test_query_send_mithril_api_version_header() {
         let (server, mut client) = setup_server_and_client();
-        client.api_version_provider =
-            APIVersionProvider::new_with_default_version(Version::parse("1.2.9").unwrap());
+        client.api_version_provider = Arc::new(APIVersionProvider::new_with_default_version(
+            Version::parse("1.2.9").unwrap(),
+        ));
         server.mock(|when, then| {
             when.method(httpmock::Method::GET)
                 .header(MITHRIL_API_VERSION_HEADER, "1.2.9");
@@ -254,8 +256,9 @@ mod tests {
     #[tokio::test]
     async fn test_query_send_additional_header_and_dont_override_mithril_api_version_header() {
         let (server, mut client) = setup_server_and_client();
-        client.api_version_provider =
-            APIVersionProvider::new_with_default_version(Version::parse("1.2.9").unwrap());
+        client.api_version_provider = Arc::new(APIVersionProvider::new_with_default_version(
+            Version::parse("1.2.9").unwrap(),
+        ));
         client.additional_headers = {
             let mut headers = HeaderMap::new();
             headers.insert(MITHRIL_API_VERSION_HEADER, "9.4.5".parse().unwrap());
@@ -336,9 +339,9 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::new_with_default_version(
+                .with_api_version_provider(Arc::new(APIVersionProvider::new_with_default_version(
                     Version::parse(client_version).unwrap(),
-                ))
+                )))
                 .build()
                 .unwrap();
             let response =
@@ -360,9 +363,9 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::new_with_default_version(
+                .with_api_version_provider(Arc::new(APIVersionProvider::new_with_default_version(
                     Version::parse(version).unwrap(),
-                ))
+                )))
                 .build()
                 .unwrap();
             let response = build_fake_response_with_header(MITHRIL_API_VERSION_HEADER, version);
@@ -379,9 +382,9 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::new_with_default_version(
+                .with_api_version_provider(Arc::new(APIVersionProvider::new_with_default_version(
                     Version::parse(client_version).unwrap(),
-                ))
+                )))
                 .build()
                 .unwrap();
             let response =
@@ -402,7 +405,7 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::default())
+                .with_api_version_provider(Arc::new(APIVersionProvider::default()))
                 .build()
                 .unwrap();
             let response =
@@ -418,7 +421,7 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::default())
+                .with_api_version_provider(Arc::new(APIVersionProvider::default()))
                 .build()
                 .unwrap();
             let response =
@@ -434,7 +437,7 @@ mod tests {
             let (logger, log_inspector) = TestLogger::memory();
             let client = AggregatorClient::builder("http://whatever")
                 .with_logger(logger)
-                .with_api_version_provider(APIVersionProvider::new_failing())
+                .with_api_version_provider(Arc::new(APIVersionProvider::new_failing()))
                 .build()
                 .unwrap();
             let response = build_fake_response_with_header(MITHRIL_API_VERSION_HEADER, "1.0.0");
@@ -450,9 +453,9 @@ mod tests {
             let client_version = "1.0.0";
             let (server, mut client) = setup_server_and_client();
             let (logger, log_inspector) = TestLogger::memory();
-            client.api_version_provider = APIVersionProvider::new_with_default_version(
+            client.api_version_provider = Arc::new(APIVersionProvider::new_with_default_version(
                 Version::parse(client_version).unwrap(),
-            );
+            ));
             client.logger = logger;
             server.mock(|_, then| {
                 then.status(StatusCode::CREATED.as_u16())