Skip to content

Commit c581a5b

Browse files
committed
Better name modules
1 parent 1dc73a1 commit c581a5b

10 files changed

Lines changed: 11 additions & 9 deletions

File tree

crates/stackable-operator/src/crd/database/server/derby.rs renamed to crates/stackable-operator/src/crd/database/databases/derby.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use schemars::JsonSchema;
22
use serde::{Deserialize, Serialize};
33
use snafu::{ResultExt, Snafu};
44

5-
use crate::crd::database::client::jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails};
5+
use crate::crd::database::drivers::jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails};
66

77
#[derive(Debug, Snafu)]
88
pub enum Error {

crates/stackable-operator/src/crd/database/server/mod.rs renamed to crates/stackable-operator/src/crd/database/databases/mod.rs

File renamed without changes.

crates/stackable-operator/src/crd/database/server/postgresql.rs renamed to crates/stackable-operator/src/crd/database/databases/postgresql.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use snafu::{ResultExt, Snafu};
77
use crate::{
88
commons::networking::HostName,
99
crd::database::{
10-
client::{
10+
drivers::{
1111
jdbc::{JDBCDatabaseConnection, JDBCDatabaseConnectionDetails},
1212
sqlalchemy::{SQLAlchemyDatabaseConnection, SQLAlchemyDatabaseConnectionDetails},
1313
},

crates/stackable-operator/src/crd/database/server/redis.rs renamed to crates/stackable-operator/src/crd/database/databases/redis.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
44
use crate::{
55
commons::networking::HostName,
66
crd::database::{
7-
client::celery::{CeleryDatabaseConnection, CeleryDatabaseConnectionDetails},
7+
drivers::celery::{CeleryDatabaseConnection, CeleryDatabaseConnectionDetails},
88
helpers::username_and_password_envs,
99
},
1010
};

crates/stackable-operator/src/crd/database/client/celery.rs renamed to crates/stackable-operator/src/crd/database/drivers/celery.rs

File renamed without changes.

crates/stackable-operator/src/crd/database/client/jdbc.rs renamed to crates/stackable-operator/src/crd/database/drivers/jdbc.rs

File renamed without changes.

crates/stackable-operator/src/crd/database/client/mod.rs renamed to crates/stackable-operator/src/crd/database/drivers/mod.rs

File renamed without changes.

crates/stackable-operator/src/crd/database/client/sqlalchemy.rs renamed to crates/stackable-operator/src/crd/database/drivers/sqlalchemy.rs

File renamed without changes.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
use snafu::Snafu;
22

3-
pub mod client;
3+
pub mod databases;
4+
pub mod drivers;
45
mod helpers;
5-
pub mod server;
66
#[cfg(test)]
77
mod tests;
88

99
#[derive(Debug, Snafu)]
1010
pub enum Error {
1111
#[snafu(context(false), display("postgresql error"))]
12-
Postgresql { source: server::postgresql::Error },
12+
Postgresql {
13+
source: databases::postgresql::Error,
14+
},
1315

1416
#[snafu(context(false), display("derby error"))]
15-
Derby { source: server::derby::Error },
17+
Derby { source: databases::derby::Error },
1618
}
1719

1820
// /// TODO docs

crates/stackable-operator/src/crd/database/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use serde::{Deserialize, Serialize};
66
use crate::{
77
builder::pod::container::ContainerBuilder,
88
crd::database::{
9-
client::{
9+
databases::{postgresql::PostgresqlConnection, redis::RedisConnection},
10+
drivers::{
1011
celery::{CeleryDatabaseConnection, GenericCeleryDatabaseConnection},
1112
jdbc::{GenericJDBCDatabaseConnection, JDBCDatabaseConnection},
1213
},
13-
server::{postgresql::PostgresqlConnection, redis::RedisConnection},
1414
},
1515
};
1616

0 commit comments

Comments
 (0)