Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump testcontainers version to latest #30493

Merged
merged 2 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
testImplementation 'com.jayway.jsonpath:json-path:2.7.0'
testImplementation 'org.mockito:mockito-inline:4.7.0'
testImplementation libs.postgresql
testImplementation libs.platform.testcontainers
testImplementation libs.platform.testcontainers.postgresql
testImplementation libs.testcontainers
testImplementation libs.testcontainers.postgresql
testImplementation libs.jmh.core
testImplementation libs.jmh.annotations
testImplementation 'com.github.docker-java:docker-java:3.2.8'
Expand Down
16 changes: 4 additions & 12 deletions airbyte-db/db-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ plugins {
id 'java-library'
}

// Add a configuration for our migrations tasks defined below to encapsulate their dependencies
configurations {
migrations.extendsFrom implementation
}

configurations.all {
exclude group: 'io.micronaut.flyway'
}
Expand All @@ -22,12 +17,9 @@ dependencies {
implementation project(':airbyte-config-oss:config-models-oss')
implementation libs.flyway.core

migrations libs.platform.testcontainers.postgresql
migrations sourceSets.main.output

// Mark as compile only to avoid leaking transitively to connectors
compileOnly libs.platform.testcontainers.postgresql
compileOnly libs.connectors.testcontainers.mysql
compileOnly libs.testcontainers.postgresql
compileOnly libs.testcontainers.mysql

// These are required because gradle might be using lower version of Jna from other
// library transitive dependency. Can be removed if we can figure out which library is the cause.
Expand All @@ -37,8 +29,8 @@ dependencies {

testImplementation project(':airbyte-test-utils')
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.platform.testcontainers.postgresql
testImplementation libs.connectors.testcontainers.mysql
testImplementation libs.testcontainers.postgresql
testImplementation libs.testcontainers.mysql

// Big Query
implementation('com.google.cloud:google-cloud-bigquery:1.133.1')
Expand Down
4 changes: 2 additions & 2 deletions airbyte-integrations/bases/base-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies {
implementation 'org.bouncycastle:bctls-jdk15on:1.66'

implementation libs.jackson.annotations
implementation libs.connectors.testcontainers
implementation libs.connectors.testcontainers.jdbc
implementation libs.testcontainers
implementation libs.testcontainers.jdbc
implementation libs.bundles.datadog

testImplementation 'commons-lang:commons-lang:2.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.json.Jsons;
import io.airbyte.integrations.util.HostPortResolver;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -63,12 +64,10 @@ public ImmutableMap.Builder<Object, Object> getBasicDbConfigBuider(final JdbcDat

public ImmutableMap.Builder<Object, Object> getBasicDbConfigBuider(final JdbcDatabaseContainer<?> db, final String schemaName) {
return ImmutableMap.builder()
.put("host", Objects.requireNonNull(db.getContainerInfo().getNetworkSettings()
.getNetworks()
.entrySet().stream().findFirst().get().getValue().getIpAddress()))
.put("host", Objects.requireNonNull(HostPortResolver.resolveHost(db)))
.put("username", db.getUsername())
.put("password", db.getPassword())
.put("port", db.getExposedPorts().get(0))
.put("port", HostPortResolver.resolvePort(db))
.put("database", schemaName)
.put("ssl", false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public static ImmutablePair<String, Integer> getInnerContainerAddress(final Cont
* @return a pair of host and port
*/
public static ImmutablePair<String, Integer> getOuterContainerAddress(final Container container) {
return ImmutablePair.of(container.getHost(),
return ImmutablePair.of(
container.getHost(),
container.getFirstMappedPort());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ dependencies {
// https://github.com/aesy/datasize
implementation "io.aesy:datasize:1.0.0"

testImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.postgresql
testImplementation "org.mockito:mockito-inline:4.1.0"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
integrationTestJavaImplementation libs.testcontainers.postgresql
}
6 changes: 3 additions & 3 deletions airbyte-integrations/bases/debezium/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dependencies {
testFixturesImplementation project(':airbyte-integrations:bases:base-java')

testImplementation project(':airbyte-test-utils')
testImplementation libs.connectors.testcontainers.jdbc
testImplementation libs.connectors.testcontainers.mysql
testImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.jdbc
testImplementation libs.testcontainers.mysql
testImplementation libs.testcontainers.postgresql

testFixturesImplementation 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {

// https://mvnrepository.com/artifact/org.assertj/assertj-core
testImplementation "org.assertj:assertj-core:${assertVersion}"
testImplementation libs.connectors.testcontainers.cassandra
testImplementation libs.testcontainers.cassandra
testImplementation project(':airbyte-integrations:bases:standard-destination-test')


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ dependencies {
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
testImplementation libs.connectors.destination.testcontainers.clickhouse
testImplementation libs.testcontainers.clickhouse

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-clickhouse')
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.connectors.destination.testcontainers.clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ dependencies {
implementation 'com.clickhouse:clickhouse-jdbc:0.3.2-patch10:all'

// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
testImplementation libs.connectors.destination.testcontainers.clickhouse
testImplementation libs.testcontainers.clickhouse
testImplementation project(":airbyte-json-validation")

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-clickhouse')
integrationTestJavaImplementation project(':airbyte-connector-test-harnesses:acceptance-test-harness')
// https://mvnrepository.com/artifact/org.testcontainers/clickhouse
integrationTestJavaImplementation libs.connectors.destination.testcontainers.clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
}

tasks.named("airbyteDocker").configure {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ dependencies {

// MIT
// https://www.testcontainers.org/
testImplementation libs.connectors.testcontainers.elasticsearch
integrationTestJavaImplementation libs.connectors.testcontainers.elasticsearch
testImplementation libs.testcontainers.elasticsearch
integrationTestJavaImplementation libs.testcontainers.elasticsearch

integrationTestJavaImplementation project(':airbyte-connector-test-harnesses:acceptance-test-harness')
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ dependencies {

// MIT
// https://www.testcontainers.org/
testImplementation libs.connectors.testcontainers.elasticsearch
integrationTestJavaImplementation libs.connectors.testcontainers.elasticsearch
testImplementation libs.testcontainers.elasticsearch
integrationTestJavaImplementation libs.testcontainers.elasticsearch

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-elasticsearch')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation "org.postgresql:postgresql:42.5.0"
implementation "commons-collections:commons-collections:3.2.2"

testImplementation libs.connectors.testcontainers.postgresql
integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.postgresql
integrationTestJavaImplementation libs.testcontainers.postgresql

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-iceberg')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-kafka')
integrationTestJavaImplementation libs.connectors.testcontainers.kafka
integrationTestJavaImplementation libs.testcontainers.kafka

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mariadb-columnstore')
integrationTestJavaImplementation libs.connectors.testcontainers.mariadb
integrationTestJavaImplementation libs.testcontainers.mariadb
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation project(':airbyte-integrations:connectors:destination-mongodb')
implementation 'org.mongodb:mongodb-driver-sync:4.3.0'

testImplementation libs.connectors.testcontainers.mongodb
testImplementation libs.testcontainers.mongodb

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mongodb-strict-encrypt')
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

implementation 'org.mongodb:mongodb-driver-sync:4.3.0'

testImplementation libs.connectors.testcontainers.mongodb
testImplementation libs.testcontainers.mongodb
testImplementation project(':airbyte-integrations:bases:standard-destination-test')

integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mongodb')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.connectors.testcontainers.mssqlserver
testImplementation libs.testcontainers.mssqlserver

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mssql-strict-encrypt')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre14'

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.connectors.testcontainers.mssqlserver
testImplementation libs.testcontainers.mssqlserver

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mssql')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
integrationTestJavaImplementation libs.connectors.testcontainers.mysql
integrationTestJavaImplementation libs.testcontainers.mysql

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
integrationTestJavaImplementation libs.connectors.testcontainers.mysql
integrationTestJavaImplementation libs.testcontainers.mysql

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
testImplementation project(':airbyte-test-utils')

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.connectors.destination.testcontainers.oracle.xe
testImplementation libs.testcontainers.oracle.xe

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
implementation "com.oracle.database.jdbc:ojdbc8-production:19.7.0.0"

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation libs.connectors.destination.testcontainers.oracle.xe
testImplementation libs.testcontainers.oracle.xe

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-oracle')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
integrationTestJavaImplementation libs.testcontainers.postgresql

integrationTestJavaImplementation project(':airbyte-config-oss:config-models-oss')
integrationTestJavaImplementation project(':airbyte-connector-test-harnesses:acceptance-test-harness')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ dependencies {

testImplementation project(':airbyte-test-utils')

testImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.postgresql

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-postgres')

integrationTestJavaImplementation libs.connectors.testcontainers.postgresql
integrationTestJavaImplementation libs.testcontainers.postgresql

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

implementation 'org.apache.pulsar:pulsar-client:2.8.1'

testImplementation libs.connectors.testcontainers.pulsar
testImplementation libs.testcontainers.pulsar
testImplementation project(':airbyte-integrations:bases:standard-destination-test')

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
// https://mvnrepository.com/artifact/org.assertj/assertj-core
testImplementation "org.assertj:assertj-core:${assertVersion}"
// https://mvnrepository.com/artifact/org.testcontainers/testcontainers
testImplementation libs.connectors.testcontainers
testImplementation libs.testcontainers

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-redis')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// https://mvnrepository.com/artifact/org.assertj/assertj-core
testImplementation "org.assertj:assertj-core:${assertVersion}"
// https://mvnrepository.com/artifact/org.testcontainers/testcontainers
testImplementation libs.connectors.testcontainers.scylla
testImplementation libs.testcontainers.scylla



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ dependencies {
implementation project(':airbyte-integrations:bases:bases-destination-jdbc')

implementation 'mysql:mysql-connector-java:8.0.30'
implementation libs.connectors.testcontainers.tidb
testImplementation libs.testcontainers.tidb

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-tidb')

integrationTestJavaImplementation libs.connectors.testcontainers.tidb
integrationTestJavaImplementation libs.testcontainers.tidb
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
testImplementation project(':airbyte-test-utils')

testImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.postgresql

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
testImplementation project(':airbyte-test-utils')

testImplementation libs.connectors.testcontainers.postgresql
testImplementation libs.testcontainers.postgresql

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies {
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse-strict-encrypt')
integrationTestJavaImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
integrationTestJavaImplementation libs.connectors.source.testcontainers.clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies {
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse')
integrationTestJavaImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
integrationTestJavaImplementation libs.connectors.source.testcontainers.clickhouse
integrationTestJavaImplementation libs.testcontainers.clickhouse
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ dependencies {
implementation project(':airbyte-integrations:connectors:source-jdbc')
implementation project(':airbyte-integrations:connectors:source-relational-db')
implementation project(':airbyte-integrations:connectors:source-cockroachdb')

implementation libs.connectors.testcontainers
implementation libs.connectors.testcontainers.jdbc
implementation libs.connectors.testcontainers.cockroachdb
implementation libs.postgresql

testImplementation libs.testcontainers
testImplementation libs.testcontainers.jdbc
testImplementation libs.testcontainers.cockroachdb

integrationTestJavaImplementation libs.testcontainers
integrationTestJavaImplementation libs.testcontainers.jdbc
integrationTestJavaImplementation libs.testcontainers.cockroachdb
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-cockroachdb')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-cockroachdb-strict-encrypt')
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
Expand Down
Loading