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

🐛Source Google search console: Fix incremental sync: keep all urls in state object #9194

Merged
merged 10 commits into from
Jan 5, 2022
Merged

🐛Source Google search console: Fix incremental sync: keep all urls in state object #9194

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cdde769
bugfix: keep all urls in state object
grubberr Dec 29, 2021
d76d4e1
google-search-console.md updated
grubberr Dec 29, 2021
ca2704f
Merge branch 'master' into grubberr/8798-source-google-search-console
grubberr Dec 31, 2021
a2f6532
fix 0.1.10 -> 0.1.11
grubberr Dec 31, 2021
cbdacae
0.1.10 -> 0.1.11 (fix)
grubberr Dec 31, 2021
aa3e349
test_updated_state added
grubberr Dec 31, 2021
c150461
Merge branch 'master' into grubberr/8798-source-google-search-console
grubberr Jan 5, 2022
b9b30e0
add example of state structure
grubberr Jan 5, 2022
3184eb7
Merge branch 'master' into grubberr/8798-source-google-search-console
grubberr Jan 5, 2022
614d311
source_specs.yaml updated
grubberr Jan 5, 2022
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 ...ain/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "eb4c9e00-db83-4d63-a386-39cfa91012a8",
"name": "Google Search Console",
"dockerRepository": "airbyte/source-google-search-console",
"dockerImageTag": "0.1.9",
"dockerImageTag": "0.1.10",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/google-search-console",
"icon": "googlesearchconsole.svg"
}
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
- name: Google Search Console
sourceDefinitionId: eb4c9e00-db83-4d63-a386-39cfa91012a8
dockerRepository: airbyte/source-google-search-console
dockerImageTag: 0.1.9
dockerImageTag: 0.1.10
documentationUrl: https://docs.airbyte.io/integrations/sources/google-search-console
icon: googlesearchconsole.svg
sourceType: api
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-google-search-console/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENV SENTRY_DSN "https://d4b03de0c4574c78999b8d58e55243dc@o1009025.ingest.sentry.io/6102835"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.9
LABEL io.airbyte.version=0.1.10
LABEL io.airbyte.name=airbyte/source-google-search-console
14 changes: 4 additions & 10 deletions ...egrations/connectors/source-google-search-console/source_google_search_console/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,10 @@ def get_updated_state(
site_url = latest_record.get("site_url")
search_type = latest_record.get("search_type")

if current_stream_state.get(site_url, {}).get(search_type):
current_stream_state[site_url][search_type] = {
self.cursor_field: max(latest_benchmark, current_stream_state[site_url][search_type][self.cursor_field])
}

elif current_stream_state.get(site_url):
current_stream_state[site_url][search_type] = {self.cursor_field: latest_benchmark}

else:
current_stream_state = {site_url: {search_type: {self.cursor_field: latest_benchmark}}}
value = current_stream_state.get(site_url, {}).get(search_type, {}).get(self.cursor_field)
if value:
latest_benchmark = max(latest_benchmark, value)
current_stream_state.setdefault(site_url, {}).setdefault(search_type, {})[self.cursor_field] = latest_benchmark

# we need to get the max date over all searchTypes but the current acceptance test YAML format doesn't
# support that
Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/google-search-console.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ You should now be ready to use the Google Workspace Admin Reports API connector

| Version | Date | Pull Request | Subject |
| :--- | :--- | :--- | :--- |
| `0.1.10` | 2021-12-29 | [9194](https://github.com/airbytehq/airbyte/pull/9194) | Fix incremental sync: keep all urls in state object |
| `0.1.9` | 2021-12-22 | [9047](https://github.com/airbytehq/airbyte/pull/9047) | Add 'order' to spec.json props |
| `0.1.8` | 2021-12-21 | [8248](https://github.com/airbytehq/airbyte/pull/8248) | Enable Sentry for performance and errors tracking |
| `0.1.7` | 2021-11-26 | [7431](https://github.com/airbytehq/airbyte/pull/7431) | Add default `end_date` param value |
Expand Down