🎉 Source Zendesk Chat: engagements data fix infinity looping + gradle…

…w format (#18121) * fix infinity looping in chats * added more meaninful to variable name * bump docker version * auto-bump connector version * run format Co-authored-by: Roberto Bonnet <robertojuarezwp@gmail.com> Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
airbytehq · Oct 18, 2022 · 70dd9a8 · 70dd9a8
1 parent 740bbcd
commit 70dd9a8
Show file tree

Hide file tree

Showing 30 changed files with 246 additions and 233 deletions.
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -1147,7 +1147,7 @@
 - name: Zendesk Chat
   sourceDefinitionId: 40d24d0f-b8f9-4fe0-9e6c-b06c0f3f45e4
   dockerRepository: airbyte/source-zendesk-chat
-  dockerImageTag: 0.1.10
+  dockerImageTag: 0.1.11
   documentationUrl: https://docs.airbyte.com/integrations/sources/zendesk-chat
   icon: zendesk.svg
   sourceType: api

diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -11736,7 +11736,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-zendesk-chat:0.1.10"
+- dockerImage: "airbyte/source-zendesk-chat:0.1.11"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/zendesk-chat"
     connectionSpecification:

diff --git a/...ations/destination/bigquery/formatter/DefaultBigQueryDenormalizedRecordFormatterTest.java b/...ations/destination/bigquery/formatter/DefaultBigQueryDenormalizedRecordFormatterTest.java
@@ -74,9 +74,9 @@ void testSchema() {
     DefaultBigQueryDenormalizedRecordFormatter rf = new DefaultBigQueryDenormalizedRecordFormatter(
         jsonNodeSchema, new BigQuerySQLNameTransformer());
     final Field subFields = Field.newBuilder("big_query_array", LegacySQLTypeName.RECORD,
-            Field.of("domain", LegacySQLTypeName.STRING),
-            Field.of("grants", LegacySQLTypeName.RECORD,
-                Field.newBuilder("big_query_array", StandardSQLTypeName.STRING).setMode(Mode.REPEATED).build()))
+        Field.of("domain", LegacySQLTypeName.STRING),
+        Field.of("grants", LegacySQLTypeName.RECORD,
+            Field.newBuilder("big_query_array", StandardSQLTypeName.STRING).setMode(Mode.REPEATED).build()))
         .setMode(Mode.REPEATED).build();
     final Schema expectedResult = Schema.of(
         Field.newBuilder("accepts_marketing_updated_at", LegacySQLTypeName.DATETIME).setMode(Mode.NULLABLE).build(),
@@ -147,8 +147,8 @@ void testSchemaWithInvalidArrayType() {
     final Schema expectedResult = Schema.of(
         Field.of("name", LegacySQLTypeName.STRING),
         Field.newBuilder("permission_list", LegacySQLTypeName.RECORD,
-                Field.of("domain", LegacySQLTypeName.STRING),
-                Field.newBuilder("grants", LegacySQLTypeName.STRING).setMode(Mode.REPEATED).build())
+            Field.of("domain", LegacySQLTypeName.STRING),
+            Field.newBuilder("grants", LegacySQLTypeName.STRING).setMode(Mode.REPEATED).build())
             .setMode(Mode.REPEATED).build(),
         Field.of("_airbyte_ab_id", LegacySQLTypeName.STRING),
         Field.of("_airbyte_emitted_at", LegacySQLTypeName.TIMESTAMP));
@@ -181,8 +181,8 @@ void testSchemaWithNestedDatetimeInsideNullObject() {
     final Schema expectedResult = Schema.of(
         Field.newBuilder("name", LegacySQLTypeName.STRING).setMode(Mode.NULLABLE).build(),
         Field.newBuilder("appointment", LegacySQLTypeName.RECORD,
-                Field.newBuilder("street", LegacySQLTypeName.STRING).setMode(Mode.NULLABLE).build(),
-                Field.newBuilder("expTime", LegacySQLTypeName.DATETIME).setMode(Mode.NULLABLE).build())
+            Field.newBuilder("street", LegacySQLTypeName.STRING).setMode(Mode.NULLABLE).build(),
+            Field.newBuilder("expTime", LegacySQLTypeName.DATETIME).setMode(Mode.NULLABLE).build())
             .setMode(Mode.NULLABLE).build(),
         Field.of("_airbyte_ab_id", LegacySQLTypeName.STRING),
         Field.of("_airbyte_emitted_at", LegacySQLTypeName.TIMESTAMP));
@@ -213,8 +213,8 @@ void formatRecord_objectType() throws JsonProcessingException {
     final DefaultBigQueryDenormalizedRecordFormatter rf = new DefaultBigQueryDenormalizedRecordFormatter(
         jsonNodeSchema, new BigQuerySQLNameTransformer());
     final JsonNode objectNode = mapper.readTree("""
-        {"name":"data"}
-        """);
+                                                {"name":"data"}
+                                                """);
     final AirbyteRecordMessage airbyteRecordMessage = new AirbyteRecordMessage();
     airbyteRecordMessage.setEmittedAt(1602637589000L);
     airbyteRecordMessage.setData(objectNode);
@@ -234,8 +234,8 @@ void formatRecord_containsRefDefinition() throws JsonProcessingException {
         jsonNodeSchema, new BigQuerySQLNameTransformer());
     rf.fieldsContainRefDefinitionValue.add("name");
     final JsonNode objectNode = mapper.readTree("""
-        {"name":"data"}
-        """);
+                                                {"name":"data"}
+                                                """);
     final AirbyteRecordMessage airbyteRecordMessage = new AirbyteRecordMessage();
     airbyteRecordMessage.setEmittedAt(1602637589000L);
     airbyteRecordMessage.setData(objectNode);
@@ -254,8 +254,8 @@ void formatRecord_objectWithArray() throws JsonProcessingException {
     DefaultBigQueryDenormalizedRecordFormatter rf = new DefaultBigQueryDenormalizedRecordFormatter(
         jsonNodeSchema, new BigQuerySQLNameTransformer());
     final JsonNode objectNode = mapper.readTree("""
-        {"object_with_arrays":["array_3"]}
-        """);
+                                                {"object_with_arrays":["array_3"]}
+                                                """);
     final AirbyteRecordMessage airbyteRecordMessage = new AirbyteRecordMessage();
     airbyteRecordMessage.setEmittedAt(1602637589000L);
     airbyteRecordMessage.setData(objectNode);
@@ -276,7 +276,7 @@ void formatRecordNotObject_thenThrowsError() throws JsonProcessingException {
     DefaultBigQueryDenormalizedRecordFormatter rf = new DefaultBigQueryDenormalizedRecordFormatter(
         jsonNodeSchema, new BigQuerySQLNameTransformer());
     final JsonNode arrayNode = mapper.readTree("""
-        ["one"]""");
+                                               ["one"]""");
 
     final AirbyteRecordMessage airbyteRecordMessage = new AirbyteRecordMessage();
     airbyteRecordMessage.setEmittedAt(1602637589000L);

diff --git a/.../integrations/destination/bigquery/formatter/arrayformater/DefaultArrayFormatterTest.java b/.../integrations/destination/bigquery/formatter/arrayformater/DefaultArrayFormatterTest.java
@@ -32,16 +32,16 @@ void surroundArraysByObjects() {
   void formatArrayItems() throws JsonProcessingException {
     final JsonNode expectedArrayNode = mapper.readTree(
         """
-            [
-              {"big_query_array": ["one", "two"]},
-              {"big_query_array": ["one", "two"]}
-            ]
-            """);
+        [
+          {"big_query_array": ["one", "two"]},
+          {"big_query_array": ["one", "two"]}
+        ]
+        """);
     final List<JsonNode> arrayNodes = List.of(
-        mapper.readTree(""" 
-            ["one", "two"]"""),
-        mapper.readTree(""" 
-            ["one", "two"]"""));
+        mapper.readTree("""
+                        ["one", "two"]"""),
+        mapper.readTree("""
+                        ["one", "two"]"""));
 
     final JsonNode result = formatter.formatArrayItems(arrayNodes);
 
@@ -50,10 +50,10 @@ void formatArrayItems() throws JsonProcessingException {
 
   @Test
   void formatArrayItems_notArray() throws JsonProcessingException {
-    final JsonNode objectNodeInput = mapper.readTree(""" 
-            {"type":"object","items":{"type":"integer"}}""");
-    final JsonNode expectedResult = mapper.readTree(""" 
-            [{"type":"object","items":{"type":"integer"}}]""");
+    final JsonNode objectNodeInput = mapper.readTree("""
+                                                     {"type":"object","items":{"type":"integer"}}""");
+    final JsonNode expectedResult = mapper.readTree("""
+                                                    [{"type":"object","items":{"type":"integer"}}]""");
 
     final JsonNode result = formatter.formatArrayItems(List.of(objectNodeInput));
 
@@ -64,26 +64,27 @@ void formatArrayItems_notArray() throws JsonProcessingException {
   void findArrays() throws JsonProcessingException {
     final JsonNode schemaArrays = getSchemaArrays();
     final List<JsonNode> expectedResult = List.of(
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree(
+            """
             {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""));
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""));
 
     final List<JsonNode> result = formatter.findArrays(schemaArrays);
     assertEquals(expectedResult, result);

diff --git a/...e/integrations/destination/bigquery/formatter/arrayformater/LegacyArrayFormatterTest.java b/...e/integrations/destination/bigquery/formatter/arrayformater/LegacyArrayFormatterTest.java
@@ -4,19 +4,14 @@
 
 package io.airbyte.integrations.destination.bigquery.formatter.arrayformater;
 
-import static io.airbyte.integrations.destination.bigquery.formatter.util.FormatterUtil.NESTED_ARRAY_FIELD;
-import static io.airbyte.integrations.destination.bigquery.formatter.util.FormatterUtil.TYPE_FIELD;
 import static io.airbyte.integrations.destination.bigquery.util.BigQueryDenormalizedTestSchemaUtils.getExpectedSchemaArraysLegacy;
 import static io.airbyte.integrations.destination.bigquery.util.BigQueryDenormalizedTestSchemaUtils.getSchemaArrays;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
@@ -38,26 +33,27 @@ void surroundArraysByObjects() {
   void findArrays() throws JsonProcessingException {
     final JsonNode schemaArrays = getSchemaArrays();
     final List<JsonNode> expectedResult = List.of(
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""),
-        mapper.readTree(""" 
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""),
+        mapper.readTree(
+            """
             {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
-        mapper.readTree(""" 
-            {"type":["array"],"items":{"type":"integer"}}"""));
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":["array"],"items":{"type":"integer"}}}"""),
+        mapper.readTree("""
+                        {"type":["array"],"items":{"type":"integer"}}"""));
 
     final List<JsonNode> result = formatter.findArrays(schemaArrays);
 
@@ -74,13 +70,13 @@ void findArrays_null() {
   void formatArrayItems() throws JsonProcessingException {
     final JsonNode expectedArrayNode = mapper.readTree(
         """
-              {"big_query_array": [["one", "two"], ["one", "two"]]}
-            """);
+          {"big_query_array": [["one", "two"], ["one", "two"]]}
+        """);
     final List<JsonNode> arrayNodes = List.of(
-        mapper.readTree(""" 
-            ["one", "two"]"""),
-        mapper.readTree(""" 
-            ["one", "two"]"""));
+        mapper.readTree("""
+                        ["one", "two"]"""),
+        mapper.readTree("""
+                        ["one", "two"]"""));
 
     final JsonNode result = formatter.formatArrayItems(arrayNodes);
 

diff --git a/...t/java/io/airbyte/integrations/destination/bigquery/formatter/util/FormatterUtilTest.java b/...t/java/io/airbyte/integrations/destination/bigquery/formatter/util/FormatterUtilTest.java
@@ -20,33 +20,33 @@ class FormatterUtilTest {
   void isAirbyteArray_typeIsNull() throws JsonProcessingException {
     final JsonNode arrayNode = mapper.readTree(
         """
-            ["one", "two"]""");
+        ["one", "two"]""");
 
     final boolean result = FormatterUtil.isAirbyteArray(arrayNode);
     assertFalse(result);
   }
 
   @Test
   void isAirbyteArray_typeFieldIsArray() throws JsonProcessingException {
-    final JsonNode arrayNode = mapper.readTree(""" 
-        {"type":["array"],"items":{"type":"integer"}}""");
+    final JsonNode arrayNode = mapper.readTree("""
+                                               {"type":["array"],"items":{"type":"integer"}}""");
 
     boolean result = FormatterUtil.isAirbyteArray(arrayNode);
     assertTrue(result);
   }
 
   @Test
   void isAirbyteArray_typeFieldIsNotArray() throws JsonProcessingException {
-    final JsonNode objectNode = mapper.readTree(""" 
-        {"type":"object"}""");
+    final JsonNode objectNode = mapper.readTree("""
+                                                {"type":"object"}""");
     final boolean result = FormatterUtil.isAirbyteArray(objectNode);
     assertFalse(result);
   }
 
   @Test
   void isAirbyteArray_textIsNotArray() throws JsonProcessingException {
-    final JsonNode arrayNode = mapper.readTree(""" 
-        {"type":["notArrayText"]}""");
+    final JsonNode arrayNode = mapper.readTree("""
+                                               {"type":["notArrayText"]}""");
     final boolean result = FormatterUtil.isAirbyteArray(arrayNode);
     assertFalse(result);
   }

diff --git a/...yte/integrations/destination/elasticsearch/SshElasticsearchDestinationAcceptanceTest.java b/...yte/integrations/destination/elasticsearch/SshElasticsearchDestinationAcceptanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
 package io.airbyte.integrations.destination.elasticsearch;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -12,6 +16,7 @@
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 public abstract class SshElasticsearchDestinationAcceptanceTest extends ElasticsearchDestinationAcceptanceTest {
+
   private static final Network network = Network.newNetwork();
   private static final SshBastionContainer bastion = new SshBastionContainer();
   private static ElasticsearchContainer container;
@@ -61,4 +66,5 @@ public static void afterAll() {
     container.close();
     bastion.getContainer().close();
   }
+
 }
diff --git a/.../integrations/destination/elasticsearch/SshKeyElasticsearchDestinationAcceptanceTest.java b/.../integrations/destination/elasticsearch/SshKeyElasticsearchDestinationAcceptanceTest.java
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
 package io.airbyte.integrations.destination.elasticsearch;
 
 import io.airbyte.integrations.base.ssh.SshTunnel;
@@ -7,4 +11,5 @@ public class SshKeyElasticsearchDestinationAcceptanceTest extends SshElasticsear
   public SshTunnel.TunnelMethod getTunnelMethod() {
     return SshTunnel.TunnelMethod.SSH_KEY_AUTH;
   }
+
 }
diff --git a/...grations/destination/elasticsearch/SshPasswordElasticsearchDestinationAcceptanceTest.java b/...grations/destination/elasticsearch/SshPasswordElasticsearchDestinationAcceptanceTest.java
@@ -1,8 +1,13 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
 package io.airbyte.integrations.destination.elasticsearch;
 
 import io.airbyte.integrations.base.ssh.SshTunnel;
 
-public class SshPasswordElasticsearchDestinationAcceptanceTest  extends SshElasticsearchDestinationAcceptanceTest {
+public class SshPasswordElasticsearchDestinationAcceptanceTest extends SshElasticsearchDestinationAcceptanceTest {
+
   @Override
   public SshTunnel.TunnelMethod getTunnelMethod() {
     return SshTunnel.TunnelMethod.SSH_PASSWORD_AUTH;

diff --git a/...ion/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java b/...ion/java/io/airbyte/integrations/destination/redis/SshRedisDestinationAcceptanceTest.java
@@ -86,9 +86,9 @@ protected JsonNode getFailCheckConfig() {
 
   @Override
   protected List<JsonNode> retrieveRecords(TestDestinationEnv testEnv,
-      String streamName,
-      String namespace,
-      JsonNode streamSchema) {
+                                           String streamName,
+                                           String namespace,
+                                           JsonNode streamSchema) {
     var key = redisNameTransformer.keyName(namespace, streamName);
     return redisCache.getAll(key).stream()
         .sorted(Comparator.comparing(RedisRecord::getTimestamp))
@@ -97,7 +97,6 @@ protected List<JsonNode> retrieveRecords(TestDestinationEnv testEnv,
         .collect(Collectors.toList());
   }
 
-
   @Override
   protected boolean implementsNamespaces() {
     return true;

diff --git a/airbyte-integrations/connectors/source-file/source_file/client.py b/airbyte-integrations/connectors/source-file/source_file/client.py
@@ -317,7 +317,6 @@ def load_dataframes(self, fp, skip_data=False) -> Iterable:
             logger.error(error_msg)
             raise ConfigurationError(error_msg) from err
 
-
         reader_options = {**self._reader_options}
         try:
             if self._reader_format == "csv":