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.

Sign up for GitHub

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

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

Merged
merged 4 commits into from
Aug 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5588d3
Source Clockify: Reset page counter when pagination is complete
ezra-quemuel Jun 30, 2023
8305dd5
fix: update schema files with nullable values
sajarin Aug 4, 2023
18b5f1e
fix: disable backwards compatibility test for discovery for v0.2.0
sajarin Aug 4, 2023
9b0c1f2
Merge branch 'master' into saj/clockify-pagination
sajarin Aug 4, 2023
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
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-clockify/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions airbyte-integrations/connectors/source-clockify/acceptance-test-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-clockify/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-clockify/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions airbyte-integrations/connectors/source-clockify/source_clockify/schemas/clients.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
73 changes: 37 additions & 36 deletions airbyte-integrations/connectors/source-clockify/source_clockify/schemas/projects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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": [
Expand All @@ -60,12 +61,12 @@
"type": ["null", "string"]
}
},
"type": "object"
"type": ["null", "object"]
}
]
},
"duration": {
"type": "string"
"type": ["null", "string"]
},
"estimate": {
"properties": {
Expand All @@ -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": [
Expand All @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
29 changes: 15 additions & 14 deletions airbyte-integrations/connectors/source-clockify/source_clockify/schemas/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -30,15 +31,15 @@
"type": ["null", "string"]
}
},
"type": "object"
"type": ["null", "object"]
}
]
},
"duration": {
"type": ["null", "string"]
},
"estimate": {
"type": "string"
"type": ["null", "string"]
},
"hourlyRate": {
"anyOf": [
Expand All @@ -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"
Expand Down
Loading