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

13532 Fixed integration tests destination-mssql Mac OS #14252

Merged
merged 3 commits into from
Jun 30, 2022
Merged

13532 Fixed integration tests destination-mssql Mac OS #14252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cd8051
13532 Fixed integration tests destination-mssql Mac OS
suhomud Jun 29, 2022
c1cea07
13523 Clean up
suhomud Jun 29, 2022
2eb6788
13523 Modified db configuration
suhomud Jun 30, 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
5 changes: 3 additions & 2 deletions ...ration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.airbyte.integrations.destination.ExtendedNameTransformer;
import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import io.airbyte.integrations.util.HostPortResolver;
import io.airbyte.test.utils.DatabaseConnectionHelper;
import java.sql.SQLException;
import java.util.List;
Expand Down Expand Up @@ -49,8 +50,8 @@ protected boolean supportsNormalization() {

private JsonNode getConfig(final MSSQLServerContainer<?> db) {
return Jsons.jsonNode(ImmutableMap.builder()
.put("host", db.getHost())
.put("port", db.getFirstMappedPort())
.put("host", HostPortResolver.resolveHost(db))
.put("port", HostPortResolver.resolvePort(db))
.put("username", db.getUsername())
.put("password", db.getPassword())
.put("schema", "test_schema")
Expand Down
5 changes: 3 additions & 2 deletions ...ion/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.airbyte.integrations.base.JavaBaseConstants;
import io.airbyte.integrations.destination.ExtendedNameTransformer;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.util.HostPortResolver;
import io.airbyte.test.utils.DatabaseConnectionHelper;
import java.sql.SQLException;
import java.util.ArrayList;
Expand Down Expand Up @@ -54,8 +55,8 @@ protected boolean supportsNormalization() {
private JsonNode getConfig(final MSSQLServerContainer<?> db) {

return Jsons.jsonNode(ImmutableMap.builder()
.put("host", db.getHost())
.put("port", db.getFirstMappedPort())
.put("host", HostPortResolver.resolveHost(db))
.put("port", HostPortResolver.resolvePort(db))
.put("username", db.getUsername())
.put("password", db.getPassword())
.put("schema", "test_schema")
Expand Down
21 changes: 2 additions & 19 deletions ...ion/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.functional.CheckedFunction;
import io.airbyte.commons.json.Jsons;
import io.airbyte.db.Database;
Expand All @@ -20,11 +19,9 @@
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.commons.lang3.RandomStringUtils;
import org.jooq.DSLContext;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.Network;

Expand All @@ -51,7 +48,7 @@ protected String getImageName() {

@Override
protected JsonNode getConfig() throws Exception {
return bastion.getTunnelConfig(getTunnelMethod(), getMSSQLDbConfigBuilder(db));
return bastion.getTunnelConfig(getTunnelMethod(), bastion.getBasicDbConfigBuider(db, database).put("schema", schemaName));
}

@Override
Expand Down Expand Up @@ -108,20 +105,6 @@ protected List<String> resolveIdentifier(final String identifier) {
return result;
}

public ImmutableMap.Builder<Object, Object> getMSSQLDbConfigBuilder(final JdbcDatabaseContainer<?> db) {
return ImmutableMap.builder()
.put("host", Objects.requireNonNull(db.getContainerInfo().getNetworkSettings()
.getNetworks()
.get(((Network.NetworkImpl) network).getName())
.getIpAddress()))
.put("username", db.getUsername())
.put("password", db.getPassword())
.put("port", db.getExposedPorts().get(0))
.put("database", database)
.put("schema", schemaName)
.put("ssl", false);
}

private static Database getDatabaseFromConfig(final JsonNode config) {
final DSLContext dslContext = DSLContextFactory.create(
config.get("username").asText(),
Expand Down Expand Up @@ -179,7 +162,7 @@ private void startTestContainers() {
}

private void initAndStartJdbcContainer() {
db = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04")
db = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2019-CU16-ubuntu-20.04")
.withNetwork(network)
.acceptLicense();
db.start();
Expand Down