Skip to content

Commit

Permalink
chore: Prefer testcontainers_modules re-exports
Browse files Browse the repository at this point in the history
`testcontainers_modules` wraps around `testcontainers`. When our version conflicts with its version, issues arise. For this reason, prefer its own, re-exported version of `testcontainers`.
  • Loading branch information
spotlightishere committed Aug 31, 2024
1 parent 164e5b6 commit b48b113
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repository.workspace = true
authors.workspace = true

[features]
testkit = ["dep:charted-testkit", "dep:testcontainers"]
testkit = ["dep:charted-testkit", "dep:testcontainers-modules"]
default = ["testkit"]
merge = ["azalia/config"]

Expand All @@ -40,8 +40,9 @@ rand = "0.8.5"
serde.workspace = true
serde_json.workspace = true
utoipa.workspace = true
testcontainers = { workspace = true, optional = true }
testcontainers-modules = { workspace = true, features = ["postgres"] }
testcontainers-modules = { workspace = true, optional = true, features = [
"postgres",
] }

[build-dependencies]
chrono.workspace = true
Expand Down
6 changes: 4 additions & 2 deletions crates/core/src/testkit/containers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use testcontainers::{runners::AsyncRunner, ContainerAsync, ImageExt};
use testcontainers_modules::postgres::Postgres;
use testcontainers_modules::{
postgres::Postgres,
testcontainers::{runners::AsyncRunner, ContainerAsync, ImageExt},
};

// renovate: datasource=docker rev=library/postgres
const TAG: &str = "16.2";
Expand Down

0 comments on commit b48b113

Please sign in to comment.