diff --git a/airbyte-integrations/bases/s3-destination-base-integration-test/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationAcceptanceTest.java b/airbyte-integrations/bases/s3-destination-base-integration-test/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationAcceptanceTest.java index 869a539e9624a..dff0ff84bb104 100644 --- a/airbyte-integrations/bases/s3-destination-base-integration-test/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationAcceptanceTest.java +++ b/airbyte-integrations/bases/s3-destination-base-integration-test/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationAcceptanceTest.java @@ -22,6 +22,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.nio.file.Path; import java.util.Comparator; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -125,7 +126,7 @@ protected List getAllSyncedObjects(final String streamName, fin *
  • Construct the S3 client.
    • */ @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = getBaseConfigJson(); // Set a random s3 bucket path for each integration test final JsonNode configJson = Jsons.clone(baseConfigJson); @@ -149,7 +150,7 @@ protected void setup(final TestDestinationEnv testEnv) { * Remove all the S3 output from the tests. */ @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final List keysToDelete = new LinkedList<>(); final List objects = s3Client .listObjects(config.getBucketName(), config.getBucketPath()) diff --git a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java index f48ed6e1c8025..ad6b53708f1a2 100644 --- a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java +++ b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java @@ -100,6 +100,8 @@ public abstract class DestinationAcceptanceTest { + private static final HashSet TEST_SCHEMAS = new HashSet<>(); + private static final Random RANDOM = new Random(); private static final String NORMALIZATION_VERSION = "dev"; @@ -210,7 +212,9 @@ protected String getDefaultSchema(final JsonNode config) throws Exception { if (config.get("schema") == null) { return null; } - return config.get("schema").asText(); + final String schema = config.get("schema").asText(); + TEST_SCHEMAS.add(schema); + return schema; } /** @@ -319,9 +323,10 @@ protected List retrieveNormalizedRecords(final TestDestinationEnv test * postgres database. This function will be called before EACH test. * * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. */ - protected abstract void setup(TestDestinationEnv testEnv) throws Exception; + protected abstract void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception; /** * Function that performs any clean up of external resources required for the test. e.g. delete a @@ -329,9 +334,10 @@ protected List retrieveNormalizedRecords(final TestDestinationEnv test * destination so that there is no contamination across tests. * * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. */ - protected abstract void tearDown(TestDestinationEnv testEnv) throws Exception; + protected abstract void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception; /** * @deprecated This method is moved to the AdvancedTestDataComparator. Please move your destination @@ -354,7 +360,7 @@ void setUpInternal() throws Exception { testEnv = new TestDestinationEnv(localRoot); mConnectorConfigUpdater = Mockito.mock(ConnectorConfigUpdater.class); - setup(testEnv); + setup(testEnv, TEST_SCHEMAS); processFactory = new DockerProcessFactory( workspaceRoot, @@ -366,7 +372,7 @@ void setUpInternal() throws Exception { @AfterEach void tearDownInternal() throws Exception { - tearDown(testEnv); + tearDown(testEnv, TEST_SCHEMAS); } /** @@ -981,6 +987,7 @@ void testSyncUsesAirbyteStreamNamespaceIfNotNull() throws Exception { // A randomized namespace is required otherwise you can generate a "false success" with data from a // previous run. final String namespace = Strings.addRandomSuffix("airbyte_source_namespace", "_", 8); + TEST_SCHEMAS.add(namespace); catalog.getStreams().forEach(stream -> stream.setNamespace(namespace)); final ConfiguredAirbyteCatalog configuredCatalog = CatalogHelpers.toDefaultConfiguredCatalog( @@ -1014,10 +1021,12 @@ void testSyncWriteSameTableNameDifferentNamespace() throws Exception { MoreResources.readResource(DataArgumentsProvider.EXCHANGE_RATE_CONFIG.getCatalogFileVersion(getProtocolVersion())), AirbyteCatalog.class); final var namespace1 = Strings.addRandomSuffix("sourcenamespace", "_", 8); + TEST_SCHEMAS.add(namespace1); catalog.getStreams().forEach(stream -> stream.setNamespace(namespace1)); final var diffNamespaceStreams = new ArrayList(); - final var namespace2 = Strings.addRandomSuffix("diff_sourcenamespace", "_", 8);; + final var namespace2 = Strings.addRandomSuffix("diff_sourcenamespace", "_", 8); + TEST_SCHEMAS.add(namespace2); final var mapper = MoreMappers.initMapper(); for (final AirbyteStream stream : catalog.getStreams()) { final var clonedStream = mapper.readValue(mapper.writeValueAsString(stream), diff --git a/airbyte-integrations/connectors/destination-azure-blob-storage/src/test-integration/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-azure-blob-storage/src/test-integration/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageDestinationAcceptanceTest.java index 51fa2db7ca28b..60ca9e55d3217 100644 --- a/airbyte-integrations/connectors/destination-azure-blob-storage/src/test-integration/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-azure-blob-storage/src/test-integration/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageDestinationAcceptanceTest.java @@ -21,6 +21,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.nio.file.Path; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -125,7 +126,7 @@ protected boolean supportObjectDataTypeTest() { *
  • Construct the Azure Blob client.
    • */ @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = getBaseConfigJson(); configJson = Jsons.jsonNode(ImmutableMap.builder() @@ -159,7 +160,7 @@ protected void setup(final TestDestinationEnv testEnv) { * Remove all the Container output from the tests. */ @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final BlobServiceClient storageClient = new BlobServiceClientBuilder() .endpoint(azureBlobStorageDestinationConfig.getEndpointUrl()) diff --git a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationAcceptanceTest.java index e10dcadce4b12..0e87f8761fe7b 100644 --- a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationAcceptanceTest.java @@ -45,6 +45,7 @@ import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog; import java.io.IOException; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.TimeZone; @@ -203,14 +204,14 @@ protected JsonNode createConfig() throws IOException { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { config = createConfig(); bigquery = configureBigQuery(config); dataset = getBigQueryDataSet(config, bigquery); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { tearDownBigQuery(dataset, bigquery); } diff --git a/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryGcsDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryGcsDestinationAcceptanceTest.java index ca29799fd3cba..d80a80fbffbdb 100644 --- a/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryGcsDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryGcsDestinationAcceptanceTest.java @@ -16,6 +16,7 @@ import io.airbyte.integrations.destination.record_buffer.FileBuffer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.nio.file.Path; +import java.util.HashSet; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.slf4j.Logger; @@ -28,15 +29,15 @@ public class BigQueryGcsDestinationAcceptanceTest extends AbstractBigQueryDestin private static final Logger LOGGER = LoggerFactory.getLogger(BigQueryGcsDestinationAcceptanceTest.class); /** - * Sets up secretsFile path as well as BigQuery and GCS instances for verification and cleanup This - * function will be called before EACH test. + * Sets up secretsFile path as well as BigQuery and GCS instances for verification and cleanup This function will be called before EACH test. * - * @see DestinationAcceptanceTest#setUpInternal() - * @param testEnv - information about the test environment. + * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. + * @see DestinationAcceptanceTest#setUpInternal() */ @Override - protected void setup(TestDestinationEnv testEnv) throws Exception { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { // use secrets file with GCS staging config secretsFile = Path.of("secrets/credentials-gcs-staging.json"); setUpBigQuery(); @@ -52,12 +53,13 @@ protected void setup(TestDestinationEnv testEnv) throws Exception { /** * Removes data from bigquery and GCS This function will be called after EACH test * - * @see DestinationAcceptanceTest#tearDownInternal() - * @param testEnv - information about the test environment. + * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. + * @see DestinationAcceptanceTest#tearDownInternal() */ @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { tearDownBigQuery(); tearDownGcs(); } diff --git a/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryStandardDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryStandardDestinationAcceptanceTest.java index b7d1197df0896..b5767feea3152 100644 --- a/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryStandardDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-bigquery/src/test-integration/java/io/airbyte/integrations/destination/bigquery/BigQueryStandardDestinationAcceptanceTest.java @@ -8,6 +8,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.nio.file.Path; +import java.util.HashSet; import org.junit.jupiter.api.TestInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,15 +19,15 @@ public class BigQueryStandardDestinationAcceptanceTest extends AbstractBigQueryD private static final Logger LOGGER = LoggerFactory.getLogger(BigQueryStandardDestinationAcceptanceTest.class); /** - * Sets up secretsFile path and BigQuery instance for verification and cleanup This function will be - * called before EACH test. + * Sets up secretsFile path and BigQuery instance for verification and cleanup This function will be called before EACH test. * - * @see DestinationAcceptanceTest#setUpInternal() - * @param testEnv - information about the test environment. + * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. + * @see DestinationAcceptanceTest#setUpInternal() */ @Override - protected void setup(TestDestinationEnv testEnv) throws Exception { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { secretsFile = Path.of("secrets/credentials-standard.json"); setUpBigQuery(); } @@ -34,12 +35,13 @@ protected void setup(TestDestinationEnv testEnv) throws Exception { /** * Removes data from bigquery This function will be called after EACH test * - * @see DestinationAcceptanceTest#tearDownInternal() - * @param testEnv - information about the test environment. + * @param testEnv - information about the test environment. + * @param TEST_SCHEMAS * @throws Exception - can throw any exception, test framework will handle. + * @see DestinationAcceptanceTest#tearDownInternal() */ @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { tearDownBigQuery(); } diff --git a/airbyte-integrations/connectors/destination-cassandra/src/test-integration/java/io/airbyte/integrations/destination/cassandra/CassandraDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-cassandra/src/test-integration/java/io/airbyte/integrations/destination/cassandra/CassandraDestinationAcceptanceTest.java index 6a022e2337ca9..c32f3fc6288b5 100644 --- a/airbyte-integrations/connectors/destination-cassandra/src/test-integration/java/io/airbyte/integrations/destination/cassandra/CassandraDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-cassandra/src/test-integration/java/io/airbyte/integrations/destination/cassandra/CassandraDestinationAcceptanceTest.java @@ -9,6 +9,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.util.HostPortResolver; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; @@ -29,7 +30,7 @@ static void initContainer() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { configJson = TestDataFactory.createJsonConfig( cassandraContainer.getUsername(), cassandraContainer.getPassword(), @@ -41,7 +42,7 @@ protected void setup(TestDestinationEnv testEnv) { } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { cassandraCqlProvider.retrieveMetadata().forEach(meta -> { var keyspace = meta.value1(); meta.value2().forEach(table -> cassandraCqlProvider.truncate(keyspace, table)); diff --git a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java index 6bd26cacdba14..717da5dd99a56 100644 --- a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java @@ -24,6 +24,7 @@ import java.sql.SQLException; import java.time.Duration; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.params.ParameterizedTest; @@ -164,7 +165,7 @@ protected List resolveIdentifier(final String identifier) { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new GenericContainer<>(new ImageFromDockerfile("clickhouse-test") .withFileFromClasspath("Dockerfile", "docker/Dockerfile") .withFileFromClasspath("clickhouse_certs.sh", "docker/clickhouse_certs.sh")) @@ -184,7 +185,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java index 3fa1f7e365c6a..f38dfb38b996c 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java @@ -23,6 +23,7 @@ import io.airbyte.integrations.util.HostPortResolver; import java.sql.SQLException; import java.time.Duration; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.params.ParameterizedTest; @@ -137,7 +138,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new ClickHouseContainer("clickhouse/clickhouse-server:22.5") .waitingFor(Wait.forHttp("/ping").forPort(8123) .forStatusCode(200).withStartupTimeout(Duration.of(60, SECONDS))); @@ -145,7 +146,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java index 57651ea3a412d..e892e4b5cbaa8 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java @@ -20,6 +20,7 @@ import io.airbyte.integrations.standardtest.destination.argproviders.DataTypeTestArgumentProvider; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.params.ParameterizedTest; @@ -154,14 +155,14 @@ private static JdbcDatabase getDatabase(final JsonNode config) { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { bastion.initAndStartBastion(network); db = (ClickHouseContainer) new ClickHouseContainer("clickhouse/clickhouse-server:22.5").withNetwork(network); db.start(); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { bastion.stopAndCloseContainers(db); } diff --git a/airbyte-integrations/connectors/destination-csv/src/test-integration/java/io/airbyte/integrations/destination/csv/CsvDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-csv/src/test-integration/java/io/airbyte/integrations/destination/csv/CsvDestinationAcceptanceTest.java index 614d8dcc8d905..d2b6d402f3fdb 100644 --- a/airbyte-integrations/connectors/destination-csv/src/test-integration/java/io/airbyte/integrations/destination/csv/CsvDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-csv/src/test-integration/java/io/airbyte/integrations/destination/csv/CsvDestinationAcceptanceTest.java @@ -24,6 +24,7 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -118,12 +119,12 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // no op } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // no op } diff --git a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksAzureBlobStorageDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksAzureBlobStorageDestinationAcceptanceTest.java index eaf0376e11fc9..2d02d79619b20 100644 --- a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksAzureBlobStorageDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksAzureBlobStorageDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.destination.jdbc.copy.azure.AzureBlobStorageConfig; import java.nio.file.Path; import java.sql.SQLException; +import java.util.HashSet; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Disabled; import org.slf4j.Logger; @@ -45,7 +46,7 @@ protected JsonNode getFailCheckConfig() { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = Jsons.deserialize(IOs.readFile(Path.of(SECRETS_CONFIG_JSON))); // Set a random Azure path and database schema for each integration test @@ -69,7 +70,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { final BlobServiceClient storageClient = new BlobServiceClientBuilder() .endpoint(azureBlobStorageConfig.getEndpointUrl()) .sasToken(azureBlobStorageConfig.getSasToken()) @@ -83,7 +84,7 @@ protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { blobContainerClient.delete(); } - super.tearDown(testEnv); + super.tearDown(testEnv, TEST_SCHEMAS); } } diff --git a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksDestinationAcceptanceTest.java index d8df20e1e1163..10ace3a10b054 100644 --- a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.destination.s3.util.AvroRecordHelper; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -67,7 +68,7 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { DatabricksUtilTest.cleanUpData(databricksConfig); } diff --git a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksManagedTablesDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksManagedTablesDestinationAcceptanceTest.java index 8f65c74af7f9e..2fecf0bef9d82 100644 --- a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksManagedTablesDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksManagedTablesDestinationAcceptanceTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -80,13 +81,13 @@ protected JsonNode getFailCheckConfig() throws Exception { } @Override - protected void setup(TestDestinationEnv testEnv) throws Exception { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { this.configJson = Jsons.deserialize(IOs.readFile(Path.of(SECRETS_CONFIG_JSON))); this.databricksConfig = DatabricksDestinationConfig.get(configJson); } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { DatabricksUtilTest.cleanUpData(databricksConfig); } diff --git a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksS3DestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksS3DestinationAcceptanceTest.java index 64030483a82d2..dc64661c39eb7 100644 --- a/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksS3DestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksS3DestinationAcceptanceTest.java @@ -21,6 +21,7 @@ import io.airbyte.integrations.destination.s3.S3DestinationConfig; import java.nio.file.Path; import java.sql.SQLException; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.RandomStringUtils; @@ -46,7 +47,7 @@ protected JsonNode getFailCheckConfig() { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = Jsons.deserialize(IOs.readFile(Path.of(SECRETS_CONFIG_JSON))); // Set a random s3 bucket path and database schema for each integration test @@ -63,7 +64,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { // clean up s3 final List keysToDelete = new LinkedList<>(); final List objects = s3Client @@ -82,7 +83,7 @@ protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { } s3Client.shutdown(); - super.tearDown(testEnv); + super.tearDown(testEnv, TEST_SCHEMAS); } } diff --git a/airbyte-integrations/connectors/destination-dev-null/src/test-integration/java/io/airbyte/integrations/destination/dev_null/DevNullDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-dev-null/src/test-integration/java/io/airbyte/integrations/destination/dev_null/DevNullDestinationAcceptanceTest.java index af0e1c419d750..80f981167ef76 100644 --- a/airbyte-integrations/connectors/destination-dev-null/src/test-integration/java/io/airbyte/integrations/destination/dev_null/DevNullDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-dev-null/src/test-integration/java/io/airbyte/integrations/destination/dev_null/DevNullDestinationAcceptanceTest.java @@ -12,6 +12,7 @@ import io.airbyte.protocol.models.v0.AirbyteMessage; import io.airbyte.protocol.models.v0.AirbyteRecordMessage; import java.util.Collections; +import java.util.HashSet; import java.util.List; public class DevNullDestinationAcceptanceTest extends DestinationAcceptanceTest { @@ -41,12 +42,12 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // do nothing } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // do nothing } diff --git a/airbyte-integrations/connectors/destination-doris/src/test-integration/java/io/airbyte/integrations/destination/doris/DorisDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-doris/src/test-integration/java/io/airbyte/integrations/destination/doris/DorisDestinationAcceptanceTest.java index b8189986d3e63..1088b3aebbe95 100644 --- a/airbyte-integrations/connectors/destination-doris/src/test-integration/java/io/airbyte/integrations/destination/doris/DorisDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-doris/src/test-integration/java/io/airbyte/integrations/destination/doris/DorisDestinationAcceptanceTest.java @@ -15,6 +15,7 @@ import java.nio.file.Paths; import java.sql.*; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import org.apache.commons.lang3.StringEscapeUtils; import org.junit.jupiter.api.AfterAll; @@ -107,12 +108,12 @@ protected List retrieveRecords(TestDestinationEnv testEnv, } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any setup actions needed before every test case } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any cleanup actions needed after every test case } diff --git a/airbyte-integrations/connectors/destination-dynamodb/src/test-integration/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-dynamodb/src/test-integration/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationAcceptanceTest.java index 434b6083a05ab..23efba4b35287 100644 --- a/airbyte-integrations/connectors/destination-dynamodb/src/test-integration/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-dynamodb/src/test-integration/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationAcceptanceTest.java @@ -105,7 +105,7 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = getBaseConfigJson(); // Set a random s3 bucket path for each integration test final JsonNode configJson = Jsons.clone(baseConfigJson); @@ -139,7 +139,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final var dynamodb = new DynamoDB(this.client); final List tables = new ArrayList(); dynamodb.listTables().forEach(o -> { diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/test-integration/java/io/airbyte/integrations/destination/e2e_test/TestingSilentDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-e2e-test/src/test-integration/java/io/airbyte/integrations/destination/e2e_test/TestingSilentDestinationAcceptanceTest.java index 3acb7b50cbc82..5b2d5996b7bb9 100644 --- a/airbyte-integrations/connectors/destination-e2e-test/src/test-integration/java/io/airbyte/integrations/destination/e2e_test/TestingSilentDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-e2e-test/src/test-integration/java/io/airbyte/integrations/destination/e2e_test/TestingSilentDestinationAcceptanceTest.java @@ -13,6 +13,7 @@ import io.airbyte.protocol.models.v0.AirbyteMessage; import io.airbyte.protocol.models.v0.AirbyteRecordMessage; import java.util.Collections; +import java.util.HashSet; import java.util.List; public class TestingSilentDestinationAcceptanceTest extends DestinationAcceptanceTest { @@ -42,12 +43,12 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // do nothing } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // do nothing } diff --git a/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchStrictEncryptDestinationAcceptanceTest.java index a88a908b9b381..28889246bf13b 100644 --- a/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-elasticsearch-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchStrictEncryptDestinationAcceptanceTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.HashSet; import java.util.List; import java.util.Map; import org.junit.jupiter.api.AfterAll; @@ -134,10 +135,10 @@ protected List retrieveRecords(final DestinationAcceptanceTest.TestDes } @Override - protected void setup(final DestinationAcceptanceTest.TestDestinationEnv testEnv) {} + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override - protected void tearDown(final DestinationAcceptanceTest.TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final ElasticsearchConnection connection = new ElasticsearchConnection(mapper.convertValue(getConfig(), ConnectorConfiguration.class)); connection.allIndices().forEach(connection::deleteIndexIfPresent); } diff --git a/airbyte-integrations/connectors/destination-elasticsearch/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-elasticsearch/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchDestinationAcceptanceTest.java index 253db3d2761a6..67102829ad3bd 100644 --- a/airbyte-integrations/connectors/destination-elasticsearch/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-elasticsearch/src/test-integration/java/io/airbyte/integrations/destination/elasticsearch/ElasticsearchDestinationAcceptanceTest.java @@ -10,6 +10,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.time.Duration; +import java.util.HashSet; import java.util.List; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -114,10 +115,10 @@ protected List retrieveRecords(TestDestinationEnv testEnv, } @Override - protected void setup(TestDestinationEnv testEnv) throws Exception {} + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception {} @Override - protected void tearDown(TestDestinationEnv testEnv) throws Exception { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { ElasticsearchConnection connection = new ElasticsearchConnection(mapper.convertValue(getConfig(), ConnectorConfiguration.class)); connection.allIndices().forEach(connection::deleteIndexIfPresent); connection.close(); diff --git a/airbyte-integrations/connectors/destination-exasol/src/test-integration/java/io/airbyte/integrations/destination/exasol/ExasolDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-exasol/src/test-integration/java/io/airbyte/integrations/destination/exasol/ExasolDestinationAcceptanceTest.java index f56aed797572c..8b939c7ef6e4e 100644 --- a/airbyte-integrations/connectors/destination-exasol/src/test-integration/java/io/airbyte/integrations/destination/exasol/ExasolDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-exasol/src/test-integration/java/io/airbyte/integrations/destination/exasol/ExasolDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -137,12 +138,12 @@ private static DSLContext getDSLContext(final JsonNode config) { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // Nothing to do } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { EXASOL.purgeDatabase(); } diff --git a/airbyte-integrations/connectors/destination-gcs/src/test-integration/java/io/airbyte/integrations/destination/gcs/GcsDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-gcs/src/test-integration/java/io/airbyte/integrations/destination/gcs/GcsDestinationAcceptanceTest.java index 3897d7e73de90..9abb84f42eee9 100644 --- a/airbyte-integrations/connectors/destination-gcs/src/test-integration/java/io/airbyte/integrations/destination/gcs/GcsDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-gcs/src/test-integration/java/io/airbyte/integrations/destination/gcs/GcsDestinationAcceptanceTest.java @@ -29,6 +29,7 @@ import io.airbyte.protocol.models.v0.AirbyteConnectionStatus; import java.nio.file.Path; import java.util.Comparator; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -160,7 +161,7 @@ protected List getAllSyncedObjects(final String streamName, fin *
  • Construct the GCS client.
    • */ @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final JsonNode baseConfigJson = getBaseConfigJson(); // Set a random GCS bucket path for each integration test final JsonNode configJson = Jsons.clone(baseConfigJson); @@ -184,7 +185,7 @@ protected void setup(final TestDestinationEnv testEnv) { * Remove all the S3 output from the tests. */ @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final List keysToDelete = new LinkedList<>(); final List objects = s3Client .listObjects(config.getBucketName(), config.getBucketPath()) diff --git a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hadoop/BaseIcebergHadoopCatalogS3IntegrationTest.java b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hadoop/BaseIcebergHadoopCatalogS3IntegrationTest.java index c3bba8d9147eb..f9afbf37baadf 100644 --- a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hadoop/BaseIcebergHadoopCatalogS3IntegrationTest.java +++ b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hadoop/BaseIcebergHadoopCatalogS3IntegrationTest.java @@ -29,6 +29,7 @@ import io.airbyte.integrations.destination.iceberg.container.MinioContainer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.util.HostPortResolver; +import java.util.HashSet; import java.util.List; import java.util.Map; import org.slf4j.Logger; @@ -43,13 +44,13 @@ public abstract class BaseIcebergHadoopCatalogS3IntegrationTest extends Destinat private MinioContainer s3Storage; @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { s3Storage = IcebergIntegrationTestUtil.createAndStartMinioContainer(null); IcebergIntegrationTestUtil.createS3WarehouseBucket(getConfig()); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { IcebergIntegrationTestUtil.stopAndCloseContainer(s3Storage, "Minio"); } diff --git a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3AvroIntegrationTest.java b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3AvroIntegrationTest.java index 1f40b7a4e25c8..c744cd329eb69 100644 --- a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3AvroIntegrationTest.java +++ b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3AvroIntegrationTest.java @@ -11,6 +11,7 @@ import io.airbyte.integrations.destination.iceberg.config.format.DataFileFormat; import io.airbyte.integrations.destination.iceberg.container.HiveMetastoreS3PostgresCompose; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import java.util.HashSet; import java.util.List; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -48,10 +49,10 @@ public static void stopCompose() { } @Override - protected void setup(final TestDestinationEnv testEnv) {} + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override - protected void tearDown(final TestDestinationEnv testEnv) {} + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override protected String getImageName() { diff --git a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3ParquetIntegrationTest.java b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3ParquetIntegrationTest.java index 128a48a811457..fd8b2f11c0310 100644 --- a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3ParquetIntegrationTest.java +++ b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/hive/IcebergHiveCatalogS3ParquetIntegrationTest.java @@ -11,6 +11,7 @@ import io.airbyte.integrations.destination.iceberg.config.format.DataFileFormat; import io.airbyte.integrations.destination.iceberg.container.HiveMetastoreS3PostgresCompose; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import java.util.HashSet; import java.util.List; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -48,10 +49,10 @@ public static void stopCompose() { } @Override - protected void setup(final TestDestinationEnv testEnv) {} + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override - protected void tearDown(final TestDestinationEnv testEnv) {} + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override protected String getImageName() { diff --git a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/jdbc/BaseIcebergJdbcCatalogS3IntegrationTest.java b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/jdbc/BaseIcebergJdbcCatalogS3IntegrationTest.java index 6a5c385838e91..f9309330e8970 100644 --- a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/jdbc/BaseIcebergJdbcCatalogS3IntegrationTest.java +++ b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/jdbc/BaseIcebergJdbcCatalogS3IntegrationTest.java @@ -34,6 +34,7 @@ import io.airbyte.integrations.destination.iceberg.container.MinioContainer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.util.HostPortResolver; +import java.util.HashSet; import java.util.List; import java.util.Map; import org.slf4j.Logger; @@ -52,7 +53,7 @@ public abstract class BaseIcebergJdbcCatalogS3IntegrationTest extends Destinatio private MinioContainer s3Storage; @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { catalogDb = new PostgreSQLContainer<>("postgres:13-alpine"); catalogDb.start(); LOGGER.info("==> Started PostgreSQL docker container..."); @@ -62,7 +63,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { IcebergIntegrationTestUtil.stopAndCloseContainer(s3Storage, "Minio"); IcebergIntegrationTestUtil.stopAndCloseContainer(catalogDb, "PostgreSQL"); } diff --git a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/rest/BaseIcebergRESTCatalogS3IntegrationTest.java b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/rest/BaseIcebergRESTCatalogS3IntegrationTest.java index 4499033a30b4d..6bbf8e8c6a5b8 100644 --- a/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/rest/BaseIcebergRESTCatalogS3IntegrationTest.java +++ b/airbyte-integrations/connectors/destination-iceberg/src/test-integration/java/io/airbyte/integrations/destination/iceberg/rest/BaseIcebergRESTCatalogS3IntegrationTest.java @@ -9,6 +9,7 @@ import io.airbyte.integrations.destination.iceberg.config.format.DataFileFormat; import io.airbyte.integrations.destination.iceberg.container.RESTServerWithMinioCompose; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import java.util.HashSet; import org.junit.jupiter.api.AfterAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +39,10 @@ public static void stopCompose() { } @Override - protected void setup(final TestDestinationEnv testEnv) {} + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override - protected void tearDown(final TestDestinationEnv testEnv) {} + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) {} @Override protected String getImageName() { diff --git a/airbyte-integrations/connectors/destination-kafka/src/test-integration/java/io/airbyte/integrations/destination/kafka/KafkaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-kafka/src/test-integration/java/io/airbyte/integrations/destination/kafka/KafkaDestinationAcceptanceTest.java index 11d4653f6245b..5844383c9113f 100644 --- a/airbyte-integrations/connectors/destination-kafka/src/test-integration/java/io/airbyte/integrations/destination/kafka/KafkaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-kafka/src/test-integration/java/io/airbyte/integrations/destination/kafka/KafkaDestinationAcceptanceTest.java @@ -19,6 +19,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import org.apache.kafka.clients.consumer.ConsumerConfig; @@ -166,13 +167,13 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { KAFKA = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.0")); KAFKA.start(); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { KAFKA.close(); } diff --git a/airbyte-integrations/connectors/destination-keen/src/test-integration/java/io/airbyte/integrations/destination/keen/KeenDestinationTest.java b/airbyte-integrations/connectors/destination-keen/src/test-integration/java/io/airbyte/integrations/destination/keen/KeenDestinationTest.java index aa79277d811b6..f097bd19213d0 100644 --- a/airbyte-integrations/connectors/destination-keen/src/test-integration/java/io/airbyte/integrations/destination/keen/KeenDestinationTest.java +++ b/airbyte-integrations/connectors/destination-keen/src/test-integration/java/io/airbyte/integrations/destination/keen/KeenDestinationTest.java @@ -96,7 +96,7 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { if (!Files.exists(Path.of(SECRET_FILE_PATH))) { throw new IllegalStateException( "Must provide path to a file containing Keen account credentials: Project ID and Master API Key. " + @@ -109,7 +109,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { for (final String keenCollection : collectionsToDelete) { keenHttpClient.eraseStream(keenCollection, projectId, apiKey); } diff --git a/airbyte-integrations/connectors/destination-kinesis/src/test-integration/java/io/airbyte/integrations/destination/kinesis/KinesisDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-kinesis/src/test-integration/java/io/airbyte/integrations/destination/kinesis/KinesisDestinationAcceptanceTest.java index c6946b195a727..e3090520f5fa5 100644 --- a/airbyte-integrations/connectors/destination-kinesis/src/test-integration/java/io/airbyte/integrations/destination/kinesis/KinesisDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-kinesis/src/test-integration/java/io/airbyte/integrations/destination/kinesis/KinesisDestinationAcceptanceTest.java @@ -10,6 +10,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; @@ -34,7 +35,7 @@ static void initContainer() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { configJson = KinesisDataFactory.jsonConfig( kinesisContainer.getEndpointOverride().toString(), kinesisContainer.getRegion(), @@ -65,7 +66,7 @@ protected boolean supportObjectDataTypeTest() { } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { kinesisStream.deleteAllStreams(); } diff --git a/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java index 65a814c140f17..113218b92c82c 100644 --- a/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java @@ -16,6 +16,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.nio.file.Files; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -91,12 +92,12 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // no op } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // no op } diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java index 8727a6c27c833..a007a9dd8d8fd 100644 --- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.testcontainers.containers.MariaDBContainer; @@ -116,7 +117,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final DockerImageName mcsImage = DockerImageName.parse("fengdi/columnstore:1.5.2").asCompatibleSubstituteFor("mariadb"); db = new MariaDBContainer(mcsImage); db.start(); @@ -128,7 +129,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java index 0ee45d0c3e07d..a7adf43a01bc0 100644 --- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.destination.StandardNameTransformer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -129,7 +130,7 @@ protected List resolveIdentifier(final String identifier) { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { bastion.initAndStartBastion(network); startAndInitJdbcContainer(); } @@ -147,7 +148,7 @@ private void startAndInitJdbcContainer() throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { bastion.stopAndCloseContainers(db); } diff --git a/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationStrictEncryptAcceptanceTest.java b/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationStrictEncryptAcceptanceTest.java index 882442b2ad465..2d3de3193985b 100644 --- a/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationStrictEncryptAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mongodb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationStrictEncryptAcceptanceTest.java @@ -23,6 +23,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import org.bson.Document; import org.junit.jupiter.api.BeforeAll; @@ -127,7 +128,7 @@ void testCheck() throws Exception { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final var credentials = String.format("%s:%s@", config.get(AUTH_TYPE).get(JdbcUtils.USERNAME_KEY).asText(), config.get(AUTH_TYPE).get(JdbcUtils.PASSWORD_KEY).asText()); final String connectionString = String.format("mongodb+srv://%s%s/%s?retryWrites=true&w=majority&tls=true", @@ -139,7 +140,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { for (final String collectionName : mongoDatabase.getCollectionNames()) { mongoDatabase.getDatabase().getCollection(collectionName).drop(); } diff --git a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java index 80f0c4bc5bb02..aaa6a6f36dd58 100644 --- a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java @@ -21,6 +21,7 @@ import io.airbyte.protocol.models.v0.AirbyteConnectionStatus; import java.io.IOException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import org.bson.Document; import org.junit.jupiter.api.Test; @@ -180,13 +181,13 @@ public void testCheckIncorrectPort() { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container = new MongoDBContainer(DOCKER_IMAGE_NAME); container.start(); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container.stop(); container.close(); } diff --git a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/SshMongoDbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/SshMongoDbDestinationAcceptanceTest.java index dbbcb2592646c..a537334cc41d1 100644 --- a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/SshMongoDbDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/SshMongoDbDestinationAcceptanceTest.java @@ -16,6 +16,7 @@ import io.airbyte.integrations.base.ssh.SshTunnel; import io.airbyte.integrations.util.HostPortResolver; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import org.bson.Document; import org.testcontainers.containers.MongoDBContainer; @@ -31,7 +32,7 @@ public abstract class SshMongoDbDestinationAcceptanceTest extends MongodbDestina public abstract SshTunnel.TunnelMethod getTunnelMethod(); @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container = new MongoDBContainer(DOCKER_IMAGE_NAME) .withNetwork(network) .withExposedPorts(DEFAULT_PORT); @@ -81,7 +82,7 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container.stop(); container.close(); bastion.getContainer().stop(); diff --git a/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java index 5d6b8ae632575..904dda8bf851c 100644 --- a/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.UUID; @@ -139,7 +140,7 @@ private String getIpAddress() throws UnknownHostException { } @Override - protected void setup(final TestDestinationEnv testEnv) throws MqttException { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws MqttException { recordsPerTopic.clear(); client = new MqttClient("tcp://" + extension.getHost() + ":" + extension.getMqttPort(), UUID.randomUUID().toString(), new MemoryPersistence()); @@ -156,7 +157,7 @@ protected void setup(final TestDestinationEnv testEnv) throws MqttException { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws MqttException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws MqttException { client.disconnectForcibly(); client.close(); } diff --git a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java index 45a579872b835..7a8330ac637e5 100644 --- a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java @@ -24,6 +24,7 @@ import io.airbyte.test.utils.DatabaseConnectionHelper; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -146,7 +147,7 @@ private static Database getDatabase(final DSLContext dslContext) { } @Override - protected void setup(final TestDestinationEnv testEnv) throws SQLException { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { final JsonNode configWithoutDbName = getConfig(db); final String dbName = Strings.addRandomSuffix("db", "_", 10); dslContext = getDslContext(configWithoutDbName); @@ -165,7 +166,7 @@ protected void setup(final TestDestinationEnv testEnv) throws SQLException { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { dslContext.close(); } diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java index 26edb690eb009..9d2bb79a01656 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java @@ -20,6 +20,7 @@ import io.airbyte.integrations.util.HostPortResolver; import io.airbyte.test.utils.DatabaseConnectionHelper; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -130,7 +131,7 @@ private static Database getDatabase(final DSLContext dslContext) { // 1. exec into mssql container (not the test container container) // 2. /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "A_Str0ng_Required_Password" @Override - protected void setup(final TestDestinationEnv testEnv) throws SQLException { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { final JsonNode configWithoutDbName = getConfig(db); final String dbName = Strings.addRandomSuffix("db", "_", 10); dslContext = getDslContext(configWithoutDbName); @@ -149,7 +150,7 @@ protected void setup(final TestDestinationEnv testEnv) throws SQLException { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { dslContext.close(); } diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java index 589f83ede8580..9156678eb628f 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java @@ -20,6 +20,7 @@ import io.airbyte.integrations.util.HostPortResolver; import io.airbyte.test.utils.DatabaseConnectionHelper; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -141,7 +142,7 @@ private static Database getDatabase(final DSLContext dslContext) { // 1. exec into mssql container (not the test container container) // 2. /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "A_Str0ng_Required_Password" @Override - protected void setup(final TestDestinationEnv testEnv) throws SQLException { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { configWithoutDbName = getConfig(db); final String dbName = Strings.addRandomSuffix("db", "_", 10); dslContext = getDslContext(configWithoutDbName); @@ -160,7 +161,7 @@ protected void setup(final TestDestinationEnv testEnv) throws SQLException { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { dslContext.close(); } diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java index d6bc3625aab8a..3225540252fd1 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.destination.StandardNameTransformer; import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; @@ -114,7 +115,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { startTestContainers(); SshTunnel.sshWrap( @@ -126,7 +127,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { ctx.fetch(String.format("CREATE DATABASE %s;", database)); ctx.fetch(String.format("USE %s;", database)); ctx.fetch(String.format("CREATE SCHEMA %s;", schemaName)); - + TEST_SCHEMAS.add(schemaName); return null; }); }); @@ -146,7 +147,7 @@ private void initAndStartJdbcContainer() { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { bastion.stopAndCloseContainers(db); } diff --git a/airbyte-integrations/connectors/destination-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLStrictEncryptDestinationAcceptanceTest.java index c409004b77efa..dc32fc2742968 100644 --- a/airbyte-integrations/connectors/destination-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLStrictEncryptDestinationAcceptanceTest.java @@ -27,6 +27,7 @@ import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog; import java.sql.SQLException; import java.time.Instant; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -140,7 +141,7 @@ protected List retrieveNormalizedRecords(final TestDestinationEnv test } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new MySQLContainer<>("mysql:8.0"); db.start(); setLocalInFileToTrue(); @@ -179,7 +180,7 @@ private void executeQuery(final String query) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLDestinationAcceptanceTest.java index 583d31b56fae3..ffc9336c45d5e 100644 --- a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLDestinationAcceptanceTest.java @@ -30,6 +30,7 @@ import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog; import java.sql.SQLException; import java.time.Instant; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -148,7 +149,7 @@ protected List retrieveNormalizedRecords(final TestDestinationEnv test } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new MySQLContainer<>("mysql:8.0"); db.start(); setLocalInFileToTrue(); @@ -187,7 +188,7 @@ private void executeQuery(final String query) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SshMySQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SshMySQLDestinationAcceptanceTest.java index 8df6ef3555a2f..02b1fe3a30d11 100644 --- a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SshMySQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SshMySQLDestinationAcceptanceTest.java @@ -19,6 +19,7 @@ import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; @@ -135,7 +136,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { schemaName = RandomStringUtils.randomAlphabetic(8).toLowerCase(); final var config = getConfig(); SshTunnel.sshWrap( @@ -148,7 +149,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { SshTunnel.sshWrap( getConfig(), JdbcUtils.HOST_LIST_KEY, diff --git a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SslMySQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SslMySQLDestinationAcceptanceTest.java index ce8e060c96761..6e408982db027 100644 --- a/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SslMySQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SslMySQLDestinationAcceptanceTest.java @@ -17,6 +17,7 @@ import io.airbyte.integrations.destination.StandardNameTransformer; import io.airbyte.protocol.models.v0.AirbyteConnectionStatus; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -84,7 +85,7 @@ public void testCustomDbtTransformations() { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new MySQLContainer<>("mysql:8.0"); db.start(); @@ -104,7 +105,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { dslContext.close(); db.stop(); db.close(); diff --git a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java index f367195fca07a..3d39d4a61c8a9 100644 --- a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java @@ -25,6 +25,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import javax.sql.DataSource; @@ -141,7 +142,7 @@ private static DSLContext getDslContext(final JsonNode config) { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final String dbName = Strings.addRandomSuffix("db", "_", 10); db = new OracleContainer() .withUsername("test") @@ -162,7 +163,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java index c486c8a6d5811..a532db7099a4e 100644 --- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java @@ -20,6 +20,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.io.IOException; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -131,7 +132,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { startTestContainers(); SshTunnel.sshWrap( getConfig(), @@ -170,7 +171,7 @@ private Database getDatabaseFromConfig(final JsonNode config) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { SshTunnel.sshWrap( getConfig(), JdbcUtils.HOST_LIST_KEY, diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java index e1f1adc9fe15f..7a61881be00a0 100644 --- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java @@ -27,6 +27,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import javax.sql.DataSource; @@ -149,7 +150,7 @@ private static Database getDatabase(final DSLContext dslContext) { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final String dbName = Strings.addRandomSuffix("db", "_", 10); db = new OracleContainer() .withUsername("test") @@ -170,7 +171,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationStrictEncryptAcceptanceTest.java b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationStrictEncryptAcceptanceTest.java index ffd4b02d226f9..6c5101964ffff 100644 --- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationStrictEncryptAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationStrictEncryptAcceptanceTest.java @@ -22,6 +22,7 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -140,7 +141,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { db = new PostgreSQLContainer<>(DockerImageName.parse("postgres:bullseye") .asCompatibleSubstituteFor("postgres")); db.start(); @@ -148,7 +149,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationAcceptanceTest.java index 9ff0f7413df1c..43260abd81b6e 100644 --- a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationAcceptanceTest.java @@ -17,6 +17,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import io.airbyte.integrations.util.HostPortResolver; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -127,13 +128,13 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db = new PostgreSQLContainer<>("postgres:13-alpine"); db.start(); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationSSLFullCertificateAcceptanceTest.java b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationSSLFullCertificateAcceptanceTest.java index 9931d1876f759..440e2ac2aed43 100644 --- a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationSSLFullCertificateAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/PostgresDestinationSSLFullCertificateAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -133,7 +134,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { db = new PostgreSQLContainer<>(DockerImageName.parse("postgres:bullseye") .asCompatibleSubstituteFor("postgres")); db.start(); @@ -141,7 +142,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { db.stop(); db.close(); } diff --git a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java index fa76a9723d9e0..030a80958065a 100644 --- a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java @@ -18,6 +18,7 @@ import io.airbyte.integrations.destination.StandardNameTransformer; import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; @@ -133,7 +134,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { startTestContainers(); // do everything in a randomly generated schema so that we can wipe it out at the end. @@ -143,6 +144,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { JdbcUtils.PORT_LIST_KEY, mangledConfig -> { getDatabaseFromConfig(mangledConfig).query(ctx -> ctx.fetch(String.format("CREATE SCHEMA %s;", schemaName))); + TEST_SCHEMAS.add(schemaName); }); } @@ -158,7 +160,7 @@ private void initAndStartJdbcContainer() { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { // blow away the test schema at the end. SshTunnel.sshWrap( getConfig(), diff --git a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java index ebbecc89eed5e..4c88051ef415e 100644 --- a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java @@ -47,6 +47,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -185,7 +186,7 @@ NAMESPACE, nullToEmpty(n), } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { if (!Files.exists(CREDENTIALS_PATH)) { throw new IllegalStateException( "Must provide path to a gcp service account credentials file. By default {module-root}/" @@ -243,7 +244,7 @@ public void testSecondSync() throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // delete subscription if (subscriptionAdminClient != null && subscriptionName != null) { subscriptionAdminClient.deleteSubscription(subscriptionName); diff --git a/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java index 8e88d44ece8be..7da3ce8abd522 100644 --- a/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Base64; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -179,13 +180,13 @@ private List getIpAddresses() throws UnknownHostException { } @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { PULSAR = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:2.8.1")); PULSAR.start(); } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { PULSAR.close(); } diff --git a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java index 1492436196026..dcb688f8549b5 100644 --- a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java @@ -10,6 +10,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; @@ -30,7 +31,7 @@ static void initContainer() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { jsonConfig = RedisDataFactory.jsonConfig( redisContainer.getHost(), redisContainer.getFirstMappedPort()); @@ -39,7 +40,7 @@ protected void setup(TestDestinationEnv testEnv) { } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { redisCache.flushAll(); } diff --git a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java index fad4da3d871e2..5e6aaffc34106 100644 --- a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java @@ -15,6 +15,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import io.airbyte.integrations.util.HostPortResolver; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.AfterAll; @@ -48,7 +49,7 @@ static void stop() { public abstract SshTunnel.TunnelMethod getTunnelMethod(); @Override - protected void setup(final TestDestinationEnv testEnv) { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { jsonConfig = RedisDataFactory.jsonConfig( redisContainer.getHost(), redisContainer.getFirstMappedPort()); @@ -57,7 +58,7 @@ protected void setup(final TestDestinationEnv testEnv) { } @Override - protected void tearDown(final TestDestinationEnv testEnv) { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { redisCache.flushAll(); } diff --git a/airbyte-integrations/connectors/destination-redpanda/src/test-integration/java/io/airbyte/integrations/destination/redpanda/RedpandaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redpanda/src/test-integration/java/io/airbyte/integrations/destination/redpanda/RedpandaDestinationAcceptanceTest.java index 04df235eea360..bee5abb4dbe30 100644 --- a/airbyte-integrations/connectors/destination-redpanda/src/test-integration/java/io/airbyte/integrations/destination/redpanda/RedpandaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redpanda/src/test-integration/java/io/airbyte/integrations/destination/redpanda/RedpandaDestinationAcceptanceTest.java @@ -14,6 +14,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; @@ -51,7 +52,7 @@ static void stopContainer() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { this.redpandaNameTransformer = new RedpandaNameTransformer(); this.adminClient = AdminClient.create(Map.of( AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, redpandaContainer.getBootstrapServers(), @@ -61,7 +62,7 @@ protected void setup(TestDestinationEnv testEnv) { } @Override - protected void tearDown(TestDestinationEnv testEnv) throws ExecutionException, InterruptedException { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws ExecutionException, InterruptedException { var topics = adminClient.listTopics().listings().get().stream() .filter(tl -> !tl.isInternal()) .map(TopicListing::name) diff --git a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java index d0061829a2873..247289c31048f 100644 --- a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.nio.file.Path; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; @@ -204,7 +205,7 @@ private List retrieveRecordsFromTable(final String tableName, final St // for each test we create a new schema in the database. run the test in there and then remove it. @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final String schemaName = Strings.addRandomSuffix("integration_test", "_", 5); final String createSchemaQuery = String.format("CREATE SCHEMA %s", schemaName); baseConfig = getStaticConfig(); @@ -214,13 +215,18 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { getDatabase().query(ctx -> ctx.execute(createUser)); final JsonNode configForSchema = Jsons.clone(baseConfig); ((ObjectNode) configForSchema).put("schema", schemaName); + TEST_SCHEMAS.add(schemaName); config = configForSchema; this.testDestinationEnv = testEnv; } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { + System.out.println("TEST_SCHEMAS: " + TEST_SCHEMAS); getDatabase().query(ctx -> ctx.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE", config.get("schema").asText()))); + for (String schema : TEST_SCHEMAS) { + getDatabase().query(ctx -> ctx.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE", schema))); + } getDatabase().query(ctx -> ctx.execute(String.format("drop user if exists %s;", USER_WITHOUT_CREDS))); } diff --git a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/SshRedshiftDestinationBaseAcceptanceTest.java b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/SshRedshiftDestinationBaseAcceptanceTest.java index 3be0b91396ede..b19c4ee917a18 100644 --- a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/SshRedshiftDestinationBaseAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/SshRedshiftDestinationBaseAcceptanceTest.java @@ -26,6 +26,7 @@ import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.io.IOException; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -155,10 +156,11 @@ protected int getMaxRecordValueLimit() { } @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { baseConfig = getStaticConfig(); final JsonNode configForSchema = Jsons.clone(baseConfig); schemaName = Strings.addRandomSuffix("integration_test", "_", 5); + TEST_SCHEMAS.add(schemaName); ((ObjectNode) configForSchema).put("schema", schemaName); config = configForSchema; @@ -183,7 +185,7 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { // blow away the test schema at the end. SshTunnel.sshWrap( getConfig(), diff --git a/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java index 1c71d1883b44c..2f7a51c763916 100644 --- a/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java @@ -24,6 +24,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -147,12 +148,12 @@ private static void dropFields(JsonNode node, String... fields) { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // Nothing to do } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { try { final ApiClient client = RocksetUtils.apiClientFromConfig(getConfig()); String workspace = getConfig().get("workspace").asText(); diff --git a/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlDestinationAcceptanceTest.java index 5654c34466d69..69f3fae07cfb7 100644 --- a/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlDestinationAcceptanceTest.java @@ -6,14 +6,15 @@ import io.airbyte.integrations.destination.s3.S3BaseJsonlDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.argproviders.DataTypeTestArgumentProvider; +import java.util.HashSet; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ArgumentsSource; public class S3GlueJsonlDestinationAcceptanceTest extends S3BaseJsonlDestinationAcceptanceTest { @Override - protected void tearDown(TestDestinationEnv testEnv) { - super.tearDown(testEnv); + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { + super.tearDown(testEnv, TEST_SCHEMAS); GlueDestinationConfig glueDestinationConfig = GlueDestinationConfig.getInstance(configJson); try (var glueTestClient = new GlueTestClient(glueDestinationConfig.getAWSGlueInstance())) { diff --git a/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlGzipDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlGzipDestinationAcceptanceTest.java index f3c4960e7e6e3..f80bcd7edbeb6 100644 --- a/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlGzipDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-s3-glue/src/test-integration/java/io/airbyte/integrations/destination/s3_glue/S3GlueJsonlGzipDestinationAcceptanceTest.java @@ -5,12 +5,13 @@ package io.airbyte.integrations.destination.s3_glue; import io.airbyte.integrations.destination.s3.S3BaseJsonlGzipDestinationAcceptanceTest; +import java.util.HashSet; public class S3GlueJsonlGzipDestinationAcceptanceTest extends S3BaseJsonlGzipDestinationAcceptanceTest { @Override - protected void tearDown(TestDestinationEnv testEnv) { - super.tearDown(testEnv); + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { + super.tearDown(testEnv, TEST_SCHEMAS); GlueDestinationConfig glueDestinationConfig = GlueDestinationConfig.getInstance(configJson); try (var glueTestClient = new GlueTestClient(glueDestinationConfig.getAWSGlueInstance())) { diff --git a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java index 1416b236909ee..683ebf0fece1e 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java @@ -12,6 +12,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import io.airbyte.integrations.util.HostPortResolver; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; @@ -37,7 +38,7 @@ static void initContainer() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { configJson = TestDataFactory.jsonConfig( HostPortResolver.resolveHost(scyllaContainer), HostPortResolver.resolvePort(scyllaContainer)); @@ -47,7 +48,7 @@ protected void setup(TestDestinationEnv testEnv) { } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { scyllaCqlProvider.metadata().stream() .filter(m -> !m.value1().startsWith("system")) .forEach(meta -> { diff --git a/airbyte-integrations/connectors/destination-selectdb/src/test-integration/java/io/airbyte/integrations/destination/selectdb/SelectdbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-selectdb/src/test-integration/java/io/airbyte/integrations/destination/selectdb/SelectdbDestinationAcceptanceTest.java index a8817d7a90e79..9e53537864fd8 100644 --- a/airbyte-integrations/connectors/destination-selectdb/src/test-integration/java/io/airbyte/integrations/destination/selectdb/SelectdbDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-selectdb/src/test-integration/java/io/airbyte/integrations/destination/selectdb/SelectdbDestinationAcceptanceTest.java @@ -15,6 +15,7 @@ import java.nio.file.Paths; import java.sql.*; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import org.apache.commons.lang3.StringEscapeUtils; import org.junit.jupiter.api.AfterAll; @@ -106,12 +107,12 @@ protected List retrieveRecords(TestDestinationEnv testEnv, } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any setup actions needed before every test case } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any cleanup actions needed after every test case } diff --git a/airbyte-integrations/connectors/destination-snowflake/src/test-integration/java/io/airbyte/integrations/destination/snowflake/SnowflakeInsertDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-snowflake/src/test-integration/java/io/airbyte/integrations/destination/snowflake/SnowflakeInsertDestinationAcceptanceTest.java index 5acb6b10ec282..0f25fd08528d3 100644 --- a/airbyte-integrations/connectors/destination-snowflake/src/test-integration/java/io/airbyte/integrations/destination/snowflake/SnowflakeInsertDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-snowflake/src/test-integration/java/io/airbyte/integrations/destination/snowflake/SnowflakeInsertDestinationAcceptanceTest.java @@ -34,6 +34,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.TimeZone; @@ -172,9 +173,10 @@ private List retrieveRecordsFromTable(final String tableName, final St // for each test we create a new schema in the database. run the test in there and then remove it. @Override - protected void setup(final TestDestinationEnv testEnv) throws Exception { + protected void setup(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final String schemaName = Strings.addRandomSuffix("integration_test", "_", 5); final String createSchemaQuery = String.format("CREATE SCHEMA %s", schemaName); + TEST_SCHEMAS.add(schemaName); this.config = Jsons.clone(getStaticConfig()); ((ObjectNode) config).put("schema", schemaName); @@ -185,9 +187,15 @@ protected void setup(final TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws Exception { - final String createSchemaQuery = String.format("DROP SCHEMA IF EXISTS %s", config.get("schema").asText()); - database.execute(createSchemaQuery); + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { + String dropSchemaQuery = String.format("DROP SCHEMA IF EXISTS %s", config.get("schema").asText()); + database.execute(dropSchemaQuery); + + for (String schema : TEST_SCHEMAS) { + dropSchemaQuery = String.format("DROP SCHEMA IF EXISTS %s", schema); + database.execute(dropSchemaQuery); + } + DataSourceFactory.close(dataSource); } diff --git a/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyDestinationAcceptanceTest.java index 92a9bce20da69..17cfaf17405b3 100644 --- a/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyDestinationAcceptanceTest.java @@ -45,6 +45,7 @@ import java.nio.file.Path; import java.sql.SQLException; import java.time.Instant; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -67,7 +68,7 @@ public abstract class StarburstGalaxyDestinationAcceptanceTest extends Destinati private Database database; @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { dslContext = create(galaxyDestinationConfig.galaxyUsername(), galaxyDestinationConfig.galaxyPassword(), STARBURST_GALAXY_DRIVER_CLASS, getGalaxyConnectionString(galaxyDestinationConfig), SQLDialect.DEFAULT); database = new Database(dslContext); @@ -106,7 +107,7 @@ protected List retrieveRecords(final TestDestinationEnv testEnv, } @Override - protected void tearDown(final TestDestinationEnv testEnv) throws SQLException { + protected void tearDown(final TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws SQLException { // clean up database List schemas = executeQuery(format("SHOW SCHEMAS LIKE '%s'", galaxyDestinationConfig.galaxyCatalogSchema().toLowerCase(ENGLISH))); schemas.stream().map(node -> node.get("Schema").asText()) diff --git a/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyS3DestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyS3DestinationAcceptanceTest.java index 460e564a04579..459b2580eaaba 100644 --- a/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyS3DestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-starburst-galaxy/src/test-integration/java/io/airbyte/integrations/destination/starburst_galaxy/StarburstGalaxyS3DestinationAcceptanceTest.java @@ -20,6 +20,7 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.destination.s3.S3DestinationConfig; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; import org.slf4j.Logger; @@ -40,7 +41,7 @@ protected JsonNode getFailCheckConfig() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { JsonNode baseConfigJson = Jsons.deserialize(IOs.readFile(Path.of(SECRETS_CONFIG_JSON))); // Set a random s3 bucket path and database schema for each integration test @@ -55,7 +56,7 @@ protected void setup(TestDestinationEnv testEnv) { S3DestinationConfig s3Config = galaxyDestinationConfig.storageConfig().getS3DestinationConfigOrThrow(); LOGGER.info("Test full path: s3://{}/{}", s3Config.getBucketName(), s3Config.getBucketPath()); - super.setup(testEnv); // Create a database + super.setup(testEnv, TEST_SCHEMAS); // Create a database } @Override diff --git a/airbyte-integrations/connectors/destination-teradata/src/test-integration/java/io/airbyte/integrations/destination/teradata/TeradataDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-teradata/src/test-integration/java/io/airbyte/integrations/destination/teradata/TeradataDestinationAcceptanceTest.java index 946a4e536f868..cad86c81fd4eb 100644 --- a/airbyte-integrations/connectors/destination-teradata/src/test-integration/java/io/airbyte/integrations/destination/teradata/TeradataDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-teradata/src/test-integration/java/io/airbyte/integrations/destination/teradata/TeradataDestinationAcceptanceTest.java @@ -21,6 +21,7 @@ import io.airbyte.integrations.destination.teradata.envclient.dto.*; import io.airbyte.integrations.destination.teradata.envclient.exception.BaseException; import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; +import java.util.HashSet; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -141,7 +142,7 @@ private List retrieveRecordsFromTable(final String tableName, final St } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { final String createSchemaQuery = String.format(CREATE_DATABASE, SCHEMA_NAME); try { ((ObjectNode) configJson).put("schema", SCHEMA_NAME); @@ -154,7 +155,7 @@ protected void setup(TestDestinationEnv testEnv) { } @Override - protected void tearDown(TestDestinationEnv testEnv) throws Exception { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { final String deleteQuery = String.format(String.format(DELETE_DATABASE, SCHEMA_NAME)); final String dropQuery = String.format(String.format(DROP_DATABASE, SCHEMA_NAME)); try { diff --git a/airbyte-integrations/connectors/destination-tidb/src/test-integration/java/io/airbyte/integrations/destination/tidb/TiDBDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-tidb/src/test-integration/java/io/airbyte/integrations/destination/tidb/TiDBDestinationAcceptanceTest.java index 181507bac4006..ce0d45aacd441 100644 --- a/airbyte-integrations/connectors/destination-tidb/src/test-integration/java/io/airbyte/integrations/destination/tidb/TiDBDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-tidb/src/test-integration/java/io/airbyte/integrations/destination/tidb/TiDBDestinationAcceptanceTest.java @@ -17,6 +17,7 @@ import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import io.airbyte.integrations.util.HostPortResolver; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -135,14 +136,14 @@ protected List retrieveNormalizedRecords(final TestDestinationEnv test } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container = new GenericContainer(DockerImageName.parse("pingcap/tidb:nightly")) .withExposedPorts(4000); container.start(); } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { container.stop(); container.close(); } diff --git a/airbyte-integrations/connectors/destination-vertica/src/test-integration/java/io/airbyte/integrations/destination/vertica/VerticaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-vertica/src/test-integration/java/io/airbyte/integrations/destination/vertica/VerticaDestinationAcceptanceTest.java index 4c634d505ccfa..3789e87ce4f67 100644 --- a/airbyte-integrations/connectors/destination-vertica/src/test-integration/java/io/airbyte/integrations/destination/vertica/VerticaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-vertica/src/test-integration/java/io/airbyte/integrations/destination/vertica/VerticaDestinationAcceptanceTest.java @@ -16,6 +16,7 @@ import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import java.io.IOException; import java.sql.SQLException; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; @@ -118,13 +119,13 @@ static void cleanUp() { } @Override - protected void setup(TestDestinationEnv testEnv) { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any setup actions needed before every test case } @Override - protected void tearDown(TestDestinationEnv testEnv) { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) { // TODO Implement this method to run any cleanup actions needed after every test case } diff --git a/airbyte-integrations/connectors/destination-yugabytedb/src/test-integration/java/io/airbyte/integrations/destination/yugabytedb/YugabytedbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-yugabytedb/src/test-integration/java/io/airbyte/integrations/destination/yugabytedb/YugabytedbDestinationAcceptanceTest.java index 2c8b0f7012368..d6335a6ed4947 100644 --- a/airbyte-integrations/connectors/destination-yugabytedb/src/test-integration/java/io/airbyte/integrations/destination/yugabytedb/YugabytedbDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-yugabytedb/src/test-integration/java/io/airbyte/integrations/destination/yugabytedb/YugabytedbDestinationAcceptanceTest.java @@ -49,7 +49,7 @@ protected String getImageName() { } @Override - protected void setup(TestDestinationEnv testEnv) throws Exception { + protected void setup(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { jsonConfig = Jsons.jsonNode(ImmutableMap.builder() .put("host", yugabytedbContainer.getHost()) .put("port", yugabytedbContainer.getMappedPort(5433)) @@ -69,7 +69,7 @@ protected void setup(TestDestinationEnv testEnv) throws Exception { } @Override - protected void tearDown(TestDestinationEnv testEnv) throws Exception { + protected void tearDown(TestDestinationEnv testEnv, HashSet TEST_SCHEMAS) throws Exception { database.execute(connection -> { var statement = connection.createStatement(); cleanupTables.forEach(tb -> {