[Non-forked] 🐛 Source Clockify: Fix pagination logic (#29105)

* Source Clockify: Reset page counter when pagination is complete * fix: update schema files with nullable values * fix: disable backwards compatibility test for discovery for v0.2.0 --------- Co-authored-by: Ezra Quemuel <ezra.quemuel@redesignhealth.com>
airbytehq · Aug 7, 2023 · a277025 · a277025
1 parent 5f13ef1
commit a277025
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 130 deletions.
diff --git a/airbyte-integrations/connectors/source-clockify/Dockerfile b/airbyte-integrations/connectors/source-clockify/Dockerfile
@@ -34,5 +34,5 @@ COPY source_clockify ./source_clockify
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.2.0
+LABEL io.airbyte.version=0.2.1
 LABEL io.airbyte.name=airbyte/source-clockify
diff --git a/airbyte-integrations/connectors/source-clockify/acceptance-test-config.yml b/airbyte-integrations/connectors/source-clockify/acceptance-test-config.yml
@@ -14,6 +14,9 @@ acceptance_tests:
   discovery:
     tests:
       - config_path: "secrets/config.json"
+        backward_compatibility_tests_config:
+          previous_connector_version: "0.2.0"
+          disable_for_version: "0.2.0"
   basic_read:
     tests:
       - config_path: "secrets/config.json"

diff --git a/airbyte-integrations/connectors/source-clockify/metadata.yaml b/airbyte-integrations/connectors/source-clockify/metadata.yaml
@@ -2,7 +2,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: e71aae8a-5143-11ed-bdc3-0242ac120002
-  dockerImageTag: 0.2.0
+  dockerImageTag: 0.2.1
   dockerRepository: airbyte/source-clockify
   githubIssueLabel: source-clockify
   icon: clockify.svg

diff --git a/airbyte-integrations/connectors/source-clockify/setup.py b/airbyte-integrations/connectors/source-clockify/setup.py
@@ -9,7 +9,7 @@
     "airbyte-cdk",
 ]
 
-TEST_REQUIREMENTS = ["pytest~=6.1", "pytest-mock~=3.6.1", "connector-acceptance-test", "responses"]
+TEST_REQUIREMENTS = ["pytest~=6.1", "pytest-mock~=3.6.1", "source-acceptance-test", "responses"]
 
 setup(
     name="source_clockify",

diff --git a/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/clients.json b/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/clients.json
@@ -1,27 +1,27 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "additionalProperties": true,
   "properties": {
     "address": {
       "type": ["null", "string"]
     },
     "archived": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "id": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "email": {
       "type": ["null", "string"]
     },
     "name": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "note": {
       "type": ["null", "string"]
     },
     "workspaceId": {
-      "type": "string"
+      "type": ["null", "string"]
     }
   },
   "type": "object"

diff --git a/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/projects.json b/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/projects.json
@@ -1,11 +1,12 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": true,
   "properties": {
     "archived": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "billable": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "budgetEstimate": {
       "anyOf": [
@@ -21,27 +22,27 @@
               "type": ["null", "string"]
             },
             "type": {
-              "type": "string"
+              "type": ["null", "string"]
             },
             "resetOption": {
               "type": ["null", "string"]
             },
             "active": {
-              "type": "boolean"
+              "type": ["null", "boolean"]
             }
           },
-          "type": "object"
+          "type": ["null", "object"]
         }
       ]
     },
     "clientId": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "clientName": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "color": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "costRate": {
       "anyOf": [
@@ -60,12 +61,12 @@
               "type": ["null", "string"]
             }
           },
-          "type": "object"
+          "type": ["null", "object"]
         }
       ]
     },
     "duration": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "estimate": {
       "properties": {
@@ -76,27 +77,27 @@
           "type": "string"
         }
       },
-      "type": "object"
+      "type": ["null", "object"]
     },
     "hourlyRate": {
       "properties": {
         "amount": {
-          "type": "integer"
+          "type": ["null", "integer"]
         },
         "currency": {
-          "type": "string"
+          "type": ["null", "string"]
         }
       },
-      "type": "object"
+      "type": ["null", "object"]
     },
     "id": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "memberships": {
       "items": {
         "properties": {
           "costRate": {
-            "type": "null"
+            "type": ["null"]
           },
           "hourlyRate": {
             "anyOf": [
@@ -106,67 +107,67 @@
               {
                 "properties": {
                   "amount": {
-                    "type": "integer"
+                    "type": ["null", "integer"]
                   },
                   "currency": {
-                    "type": "string"
+                    "type": ["null", "string"]
                   }
                 },
-                "type": "object"
+                "type": ["null", "object"]
               }
             ]
           },
           "membershipStatus": {
-            "type": "string"
+            "type": ["null", "string"]
           },
           "membershipType": {
-            "type": "string"
+            "type": ["null", "string"]
           },
           "targetId": {
-            "type": "string"
+            "type": ["null", "string"]
           },
           "userId": {
-            "type": "string"
+            "type": ["null", "string"]
           }
         },
-        "type": "object"
+        "type": ["null", "object"]
       },
-      "type": "array"
+      "type": ["null", "array"]
     },
     "name": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "note": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "public": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "template": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "timeEstimate": {
       "properties": {
         "active": {
-          "type": "boolean"
+          "type": ["null", "boolean"]
         },
         "estimate": {
-          "type": "string"
+          "type": ["null", "string"]
         },
         "includeNonBillable": {
-          "type": "boolean"
+          "type": ["null", "boolean"]
         },
         "resetOption": {
           "type": ["null", "string"]
         },
         "type": {
-          "type": "string"
+          "type": ["null", "string"]
         }
       },
-      "type": "object"
+      "type": ["null", "object"]
     },
     "workspaceId": {
-      "type": "string"
+      "type": ["null", "string"]
     }
   },
   "type": "object"

diff --git a/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tags.json b/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tags.json
@@ -1,17 +1,18 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": true,
   "properties": {
     "archived": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "id": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "name": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "workspaceId": {
-      "type": "string"
+      "type": ["null", "string"]
     }
   },
   "type": "object"

diff --git a/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tasks.json b/airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tasks.json
@@ -1,17 +1,18 @@
 {
-  "$schema": "http://json-schema.org/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": true,
   "properties": {
     "assigneeId": {
       "type": ["null", "string"]
     },
     "assigneeIds": {
       "items": {
-        "type": "string"
+        "type": ["null", "string"]
       },
-      "type": "array"
+      "type": ["null", "array"]
     },
     "billable": {
-      "type": "boolean"
+      "type": ["null", "boolean"]
     },
     "costRate": {
       "anyOf": [
@@ -30,15 +31,15 @@
               "type": ["null", "string"]
             }
           },
-          "type": "object"
+          "type": ["null", "object"]
         }
       ]
     },
     "duration": {
       "type": ["null", "string"]
     },
     "estimate": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "hourlyRate": {
       "anyOf": [
@@ -48,30 +49,30 @@
         {
           "properties": {
             "amount": {
-              "type": "integer"
+              "type": ["null", "integer"]
             },
             "currency": {
-              "type": "string"
+              "type": ["null", "string"]
             }
           },
-          "type": "object"
+          "type": ["null", "object"]
         }
       ]
     },
     "id": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "name": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "projectId": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "status": {
-      "type": "string"
+      "type": ["null", "string"]
     },
     "userGroupIds": {
-      "type": "array"
+      "type": ["null", "array"]
     }
   },
   "type": "object"