Update module structure

Author: sbernauer

crates/stackable-operator/src/crd/mod.rs

@@ -5,7 +5,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 pub mod authentication;
-pub mod database;
 pub mod git_sync;
 pub mod listener;
 pub mod s3;

…ator/src/crd/database/databases/derby.rs …perator/src/databases/databases/derby.rscrates/stackable-operator/src/crd/database/databases/derby.rs renamed to crates/stackable-operator/src/databases/databases/derby.rs crates/stackable-operator/src/crd/database/databases/derby.rs renamed to crates/stackable-operator/src/databases/databases/derby.rs

@@ -2,7 +2,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
 
-use crate::crd::database::drivers::jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails};
+use crate::databases::drivers::jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails};
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -22,7 +22,7 @@ impl JDBCDatabaseConnection for DerbyConnection {
     fn jdbc_connection_details(
         &self,
         unique_database_name: &str,
-    ) -> Result<JDBCDatabaseConnectionDetails, crate::crd::database::Error> {
+    ) -> Result<JDBCDatabaseConnectionDetails, crate::databases::Error> {
         let location = self
             .location
             .clone()

…erator/src/crd/database/databases/mod.rs …-operator/src/databases/databases/mod.rscrates/stackable-operator/src/crd/database/databases/mod.rs renamed to crates/stackable-operator/src/databases/databases/mod.rs crates/stackable-operator/src/crd/database/databases/mod.rs renamed to crates/stackable-operator/src/databases/databases/mod.rs

@@ -6,7 +6,7 @@ use snafu::{ResultExt, Snafu};
 
 use crate::{
     commons::networking::HostName,
-    crd::database::{
+    databases::{
         drivers::jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails},
         helpers::{connection_parameters_as_url_query_parameters, username_and_password_envs},
     },
@@ -50,7 +50,7 @@ impl JDBCDatabaseConnection for MysqlConnection {
     fn jdbc_connection_details(
         &self,
         unique_database_name: &str,
-    ) -> Result<JDBCDatabaseConnectionDetails, crate::crd::database::Error> {
+    ) -> Result<JDBCDatabaseConnectionDetails, crate::databases::Error> {
         let Self {
             host,
             port,

…ator/src/crd/database/databases/mysql.rs …perator/src/databases/databases/mysql.rscrates/stackable-operator/src/crd/database/databases/mysql.rs renamed to crates/stackable-operator/src/databases/databases/mysql.rs crates/stackable-operator/src/crd/database/databases/mysql.rs renamed to crates/stackable-operator/src/databases/databases/mysql.rs

@@ -6,7 +6,7 @@ use snafu::{ResultExt, Snafu};
 
 use crate::{
     commons::networking::HostName,
-    crd::database::{
+    databases::{
         drivers::{
             jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails},
             sqlalchemy::{SQLAlchemyDatabaseConnection, SQLAlchemyDatabaseConnectionDetails},
@@ -53,7 +53,7 @@ impl JDBCDatabaseConnection for PostgresqlConnection {
     fn jdbc_connection_details(
         &self,
         unique_database_name: &str,
-    ) -> Result<JDBCDatabaseConnectionDetails, crate::crd::database::Error> {
+    ) -> Result<JDBCDatabaseConnectionDetails, crate::databases::Error> {
         let Self {
             host,
             port,

…src/crd/database/databases/postgresql.rs …or/src/databases/databases/postgresql.rscrates/stackable-operator/src/crd/database/databases/postgresql.rs renamed to crates/stackable-operator/src/databases/databases/postgresql.rs crates/stackable-operator/src/crd/database/databases/postgresql.rs renamed to crates/stackable-operator/src/databases/databases/postgresql.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commons::networking::HostName,
-    crd::database::{
+    databases::{
         drivers::celery::{CeleryDatabaseConnection, CeleryDatabaseConnectionDetails},
         helpers::username_and_password_envs,
     },

…ator/src/crd/database/databases/redis.rs …perator/src/databases/databases/redis.rscrates/stackable-operator/src/crd/database/databases/redis.rs renamed to crates/stackable-operator/src/databases/databases/redis.rs crates/stackable-operator/src/crd/database/databases/redis.rs renamed to crates/stackable-operator/src/databases/databases/redis.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use url::Url;
 
 use crate::{
-    builder::pod::container::ContainerBuilder, crd::database::helpers::username_and_password_envs,
+    builder::pod::container::ContainerBuilder, databases::helpers::username_and_password_envs,
 };
 
 /// TODO docs
@@ -13,7 +13,7 @@ pub trait JDBCDatabaseConnection {
     fn jdbc_connection_details(
         &self,
         unique_database_name: &str,
-    ) -> Result<JDBCDatabaseConnectionDetails, crate::crd::database::Error>;
+    ) -> Result<JDBCDatabaseConnectionDetails, crate::databases::Error>;
 }
 
 pub struct JDBCDatabaseConnectionDetails {
@@ -56,7 +56,7 @@ impl JDBCDatabaseConnection for GenericJDBCDatabaseConnection {
     fn jdbc_connection_details(
         &self,
         unique_database_name: &str,
-    ) -> Result<JDBCDatabaseConnectionDetails, crate::crd::database::Error> {
+    ) -> Result<JDBCDatabaseConnectionDetails, crate::databases::Error> {
         let (username_env, password_env) =
             username_and_password_envs(unique_database_name, &self.credentials_secret);