Endpoint configuration as Map

This patch rewrites the endpoint configuration format to be a map.

The problem here is, that a list of endpoints cannot easily be used with layered
configuration, where a part of the configuration lives in the XDG config home of
the user and the rest lives in the repository.

With this patch, the endpoints are configured with a map instead of an array,
which makes it less complicated to overwrite.
The name of an endpoint is now the key in the map.

A type `EndpointName` was introduced to take advantage of strong typing. Thus,
the patch touches a bit more code to adapt to the new type in use.

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Tested-by: Matthias Beyer <matthias.beyer@atos.net>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/db/models/endpoint.rs b/src/db/models/endpoint.rs
index 73009f6..d7a7986 100644
--- a/src/db/models/endpoint.rs
+++ b/src/db/models/endpoint.rs
@@ -13,6 +13,7 @@ use anyhow::Result;
 use diesel::prelude::*;
 use diesel::PgConnection;
 
+use crate::config::EndpointName;
 use crate::schema::endpoints;
 use crate::schema::endpoints::*;
 
@@ -29,8 +30,8 @@ struct NewEndpoint<'a> {
 }
 
 impl Endpoint {
-    pub fn create_or_fetch(database_connection: &PgConnection, ep_name: &str) -> Result<Endpoint> {
-        let new_ep = NewEndpoint { name: ep_name };
+    pub fn create_or_fetch(database_connection: &PgConnection, ep_name: &EndpointName) -> Result<Endpoint> {
+        let new_ep = NewEndpoint { name: ep_name.as_ref() };
 
         diesel::insert_into(endpoints::table)
             .values(&new_ep)
@@ -38,7 +39,7 @@ impl Endpoint {
             .execute(database_connection)?;
 
         dsl::endpoints
-            .filter(name.eq(ep_name))
+            .filter(name.eq(ep_name.as_ref()))
             .first::<Endpoint>(database_connection)
             .map_err(Error::from)
     }