Skip to content

Commit

Permalink
🚨 🚨 Source Google Ads: update schemas and names of default streams (#…
Browse files Browse the repository at this point in the history 
…31048)

Co-authored-by: tolik0 <[email protected]>
Co-authored-by: Ben Church <[email protected]>
  • Loading branch information
@tolik0 @bnchrch
3 people authored Oct 16, 2023
1 parent 31fe1f3 commit cb3df14
Show file tree
Hide file tree
Showing 43 changed files with 434 additions and 466 deletions.
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-google-ads/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ COPY main.py ./

ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=1.0.0
LABEL io.airbyte.version=2.0.0
LABEL io.airbyte.name=airbyte/source-google-ads
22 changes: 11 additions & 11 deletions airbyte-integrations/connectors/source-google-ads/acceptance-test-config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ acceptance_tests:
tests:
- config_path: "secrets/config.json"
backward_compatibility_tests_config:
disable_for_version: "0.11.1" # schemas for custom queries are fixed in 1.0.0
disable_for_version: "1.0.0" # schemas of default streams were updated
basic_read:
tests:
- config_path: "secrets/config.json"
Expand All @@ -27,16 +27,16 @@ acceptance_tests:
extra_records: yes # the file with all the records is 15 MB, so comparing only 3 records
timeout_seconds: 3600
empty_streams:
- name: "account_labels"
- name: "customer_label"
bypass_reason: "Data is present in UI, but not in API: supposedly insufficient permissions"
- name: "shopping_performance_report"
- name: "shopping_performance_view"
bypass_reason: "No shopping campaign, need item for sale"
- name: "display_topics_performance_report"
- name: "topic_view"
bypass_reason: "No data for this date range, tested in next config"
- name: "click_view"
bypass_reason: "Stream has data only for last 90 days, next config is used for testing it"
ignored_fields:
accounts:
customer:
- name: customer.optimization_score_weight
bypass_reason: "Value can be updated by Google Ads"
- name: customer.optimization_score
Expand All @@ -46,24 +46,24 @@ acceptance_tests:
path: "integration_tests/expected_records_click.jsonl"
timeout_seconds: 3600
empty_streams:
- name: "account_labels"
- name: "customer_label"
bypass_reason: "Data is present in UI, but not in API: supposedly insufficient permissions"
- name: "shopping_performance_report"
- name: "shopping_performance_view"
bypass_reason: "No shopping campaign, need item for sale"
- name: "display_keyword_performance_report"
- name: "display_keyword_view"
bypass_reason: "No data for this date range, tested in previous config"
- name: "keyword_report"
- name: "keyword_view"
bypass_reason: "No data for this date range, tested in previous config"
ignored_fields:
accounts:
customer:
- name: customer.optimization_score_weight
bypass_reason: "Value can be updated by Google Ads"
- name: customer.optimization_score
bypass_reason: "Value can be updated by Google Ads"
campaign_budget:
- name: campaign_budget.recommended_budget_estimated_change_weekly_interactions
bypass_reason: "Value can be updated by Google Ads"
campaigns:
campaign:
- name: campaign.optimization_score
bypass_reason: "Value can be updated by Google Ads"
full_refresh:
Expand Down
28 changes: 14 additions & 14 deletions airbyte-integrations/connectors/source-google-ads/integration_tests/abnormal_state.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,77 +17,77 @@
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "geographic_report" }
"stream_descriptor": { "name": "geographic_view" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "keyword_report" }
"stream_descriptor": { "name": "keyword_view" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "display_topics_performance_report" }
"stream_descriptor": { "name": "topic_view" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "shopping_performance_report" }
"stream_descriptor": { "name": "shopping_performance_view" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "ad_group_ads" }
"stream_descriptor": { "name": "ad_group_ad" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "ad_groups" }
"stream_descriptor": { "name": "ad_group" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "accounts" }
"stream_descriptor": { "name": "customer" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "campaigns" }
"stream_descriptor": { "name": "campaign" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "user_location_report" }
"stream_descriptor": { "name": "user_location_view" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "ad_group_ad_report" }
"stream_descriptor": { "name": "ad_group_ad_legacy" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "display_keyword_performance_report" }
"stream_descriptor": { "name": "display_keyword_view" }
}
},
{
Expand All @@ -101,14 +101,14 @@
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "campaign_bidding_strategies" }
"stream_descriptor": { "name": "campaign_bidding_strategy" }
}
},
{
"type": "STREAM",
"stream": {
"stream_state": { "4651612872": { "segments.date": "2222-01-01" } },
"stream_descriptor": { "name": "ad_group_bidding_strategies" }
"stream_descriptor": { "name": "ad_group_bidding_strategy" }
}
},
{
Expand All @@ -121,7 +121,7 @@
}
}
},
"stream_descriptor": { "name": "ad_group_criterions" }
"stream_descriptor": { "name": "ad_group_criterion" }
}
},
{
Expand Down
42 changes: 21 additions & 21 deletions airbyte-integrations/connectors/source-google-ads/integration_tests/configured_catalog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"streams": [
{
"stream": {
"name": "ad_group_ad_report",
"name": "ad_group_ad_legacy",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand Down Expand Up @@ -110,7 +110,7 @@
},
{
"stream": {
"name": "geographic_report",
"name": "geographic_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -134,7 +134,7 @@
},
{
"stream": {
"name": "keyword_report",
"name": "keyword_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -156,7 +156,7 @@
},
{
"stream": {
"name": "display_keyword_performance_report",
"name": "display_keyword_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -182,7 +182,7 @@
},
{
"stream": {
"name": "display_topics_performance_report",
"name": "topic_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -208,7 +208,7 @@
},
{
"stream": {
"name": "shopping_performance_report",
"name": "shopping_performance_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand All @@ -220,7 +220,7 @@
},
{
"stream": {
"name": "ad_group_ads",
"name": "ad_group_ad",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand All @@ -238,7 +238,7 @@
},
{
"stream": {
"name": "ad_groups",
"name": "ad_group",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand All @@ -252,7 +252,7 @@
},
{
"stream": {
"name": "accounts",
"name": "customer",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand All @@ -266,7 +266,7 @@
},
{
"stream": {
"name": "campaigns",
"name": "campaign",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand All @@ -290,7 +290,7 @@
},
{
"stream": {
"name": "campaign_labels",
"name": "campaign_label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["campaign.id"], ["label.id"]]
Expand All @@ -301,7 +301,7 @@
},
{
"stream": {
"name": "ad_group_labels",
"name": "ad_group_label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["ad_group.id"], ["label.id"]]
Expand All @@ -312,7 +312,7 @@
},
{
"stream": {
"name": "ad_group_ad_labels",
"name": "ad_group_ad_label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [
Expand All @@ -327,7 +327,7 @@
},
{
"stream": {
"name": "user_location_report",
"name": "user_location_view",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
Expand Down Expand Up @@ -396,7 +396,7 @@
},
{
"stream": {
"name": "labels",
"name": "label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["label.id"]]
Expand All @@ -407,7 +407,7 @@
},
{
"stream": {
"name": "account_labels",
"name": "customer_label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["customer_label.resource_name"]]
Expand All @@ -418,7 +418,7 @@
},
{
"stream": {
"name": "campaign_bidding_strategies",
"name": "campaign_bidding_strategy",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -440,7 +440,7 @@
},
{
"stream": {
"name": "ad_group_bidding_strategies",
"name": "ad_group_bidding_strategy",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [
Expand All @@ -462,7 +462,7 @@
},
{
"stream": {
"name": "ad_group_criterions",
"name": "ad_group_criterion",
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_primary_key": [["ad_group_criterion.resource_name"]]
Expand All @@ -473,7 +473,7 @@
},
{
"stream": {
"name": "ad_listing_group_criterions",
"name": "ad_listing_group_criterion",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["ad_group_criterion.resource_name"]]
Expand All @@ -484,7 +484,7 @@
},
{
"stream": {
"name": "ad_group_criterion_labels",
"name": "ad_group_criterion_label",
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [
Expand Down
Loading

0 comments on commit cb3df14

Please sign in to comment.