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

🐛 Surveymonkey source: fix gzip compressed http response caching #5983

Merged
merged 2 commits into from
Sep 12, 2021
Merged

🐛 Surveymonkey source: fix gzip compressed http response caching #5983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e779fd
Surveymonkey source: fix gzip compressed http response caching
Sep 10, 2021
c8c1e20
Update PR for changelog
Sep 10, 2021
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-surveymonkey/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ RUN pip install .
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-surveymonkey
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-surveymonkey/acceptance-test-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ tests:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
status: "exception"
discovery:
- config_path: "secrets/config.json"
basic_read:
Expand All @@ -18,7 +18,7 @@ tests:
#incremental:
# - config_path: "secrets/config.json"
# configured_catalog_path: "integration_tests/configured_catalog.json"
# future_state_path: "integration_tests/abnormal_state.json"
# future_state_path: "integration_tests/abnormal_state.json"
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog.json"
8 changes: 4 additions & 4 deletions ...grations/connectors/source-surveymonkey/source_surveymonkey/schemas/survey_questions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"type": "string"
},
"layout": {
"type": "string"
"type": ["object", "null"]
},
"sorting": {
"type": "string"
"type": ["string", "null"]
},
"required": {
"type": "string"
"type": ["string", "null"]
},
"validation": {
"type": "string"
"type": ["string", "null"]
},
"forced_ranking": {
"type": "boolean"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You admit that 4 properties can be Null, are you sure that the rest of the properties cannot be Null too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest of the properties are required for request (or they have default value) hence they would always be present on output

https://developer.surveymonkey.com/api/v3/#surveys-id-pages-id-questions

Expand Down
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"title": "Start Date",
"type": "string",
"description": "The date from which you'd like to replicate the data",
"pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
"examples": "2021-01-01T00:00:00Z"
"pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z?$",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my understanding: in what cases can we miss an error with ^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$, but validate it with ^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z?$?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Z is not required anymore

"examples": ["2021-01-01T00:00:00Z"]
},
"access_token": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def read_records(
This API is very very rate limited, we need to reuse everything possible.
We use the "new_episodes" record mode to save and reuse all requests in slices, details, etc..
"""
with vcr.use_cassette(cache_file.name, record_mode="new_episodes", serializer="json"):
with vcr.use_cassette(cache_file.name, record_mode="new_episodes", serializer="json", decode_compressed_response=True):
yield from super().read_records(
sync_mode=sync_mode, cursor_field=cursor_field, stream_slice=stream_slice, stream_state=stream_state
)
Expand Down
3 changes: 2 additions & 1 deletion docs/integrations/sources/surveymonkey.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ Then go to Settings and copy your access token

| Version | Date | Pull Request | Subject |
| :------ | :-------- | :----- | :------ |
| 0.1.0 | 2021-07-06 | [4097](https://github.com/airbytehq/airbyte/pull/4097) | Initial Release |
| 0.1.1 | 2021-09-10 | [5983](https://github.com/airbytehq/airbyte/pull/5983) | Fix caching for gzip compressed http response |
| 0.1.0 | 2021-07-06 | [4097](https://github.com/airbytehq/airbyte/pull/4097) | Initial Release |