chore: Update catalog code to new code structure

src/catalog/backends.rs

@@ -12,5 +12,56 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+use async_trait::async_trait;
+use dyn_clone::DynClone;
+
 pub mod error;
 pub mod sql;
+
+use crate::catalog::error::CatalogProviderError;
+use crate::catalog::{Endpoint, EndpointListParameters, Service, ServiceListParameters};
+use crate::config::Config;
+use crate::keystone::ServiceState;
+
+#[async_trait]
+pub trait CatalogBackend: DynClone + Send + Sync + std::fmt::Debug {
+    /// Set config
+    fn set_config(&mut self, config: Config);
+
+    /// List services
+    async fn list_services(
+        &self,
+        state: &ServiceState,
+        params: &ServiceListParameters,
+    ) -> Result<Vec<Service>, CatalogProviderError>;
+
+    /// Get single service by ID
+    async fn get_service<'a>(
+        &self,
+        state: &ServiceState,
+        id: &'a str,
+    ) -> Result<Option<Service>, CatalogProviderError>;
+
+    /// List Endpoints
+    async fn list_endpoints(
+        &self,
+        state: &ServiceState,
+        params: &EndpointListParameters,
+    ) -> Result<Vec<Endpoint>, CatalogProviderError>;
+
+    /// Get single endpoint by ID
+    async fn get_endpoint<'a>(
+        &self,
+        state: &ServiceState,
+        id: &'a str,
+    ) -> Result<Option<Endpoint>, CatalogProviderError>;
+
+    /// Get Catalog (Services with Endpoints)
+    async fn get_catalog(
+        &self,
+        state: &ServiceState,
+        enabled: bool,
+    ) -> Result<Vec<(Service, Vec<Endpoint>)>, CatalogProviderError>;
+}
+
+dyn_clone::clone_trait_object!(CatalogBackend);

src/catalog/backends/sql.rs

@@ -19,6 +19,7 @@ use sea_orm::query::*;
 
 use super::super::types::*;
 use crate::catalog::CatalogProviderError;
+use crate::catalog::backends::CatalogBackend;
 use crate::catalog::backends::error::{CatalogDatabaseError, db_err};
 use crate::config::Config;
 use crate::db::entity::{

src/catalog/mock.rs

@@ -0,0 +1,69 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+use async_trait::async_trait;
+#[cfg(test)]
+use mockall::mock;
+
+use crate::catalog::CatalogApi;
+use crate::catalog::error::CatalogProviderError;
+use crate::catalog::types::{Endpoint, EndpointListParameters, Service, ServiceListParameters};
+use crate::config::Config;
+use crate::keystone::ServiceState;
+use crate::plugin_manager::PluginManager;
+
+#[cfg(test)]
+mock! {
+    pub CatalogProvider {
+        pub fn new(cfg: &Config, plugin_manager: &PluginManager) -> Result<Self, CatalogProviderError>;
+    }
+
+    #[async_trait]
+    impl CatalogApi for CatalogProvider {
+        async fn list_services(
+            &self,
+            state: &ServiceState,
+            params: &ServiceListParameters
+        ) -> Result<Vec<Service>, CatalogProviderError>;
+
+        async fn get_service<'a>(
+            &self,
+            state: &ServiceState,
+            id: &'a str,
+        ) -> Result<Option<Service>, CatalogProviderError>;
+
+        async fn list_endpoints(
+            &self,
+            state: &ServiceState,
+            params: &EndpointListParameters,
+        ) -> Result<Vec<Endpoint>, CatalogProviderError>;
+
+        async fn get_endpoint<'a>(
+            &self,
+            state: &ServiceState,
+            id: &'a str,
+        ) -> Result<Option<Endpoint>, CatalogProviderError>;
+
+        async fn get_catalog(
+            &self,
+            state: &ServiceState,
+            enabled: bool,
+        ) -> Result<Vec<(Service, Vec<Endpoint>)>, CatalogProviderError>;
+
+    }
+
+    impl Clone for CatalogProvider {
+        fn clone(&self) -> Self;
+    }
+}

src/catalog/mod.rs

@@ -13,103 +13,28 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use async_trait::async_trait;
-#[cfg(test)]
-use mockall::mock;
 
 pub mod backends;
 pub mod error;
+#[cfg(test)]
+mod mock;
 pub(crate) mod types;
 
+use crate::catalog::backends::CatalogBackend;
 use crate::catalog::backends::sql::SqlBackend;
 use crate::catalog::error::CatalogProviderError;
-use crate::catalog::types::{
-    CatalogBackend, Endpoint, EndpointListParameters, Service, ServiceListParameters,
-};
 use crate::config::Config;
 use crate::keystone::ServiceState;
 use crate::plugin_manager::PluginManager;
 
