🐛 Source Zendesk Support: fix incremental logic for ticket_comments stream

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/79c1aa37-dae3-42ae-b333-d1c105477715.json

@@ -2,7 +2,7 @@
   "sourceDefinitionId": "79c1aa37-dae3-42ae-b333-d1c105477715",
   "name": "Zendesk Support",
   "dockerRepository": "airbyte/source-zendesk-support",
-  "dockerImageTag": "0.1.0",
+  "dockerImageTag": "0.1.1",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/zendesk-support",
   "icon": "zendesk.svg"
 }

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -194,7 +194,7 @@
 - sourceDefinitionId: 79c1aa37-dae3-42ae-b333-d1c105477715
   name: Zendesk Support
   dockerRepository: airbyte/source-zendesk-support
-  dockerImageTag: 0.1.0
+  dockerImageTag: 0.1.1
   documentationUrl: https://docs.airbyte.io/integrations/sources/zendesk-support
   icon: zendesk.svg
 - sourceDefinitionId: d8313939-3782-41b0-be29-b3ca20d8dd3a

airbyte-integrations/connectors/source-zendesk-support/Dockerfile

@@ -21,5 +21,5 @@ COPY source_zendesk_support ./source_zendesk_support
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.0
+LABEL io.airbyte.version=0.1.1
 LABEL io.airbyte.name=airbyte/source-zendesk-support

airbyte-integrations/connectors/source-zendesk-support/acceptance-test-docker.sh

@@ -1,4 +1,11 @@
 #!/usr/bin/env sh
+image_name=$(cat acceptance-test-config.yml | grep "connector_image" | head -n 1 | cut -d: -f2-)
+# Build latest connector image
+echo "try to build: ${image_name}"
+docker build . -t ${image_name}
+
+# Pull latest acctest image
+docker pull airbyte/source-acceptance-test:latest
 
 docker run --rm -it \
     -v /var/run/docker.sock:/var/run/docker.sock \

airbyte-integrations/connectors/source-zendesk-support/integration_tests/integration_test.py

@@ -55,6 +55,7 @@ def _test_export_stream(self, stream_cls: type):
         for record_id, timestamp in record_timestamps.items():
             state = {stream.cursor_field: timestamp}
             for record in stream.read_records(sync_mode=None, stream_state=state):
+                print(f"First record: {record}!={record_id} ({timestamp}), state:{state}")
                 assert record["id"] != record_id
                 break
 

airbyte-integrations/connectors/source-zendesk-support/integration_tests/invalid_config.json

@@ -1,6 +1,8 @@
 {
-  "email": "broken.email@invalid.config",
-  "api_token": "<broken token>",
+  "auth_method": {
+    "api_token": "<broken token>",
+    "email": "broken.email@invalid.config"
+  },
   "subdomain": "test-failure-airbyte",
   "start_date": "2030-01-01T00:00:00Z"
 }

airbyte-integrations/connectors/source-zendesk-support/setup.py

@@ -27,7 +27,7 @@
 
 MAIN_REQUIREMENTS = ["airbyte-cdk", "pytz"]
 
-TEST_REQUIREMENTS = ["pytest~=6.1", "source-acceptance-test", "requests-mock==1.9.3", "timeout-decorator==0.5.0"]
+TEST_REQUIREMENTS = ["pytest~=6.1", "source-acceptance-test", "requests-mock==1.9.3"]
 
 setup(
     version="0.1.0",

airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/schemas/organizations.json

@@ -53,8 +53,7 @@
       "type": ["null", "integer"]
     },
     "deleted_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     }
   }
 }

airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/schemas/ticket_metrics.json

@@ -73,8 +73,7 @@
       "type": ["null", "integer"]
     },
     "latest_comment_added_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "on_hold_time_in_minutes": {
       "type": ["null", "object"],
@@ -131,20 +130,16 @@
       "type": ["null", "string"]
     },
     "initially_assigned_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "assigned_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "solved_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "assignee_updated_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     }
   },
   "type": ["null", "object"]

airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/schemas/tickets.json

@@ -93,8 +93,7 @@
       "type": ["null", "boolean"]
     },
     "due_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "followup_ids": {
       "items": {

airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/schemas/users.json

@@ -153,8 +153,7 @@
       "additionalProperties": true
     },
     "last_login_at": {
-      "type": ["null", "string"],
-      "format": "date-time"
+      "type": ["null", "string"]
     },
     "alias": {
       "type": ["null", "string"]

airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/spec.json

@@ -20,6 +20,7 @@
       "auth_method": {
         "title": "ZenDesk Authorization Method",
         "type": "object",
+        "default": "api_token",
         "description": "Zendesk service provides 2 auth method: API token and oAuth2. Now only the first one is available. Another one will be added in the future",
         "oneOf": [
           {
@@ -28,6 +29,10 @@
             "required": ["email", "api_token"],
             "additionalProperties": false,
             "properties": {
+              "auth_method": {
+                "type": "string",
+                "const": "api_token"
+              },
               "email": {
                 "type": "string",
                 "description": "The user email for your Zendesk account"