diff --git a/server/Cargo.lock b/server/Cargo.lock index bf7ed8532..8aefcf870 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1228,21 +1228,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1805,22 +1790,6 @@ dependencies = [ "webpki-roots 0.26.3", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.5" @@ -2387,23 +2356,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "navigatum-main-api" version = "1.0.0" @@ -2438,7 +2390,7 @@ dependencies = [ "sqlx", "structured-logger", "tempfile", - "testcontainers 0.19.0", + "testcontainers", "testcontainers-modules", "time", "tokio", @@ -2668,50 +2620,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -3323,13 +3237,11 @@ dependencies = [ "http-body-util", "hyper 1.3.1", "hyper-rustls 0.27.2", - "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -3343,7 +3255,6 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", "tower-service", @@ -4389,34 +4300,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "testcontainers" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c9b71635ab25d4f789a86678d114a4f390467c8b93fd7feeaf7c443732a511" -dependencies = [ - "async-trait", - "bollard", - "bollard-stubs", - "bytes", - "dirs", - "docker_credential", - "either", - "futures", - "log", - "memchr", - "parse-display", - "reqwest 0.12.5", - "serde", - "serde_json", - "serde_with", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "url", -] - [[package]] name = "testcontainers" version = "0.19.0" @@ -4449,11 +4332,11 @@ dependencies = [ [[package]] name = "testcontainers-modules" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322fe829905e734f38a73be07e200a25713fe4baa65074277af7b30dbc4ea487" +checksum = "62fd1d073aa411d7a902969516261bebd71c5218098713fbd5aea7f4f72a45f1" dependencies = [ - "testcontainers 0.18.0", + "testcontainers", ] [[package]] @@ -4563,16 +4446,6 @@ dependencies = [ "syn 2.0.68", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" diff --git a/server/main-api/Cargo.toml b/server/main-api/Cargo.toml index 4de32ad06..92b95634f 100644 --- a/server/main-api/Cargo.toml +++ b/server/main-api/Cargo.toml @@ -67,12 +67,12 @@ actix-governor = { version = "0.5.0", features = ["logger"] } tempfile = "3.10.1" base64 = "0.22.1" time = "0.3.36" -testcontainers-modules = { version = "0.6.1", features = ["postgres"] } +testcontainers-modules = { version = "0.7.0", features = ["postgres"] } [dev-dependencies] pretty_assertions = "1.4.0" testcontainers = { version = "0.19.0", features = ["watchdog"] } -testcontainers-modules = {version = "0.6.1",features = ["postgres"] } +testcontainers-modules = {version = "0.7.0",features = ["postgres"] } [features] skip_db_setup = []