-#[derive(Clone, Debug)]
-pub struct CatalogProvider {
-    backend_driver: Box<dyn CatalogBackend>,
-}
-
-#[async_trait]
-pub trait CatalogApi: Send + Sync + Clone {
-    async fn list_services(
-        &self,
-        state: &ServiceState,
-        params: &ServiceListParameters,
-    ) -> Result<Vec<Service>, CatalogProviderError>;
-
-    async fn get_service<'a>(
-        &self,
-        state: &ServiceState,
-        id: &'a str,
-    ) -> Result<Option<Service>, CatalogProviderError>;
-
-    async fn list_endpoints(
-        &self,
-        state: &ServiceState,
-        params: &EndpointListParameters,
-    ) -> Result<Vec<Endpoint>, CatalogProviderError>;
-
-    async fn get_endpoint<'a>(
-        &self,
-        state: &ServiceState,
-        id: &'a str,
-    ) -> Result<Option<Endpoint>, CatalogProviderError>;
-
-    async fn get_catalog(
-        &self,
-        state: &ServiceState,
-        enabled: bool,
-    ) -> Result<Vec<(Service, Vec<Endpoint>)>, CatalogProviderError>;
-}
-
 #[cfg(test)]
-mock! {
-    pub CatalogProvider {
-        pub fn new(cfg: &Config, plugin_manager: &PluginManager) -> Result<Self, CatalogProviderError>;
-    }
-
-    #[async_trait]
-    impl CatalogApi for CatalogProvider {
-        async fn list_services(
-            &self,
-            state: &ServiceState,
-            params: &ServiceListParameters
-        ) -> Result<Vec<Service>, CatalogProviderError>;
-
-        async fn get_service<'a>(
-            &self,
-            state: &ServiceState,
-            id: &'a str,
-        ) -> Result<Option<Service>, CatalogProviderError>;
+pub use mock::MockCatalogProvider;
 
-        async fn list_endpoints(
-            &self,
-            state: &ServiceState,
-            params: &EndpointListParameters,
-        ) -> Result<Vec<Endpoint>, CatalogProviderError>;
+pub use types::*;
 
-        async fn get_endpoint<'a>(
-            &self,
-            state: &ServiceState,
-            id: &'a str,
-        ) -> Result<Option<Endpoint>, CatalogProviderError>;
-
-        async fn get_catalog(
-            &self,
-            state: &ServiceState,
-            enabled: bool,
-        ) -> Result<Vec<(Service, Vec<Endpoint>)>, CatalogProviderError>;
-
-    }
-
-    impl Clone for CatalogProvider {
-        fn clone(&self) -> Self;
-    }
+#[derive(Clone, Debug)]
+pub struct CatalogProvider {
+    backend_driver: Box<dyn CatalogBackend>,
 }
 
 impl CatalogProvider {

src/catalog/types.rs

@@ -12,15 +12,12 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+use async_trait::async_trait;
+
 pub mod endpoint;
 pub mod service;
 
-use async_trait::async_trait;
-use dyn_clone::DynClone;
-
 use crate::catalog::CatalogProviderError;
-use crate::config::Config;
-
 pub use crate::catalog::types::endpoint::{
     Endpoint, EndpointBuilder, EndpointBuilderError, EndpointListParameters,
 };
@@ -30,44 +27,34 @@ pub use crate::catalog::types::service::{
 use crate::keystone::ServiceState;
 
 #[async_trait]
-pub trait CatalogBackend: DynClone + Send + Sync + std::fmt::Debug {
-    /// Set config
-    fn set_config(&mut self, config: Config);
-
-    /// List services
+pub trait CatalogApi: Send + Sync + Clone {
     async fn list_services(
         &self,
         state: &ServiceState,
         params: &ServiceListParameters,
     ) -> Result<Vec<Service>, CatalogProviderError>;
 
-    /// Get single service by ID
     async fn get_service<'a>(
         &self,
         state: &ServiceState,
         id: &'a str,
     ) -> Result<Option<Service>, CatalogProviderError>;
 
-    /// List Endpoints
     async fn list_endpoints(
         &self,
         state: &ServiceState,
         params: &EndpointListParameters,
     ) -> Result<Vec<Endpoint>, CatalogProviderError>;
 
-    /// Get single endpoint by ID
     async fn get_endpoint<'a>(
         &self,
         state: &ServiceState,
         id: &'a str,
     ) -> Result<Option<Endpoint>, CatalogProviderError>;
 
-    /// Get Catalog (Services with Endpoints)
     async fn get_catalog(
         &self,
         state: &ServiceState,
         enabled: bool,
     ) -> Result<Vec<(Service, Vec<Endpoint>)>, CatalogProviderError>;
 }
-
-dyn_clone::clone_trait_object!(CatalogBackend);

src/plugin_manager.rs

@@ -15,7 +15,7 @@
 use std::collections::HashMap;
 
 use crate::assignment::types::AssignmentBackend;
-use crate::catalog::types::CatalogBackend;
+use crate::catalog::backends::CatalogBackend;
 use crate::federation::types::FederationBackend;
 use crate::identity::types::IdentityBackend;
 use crate::resource::types::ResourceBackend;