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.

Sign up for GitHub

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

Jump to bottom

13539 Fix integration tests source-clickhouse Mac OS #14701

Merged
merged 18 commits into from
Jul 26, 2022
Merged

13539 Fix integration tests source-clickhouse Mac OS #14701

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4790588
13539 Fix integration tests source-clickhouse Mac OS
suhomud Jul 14, 2022
3f366c4
13539 Updated clickhouse jdbc driver
suhomud Jul 20, 2022
7aa4b76
Merge branch 'master' into suhomud/13539_fix_integration_tests_source…
suhomud Jul 20, 2022
860a68f
13539 Bump up the versions
suhomud Jul 20, 2022
4a0b97a
13539 Fixed merge conflicts
suhomud Jul 20, 2022
9c121f9
13539 Updated destination-clickhouse-strict-encrypt
suhomud Jul 21, 2022
105c4fc
13539 Updated SSL configuration and tests for clickhouse-destination
suhomud Jul 22, 2022
484a882
13539 Updated SSL for source-clickhouse-strict-encrypt
suhomud Jul 22, 2022
421bcd2
Merge branch 'master' into suhomud/13539_fix_integration_tests_source…
suhomud Jul 22, 2022
e7ef45d
13539 Clean up
suhomud Jul 22, 2022
88d7c6e
13539 Fixed failed tests
suhomud Jul 22, 2022
ad1a677
13539 Resolved host by ip
suhomud Jul 22, 2022
72d3540
Merge branch 'master' into suhomud/13539_fix_integration_tests_source…
suhomud Jul 25, 2022
630d8ae
13539 Fixed code formatting
suhomud Jul 25, 2022
d79ccfd
13539 Bump up source-clickhouse-strict-encrypt version
suhomud Jul 26, 2022
a2be5db
13539 Bump up source-clickhouse-strict-encrypt version
suhomud Jul 26, 2022
b39df16
auto-bump connector version [ci skip]
octavia-squidington-iii Jul 26, 2022
b10fe39
auto-bump connector version [ci skip]
octavia-squidington-iii Jul 26, 2022
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
2 changes: 1 addition & 1 deletion ...tions/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private void startTestContainers() {
}

private void initAndStartJdbcContainer() {
db = (ClickHouseContainer) new ClickHouseContainer("yandex/clickhouse-server:21.8.8.29-alpine").withNetwork(network);
db = (ClickHouseContainer) new ClickHouseContainer("clickhouse/clickhouse-server:22.5").withNetwork(network);
db.start();
}

Expand Down
5 changes: 3 additions & 2 deletions ...integrations/io/airbyte/integration_tests/sources/ClickHouseJdbcSourceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.airbyte.integrations.source.clickhouse.ClickHouseSource;
import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
import io.airbyte.integrations.source.jdbc.test.JdbcSourceAcceptanceTest;
import io.airbyte.integrations.util.HostPortResolver;
import java.sql.JDBCType;
import java.sql.SQLException;
import java.util.List;
Expand Down Expand Up @@ -81,8 +82,8 @@ public void setup() throws Exception {
db.start();

config = Jsons.jsonNode(ImmutableMap.builder()
.put("host", db.getHost())
.put("port", db.getFirstMappedPort())
.put("host", HostPortResolver.resolveHost(db))
.put("port", HostPortResolver.resolvePort(db))
.put("database", SCHEMA_NAME)
.put("username", db.getUsername())
.put("password", db.getPassword())
Expand Down
7 changes: 4 additions & 3 deletions ...o/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseJdbcStressTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.airbyte.integrations.source.clickhouse.ClickHouseSource;
import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
import io.airbyte.integrations.source.jdbc.test.JdbcStressTest;
import io.airbyte.integrations.util.HostPortResolver;
import java.sql.JDBCType;
import java.util.Optional;
import org.junit.jupiter.api.AfterEach;
Expand All @@ -32,12 +33,12 @@ public Optional<String> getDefaultSchemaName() {
@Override
@BeforeEach
public void setup() throws Exception {
db = new ClickHouseContainer("yandex/clickhouse-server:21.8.8.29-alpine");
db = new ClickHouseContainer("clickhouse/clickhouse-server:22.5");
db.start();

config = Jsons.jsonNode(ImmutableMap.builder()
.put("host", db.getHost())
.put("port", db.getFirstMappedPort())
.put("host", HostPortResolver.resolveHost(db))
.put("port", HostPortResolver.resolvePort(db))
.put("database", SCHEMA_NAME)
.put("username", db.getUsername())
.put("password", db.getPassword())
Expand Down
2 changes: 1 addition & 1 deletion ...yte/integrations/io/airbyte/integration_tests/sources/ClickHouseSourceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected JsonNode getState() {

@Override
protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
db = new ClickHouseContainer("yandex/clickhouse-server:21.8.8.29-alpine");
db = new ClickHouseContainer("clickhouse/clickhouse-server:22.5");
db.start();

config = Jsons.jsonNode(ImmutableMap.builder()
Expand Down
5 changes: 3 additions & 2 deletions ...egrations/io/airbyte/integration_tests/sources/SslClickHouseJdbcSourceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import io.airbyte.integrations.source.clickhouse.ClickHouseSource;
import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
import io.airbyte.integrations.source.jdbc.test.JdbcSourceAcceptanceTest;
import io.airbyte.integrations.util.HostPortResolver;
import java.sql.JDBCType;
import java.util.List;
import javax.sql.DataSource;
Expand Down Expand Up @@ -68,8 +69,8 @@ static void init() {
@BeforeEach
public void setup() throws Exception {
final JsonNode configWithoutDbName = Jsons.jsonNode(ImmutableMap.builder()
.put("host", container.getHost())
.put("port", container.getFirstMappedPort())
.put("host", HostPortResolver.resolveHost(container))
.put("port", HostPortResolver.resolvePort(container))
.put("username", "default")
.put("password", "")
.build());
Expand Down
2 changes: 1 addition & 1 deletion deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ connectors-testcontainers-scylla = "1.16.2"
connectors-testcontainers-tidb = "1.16.3"
connectors-destination-testcontainers-clickhouse = "1.17.3"
connectors-destination-testcontainers-oracle-xe = "1.16.0"
connectors-source-testcontainers-clickhouse = "1.16.0"
connectors-source-testcontainers-clickhouse = "1.17.3"
platform-testcontainers = "1.17.1"

[libraries]
Expand Down