diff --git a/Cargo.lock b/Cargo.lock index ce6d2df..ed085ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2354,9 +2354,11 @@ dependencies = [ "gb-core", "gb-messaging", "gb-monitoring", + "redis 0.23.3", "rstest", "serde", "serde_json", + "sqlx", "tokio", "tokio-stream", "tokio-test", @@ -2383,7 +2385,7 @@ dependencies = [ "oauth2", "openid", "rand 0.8.5", - "redis", + "redis 0.24.0", "ring 0.17.8", "rstest", "serde", @@ -2432,7 +2434,7 @@ dependencies = [ "axum 0.7.9", "chrono", "mockall", - "redis", + "redis 0.24.0", "rstest", "serde", "serde_json", @@ -2496,7 +2498,7 @@ dependencies = [ "gb-core", "lapin", "rdkafka", - "redis", + "redis 0.24.0", "rstest", "serde", "serde_json", @@ -2548,7 +2550,7 @@ dependencies = [ "chrono", "gb-core", "mockall", - "redis", + "redis 0.24.0", "rstest", "serde", "serde_json", @@ -2582,7 +2584,7 @@ dependencies = [ "predicates", "prometheus", "rand 0.8.5", - "redis", + "redis 0.24.0", "reqwest 0.11.27", "rstest", "serde", @@ -5418,6 +5420,27 @@ dependencies = [ "futures-io", ] +[[package]] +name = "redis" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" +dependencies = [ + "async-trait", + "bytes", + "combine", + "futures-util", + "itoa", + "percent-encoding", + "pin-project-lite", + "ryu", + "sha1_smol", + "socket2 0.4.10", + "tokio", + "tokio-util", + "url", +] + [[package]] name = "redis" version = "0.24.0" @@ -6435,6 +6458,8 @@ dependencies = [ "once_cell", "paste", "percent-encoding", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -6447,6 +6472,7 @@ dependencies = [ "tracing", "url", "uuid", + "webpki-roots 0.25.4", ] [[package]] diff --git a/gb-api/Cargo.toml b/gb-api/Cargo.toml index 9c2c608..fde0c38 100644 --- a/gb-api/Cargo.toml +++ b/gb-api/Cargo.toml @@ -22,6 +22,8 @@ async-trait= { workspace = true } futures-util = { version = "0.3", features = ["sink"] } chrono = { workspace = true, features = ["serde"] } tokio-stream = "0.1.17" +sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "chrono", "uuid"] } +redis = { version = "0.23", features = ["tokio-comp"] } [dev-dependencies] rstest= { workspace = true } diff --git a/lib.rs b/lib.rs deleted file mode 100644 index 34262da..0000000 --- a/lib.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod error; -pub mod handlers; -pub mod models; -pub mod services; // Make services public -pub mod middleware; - -pub use error::AuthError; -pub use handlers::*; -pub use models::*; -pub use services::AuthService; // This re-export is good -pub use middleware::*; diff --git a/postgres.rs b/postgres.rs deleted file mode 100644 index e69de29..0000000 diff --git a/processor.rs b/processor.rs deleted file mode 100644 index e69de29..0000000