Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

ElasticSearch, GCS, Keen, Kafka, Kinesis destinations : Enable DAT tests #11971

Merged
merged 25 commits into from
Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
44a6d81
add Boolean, Number, DateTimeWithTZ compare methods
DoNotPanicUA Mar 11, 2022
656148a
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Mar 22, 2022
46c3a1b
Improve value comparison
DoNotPanicUA Mar 30, 2022
2a4b384
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Mar 30, 2022
cd53764
Compare inherit objects element by element
DoNotPanicUA Apr 6, 2022
4cd50de
Merge remote-tracking branch 'origin/aleonets/add-dat-tests-ph1' into…
DoNotPanicUA Apr 6, 2022
3c911c9
Move comparison methods to a new class not to overload the test class.
DoNotPanicUA Apr 7, 2022
f28b9af
format
DoNotPanicUA Apr 8, 2022
af1cff8
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 10, 2022
06764b2
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 11, 2022
4ddee6c
Move common method to ComparatorUtils. + Review update
DoNotPanicUA Apr 12, 2022
127b4ba
format
DoNotPanicUA Apr 12, 2022
ed890d3
review
DoNotPanicUA Apr 13, 2022
4007837
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 13, 2022
f1e860b
review
DoNotPanicUA Apr 13, 2022
5b59eb1
mark resolveIdentifier method as deprecated
DoNotPanicUA Apr 13, 2022
4803514
enable DAT tests for destination-Elasticsearch, destination-gcs, dest…
DoNotPanicUA Apr 13, 2022
c2106a4
remove size objects validation. We iterate expected elements and comp…
DoNotPanicUA Apr 13, 2022
b3e8a31
Merge remote-tracking branch 'origin/aleonets/add-dat-tests-ph1' into…
DoNotPanicUA Apr 13, 2022
884cf5b
fix Csv actual data read. + use proper comparator for different file …
DoNotPanicUA Apr 13, 2022
a232f90
format
DoNotPanicUA Apr 13, 2022
28625d6
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 14, 2022
bf9b84c
Merge remote-tracking branch 'origin/master' into aleonets/add-dat-te…
DoNotPanicUA Apr 15, 2022
15f7d86
Merge remote-tracking branch 'origin/aleonets/add-dat-tests-ph1' into…
DoNotPanicUA Apr 15, 2022
6c007b7
Merge remote-tracking branch 'origin/master' into aleonets/dat-EGK
DoNotPanicUA Apr 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.io.IOException;
import java.time.Duration;
import java.util.List;
Expand Down Expand Up @@ -63,6 +65,26 @@ protected boolean supportsNormalization() {
return false;
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected JsonNode getConfig() {
var configJson = mapper.createObjectNode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io.airbyte.integrations.destination.s3.avro.AvroConstants;
import io.airbyte.integrations.destination.s3.avro.JsonFieldNameUpdater;
import io.airbyte.integrations.destination.s3.util.AvroRecordHelper;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.util.LinkedList;
import java.util.List;
import org.apache.avro.file.DataFileReader;
Expand All @@ -35,6 +36,11 @@ protected JsonNode getFormatConfig() {
+ "}");
}

@Override
protected TestDataComparator getTestDataComparator() {
return new GcsAvroTestDataComparator();
}

@Override
protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
final String streamName,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright (c) 2021 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.integrations.destination.gcs;

import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import java.time.*;
import java.time.format.DateTimeFormatter;

public class GcsAvroTestDataComparator extends AdvancedTestDataComparator {

@Override
protected boolean compareDateValues(String expectedValue, String actualValue) {
var destinationDate = LocalDate.ofEpochDay(Long.parseLong(actualValue));
var expectedDate = LocalDate.parse(expectedValue, DateTimeFormatter.ofPattern(AIRBYTE_DATE_FORMAT));
return expectedDate.equals(destinationDate);
}

private Instant getInstantFromEpoch(String epochValue) {
return Instant.ofEpochMilli(Long.parseLong(epochValue.replaceAll("000$", "")));
}

@Override
protected ZonedDateTime parseDestinationDateWithTz(String destinationValue) {
return ZonedDateTime.ofInstant(getInstantFromEpoch(destinationValue), ZoneOffset.UTC);
}

@Override
protected boolean compareDateTimeValues(String airbyteMessageValue, String destinationValue) {
var format = DateTimeFormatter.ofPattern(AIRBYTE_DATETIME_FORMAT);
LocalDateTime dateTime = LocalDateTime.ofInstant(getInstantFromEpoch(destinationValue), ZoneOffset.UTC);
return super.compareDateTimeValues(airbyteMessageValue, format.format(dateTime));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,22 @@ private static JsonNode getJsonNode(final Map<String, String> input, final Map<S
case "boolean" -> json.put(key, Boolean.valueOf(value));
case "integer" -> json.put(key, Integer.valueOf(value));
case "number" -> json.put(key, Double.valueOf(value));
case "" -> addNoTypeValue(json, key, value);
default -> json.put(key, value);
}
}
return json;
}

private static void addNoTypeValue(ObjectNode json, String key, String value) {
if (value != null && (value.matches("^\\[.*\\]$")) || value.matches("^\\{.*\\}$")) {
var newNode = Jsons.deserialize(value);
json.set(key, newNode);
} else {
json.put(key, value);
}
}

@Override
protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
final String streamName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import io.airbyte.integrations.destination.s3.S3FormatConfig;
import io.airbyte.integrations.destination.s3.S3StorageOperations;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.LinkedList;
Expand Down Expand Up @@ -85,6 +87,26 @@ protected String getDefaultSchema(final JsonNode config) {
return null;
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected JsonNode getFailCheckConfig() {
final JsonNode baseJson = getBaseConfigJson();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.airbyte.integrations.destination.s3.avro.AvroConstants;
import io.airbyte.integrations.destination.s3.avro.JsonFieldNameUpdater;
import io.airbyte.integrations.destination.s3.util.AvroRecordHelper;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
Expand All @@ -38,6 +39,11 @@ protected JsonNode getFormatConfig() {
"compression_codec", "GZIP"));
}

@Override
protected TestDataComparator getTestDataComparator() {
return new GcsAvroTestDataComparator();
}

@Override
protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
final String streamName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import io.airbyte.integrations.destination.NamingConventionTransformer;
import io.airbyte.integrations.destination.StandardNameTransformer;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -114,6 +116,26 @@ protected String getDefaultSchema(final JsonNode config) {
return "";
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected List<JsonNode> retrieveNormalizedRecords(final TestDestinationEnv testEnv, final String streamName, final String namespace) {
return retrieveRecords(testEnv, streamName, namespace, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import io.airbyte.commons.io.IOs;
import io.airbyte.commons.json.Jsons;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
import java.nio.file.Files;
Expand Down Expand Up @@ -45,6 +47,26 @@ protected JsonNode getConfig() throws Exception {
return configJson;
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

@Override
protected JsonNode getFailCheckConfig() throws Exception {
((ObjectNode) configJson).put(CONFIG_PROJECT_ID, "fake");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import com.fasterxml.jackson.databind.JsonNode;
import io.airbyte.commons.json.Jsons;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -42,6 +44,26 @@ protected void setup(TestDestinationEnv testEnv) {
kinesisNameTransformer = new KinesisNameTransformer();
}

@Override
protected TestDataComparator getTestDataComparator() {
return new AdvancedTestDataComparator();
}

@Override
protected boolean supportBasicDataTypeTest() {
return true;
}

@Override
protected boolean supportArrayDataTypeTest() {
return true;
}

@Override
protected boolean supportObjectDataTypeTest() {
return true;
}

@Override
protected void tearDown(TestDestinationEnv testEnv) {
kinesisStream.deleteAllStreams();
Expand Down